diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 16c4abe2c32251a12ee8319163f5bede98bbbe19..74842ed4f84c11faa50d9fd6a9fe124316b2067f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
<application
android:allowBackup="true"
@@ -19,13 +22,6 @@
android:name="android.app.lib_name"
android:value="" />
</activity>
- <activity
- android:name=".CapacityStatus"
- android:exported="false">
- <meta-data
- android:name="android.app.lib_name"
- android:value="" />
- </activity>
<activity
android:name=".BlutBildErstellen"
android:exported="false">
diff --git a/app/src/main/java/com/example/firstintent/Akte.java b/app/src/main/java/com/example/firstintent/Akte.java
index 27297ec9a088a4f9622d008903038b51157fb775..bda33d90a7a02c229ac5b0372d4c8c7b0eafa13d 100644
--- a/app/src/main/java/com/example/firstintent/Akte.java
+++ b/app/src/main/java/com/example/firstintent/Akte.java
@@ -26,6 +26,21 @@ public class Akte {
}
+
+ // constructor for the Auftraege
+ public Akte(int _id, boolean isactive ){
+
+ this.id= _id;
+ this.isActive=isactive;
+
+ }
+
+ // constructor used for printing out the auftrage in the Dienstleister Section
+ public Akte(boolean isactived){
+
+ isActive=isactived;
+ }
+
// to string is necessary for printing the content of a class object
@Override
diff --git a/app/src/main/java/com/example/firstintent/Auftraege.java b/app/src/main/java/com/example/firstintent/Auftraege.java
index bb71e0c574820d38806e47a2945774882b3f2a74..3f201eb6d1ec640939383a47cd97eedb678ab242 100644
--- a/app/src/main/java/com/example/firstintent/Auftraege.java
+++ b/app/src/main/java/com/example/firstintent/Auftraege.java
@@ -4,21 +4,52 @@ import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
+import android.widget.ArrayAdapter;
import android.widget.Button;
+import android.widget.ListView;
+import android.widget.Switch;
+import android.widget.Toast;
public class Auftraege extends AppCompatActivity {
+ // Switch switch_auftraege;
+ Button viewbtn;
+ ListView listing;
+
+
+ ArrayAdapter patientArrayAdapter2;
+ DatabaseHelper databaseHelper;
+ Akte akte;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_auftraege);
- Button fifthButton= (Button) findViewById(R.id.button5);
+ // switch_auftraege=findViewById(R.id.switch6);
+ viewbtn=findViewById(R.id.button5);
+ listing=findViewById(R.id.aufraegelist);
- fifthButton.setOnClickListener(new View.OnClickListener() {
+ viewbtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- finish();
+
+
+ try {
+ // akte= new Akte(switch_auftraege.isChecked());
+ databaseHelper= new DatabaseHelper(Auftraege.this);
+ patientArrayAdapter2= new ArrayAdapter<Akte>(Auftraege.this, android.R.layout.simple_list_item_1,databaseHelper.search2(akte));
+ listing.setAdapter(patientArrayAdapter2);
+
+ }
+ catch(Exception e){
+
+ Toast.makeText(Auftraege.this,"Error viewing Aufraege", Toast.LENGTH_SHORT).show();
+
+ }
+
+
+
}
});
@@ -26,5 +57,6 @@ public class Auftraege extends AppCompatActivity {
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/firstintent/BlutbildAnordnen.java b/app/src/main/java/com/example/firstintent/BlutbildAnordnen.java
index 7580436fed795d8be5c040ae5b75a4e3db7b86e1..a1599ebe53ae627c1b1e0d875d6fbc8e2d2746d8 100644
--- a/app/src/main/java/com/example/firstintent/BlutbildAnordnen.java
+++ b/app/src/main/java/com/example/firstintent/BlutbildAnordnen.java
@@ -4,23 +4,84 @@ import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
+import android.widget.ArrayAdapter;
import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.Switch;
+import android.widget.Toast;
public class BlutbildAnordnen extends AppCompatActivity {
+ EditText id1;
+ Button viewbtn, anordnenbtn;
+ ListView plists;
+ Switch switching; // This will decide if the patinet will
+
+ DatabaseHelper databaseHelper;
+ Akte akte;
+ ArrayAdapter patientArrayAdapter;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_blutbild_anordnen);
- Button thirteenthButton = (Button) findViewById(R.id.button13);
+ id1=findViewById(R.id.editTextTextPersonName3);
+ viewbtn=findViewById(R.id.button12);
+ anordnenbtn=findViewById(R.id.button13);
+ switching=findViewById(R.id.switch4);
+ plists=findViewById(R.id.anordnen1);
+
+
+
+ anordnenbtn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+
+ try {
+ databaseHelper=new DatabaseHelper(BlutbildAnordnen.this);
+ // Initializing the constructor with the id and switch typed in from the user
+ akte=new Akte(Integer.parseInt(id1.getText().toString()),switching.isChecked());
+
+ // Check function if the update was successful
+ boolean updating= databaseHelper.updateData2(akte);
+ if (updating==true){
+
+ Toast.makeText(BlutbildAnordnen.this,"succesfully assigned bloodtest", Toast.LENGTH_SHORT).show();
+ }
+
+ else{
+ Toast.makeText(BlutbildAnordnen.this,"blood test assignment failed", Toast.LENGTH_SHORT).show();
+
+ }
+
- thirteenthButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- finish();
}
- });
+
+ catch (Exception e){
+
+ Toast.makeText(BlutbildAnordnen.this,"assignment failed", Toast.LENGTH_SHORT).show();
+
+
+ }
+
+ }
+ });
+
+
+
+ viewbtn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+
+
+ databaseHelper= new DatabaseHelper(BlutbildAnordnen.this);
+ patientArrayAdapter= new ArrayAdapter<Akte>(BlutbildAnordnen.this, android.R.layout.simple_list_item_1,databaseHelper.getEveryone());
+ plists.setAdapter(patientArrayAdapter);
+ }
+ });
+
}
diff --git a/app/src/main/java/com/example/firstintent/CapacityStatus.java b/app/src/main/java/com/example/firstintent/CapacityStatus.java
deleted file mode 100644
index e624d3cd8eb0a0f072a622863bb864a9f7c128aa..0000000000000000000000000000000000000000
--- a/app/src/main/java/com/example/firstintent/CapacityStatus.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.example.firstintent;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-
-public class CapacityStatus extends AppCompatActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_capacity_status);
-
- Button SecondButton= (Button) findViewById(R.id.buttonclose1);
-
- SecondButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- finish();
- }
- });
-
-
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/firstintent/DatabaseHelper.java b/app/src/main/java/com/example/firstintent/DatabaseHelper.java
index 58c86be63068edbd7b8c4e839296386bb2689d11..dd7dfe3d76ea485c3f20d65605ce170b37aa87ba 100644
--- a/app/src/main/java/com/example/firstintent/DatabaseHelper.java
+++ b/app/src/main/java/com/example/firstintent/DatabaseHelper.java
@@ -182,6 +182,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
}
+ // This function is being used by the Dienstleister
public boolean updateData(Akte akte){
SQLiteDatabase db = this.getWritableDatabase();
@@ -198,6 +199,74 @@ public class DatabaseHelper extends SQLiteOpenHelper {
return true;
}
+ // update function for the blutbild and mrt anordnen
+
+ public boolean updateData2(Akte akte){
+
+ SQLiteDatabase db=this.getWritableDatabase(); // use this when writing to the database
+ ContentValues cv= new ContentValues();
+
+ cv.put(COLUMN_ID,akte.getId());
+ cv.put(COLUMN_ACTIVE_PATIENT,akte.isActive());
+
+ db.update(PATIENT_TABLE,cv,"ID = ?", new String[]{String.valueOf(akte.getId())});
+
+ return true;
+ }
+
+
+
+ // get Auftraege function
+
+ public List<Akte> search2 (Akte akte){
+ List<Akte> returnList = new ArrayList<>();
+
+ // get Data from the database
+
+ String queryString = "SELECT * FROM " + PATIENT_TABLE +
+ " WHERE " + COLUMN_ACTIVE_PATIENT +
+ "=\"" + " 1 " + "\";"; // There does not exist true or false in sqlite . You have to use 0 or 1
+
+
+ SQLiteDatabase db = this.getReadableDatabase();
+ Cursor cursor = db.rawQuery(queryString, null);
+ if (cursor.moveToFirst()) {
+ // loop through the results and create a new patient object and put them into the return list
+
+ do {
+ int patientID = cursor.getInt(0);
+ String PatientName = cursor.getString(1);
+ int VersicherungsNumber = cursor.getInt(2);
+ int roomNumber = cursor.getInt(3);
+ boolean activePatients = cursor.getInt(4) == 1 ? true : false;
+
+ akte = new Akte(patientID, VersicherungsNumber, PatientName, roomNumber, activePatients);
+
+ returnList.add(akte);
+
+ }
+ while (cursor.moveToNext());
+
+ }
+
+ else {
+ // If there are no results from the database then we will not add anything to the list
+
+
+
+ }
+
+ cursor.close();
+ db.close();
+ return returnList;
+
+ }
+
+
+
+
+
+
diff --git a/app/src/main/java/com/example/firstintent/MRTErstellen.java b/app/src/main/java/com/example/firstintent/MRTErstellen.java
index 0716bfa880fdac73b37590a9c6c6f32299cdd657..9bb499616ffeb2b8b90b0608abae63dd41409091 100644
--- a/app/src/main/java/com/example/firstintent/MRTErstellen.java
+++ b/app/src/main/java/com/example/firstintent/MRTErstellen.java
@@ -13,15 +13,5 @@ public class MRTErstellen extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_mrterstellen);
-
- Button twelfthButton = (Button) findViewById(R.id.button12);
-
- twelfthButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- finish();
- }
- });
-
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/firstintent/MRTanordnen.java b/app/src/main/java/com/example/firstintent/MRTanordnen.java
index 38bc59bcec3e790912b642c2200d623d8475ff7c..9862e9ff6f04044891230fb26112ce9634fab502 100644
--- a/app/src/main/java/com/example/firstintent/MRTanordnen.java
+++ b/app/src/main/java/com/example/firstintent/MRTanordnen.java
@@ -4,23 +4,79 @@ import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
+import android.widget.ArrayAdapter;
import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.Switch;
+import android.widget.Toast;
public class MRTanordnen extends AppCompatActivity {
+ EditText a_id;
+ Switch switch_id;
+ Button vbuttoning,updatebtn;
+ ListView vlists;
+
+
+ DatabaseHelper databaseHelper;
+ Akte akte;
+ ArrayAdapter patientArrayAdapter;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_mrtanordnen);
- Button fourteenthButton = (Button) findViewById(R.id.button14);
+ a_id=findViewById(R.id.editTextTextPersonName4);
+ switch_id=findViewById(R.id.switch5);
+ vbuttoning=findViewById(R.id.button14);
+ updatebtn=findViewById(R.id.button16);
+ vlists=findViewById(R.id.mrtlist);
+
+
+ updatebtn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+
+ try {
+ databaseHelper=new DatabaseHelper(MRTanordnen.this);
+ akte=new Akte(Integer.parseInt(a_id.getText().toString()),switch_id.isChecked());
+ boolean updating= databaseHelper.updateData2(akte);
+ if (updating==true){
+
+ Toast.makeText(MRTanordnen.this,"succesfully assigned MRI", Toast.LENGTH_SHORT).show();
+
+ }
+
+ else{
- fourteenthButton.setOnClickListener(new View.OnClickListener() {
+ Toast.makeText(MRTanordnen.this,"MRI assignment failed", Toast.LENGTH_SHORT).show();
+ }
+
+ }
+
+ catch (Exception e){
+
+ Toast.makeText(MRTanordnen.this,"MRT failed", Toast.LENGTH_SHORT).show();
+
+ }
+ }
+ });
+
+
+
+ // View all button
+ vbuttoning.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- finish();
+ databaseHelper= new DatabaseHelper(MRTanordnen.this);
+ patientArrayAdapter= new ArrayAdapter<Akte>(MRTanordnen.this, android.R.layout.simple_list_item_1,databaseHelper.getEveryone());
+ vlists.setAdapter(patientArrayAdapter);
+
}
});
+
}
diff --git a/app/src/main/java/com/example/firstintent/PatientenSuche.java b/app/src/main/java/com/example/firstintent/PatientenSuche.java
index 594edc62db2d6f8e6005b558d036ba6c4aff1791..8ac60d51b03c21df3a1396e3e5c8e2e70e762c4d 100644
--- a/app/src/main/java/com/example/firstintent/PatientenSuche.java
+++ b/app/src/main/java/com/example/firstintent/PatientenSuche.java
@@ -59,7 +59,6 @@ public class PatientenSuche extends AppCompatActivity {
listings.setAdapter(patientArrayAdapter);
-
}
catch(Exception e){
Toast.makeText(PatientenSuche.this,"Error searching patient", Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/com/example/firstintent/Verwaltung.java b/app/src/main/java/com/example/firstintent/Verwaltung.java
index ef2ff96aee171fd778a52140f9ab57ffceab7f6c..0f5ee6f811e8981e89c231c310e07fbbe662bd49 100644
--- a/app/src/main/java/com/example/firstintent/Verwaltung.java
+++ b/app/src/main/java/com/example/firstintent/Verwaltung.java
@@ -34,9 +34,5 @@ public class Verwaltung extends AppCompatActivity {
startActivity(i);
}
- public void CapacityStatus(View view) {
- Intent i = new Intent(this, CapacityStatus.class);
- startActivity(i);
- }
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_image_24.xml b/app/src/main/res/drawable/ic_baseline_image_24.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d35859dd57d588907399377b4a8012a049d63dbd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_image_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_auftraege.xml b/app/src/main/res/layout/activity_auftraege.xml
index 2acef040013f85bbbece91b214e9c3e90ef9b0a1..0fcb971085e8ef7eb6483f50d45141ca02c223b1 100644
--- a/app/src/main/res/layout/activity_auftraege.xml
+++ b/app/src/main/res/layout/activity_auftraege.xml
@@ -8,11 +8,28 @@
<Button
android:id="@+id/button5"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginTop="297dp"
- android:text="close"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:text="View"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
+
+ <ListView
+ android:id="@+id/aufraegelist"
+ android:layout_width="409dp"
+ android:layout_height="571dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="32dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="8dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/button5" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_blutbild_anordnen.xml b/app/src/main/res/layout/activity_blutbild_anordnen.xml
index a1cf36256532f4c966bb5ba81d04e6baf960f5e4..6c9509eda137742be84bc3b13149c71350ad91c5 100644
--- a/app/src/main/res/layout/activity_blutbild_anordnen.xml
+++ b/app/src/main/res/layout/activity_blutbild_anordnen.xml
@@ -6,13 +6,61 @@
android:layout_height="match_parent"
tools:context=".BlutbildAnordnen">
+ <EditText
+ android:id="@+id/editTextTextPersonName3"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:ems="10"
+ android:hint="ID"
+ android:inputType="textPersonName"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <Switch
+ android:id="@+id/switch4"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="24dp"
+ android:text="Switch"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName3" />
+
+ <Button
+ android:id="@+id/button12"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="32dp"
+ android:layout_marginEnd="8dp"
+ android:text="ViewAll"
+ app:layout_constraintEnd_toStartOf="@+id/button13"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/switch4" />
+
<Button
android:id="@+id/button13"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="140dp"
- android:layout_marginTop="264dp"
- android:text="close"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="32dp"
+ android:layout_marginEnd="8dp"
+ android:text="anordnen"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/button12"
+ app:layout_constraintTop_toBottomOf="@+id/switch4" />
+
+ <ListView
+ android:id="@+id/anordnen1"
+ android:layout_width="409dp"
+ android:layout_height="545dp"
+ android:layout_marginTop="32dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toBottomOf="@+id/button12" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_capacity_status.xml b/app/src/main/res/layout/activity_capacity_status.xml
deleted file mode 100644
index e8506155c0e8495722d85fc454f72c5b381e898b..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/activity_capacity_status.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:context=".CapacityStatus">
-
- <Button
- android:id="@+id/buttonclose1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="308dp"
- android:text="close"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_mrtanordnen.xml b/app/src/main/res/layout/activity_mrtanordnen.xml
index e781ad625518e9d5b708f4917651f2fbdf2acdf3..eb0d01fc01e98e1521abf4798c4ae86c3a576b66 100644
--- a/app/src/main/res/layout/activity_mrtanordnen.xml
+++ b/app/src/main/res/layout/activity_mrtanordnen.xml
@@ -6,13 +6,64 @@
android:layout_height="match_parent"
tools:context=".MRTanordnen">
+ <EditText
+ android:id="@+id/editTextTextPersonName4"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:ems="10"
+ android:hint="ID"
+ android:inputType="textPersonName"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <Switch
+ android:id="@+id/switch5"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="32dp"
+ android:layout_marginEnd="8dp"
+ android:text="Switch"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName4" />
+
<Button
android:id="@+id/button14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="279dp"
- android:text="close"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="24dp"
+ android:layout_marginEnd="8dp"
+ android:text="Viewall"
+ app:layout_constraintEnd_toStartOf="@+id/button16"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/switch5" />
+
+ <Button
+ android:id="@+id/button16"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="24dp"
+ android:layout_marginEnd="8dp"
+ android:text="anordnen"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/button14"
+ app:layout_constraintTop_toBottomOf="@+id/switch5" />
+
+ <ListView
+ android:id="@+id/mrtlist"
+ android:layout_width="409dp"
+ android:layout_height="545dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="64dp"
+ android:layout_marginEnd="8dp"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toBottomOf="@+id/button14" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_mrterstellen.xml b/app/src/main/res/layout/activity_mrterstellen.xml
index ce485ffa530bc05d07ddbf760fe5f3bbd1f674ce..8931fa3209ba9e301ac12f39f6d0557e66041876 100644
--- a/app/src/main/res/layout/activity_mrterstellen.xml
+++ b/app/src/main/res/layout/activity_mrterstellen.xml
@@ -2,17 +2,38 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/constraintLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MRTErstellen">
- <Button
- android:id="@+id/button12"
+ <ImageView
+ android:id="@+id/imageView3"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ app:srcCompat="@drawable/ic_launcher_background"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:layout_editor_absoluteX="66dp"
+ tools:layout_editor_absoluteY="181dp" />
+ <com.google.android.material.floatingactionbutton.FloatingActionButton
+ android:id="@+id/SelectImage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="268dp"
- android:text="close"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+ android:src="@drawable/ic_baseline_image_24"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ android:layout_marginBottom="20dp"
+
+ />
+
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
diff --git a/app/src/main/res/layout/activity_verwaltung.xml b/app/src/main/res/layout/activity_verwaltung.xml
index 60461bc84ebf1231db6f5e7ee731dda556f387c0..bfa195d947e6cc8cf1cadd43d0f4cd683273e243 100644
--- a/app/src/main/res/layout/activity_verwaltung.xml
+++ b/app/src/main/res/layout/activity_verwaltung.xml
@@ -8,47 +8,39 @@
<Button
android:id="@+id/button8"
- android:layout_width="221dp"
+ android:layout_width="0dp"
android:layout_height="61dp"
- android:layout_marginStart="4dp"
- android:layout_marginTop="68dp"
+ android:layout_marginTop="100dp"
android:onClick="Patientaufnehmen"
android:text="Patientaufnehmen"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button10"
- android:layout_width="225dp"
+ android:layout_width="0dp"
android:layout_height="54dp"
- android:layout_marginStart="4dp"
- android:layout_marginTop="48dp"
+ android:layout_marginTop="100dp"
android:onClick="PatientEntlassen"
android:text="PatientEntlassen"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.532"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button8" />
<Button
android:id="@+id/button11"
- android:layout_width="238dp"
+ android:layout_width="0dp"
android:layout_height="56dp"
- android:layout_marginStart="4dp"
- android:layout_marginTop="28dp"
+ android:layout_marginTop="100dp"
android:onClick="PatientenVerlegen"
android:text="PatientenVerlegen"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/button10" />
-
- <Button
- android:id="@+id/button16"
- android:layout_width="236dp"
- android:layout_height="57dp"
- android:layout_marginStart="4dp"
- android:layout_marginBottom="152dp"
- android:onClick="CapacityStatus"
- android:text="KapazitätStatus"
app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.549"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/button11"
- app:layout_constraintVertical_bias="0.07" />
+ app:layout_constraintTop_toBottomOf="@+id/button10"
+ app:layout_constraintVertical_bias="0.0" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file