From 8e9ce260c2ca24528e6025874645d75a0c9e0222 Mon Sep 17 00:00:00 2001
From: StefanTodoran <stefan.alex4@gmail.com>
Date: Wed, 5 Apr 2023 15:42:07 -0700
Subject: [PATCH 01/50] improved password input (hides chars & view option)

---
 .gitignore                                   |  2 ++
 .idea/gradle.xml                             |  1 +
 .idea/misc.xml                               |  2 +-
 app/src/main/AndroidManifest.xml             |  1 -
 app/src/main/res/layout/fragment_account.xml | 23 +++++++++++++-------
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index aa724b7..23c29da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,14 @@
 *.iml
 .gradle
 /local.properties
+/.idea/.name
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+.idea/deploymentTargetDropDown.xml
 .DS_Store
 /build
 /captures
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2d7c21..a0de2a1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 63a4643..be4cb1d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -148,7 +148,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="Embedded JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 03cb862..18fa93b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,6 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index fa999c2..e097d7a 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -36,15 +36,22 @@
             android:padding="10dp"
             android:textSize="16sp" />
 
-        <EditText
-            android:id="@+id/password"
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:background="@drawable/text_input_bg"
-            android:hint="Password"
-            android:padding="10dp"
-            android:textSize="16sp" />
+            android:layout_height="match_parent"
+            android:textColorHint="#B9B8B8"
+            app:passwordToggleEnabled="true">
+            <EditText
+                android:id="@+id/password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:background="@drawable/text_input_bg"
+                android:hint="Password"
+                android:inputType="textPassword"
+                android:padding="10dp"
+                android:textSize="16sp" />
+        </com.google.android.material.textfield.TextInputLayout>
 
         <TextView
             android:id="@+id/error"

From 0e5154eccb48df200e24445a2b283f5fdd552e65 Mon Sep 17 00:00:00 2001
From: Navkiran <100175211+Navkiran23@users.noreply.github.com>
Date: Fri, 14 Apr 2023 17:56:40 -0700
Subject: [PATCH 02/50] Created an initial Multiple Choice List Component

---
 .../Fragments/MutipleChoiceComponent.java     | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 app/src/main/java/com/ug/air/alrite/Fragments/MutipleChoiceComponent.java

diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/MutipleChoiceComponent.java b/app/src/main/java/com/ug/air/alrite/Fragments/MutipleChoiceComponent.java
new file mode 100644
index 0000000..1cd7796
--- /dev/null
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/MutipleChoiceComponent.java
@@ -0,0 +1,61 @@
+package com.ug.air.alrite.Fragments;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * List of choices that the user will make
+ * Depending on the type of question the
+ * items added to the list will differ
+ * */
+
+public class MutipleChoiceComponent {
+    private Map<Integer, String> MultipleChoice;
+    private Map<Boolean, String> TrueOrFalse;
+
+    /**
+     * Constructor
+     * Creates a new, empty list
+     */
+    public MutipleChoiceComponent() {
+        this.MultipleChoice = new HashMap<>();
+        this.TrueOrFalse = new HashMap<>();
+    }
+
+    /**
+     * Add a new choice into the table
+     * Index of the list will be the choice number
+     * @param ChoiceName Value to provide into the list
+     * that corresponds to its value
+     * @param ChoiceValue Value which corresponds to the numbering
+     * of the choice within the Map
+    */
+    public void addBooleanValue(Boolean ChoiceValue, String ChoiceName) {
+            if(ChoiceName == null) {
+                throw new IllegalArgumentException("Need to have an input for the string");
+            }
+            if(ChoiceValue != true || ChoiceValue != false) {
+                throw new IllegalArgumentException("For a true or false value we need to have a" +
+                        "true or false choice answer");
+            }
+            this.TrueOrFalse.put(ChoiceValue, ChoiceName);
+    }
+
+    /**
+     * Add a new choice into the table
+     * Index of the list will be the choice number
+     * @param ChoiceName Value to provide into the list
+     * that corresponds to its value
+     * @param ChoiceNum Value which corresponds to the numbering
+     * of the choice within the Map
+     */
+    public void addMultipleChoiceValue(Integer ChoiceNum, String ChoiceName) {
+        if(ChoiceName == null) {
+            throw new IllegalArgumentException("Need to have an input for the string");
+        }
+        if(ChoiceNum == -1) {
+            throw new IllegalArgumentException("Cannot have choice number be negative");
+        }
+        this.MultipleChoice.put(ChoiceNum, ChoiceName);
+    }
+}

From 07b7b2734f57dbd2ac78aad493c81173275684a2 Mon Sep 17 00:00:00 2001
From: Navkiran <100175211+Navkiran23@users.noreply.github.com>
Date: Mon, 24 Apr 2023 14:28:13 -0700
Subject: [PATCH 03/50] File for page - Delete Later on

---
 MainActivity.kt   |  11 +++++
 activity_main.xml | 119 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)
 create mode 100644 MainActivity.kt
 create mode 100644 activity_main.xml

diff --git a/MainActivity.kt b/MainActivity.kt
new file mode 100644
index 0000000..a920395
--- /dev/null
+++ b/MainActivity.kt
@@ -0,0 +1,11 @@
+package com.example.pagecomponent
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+
+class MainActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+    }
+}
\ No newline at end of file
diff --git a/activity_main.xml b/activity_main.xml
new file mode 100644
index 0000000..c6a6fb5
--- /dev/null
+++ b/activity_main.xml
@@ -0,0 +1,119 @@
+<?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=".MainActivity">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/my_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="#378163"
+        android:elevation="4dp"
+        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        tools:ignore="MissingConstraints" />
+
+    <TextView
+        android:id="@+id/editTextTextPersonName"
+        android:layout_width="276dp"
+        android:layout_height="55dp"
+        android:ems="10"
+        android:inputType="textPersonName"
+        android:text="Insert the question you ask here"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.629"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.146" />
+
+    <RadioButton
+        android:id="@+id/radioButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="This would be question #1"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.135"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.225" />
+
+    <RadioButton
+        android:id="@+id/radioButton2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="This would be question #3"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.135"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.401" />
+
+    <RadioButton
+        android:id="@+id/radioButton3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="This would be question #4"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.135"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.486" />
+
+    <RadioButton
+        android:id="@+id/radioButton4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="This would be question #2"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.135"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.31" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Back"
+        android:background="#003865"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.142"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.941" />
+
+    <Button
+        android:id="@+id/button2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Next"
+        android:background="#378163"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.873"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.941" />
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Patient history"
+        android:textColor="@color/design_default_color_primary_variant"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.049"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.022" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 488ecb5857c5e12feee15698dfe3edba5d7546cb Mon Sep 17 00:00:00 2001
From: Navkiran <100175211+Navkiran23@users.noreply.github.com>
Date: Mon, 24 Apr 2023 15:03:20 -0700
Subject: [PATCH 04/50] Delete MainActivity.kt

---
 MainActivity.kt | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 MainActivity.kt

diff --git a/MainActivity.kt b/MainActivity.kt
deleted file mode 100644
index a920395..0000000
--- a/MainActivity.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.example.pagecomponent
-
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-
-class MainActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-    }
-}
\ No newline at end of file

From 2372f5042a9e913492b85fbc1700575019e9e9d5 Mon Sep 17 00:00:00 2001
From: Navkiran <100175211+Navkiran23@users.noreply.github.com>
Date: Mon, 24 Apr 2023 15:03:28 -0700
Subject: [PATCH 05/50] Delete activity_main.xml

---
 activity_main.xml | 119 ----------------------------------------------
 1 file changed, 119 deletions(-)
 delete mode 100644 activity_main.xml

diff --git a/activity_main.xml b/activity_main.xml
deleted file mode 100644
index c6a6fb5..0000000
--- a/activity_main.xml
+++ /dev/null
@@ -1,119 +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=".MainActivity">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/my_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="#378163"
-        android:elevation="4dp"
-        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-        tools:ignore="MissingConstraints" />
-
-    <TextView
-        android:id="@+id/editTextTextPersonName"
-        android:layout_width="276dp"
-        android:layout_height="55dp"
-        android:ems="10"
-        android:inputType="textPersonName"
-        android:text="Insert the question you ask here"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.629"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.146" />
-
-    <RadioButton
-        android:id="@+id/radioButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="This would be question #1"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.135"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.225" />
-
-    <RadioButton
-        android:id="@+id/radioButton2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="This would be question #3"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.135"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.401" />
-
-    <RadioButton
-        android:id="@+id/radioButton3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="This would be question #4"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.135"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.486" />
-
-    <RadioButton
-        android:id="@+id/radioButton4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="This would be question #2"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.135"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.31" />
-
-    <Button
-        android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Back"
-        android:background="#003865"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.142"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.941" />
-
-    <Button
-        android:id="@+id/button2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Next"
-        android:background="#378163"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.873"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.941" />
-
-    <TextView
-        android:id="@+id/textView2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Patient history"
-        android:textColor="@color/design_default_color_primary_variant"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.049"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.022" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 75fbc6cc5d8d6206a98814401cfbe635a28c8109 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Mon, 24 Apr 2023 15:59:53 -0700
Subject: [PATCH 06/50] Implemented the multiple choice fragment, plus a
 prototype json integration

---
 .../alrite/Activities/PatientActivity.java    | 161 ++++++++++++++++--
 .../Patient/MultipleChoiceFragment.java       | 157 +++++++++++++++++
 app/src/main/res/layout/multiple_choice.xml   | 119 +++++++++++++
 app/src/main/res/values/strings.xml           |   3 +
 4 files changed, 430 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
 create mode 100644 app/src/main/res/layout/multiple_choice.xml

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 8afe5da..359b6af 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -2,13 +2,12 @@
 
 import static com.ug.air.alrite.Activities.DiagnosisActivity.DATE_2;
 import static com.ug.air.alrite.Activities.DiagnosisActivity.DURATION_2;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.BRONCHODILATOR;
+import static com.ug.air.alrite.Fragments.Patient.Assess.FINAL_DIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DATE;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DURATION;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.FILENAME;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USERNAME;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.UUIDS;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.BRONC;
 import static com.ug.air.alrite.Fragments.Patient.Initials.CIN;
 import static com.ug.air.alrite.Fragments.Patient.Initials.INITIAL_DATE;
 import static com.ug.air.alrite.Fragments.Patient.Initials.PIN;
@@ -16,7 +15,10 @@
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.INITIAL_DATE_2;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.SECOND;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentResultListener;
 import androidx.fragment.app.FragmentTransaction;
 
 import android.app.Dialog;
@@ -27,21 +29,22 @@
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
 
-import com.ug.air.alrite.BuildConfig;
+import com.makeramen.roundedimageview.BuildConfig;
 import com.ug.air.alrite.Fragments.Patient.ActivePatients;
-import com.ug.air.alrite.Fragments.Patient.HIVStatus;
-import com.ug.air.alrite.Fragments.Patient.Initials;
+import com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment;
 import com.ug.air.alrite.Fragments.Patient.OtherPatients;
-import com.ug.air.alrite.Fragments.Patient.Wheezing;
 import com.ug.air.alrite.R;
 import com.ug.air.alrite.Utils.Credentials;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.File;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
@@ -49,7 +52,7 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-public class PatientActivity extends AppCompatActivity {
+public class PatientActivity extends AppCompatActivity implements MultipleChoiceFragment.onGetResultListener {
 
     public static final String SHARED_PREFS = "sharedPrefs";
     public static final String INCOMPLETE = "incomplete";
@@ -70,7 +73,12 @@ protected void onCreate(Bundle savedInstanceState) {
             frag = intent.getExtras().getInt("Fragment");
             FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
             if (frag == 1){
-                fragmentTransaction.add(R.id.fragment_container, new Initials());
+                // fragmentTransaction.add(R.id.fragment_container, new Initials());
+                try {
+                    implementEditableDecisionTree();
+                } catch (JSONException e) {
+                    throw new RuntimeException("JSONException in Patient: " + e);
+                }
             }else if (frag == 2){
                 fragmentTransaction.add(R.id.fragment_container, new ActivePatients());
             }else {
@@ -229,4 +237,137 @@ private void doLogic(String file) {
         intent = new Intent(PatientActivity.this, Dashboard.class);
         startActivity(intent);
     }
+
+    // TODO: ensure that the strings are not hard-coded in the future
+    private void implementEditableDecisionTree() throws JSONException {
+        pages = createTestingJson();
+        // This is just an array because it needs to be mutable: think of it as
+        // its own element
+        JSONObject nextPage = pages.getJSONObject(0);
+
+        // Continue looping through each page in sequence: depending on the component,
+        // inflate a new fragment for that component type
+        // If the next page is the final page, exit the loop
+        getNextPage(nextPage);
+    }
+
+    private JSONArray createTestingJson() throws JSONException {
+        JSONObject multi_choice = new JSONObject();
+        multi_choice.put("type", "multiple-choice");
+        multi_choice.put("question", "What is the date?");
+        multi_choice.put("choices", new JSONArray(new String[]{"yes", "no"}));
+        multi_choice.put("diagnoses", new JSONArray(new String[]{"very ill", "probably fine"}));
+        multi_choice.put("gotos", new JSONArray(new String[]{"final_diagnosis", "final_diagnosis"}));
+
+        JSONObject date_page = new JSONObject();
+        date_page.put("page_id", "date_page");
+        date_page.put("component", multi_choice);
+        date_page.put("final", true);
+
+        JSONObject final_diagnosis = new JSONObject();
+        final_diagnosis.put("page_id", "final_diagnosis");
+
+        JSONArray pages = new JSONArray();
+        pages.put(date_page);
+        pages.put(final_diagnosis);
+
+        return pages;
+    }
+
+    /**
+     * NOTE: THIS SHOULD ONLY BE USED FOR SINGLE-LAYER ARRAYS
+     *
+     * @param jsonArray
+     * @return
+     * @throws JSONException
+     */
+    private ArrayList<String> jsonArrayToList(JSONArray jsonArray) throws JSONException {
+        ArrayList<String> ret = new ArrayList<>();
+        for (int i = 0; i < jsonArray.length(); i++) {
+            ret.add(jsonArray.getString(i));
+        }
+        return ret;
+    }
+
+    /**
+     * This will add the given fragment to the back stack, and do a transaction
+     * which replaces the current fragment with the given fragment
+     *
+     * @param fragment the fragment to swap to
+     */
+    private void completeFragmentTransaction(Fragment fragment) {
+        // Begin the transaction
+        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+        // Replace the contents of the container with the new fragment
+        ft.replace(R.id.fragment_container, fragment);
+        // Complete the changes added above
+        ft.addToBackStack(null);
+        ft.commit();
+    }
+
+    // Full JSON infos to call getNextPage
+    JSONArray pages;
+
+    // Information gotten from JSON
+    String question;
+    ArrayList<String> choices;
+    ArrayList<String> diagnoses;
+    ArrayList<String> gotos;
+
+    private void getNextPage(JSONObject currNextPage) throws JSONException {
+        if (currNextPage.getString("page_id").equals("final_diagnosis")) {
+            // We're done! Let's exit out to the diagnosis page after finalizing our result
+            startActivity(new Intent(getApplicationContext(), DiagnosisActivity.class));
+            return;
+        }
+
+        JSONObject nextPageComponent = currNextPage.getJSONObject("component");
+
+        // Multiple choice option:
+        if (nextPageComponent.getString("type").equals("multiple-choice")) {
+            // Collect the important arguments from the component
+            question = nextPageComponent.getString("question");
+            choices = jsonArrayToList(nextPageComponent.getJSONArray("choices"));
+            diagnoses = jsonArrayToList(nextPageComponent.getJSONArray("diagnoses"));
+            gotos = jsonArrayToList(nextPageComponent.getJSONArray("gotos"));
+
+            // Get the new page's fragment, and set a listener for when the next button
+            // is clicked
+            MultipleChoiceFragment mc_fragment = MultipleChoiceFragment.newInstance(question, choices);
+
+            // Replace and commit the fragment
+            completeFragmentTransaction(mc_fragment);
+
+        } else {
+            throw new IllegalStateException("should never get here lol");
+        }
+    }
+
+    @Override
+    public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONException {
+        // Enter the result into the editor
+        editor.putString(question, diagnoses.get(choiceIndex));
+        editor.apply();
+
+        // Decide on the next page based on the result
+        String nextPageName = gotos.get(choiceIndex);
+        int pagesIdx = findIndexInPagesGivenPageId(nextPageName);
+        JSONObject nextPage = pages.getJSONObject(pagesIdx);
+        try {
+            getNextPage(nextPage);
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private int findIndexInPagesGivenPageId(String pageID) throws JSONException {
+        for (int i = 0; i < pages.length(); i++) {
+            JSONObject currPage = pages.getJSONObject(i);
+            String pageName = currPage.getString("page_id");
+            if (pageID.equals(pageName)) {
+                return i;
+            }
+        }
+        return -1;
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
new file mode 100644
index 0000000..ac74370
--- /dev/null
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
@@ -0,0 +1,157 @@
+package com.ug.air.alrite.Fragments.Patient;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.fragment.app.Fragment;
+
+import com.ug.air.alrite.R;
+
+import org.json.JSONException;
+
+import java.util.ArrayList;
+
+public class MultipleChoiceFragment extends Fragment {
+
+    public interface onGetResultListener {
+        public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONException;
+    }
+    onGetResultListener getResultListener;
+
+    public static final String SHARED_PREFS = "sharedPrefs";
+    public static final String QUESTION = "question";
+    public static final String CHOICES = "choices";
+    public static final String DEFAULT = "**default string**";
+    String previousResponse;
+    String question;
+    ArrayList<String> choices;
+    View view;
+    RadioGroup choiceGroup;
+    Button backButton, nextButton;
+    SharedPreferences sharedPreferences;
+    SharedPreferences.Editor editor;
+
+    /**
+     * This is where we do what we usually do in the onAttach section, except that
+     * we also add a listener for sending the result of the Multiple Choice up to
+     * the activity
+     *
+     * @param activity the PatientActivity that we're running this fragment on
+     */
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        try {
+            getResultListener = (onGetResultListener) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.toString() + " must implement onSomeEventListener");
+        }
+    }
+
+    /**
+     * This creates a new MultipleChoiceFragment with a separate constructor, so
+     * that we can retain the given information and return the fragment
+     *
+     * @param question the question at the top of the page
+     * @param choices the given choices for the user to choose from
+     * @return the fragment to be used in the future
+     */
+    public static MultipleChoiceFragment newInstance(String question, ArrayList<String> choices) {
+        MultipleChoiceFragment mfc = new MultipleChoiceFragment();
+        Bundle args = new Bundle();
+        args.putString(QUESTION, question);
+        args.putStringArrayList(CHOICES, choices);
+        mfc.setArguments(args);
+        return mfc;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Idk exactly what this does right now, but it sets up the view and the stored information
+        view = inflater.inflate(R.layout.multiple_choice, container, false);
+        sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+        editor = sharedPreferences.edit();
+
+        // Retrieve the information for the question/choices of the page
+        assert getArguments() != null;
+        question = getArguments().getString(QUESTION);
+        choices = getArguments().getStringArrayList(CHOICES);
+
+        // Then, set the information for each question/choice to line up with our givens
+        TextView questionDisplay = view.findViewById(R.id.mc_question);
+        questionDisplay.setText(question);
+        // TODO: create buttons in here, and then choose their ids more easily
+        RadioButton choice1 = view.findViewById(R.id.choice1);
+        choice1.setText(choices.get(0));
+        RadioButton choice2 = view.findViewById(R.id.choice2);
+        choice2.setText(choices.get(1));
+
+        // All of the buttons/things that we'll need to reference
+        nextButton = view.findViewById(R.id.next);
+        backButton = view.findViewById(R.id.back);
+        choiceGroup = view.findViewById(R.id.mc_options);
+
+        // If we've already seen this page, reload our past choices
+        loadSelectedChoiceIfAlreadySelected();
+
+        // This is a listener for, if the next button is pressed, whether we can go
+        // on or not, and what information should be sent up
+        nextButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                // First, we check that at least one option was selected
+                // if not, then we create a popup which tells the user to select at
+                // least one option
+                int chosenOption = choiceGroup.getCheckedRadioButtonId();
+                if (chosenOption == -1) {
+                    Toast.makeText(getActivity(), "Please select at least one of the options", Toast.LENGTH_SHORT).show();
+                    return;
+                }
+
+                // Get the index of the choice in the set of buttons: relies on the
+                // buttons having names with their index at the end
+                String chosenOptionId = v.getResources().getResourceName(chosenOption);
+                int index = Integer.parseInt(chosenOptionId.substring(chosenOptionId.length() - 1));
+
+                // Send the result back up to main: a listener there will trigger
+                // and start the next fragment sequence up
+                try {
+                    getResultListener.getResultFromMultipleChoiceFragment(index);
+                } catch (JSONException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+
+        return view;
+    }
+
+    /**
+     * In the case that we're creating this view again after we've already stepped
+     * through this option, pre-select the choice that we already made, so that we
+     * don't get inconsistent answers from this
+     */
+    private void loadSelectedChoiceIfAlreadySelected() {
+        SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+        previousResponse = sharedPreferences.getString(question, DEFAULT);
+
+        for (int i = 0; i < choices.size(); i++) {
+            if (previousResponse.equals(choices.get(i))) {
+                RadioGroup allChoices = view.findViewById(R.id.mc_options);
+                allChoices.check(i);
+                return;
+            }
+        }
+    }
+}
diff --git a/app/src/main/res/layout/multiple_choice.xml b/app/src/main/res/layout/multiple_choice.xml
new file mode 100644
index 0000000..7380709
--- /dev/null
+++ b/app/src/main/res/layout/multiple_choice.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".Fragments.Patient.Fever">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="?actionBarSize"
+        android:background="@color/green_main"
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp"
+        android:orientation="vertical"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:text="Patient's Examination"
+            android:textColor="@color/white"
+            android:textSize="18sp"/>
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/buttons"
+            android:layout_marginEnd="0dp"
+            android:layout_marginBottom="10dp"
+            android:fadeScrollbars="true"
+            android:padding="10dp"
+            android:scrollbars="none">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/mc_question"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="25dp"
+                    android:gravity="center_horizontal"
+                    android:text="@string/mc_question"
+                    android:textColor="@color/black"
+                    android:textSize="18sp" />
+
+                <RadioGroup
+                    android:id="@+id/mc_options"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp">
+
+                    <RadioButton
+                        android:id="@+id/choice1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:buttonTint="@color/black"
+                        android:text="@string/choice1"
+                        android:textSize="18sp" />
+
+                    <RadioButton
+                        android:id="@+id/choice2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:buttonTint="@color/black"
+                        android:text="@string/choice2"
+                        android:textSize="18sp" />
+
+                </RadioGroup>
+
+            </LinearLayout>
+
+        </ScrollView>
+
+        <RelativeLayout
+            android:id="@+id/buttons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true">
+
+            <Button
+                android:id="@+id/back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/bg_button"
+                android:text="Back"
+                android:textColor="@color/white" />
+
+            <Button
+                android:id="@+id/next"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_margin="10dp"
+                android:background="@drawable/primary_button"
+                android:text="next"
+                android:textColor="@color/white"/>
+
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3219f2b..4895e66 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -268,4 +268,7 @@
     <string name="st2">A noise on breathing in due to obstruction of the upper airway</string>
     <string name="st4">Stridor is a loud whistling sound made when taking in a breath. It is a sign of upper airway blockage and must be treated right away to prevent the airway from completely closing.</string>
 
+    <string name="mc_question">%s</string>
+    <string name="choice1">%s</string>
+    <string name="choice2">%s</string>
 </resources>
\ No newline at end of file

From f863b19946a157b7b40db3dc07595dbb1752e933 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Tue, 25 Apr 2023 20:17:02 -0700
Subject: [PATCH 07/50] Example file for the json

---
 .../com/ug/air/alrite/Activities/example.json | 92 +++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 app/src/main/java/com/ug/air/alrite/Activities/example.json

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/example.json b/app/src/main/java/com/ug/air/alrite/Activities/example.json
new file mode 100644
index 0000000..5a677ac
--- /dev/null
+++ b/app/src/main/java/com/ug/air/alrite/Activities/example.json
@@ -0,0 +1,92 @@
+{
+  "pages":
+  [
+    {
+      "pageID": "page_1",
+      "pageTitle": "smoke_tobacco",
+      "content":
+      [
+        {
+          "type": "multiple-choice",
+          "text": "Does anyone in the child's home smoke tobacco?",
+          "choices":
+          [
+            {
+              "text": "Yes",
+              "link": "page_2",
+              "valueID": "yes"
+            },
+            {
+              "text": "No",
+              "link": "page_3",
+              "valueID": "no"
+            },
+            {
+              "text": "Not sure",
+              "link": "page_3",
+              "valueID": "unsure"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "pageID": "page_2",
+      "pageTitle": "kerosene",
+      "content":
+      [
+        {
+          "type": "multiple-choice",
+          "text": "Does any of the family members use kerosene, charcoal, or other biomass in the home?",
+          "choices":
+          [
+            {
+              "text": "Yes",
+              "link": "final_page",
+              "valueID": "yes"
+            },
+            {
+              "text": "No",
+              "link": "final_page",
+              "valueID": "no"
+            },
+            {
+              "text": "Not sure",
+              "link": "final_page",
+              "valueID": "unsure"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "pageID": "page_3",
+      "pageTitle": "allergies",
+      "content":
+      [
+        {
+          "type": "multiple-choice",
+          "text": "Has the child’s parents or siblings had similar breathing problems, other diseases with breathing problems or allergies?",
+          "choices":
+          [
+            {
+              "text": "Yes",
+              "link": "final_page",
+              "valueID": "yes"
+            },
+            {
+              "text": "No",
+              "link": "final_page",
+              "valueID": "no"
+            },
+            {
+              "text": "Not sure",
+              "link": "final_page",
+              "valueID": "unsure"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file

From c280b233c4e597d66deff6b5484a1c9de4b30185 Mon Sep 17 00:00:00 2001
From: Navkiran <nav1123@icloud.com>
Date: Tue, 25 Apr 2023 20:26:29 -0700
Subject: [PATCH 08/50] Added hardcoded radiobuttons

---
 .idea/gradle.xml                                          | 2 +-
 .idea/misc.xml                                            | 2 +-
 .../alrite/Fragments/Patient/MultipleChoiceFragment.java  | 5 +++++
 app/src/main/res/layout/multiple_choice.xml               | 8 ++++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a0de2a1..7b46144 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index be4cb1d..b407079 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -148,7 +148,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="Embedded JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
index ac74370..99c4ad7 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
@@ -91,11 +91,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         // Then, set the information for each question/choice to line up with our givens
         TextView questionDisplay = view.findViewById(R.id.mc_question);
         questionDisplay.setText(question);
+
         // TODO: create buttons in here, and then choose their ids more easily
+        // Currently storing 3 radio buttons will update later
+        // Set for demo might add more or create optimized loop
         RadioButton choice1 = view.findViewById(R.id.choice1);
         choice1.setText(choices.get(0));
         RadioButton choice2 = view.findViewById(R.id.choice2);
         choice2.setText(choices.get(1));
+        RadioButton choice3 = view.findViewById(R.id.choice3);
+        choice3.setText(choices.get(2));
 
         // All of the buttons/things that we'll need to reference
         nextButton = view.findViewById(R.id.next);
diff --git a/app/src/main/res/layout/multiple_choice.xml b/app/src/main/res/layout/multiple_choice.xml
index 7380709..8731694 100644
--- a/app/src/main/res/layout/multiple_choice.xml
+++ b/app/src/main/res/layout/multiple_choice.xml
@@ -77,6 +77,14 @@
                         android:buttonTint="@color/black"
                         android:text="@string/choice2"
                         android:textSize="18sp" />
+                    <RadioButton
+                        android:id="@+id/choice3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:buttonTint="@color/black"
+                        android:text="@string/choice2"
+                        android:textSize="18sp" />
 
                 </RadioGroup>
 

From 2cd5d883cf0619a4f1322a4fc76440fcf6c14562 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Tue, 25 Apr 2023 20:43:44 -0700
Subject: [PATCH 09/50] Code DOES NOT WORK but we're trying...

---
 .../alrite/Activities/PatientActivity.java    | 100 +++++++++---------
 .../Patient/MultipleChoiceFragment.java       |  22 +++-
 app/src/main/res/layout/multiple_choice.xml   |   2 +-
 3 files changed, 72 insertions(+), 52 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 359b6af..7937c34 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -2,7 +2,6 @@
 
 import static com.ug.air.alrite.Activities.DiagnosisActivity.DATE_2;
 import static com.ug.air.alrite.Activities.DiagnosisActivity.DURATION_2;
-import static com.ug.air.alrite.Fragments.Patient.Assess.FINAL_DIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DATE;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DURATION;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.FILENAME;
@@ -15,10 +14,8 @@
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.INITIAL_DATE_2;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.SECOND;
 
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentResultListener;
 import androidx.fragment.app.FragmentTransaction;
 
 import android.app.Dialog;
@@ -30,6 +27,8 @@
 import android.view.View;
 import android.widget.Button;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
 import com.makeramen.roundedimageview.BuildConfig;
 import com.ug.air.alrite.Fragments.Patient.ActivePatients;
 import com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment;
@@ -41,7 +40,14 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -49,6 +55,7 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -240,7 +247,7 @@ private void doLogic(String file) {
 
     // TODO: ensure that the strings are not hard-coded in the future
     private void implementEditableDecisionTree() throws JSONException {
-        pages = createTestingJson();
+        pages = Objects.requireNonNull(createTestingJson()).getJSONArray("pages");
         // This is just an array because it needs to be mutable: think of it as
         // its own element
         JSONObject nextPage = pages.getJSONObject(0);
@@ -251,27 +258,17 @@ private void implementEditableDecisionTree() throws JSONException {
         getNextPage(nextPage);
     }
 
-    private JSONArray createTestingJson() throws JSONException {
-        JSONObject multi_choice = new JSONObject();
-        multi_choice.put("type", "multiple-choice");
-        multi_choice.put("question", "What is the date?");
-        multi_choice.put("choices", new JSONArray(new String[]{"yes", "no"}));
-        multi_choice.put("diagnoses", new JSONArray(new String[]{"very ill", "probably fine"}));
-        multi_choice.put("gotos", new JSONArray(new String[]{"final_diagnosis", "final_diagnosis"}));
-
-        JSONObject date_page = new JSONObject();
-        date_page.put("page_id", "date_page");
-        date_page.put("component", multi_choice);
-        date_page.put("final", true);
-
-        JSONObject final_diagnosis = new JSONObject();
-        final_diagnosis.put("page_id", "final_diagnosis");
+    private JSONObject createTestingJson() throws JSONException {
+        try {
+            // Get the file that has the json in it
+            Object o = new JsonParser().parse(new FileReader("example.json"));
+            JSONObject jsonStr = (JSONObject) o;
 
-        JSONArray pages = new JSONArray();
-        pages.put(date_page);
-        pages.put(final_diagnosis);
+            return jsonStr;
 
-        return pages;
+        } catch(FileNotFoundException e) {
+            throw new RuntimeException("issue with finding the json file: " + e);
+        }
     }
 
     /**
@@ -281,10 +278,10 @@ private JSONArray createTestingJson() throws JSONException {
      * @return
      * @throws JSONException
      */
-    private ArrayList<String> jsonArrayToList(JSONArray jsonArray) throws JSONException {
-        ArrayList<String> ret = new ArrayList<>();
+    private ArrayList<JSONObject> JSONArrayToListOfJSONObjects(JSONArray jsonArray) throws JSONException {
+        ArrayList<JSONObject> ret = new ArrayList<>();
         for (int i = 0; i < jsonArray.length(); i++) {
-            ret.add(jsonArray.getString(i));
+            ret.add(jsonArray.getJSONObject(i));
         }
         return ret;
     }
@@ -310,47 +307,52 @@ private void completeFragmentTransaction(Fragment fragment) {
 
     // Information gotten from JSON
     String question;
-    ArrayList<String> choices;
-    ArrayList<String> diagnoses;
-    ArrayList<String> gotos;
+    ArrayList<JSONObject> choices;
 
     private void getNextPage(JSONObject currNextPage) throws JSONException {
-        if (currNextPage.getString("page_id").equals("final_diagnosis")) {
+        if (currNextPage.getString("pageID").equals("final_page")) {
             // We're done! Let's exit out to the diagnosis page after finalizing our result
             startActivity(new Intent(getApplicationContext(), DiagnosisActivity.class));
             return;
         }
 
-        JSONObject nextPageComponent = currNextPage.getJSONObject("component");
+        // Get all of the items that should be displayed on the page
+        // TODO: we're not accounting for multiple things on a page, fix in the future
+        JSONArray nextPageComponents = currNextPage.getJSONArray("content");
 
-        // Multiple choice option:
-        if (nextPageComponent.getString("type").equals("multiple-choice")) {
-            // Collect the important arguments from the component
-            question = nextPageComponent.getString("question");
-            choices = jsonArrayToList(nextPageComponent.getJSONArray("choices"));
-            diagnoses = jsonArrayToList(nextPageComponent.getJSONArray("diagnoses"));
-            gotos = jsonArrayToList(nextPageComponent.getJSONArray("gotos"));
+        for (int i = 0; i < nextPageComponents.length(); i++) {
+            JSONObject nextPageComponent = nextPageComponents.getJSONObject(i);
 
-            // Get the new page's fragment, and set a listener for when the next button
-            // is clicked
-            MultipleChoiceFragment mc_fragment = MultipleChoiceFragment.newInstance(question, choices);
+            // Multiple choice option:
+            if (nextPageComponent.getString("type").equals("multiple-choice")) {
+                // Collect the important arguments from the component
+                question = nextPageComponent.getString("text");
+                choices = JSONArrayToListOfJSONObjects(nextPageComponent.getJSONArray("choices"));
 
-            // Replace and commit the fragment
-            completeFragmentTransaction(mc_fragment);
+                // Get the new page's fragment, and set a listener for when the next button
+                // is clicked
+                MultipleChoiceFragment mc_fragment = MultipleChoiceFragment.newInstance(question, choices);
 
-        } else {
-            throw new IllegalStateException("should never get here lol");
+                // Replace and commit the fragment
+                completeFragmentTransaction(mc_fragment);
+
+            } else {
+                throw new IllegalStateException("should never get here lol");
+            }
         }
     }
 
     @Override
     public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONException {
-        // Enter the result into the editor
-        editor.putString(question, diagnoses.get(choiceIndex));
+        String diagnosis = choices.get(choiceIndex - 1).getString("valueID");
+        String nextPageName = choices.get(choiceIndex - 1).getString("link");
+
+
+        // Enter the diagnosis into the editor
+        editor.putString(question, diagnosis);
         editor.apply();
 
         // Decide on the next page based on the result
-        String nextPageName = gotos.get(choiceIndex);
         int pagesIdx = findIndexInPagesGivenPageId(nextPageName);
         JSONObject nextPage = pages.getJSONObject(pagesIdx);
         try {
@@ -363,7 +365,7 @@ public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONExce
     private int findIndexInPagesGivenPageId(String pageID) throws JSONException {
         for (int i = 0; i < pages.length(); i++) {
             JSONObject currPage = pages.getJSONObject(i);
-            String pageName = currPage.getString("page_id");
+            String pageName = currPage.getString("pageID");
             if (pageID.equals(pageName)) {
                 return i;
             }
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
index 99c4ad7..b12b4c0 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
@@ -18,6 +18,7 @@
 import com.ug.air.alrite.R;
 
 import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.util.ArrayList;
 
@@ -66,11 +67,12 @@ public void onAttach(Activity activity) {
      * @param choices the given choices for the user to choose from
      * @return the fragment to be used in the future
      */
-    public static MultipleChoiceFragment newInstance(String question, ArrayList<String> choices) {
+    public static MultipleChoiceFragment newInstance(String question, ArrayList<JSONObject> choices) throws JSONException {
         MultipleChoiceFragment mfc = new MultipleChoiceFragment();
         Bundle args = new Bundle();
         args.putString(QUESTION, question);
-        args.putStringArrayList(CHOICES, choices);
+        ArrayList<String> text_choices = getTextFromChoices(choices);
+        args.putStringArrayList(CHOICES, text_choices);
         mfc.setArguments(args);
         return mfc;
     }
@@ -159,4 +161,20 @@ private void loadSelectedChoiceIfAlreadySelected() {
             }
         }
     }
+
+    /**
+     * This is used specifically for newInstance, and relies on the JSON being set
+     * up as in the "example.json" file. This will extract all of the text answers
+     * from the given choices list.
+     *
+     * @param list is an ArrayList of JSONObjects (choices)
+     * @return the list of strings of text for each choice, in order
+     */
+    private static ArrayList<String> getTextFromChoices(ArrayList<JSONObject> list) throws JSONException {
+        ArrayList<String> ret = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            ret.add(list.get(i).getString("text"));
+        }
+        return ret;
+    }
 }
diff --git a/app/src/main/res/layout/multiple_choice.xml b/app/src/main/res/layout/multiple_choice.xml
index 8731694..e7556ba 100644
--- a/app/src/main/res/layout/multiple_choice.xml
+++ b/app/src/main/res/layout/multiple_choice.xml
@@ -83,7 +83,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="10dp"
                         android:buttonTint="@color/black"
-                        android:text="@string/choice2"
+                        android:text="%s"
                         android:textSize="18sp" />
 
                 </RadioGroup>

From 1664591d98a986de879114372490651395bb404a Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Tue, 25 Apr 2023 21:33:24 -0700
Subject: [PATCH 10/50] Code "works" but theoretically this won't be in the
 final product so it won't matter...

---
 .../alrite/Activities/PatientActivity.java    | 118 ++++++++++++++++--
 1 file changed, 106 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 7937c34..87fb3bc 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -48,6 +48,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.file.Path;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -258,18 +260,6 @@ private void implementEditableDecisionTree() throws JSONException {
         getNextPage(nextPage);
     }
 
-    private JSONObject createTestingJson() throws JSONException {
-        try {
-            // Get the file that has the json in it
-            Object o = new JsonParser().parse(new FileReader("example.json"));
-            JSONObject jsonStr = (JSONObject) o;
-
-            return jsonStr;
-
-        } catch(FileNotFoundException e) {
-            throw new RuntimeException("issue with finding the json file: " + e);
-        }
-    }
 
     /**
      * NOTE: THIS SHOULD ONLY BE USED FOR SINGLE-LAYER ARRAYS
@@ -372,4 +362,108 @@ private int findIndexInPagesGivenPageId(String pageID) throws JSONException {
         }
         return -1;
     }
+
+    private JSONObject createTestingJson() throws JSONException {
+
+        // Get the file that has the json in it
+//            String name1 = getFilesDir().getAbsolutePath();
+//            String name =  getApplicationContext().getApplicationInfo().dataDir + "/Activities/example.json";
+//
+//            Object o = new JsonParser().parse(new FileReader(name));
+//            JSONObject jsonStr = (JSONObject) o;
+
+        JSONObject fin = new JSONObject("{\n" +
+                "  \"pages\":\n" +
+                "  [\n" +
+                "    {\n" +
+                "      \"pageID\": \"page_1\",\n" +
+                "      \"pageTitle\": \"smoke_tobacco\",\n" +
+                "      \"content\":\n" +
+                "      [\n" +
+                "        {\n" +
+                "          \"type\": \"multiple-choice\",\n" +
+                "          \"text\": \"Does anyone in the child's home smoke tobacco?\",\n" +
+                "          \"choices\":\n" +
+                "          [\n" +
+                "            {\n" +
+                "              \"text\": \"Yes\",\n" +
+                "              \"link\": \"page_2\",\n" +
+                "              \"valueID\": \"yes\"\n" +
+                "            },\n" +
+                "            {\n" +
+                "              \"text\": \"No\",\n" +
+                "              \"link\": \"page_3\",\n" +
+                "              \"valueID\": \"no\"\n" +
+                "            },\n" +
+                "            {\n" +
+                "              \"text\": \"Not sure\",\n" +
+                "              \"link\": \"page_3\",\n" +
+                "              \"valueID\": \"unsure\"\n" +
+                "            }\n" +
+                "          ]\n" +
+                "        }\n" +
+                "      ]\n" +
+                "    },\n" +
+                "    {\n" +
+                "      \"pageID\": \"page_2\",\n" +
+                "      \"pageTitle\": \"kerosene\",\n" +
+                "      \"content\":\n" +
+                "      [\n" +
+                "        {\n" +
+                "          \"type\": \"multiple-choice\",\n" +
+                "          \"text\": \"Does any of the family members use kerosene, charcoal, or other biomass in the home?\",\n" +
+                "          \"choices\":\n" +
+                "          [\n" +
+                "            {\n" +
+                "              \"text\": \"Yes\",\n" +
+                "              \"link\": \"final_page\",\n" +
+                "              \"valueID\": \"yes\"\n" +
+                "            },\n" +
+                "            {\n" +
+                "              \"text\": \"No\",\n" +
+                "              \"link\": \"final_page\",\n" +
+                "              \"valueID\": \"no\"\n" +
+                "            },\n" +
+                "            {\n" +
+                "              \"text\": \"Not sure\",\n" +
+                "              \"link\": \"final_page\",\n" +
+                "              \"valueID\": \"unsure\"\n" +
+                "            }\n" +
+                "          ]\n" +
+                "        }\n" +
+                "      ]\n" +
+                "    },\n" +
+                "    {\n" +
+                "      \"pageID\": \"page_3\",\n" +
+                "      \"pageTitle\": \"allergies\",\n" +
+                "      \"content\":\n" +
+                "      [\n" +
+                "        {\n" +
+                "          \"type\": \"multiple-choice\",\n" +
+                "          \"text\": \"Has the child’s parents or siblings had similar breathing problems, other diseases with breathing problems or allergies?\",\n" +
+                "          \"choices\":\n" +
+                "          [\n" +
+                "            {\n" +
+                "              \"text\": \"Yes\",\n" +
+                "              \"link\": \"final_page\",\n" +
+                "              \"valueID\": \"yes\"\n" +
+                "            },\n" +
+                "            {\n" +
+                "              \"text\": \"No\",\n" +
+                "              \"link\": \"final_page\",\n" +
+                "              \"valueID\": \"no\"\n" +
+                "            },\n" +
+                "            {\n" +
+                "              \"text\": \"Not sure\",\n" +
+                "              \"link\": \"final_page\",\n" +
+                "              \"valueID\": \"unsure\"\n" +
+                "            }\n" +
+                "          ]\n" +
+                "        }\n" +
+                "      ]\n" +
+                "    }\n" +
+                "  ]\n" +
+                "}");
+        return fin;
+    }
 }
\ No newline at end of file

From 041abf610519b0bc23f065d31c9c12d5541d32c4 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Wed, 3 May 2023 13:56:58 -0700
Subject: [PATCH 11/50] Updated MultipleChoiceFragment with back button

---
 .../alrite/Activities/PatientActivity.java    | 101 ++++++++++++++----
 .../Patient/MultipleChoiceFragment.java       |  14 ++-
 app/src/main/res/layout/multiple_choice.xml   |   1 +
 3 files changed, 93 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 87fb3bc..6018960 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -22,6 +22,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -30,6 +31,9 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import com.makeramen.roundedimageview.BuildConfig;
+import com.ug.air.alrite.APIs.ApiClient;
+import com.ug.air.alrite.APIs.DecisionTreeJSON;
+import com.ug.air.alrite.APIs.JsonPlaceHolder;
 import com.ug.air.alrite.Fragments.Patient.ActivePatients;
 import com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment;
 import com.ug.air.alrite.Fragments.Patient.OtherPatients;
@@ -61,6 +65,13 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import retrofit2.Call;
+import retrofit2.Retrofit;
+
 public class PatientActivity extends AppCompatActivity implements MultipleChoiceFragment.onGetResultListener {
 
     public static final String SHARED_PREFS = "sharedPrefs";
@@ -85,7 +96,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 // fragmentTransaction.add(R.id.fragment_container, new Initials());
                 try {
                     implementEditableDecisionTree();
-                } catch (JSONException e) {
+                } catch (JSONException | IOException e) {
                     throw new RuntimeException("JSONException in Patient: " + e);
                 }
             }else if (frag == 2){
@@ -248,19 +259,26 @@ private void doLogic(String file) {
     }
 
     // TODO: ensure that the strings are not hard-coded in the future
-    private void implementEditableDecisionTree() throws JSONException {
+    private void implementEditableDecisionTree() throws JSONException, IOException {
+//        DecisionTreeJSON json = ApiClient.getClient(ApiClient.TEMP_SERV_URL)
+//                                    .create(DecisionTreeJSON.class);
+//        Call<String> call = DecisionTreeJSON.getJson();
+//        System.out.println(json);
+
+        backstack = new ArrayList<>();
         pages = Objects.requireNonNull(createTestingJson()).getJSONArray("pages");
         // This is just an array because it needs to be mutable: think of it as
         // its own element
         JSONObject nextPage = pages.getJSONObject(0);
 
+        // Handling the intent
+
         // Continue looping through each page in sequence: depending on the component,
         // inflate a new fragment for that component type
         // If the next page is the final page, exit the loop
         getNextPage(nextPage);
     }
 
-
     /**
      * NOTE: THIS SHOULD ONLY BE USED FOR SINGLE-LAYER ARRAYS
      *
@@ -298,50 +316,76 @@ private void completeFragmentTransaction(Fragment fragment) {
     // Information gotten from JSON
     String question;
     ArrayList<JSONObject> choices;
+    ArrayList<String> backstack;
 
     private void getNextPage(JSONObject currNextPage) throws JSONException {
-        if (currNextPage.getString("pageID").equals("final_page")) {
-            // We're done! Let's exit out to the diagnosis page after finalizing our result
-            startActivity(new Intent(getApplicationContext(), DiagnosisActivity.class));
-            return;
-        }
-
         // Get all of the items that should be displayed on the page
         // TODO: we're not accounting for multiple things on a page, fix in the future
         JSONArray nextPageComponents = currNextPage.getJSONArray("content");
 
+        // Add the new page to the backstack, if it's not already there somewhere
+        if (!backstack.contains(currNextPage.getString("pageID"))) {
+            backstack.add(currNextPage.getString("pageID"));
+        }
+
         for (int i = 0; i < nextPageComponents.length(); i++) {
             JSONObject nextPageComponent = nextPageComponents.getJSONObject(i);
 
             // Multiple choice option:
             if (nextPageComponent.getString("type").equals("multiple-choice")) {
-                // Collect the important arguments from the component
-                question = nextPageComponent.getString("text");
-                choices = JSONArrayToListOfJSONObjects(nextPageComponent.getJSONArray("choices"));
-
-                // Get the new page's fragment, and set a listener for when the next button
-                // is clicked
-                MultipleChoiceFragment mc_fragment = MultipleChoiceFragment.newInstance(question, choices);
-
-                // Replace and commit the fragment
-                completeFragmentTransaction(mc_fragment);
-
+                createMultipleChoiceFragment(nextPageComponent);
             } else {
                 throw new IllegalStateException("should never get here lol");
             }
         }
     }
 
+    /**
+     * Start the Diagnosis activity that directly follows from this one, and exit
+     * the activity.
+     */
+    private void exitActivity() {
+        startActivity(new Intent(PatientActivity.this, DiagnosisActivity.class));
+        this.finish();
+    }
+
+    private void createMultipleChoiceFragment(JSONObject page) throws JSONException {
+        // Collect the important arguments from the component
+        question = page.getString("text");
+        choices = JSONArrayToListOfJSONObjects(page.getJSONArray("choices"));
+
+        // Get the new page's fragment, and set a listener for when the next button
+        // is clicked
+        MultipleChoiceFragment mc_fragment = MultipleChoiceFragment.newInstance(question, choices);
+
+        // Replace and commit the fragment
+        completeFragmentTransaction(mc_fragment);
+    }
+
+    /**
+     * Listener for clicking the next button: we can move to the correct next
+     * page, as given by the user's sent JSON
+     *
+     * @param choiceIndex the radiobutton choice that the user picked
+     * @throws JSONException because we use json objects
+     */
     @Override
     public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONException {
-        String diagnosis = choices.get(choiceIndex - 1).getString("valueID");
+        String diagnosis = choices.get(choiceIndex - 1).getString("text");
         String nextPageName = choices.get(choiceIndex - 1).getString("link");
-
+        System.out.println("NEXT PAGE NAME:" + nextPageName);
 
         // Enter the diagnosis into the editor
         editor.putString(question, diagnosis);
         editor.apply();
 
+        // If the next page would be the final page, then the assessment is over!
+        // So, start up the diagnosis activity
+        if (nextPageName.equals("final_page")) {
+            exitActivity();
+            return;
+        }
+
         // Decide on the next page based on the result
         int pagesIdx = findIndexInPagesGivenPageId(nextPageName);
         JSONObject nextPage = pages.getJSONObject(pagesIdx);
@@ -352,6 +396,19 @@ public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONExce
         }
     }
 
+    @Override
+    public void getLastPage() throws JSONException {
+        // TODO: exit to main activity, if it's the first page
+
+        // Get the last page JSON object that we put on to the backstack
+        backstack.remove(backstack.size() - 1);
+        String backPageName = backstack.get(backstack.size() - 1);
+        int pagesIndex = findIndexInPagesGivenPageId(backPageName);
+        JSONObject lastPage = pages.getJSONObject(pagesIndex);
+
+        getNextPage(lastPage);
+    }
+
     private int findIndexInPagesGivenPageId(String pageID) throws JSONException {
         for (int i = 0; i < pages.length(); i++) {
             JSONObject currPage = pages.getJSONObject(i);
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
index b12b4c0..77596d8 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
@@ -25,7 +25,8 @@
 public class MultipleChoiceFragment extends Fragment {
 
     public interface onGetResultListener {
-        public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONException;
+        void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONException;
+        void getLastPage() throws JSONException;
     }
     onGetResultListener getResultListener;
 
@@ -141,6 +142,17 @@ public void onClick(View v) {
             }
         });
 
+        backButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                try {
+                    getResultListener.getLastPage();
+                } catch (JSONException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+
         return view;
     }
 
diff --git a/app/src/main/res/layout/multiple_choice.xml b/app/src/main/res/layout/multiple_choice.xml
index e7556ba..0d87f53 100644
--- a/app/src/main/res/layout/multiple_choice.xml
+++ b/app/src/main/res/layout/multiple_choice.xml
@@ -77,6 +77,7 @@
                         android:buttonTint="@color/black"
                         android:text="@string/choice2"
                         android:textSize="18sp" />
+
                     <RadioButton
                         android:id="@+id/choice3"
                         android:layout_width="wrap_content"

From eb96640679224f1d80a8db724a442cdaa01b79cb Mon Sep 17 00:00:00 2001
From: Navkiran <nav1123@icloud.com>
Date: Wed, 3 May 2023 13:57:43 -0700
Subject: [PATCH 12/50] Initial code for the text component

---
 .../alrite/Activities/TextInputExample.json   |  92 ++++++
 .../Fragments/MutipleChoiceComponent.java     |  61 ----
 .../Fragments/Patient/TextInputFragment.java  | 282 ++++++++++++++++++
 app/src/main/res/layout/text_input.xml        | 151 ++++++++++
 app/src/main/res/values/strings.xml           |  10 +
 5 files changed, 535 insertions(+), 61 deletions(-)
 create mode 100644 app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
 delete mode 100644 app/src/main/java/com/ug/air/alrite/Fragments/MutipleChoiceComponent.java
 create mode 100644 app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
 create mode 100644 app/src/main/res/layout/text_input.xml

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json b/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
new file mode 100644
index 0000000..4401946
--- /dev/null
+++ b/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
@@ -0,0 +1,92 @@
+{
+  "pages":
+  [
+    {
+      "pageID": "page_1",
+      "pageTitle": "Text",
+      "content":
+      [
+        {
+          "type": "multiple-choice",
+          "text": "Does anyone in the child's home smoke tobacco?",
+          "choices":
+          [
+            {
+              "text": "Yes",
+              "link": "page_2",
+              "valueID": "yes"
+            },
+            {
+              "text": "No",
+              "link": "page_3",
+              "valueID": "no"
+            },
+            {
+              "text": "Not sure",
+              "link": "page_3",
+              "valueID": "unsure"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "pageID": "page_2",
+      "pageTitle": "kerosene",
+      "content":
+      [
+        {
+          "type": "multiple-choice",
+          "text": "Does any of the family members use kerosene, charcoal, or other biomass in the home?",
+          "choices":
+          [
+            {
+              "text": "Yes",
+              "link": "final_page",
+              "valueID": "yes"
+            },
+            {
+              "text": "No",
+              "link": "final_page",
+              "valueID": "no"
+            },
+            {
+              "text": "Not sure",
+              "link": "final_page",
+              "valueID": "unsure"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "pageID": "page_3",
+      "pageTitle": "allergies",
+      "content":
+      [
+        {
+          "type": "multiple-choice",
+          "text": "Has the child’s parents or siblings had similar breathing problems, other diseases with breathing problems or allergies?",
+          "choices":
+          [
+            {
+              "text": "Yes",
+              "link": "final_page",
+              "valueID": "yes"
+            },
+            {
+              "text": "No",
+              "link": "final_page",
+              "valueID": "no"
+            },
+            {
+              "text": "Not sure",
+              "link": "final_page",
+              "valueID": "unsure"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/MutipleChoiceComponent.java b/app/src/main/java/com/ug/air/alrite/Fragments/MutipleChoiceComponent.java
deleted file mode 100644
index 1cd7796..0000000
--- a/app/src/main/java/com/ug/air/alrite/Fragments/MutipleChoiceComponent.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ug.air.alrite.Fragments;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * List of choices that the user will make
- * Depending on the type of question the
- * items added to the list will differ
- * */
-
-public class MutipleChoiceComponent {
-    private Map<Integer, String> MultipleChoice;
-    private Map<Boolean, String> TrueOrFalse;
-
-    /**
-     * Constructor
-     * Creates a new, empty list
-     */
-    public MutipleChoiceComponent() {
-        this.MultipleChoice = new HashMap<>();
-        this.TrueOrFalse = new HashMap<>();
-    }
-
-    /**
-     * Add a new choice into the table
-     * Index of the list will be the choice number
-     * @param ChoiceName Value to provide into the list
-     * that corresponds to its value
-     * @param ChoiceValue Value which corresponds to the numbering
-     * of the choice within the Map
-    */
-    public void addBooleanValue(Boolean ChoiceValue, String ChoiceName) {
-            if(ChoiceName == null) {
-                throw new IllegalArgumentException("Need to have an input for the string");
-            }
-            if(ChoiceValue != true || ChoiceValue != false) {
-                throw new IllegalArgumentException("For a true or false value we need to have a" +
-                        "true or false choice answer");
-            }
-            this.TrueOrFalse.put(ChoiceValue, ChoiceName);
-    }
-
-    /**
-     * Add a new choice into the table
-     * Index of the list will be the choice number
-     * @param ChoiceName Value to provide into the list
-     * that corresponds to its value
-     * @param ChoiceNum Value which corresponds to the numbering
-     * of the choice within the Map
-     */
-    public void addMultipleChoiceValue(Integer ChoiceNum, String ChoiceName) {
-        if(ChoiceName == null) {
-            throw new IllegalArgumentException("Need to have an input for the string");
-        }
-        if(ChoiceNum == -1) {
-            throw new IllegalArgumentException("Cannot have choice number be negative");
-        }
-        this.MultipleChoice.put(ChoiceNum, ChoiceName);
-    }
-}
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
new file mode 100644
index 0000000..b22740b
--- /dev/null
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
@@ -0,0 +1,282 @@
+package com.ug.air.alrite.Fragments.Patient;
+
+import static com.ug.air.alrite.Fragments.Patient.Assess.S4;
+import static com.ug.air.alrite.Fragments.Patient.FTouch.TOUCH;
+import static com.ug.air.alrite.Fragments.Patient.HIVCare.CHOICEHC;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.renderscript.ScriptGroup;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.ug.air.alrite.R;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+
+public class TextInputFragment extends Fragment {
+
+    View view;
+    EditText etDay;
+    Button back, next, btnSkip, btnSave;
+    String userInput, diagnosis;
+    public static final String Question = "What is the childs temperature";
+    public static final String TDIAGNOSIS = "diagnosis_4";
+    public static final String SHARED_PREFS = "sharedPrefs";
+    SharedPreferences sharedPreferences;
+    SharedPreferences.Editor editor;
+    Dialog dialog;
+    TextView txtMessage;
+    public static final String IHint = "";
+    public static final String IInformation = "";
+    public static final String SInformation = "";
+    public static final String min_value = "";
+    public static final String max_value = "";
+    public static final String minValueforDiagnosis = "";
+    String question;
+    String InputHint;
+    String InputInformation;
+    String SkipInformation;
+    int MinValue;
+    int MaxValue;
+    int diagnosisCutoff;
+    /**
+     * This creates a new MultipleChoiceFragment with a separate constructor, so
+     * that we can retain the given information and return the fragment
+     *
+     * @param question the question at the top of the page
+     * @param InputHint the input hint for the user
+     * @param InputInformation the input hint for the user
+     * @param SkipInformation the input hint for the user
+     * @param MinValue the input hint for the user
+     * @param MaxValue the input hint for the user
+     * @param diagnosisCutoff the input hint for the user
+     * @return the fragment to be used in the future
+     */
+    public static TextInputFragment newInstance(String question, String InputHint, String InputInformation, String SkipInformation,
+                                                int MinValue, int MaxValue, int diagnosisCutoff) throws JSONException {
+        TextInputFragment tif = new TextInputFragment();
+        Bundle args = new Bundle();
+        args.putString(Question, question);
+        args.putString(IHint, InputHint);
+        args.putString(IInformation, InputInformation);
+        args.putString(SInformation, SkipInformation);
+        args.putInt(min_value ,MinValue);
+        args.putInt(max_value ,MaxValue);
+        args.putInt(minValueforDiagnosis , diagnosisCutoff);
+        tif.setArguments(args);
+        return tif;
+}
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        view = inflater.inflate(R.layout.text_input, container, false);
+        sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+        editor = sharedPreferences.edit();
+
+        assert getArguments() != null;
+        question = getArguments().getString(Question);
+        InputHint = getArguments().getString(IHint);
+        InputInformation = getArguments().getString(IInformation);
+        SkipInformation = getArguments().getString(SInformation);
+        MinValue = getArguments().getInt(min_value);
+        MaxValue = getArguments().getInt(max_value);
+        diagnosisCutoff = getArguments().getInt(minValueforDiagnosis);
+
+        TextView questionDisplay = view.findViewById(R.id.ti_question);
+        questionDisplay.setText(question);
+        TextView InputHintDisplay = view.findViewById(R.id.IHint);
+        InputHintDisplay.setText(InputHint);
+        TextView InputInformationDisplay = view.findViewById(R.id.ti_IInformation);
+        InputInformationDisplay.setText(InputInformation);
+        TextView SkipInformationDisplay = view.findViewById(R.id.ti_SInformation);
+        SkipInformationDisplay.setText(SkipInformation);
+
+        next = view.findViewById(R.id.next);
+        back = view.findViewById(R.id.back);
+        btnSkip = view.findViewById(R.id.skip);
+
+        etDay.requestFocus();
+
+        loadData();
+        updateViews();
+
+
+        etDay.addTextChangedListener(textWatcher);
+
+        next.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                userInput = etDay.getText().toString();
+                if (userInput.isEmpty()){
+                    Toast.makeText(getActivity(), "Please fill in the field before you continue", Toast.LENGTH_SHORT).show();
+                }else{
+                    saveData();
+                }
+            }
+        });
+
+        back.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                String assess = sharedPreferences.getString(S4, "");
+                String care = sharedPreferences.getString(CHOICEHC, "");
+
+                FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
+                if (!assess.equals("None of these")){
+                    fr.replace(R.id.fragment_container, new CoughD());
+                }else{
+                    if (care.isEmpty()){
+                        fr.replace(R.id.fragment_container, new HIVStatus());
+                    }else{
+                        fr.replace(R.id.fragment_container, new HIVCare());
+                    }
+                }
+
+                fr.commit();
+            }
+        });
+
+        btnSkip.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
+                fr.replace(R.id.fragment_container, new FTouch());
+                fr.addToBackStack(null);
+                fr.commit();
+            }
+        });
+
+        return view;
+    }
+
+    TextWatcher textWatcher = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            userInput = etDay.getText().toString();
+            if (!userInput.isEmpty()){
+                float dy = Float.parseFloat(userInput);
+                btnSkip.setEnabled(false);
+                if (dy < MinValue){
+                    etDay.setError("You have entered a value below the minimum");
+                    next.setEnabled(false);
+                }else if (dy > MaxValue) {
+                    etDay.setError("You have entered a value above the maximum");
+                    next.setEnabled(false);
+                } else {
+                    btnSkip.setEnabled(true);
+                    next.setEnabled(true);
+                }
+            }
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+
+        }
+    };
+
+    private void saveData() {
+        deleteSharedPreferences();
+
+        String assess = sharedPreferences.getString(S4, "");
+        editor.putString(Question, userInput);
+        editor.apply();
+        float tp = Float.parseFloat(userInput);
+        if (tp >= diagnosisCutoff && assess.contains("None of these")){
+            diagnosis = "Enter Diagnosis here";
+            editor.putString(TDIAGNOSIS, diagnosis);
+            editor.apply();
+            showDialog();
+        }else if (tp >= diagnosisCutoff){
+            editor.remove(TDIAGNOSIS);
+            editor.apply();
+            showDialog();
+        }else {
+            editor.remove(TDIAGNOSIS);
+            editor.apply();
+            FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
+            fr.replace(R.id.fragment_container, new Oxygen());
+            fr.addToBackStack(null);
+            fr.commit();
+        }
+
+    }
+
+    private void loadData() {
+        userInput = sharedPreferences.getString(Question, "");
+    }
+
+    private void updateViews() {
+        if (!userInput.isEmpty()){
+            etDay.setText(userInput);
+            btnSkip.setEnabled(false);
+        }else {
+            btnSkip.setEnabled(true);
+        }
+    }
+
+    private void deleteSharedPreferences() {
+        editor.remove(TOUCH);
+        editor.remove(TDIAGNOSIS);
+        editor.apply();
+    }
+
+    private void showDialog() {
+        dialog = new Dialog(getActivity());
+        dialog.setContentView(R.layout.assess);
+        dialog.setCancelable(true);
+
+        txtMessage = dialog.findViewById(R.id.message);
+        btnSave = dialog.findViewById(R.id.ContinueButton);
+
+        btnSave.setText("Continue");
+
+        txtMessage.setText("Popup text for the user indicating message");
+        txtMessage.setTextColor(Color.parseColor("#FF0000"));
+        txtMessage.setTypeface(Typeface.DEFAULT_BOLD);
+
+        btnSave.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                dialog.dismiss();
+                FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
+                fr.replace(R.id.fragment_container, new Oxygen());
+                fr.addToBackStack(null);
+                fr.commit();
+            }
+        });
+
+        dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
+        dialog.getWindow().setGravity(Gravity.CENTER);
+        dialog.show();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/text_input.xml b/app/src/main/res/layout/text_input.xml
new file mode 100644
index 0000000..d9a91b9
--- /dev/null
+++ b/app/src/main/res/layout/text_input.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".Fragments.Patient.Temperature">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="?actionBarSize"
+        android:background="@color/green_main"
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp"
+        android:orientation="vertical"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:text="Patient's Examination"
+            android:textColor="@color/white"
+            android:textSize="18sp"/>
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/buttons"
+            android:layout_marginEnd="0dp"
+            android:layout_marginBottom="10dp"
+            android:fadeScrollbars="true"
+            android:padding="10dp"
+            android:scrollbars="none">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/ti_question"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:text="@string/ti_question"
+                    android:textColor="@color/black"
+                    android:textSize="18sp" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:gravity="center_horizontal"
+                    android:orientation="horizontal"
+                    android:weightSum="1">
+
+                    <EditText
+                        android:id="@+id/IHint"
+                        android:layout_width="0dp"
+                        android:layout_height="50dp"
+                        android:layout_margin="10dp"
+                        android:layout_weight=".5"
+                        android:background="@drawable/text_input_bg"
+                        android:gravity="center"
+                        android:hint="@string/ti_IHint"
+                        android:inputType="numberDecimal"
+                        android:maxLength="4" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/ti_IInformation"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:text="@string/ti_IInformation"
+                    android:textSize="12sp" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/ti_SInformation"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_horizontal"
+                        android:text="@string/ti_SInformation"
+                        android:textSize="12sp" />
+
+                    <Button
+                        android:id="@+id/skip"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginBottom="10dp"
+                        android:background="@drawable/bg_button"
+                        android:text="Skip"
+                        android:textColor="@color/color_background" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+
+        </ScrollView>
+
+        <RelativeLayout
+            android:id="@+id/buttons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true">
+
+            <Button
+                android:id="@+id/back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/bg_button"
+                android:text="Back"
+                android:textColor="@color/white" />
+
+            <Button
+                android:id="@+id/next"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_margin="10dp"
+                android:background="@drawable/primary_button"
+                android:text="next"
+                android:textColor="@color/white"/>
+
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4895e66..6586ae2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -271,4 +271,14 @@
     <string name="mc_question">%s</string>
     <string name="choice1">%s</string>
     <string name="choice2">%s</string>
+
+    <!--   New Strings for the text input -->
+    <string name="ti_question">%s</string>
+    <string name="ti_IHint">%s</string>
+    <string name="ti_IInformation">%s</string>
+    <string name="ti_SInformation">%s</string>
+    <string name="ti_minval">%s</string>
+    <string name="ti_maxval">%s</string>
+    <string name="ti_minvalforDiagnosis">%s</string>
+
 </resources>
\ No newline at end of file

From 6d68e42ebb772f17a559fbeb985f62b96d2e1889 Mon Sep 17 00:00:00 2001
From: Navkiran <nav1123@icloud.com>
Date: Wed, 3 May 2023 14:04:20 -0700
Subject: [PATCH 13/50] Initial code for the text component

---
 .../Fragments/Patient/TextInputFragment.java  | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
index b22740b..22df673 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
@@ -127,6 +127,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         etDay.addTextChangedListener(textWatcher);
 
         next.setOnClickListener(new View.OnClickListener() {
+            //if there is nothing inputted
+            //get the int result from the id and get the text from there!
             @Override
             public void onClick(View v) {
                 userInput = etDay.getText().toString();
@@ -141,22 +143,16 @@ public void onClick(View v) {
         back.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
-                String assess = sharedPreferences.getString(S4, "");
-                String care = sharedPreferences.getString(CHOICEHC, "");
-
-                FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
-                if (!assess.equals("None of these")){
-                    fr.replace(R.id.fragment_container, new CoughD());
-                }else{
-                    if (care.isEmpty()){
-                        fr.replace(R.id.fragment_container, new HIVStatus());
-                    }else{
-                        fr.replace(R.id.fragment_container, new HIVCare());
+                back.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        try {
+                            getResultListener.getLastPage();
+                        } catch (JSONException e) {
+                            throw new RuntimeException(e);
+                        }
                     }
-                }
-
-                fr.commit();
+                });
             }
         });
 

From f07fecb9fcfe04d041dc1271fcb2365cb23b861e Mon Sep 17 00:00:00 2001
From: evasy <yitongshan2016@yahoo.com>
Date: Sun, 7 May 2023 23:29:26 -0700
Subject: [PATCH 14/50] multiselect ver.1

---
 app/src/main/AndroidManifest.xml              |   6 +-
 .../Patient/MultipleSelectionFragment.java    | 199 ++++++++++++++++++
 2 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 18fa93b..bcbfcdc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,9 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
 
     <application
         android:allowBackup="true"
@@ -13,7 +16,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="true"
+        android:requestLegacyExternalStorage="true">
         <activity
             android:name=".Activities.LearnActivity"
             android:exported="true" />
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
new file mode 100644
index 0000000..2ab9044
--- /dev/null
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
@@ -0,0 +1,199 @@
+package com.ug.air.alrite.Fragments.Patient;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.RadioGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.fragment.app.Fragment;
+
+import com.ug.air.alrite.R;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+public class MultipleSelectionFragment extends Fragment {
+
+    public interface onGetResultListener {
+        public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONException;
+    }
+    onGetResultListener getResultListener;
+
+    public static final String SHARED_PREFS = "sharedPrefs";
+    public static final String QUESTION = "question";
+    public static final String CHOICES = "choices";
+    public static final String DEFAULT = "**default string**";
+    String previousResponse;
+    String question;
+    ArrayList<String> choices;
+    View view;
+    RadioGroup choiceGroup;
+    Button backButton, nextButton;
+    SharedPreferences sharedPreferences;
+    SharedPreferences.Editor editor;
+
+    /**
+     * This is where we do what we usually do in the onAttach section, except that
+     * we also add a listener for sending the result of the Multiple Choice up to
+     * the activity
+     *
+     * @param activity the PatientActivity that we're running this fragment on
+     */
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        try {
+            getResultListener = (onGetResultListener) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.toString() + " must implement onSomeEventListener");
+        }
+    }
+
+    /**
+     * This creates a new MultipleSelectionFragment with a separate constructor, so
+     * that we can retain the given information and return the fragment
+     *
+     * @param question the question at the top of the page
+     * @param choices the given choices for the user to choose from
+     * @return the fragment to be used in the future
+     */
+    public static MultipleSelectionFragment newInstance(String question, ArrayList<JSONObject> choices) throws JSONException {
+        MultipleSelectionFragment msc = new MultipleSelectionFragment();
+        Bundle args = new Bundle();
+        args.putString(QUESTION, question);
+        ArrayList<String> text_choices = getTextFromChoices(choices);
+        args.putStringArrayList(CHOICES, text_choices);
+        msc.setArguments(args);
+        return msc;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        view = inflater.inflate(R.layout.multiple_select, container, false);
+        sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+        editor = sharedPreferences.edit();
+
+        // Retrieve the information for the question/choices of the page
+        assert getArguments() != null;
+        question = getArguments().getString(QUESTION);
+        choices = getArguments().getStringArrayList(CHOICES);
+
+        // Then, set the information for each question/choice to line up with our givens
+        TextView questionDisplay = view.findViewById(R.id.mc_question);
+        questionDisplay.setText(question);
+
+        // create buttons in here, and then choose their ids more easily
+        // Currently storing 5 checkboxes will update later
+        // Set for demo might add more or create optimized loop
+        ArrayList<CheckBox> choiceGroup = new ArrayList<CheckBox>();
+
+        CheckBox choice1 = view.findViewById(R.id.choice1);
+        choice1.setText(choices.get(0));
+        CheckBox choice2 = view.findViewById(R.id.choice2);
+        choice2.setText(choices.get(1));
+        CheckBox choice3 = view.findViewById(R.id.choice3);
+        choice3.setText(choices.get(2));
+        CheckBox choice4 = view.findViewById(R.id.choice4);
+        choice4.setText(choices.get(3));
+        CheckBox choice5 = view.findViewById(R.id.choice5);
+        choice5.setText(choices.get(4));
+
+        choiceGroup.add(choice1);
+        choiceGroup.add(choice2);
+        choiceGroup.add(choice3);
+        choiceGroup.add(choice4);
+        choiceGroup.add(choice5);
+
+
+        // All of the buttons/things that we'll need to reference
+        nextButton = view.findViewById(R.id.next);
+        backButton = view.findViewById(R.id.back);
+
+        // If we've already seen this page, reload our past choices
+        loadSelectedChoiceIfAlreadySelected();
+
+        // This is a listener for, if the next button is pressed, whether we can go
+        // on or not, and what information should be sent up
+        nextButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                // we need to see which choices are selected
+                // store the ids
+                ArrayList<Integer> chosenOptions = new ArrayList<Integer>();
+                for (CheckBox choice : choiceGroup) {
+                    if (choice.isChecked()) {
+                        multipleSelectedOptions.add(choice);
+                    }
+                }
+                if (chosenOptions.size() <= 1) {
+                    Toast.makeText(getActivity(), "Please select more than one of the options", Toast.LENGTH_SHORT).show();
+                    return;
+                }
+
+                // Get the indices of the choices in the set of buttons: relies on the
+                // buttons having names with their index at the end
+                ArrayList<String> chosenOptionIds = new ArrayList<String>();
+                for (CheckBox c : multipleSelectedOptions) {
+
+                }
+                String chosenOptionIds = v.getResources().getResourceName(chosenOptions);
+                int index = Integer.parseInt(chosenOptionId.substring(chosenOptionId.length() - 1));
+
+                // Send the result back up to main: a listener there will trigger
+                // and start the next fragment sequence up
+                try {
+                    getResultListener.getResultFromMultipleChoiceFragment(index);
+                } catch (JSONException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+
+        return view;
+    }
+
+    /**
+     * In the case that we're creating this view again after we've already stepped
+     * through this option, pre-select the choice that we already made, so that we
+     * don't get inconsistent answers from this
+     */
+    private void loadSelectedChoiceIfAlreadySelected() {
+        SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+        previousResponse = sharedPreferences.getString(question, DEFAULT);
+
+        for (int i = 0; i < choices.size(); i++) {
+            if (previousResponse.equals(choices.get(i))) {
+                RadioGroup allChoices = view.findViewById(R.id.mc_options);
+                allChoices.check(i);
+                return;
+            }
+        }
+    }
+
+    /**
+     * This is used specifically for newInstance, and relies on the JSON being set
+     * up as in the "example.json" file. This will extract all of the text answers
+     * from the given choices list.
+     *
+     * @param list is an ArrayList of JSONObjects (choices)
+     * @return the list of strings of text for each choice, in order
+     */
+    private static ArrayList<String> getTextFromChoices(ArrayList<JSONObject> list) throws JSONException {
+        ArrayList<String> ret = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            ret.add(list.get(i).getString("text"));
+        }
+        return ret;
+    }
+}

From 126c37d1b7963a4b5e870a48baa14ab22d23af29 Mon Sep 17 00:00:00 2001
From: evasy <yitongshan2016@yahoo.com>
Date: Mon, 8 May 2023 03:10:54 -0700
Subject: [PATCH 15/50] multiselect ver.1.1

---
 .../Fragments/MutipleSelectionComponent.java  |  61 ++++++++
 app/src/main/res/layout/multiple_select.xml   | 137 ++++++++++++++++++
 2 files changed, 198 insertions(+)
 create mode 100644 app/src/main/java/com/ug/air/alrite/Fragments/MutipleSelectionComponent.java
 create mode 100644 app/src/main/res/layout/multiple_select.xml

diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/MutipleSelectionComponent.java b/app/src/main/java/com/ug/air/alrite/Fragments/MutipleSelectionComponent.java
new file mode 100644
index 0000000..a8bf415
--- /dev/null
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/MutipleSelectionComponent.java
@@ -0,0 +1,61 @@
+package com.ug.air.alrite.Fragments;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * List of choices that the user will make
+ * Depending on the type of question the
+ * items added to the list will differ
+ * */
+
+public class MutipleSelectionComponent {
+    private Map<Integer, String> MultipleSelect;
+    private Map<Boolean, String> TrueOrFalse;
+
+    /**
+     * Constructor
+     * Creates a new, empty list
+     */
+    public MutipleSelectionComponent() {
+        this.MultipleSelect = new HashMap<>();
+        this.TrueOrFalse = new HashMap<>();
+    }
+
+    /**
+     * Add a new choice into the table
+     * Index of the list will be the choice number
+     * @param ChoiceName Value to provide into the list
+     * that corresponds to its value
+     * @param ChoiceValue Value which corresponds to the numbering
+     * of the choice within the Map
+    */
+    public void addBooleanValue(Boolean ChoiceValue, String ChoiceName) {
+            if(ChoiceName == null) {
+                throw new IllegalArgumentException("Need to have an input for the string");
+            }
+            if(ChoiceValue != true || ChoiceValue != false) {
+                throw new IllegalArgumentException("For a true or false value we need to have a" +
+                        "true or false choice answer");
+            }
+            this.TrueOrFalse.put(ChoiceValue, ChoiceName);
+    }
+
+    /**
+     * Add a new choice into the table
+     * Index of the list will be the choice number
+     * @param ChoiceName Value to provide into the list
+     * that corresponds to its value
+     * @param ChoiceNum Value which corresponds to the numbering
+     * of the choice within the Map
+     */
+    public void addMultipleChoiceValue(Integer ChoiceNum, String ChoiceName) {
+        if(ChoiceName == null) {
+            throw new IllegalArgumentException("Need to have an input for the string");
+        }
+        if(ChoiceNum == -1) {
+            throw new IllegalArgumentException("Cannot have choice number be negative");
+        }
+        this.MultipleSelect.put(ChoiceNum, ChoiceName);
+    }
+}
diff --git a/app/src/main/res/layout/multiple_select.xml b/app/src/main/res/layout/multiple_select.xml
new file mode 100644
index 0000000..45ee34e
--- /dev/null
+++ b/app/src/main/res/layout/multiple_select.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".Fragments.Patient.Fever">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="?actionBarSize"
+        android:background="@color/green_main"
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp"
+        android:orientation="vertical"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:text="Patient's Examination"
+            android:textColor="@color/white"
+            android:textSize="18sp"/>
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/buttons"
+            android:layout_marginEnd="0dp"
+            android:layout_marginBottom="10dp"
+            android:fadeScrollbars="true"
+            android:padding="10dp"
+            android:scrollbars="none">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/mc_question"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="25dp"
+                    android:gravity="center_horizontal"
+                    android:text="@string/mc_question"
+                    android:textColor="@color/black"
+                    android:textSize="18sp" />
+
+                <CheckBox
+                    android:id="@+id/choice1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:buttonTint="@color/black"
+                    android:text="@string/choice1"
+                    android:textSize="18sp" />
+
+                <CheckBox
+                    android:id="@+id/choice2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:buttonTint="@color/black"
+                    android:text="@string/choice2"
+                    android:textSize="18sp" />
+
+                <CheckBox
+                    android:id="@+id/choice3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:buttonTint="@color/black"
+                    android:text="%s"
+                    android:textSize="18sp" />
+
+                <CheckBox
+                    android:id="@+id/choice4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:buttonTint="@color/black"
+                    android:text="%s"
+                    android:textSize="18sp" />
+
+                <CheckBox
+                    android:id="@+id/choice5"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:buttonTint="@color/black"
+                    android:text="%s"
+                    android:textSize="18sp" />
+            </LinearLayout>
+
+        </ScrollView>
+
+        <RelativeLayout
+            android:id="@+id/buttons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true">
+
+            <Button
+                android:id="@+id/back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/bg_button"
+                android:text="Back"
+                android:textColor="@color/white" />
+
+            <Button
+                android:id="@+id/next"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_margin="10dp"
+                android:background="@drawable/primary_button"
+                android:text="next"
+                android:textColor="@color/white"/>
+
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file

From b589faeb623e177e7c9a71041c56626a70b6f009 Mon Sep 17 00:00:00 2001
From: evasy <yitongshan2016@yahoo.com>
Date: Mon, 8 May 2023 05:25:13 -0700
Subject: [PATCH 16/50] multiselect ver.1.2

---
 .../Patient/MultipleSelectionFragment.java    | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
index 2ab9044..e234716 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
@@ -9,7 +9,6 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -35,9 +34,9 @@ public interface onGetResultListener {
     public static final String DEFAULT = "**default string**";
     String previousResponse;
     String question;
-    ArrayList<String> choices;
+    ArrayList<String> choices; // list of the texts of the checkboxes
+    ArrayList<CheckBox> choiceGroup; // list of checkboxes
     View view;
-    RadioGroup choiceGroup;
     Button backButton, nextButton;
     SharedPreferences sharedPreferences;
     SharedPreferences.Editor editor;
@@ -87,7 +86,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         // Retrieve the information for the question/choices of the page
         assert getArguments() != null;
         question = getArguments().getString(QUESTION);
-        choices = getArguments().getStringArrayList(CHOICES);
+        choices = getArguments().getStringArrayList(CHOICES); // list of strings
 
         // Then, set the information for each question/choice to line up with our givens
         TextView questionDisplay = view.findViewById(R.id.mc_question);
@@ -95,8 +94,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         // create buttons in here, and then choose their ids more easily
         // Currently storing 5 checkboxes will update later
-        // Set for demo might add more or create optimized loop
-        ArrayList<CheckBox> choiceGroup = new ArrayList<CheckBox>();
+        // might add more or create optimized loop
 
         CheckBox choice1 = view.findViewById(R.id.choice1);
         choice1.setText(choices.get(0));
@@ -114,6 +112,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         choiceGroup.add(choice3);
         choiceGroup.add(choice4);
         choiceGroup.add(choice5);
+        System.out.println(choiceGroup);
 
 
         // All of the buttons/things that we'll need to reference
@@ -121,7 +120,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         backButton = view.findViewById(R.id.back);
 
         // If we've already seen this page, reload our past choices
-        loadSelectedChoiceIfAlreadySelected();
+        loadSelectedChoicesIfAlreadySelected();
 
         // This is a listener for, if the next button is pressed, whether we can go
         // on or not, and what information should be sent up
@@ -133,7 +132,9 @@ public void onClick(View v) {
                 ArrayList<Integer> chosenOptions = new ArrayList<Integer>();
                 for (CheckBox choice : choiceGroup) {
                     if (choice.isChecked()) {
-                        multipleSelectedOptions.add(choice);
+                        // get the id of this choice
+                        int id = choice.getId();
+                        chosenOptions.add(id);
                     }
                 }
                 if (chosenOptions.size() <= 1) {
@@ -143,17 +144,19 @@ public void onClick(View v) {
 
                 // Get the indices of the choices in the set of buttons: relies on the
                 // buttons having names with their index at the end
-                ArrayList<String> chosenOptionIds = new ArrayList<String>();
-                for (CheckBox c : multipleSelectedOptions) {
-
+                ArrayList<Integer> chosenOptionIds = new ArrayList<Integer>();
+                for (int c : chosenOptions) {
+                    String chosenOptionId = v.getResources().getResourceName(c);
+                    int index = Integer.parseInt(chosenOptionId.substring(chosenOptionId.length() - 1));
+                    chosenOptionIds.add(index);
                 }
-                String chosenOptionIds = v.getResources().getResourceName(chosenOptions);
-                int index = Integer.parseInt(chosenOptionId.substring(chosenOptionId.length() - 1));
 
                 // Send the result back up to main: a listener there will trigger
                 // and start the next fragment sequence up
                 try {
-                    getResultListener.getResultFromMultipleChoiceFragment(index);
+                    for (int index : chosenOptionIds) {
+                        getResultListener.getResultFromMultipleChoiceFragment(index);
+                    }
                 } catch (JSONException e) {
                     throw new RuntimeException(e);
                 }
@@ -163,22 +166,18 @@ public void onClick(View v) {
         return view;
     }
 
+
     /**
      * In the case that we're creating this view again after we've already stepped
      * through this option, pre-select the choice that we already made, so that we
      * don't get inconsistent answers from this
      */
-    private void loadSelectedChoiceIfAlreadySelected() {
+    private void loadSelectedChoicesIfAlreadySelected() {
+        // TODO: how to make it response multiple ones
         SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
         previousResponse = sharedPreferences.getString(question, DEFAULT);
 
-        for (int i = 0; i < choices.size(); i++) {
-            if (previousResponse.equals(choices.get(i))) {
-                RadioGroup allChoices = view.findViewById(R.id.mc_options);
-                allChoices.check(i);
-                return;
-            }
-        }
+        //
     }
 
     /**

From 5942a878d0266c6169ae444894e2d2ef7bbc9f68 Mon Sep 17 00:00:00 2001
From: Navkiran <nav1123@icloud.com>
Date: Mon, 8 May 2023 14:33:09 -0700
Subject: [PATCH 17/50] Initial code for the text component

---
 .../alrite/Activities/PatientActivity.java    | 40 ++++++++++++++++++-
 .../Fragments/Patient/TextInputFragment.java  | 24 ++++++++++-
 app/src/main/res/layout/text_input.xml        |  7 +++-
 3 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 6018960..84a8802 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -32,11 +32,12 @@
 import com.google.gson.JsonParser;
 import com.makeramen.roundedimageview.BuildConfig;
 import com.ug.air.alrite.APIs.ApiClient;
-import com.ug.air.alrite.APIs.DecisionTreeJSON;
+//import com.ug.air.alrite.APIs.DecisionTreeJSON;
 import com.ug.air.alrite.APIs.JsonPlaceHolder;
 import com.ug.air.alrite.Fragments.Patient.ActivePatients;
 import com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment;
 import com.ug.air.alrite.Fragments.Patient.OtherPatients;
+import com.ug.air.alrite.Fragments.Patient.TextInputFragment;
 import com.ug.air.alrite.R;
 import com.ug.air.alrite.Utils.Credentials;
 
@@ -317,6 +318,14 @@ private void completeFragmentTransaction(Fragment fragment) {
     String question;
     ArrayList<JSONObject> choices;
     ArrayList<String> backstack;
+    // Other than question there is more information needed
+    // from the JSON for text input
+    String InputHint;
+    String InputInformation;
+    String SkipInformation;
+    int MinValue;
+    int MaxValue;
+    int diagnosisCutoff;
 
     private void getNextPage(JSONObject currNextPage) throws JSONException {
         // Get all of the items that should be displayed on the page
@@ -361,7 +370,36 @@ private void createMultipleChoiceFragment(JSONObject page) throws JSONException
         // Replace and commit the fragment
         completeFragmentTransaction(mc_fragment);
     }
+    /**
+     * Creating the Fragment for Text Input
+     *
+     * @throws JSONException because we use json objects
+     */
+    private void createTextInputFragment(JSONObject page) throws JSONException {
+        // Collect the important arguments from the component
+        question = page.getString("text");
+        InputHint = page.getString("text");
+        InputInformation = page.getString("");
+        SkipInformation = page.getString("");
+        MinValue = page.getInt("");
+        MaxValue = page.getInt("");
+        diagnosisCutoff = page.getInt("");
+
+        // Get the new page's fragment, and set a listener for when the next button
+        // is clicked
+        TextInputFragment ti_fragment = TextInputFragment.newInstance(question, InputHint, InputInformation, SkipInformation,
+        MinValue, MaxValue, diagnosisCutoff);
+
+        // Replace and commit the fragment
+        completeFragmentTransaction(ti_fragment);
+    }
+    public void getResultFromTextInputFragment(int numberInputted) throws JSONException {
+        String diagnosis = "";
+        // Enter the diagnosis into the editor
+        editor.putString(question, diagnosis);
+        editor.apply();
 
+    }
     /**
      * Listener for clicking the next button: we can move to the correct next
      * page, as given by the user's sent JSON
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
index 22df673..742ee86 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
@@ -4,6 +4,7 @@
 import static com.ug.air.alrite.Fragments.Patient.FTouch.TOUCH;
 import static com.ug.air.alrite.Fragments.Patient.HIVCare.CHOICEHC;
 
+import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -35,7 +36,11 @@
 
 
 public class TextInputFragment extends Fragment {
-
+    public interface onGetResultListener {
+        void getResultFromTextInputFragment(int choiceIndex) throws JSONException;
+        void getLastPage() throws JSONException;
+    }
+    MultipleChoiceFragment.onGetResultListener getResultListener;
     View view;
     EditText etDay;
     Button back, next, btnSkip, btnSave;
@@ -169,12 +174,27 @@ public void onClick(View v) {
         return view;
     }
 
+    /**
+     * This is where we do what we usually do in the onAttach section, except that
+     * we also add a listener for sending the result of the Text Input up to
+     * the activity
+     *
+     * @param activity the PatientActivity that we're running this fragment on
+     */
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        try {
+            getResultListener = (MultipleChoiceFragment.onGetResultListener) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.toString() + " must implement onSomeEventListener");
+        }
+    }
     TextWatcher textWatcher = new TextWatcher() {
         @Override
         public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
         }
-
         @Override
         public void onTextChanged(CharSequence s, int start, int before, int count) {
             userInput = etDay.getText().toString();
diff --git a/app/src/main/res/layout/text_input.xml b/app/src/main/res/layout/text_input.xml
index d9a91b9..0be2831 100644
--- a/app/src/main/res/layout/text_input.xml
+++ b/app/src/main/res/layout/text_input.xml
@@ -139,10 +139,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:layout_margin="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="10dp"
                 android:background="@drawable/primary_button"
                 android:text="next"
-                android:textColor="@color/white"/>
+                android:textColor="@color/white" />
 
         </RelativeLayout>
 

From 321a86383df6fc0c93ee78ce22015ffa3bdbd2b6 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Mon, 8 May 2023 14:57:01 -0700
Subject: [PATCH 18/50] Got HTTP request working

---
 .../com/ug/air/alrite/APIs/ApiClient.java     |  14 +-
 .../alrite/Activities/PatientActivity.java    | 312 +++++++++---------
 .../Patient/MultipleChoiceFragment.java       |   3 +-
 3 files changed, 163 insertions(+), 166 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/APIs/ApiClient.java b/app/src/main/java/com/ug/air/alrite/APIs/ApiClient.java
index 4e07fc6..4afc053 100644
--- a/app/src/main/java/com/ug/air/alrite/APIs/ApiClient.java
+++ b/app/src/main/java/com/ug/air/alrite/APIs/ApiClient.java
@@ -11,12 +11,16 @@
 import retrofit2.converter.gson.GsonConverterFactory;
 import retrofit2.converter.scalars.ScalarsConverterFactory;
 
+
+
 public class ApiClient {
-    private static final String BASE_URL = "http://140.142.142.94/alrite/apis/";
-//    private static final String BASE_URL = "http://10.0.2.2:8000/alrite/apis/";
-    private static Retrofit retrofit = null;
+    public static final String BASE_URL = "http://140.142.142.94/alrite/apis/";
+    public static final String TEMP_SERV_URL = "http://10.0.2.2:8000";
+
+    //    private static final String BASE_URL = "http://10.0.2.2:8000/alrite/apis/";
+    private static Retrofit retrofit;
 
-    public static Retrofit getClient() {
+    public static Retrofit getClient(String URL) {
 
         if (retrofit == null){
 
@@ -33,7 +37,7 @@ public static Retrofit getClient() {
                     .build();
 
             retrofit = new Retrofit.Builder()
-                    .baseUrl(BASE_URL)
+                    .baseUrl(URL)
                     .client(okHttpClient)
                     .addConverterFactory(ScalarsConverterFactory.create())
                     .addConverterFactory(GsonConverterFactory.create(gson))
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 84a8802..7547727 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -14,6 +14,7 @@
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.INITIAL_DATE_2;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.SECOND;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
@@ -32,7 +33,7 @@
 import com.google.gson.JsonParser;
 import com.makeramen.roundedimageview.BuildConfig;
 import com.ug.air.alrite.APIs.ApiClient;
-//import com.ug.air.alrite.APIs.DecisionTreeJSON;
+import com.ug.air.alrite.APIs.DecisionTreeJSON;
 import com.ug.air.alrite.APIs.JsonPlaceHolder;
 import com.ug.air.alrite.Fragments.Patient.ActivePatients;
 import com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment;
@@ -68,10 +69,11 @@
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
+import retrofit2.Callback;
 import retrofit2.Retrofit;
+import retrofit2.Response;
 
 public class PatientActivity extends AppCompatActivity implements MultipleChoiceFragment.onGetResultListener {
 
@@ -95,11 +97,7 @@ protected void onCreate(Bundle savedInstanceState) {
             FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
             if (frag == 1){
                 // fragmentTransaction.add(R.id.fragment_container, new Initials());
-                try {
-                    implementEditableDecisionTree();
-                } catch (JSONException | IOException e) {
-                    throw new RuntimeException("JSONException in Patient: " + e);
-                }
+                getJSONFromBackend();
             }else if (frag == 2){
                 fragmentTransaction.add(R.id.fragment_container, new ActivePatients());
             }else {
@@ -259,18 +257,63 @@ private void doLogic(String file) {
         startActivity(intent);
     }
 
+
+    /**---------------------------------------------------------------------------------------------
+     *
+     * Decision Tree creation and maintenance functions below vv
+     *
+     *--------------------------------------------------------------------------------------------*/
+
+    // Strings for the JSON identifiers
+    public static final String COMPONENT = "component";
+    public static final String MULTISELECT = "multiselect";
+    public static final String PAGE_ID = "pageID";
+    public static final String PAGES = "pages";
+    public static final String LABEL = "label";
+    public static final String CHOICES = "choices";
+    public static final String TEXT = "text";
+    public static final String VALUE = "value";
+    public static final String LINK = "link";
+    public static final String CONTENT = "content";
+    public static final String MULTIPLE_CHOICE = "MultipleChoice";
+    public static final String TEXT_INPUT = "TextInput";
+    public static final String DIAGNOSIS_PAGE = "Diagnosis Page";
+    public static final String TITLE = "title";
+
+     // Full JSON infos to call getNextPage
+     JSONArray pages;
+
+     // Information gotten from JSON for the current page
+     // Information gotten from JSON
+     String question;
+     ArrayList<JSONObject> choices;
+     ArrayList<String> backstack;
+     // Other than question there is more information needed
+     // from the JSON for text input
+     String InputHint;
+     String InputInformation;
+     String SkipInformation;
+     int MinValue;
+     int MaxValue;
+     int diagnosisCutoff;
+
+    /**
+     *
+     * @throws JSONException
+     * @throws IOException
+     */
     // TODO: ensure that the strings are not hard-coded in the future
-    private void implementEditableDecisionTree() throws JSONException, IOException {
+    private void implementEditableDecisionTree(JSONObject json) throws JSONException, IOException {
 //        DecisionTreeJSON json = ApiClient.getClient(ApiClient.TEMP_SERV_URL)
 //                                    .create(DecisionTreeJSON.class);
 //        Call<String> call = DecisionTreeJSON.getJson();
 //        System.out.println(json);
 
         backstack = new ArrayList<>();
-        pages = Objects.requireNonNull(createTestingJson()).getJSONArray("pages");
+        pages = json.getJSONArray(PAGES);
         // This is just an array because it needs to be mutable: think of it as
         // its own element
-        JSONObject nextPage = pages.getJSONObject(0);
+        String nextPage = pages.getJSONObject(0).getString(PAGE_ID);
 
         // Handling the intent
 
@@ -311,44 +354,88 @@ private void completeFragmentTransaction(Fragment fragment) {
         ft.commit();
     }
 
-    // Full JSON infos to call getNextPage
-    JSONArray pages;
-
-    // Information gotten from JSON
-    String question;
-    ArrayList<JSONObject> choices;
-    ArrayList<String> backstack;
-    // Other than question there is more information needed
-    // from the JSON for text input
-    String InputHint;
-    String InputInformation;
-    String SkipInformation;
-    int MinValue;
-    int MaxValue;
-    int diagnosisCutoff;
-
-    private void getNextPage(JSONObject currNextPage) throws JSONException {
+    /**
+     * Given a page from the json object, we create the fragment for that page and
+     * populate it with the necessary information.
+     *
+     * @param nextPageID the ID of the next page to be displayed in the app
+     * @throws JSONException if the json is mad at you for calling it improperly
+     */
+    private void getNextPage(String nextPageID) throws JSONException {
+        // Add the new page to the backstack, if it's not already there somewhere
+        if (!backstack.contains(nextPageID)) {
+            backstack.add(nextPageID);
+        }
+
         // Get all of the items that should be displayed on the page
-        // TODO: we're not accounting for multiple things on a page, fix in the future
-        JSONArray nextPageComponents = currNextPage.getJSONArray("content");
+        JSONObject nextPageJSON = pages.getJSONObject(findIndexInPagesGivenPageId(nextPageID));
+        JSONArray nextPageContent = nextPageJSON.getJSONArray(CONTENT);
 
-        // Add the new page to the backstack, if it's not already there somewhere
-        if (!backstack.contains(currNextPage.getString("pageID"))) {
-            backstack.add(currNextPage.getString("pageID"));
+        // If the next page would be the final page, then the assessment is over!
+        // So, start up the diagnosis activity
+        if (nextPageJSON.get(TITLE).equals(DIAGNOSIS_PAGE)) {
+            exitActivity();
+            return;
         }
 
-        for (int i = 0; i < nextPageComponents.length(); i++) {
-            JSONObject nextPageComponent = nextPageComponents.getJSONObject(i);
+        // Then, for each component that we're given within the page, display a
+        // fragment for that component.
+        for (int i = 0; i < nextPageContent.length(); i++) {
+            JSONObject nextPageComponent = nextPageContent.getJSONObject(i);
+            String nextPageComponentType = nextPageComponent.getString(COMPONENT);
+
+            // Multiple choice option(s):
+            if (nextPageComponentType.equals(MULTIPLE_CHOICE)) {
+                Boolean isMultiSelect = nextPageComponent.getBoolean(MULTISELECT);
+                if (isMultiSelect) {
+                    createMultiSelectFragment(nextPageComponent);
+                } else {
+                    createMultipleChoiceFragment(nextPageComponent);
+                }
+
+            // Text input option:
+            } else if (nextPageComponentType.equals(TEXT_INPUT)) {
+                createTextInputFragment(nextPageComponent);
 
-            // Multiple choice option:
-            if (nextPageComponent.getString("type").equals("multiple-choice")) {
-                createMultipleChoiceFragment(nextPageComponent);
+            // There was an issue with identifying the page...
             } else {
                 throw new IllegalStateException("should never get here lol");
             }
         }
     }
 
+    /**
+     * Essentially, make an asynchronous API call to get the HTTP
+     */
+    private void getJSONFromBackend() {
+        DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.TEMP_SERV_URL).create(DecisionTreeJSON.class);
+        Call<String> call = dtJson.getJson();
+        call.enqueue(new Callback<String>() {
+            @Override
+            public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
+                if (!response.isSuccessful()) {
+                    System.out.println("no site, plase try again");
+                    return;
+                }
+
+                // We've received a response! We can turn this into a JSONObject
+                // and store the result locally
+                try {
+                    assert response.body() != null;
+                    JSONObject json = new JSONObject(response.body());
+                    implementEditableDecisionTree(json);
+                } catch (JSONException | IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+
+            @Override
+            public void onFailure(Call<String> call, Throwable t) {
+                throw new RuntimeException(t);
+            }
+        });
+    }
+
     /**
      * Start the Diagnosis activity that directly follows from this one, and exit
      * the activity.
@@ -358,10 +445,10 @@ private void exitActivity() {
         this.finish();
     }
 
-    private void createMultipleChoiceFragment(JSONObject page) throws JSONException {
+    private void createMultipleChoiceFragment(JSONObject nextPageComponent) throws JSONException {
         // Collect the important arguments from the component
-        question = page.getString("text");
-        choices = JSONArrayToListOfJSONObjects(page.getJSONArray("choices"));
+        question = nextPageComponent.getString(LABEL);
+        choices = JSONArrayToListOfJSONObjects(nextPageComponent.getJSONArray(CHOICES));
 
         // Get the new page's fragment, and set a listener for when the next button
         // is clicked
@@ -400,40 +487,51 @@ public void getResultFromTextInputFragment(int numberInputted) throws JSONExcept
         editor.apply();
 
     }
+    private void createMultiSelectFragment(JSONObject nextPageComponent) throws JSONException {
+//        // Collect the important arguments from the component
+//        question = page.getString(LABEL);
+//        choices = JSONArrayToListOfJSONObjects(page.getJSONArray(CHOICES));
+//
+//        // Get the new page's fragment, and set a listener for when the next button
+//        // is clicked
+//        MultiSelectFragment ms_fragment = MultiSelectFragment.newInstance(question, choices);
+//
+//        // Replace and commit the fragment
+//        completeFragmentTransaction(ms_fragment);
+    }
+
     /**
      * Listener for clicking the next button: we can move to the correct next
-     * page, as given by the user's sent JSON
+     * page, as given by the user's sent JSON. This one is specifically for the
+     * multiple choice fragment.
      *
      * @param choiceIndex the radiobutton choice that the user picked
      * @throws JSONException because we use json objects
      */
     @Override
     public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONException {
-        String diagnosis = choices.get(choiceIndex - 1).getString("text");
-        String nextPageName = choices.get(choiceIndex - 1).getString("link");
+        String diagnosis = choices.get(choiceIndex - 1).getString(TEXT);
+        String nextPageName = choices.get(choiceIndex - 1).getString(LINK);
         System.out.println("NEXT PAGE NAME:" + nextPageName);
 
         // Enter the diagnosis into the editor
         editor.putString(question, diagnosis);
         editor.apply();
 
-        // If the next page would be the final page, then the assessment is over!
-        // So, start up the diagnosis activity
-        if (nextPageName.equals("final_page")) {
-            exitActivity();
-            return;
-        }
-
         // Decide on the next page based on the result
-        int pagesIdx = findIndexInPagesGivenPageId(nextPageName);
-        JSONObject nextPage = pages.getJSONObject(pagesIdx);
         try {
-            getNextPage(nextPage);
+            getNextPage(nextPageName);
         } catch (JSONException e) {
             throw new RuntimeException(e);
         }
     }
 
+    /**
+     * Listener for clicking the back button: calls up the next page based on the
+     * current backstack of pages
+     *
+     * @throws JSONException if the json hates you
+     */
     @Override
     public void getLastPage() throws JSONException {
         // TODO: exit to main activity, if it's the first page
@@ -441,10 +539,8 @@ public void getLastPage() throws JSONException {
         // Get the last page JSON object that we put on to the backstack
         backstack.remove(backstack.size() - 1);
         String backPageName = backstack.get(backstack.size() - 1);
-        int pagesIndex = findIndexInPagesGivenPageId(backPageName);
-        JSONObject lastPage = pages.getJSONObject(pagesIndex);
 
-        getNextPage(lastPage);
+        getNextPage(backPageName);
     }
 
     private int findIndexInPagesGivenPageId(String pageID) throws JSONException {
@@ -457,108 +553,4 @@ private int findIndexInPagesGivenPageId(String pageID) throws JSONException {
         }
         return -1;
     }
-
-    private JSONObject createTestingJson() throws JSONException {
-
-        // Get the file that has the json in it
-//            String name1 = getFilesDir().getAbsolutePath();
-//            String name =  getApplicationContext().getApplicationInfo().dataDir + "/Activities/example.json";
-//
-//            Object o = new JsonParser().parse(new FileReader(name));
-//            JSONObject jsonStr = (JSONObject) o;
-
-        JSONObject fin = new JSONObject("{\n" +
-                "  \"pages\":\n" +
-                "  [\n" +
-                "    {\n" +
-                "      \"pageID\": \"page_1\",\n" +
-                "      \"pageTitle\": \"smoke_tobacco\",\n" +
-                "      \"content\":\n" +
-                "      [\n" +
-                "        {\n" +
-                "          \"type\": \"multiple-choice\",\n" +
-                "          \"text\": \"Does anyone in the child's home smoke tobacco?\",\n" +
-                "          \"choices\":\n" +
-                "          [\n" +
-                "            {\n" +
-                "              \"text\": \"Yes\",\n" +
-                "              \"link\": \"page_2\",\n" +
-                "              \"valueID\": \"yes\"\n" +
-                "            },\n" +
-                "            {\n" +
-                "              \"text\": \"No\",\n" +
-                "              \"link\": \"page_3\",\n" +
-                "              \"valueID\": \"no\"\n" +
-                "            },\n" +
-                "            {\n" +
-                "              \"text\": \"Not sure\",\n" +
-                "              \"link\": \"page_3\",\n" +
-                "              \"valueID\": \"unsure\"\n" +
-                "            }\n" +
-                "          ]\n" +
-                "        }\n" +
-                "      ]\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"pageID\": \"page_2\",\n" +
-                "      \"pageTitle\": \"kerosene\",\n" +
-                "      \"content\":\n" +
-                "      [\n" +
-                "        {\n" +
-                "          \"type\": \"multiple-choice\",\n" +
-                "          \"text\": \"Does any of the family members use kerosene, charcoal, or other biomass in the home?\",\n" +
-                "          \"choices\":\n" +
-                "          [\n" +
-                "            {\n" +
-                "              \"text\": \"Yes\",\n" +
-                "              \"link\": \"final_page\",\n" +
-                "              \"valueID\": \"yes\"\n" +
-                "            },\n" +
-                "            {\n" +
-                "              \"text\": \"No\",\n" +
-                "              \"link\": \"final_page\",\n" +
-                "              \"valueID\": \"no\"\n" +
-                "            },\n" +
-                "            {\n" +
-                "              \"text\": \"Not sure\",\n" +
-                "              \"link\": \"final_page\",\n" +
-                "              \"valueID\": \"unsure\"\n" +
-                "            }\n" +
-                "          ]\n" +
-                "        }\n" +
-                "      ]\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"pageID\": \"page_3\",\n" +
-                "      \"pageTitle\": \"allergies\",\n" +
-                "      \"content\":\n" +
-                "      [\n" +
-                "        {\n" +
-                "          \"type\": \"multiple-choice\",\n" +
-                "          \"text\": \"Has the child’s parents or siblings had similar breathing problems, other diseases with breathing problems or allergies?\",\n" +
-                "          \"choices\":\n" +
-                "          [\n" +
-                "            {\n" +
-                "              \"text\": \"Yes\",\n" +
-                "              \"link\": \"final_page\",\n" +
-                "              \"valueID\": \"yes\"\n" +
-                "            },\n" +
-                "            {\n" +
-                "              \"text\": \"No\",\n" +
-                "              \"link\": \"final_page\",\n" +
-                "              \"valueID\": \"no\"\n" +
-                "            },\n" +
-                "            {\n" +
-                "              \"text\": \"Not sure\",\n" +
-                "              \"link\": \"final_page\",\n" +
-                "              \"valueID\": \"unsure\"\n" +
-                "            }\n" +
-                "          ]\n" +
-                "        }\n" +
-                "      ]\n" +
-                "    }\n" +
-                "  ]\n" +
-                "}");
-        return fin;
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
index 77596d8..2719ef9 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
@@ -15,6 +15,7 @@
 
 import androidx.fragment.app.Fragment;
 
+import com.ug.air.alrite.Activities.PatientActivity;
 import com.ug.air.alrite.R;
 
 import org.json.JSONException;
@@ -185,7 +186,7 @@ private void loadSelectedChoiceIfAlreadySelected() {
     private static ArrayList<String> getTextFromChoices(ArrayList<JSONObject> list) throws JSONException {
         ArrayList<String> ret = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
-            ret.add(list.get(i).getString("text"));
+            ret.add(list.get(i).getString(PatientActivity.TEXT));
         }
         return ret;
     }

From c07fd3ce3c201425ad0701312b6830f3930a0ddf Mon Sep 17 00:00:00 2001
From: Navkiran <nav1123@icloud.com>
Date: Mon, 8 May 2023 14:57:40 -0700
Subject: [PATCH 19/50] Initial code for the text component

---
 .../Fragments/Patient/TextInputFragment.java  | 36 +++++--------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
index 742ee86..50778b0 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
@@ -1,8 +1,6 @@
 package com.ug.air.alrite.Fragments.Patient;
 
-import static com.ug.air.alrite.Fragments.Patient.Assess.S4;
 import static com.ug.air.alrite.Fragments.Patient.FTouch.TOUCH;
-import static com.ug.air.alrite.Fragments.Patient.HIVCare.CHOICEHC;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -11,7 +9,6 @@
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.renderscript.ScriptGroup;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.Gravity;
@@ -30,17 +27,15 @@
 import com.ug.air.alrite.R;
 
 import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
 
 
 public class TextInputFragment extends Fragment {
+    //Fragment wise should be done may need listener for skip
     public interface onGetResultListener {
         void getResultFromTextInputFragment(int choiceIndex) throws JSONException;
         void getLastPage() throws JSONException;
     }
-    MultipleChoiceFragment.onGetResultListener getResultListener;
+    onGetResultListener getResultListener;
     View view;
     EditText etDay;
     Button back, next, btnSkip, btnSave;
@@ -185,7 +180,7 @@ public void onClick(View v) {
     public void onAttach(Activity activity) {
         super.onAttach(activity);
         try {
-            getResultListener = (MultipleChoiceFragment.onGetResultListener) activity;
+            getResultListener = (TextInputFragment.onGetResultListener) activity;
         } catch (ClassCastException e) {
             throw new ClassCastException(activity.toString() + " must implement onSomeEventListener");
         }
@@ -223,26 +218,11 @@ public void afterTextChanged(Editable s) {
     private void saveData() {
         deleteSharedPreferences();
 
-        String assess = sharedPreferences.getString(S4, "");
-        editor.putString(Question, userInput);
-        editor.apply();
-        float tp = Float.parseFloat(userInput);
-        if (tp >= diagnosisCutoff && assess.contains("None of these")){
-            diagnosis = "Enter Diagnosis here";
-            editor.putString(TDIAGNOSIS, diagnosis);
-            editor.apply();
-            showDialog();
-        }else if (tp >= diagnosisCutoff){
-            editor.remove(TDIAGNOSIS);
-            editor.apply();
-            showDialog();
-        }else {
-            editor.remove(TDIAGNOSIS);
-            editor.apply();
-            FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
-            fr.replace(R.id.fragment_container, new Oxygen());
-            fr.addToBackStack(null);
-            fr.commit();
+        int tp = Integer.parseInt(userInput);
+        try {
+            getResultListener.getResultFromTextInputFragment(tp);
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
         }
 
     }

From 812fa5c960bcd282388d849d172f9812e3a1080f Mon Sep 17 00:00:00 2001
From: evasy <yitongshan2016@yahoo.com>
Date: Wed, 10 May 2023 14:46:18 -0700
Subject: [PATCH 20/50] multiselect ver.1.3

---
 .../Fragments/MutipleSelectionComponent.java  | 20 +++++------
 .../Patient/MultipleSelectionFragment.java    | 34 +++++++++++++------
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/MutipleSelectionComponent.java b/app/src/main/java/com/ug/air/alrite/Fragments/MutipleSelectionComponent.java
index a8bf415..37ea69b 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/MutipleSelectionComponent.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/MutipleSelectionComponent.java
@@ -30,16 +30,16 @@ public MutipleSelectionComponent() {
      * @param ChoiceValue Value which corresponds to the numbering
      * of the choice within the Map
     */
-    public void addBooleanValue(Boolean ChoiceValue, String ChoiceName) {
-            if(ChoiceName == null) {
-                throw new IllegalArgumentException("Need to have an input for the string");
-            }
-            if(ChoiceValue != true || ChoiceValue != false) {
-                throw new IllegalArgumentException("For a true or false value we need to have a" +
-                        "true or false choice answer");
-            }
-            this.TrueOrFalse.put(ChoiceValue, ChoiceName);
-    }
+//    public void addBooleanValue(Boolean ChoiceValue, String ChoiceName) {
+//            if(ChoiceName == null) {
+//                throw new IllegalArgumentException("Need to have an input for the string");
+//            }
+//            if(ChoiceValue != true || ChoiceValue != false) {
+//                throw new IllegalArgumentException("For a true or false value we need to have a" +
+//                        "true or false choice answer");
+//            }
+//            this.TrueOrFalse.put(ChoiceValue, ChoiceName);
+//    }
 
     /**
      * Add a new choice into the table
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
index e234716..97185c0 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
@@ -25,6 +25,7 @@ public class MultipleSelectionFragment extends Fragment {
 
     public interface onGetResultListener {
         public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONException;
+        void getLastPage() throws JSONException;
     }
     onGetResultListener getResultListener;
 
@@ -120,7 +121,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         backButton = view.findViewById(R.id.back);
 
         // If we've already seen this page, reload our past choices
-        loadSelectedChoicesIfAlreadySelected();
+        // loadSelectedChoicesIfAlreadySelected();
 
         // This is a listener for, if the next button is pressed, whether we can go
         // on or not, and what information should be sent up
@@ -137,8 +138,8 @@ public void onClick(View v) {
                         chosenOptions.add(id);
                     }
                 }
-                if (chosenOptions.size() <= 1) {
-                    Toast.makeText(getActivity(), "Please select more than one of the options", Toast.LENGTH_SHORT).show();
+                if (chosenOptions.size() < 1) {
+                    Toast.makeText(getActivity(), "Please select at least one of the options", Toast.LENGTH_SHORT).show();
                     return;
                 }
 
@@ -155,7 +156,7 @@ public void onClick(View v) {
                 // and start the next fragment sequence up
                 try {
                     for (int index : chosenOptionIds) {
-                        getResultListener.getResultFromMultipleChoiceFragment(index);
+                        getResultListener.getResultFromMultipleChoiceFragment(index);  // adding to the diagnosis
                     }
                 } catch (JSONException e) {
                     throw new RuntimeException(e);
@@ -163,6 +164,17 @@ public void onClick(View v) {
             }
         });
 
+        backButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                try {
+                    getResultListener.getLastPage();
+                } catch (JSONException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+
         return view;
     }
 
@@ -172,13 +184,13 @@ public void onClick(View v) {
      * through this option, pre-select the choice that we already made, so that we
      * don't get inconsistent answers from this
      */
-    private void loadSelectedChoicesIfAlreadySelected() {
-        // TODO: how to make it response multiple ones
-        SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
-        previousResponse = sharedPreferences.getString(question, DEFAULT);
-
-        //
-    }
+//    private void loadSelectedChoicesIfAlreadySelected() {
+//
+//        SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+//        previousResponse = sharedPreferences.getString(question, DEFAULT);
+//
+//        //
+//    }
 
     /**
      * This is used specifically for newInstance, and relies on the JSON being set

From b0eb7590607f05ee86d42c1489f80e795340656c Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Wed, 10 May 2023 14:56:09 -0700
Subject: [PATCH 21/50] New JSON example

---
 .../alrite/Activities/TextInputExample.json   | 131 +++++++++---------
 1 file changed, 62 insertions(+), 69 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json b/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
index 4401946..34351f7 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
+++ b/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
@@ -1,92 +1,85 @@
 {
-  "pages":
-  [
+  "name": "test",
+  "pages": [
     {
       "pageID": "page_1",
-      "pageTitle": "Text",
-      "content":
-      [
+      "title": "Patient Details",
+      "content": [
         {
-          "type": "multiple-choice",
-          "text": "Does anyone in the child's home smoke tobacco?",
-          "choices":
-          [
-            {
-              "text": "Yes",
-              "link": "page_2",
-              "valueID": "yes"
-            },
-            {
-              "text": "No",
-              "link": "page_3",
-              "valueID": "no"
-            },
-            {
-              "text": "Not sure",
-              "link": "page_3",
-              "valueID": "unsure"
-            }
-          ]
+          "label": "Enter child's initials:",
+          "type": "default",
+          "valueID": "child_initials",
+          "component": "TextInput"
+        },
+        {
+          "label": "Enter child's age:",
+          "type": "numeric",
+          "valueID": "age",
+          "units": "years",
+          "component": "TextInput"
         }
-      ]
+      ],
+      "defaultLink": "page_2"
     },
     {
       "pageID": "page_2",
-      "pageTitle": "kerosene",
-      "content":
-      [
+      "title": "Assess Patient",
+      "content": [
         {
-          "type": "multiple-choice",
-          "text": "Does any of the family members use kerosene, charcoal, or other biomass in the home?",
-          "choices":
-          [
+          "label": "What symptoms does the child have?",
+          "valueID": "child_symptoms",
+          "multiselect": true,
+          "choices": [
             {
-              "text": "Yes",
-              "link": "final_page",
-              "valueID": "yes"
+              "text": "Uncontrolled jerking or convulsions",
+              "value": "convulsions",
+              "link": "page_1"
             },
             {
-              "text": "No",
-              "link": "final_page",
-              "valueID": "no"
+              "text": "Unresponsive or no awareness of surroundings",
+              "value": "unresponsive",
+              "link": "page_1"
             },
             {
-              "text": "Not sure",
-              "link": "final_page",
-              "valueID": "unsure"
+              "text": "Vomiting everything",
+              "value": "vomiting",
+              "link": "page_1"
             }
-          ]
+          ],
+          "component": "MultipleChoice"
+        },
+        {
+          "type": "at_least_one",
+          "targetValueID": "child_symptoms",
+          "satisfiedLink": "page_3",
+          "component": "Selection"
         }
-      ]
+      ],
+      "defaultLink": "page_4"
     },
     {
       "pageID": "page_3",
-      "pageTitle": "allergies",
-      "content":
-      [
+      "title": "Severe Disease",
+      "content": [
         {
-          "type": "multiple-choice",
-          "text": "Has the child’s parents or siblings had similar breathing problems, other diseases with breathing problems or allergies?",
-          "choices":
-          [
-            {
-              "text": "Yes",
-              "link": "final_page",
-              "valueID": "yes"
-            },
-            {
-              "text": "No",
-              "link": "final_page",
-              "valueID": "no"
-            },
-            {
-              "text": "Not sure",
-              "link": "final_page",
-              "valueID": "unsure"
-            }
-          ]
+          "fileName": "test.mp3",
+          "label": "something something idk",
+          "component": "MediaItem"
         }
-      ]
+      ],
+      "defaultLink": "page_4"
+    },
+    {
+      "pageID": "page_4",
+      "title": "Diagnosis Page",
+      "content": [],
+      "defaultLink": "page_1"
     }
-  ]
+  ],
+  "meta": {
+    "version": 4,
+    "apipath": "/alrite/apis/workflows/test/4/",
+    "time_created": "2023-05-01 23:01:05.383028+00:00",
+    "created_by": null
+  }
 }
\ No newline at end of file

From ddfda8d8169e765a024c9a3badbf7acfad54e6c0 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Wed, 10 May 2023 15:03:35 -0700
Subject: [PATCH 22/50] New JSON example + comparison logic

---
 .../com/ug/air/alrite/Activities/TextInputExample.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json b/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
index 34351f7..e7e959d 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
+++ b/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
@@ -12,11 +12,11 @@
           "component": "TextInput"
         },
         {
-          "label": "Enter child's age:",
-          "type": "numeric",
-          "valueID": "age",
-          "units": "years",
-          "component": "TextInput"
+          "type": "=",
+          "valueID": "child_initials",
+          "threshold": "IN",
+          "satisfiedLink": "page_4",
+          "notSatisfiedLink": "page_2"
         }
       ],
       "defaultLink": "page_2"

From cb597438e6968c2894348f3d7c3090822041abfa Mon Sep 17 00:00:00 2001
From: Navkiran <nav1123@icloud.com>
Date: Wed, 10 May 2023 15:44:57 -0700
Subject: [PATCH 23/50] Added more code for the textInput

---
 .../alrite/Activities/PatientActivity.java    | 109 +++++++++++++-----
 1 file changed, 79 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 7547727..1278f74 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -23,18 +23,14 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
 import com.makeramen.roundedimageview.BuildConfig;
 import com.ug.air.alrite.APIs.ApiClient;
 import com.ug.air.alrite.APIs.DecisionTreeJSON;
-import com.ug.air.alrite.APIs.JsonPlaceHolder;
 import com.ug.air.alrite.Fragments.Patient.ActivePatients;
 import com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment;
 import com.ug.air.alrite.Fragments.Patient.OtherPatients;
@@ -46,16 +42,8 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.nio.file.Path;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -63,16 +51,11 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Callback;
-import retrofit2.Retrofit;
 import retrofit2.Response;
 
 public class PatientActivity extends AppCompatActivity implements MultipleChoiceFragment.onGetResultListener {
@@ -290,12 +273,14 @@ private void doLogic(String file) {
      ArrayList<String> backstack;
      // Other than question there is more information needed
      // from the JSON for text input
-     String InputHint;
-     String InputInformation;
-     String SkipInformation;
-     int MinValue;
-     int MaxValue;
-     int diagnosisCutoff;
+     String InputHint; //The preview text shown in the input bubble (enter the value here)  *optional (prefer this not to be optional)
+    String InputInformation; //Extra stuff below the input bubble telling user more information (its in celcius) *optional
+    String SkipInformation; //Text shown above the skip button telling user when to skip (no thermometer available) *optional
+    int MinValue; //The minimum value allowed to be inputted
+    int MaxValue; //The maximum value allowed to be inputted
+    int diagnosisCutoff; //The minimum value to be inputted in order to get the diagnosis
+     JSONObject pageID;
+    String targetValue_id;
 
     /**
      *
@@ -377,6 +362,7 @@ private void getNextPage(String nextPageID) throws JSONException {
             exitActivity();
             return;
         }
+        pageID = nextPageJSON;
 
         // Then, for each component that we're given within the page, display a
         // fragment for that component.
@@ -471,6 +457,7 @@ private void createTextInputFragment(JSONObject page) throws JSONException {
         MinValue = page.getInt("");
         MaxValue = page.getInt("");
         diagnosisCutoff = page.getInt("");
+        targetValue_id = page.getString("valueID");
 
         // Get the new page's fragment, and set a listener for when the next button
         // is clicked
@@ -480,13 +467,6 @@ private void createTextInputFragment(JSONObject page) throws JSONException {
         // Replace and commit the fragment
         completeFragmentTransaction(ti_fragment);
     }
-    public void getResultFromTextInputFragment(int numberInputted) throws JSONException {
-        String diagnosis = "";
-        // Enter the diagnosis into the editor
-        editor.putString(question, diagnosis);
-        editor.apply();
-
-    }
     private void createMultiSelectFragment(JSONObject nextPageComponent) throws JSONException {
 //        // Collect the important arguments from the component
 //        question = page.getString(LABEL);
@@ -526,6 +506,75 @@ public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONExce
         }
     }
 
+    public void getResultFromTextInputFragment(int numberInputted) throws JSONException {
+        String diagnosis = String.valueOf(numberInputted);
+        JSONObject foundLink = getContentFromPageID(pageID, targetValue_id);;
+        String NextPage;
+        if(foundLink == null) {
+            NextPage =  pageID.getString("defaultLink");
+        } else {
+            // Replace BranchedLink with whatever the name is for the link field
+            // once the branched link logic is completed in the JSON file
+            if(foundLink.get("type").equals(">")) {
+                if (numberInputted > diagnosisCutoff) {
+                    NextPage = foundLink.getString("satisfiedLink");
+                } else {
+                    NextPage = foundLink.getString("notSatisfiedLink");
+                }
+            } else if(foundLink.get("type").equals("<")) {
+                if (numberInputted < diagnosisCutoff) {
+                    NextPage = foundLink.getString("satisfiedLink");
+                } else {
+                    NextPage = foundLink.getString("notSatisfiedLink");
+                }
+            } else {
+                if (numberInputted == diagnosisCutoff) {
+                    NextPage = foundLink.getString("satisfiedLink");
+                } else {
+                    NextPage = foundLink.getString("notSatisfiedLink");
+                }
+            }
+        }
+        // Enter the diagnosis into the editor
+        editor.putString(question, diagnosis);
+        editor.apply();
+        try {
+            getNextPage(NextPage);
+        } catch(JSONException e) {
+            throw new RuntimeException();
+        }
+    }
+
+    /**
+     * Takes the page id and returns where we wish to go
+     *
+     * @param pageid the page ID we wish to use
+     * @param targetValueID the valueID of the current component that we are using
+     * @return
+     */
+    public JSONObject getContentFromPageID(JSONObject pageid, String targetValueID) throws JSONException {
+        JSONArray contentVal;
+        if(pageid != null) {
+            try {
+                // Get the content from the JSONArray
+                contentVal = pageid.getJSONArray("content");
+            } catch (JSONException e) {
+                throw new RuntimeException(e);
+            }
+            for(int i = 0; i < contentVal.length(); i++ ) {
+                // Check to see if the ID's match up
+                // With the build in has method
+                JSONObject RetrievedTargetID = ((JSONObject)contentVal.get(i));
+                if ( RetrievedTargetID.has("targetValueID")) {
+                    if(RetrievedTargetID.get("targetValueID").equals(targetValueID)) {
+                        return RetrievedTargetID;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
     /**
      * Listener for clicking the back button: calls up the next page based on the
      * current backstack of pages

From 4d1718b869b78ce4b293480140fab4d6f3187352 Mon Sep 17 00:00:00 2001
From: evasy <yitongshan2016@yahoo.com>
Date: Fri, 12 May 2023 16:53:55 -0700
Subject: [PATCH 24/50] multiselect ver.2

---
 .../alrite/Activities/PatientActivity.java    | 60 +++++++++++++++----
 .../Patient/MultipleSelectionFragment.java    | 11 ++--
 2 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 1278f74..4d19c34 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -33,6 +33,7 @@
 import com.ug.air.alrite.APIs.DecisionTreeJSON;
 import com.ug.air.alrite.Fragments.Patient.ActivePatients;
 import com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment;
+import com.ug.air.alrite.Fragments.Patient.MultipleSelectionFragment;
 import com.ug.air.alrite.Fragments.Patient.OtherPatients;
 import com.ug.air.alrite.Fragments.Patient.TextInputFragment;
 import com.ug.air.alrite.R;
@@ -44,6 +45,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Array;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -280,7 +282,8 @@ private void doLogic(String file) {
     int MaxValue; //The maximum value allowed to be inputted
     int diagnosisCutoff; //The minimum value to be inputted in order to get the diagnosis
      JSONObject pageID;
-    String targetValue_id;
+    String targetValue_id; // for text input
+    String targetValueID; // for multiple selection
 
     /**
      *
@@ -467,19 +470,26 @@ private void createTextInputFragment(JSONObject page) throws JSONException {
         // Replace and commit the fragment
         completeFragmentTransaction(ti_fragment);
     }
-    private void createMultiSelectFragment(JSONObject nextPageComponent) throws JSONException {
-//        // Collect the important arguments from the component
-//        question = page.getString(LABEL);
-//        choices = JSONArrayToListOfJSONObjects(page.getJSONArray(CHOICES));
-//
-//        // Get the new page's fragment, and set a listener for when the next button
-//        // is clicked
-//        MultiSelectFragment ms_fragment = MultiSelectFragment.newInstance(question, choices);
-//
-//        // Replace and commit the fragment
-//        completeFragmentTransaction(ms_fragment);
+
+    /**
+     * Fragment for multiple selection
+     *
+     * @throws JSONException because we use json objects
+     */
+    private void createMultiSelectFragment(JSONObject page) throws JSONException {
+        question = page.getString(LABEL);
+        choices = JSONArrayToListOfJSONObjects(page.getJSONArray(CHOICES));
+        targetValueID = page.getString("targetValueID");
+
+        // Get the new page's fragment
+        // set a listener for when the next button is clicked
+        MultipleSelectionFragment ms_fragment = MultipleSelectionFragment.newInstance(question, choices);
+
+        // Replace and commit the fragment
+        completeFragmentTransaction(ms_fragment);
     }
 
+
     /**
      * Listener for clicking the next button: we can move to the correct next
      * page, as given by the user's sent JSON. This one is specifically for the
@@ -506,6 +516,32 @@ public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONExce
         }
     }
 
+    public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOptionIds) throws JSONException {
+        // add the selected choices to the diagnosis
+        for (int choiceIndex : chosenOptionIds) {
+            String diagnosis = choices.get(choiceIndex - 1).getString(TEXT);
+            // Enter the diagnosis into the editor
+            editor.putString(question, diagnosis);
+            editor.apply();
+        }
+
+        JSONObject foundLink = getContentFromPageID(pageID, targetValueID);
+        String NextPage;
+        if (foundLink == null) {
+            NextPage =  pageID.getString("defaultLink");
+        }
+        else {
+            NextPage = foundLink.getString("satisfiedLink");
+        }
+
+        // Decide on the next page based on the result
+        try {
+            getNextPage(NextPage);
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public void getResultFromTextInputFragment(int numberInputted) throws JSONException {
         String diagnosis = String.valueOf(numberInputted);
         JSONObject foundLink = getContentFromPageID(pageID, targetValue_id);;
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
index 97185c0..b90cdf4 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
@@ -19,12 +19,13 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 
 public class MultipleSelectionFragment extends Fragment {
 
     public interface onGetResultListener {
-        public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONException;
+        public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOptions) throws JSONException;
         void getLastPage() throws JSONException;
     }
     onGetResultListener getResultListener;
@@ -155,11 +156,9 @@ public void onClick(View v) {
                 // Send the result back up to main: a listener there will trigger
                 // and start the next fragment sequence up
                 try {
-                    for (int index : chosenOptionIds) {
-                        getResultListener.getResultFromMultipleChoiceFragment(index);  // adding to the diagnosis
-                    }
-                } catch (JSONException e) {
-                    throw new RuntimeException(e);
+                        getResultListener.getResultFromMultipleSelectionFragment(chosenOptionIds);  // adding to the diagnosis
+                    } catch (JSONException ex) {
+                    throw new RuntimeException(ex);
                 }
             }
         });

From 120b23a814ea9b1fda983f3e8cf74897c69fb27d Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Fri, 12 May 2023 17:12:13 -0700
Subject: [PATCH 25/50] DecisionTreeJSON class created

---
 .../java/com/ug/air/alrite/APIs/DecisionTreeJSON.java | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java

diff --git a/app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java b/app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java
new file mode 100644
index 0000000..46020e0
--- /dev/null
+++ b/app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java
@@ -0,0 +1,11 @@
+package com.ug.air.alrite.APIs;
+
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+
+public interface DecisionTreeJSON {
+
+    @GET("/alrite/apis/workflows/test/")
+    Call<String> getJson();
+}

From 27a702fc22d44c68df74ba2cb138a7a3d2288b7f Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Fri, 12 May 2023 17:28:47 -0700
Subject: [PATCH 26/50] Everything that I worked on is in here...

---
 .idea/misc.xml                                |   2 +-
 .../alrite/Activities/DiagnosisActivity.java  | 271 +++++++++---------
 .../alrite/Activities/PatientActivity.java    |  21 +-
 .../air/alrite/Activities/SplashActivity.java |  17 +-
 .../alrite/Activities/TextInputExample.json   |  17 +-
 .../air/alrite/Adapters/DiagnosisAdapter.java |   1 -
 .../Fragments/Patient/ActivePatients.java     | 147 +++++-----
 .../air/alrite/Fragments/Patient/Assess.java  |  50 ++--
 .../alrite/Fragments/Patient/Breathless.java  |   3 -
 .../Fragments/Patient/Bronchodilator.java     |  19 +-
 .../Fragments/Patient/Bronchodilator2.java    |  14 +-
 .../Fragments/Patient/Bronchodilator3.java    |  13 +-
 .../Fragments/Patient/ChestIndrawing.java     |  25 +-
 .../air/alrite/Fragments/Patient/Cough.java   |  19 +-
 .../air/alrite/Fragments/Patient/CoughD.java  |  27 +-
 .../air/alrite/Fragments/Patient/FTouch.java  |  12 +-
 .../air/alrite/Fragments/Patient/Fever.java   |   6 +-
 .../alrite/Fragments/Patient/Initials.java    |  42 +--
 .../air/alrite/Fragments/Patient/Nasal.java   |  10 +-
 .../Fragments/Patient/OtherPatients.java      |  40 ++-
 .../air/alrite/Fragments/Patient/Oxygen.java  |   8 +-
 .../alrite/Fragments/Patient/RRCounter.java   |  16 +-
 .../ug/air/alrite/Fragments/Patient/Sex.java  | 145 +++++-----
 .../air/alrite/Fragments/Patient/Stridor.java |   8 +-
 .../alrite/Fragments/Patient/Temperature.java |  12 +-
 .../Fragments/Patient/TextInputFragment.java  |   2 +-
 .../alrite/Fragments/Patient/Wheezing.java    |  58 ++--
 .../Fragments/navigation/AccountFragment.java |   3 +-
 .../ug/air/alrite/Worker/NotifyWorker.java    |  26 +-
 .../ug/air/alrite/Worker/NotifyWorker2.java   |  19 +-
 .../ug/air/alrite/Worker/NotifyWorker3.java   |  17 +-
 .../ug/air/alrite/Worker/NotifyWorker4.java   |   2 +-
 app/src/main/res/layout/fragment_account.xml  |   2 +-
 33 files changed, 510 insertions(+), 564 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index b407079..d525b46 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -148,7 +148,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivity.java
index dbe362a..88e1c14 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivity.java
@@ -2,13 +2,13 @@
 
 import static com.ug.air.alrite.Activities.FinalActivity.S6;
 import static com.ug.air.alrite.Activities.FinalActivity.S7;
-import static com.ug.air.alrite.Activities.PatientActivity.INCOMPLETE;
+import static com.ug.air.alrite.Activities.PatientActivity.ASSESS_INCOMPLETE;
 import static com.ug.air.alrite.Fragments.Patient.Allergies.CHOICEY2;
-import static com.ug.air.alrite.Fragments.Patient.Assess.DIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Assess.FINAL_DIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Assess.S4;
+import static com.ug.air.alrite.Fragments.Patient.Assess.SEVERE_SYMPTOMS;
 import static com.ug.air.alrite.Fragments.Patient.Breathless.S5;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.BRONCHODILATOR;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.BRONCHODILATOR_WAS_GIVEN;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USED_BRONCHODILATOR;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DATE;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DURATION;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.FILENAME;
@@ -17,13 +17,13 @@
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator2.BDIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator2.REASON;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.B3DIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.BRONC;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.AFTER_BRONCHODILATOR;
 import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.CHOICE7;
 import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.CHOICE72;
 import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.CIDIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.POINT;
 import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.POINT2;
-import static com.ug.air.alrite.Fragments.Patient.Cough.CHOICE2;
+import static com.ug.air.alrite.Fragments.Patient.Cough.DIFFICULTY_BREATHING;
 import static com.ug.air.alrite.Fragments.Patient.Cough.NODIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.CoughD.DAY1;
 import static com.ug.air.alrite.Fragments.Patient.Eczema.CHOICEX2;
@@ -32,35 +32,31 @@
 import static com.ug.air.alrite.Fragments.Patient.HIVCare.CHOICEHC;
 import static com.ug.air.alrite.Fragments.Patient.HIVStatus.CHOICE3;
 import static com.ug.air.alrite.Fragments.Patient.HIVStatus.HDIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Initials.CIN;
+import static com.ug.air.alrite.Fragments.Patient.Initials.CHILD_INITIALS;
 import static com.ug.air.alrite.Fragments.Patient.Initials.INITIAL_DATE;
-import static com.ug.air.alrite.Fragments.Patient.Initials.PIN;
+import static com.ug.air.alrite.Fragments.Patient.Initials.PARENT_INITIALS;
 import static com.ug.air.alrite.Fragments.Patient.Kerosene.ADIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Kerosene.CHOICET2;
 import static com.ug.air.alrite.Fragments.Patient.Kerosene.TUDIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Nasal.CHOICEGN;
-import static com.ug.air.alrite.Fragments.Patient.Nasal.GNDIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Oxygen.OXDIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Oxygen.OXY;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.FASTBREATHING;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.FASTBREATHING2;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.INITIAL_DATE_2;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.SECOND;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE2;
-import static com.ug.air.alrite.Fragments.Patient.Sex.CHOICE;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_MONTHS;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_YEARS;
+import static com.ug.air.alrite.Fragments.Patient.Sex.SEX;
 import static com.ug.air.alrite.Fragments.Patient.Sex.KILO;
 import static com.ug.air.alrite.Fragments.Patient.Sex.MDIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Sex.MUAC;
 import static com.ug.air.alrite.Fragments.Patient.Smoke.CHOICET1;
 import static com.ug.air.alrite.Fragments.Patient.Stridor.CHOICE6;
-import static com.ug.air.alrite.Fragments.Patient.Stridor.STDIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Temperature.TDIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Temperature.TEMP;
 import static com.ug.air.alrite.Fragments.Patient.WheezD.CHOICEX;
 import static com.ug.air.alrite.Fragments.Patient.WheezY.DAY2;
-import static com.ug.air.alrite.Fragments.Patient.Wheezing.CHECKSTETHO;
-import static com.ug.air.alrite.Fragments.Patient.Wheezing.CHOICE8;
+import static com.ug.air.alrite.Fragments.Patient.Wheezing.WHEEZING_SOUNDS;
 import static com.ug.air.alrite.Fragments.Patient.Wheezing.CHOICE82;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -71,7 +67,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Gravity;
@@ -111,10 +106,10 @@
 
 public class DiagnosisActivity extends AppCompatActivity {
 
-    LinearLayout linearLayout1, linearLayout2, linearLayout3, linearLayout4;
+    LinearLayout summaryTabLayout, summaryExpandedLayout, diagnosisTabLayout, diagnosisExpandedLayout;
     Button btnExit, btnExit2, btnContinue, btnSave;
-    ImageView imageView1, imageView2;
-    RecyclerView recyclerView1, recyclerView2;
+    ImageView summaryTabIcon, diagnosisTabIcon;
+    RecyclerView summaryListRV, diagnosisListRV;
     TextView txtInitials, txtAge, txtGender;
     DiagnosisAdapter diagnosisAdapter;
     SummaryAdapter summaryAdapter;
@@ -127,7 +122,7 @@ public class DiagnosisActivity extends AppCompatActivity {
     public static final String DURATION_2 = "duration_2";
     SharedPreferences sharedPreferences, sharedPreferences1;
     SharedPreferences.Editor editor, editor1;
-    String age, uniqueID, age2, folder, value;
+    String ageInYears, uniqueID, ageInMonths, folder, isPending;
     float ag;
     Dialog dialog;
     RecyclerView recyclerView;
@@ -142,20 +137,23 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_diagnosis);
 
+        // Get references to page objects
         txtAge = findViewById(R.id.patient_age);
         txtGender = findViewById(R.id.patient_sex);
         txtInitials = findViewById(R.id.initials);
-        imageView1 = findViewById(R.id.accordion);
-        linearLayout1 = findViewById(R.id.clickable);
-        linearLayout2 = findViewById(R.id.summary2);
-        recyclerView1 = findViewById(R.id.recyclerView1);
-        imageView2 = findViewById(R.id.accordion2);
-        linearLayout3 = findViewById(R.id.clickable2);
-        linearLayout4 = findViewById(R.id.summary3);
+        summaryTabIcon = findViewById(R.id.accordion);
+        summaryTabLayout = findViewById(R.id.clickable);
+        summaryExpandedLayout = findViewById(R.id.summary2);
+        summaryListRV = findViewById(R.id.recyclerView1);
+        diagnosisTabIcon = findViewById(R.id.accordion2);
+        diagnosisTabLayout = findViewById(R.id.clickable2);
+        diagnosisExpandedLayout = findViewById(R.id.summary3);
         btnExit = findViewById(R.id.btnExit);
         btnSave = findViewById(R.id.btnExit2);
-        recyclerView2 = findViewById(R.id.recyclerView2);
+        diagnosisListRV = findViewById(R.id.recyclerView2);
 
+        // If we have "filename" then we should get the SharedPreferences object
+        // associated with the filename
         Intent intent = getIntent();
         if (intent.hasExtra("filename")){
             folder = intent.getExtras().getString("filename");
@@ -164,6 +162,10 @@ protected void onCreate(Bundle savedInstanceState) {
             String pending = sharedPreferences.getString(PENDING, "");
 //            String incomplete = sharedPreferences.getString(INCOMPLETE, "");
 
+            // If we've opened this page before and indicated that we don't want
+            // to exit, then this time we'll be forced to exit.
+            // If we indicated last time that we want to save and exit, then make
+            // sure that we can't press either of those buttons again
             if (pending.equals("pending")){
                 btnSave.setVisibility(View.GONE);
                 btnExit.setVisibility(View.VISIBLE);
@@ -172,11 +174,16 @@ protected void onCreate(Bundle savedInstanceState) {
                 btnExit.setVisibility(View.GONE);
             }
 
+        // If we don't have "filename" then we should get the generic shared preferences,
+        // and then check in on what we entered for the bronchodilator
         }else{
             sharedPreferences = getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
-            String bron = sharedPreferences.getString(BRONCHODILATOR, "");
-            String fin = sharedPreferences.getString(BRONC, "");
-            if (bron.equals("Bronchodialtor Given") && fin.isEmpty()){
+            String bron = sharedPreferences.getString(USED_BRONCHODILATOR, "");
+            String fin = sharedPreferences.getString(AFTER_BRONCHODILATOR, "");
+
+            // If we used a bronchodilator on the patient, but we haven't checked
+            // in on if it worked or not, then set buttons as visible/not visible
+            if (bron.equals(BRONCHODILATOR_WAS_GIVEN) && fin.isEmpty()){
                 btnSave.setVisibility(View.GONE);
             }else {
                 btnSave.setVisibility(View.VISIBLE);
@@ -184,73 +191,77 @@ protected void onCreate(Bundle savedInstanceState) {
             btnExit.setVisibility(View.VISIBLE);
         }
 
+        // Get an editor for our shared preferences
         editor = sharedPreferences.edit();
 
-        String initials = sharedPreferences.getString(CIN, "");
-        age2 = sharedPreferences.getString(AGE, "");
-        age = sharedPreferences.getString(AGE2, "");
-        String[] split = age.split("\\.");
-        ag = Float.parseFloat(age2);
-        String gender = sharedPreferences.getString(CHOICE, "");
+        // Save the patient's age, for reference in the diagnosis instructions
+        ageInMonths = sharedPreferences.getString(AGE_IN_MONTHS, "");
+
+        // At the top of the page, display the patient's initials, age, and gender
+        String initials = sharedPreferences.getString(CHILD_INITIALS, "");
+        ageInYears = sharedPreferences.getString(AGE_IN_YEARS, "");
+        String[] ageInYearsSplit = ageInYears.split("\\.");
+        String gender = sharedPreferences.getString(SEX, "");
         txtInitials.setText(initials);
-        txtAge.setText("Age: " + split[0] + " years and " + split[1] + " months");
+        txtAge.setText("Age: " + ageInYearsSplit[0] + " years and " + ageInYearsSplit[1] + " months");
         txtGender.setText("Gender: " + gender);
 
-        linearLayout1.setOnClickListener(new View.OnClickListener() {
+        // Click on the summary tab to expand it to show a summary of the patient's health
+        summaryTabLayout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (linearLayout2.getVisibility() == View.GONE){
-                    linearLayout2.setVisibility(View.VISIBLE);
-                    imageView1.setImageResource(R.drawable.ic_sub);
+                if (summaryExpandedLayout.getVisibility() == View.GONE){
+                    summaryExpandedLayout.setVisibility(View.VISIBLE);
+                    summaryTabIcon.setImageResource(R.drawable.ic_sub);
                 }else{
-                    linearLayout2.setVisibility(View.GONE);
-                    imageView1.setImageResource(R.drawable.ic_add);
+                    summaryExpandedLayout.setVisibility(View.GONE);
+                    summaryTabIcon.setImageResource(R.drawable.ic_add);
                 }
             }
         });
 
-        LinearLayoutManager layoutManager1 = new LinearLayoutManager(DiagnosisActivity.this);
+        // Add the list to be expanded + a manager to expand it
+        LinearLayoutManager summaryLayoutManager = new LinearLayoutManager(DiagnosisActivity.this);
         summaryAdapter = new SummaryAdapter(buildSummaryList());
-        recyclerView1.setAdapter(summaryAdapter);
-        recyclerView1.setLayoutManager(layoutManager1);
+        summaryListRV.setAdapter(summaryAdapter);
+        summaryListRV.setLayoutManager(summaryLayoutManager);
 
-        linearLayout3.setOnClickListener(new View.OnClickListener() {
+        // Same for diagnosis tab
+        diagnosisTabLayout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (linearLayout4.getVisibility() == View.GONE){
-                    linearLayout4.setVisibility(View.VISIBLE);
-                    imageView2.setImageResource(R.drawable.ic_sub);
+                if (diagnosisExpandedLayout.getVisibility() == View.GONE){
+                    diagnosisExpandedLayout.setVisibility(View.VISIBLE);
+                    diagnosisTabIcon.setImageResource(R.drawable.ic_sub);
                 }else{
-                    linearLayout4.setVisibility(View.GONE);
-                    imageView2.setImageResource(R.drawable.ic_add);
+                    diagnosisExpandedLayout.setVisibility(View.GONE);
+                    diagnosisTabIcon.setImageResource(R.drawable.ic_add);
                 }
             }
         });
 
-        LinearLayoutManager layoutManager2 = new LinearLayoutManager(DiagnosisActivity.this);
-        diagnosisAdapter = new DiagnosisAdapter(buildItemList());
-        recyclerView2.setAdapter(diagnosisAdapter);
-        recyclerView2.setLayoutManager(layoutManager2);
+        LinearLayoutManager diagnosisLayoutManager = new LinearLayoutManager(DiagnosisActivity.this);
+        diagnosisAdapter = new DiagnosisAdapter(buildDiagnosisList());
+        diagnosisListRV.setAdapter(diagnosisAdapter);
+        diagnosisListRV.setLayoutManager(diagnosisLayoutManager);
 
+        // Inside of the expanded diagnosis tab, if we click on one of the diagnoses,
+        // expand the tab and give instructions on what to do
         diagnosisAdapter.setOnItemClickListener(new DiagnosisAdapter.OnItemClickListener() {
             @Override
             public void onClick(int position) {
-                Diagnosis diagnosis = buildItemList().get(position);
+                Diagnosis diagnosis = buildDiagnosisList().get(position);
                 String dia = diagnosis.getDiagnosis();
                 showInstructions(dia);
 //                Toast.makeText(DiagnosisActivity.this, dia, Toast.LENGTH_SHORT).show();
             }
-
-            @Override
-            public void onClick2(int position) {
-
-            }
         });
 
+        // If we click "save and complete" then set PENDING to false and
         btnExit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                value = "not pending";
+                isPending = "not pending";
                 saveForm();
             }
         });
@@ -258,7 +269,7 @@ public void onClick(View v) {
         btnSave.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                value = "pending";
+                isPending = "pending";
                 saveForm();
             }
         });
@@ -310,7 +321,7 @@ public void onClick(View v) {
 
     }
 
-    private List<Diagnosis> buildItemList() {
+    private List<Diagnosis> buildDiagnosisList() {
         List<Diagnosis> diagnosisList = new ArrayList<>();
 
         String mDiagnosis = sharedPreferences.getString(MDIAGNOSIS, "");
@@ -332,20 +343,20 @@ private List<Diagnosis> buildItemList() {
 //            addToList2("Severe Pneumonia OR very Severe Disease");
 //        }
 
-        addToList2(oneDiagnosis);
-        addToList2(mDiagnosis);
-        addToList2(tDiagnosis);
+        addToDiagnosisList(oneDiagnosis);
+        addToDiagnosisList(mDiagnosis);
+        addToDiagnosisList(tDiagnosis);
 //        addToList2(oxDiagnosis);
-        addToList2(noDiagnosis);
-        addToList2(hDiagnosis);
+        addToDiagnosisList(noDiagnosis);
+        addToDiagnosisList(hDiagnosis);
 //        addToList2(stDiagnosis);
 //        addToList2(gnDiagnosis);
-        addToList2(ciDiagnosis);
-        addToList2(wDiagnosis);
-        addToList2(asDiagnosis);
-        addToList2(tuDiagnosis);
-        addToList2(b3Diagnosis);
-        addToList2(ftDiagnosis);
+        addToDiagnosisList(ciDiagnosis);
+        addToDiagnosisList(wDiagnosis);
+        addToDiagnosisList(asDiagnosis);
+        addToDiagnosisList(tuDiagnosis);
+        addToDiagnosisList(b3Diagnosis);
+        addToDiagnosisList(ftDiagnosis);
 
 
         for (int i=0; i < messages.size(); i++) {
@@ -369,16 +380,16 @@ private List<Assessment> buildSubItemList(String s) {
 
     private List<Summary> buildSummaryList(){
         summaryList = new ArrayList<>();
-        String pin = sharedPreferences.getString(PIN, "");
+        String pin = sharedPreferences.getString(PARENT_INITIALS, "");
         String weight = sharedPreferences.getString(KILO, "");
         String muac = sharedPreferences.getString(MUAC, "");
-        String assess = sharedPreferences.getString(S4, "");
+        String assess = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
         String temp = sharedPreferences.getString(TEMP, "");
         String feb = sharedPreferences.getString(TOUCH, "");
         String ox = sharedPreferences.getString(OXY, "");
-        String wheez = sharedPreferences.getString(CHOICE8, "");
+        String wheez = sharedPreferences.getString(WHEEZING_SOUNDS, "");
         String wheez2 = sharedPreferences.getString(CHOICE82, "");
-        String cough = sharedPreferences.getString(CHOICE2, "");
+        String cough = sharedPreferences.getString(DIFFICULTY_BREATHING, "");
         String hiv = sharedPreferences.getString(CHOICE3, "");
         String care = sharedPreferences.getString(CHOICEHC, "");
         String coughD = sharedPreferences.getString(DAY1, "");
@@ -388,7 +399,7 @@ private List<Summary> buildSummaryList(){
         String nasal = sharedPreferences.getString(CHOICEGN, "");
         String chest = sharedPreferences.getString(CHOICE7, "");
         String chest2 = sharedPreferences.getString(CHOICE72, "");
-        String bronch = sharedPreferences.getString(BRONCHODILATOR, "");
+        String bronch = sharedPreferences.getString(USED_BRONCHODILATOR, "");
         String reason = sharedPreferences.getString(REASON, "");
         String wheezD = sharedPreferences.getString(CHOICEX, "");
         String wheezY = sharedPreferences.getString(DAY2, "");
@@ -398,58 +409,58 @@ private List<Summary> buildSummaryList(){
         String smoke = sharedPreferences.getString(CHOICET1, "");
         String kerosene = sharedPreferences.getString(CHOICET2, "");
         String fastbreathing2 = sharedPreferences.getString(FASTBREATHING2, "");
-        String better = sharedPreferences.getString(BRONC, "");
+        String better = sharedPreferences.getString(AFTER_BRONCHODILATOR, "");
         String point1 = sharedPreferences.getString(POINT, "");
         String point2 = sharedPreferences.getString(POINT2, "");
         String diagnosis = sharedPreferences.getString(S7, "");
         String treatment = sharedPreferences.getString(S6, "");
 
-        addToList("Parent's initials", pin);
-        addToList("Child's weight", weight);
-        addToList("MUAC value", muac);
-        addToList("Danger Signs", assess);
-        addToList("Child Coughing", cough);
-        addToList("Days coughing", coughD);
-        addToList("Temperature", temp);
-        addToList("Febrile to touch", feb);
-        addToList("HIV Status", hiv);
-        addToList("Child in HIV Care", care);
-        addToList("Oxgyen Saturation", ox);
-        addToList("Respiratory Rate", fastbreathing);
-        addToList("Child has Stridor", stidor);
-        addToList("Child Wheezing", wheez);
+        addToSummaryList("Parent's initials", pin);
+        addToSummaryList("Child's weight", weight);
+        addToSummaryList("MUAC value", muac);
+        addToSummaryList("Danger Signs", assess);
+        addToSummaryList("Child Coughing", cough);
+        addToSummaryList("Days coughing", coughD);
+        addToSummaryList("Temperature", temp);
+        addToSummaryList("Febrile to touch", feb);
+        addToSummaryList("HIV Status", hiv);
+        addToSummaryList("Child in HIV Care", care);
+        addToSummaryList("Oxgyen Saturation", ox);
+        addToSummaryList("Respiratory Rate", fastbreathing);
+        addToSummaryList("Child has Stridor", stidor);
+        addToSummaryList("Child Wheezing", wheez);
 //        addToList("Stethoscope was used", String.valueOf(steth));
-        addToList("Child has grunting or nasal flaring", nasal);
-        addToList("Child has chest indrawing", chest);
-        addToList("Respiratory score", point1);
-        addToList("Bronchodilator", bronch);
-        addToList("Reason", reason);
-        addToList("Respiratory Rate (After bronchodilator)", fastbreathing2);
-        addToList("Child Wheezing", wheez2);
-        addToList("Child has chest indrawing", chest2);
-        addToList("Child's breathing after bronchodilator", better);
-        addToList("Respiratory score 2", point2);
-        addToList("Child has breathing difficulty", wheezD);
-        addToList("Episodes in the past year", wheezY);
-        addToList("Child his breathless", breathless);
-        addToList("Child has Eczema", eczema);
-        addToList("Child's family has Allergies", allergies);
-        addToList("Any family member smoking tobacco", smoke);
-        addToList("Any family member using kerosene", kerosene);
-        addToList("Clinician's diagnosis", diagnosis);
-        addToList("Clinician's treatment", treatment);
+        addToSummaryList("Child has grunting or nasal flaring", nasal);
+        addToSummaryList("Child has chest indrawing", chest);
+        addToSummaryList("Respiratory score", point1);
+        addToSummaryList("Bronchodilator", bronch);
+        addToSummaryList("Reason", reason);
+        addToSummaryList("Respiratory Rate (After bronchodilator)", fastbreathing2);
+        addToSummaryList("Child Wheezing", wheez2);
+        addToSummaryList("Child has chest indrawing", chest2);
+        addToSummaryList("Child's breathing after bronchodilator", better);
+        addToSummaryList("Respiratory score 2", point2);
+        addToSummaryList("Child has breathing difficulty", wheezD);
+        addToSummaryList("Episodes in the past year", wheezY);
+        addToSummaryList("Child his breathless", breathless);
+        addToSummaryList("Child has Eczema", eczema);
+        addToSummaryList("Child's family has Allergies", allergies);
+        addToSummaryList("Any family member smoking tobacco", smoke);
+        addToSummaryList("Any family member using kerosene", kerosene);
+        addToSummaryList("Clinician's diagnosis", diagnosis);
+        addToSummaryList("Clinician's treatment", treatment);
 
         return summaryList;
     }
 
-    private void addToList(String s, String pin) {
+    private void addToSummaryList(String s, String pin) {
         if (!pin.isEmpty()){
             Summary summary = new Summary(s, pin);
             summaryList.add(summary);
         }
     }
 
-    private void addToList2(String s) {
+    private void addToDiagnosisList(String s) {
         if (!s.isEmpty()){
             messages.add(s);
         }
@@ -457,10 +468,10 @@ private void addToList2(String s) {
 
     private void createList(String s) {
         String weight = sharedPreferences.getString(KILO, "");
-        int ag = Integer.parseInt(age2);
+        int ag = Integer.parseInt(ageInMonths);
 
         if (s.equals("Severe Pneumonia OR very Severe Disease")){
-            String st = sharedPreferences.getString(S4, "");
+            String st = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
             Instructions instructions = new Instructions();
             messageList = instructions.GetInstructions(ag, weight, st);
         }
@@ -574,8 +585,8 @@ private void saveForm() {
             editor.putString(USERNAME, username);
             editor.putString(DATE, formattedDate);
             editor.putString(UUIDS, uniqueID);
-            editor.putString(PENDING, value);
-            editor.putString(INCOMPLETE, "complete");
+            editor.putString(PENDING, isPending);
+            editor.putString(ASSESS_INCOMPLETE, "complete");
             editor.apply();
 
             String filename = formattedDate + "_" + uniqueID;
@@ -584,8 +595,8 @@ private void saveForm() {
 //            Toast.makeText(this, "empty", Toast.LENGTH_SHORT).show();
             doLogic(filename);
         }else {
-            editor.putString(PENDING, value);
-            editor.putString(INCOMPLETE, "complete");
+            editor.putString(PENDING, isPending);
+            editor.putString(ASSESS_INCOMPLETE, "complete");
             String filename = formattedDate + "_" + uniqueID;
             editor.putString(FILENAME, filename);
             editor.putString(DATE, formattedDate);
@@ -637,8 +648,12 @@ private void getDuration2(Date currentTime) {
     }
 
     private void doLogic(String file) {
+        // Create a new shared preferences object + editor
         sharedPreferences1 = getSharedPreferences(file, Context.MODE_PRIVATE);
         editor1 = sharedPreferences1.edit();
+
+        // Put all values from the current Shared Preferences object into the shared
+        // preferences for the given file
         Map<String, ?> all = sharedPreferences.getAll();
         for (Map.Entry<String, ?> x : all.entrySet()) {
             if (x.getValue().getClass().equals(String.class))  editor1.putString(x.getKey(),  (String)x.getValue());
@@ -660,13 +675,13 @@ private void doLogic(String file) {
             }
         }
 
-        String bron = sharedPreferences1.getString(BRONCHODILATOR, "");
-        String fin = sharedPreferences1.getString(BRONC, "");
+        String bron = sharedPreferences1.getString(USED_BRONCHODILATOR, "");
+        String fin = sharedPreferences1.getString(AFTER_BRONCHODILATOR, "");
         Intent intent;
         if (bron.equals("Bronchodialtor Given") && fin.isEmpty()){
             intent = new Intent(DiagnosisActivity.this, Dashboard.class);
         }else{
-            if (value.equals("not pending")){
+            if (isPending.equals("not pending")){
                 intent = new Intent(DiagnosisActivity.this, FinalActivity.class);
                 intent.putExtra("filename", file);
             }else {
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 4d19c34..c0e6adf 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -7,9 +7,9 @@
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.FILENAME;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USERNAME;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.UUIDS;
-import static com.ug.air.alrite.Fragments.Patient.Initials.CIN;
+import static com.ug.air.alrite.Fragments.Patient.Initials.CHILD_INITIALS;
 import static com.ug.air.alrite.Fragments.Patient.Initials.INITIAL_DATE;
-import static com.ug.air.alrite.Fragments.Patient.Initials.PIN;
+import static com.ug.air.alrite.Fragments.Patient.Initials.PARENT_INITIALS;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.FASTBREATHING2;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.INITIAL_DATE_2;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.SECOND;
@@ -43,7 +43,11 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
 import java.io.IOException;
 import java.lang.reflect.Array;
 import java.text.ParseException;
@@ -53,17 +57,25 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Callback;
+import retrofit2.Retrofit;
 import retrofit2.Response;
 
 public class PatientActivity extends AppCompatActivity implements MultipleChoiceFragment.onGetResultListener {
 
     public static final String SHARED_PREFS = "sharedPrefs";
     public static final String INCOMPLETE = "incomplete";
+
+
+    public static final String ASSESS_INCOMPLETE = "incomplete";
     SharedPreferences sharedPreferences, sharedPreferences1;
     SharedPreferences.Editor editor, editor1;
     int frag = 0;
@@ -99,8 +111,8 @@ public void onBackPressed() {
             finish();
         }
         else {
-            String pin = sharedPreferences.getString(PIN, "");
-            String cin = sharedPreferences.getString(CIN, "");
+            String pin = sharedPreferences.getString(PARENT_INITIALS, "");
+            String cin = sharedPreferences.getString(CHILD_INITIALS, "");
 
             Dialog dialog = new Dialog(this);
             dialog.setContentView(R.layout.exit);
@@ -489,7 +501,6 @@ private void createMultiSelectFragment(JSONObject page) throws JSONException {
         completeFragmentTransaction(ms_fragment);
     }
 
-
     /**
      * Listener for clicking the next button: we can move to the correct next
      * page, as given by the user's sent JSON. This one is specifically for the
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
index c03fbfc..548da9f 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
@@ -23,12 +23,22 @@
 import com.ug.air.alrite.Utils.Counter;
 import com.ug.air.alrite.Utils.Credentials;
 
+import org.json.JSONObject;
+
 import java.io.File;
+import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import retrofit2.Call;
+import retrofit2.Retrofit;
+import retrofit2.http.GET;
+
 public class SplashActivity extends AppCompatActivity {
 
     Intent i = null;
@@ -62,7 +72,6 @@ protected void onCreate(Bundle savedInstanceState) {
         logo = findViewById(R.id.logo);
 
         databaseHelper = new DatabaseHelper(this);
-
     }
 
     @Override
@@ -108,15 +117,15 @@ private void createFileCounter() {
 
     private void checkDatabase() {
         File src = new File("/data/data/" + BuildConfig.APPLICATION_ID + "/databases/alrite.db");
-        if (src.exists()){
+        if (src.exists()) {
 
             Credentials credentials = new Credentials();
             String username = credentials.creds(this).getUsername();
-            if (!username.equals("None")){
+            if (!username.equals("None")) {
                 Counter counter = new Counter();
                 counter.Count(this, APP_OPENING_COUNT);
             }
-        }else {
+        } else {
             databaseHelper.insertData(1, "None", "None", "None", "None", "None", "None");
         }
         i = new Intent(SplashActivity.this, Dashboard.class);
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json b/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
index e7e959d..eb4e827 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
+++ b/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
@@ -6,17 +6,18 @@
       "title": "Patient Details",
       "content": [
         {
-          "label": "Enter child's initials:",
-          "type": "default",
-          "valueID": "child_initials",
+          "label": "Enter child's age:",
+          "type": "numeric",
+          "valueID": "age",
+          "units": "years",
           "component": "TextInput"
         },
         {
-          "type": "=",
-          "valueID": "child_initials",
-          "threshold": "IN",
-          "satisfiedLink": "page_4",
-          "notSatisfiedLink": "page_2"
+          "type": "<",
+          "valueID": "age",
+          "threshold": "6",
+          "satisfiedLink": "page_2",
+          "notSatisfiedLink": "page_4"
         }
       ],
       "defaultLink": "page_2"
diff --git a/app/src/main/java/com/ug/air/alrite/Adapters/DiagnosisAdapter.java b/app/src/main/java/com/ug/air/alrite/Adapters/DiagnosisAdapter.java
index 01d1880..a7b12c1 100644
--- a/app/src/main/java/com/ug/air/alrite/Adapters/DiagnosisAdapter.java
+++ b/app/src/main/java/com/ug/air/alrite/Adapters/DiagnosisAdapter.java
@@ -33,7 +33,6 @@ public void setOnItemClickListener(OnItemClickListener listener){
 
     public interface OnItemClickListener {
         void onClick(int position);
-        void onClick2(int position);
     }
 
     @NonNull
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ActivePatients.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ActivePatients.java
index e3e7a93..3e57758 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ActivePatients.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ActivePatients.java
@@ -1,21 +1,19 @@
 package com.ug.air.alrite.Fragments.Patient;
 
 
-import static com.ug.air.alrite.Activities.PatientActivity.INCOMPLETE;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.BRONCHODILATOR;
+import static com.ug.air.alrite.Activities.PatientActivity.ASSESS_INCOMPLETE;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.BRONCHODILATOR_WAS_GIVEN;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USED_BRONCHODILATOR;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DATE;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.REASSESS;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator2.REASON;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.BRONC;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.FINAL;
-import static com.ug.air.alrite.Fragments.Patient.Initials.CIN;
-import static com.ug.air.alrite.Fragments.Patient.Initials.PIN;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE2;
-import static com.ug.air.alrite.Fragments.Patient.Sex.CHOICE;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.AFTER_BRONCHODILATOR;
+import static com.ug.air.alrite.Fragments.Patient.Initials.CHILD_INITIALS;
+import static com.ug.air.alrite.Fragments.Patient.Initials.PARENT_INITIALS;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_YEARS;
+import static com.ug.air.alrite.Fragments.Patient.Sex.SEX;
 
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.text.Editable;
@@ -32,8 +30,6 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.ug.air.alrite.Activities.Dashboard;
-import com.ug.air.alrite.Activities.DiagnosisActivity;
 import com.ug.air.alrite.Adapters.PatientAdapter;
 import com.ug.air.alrite.BuildConfig;
 import com.ug.air.alrite.Models.Item;
@@ -45,21 +41,19 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collections;
 import java.util.Date;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 public class ActivePatients extends Fragment {
 
     View view;
-    RecyclerView recyclerView;
+    RecyclerView rvActivePatients;
     EditText etSearch;
-    ImageView back;
-    ArrayList<Item> items;
+    ImageView buttonBack;
+    ArrayList<Item> patientsList;
     PatientAdapter patientAdapter;
-    String cin, pin, gender, age, search, dat;
-    ArrayList<String> types, files, file;
+    String childInitials, parentInitials, gender, age, search, date;
+    ArrayList<String> pToReassessInitialsList, files, patientsToReassessList;
     SharedPreferences sharedPreferences;
     SharedPreferences.Editor editor;
 
@@ -69,9 +63,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         // Inflate the layout for this fragment
         view = inflater.inflate(R.layout.fragment_active_patients, container, false);
 
-        recyclerView = view.findViewById(R.id.recyclerView3);
+        rvActivePatients = view.findViewById(R.id.recyclerView3);
         etSearch = view.findViewById(R.id.search);
-        back = view.findViewById(R.id.back);
+        buttonBack = view.findViewById(R.id.back);
 
 //        back.setOnClickListener(new View.OnClickListener() {
 //            @Override
@@ -80,25 +74,25 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 //            }
 //        });
 
-        back.setVisibility(View.GONE);
+        buttonBack.setVisibility(View.GONE);
 
-        recyclerView.setHasFixedSize(true);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
+        rvActivePatients.setHasFixedSize(true);
+        rvActivePatients.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
 
-        items = new ArrayList<>();
+        patientsList = new ArrayList<>();
         files = new ArrayList<String>();
 
         accessSharedFile();
 
         etSearch.addTextChangedListener(textWatcher);
 
-        patientAdapter = new PatientAdapter(getActivity(), items);
-        recyclerView.setAdapter(patientAdapter);
+        patientAdapter = new PatientAdapter(getActivity(), patientsList);
+        rvActivePatients.setAdapter(patientAdapter);
 
         patientAdapter.setOnItemClickListener(new PatientAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(int position) {
-                Patient patient = (Patient) items.get(position).getObject();
+                Patient patient = (Patient) patientsList.get(position).getObject();
                 String name = patient.getFilename();
                 boolean reassess = patient.isReassess();
                 if (reassess){
@@ -131,28 +125,28 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
         public void onTextChanged(CharSequence s, int start, int before, int count) {
             search = etSearch.getText().toString();
             if (!search.isEmpty()) {
-                items.clear();
-                for(String type : types){
+                patientsList.clear();
+                for(String type : pToReassessInitialsList){
                     String ty = type.toLowerCase();
                     if (ty.contains(search)){
-                        int index = types.indexOf(type);
-                        String fileName = file.get(index);
+                        int index = pToReassessInitialsList.indexOf(type);
+                        String fileName = patientsToReassessList.get(index);
                         sharedPreferences = requireActivity().getSharedPreferences(fileName, Context.MODE_PRIVATE);
-                        cin = sharedPreferences.getString(CIN, "");
-                        pin = sharedPreferences.getString(PIN, "");
-                        age = sharedPreferences.getString(AGE2, "");
-                        gender = sharedPreferences.getString(CHOICE, "");
-                        dat = sharedPreferences.getString(DATE, "");
+                        childInitials = sharedPreferences.getString(CHILD_INITIALS, "");
+                        parentInitials = sharedPreferences.getString(PARENT_INITIALS, "");
+                        age = sharedPreferences.getString(AGE_IN_YEARS, "");
+                        gender = sharedPreferences.getString(SEX, "");
+                        date = sharedPreferences.getString(DATE, "");
                         boolean reassess = sharedPreferences.getBoolean(REASSESS, false);
                         String[] split = age.split("\\.");
                         String ag = split[0] + " years and " + split[1] + " months";
                         try {
                             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
-                            Date date = df.parse(dat);
+                            Date date = df.parse(ActivePatients.this.date);
                             SimpleDateFormat df1 = new SimpleDateFormat("EEE, d MMM yyyy HH:mm");
                             String formattedDate = df1.format(date);
-                            Patient patient = new Patient("Age: " + ag, "Gender: " + gender, cin, "Parent/Guardian: " + pin, formattedDate, fileName, reassess);
-                            items.add(new Item(0, patient));
+                            Patient patient = new Patient("Age: " + ag, "Gender: " + gender, childInitials, "Parent/Guardian: " + parentInitials, formattedDate, fileName, reassess);
+                            patientsList.add(new Item(0, patient));
 //                            patientAdapter.notifyDataSetChanged();
                         } catch (ParseException e) {
                             e.printStackTrace();
@@ -162,7 +156,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
                 }
                 patientAdapter.notifyDataSetChanged();
             }else {
-                items.clear();
+                patientsList.clear();
                 accessSharedFile();
                 patientAdapter.notifyDataSetChanged();
             }
@@ -174,38 +168,53 @@ public void afterTextChanged(Editable s) {
         }
     };
 
+    /**
+     *
+     */
     private void accessSharedFile() {
-        File src = new File("/data/data/" + BuildConfig.APPLICATION_ID + "/shared_prefs");
-        if (src.exists()){
-            File[] contents = src.listFiles();
+        // Get the shared preferences folder on the current device
+        File sharedPrefsFolder = new File("/data/data/" + BuildConfig.APPLICATION_ID + "/shared_prefs");
+        if (sharedPrefsFolder.exists()){
+            File[] sharedPrefsFiles = sharedPrefsFolder.listFiles();
 //        Toast.makeText(getActivity(), "" + contents, Toast.LENGTH_SHORT).show();
-            if (contents.length != 0) {
-                types = new ArrayList<String>();
-                file = new ArrayList<String>();
-                for (File f : contents) {
+            if (sharedPrefsFiles.length != 0) {
+                pToReassessInitialsList = new ArrayList<String>();
+                patientsToReassessList = new ArrayList<String>();
+
+                // Go through each file in the shared preferences folder
+                for (File f : sharedPrefsFiles) {
                     if (f.isFile()) {
-                        String name = f.getName().toString();
-                        if (!name.equals("sharedPrefs.xml") && !name.equals("counter_file.xml")){
-                            String names = name.replace(".xml", "");
-                            sharedPreferences = requireActivity().getSharedPreferences(names, Context.MODE_PRIVATE);
+                        String filename = f.getName().toString();
+                        if (!filename.equals("sharedPrefs.xml") && !filename.equals("counter_file.xml")){
+                            // Get a file from the folder for a patient, and get the name itself
+                            // and the shared preferences object + editor for that file
+                            String patientFilename = filename.replace(".xml", "");
+                            sharedPreferences = requireActivity().getSharedPreferences(patientFilename, Context.MODE_PRIVATE);
                             editor = sharedPreferences.edit();
-                            String bron = sharedPreferences.getString(BRONCHODILATOR, "");
-                            String fin = sharedPreferences.getString(BRONC, "");
-                            String incomplete = sharedPreferences.getString(INCOMPLETE, "");
-                            if (bron.equals("Bronchodialtor Given") && fin.isEmpty()){
-                                file.add(names);
-                                cin = sharedPreferences.getString(CIN, "");
-                                pin = sharedPreferences.getString(PIN, "");
-                                age = sharedPreferences.getString(AGE2, "");
-                                gender = sharedPreferences.getString(CHOICE, "");
-                                dat = sharedPreferences.getString(DATE, "");
+
+                            // Look in the shared preferences for if we used a bronchodilator
+                            // or not, and how it turned out if we did, and if we finished
+                            // the assessment or not.
+                            String givenBronch = sharedPreferences.getString(USED_BRONCHODILATOR, "");
+                            String afterBronch = sharedPreferences.getString(AFTER_BRONCHODILATOR, "");
+                            String assessIncomplete = sharedPreferences.getString(ASSESS_INCOMPLETE, "");
+
+                            // If we gave the bronchodilator but never checked final condition,
+                            //
+                            if (givenBronch.equals(BRONCHODILATOR_WAS_GIVEN) && afterBronch.isEmpty()){
+                                patientsToReassessList.add(patientFilename);
+                                childInitials = sharedPreferences.getString(CHILD_INITIALS, "");
+                                parentInitials = sharedPreferences.getString(PARENT_INITIALS, "");
+                                age = sharedPreferences.getString(AGE_IN_YEARS, "");
+                                gender = sharedPreferences.getString(SEX, "");
+                                date = sharedPreferences.getString(DATE, "");
                                 boolean reassess = sharedPreferences.getBoolean(REASSESS, false);
-                                types.add(cin);
+                                pToReassessInitialsList.add(childInitials);
                                 String[] split = age.split("\\.");
                                 String ag = split[0] + " years and " + split[1] + " months";
                                 try {
                                     SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
-                                    Date date = df.parse(dat);
+                                    Date date = df.parse(this.date);
                                     SimpleDateFormat df1 = new SimpleDateFormat("EEE, d MMM yyyy HH:mm");
                                     String formattedDate = df1.format(date);
 
@@ -215,15 +224,15 @@ private void accessSharedFile() {
                                     if (minutes >= 15 && minutes < 240){
                                         editor.putBoolean(REASSESS, true);
                                         editor.apply();
-                                        Patient patient = new Patient("Age: " + ag, "Gender: " + gender, cin, "Parent/Guardian: " + pin, formattedDate, names, reassess);
-                                        items.add(new Item(0, patient));
+                                        Patient patient = new Patient("Age: " + ag, "Gender: " + gender, childInitials, "Parent/Guardian: " + parentInitials, formattedDate, patientFilename, reassess);
+                                        patientsList.add(new Item(0, patient));
                                     }else if (minutes >= 240){
-                                        editor.putString(BRONCHODILATOR, "Bronchodialtor Not Given");
+                                        editor.putString(USED_BRONCHODILATOR, "Bronchodialtor Not Given");
                                         editor.putString(REASON, "A 4 hour time period elapsed");
                                         editor.apply();
                                     }else {
-                                        Patient patient = new Patient("Age: " + ag, "Gender: " + gender, cin, "Parent/Guardian: " + pin, formattedDate, names, reassess);
-                                        items.add(new Item(0, patient));
+                                        Patient patient = new Patient("Age: " + ag, "Gender: " + gender, childInitials, "Parent/Guardian: " + parentInitials, formattedDate, patientFilename, reassess);
+                                        patientsList.add(new Item(0, patient));
                                     }
                                 } catch (ParseException e) {
                                     e.printStackTrace();
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Assess.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Assess.java
index 3f51579..336af37 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Assess.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Assess.java
@@ -1,6 +1,6 @@
 package com.ug.air.alrite.Fragments.Patient;
 
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_MONTHS;
 import static com.ug.air.alrite.Fragments.Patient.Sex.KILO;
 
 import android.app.Dialog;
@@ -40,7 +40,7 @@
 public class Assess extends Fragment {
 
     View view;
-    Button back, next, btnExit, btnContinue;
+    Button buttonBack, buttonNext, btnExit, btnContinue;
     CheckBox drink, vomit, resp, convu, none;
     String s = "";
     Boolean check1, check2, check3, check4, check5;
@@ -54,14 +54,14 @@ public class Assess extends Fragment {
     String diagnosis;
 
     public static final String SHARED_PREFS = "sharedPrefs";
-    public static final String CHECK1 = "check1";
-    public static final String CHECK2 = "check2";
-    public static final String CHECK3 = "check3";
-    public static final String CHECK4 = "check4";
-    public static final String CHECK5 = "check5";
+    public static final String CANT_DRINK = "check1";
+    public static final String VOMITING = "check2";
+    public static final String UNRESPONSIVE = "check3";
+    public static final String CONVULSIONS = "check4";
+    public static final String NONE = "check5";
     public static final String DATE = "date";
-    public static final String S4 = "symptoms";
-    public static final String FINAL_DIAGNOSIS= "diagnosis_1";
+    public static final String SEVERE_SYMPTOMS = "symptoms";
+    public static final String FINAL_DIAGNOSIS= "diagnosis_severe_pneumonia_disease";
     public static final String DIAGNOSIS = "diagnosis";
     SharedPreferences sharedPreferences, sharedPreferences1;
     SharedPreferences.Editor editor, editor1;
@@ -72,8 +72,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         // Inflate the layout for this fragment
         view = inflater.inflate(R.layout.fragment_assess, container, false);
 
-        back = view.findViewById(R.id.back);
-        next = view.findViewById(R.id.next);
+        buttonBack = view.findViewById(R.id.back);
+        buttonNext = view.findViewById(R.id.next);
         drink = view.findViewById(R.id.drink);
         vomit = view.findViewById(R.id.vomit);
         none = view.findViewById(R.id.none);
@@ -159,14 +159,14 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             }
         });
 
-        next.setOnClickListener(new View.OnClickListener() {
+        buttonNext.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 checkedList();
             }
         });
 
-        back.setOnClickListener(new View.OnClickListener() {
+        buttonBack.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
@@ -213,12 +213,12 @@ private void checkedList() {
 
     private void saveData() {
 
-        editor.putBoolean(CHECK1, drink.isChecked());
-        editor.putBoolean(CHECK2, vomit.isChecked());
-        editor.putBoolean(CHECK3, resp.isChecked());
-        editor.putBoolean(CHECK4, convu.isChecked());
-        editor.putBoolean(CHECK5, none.isChecked());
-        editor.putString(S4, s);
+        editor.putBoolean(CANT_DRINK, drink.isChecked());
+        editor.putBoolean(VOMITING, vomit.isChecked());
+        editor.putBoolean(UNRESPONSIVE, resp.isChecked());
+        editor.putBoolean(CONVULSIONS, convu.isChecked());
+        editor.putBoolean(NONE, none.isChecked());
+        editor.putString(SEVERE_SYMPTOMS, s);
 
         editor.apply();
 
@@ -226,11 +226,11 @@ private void saveData() {
     }
 
     private void loadData() {
-        check1 = sharedPreferences.getBoolean(CHECK1, false);
-        check2 = sharedPreferences.getBoolean(CHECK2, false);
-        check3 = sharedPreferences.getBoolean(CHECK3, false);
-        check4 = sharedPreferences.getBoolean(CHECK4, false);
-        check5 = sharedPreferences.getBoolean(CHECK5, false);
+        check1 = sharedPreferences.getBoolean(CANT_DRINK, false);
+        check2 = sharedPreferences.getBoolean(VOMITING, false);
+        check3 = sharedPreferences.getBoolean(UNRESPONSIVE, false);
+        check4 = sharedPreferences.getBoolean(CONVULSIONS, false);
+        check5 = sharedPreferences.getBoolean(NONE, false);
     }
 
     private void updateViews() {
@@ -279,7 +279,7 @@ private void displayDialog() {
         assessments = new ArrayList<>();
         assessmentAdapter = new AssessmentAdapter(assessments);
 
-        String age = sharedPreferences.getString(AGE, "");
+        String age = sharedPreferences.getString(AGE_IN_MONTHS, "");
         String weight = sharedPreferences.getString(KILO, "");
         int ag = Integer.parseInt(age);
 
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Breathless.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Breathless.java
index 364d187..a5e2a19 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Breathless.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Breathless.java
@@ -1,6 +1,5 @@
 package com.ug.air.alrite.Fragments.Patient;
 
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE;
 import static com.ug.air.alrite.Fragments.Patient.WheezY.DAY2;
 
 import android.content.Context;
@@ -20,8 +19,6 @@
 
 import com.ug.air.alrite.R;
 
-import java.util.Objects;
-
 
 public class Breathless extends Fragment {
 
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator.java
index 310008b..b94a2d9 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator.java
@@ -1,7 +1,6 @@
 package com.ug.air.alrite.Fragments.Patient;
 
 import static com.ug.air.alrite.Activities.SplashActivity.BRONCHODILATOR_COUNT;
-import static com.ug.air.alrite.Activities.SplashActivity.STRIDOR_COUNT;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator2.BDIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator2.REASON;
 import static com.ug.air.alrite.Fragments.Patient.Initials.INITIAL_DATE;
@@ -19,10 +18,8 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.work.Data;
-import androidx.work.ExistingPeriodicWorkPolicy;
 import androidx.work.ExistingWorkPolicy;
 import androidx.work.OneTimeWorkRequest;
-import androidx.work.PeriodicWorkRequest;
 import androidx.work.WorkManager;
 import androidx.work.WorkRequest;
 
@@ -36,11 +33,9 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 import android.widget.VideoView;
 
 import com.ug.air.alrite.Activities.DiagnosisActivity;
-import com.ug.air.alrite.Activities.PatientActivity;
 import com.ug.air.alrite.Adapters.AssessmentAdapter;
 import com.ug.air.alrite.Models.Assessment;
 import com.ug.air.alrite.R;
@@ -66,7 +61,9 @@ public class Bronchodilator extends Fragment {
     Dialog dialog;
     String bronchodilator, uniqueID, filename;
     TextView txtMessage;
-    public static final String BRONCHODILATOR = "bronchodilator";
+    public static final String BRONCHODILATOR_WAS_GIVEN = "Bronchodialtor Given";
+    public static final String BRONCHODILATOR_NOT_GIVEN = "Bronchodialtor Not Given";
+    public static final String USED_BRONCHODILATOR = "bronchodilator";
     public static final String REASSESS = "reassess";
 //    public static final String BACKGROUND = "background";
     public static final String SHARED_PREFS = "sharedPrefs";
@@ -112,23 +109,25 @@ public void onClick(View view) {
             }
         });
 
+        // The patient was given a bronchodilator
         btnGiven.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 editor.remove(BDIAGNOSIS);
                 editor.remove(REASON);
-                bronchodilator = "Bronchodialtor Given";
-                editor.putString(BRONCHODILATOR, bronchodilator);
+                bronchodilator = BRONCHODILATOR_WAS_GIVEN;
+                editor.putString(USED_BRONCHODILATOR, bronchodilator);
                 editor.apply();
                 showDialog();
             }
         });
 
+        // The patient was not given a bronchodilator
         btnNot.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                bronchodilator = "Bronchodialtor Not Given";
-                editor.putString(BRONCHODILATOR, bronchodilator);
+                bronchodilator = BRONCHODILATOR_NOT_GIVEN;
+                editor.putString(USED_BRONCHODILATOR, bronchodilator);
                 editor.apply();
                 FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
                 fr.replace(R.id.fragment_container, new Bronchodilator2());
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator2.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator2.java
index 4d6bd78..7787217 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator2.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator2.java
@@ -1,9 +1,9 @@
 package com.ug.air.alrite.Fragments.Patient;
 
-import static com.ug.air.alrite.Fragments.Patient.Cough.CHOICE2;
+import static com.ug.air.alrite.Fragments.Patient.Cough.DIFFICULTY_BREATHING;
 import static com.ug.air.alrite.Fragments.Patient.CoughD.DAY1;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE;
-import static com.ug.air.alrite.Fragments.Patient.Wheezing.CHOICE8;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_MONTHS;
+import static com.ug.air.alrite.Fragments.Patient.Wheezing.WHEEZING_SOUNDS;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -50,7 +50,7 @@ public class Bronchodilator2 extends Fragment {
     EditText etOther;
     public static final String SHARED_PREFS = "sharedPrefs";
     public static final String REASON = "bronchodilator_not_given_reason";
-    public static final String BDIAGNOSIS = "diagnosis_8";
+    public static final String BDIAGNOSIS = "bronchodilator_diagnosis";
     SharedPreferences sharedPreferences, sharedPreferences1;
     SharedPreferences.Editor editor, editor1;
     String diagnosis;
@@ -150,8 +150,8 @@ private void saveData(String s) {
         editor.putString(REASON, s);
         editor.apply();
 
-        String cough = sharedPreferences.getString(CHOICE2, "");
-        String wheezing = sharedPreferences.getString(CHOICE8, "");
+        String cough = sharedPreferences.getString(DIFFICULTY_BREATHING, "");
+        String wheezing = sharedPreferences.getString(WHEEZING_SOUNDS, "");
         String days = sharedPreferences.getString(DAY1, "");
         day = Long.parseLong(days);
 
@@ -229,7 +229,7 @@ private void showDialog2() {
         linearLayout_instruction.setBackgroundColor(getResources().getColor(R.color.moderateDiagnosisColor));
         txtDiagnosis.setText(R.string.wheez_ill);
 
-        String age = sharedPreferences.getString(AGE, "");
+        String age = sharedPreferences.getString(AGE_IN_MONTHS, "");
         float ag = Float.parseFloat(age);
         if (ag < 2){
             messages = Arrays.asList(R.string.wheez_ill1, R.string.wheez_ill2, R.string.wheez_ill3,
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator3.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator3.java
index 3699a43..e41f13a 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator3.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator3.java
@@ -2,10 +2,9 @@
 
 import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.POINT;
 import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.POINT2;
-import static com.ug.air.alrite.Fragments.Patient.Cough.CHOICE2;
+import static com.ug.air.alrite.Fragments.Patient.Cough.DIFFICULTY_BREATHING;
 import static com.ug.air.alrite.Fragments.Patient.CoughD.DAY1;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE;
-import static com.ug.air.alrite.Fragments.Patient.Wheezing.CHOICE8;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_MONTHS;
 import static com.ug.air.alrite.Fragments.Patient.Wheezing.CHOICE82;
 
 import android.app.Dialog;
@@ -65,7 +64,7 @@ public class Bronchodilator3 extends Fragment {
     private static final int YES = 0;
     private static final int NO = 1;
     private static final int NOT = 2;
-    public static final String BRONC = "after_bronchodilator";
+    public static final String AFTER_BRONCHODILATOR = "after_bronchodilator";
     public static final String FINAL = "final";
     public static final String B3DIAGNOSIS = "diagnosis_9";
     public static final String SHARED_PREFS = "sharedPrefs";
@@ -135,10 +134,10 @@ public void onClick(View v) {
     }
 
     private void saveData() {
-        editor.putString(BRONC, value9);
+        editor.putString(AFTER_BRONCHODILATOR, value9);
         editor.apply();
 
-        String cough = sharedPreferences.getString(CHOICE2, "");
+        String cough = sharedPreferences.getString(DIFFICULTY_BREATHING, "");
         String wheezing = sharedPreferences.getString(CHOICE82, "");
         String days = sharedPreferences.getString(DAY1, "");
         String point1 = sharedPreferences.getString(POINT, "");
@@ -221,7 +220,7 @@ private void showDialog(int value) {
         }else if (value == 3){
             linearLayout_instruction.setBackgroundColor(getResources().getColor(R.color.mildDiagnosisColor));
             txtDiagnosis.setText(R.string.wheez_ill);
-            String age = sharedPreferences.getString(AGE, "");
+            String age = sharedPreferences.getString(AGE_IN_MONTHS, "");
             float ag = Float.parseFloat(age);
             if (ag < 2){
                 messages = Arrays.asList(R.string.wheez_ill1, R.string.wheez_ill2, R.string.wheez_ill3,
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ChestIndrawing.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ChestIndrawing.java
index e7a35f7..8521628 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ChestIndrawing.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ChestIndrawing.java
@@ -1,26 +1,19 @@
 package com.ug.air.alrite.Fragments.Patient;
 
 import static com.ug.air.alrite.Activities.SplashActivity.CHESTINDRWAING_COUNT;
-import static com.ug.air.alrite.Activities.SplashActivity.STRIDOR_COUNT;
-import static com.ug.air.alrite.Activities.SplashActivity.WHEEZING_COUNT;
 import static com.ug.air.alrite.Fragments.Patient.Assess.DIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Assess.FINAL_DIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Assess.S4;
-import static com.ug.air.alrite.Fragments.Patient.Cough.CHOICE2;
+import static com.ug.air.alrite.Fragments.Patient.Assess.SEVERE_SYMPTOMS;
+import static com.ug.air.alrite.Fragments.Patient.Cough.DIFFICULTY_BREATHING;
 import static com.ug.air.alrite.Fragments.Patient.HIVStatus.HDIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Nasal.CHOICEGN;
 import static com.ug.air.alrite.Fragments.Patient.Nasal.GNDIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Oxygen.OXDIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.RRCounter.RATE;
-import static com.ug.air.alrite.Fragments.Patient.RRCounter.RATE2;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.SECOND;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE;
-import static com.ug.air.alrite.Fragments.Patient.Sex.KILO;
 import static com.ug.air.alrite.Fragments.Patient.Stridor.STDIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Wheezing.CHOICE8;
+import static com.ug.air.alrite.Fragments.Patient.Wheezing.WHEEZING_SOUNDS;
 import static com.ug.air.alrite.Fragments.Patient.CoughD.DAY1;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.FASTBREATHING;
-import static com.ug.air.alrite.Fragments.Patient.Wheezing.CHOICE82;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -32,11 +25,9 @@
 import androidx.cardview.widget.CardView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import android.util.Log;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -59,8 +50,6 @@
 import com.ug.air.alrite.Utils.Counter;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 public class ChestIndrawing extends Fragment {
 
@@ -154,7 +143,7 @@ public void onClick(View v) {
         back.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String assess = sharedPreferences.getString(S4, "");
+                String assess = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
                 FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
 
                 if (second.isEmpty()){
@@ -187,7 +176,7 @@ private void saveData() {
         if (second.isEmpty()){
             editor.putString(CHOICE7, value8);
             editor.apply();
-            String assess = sharedPreferences.getString(S4, "");
+            String assess = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
 
             if (!assess.equals("None of these")){
                 startActivity(new Intent(getActivity(), DiagnosisActivity.class));
@@ -277,7 +266,7 @@ public void onClick(View v) {
     }
 
     private void makeAssessment(){
-        String cough = sharedPreferences.getString(CHOICE2, "");
+        String cough = sharedPreferences.getString(DIFFICULTY_BREATHING, "");
         String fDiagnosis = sharedPreferences.getString(DIAGNOSIS, "");
         String oxDiagnosis = sharedPreferences.getString(OXDIAGNOSIS, "");
         String stDiagnosis = sharedPreferences.getString(STDIAGNOSIS, "");
@@ -285,7 +274,7 @@ private void makeAssessment(){
         String hDiagnosis = sharedPreferences.getString(HDIAGNOSIS, "");
         String oneDiagnosis = sharedPreferences.getString(FINAL_DIAGNOSIS, "");
         fastBreathing = sharedPreferences.getString(FASTBREATHING, "");
-        wheezing = sharedPreferences.getString(CHOICE8, "");
+        wheezing = sharedPreferences.getString(WHEEZING_SOUNDS, "");
         String days = sharedPreferences.getString(DAY1, "");
         day = Long.parseLong(days);
         boolean cx = oneDiagnosis.isEmpty() && hDiagnosis.isEmpty();
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Cough.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Cough.java
index 1c5b90a..aaa54ee 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Cough.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Cough.java
@@ -1,9 +1,7 @@
 package com.ug.air.alrite.Fragments.Patient;
 
-import static com.ug.air.alrite.Fragments.Patient.Assess.DATE;
-import static com.ug.air.alrite.Fragments.Patient.Assess.DIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Assess.FINAL_DIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Assess.S4;
+import static com.ug.air.alrite.Fragments.Patient.Assess.SEVERE_SYMPTOMS;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -29,21 +27,14 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.ug.air.alrite.Activities.Dashboard;
 import com.ug.air.alrite.Activities.DiagnosisActivity;
 import com.ug.air.alrite.Adapters.AssessmentAdapter;
 import com.ug.air.alrite.Models.Assessment;
 import com.ug.air.alrite.R;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.UUID;
 
 
 public class Cough extends Fragment {
@@ -55,7 +46,7 @@ public class Cough extends Fragment {
     String value3 = "none";
     private static final int YES = 0;
     private static final int NO = 1;
-    public static final String CHOICE2 = "difficulty_breathing";
+    public static final String DIFFICULTY_BREATHING = "difficulty_breathing";
     public static final String NODIAGNOSIS = "diagnosis_3";
     public static final String SHARED_PREFS = "sharedPrefs";
     Dialog dialog;
@@ -130,7 +121,7 @@ public void onClick(View v) {
     }
 
     private void saveData() {
-        editor.putString(CHOICE2, value3);
+        editor.putString(DIFFICULTY_BREATHING, value3);
         editor.apply();
 
         if (value3.equals("No")){
@@ -139,7 +130,7 @@ private void saveData() {
                 editor.remove(NODIAGNOSIS);
                 editor.apply();
             }
-            String assess = sharedPreferences.getString(S4, "");
+            String assess = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
             if (!assess.equals("None of these")){
                 startActivity(new Intent(getActivity(), DiagnosisActivity.class));
             }else {
@@ -157,7 +148,7 @@ private void saveData() {
     private void loadData() {
         SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
 
-        value3 = sharedPreferences.getString(CHOICE2, "");
+        value3 = sharedPreferences.getString(DIFFICULTY_BREATHING, "");
     }
 
     private void updateViews() {
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/CoughD.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/CoughD.java
index 4fc7278..56b0ed9 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/CoughD.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/CoughD.java
@@ -1,50 +1,27 @@
 package com.ug.air.alrite.Fragments.Patient;
 
-import static com.ug.air.alrite.Fragments.Patient.Assess.DATE;
-import static com.ug.air.alrite.Fragments.Patient.Assess.DIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Assess.S4;
+import static com.ug.air.alrite.Fragments.Patient.Assess.SEVERE_SYMPTOMS;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.ug.air.alrite.Activities.Dashboard;
-import com.ug.air.alrite.Adapters.AssessmentAdapter;
-import com.ug.air.alrite.Models.Assessment;
 import com.ug.air.alrite.R;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
-
 
 public class CoughD extends Fragment {
 
@@ -137,7 +114,7 @@ private void saveData() {
 
         int dt = Integer.parseInt(day1);
 
-        String assess = sharedPreferences.getString(S4, "");
+        String assess = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
 
         if (!assess.equals("None of these")){
             FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/FTouch.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/FTouch.java
index b2347b8..ebe2b18 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/FTouch.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/FTouch.java
@@ -1,12 +1,11 @@
 package com.ug.air.alrite.Fragments.Patient;
 
-import static com.ug.air.alrite.Fragments.Patient.Assess.S4;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE;
+import static com.ug.air.alrite.Fragments.Patient.Assess.SEVERE_SYMPTOMS;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_MONTHS;
 import static com.ug.air.alrite.Fragments.Patient.Sex.KILO;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 
@@ -28,16 +27,13 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.ug.air.alrite.Activities.DiagnosisActivity;
 import com.ug.air.alrite.Adapters.AssessmentAdapter;
 import com.ug.air.alrite.Models.Assessment;
 import com.ug.air.alrite.R;
 import com.ug.air.alrite.Utils.Calculations.Instructions;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 
 public class FTouch extends Fragment {
 
@@ -129,7 +125,7 @@ private void saveData() {
         editor.putString(TOUCH, value6);
         editor.apply();
 
-        String assess = sharedPreferences.getString(S4, "");
+        String assess = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
         if (value6.equals("Yes") && !assess.equals("None of these")){
             showDialog();
         }else {
@@ -183,7 +179,7 @@ private void showDialog() {
         assessments = new ArrayList<>();
         assessmentAdapter = new AssessmentAdapter(assessments);
 
-        String age = sharedPreferences.getString(AGE, "");
+        String age = sharedPreferences.getString(AGE_IN_MONTHS, "");
         String weight = sharedPreferences.getString(KILO, "");
         int ag = Integer.parseInt(age);
 
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Fever.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Fever.java
index 600d7ab..6b9f0b2 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Fever.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Fever.java
@@ -1,6 +1,6 @@
 package com.ug.air.alrite.Fragments.Patient;
 
-import static com.ug.air.alrite.Fragments.Patient.Assess.S4;
+import static com.ug.air.alrite.Fragments.Patient.Assess.SEVERE_SYMPTOMS;
 import static com.ug.air.alrite.Fragments.Patient.HIVCare.CHOICEHC;
 
 import android.content.Context;
@@ -20,8 +20,6 @@
 
 import com.ug.air.alrite.R;
 
-import java.util.Objects;
-
 
 public class Fever extends Fragment {
 
@@ -90,7 +88,7 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
 
-                String assess = sharedPreferences.getString(S4, "");
+                String assess = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
                 String care = sharedPreferences.getString(CHOICEHC, "");
 
                 FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Initials.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Initials.java
index 989aae2..5bdd11e 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Initials.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Initials.java
@@ -18,28 +18,24 @@
 import android.widget.Toast;
 
 import com.ug.air.alrite.Activities.Dashboard;
-import com.ug.air.alrite.BuildConfig;
-import com.ug.air.alrite.Database.DatabaseHelper;
 import com.ug.air.alrite.R;
 import com.ug.air.alrite.Utils.Credentials;
 
-import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 
 public class Initials extends Fragment {
 
    View view;
-   EditText etCin, etPin, etStudy, etCode;
+   EditText etChildInitials, etParentInitials, etStudy, etCode;
    Button back, next;
-   String cin, pin, formattedDate, studyId, code, h_code, counter, filename;
-   public static final String CIN = "patient_initials";
+   String childInitials, parentInitials, formattedDate, studyId, code, h_code, counter, filename;
+   public static final String CHILD_INITIALS = "patient_initials";
     public static final String  VERSION = "app_version";
-   public static final String PIN = "parent_initials";
+   public static final String PARENT_INITIALS = "parent_initials";
    public static final String STUDY_ID = "study_id";
     public static final String STUDY_ID_2 = "study_id_2";
    public static final String INITIAL_DATE = "start_date";
@@ -54,14 +50,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         // Inflate the layout for this fragment
         view = inflater.inflate(R.layout.fragment_initials, container, false);
 
-        etCin = view.findViewById(R.id.cin);
+        etChildInitials = view.findViewById(R.id.cin);
         etCode = view.findViewById(R.id.code);
         etStudy = view.findViewById(R.id.studyId);
-        etPin = view.findViewById(R.id.pin);
+        etParentInitials = view.findViewById(R.id.pin);
         next = view.findViewById(R.id.next);
         back = view.findViewById(R.id.back);
 
         Intent intent = getActivity().getIntent();
+        // If ____, then we can combine the data for
+        // Otherwise, just get the current activity's shared preferences
         if (intent.hasExtra("filename")) {
             filename = intent.getExtras().getString("filename");
             sharedPreferences1 = requireActivity().getSharedPreferences(filename, Context.MODE_PRIVATE);
@@ -79,20 +77,26 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
             sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
         }
 
+        // Get an editor for the shared preferences
         editor = sharedPreferences.edit();
 
+        // Get the parent's initials and the child's initials and store them in
+        // the fragment, if they exist: otherwise ""
         loadData();
+
+        // Get the credentials for the current user, and set the current variables
+        // to those values
         updateViews();
 
         next.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
 
-                cin = etCin.getText().toString();
-                pin = etPin.getText().toString();
+                childInitials = etChildInitials.getText().toString();
+                parentInitials = etParentInitials.getText().toString();
                 studyId = etStudy.getText().toString();
 
-                if (cin.isEmpty() || pin.isEmpty() || studyId.equals("0") || studyId.isEmpty()){
+                if (childInitials.isEmpty() || parentInitials.isEmpty() || studyId.equals("0") || studyId.isEmpty()){
                     Toast.makeText(getActivity(), "Please fill in all the fields", Toast.LENGTH_SHORT).show();
                 }else {
                     saveData();
@@ -114,8 +118,8 @@ private void saveData() {
 
         String new_study = etCode.getText().toString();
         new_study = new_study + "_" + studyId;
-        editor.putString(CIN, cin);
-        editor.putString(PIN, pin);
+        editor.putString(CHILD_INITIALS, childInitials);
+        editor.putString(PARENT_INITIALS, parentInitials);
         editor.putString(VERSION, "2");
         editor.putString(STUDY_ID_2, studyId);
         editor.putString(STUDY_ID, new_study);
@@ -147,15 +151,15 @@ private void saveData() {
     }
 
     private void loadData() {
-        pin = sharedPreferences.getString(PIN, "");
-        cin = sharedPreferences.getString(CIN, "");
+        parentInitials = sharedPreferences.getString(PARENT_INITIALS, "");
+        childInitials = sharedPreferences.getString(CHILD_INITIALS, "");
         studyId = sharedPreferences.getString(STUDY_ID_2, "");
         formattedDate = sharedPreferences.getString(INITIAL_DATE, "");
     }
 
     private void updateViews() {
-        etPin.setText(pin);
-        etCin.setText(cin);
+        etParentInitials.setText(parentInitials);
+        etChildInitials.setText(childInitials);
 
         Credentials credentials = new Credentials();
         credentials.creds2(getActivity());
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Nasal.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Nasal.java
index 5fa3397..a11b067 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Nasal.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Nasal.java
@@ -2,10 +2,9 @@
 
 import static com.ug.air.alrite.Activities.SplashActivity.GRANT_COUNT;
 import static com.ug.air.alrite.Activities.SplashActivity.NASAL_COUNT;
-import static com.ug.air.alrite.Activities.SplashActivity.STRIDOR_COUNT;
 import static com.ug.air.alrite.Fragments.Patient.Assess.FINAL_DIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Assess.S4;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE;
+import static com.ug.air.alrite.Fragments.Patient.Assess.SEVERE_SYMPTOMS;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_MONTHS;
 import static com.ug.air.alrite.Fragments.Patient.Sex.KILO;
 
 import android.app.Dialog;
@@ -13,7 +12,6 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.media.MediaPlayer;
-import android.net.Uri;
 import android.os.Bundle;
 
 import androidx.cardview.widget.CardView;
@@ -213,8 +211,8 @@ private void displayDialog() {
         assessments = new ArrayList<>();
         assessmentAdapter = new AssessmentAdapter(assessments);
 
-        String age = sharedPreferences.getString(AGE, "");
-        String s = sharedPreferences.getString(S4, "");
+        String age = sharedPreferences.getString(AGE_IN_MONTHS, "");
+        String s = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
         String weight = sharedPreferences.getString(KILO, "");
         int ag = Integer.parseInt(age);
 
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java
index 5dd379f..9df7b9d 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java
@@ -2,15 +2,14 @@
 
 import static android.content.Context.MODE_PRIVATE;
 import static com.ug.air.alrite.Activities.DiagnosisActivity.PENDING;
-import static com.ug.air.alrite.Activities.PatientActivity.INCOMPLETE;
+import static com.ug.air.alrite.Activities.PatientActivity.ASSESS_INCOMPLETE;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DATE;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.BRONCHODILATOR;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.BRONC;
-import static com.ug.air.alrite.Fragments.Patient.Initials.CIN;
-import static com.ug.air.alrite.Fragments.Patient.Initials.PIN;
-import static com.ug.air.alrite.Fragments.Patient.Initials.STUDY_ID;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE2;
-import static com.ug.air.alrite.Fragments.Patient.Sex.CHOICE;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USED_BRONCHODILATOR;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.AFTER_BRONCHODILATOR;
+import static com.ug.air.alrite.Fragments.Patient.Initials.CHILD_INITIALS;
+import static com.ug.air.alrite.Fragments.Patient.Initials.PARENT_INITIALS;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_YEARS;
+import static com.ug.air.alrite.Fragments.Patient.Sex.SEX;
 
 import android.content.Context;
 import android.content.Intent;
@@ -35,7 +34,6 @@
 
 import com.ug.air.alrite.APIs.ApiClient;
 import com.ug.air.alrite.APIs.JsonPlaceHolder;
-import com.ug.air.alrite.Activities.Dashboard;
 import com.ug.air.alrite.Activities.DiagnosisActivity;
 import com.ug.air.alrite.Activities.PatientActivity;
 import com.ug.air.alrite.Adapters.PatientAdapter;
@@ -43,7 +41,6 @@
 import com.ug.air.alrite.Database.DatabaseHelper;
 import com.ug.air.alrite.Models.History;
 import com.ug.air.alrite.Models.Item;
-import com.ug.air.alrite.Models.Patient;
 import com.ug.air.alrite.R;
 import com.ug.air.alrite.Utils.Credentials;
 
@@ -53,7 +50,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.Objects;
 
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
@@ -89,7 +85,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         view = inflater.inflate(R.layout.fragment_other_patients, container, false);
 
         databaseHelper = new DatabaseHelper(getActivity());
-        jsonPlaceHolder = ApiClient.getClient().create(JsonPlaceHolder.class);
+        jsonPlaceHolder = ApiClient.getClient(ApiClient.BASE_URL).create(JsonPlaceHolder.class);
 
         recyclerView = view.findViewById(R.id.recyclerView3);
         etSearch = view.findViewById(R.id.search);
@@ -167,15 +163,15 @@ private void accessSharedFile2(){
                     if (!name.equals("sharedPrefs.xml") && !name.equals("counter_file.xml")){
                         String names = name.replace(".xml", "");
                         SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(names, Context.MODE_PRIVATE);
-                        String bron = sharedPreferences.getString(BRONCHODILATOR, "");
-                        String incomplete = sharedPreferences.getString(INCOMPLETE, "");
+                        String bron = sharedPreferences.getString(USED_BRONCHODILATOR, "");
+                        String incomplete = sharedPreferences.getString(ASSESS_INCOMPLETE, "");
                         String pending = sharedPreferences.getString(PENDING, "");
-                        String fin = sharedPreferences.getString(BRONC, "");
+                        String fin = sharedPreferences.getString(AFTER_BRONCHODILATOR, "");
                         if (bron.isEmpty() || bron.equals("Bronchodialtor Not Given") || !fin.isEmpty()){
-                            cin = sharedPreferences.getString(CIN, "");
-                            pin = sharedPreferences.getString(PIN, "");
-                            age = sharedPreferences.getString(AGE2, "");
-                            gender = sharedPreferences.getString(CHOICE, "");
+                            cin = sharedPreferences.getString(CHILD_INITIALS, "");
+                            pin = sharedPreferences.getString(PARENT_INITIALS, "");
+                            age = sharedPreferences.getString(AGE_IN_YEARS, "");
+                            gender = sharedPreferences.getString(SEX, "");
                             dat = sharedPreferences.getString(DATE, "");
                             if (age.isEmpty()){
                                ag = "0 years 0 months";
@@ -223,10 +219,10 @@ private void submitData() {
                             String names = name.replace(".xml", "");
                             SharedPreferences sharedPreferences = requireActivity().getSharedPreferences(names, MODE_PRIVATE);
                             SharedPreferences.Editor editor = sharedPreferences.edit();
-                            String bron = sharedPreferences.getString(BRONCHODILATOR, "");
-                            String fin = sharedPreferences.getString(BRONC, "");
+                            String bron = sharedPreferences.getString(USED_BRONCHODILATOR, "");
+                            String fin = sharedPreferences.getString(AFTER_BRONCHODILATOR, "");
                             String pending = sharedPreferences.getString(PENDING, "");
-                            String incomplete = sharedPreferences.getString(INCOMPLETE, "");
+                            String incomplete = sharedPreferences.getString(ASSESS_INCOMPLETE, "");
 
                             if (!pending.equals("pending") && (bron.isEmpty() || bron.equals("Bronchodialtor Not Given") || !fin.isEmpty())){
                                 File patient = new File("/data/data/" + BuildConfig.APPLICATION_ID + "/shared_prefs/" + name);
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Oxygen.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Oxygen.java
index 386ac13..b6f4091 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Oxygen.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Oxygen.java
@@ -1,9 +1,9 @@
 package com.ug.air.alrite.Fragments.Patient;
 
 import static com.ug.air.alrite.Fragments.Patient.Assess.FINAL_DIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Assess.S4;
+import static com.ug.air.alrite.Fragments.Patient.Assess.SEVERE_SYMPTOMS;
 import static com.ug.air.alrite.Fragments.Patient.FTouch.TOUCH;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_MONTHS;
 import static com.ug.air.alrite.Fragments.Patient.Sex.KILO;
 
 import android.app.Dialog;
@@ -244,8 +244,8 @@ private void showDialog() {
         assessments = new ArrayList<>();
         assessmentAdapter = new AssessmentAdapter(assessments);
 
-        String age = sharedPreferences.getString(AGE, "");
-        String s = sharedPreferences.getString(S4, "");
+        String age = sharedPreferences.getString(AGE_IN_MONTHS, "");
+        String s = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
         String weight = sharedPreferences.getString(KILO, "");
         int ag = Integer.parseInt(age);
 
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/RRCounter.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/RRCounter.java
index a47772c..10dac95 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/RRCounter.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/RRCounter.java
@@ -2,10 +2,10 @@
 
 import static com.ug.air.alrite.Activities.SplashActivity.MANUAL_COUNT;
 import static com.ug.air.alrite.Activities.SplashActivity.RR_COUNTER_COUNT;
-import static com.ug.air.alrite.Fragments.Patient.Assess.S4;
+import static com.ug.air.alrite.Fragments.Patient.Assess.SEVERE_SYMPTOMS;
 import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.POINT;
 import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.POINT2;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_MONTHS;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -16,7 +16,6 @@
 import androidx.fragment.app.FragmentTransaction;
 
 import android.os.CountDownTimer;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -38,7 +37,6 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 
@@ -110,7 +108,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         }
 
         editor = sharedPreferences.edit();
-        age = sharedPreferences.getString(AGE, "");
+        age = sharedPreferences.getString(AGE_IN_MONTHS, "");
         ag = Integer.parseInt(age);
 
         numBreaths = 5;
@@ -190,7 +188,7 @@ public void onClick(View v) {
         next.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String assess = sharedPreferences.getString(S4, "");
+                String assess = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
                 FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
                 if (!assess.equals("None of these")){
                     fr.replace(R.id.fragment_container, new Wheezing());
@@ -491,7 +489,7 @@ private void saveData() {
             editor.putString(FASTBREATHING2, rating);
             editor.putString(RATE2, rate);
 
-            String age = sharedPreferences.getString(AGE, "");
+            String age = sharedPreferences.getString(AGE_IN_MONTHS, "");
             int ag = Integer.parseInt(age);
 
             Instructions instructions = new Instructions();
@@ -513,7 +511,7 @@ private void saveData() {
             editor.putString(RATE, rate);
             editor.apply();
 
-            String age = sharedPreferences.getString(AGE, "");
+            String age = sharedPreferences.getString(AGE_IN_MONTHS, "");
             int ag = Integer.parseInt(age);
 
             Instructions instructions = new Instructions();
@@ -522,7 +520,7 @@ private void saveData() {
             editor.putString(POINT, pot);
             editor.apply();
 
-            String assess = sharedPreferences.getString(S4, "");
+            String assess = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
 
             FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
             if (!assess.equals("None of these")){
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Sex.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Sex.java
index d6f92ca..d196086 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Sex.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Sex.java
@@ -28,28 +28,27 @@
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
-import java.util.Objects;
 
 
 public class Sex extends Fragment {
     View view;
-    EditText etYears, etKilo1, etKilo2, etMonths, etMuac;
-    Button back, next;
+    EditText etYears, etKilo, etKilo2, etMonths, etMuac;
+    Button buttonBack, buttonNext;
     LinearLayout linearLayout;
-    RadioGroup radioGroup;
-    RadioButton radioButton1, radioButton2;
-    String age, age2, weight, text, kg1, fileName, months, years, muac, diagnosis, score, message;
+    RadioGroup rgSex;
+    RadioButton rbMale, rbFemale;
+    String ageInMonths, ageInYearsAndMonths, weight, text, kg, fileName, months, years, muac, diagnosis, score, message;
     Spinner spinner;
     Dialog dialog;
-    String value2 = "none";
+    String value_sex = "none";
     private static final int YES = 0;
     private static final int NO = 1;
-    public static final String MDIAGNOSIS = "diagnosis_2";
-    public static final String AGE = "age";
-    public static final String AGE2 = "age2";
+    public static final String MDIAGNOSIS = "diagnosis_malnutrition";
+    public static final String AGE_IN_MONTHS = "age";
+    public static final String AGE_IN_YEARS = "age2";
     public static final String KILO = "weight";
     public static final String MUAC = "muac";
-    public static final String CHOICE = "gender";
+    public static final String SEX = "gender";
     public static final String SHARED_PREFS = "sharedPrefs";
     SharedPreferences sharedPreferences, sharedPreferences1;
     SharedPreferences.Editor editor;
@@ -61,29 +60,29 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         // Inflate the layout for this fragment
         view = inflater.inflate(R.layout.fragment_sex, container, false);
 
-        next = view.findViewById(R.id.next);
-        back = view.findViewById(R.id.back);
-        radioGroup = view.findViewById(R.id.radioGroup);
-        radioButton1 = view.findViewById(R.id.yes);
-        radioButton2 = view.findViewById(R.id.no);
+        buttonNext = view.findViewById(R.id.next);
+        buttonBack = view.findViewById(R.id.back);
+        rgSex = view.findViewById(R.id.radioGroup);
+        rbMale = view.findViewById(R.id.yes);
+        rbFemale = view.findViewById(R.id.no);
         etYears = view.findViewById(R.id.years);
         etMonths = view.findViewById(R.id.months);
-        etKilo1 = view.findViewById(R.id.kg1);
+        etKilo = view.findViewById(R.id.kg1);
         etMuac = view.findViewById(R.id.muac);
         linearLayout = view.findViewById(R.id.linearMUAC);
 
-        radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+        rgSex.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup group, int checkedId) {
-                View radioButton = radioGroup.findViewById(checkedId);
-                int index = radioGroup.indexOfChild(radioButton);
+                View radioButton = rgSex.findViewById(checkedId);
+                int index = rgSex.indexOfChild(radioButton);
 
                 switch (index) {
                     case YES:
-                        value2 = "Male";
+                        value_sex = "Male";
                         break;
                     case NO:
-                        value2 = "Female";
+                        value_sex = "Female";
                         break;
 
                     default:
@@ -92,10 +91,10 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
             }
         });
 
-        etKilo1.addTextChangedListener(textWatcher1);
-        etYears.addTextChangedListener(textWatcher2);
-        etMonths.addTextChangedListener(textWatcher3);
-        etMuac.addTextChangedListener(textWatcher4);
+        etKilo.addTextChangedListener(textListenerWeight);
+        etYears.addTextChangedListener(textListenerYears);
+        etMonths.addTextChangedListener(textListenerMonths);
+        etMuac.addTextChangedListener(textListenerMUAC);
 
 
         sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
@@ -104,29 +103,29 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
         loadData();
         updateViews();
 
-        next.setOnClickListener(new View.OnClickListener() {
+        buttonNext.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 years = etYears.getText().toString();
                 months = etMonths.getText().toString();
-                kg1 = etKilo1.getText().toString();
+                kg = etKilo.getText().toString();
                 muac = etMuac.getText().toString();
 //                kg2 = etKilo2.getText().toString();
 
-                if (value2.equals("none") || years.isEmpty() || months.isEmpty()){
+                if (value_sex.equals("none") || years.isEmpty() || months.isEmpty()){
                     Toast.makeText(getActivity(), "Please fill in all the fields", Toast.LENGTH_SHORT).show();
                 }else{
                     int year = Integer.parseInt(years);
-                    int ag = (year*12) + Integer.parseInt(months);
-                    age = String.valueOf(ag);
-                    age2 = years + "." + months;
-                    weight = kg1;
+                    int ageInMos = (year*12) + Integer.parseInt(months);
+                    ageInMonths = String.valueOf(ageInMonths);
+                    ageInYearsAndMonths = years + "." + months;
+                    weight = kg;
                     saveData();
                 }
             }
         });
 
-        back.setOnClickListener(new View.OnClickListener() {
+        buttonBack.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
@@ -138,7 +137,7 @@ public void onClick(View v) {
         return view;
     }
 
-    public TextWatcher textWatcher1 = new TextWatcher() {
+    public TextWatcher textListenerWeight = new TextWatcher() {
         @Override
         public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
@@ -146,17 +145,17 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
         @Override
         public void onTextChanged(CharSequence s, int start, int before, int count) {
-            kg1 = etKilo1.getText().toString();
-            if (!kg1.isEmpty()){
-                float k1 = Float.parseFloat(kg1);
+            kg = etKilo.getText().toString();
+            if (!kg.isEmpty()){
+                float k1 = Float.parseFloat(kg);
                 if (k1 > 30.0){
-                    etKilo1.setError("The maximum kilograms for a child has to be 30.0kgs");
-                    next.setEnabled(false);
+                    etKilo.setError("The maximum kilograms for a child has to be 30.0kgs");
+                    buttonNext.setEnabled(false);
                 }else if (k1 < 0.5){
-                    etKilo1.setError("The minimum kilograms for a child has to be 0.5kgs");
-                    next.setEnabled(false);
+                    etKilo.setError("The minimum kilograms for a child has to be 0.5kgs");
+                    buttonNext.setEnabled(false);
                 }else {
-                    next.setEnabled(true);
+                    buttonNext.setEnabled(true);
                 }
 
             }
@@ -169,7 +168,7 @@ public void afterTextChanged(Editable s) {
         }
     };
 
-    public TextWatcher textWatcher4 = new TextWatcher() {
+    public TextWatcher textListenerMUAC = new TextWatcher() {
         @Override
         public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
@@ -182,12 +181,12 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
                 float k1 = Float.parseFloat(muac);
                 if (k1 > 40.0){
                     etMuac.setError("The maximum value for MUAC has to be 40.0cm");
-                    next.setEnabled(false);
+                    buttonNext.setEnabled(false);
                 }else if (k1 < 9.0){
                     etMuac.setError("The minimum value for MUAC has to be 9.0cm");
-                    next.setEnabled(false);
+                    buttonNext.setEnabled(false);
                 }else {
-                    next.setEnabled(true);
+                    buttonNext.setEnabled(true);
                 }
             }
 
@@ -199,7 +198,7 @@ public void afterTextChanged(Editable s) {
         }
     };
 
-    public TextWatcher textWatcher2 = new TextWatcher() {
+    public TextWatcher textListenerYears = new TextWatcher() {
         @Override
         public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
@@ -212,9 +211,9 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
                 int yr = Integer.parseInt(years);
                 if (yr > 4){
                     etYears.setError("The maximum number of years should be 4");
-                    next.setEnabled(false);
+                    buttonNext.setEnabled(false);
                 }else {
-                    next.setEnabled(true);
+                    buttonNext.setEnabled(true);
                 }
             }
         }
@@ -225,7 +224,7 @@ public void afterTextChanged(Editable s) {
         }
     };
 
-    public TextWatcher textWatcher3 = new TextWatcher() {
+    public TextWatcher textListenerMonths = new TextWatcher() {
         @Override
         public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
@@ -238,9 +237,9 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
                 int mt = Integer.parseInt(months);
                 if (mt > 11){
                     etMonths.setError("The maximum number of months should be 11");
-                    next.setEnabled(false);
+                    buttonNext.setEnabled(false);
                 }else {
-                    next.setEnabled(true);
+                    buttonNext.setEnabled(true);
                 }
             }
         }
@@ -259,10 +258,10 @@ private void saveData() {
             float we = Float.parseFloat(weight);
             ItemFactory itemFactory = new ItemFactory();
             try {
-                if (value2.equals("Male")){
-                    score = itemFactory.GetMaleItem(requireActivity(), age, we);
+                if (value_sex.equals("Male")){
+                    score = itemFactory.GetMaleItem(requireActivity(), ageInMonths, we);
                 }else{
-                    score = itemFactory.GetFemaleItem(requireActivity(), age, we);
+                    score = itemFactory.GetFemaleItem(requireActivity(), ageInMonths, we);
                 }
                 makeDecisions();
 
@@ -279,32 +278,32 @@ private void saveData() {
     }
 
     private void loadData() {
-        age = sharedPreferences.getString(AGE, "");
-        age2 = sharedPreferences.getString(AGE2, "");
+        ageInMonths = sharedPreferences.getString(AGE_IN_MONTHS, "");
+        ageInYearsAndMonths = sharedPreferences.getString(AGE_IN_YEARS, "");
         muac = sharedPreferences.getString(MUAC, "");
         weight = sharedPreferences.getString(KILO, "");
-        value2 = sharedPreferences.getString(CHOICE, "");
+        value_sex = sharedPreferences.getString(SEX, "");
     }
 
     private void updateViews() {
-        if (value2.equals("Male")){
-            radioButton1.setChecked(true);
-        }else if (value2.equals("Female")){
-            radioButton2.setChecked(true);
+        if (value_sex.equals("Male")){
+            rbMale.setChecked(true);
+        }else if (value_sex.equals("Female")){
+            rbFemale.setChecked(true);
         }else {
-            radioButton1.setChecked(false);
-            radioButton2.setChecked(false);
+            rbMale.setChecked(false);
+            rbFemale.setChecked(false);
         }
 
         if (!weight.isEmpty()){
-            etKilo1.setText(weight);
+            etKilo.setText(weight);
         }
         if (!muac.isEmpty()){
             etMuac.setText(muac);
         }
 
-        if (!age2.isEmpty()) {
-            String[] separated = age2.split("\\.");
+        if (!ageInYearsAndMonths.isEmpty()) {
+            String[] separated = ageInYearsAndMonths.split("\\.");
             etYears.setText(separated[0]);
             etMonths.setText(separated[1]);
         }
@@ -358,8 +357,8 @@ public void onClick(View view) {
             @Override
             public void onClick(View v) {
                 dialog.dismiss();
-                etKilo1.setText("");
-                etKilo1.requestFocus();
+                etKilo.setText("");
+                etKilo.requestFocus();
                 Toast.makeText(getActivity(), "Please check your scale and enter the weight again", Toast.LENGTH_LONG).show();
             }
         });
@@ -386,9 +385,9 @@ private void moveToNext() {
             }
         }
 
-        editor.putString(AGE, age);
-        editor.putString(AGE2, age2);
-        editor.putString(CHOICE, value2);
+        editor.putString(AGE_IN_MONTHS, ageInMonths);
+        editor.putString(AGE_IN_YEARS, ageInYearsAndMonths);
+        editor.putString(SEX, value_sex);
         editor.apply();
 
         FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Stridor.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Stridor.java
index f954d96..d957d86 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Stridor.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Stridor.java
@@ -2,8 +2,8 @@
 
 import static com.ug.air.alrite.Activities.SplashActivity.STRIDOR_COUNT;
 import static com.ug.air.alrite.Fragments.Patient.Assess.FINAL_DIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Assess.S4;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE;
+import static com.ug.air.alrite.Fragments.Patient.Assess.SEVERE_SYMPTOMS;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_MONTHS;
 import static com.ug.air.alrite.Fragments.Patient.Sex.KILO;
 
 import android.app.Dialog;
@@ -254,8 +254,8 @@ private void displayDialog() {
         assessments = new ArrayList<>();
         assessmentAdapter = new AssessmentAdapter(assessments);
 
-        String age = sharedPreferences.getString(AGE, "");
-        String s = sharedPreferences.getString(S4, "");
+        String age = sharedPreferences.getString(AGE_IN_MONTHS, "");
+        String s = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
         String weight = sharedPreferences.getString(KILO, "");
         int ag = Integer.parseInt(age);
 
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Temperature.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Temperature.java
index 80620ec..cc00685 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Temperature.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Temperature.java
@@ -1,10 +1,8 @@
 package com.ug.air.alrite.Fragments.Patient;
 
-import static com.ug.air.alrite.Fragments.Patient.Assess.S4;
+import static com.ug.air.alrite.Fragments.Patient.Assess.SEVERE_SYMPTOMS;
 import static com.ug.air.alrite.Fragments.Patient.FTouch.TOUCH;
-import static com.ug.air.alrite.Fragments.Patient.Fragment7v4.CHOICE3Y2;
 import static com.ug.air.alrite.Fragments.Patient.HIVCare.CHOICEHC;
-import static com.ug.air.alrite.Fragments.Patient.HIVStatus.CHOICE3;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -30,8 +28,6 @@
 
 import com.ug.air.alrite.R;
 
-import java.util.Objects;
-
 
 public class Temperature extends Fragment {
 
@@ -40,7 +36,7 @@ public class Temperature extends Fragment {
     Button back, next, btnSkip, btnSave;
     String temp, diagnosis;
     public static final String TEMP = "temperature";
-    public static final String TDIAGNOSIS = "diagnosis_4";
+    public static final String TDIAGNOSIS = "diagnosis_fever";
     public static final String SHARED_PREFS = "sharedPrefs";
     SharedPreferences sharedPreferences;
     SharedPreferences.Editor editor;
@@ -85,7 +81,7 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
 
-                String assess = sharedPreferences.getString(S4, "");
+                String assess = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
                 String care = sharedPreferences.getString(CHOICEHC, "");
 
                 FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
@@ -150,7 +146,7 @@ public void afterTextChanged(Editable s) {
     private void saveData() {
         deleteSharedPreferences();
 
-        String assess = sharedPreferences.getString(S4, "");
+        String assess = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
         editor.putString(TEMP, temp);
         editor.apply();
         float tp = Float.parseFloat(temp);
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
index 50778b0..412086c 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
@@ -41,7 +41,7 @@ public interface onGetResultListener {
     Button back, next, btnSkip, btnSave;
     String userInput, diagnosis;
     public static final String Question = "What is the childs temperature";
-    public static final String TDIAGNOSIS = "diagnosis_4";
+    public static final String TDIAGNOSIS = "diagnosis_fever";
     public static final String SHARED_PREFS = "sharedPrefs";
     SharedPreferences sharedPreferences;
     SharedPreferences.Editor editor;
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Wheezing.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Wheezing.java
index a4a5950..7733d75 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Wheezing.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Wheezing.java
@@ -1,17 +1,13 @@
 package com.ug.air.alrite.Fragments.Patient;
 
-import static com.ug.air.alrite.Activities.SplashActivity.STRIDOR_COUNT;
 import static com.ug.air.alrite.Activities.SplashActivity.WHEEZING_COUNT;
-import static com.ug.air.alrite.Fragments.Patient.Assess.DATE;
-import static com.ug.air.alrite.Fragments.Patient.Assess.S4;
+import static com.ug.air.alrite.Fragments.Patient.Assess.SEVERE_SYMPTOMS;
 import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.POINT;
 import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.POINT2;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.SECOND;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
@@ -19,10 +15,8 @@
 import androidx.cardview.widget.CardView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -32,31 +26,19 @@
 import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.MediaController;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.VideoView;
 
-import com.ug.air.alrite.Activities.Dashboard;
-import com.ug.air.alrite.Activities.DiagnosisActivity;
 import com.ug.air.alrite.Adapters.AssessmentAdapter;
 import com.ug.air.alrite.Models.Assessment;
 import com.ug.air.alrite.R;
 import com.ug.air.alrite.Utils.Calculations.Instructions;
 import com.ug.air.alrite.Utils.Counter;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
 
 public class Wheezing extends Fragment {
 
@@ -65,7 +47,7 @@ public class Wheezing extends Fragment {
     RadioGroup radioGroup;
     CheckBox checkBox;
     RadioButton radioButton1, radioButton2, radioButton3;
-    String value9 = "none";
+    String breathSounds = "none";
     TextView txtDisease, txtDefinition, txtOk, txtDiagnosis;
     LinearLayout linearLayoutDisease;
     LinearLayout linearLayout_instruction;
@@ -79,8 +61,8 @@ public class Wheezing extends Fragment {
     private static final int YES = 0;
     private static final int NO = 1;
     private static final int NOT = 2;
-    public static final String CHECKSTETHO = "stethoscope_used";
-    public static final String CHOICE8 = "wheezing";
+    public static final String STETHOSCOPE_USED = "stethoscope_used";
+    public static final String WHEEZING_SOUNDS = "wheezing";
     public static final String CHOICE82 = "wheezing_2";
     public static final String SHARED_PREFS = "sharedPrefs";
     SharedPreferences sharedPreferences, sharedPreferences1;
@@ -104,7 +86,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
         editor = sharedPreferences.edit();
 
-        assess = sharedPreferences.getString(S4, "");
+        assess = sharedPreferences.getString(SEVERE_SYMPTOMS, "");
         second = sharedPreferences.getString(SECOND, "");
 
         if (second.isEmpty()){
@@ -120,13 +102,13 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
 
                 switch (index) {
                     case YES:
-                        value9 = "Wheezing";
+                        breathSounds = "Wheezing";
                         break;
                     case NO:
-                        value9 = "Other abnormal breath sounds";
+                        breathSounds = "Other abnormal breath sounds";
                         break;
                     case NOT:
-                        value9 = "Normal breath sounds";
+                        breathSounds = "Normal breath sounds";
                         break;
                     default:
                         break;
@@ -137,7 +119,7 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
         next.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (value9.isEmpty()){
+                if (breathSounds.isEmpty()){
                     Toast.makeText(getActivity(), "Please select at least one of the options", Toast.LENGTH_SHORT).show();
                 }else {
                     saveData();
@@ -178,8 +160,8 @@ public void onClick(View v) {
     private void saveData() {
 
         if (second.isEmpty()){
-            editor.putString(CHOICE8, value9);
-            editor.putBoolean(CHECKSTETHO, checkBox.isChecked());
+            editor.putString(WHEEZING_SOUNDS, breathSounds);
+            editor.putBoolean(STETHOSCOPE_USED, checkBox.isChecked());
             editor.apply();
             if (!assess.equals("None of these")){
                 FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
@@ -191,7 +173,7 @@ private void saveData() {
                 int point = Integer.parseInt(pt);
 
                 Instructions instructions = new Instructions();
-                int pot = instructions.GetWheezing(value9, point);
+                int pot = instructions.GetWheezing(breathSounds, point);
                 editor.putString(POINT, String.valueOf(pot));
                 editor.apply();
 
@@ -201,15 +183,15 @@ private void saveData() {
                 fr.commit();
             }
         }else {
-            editor.putString(CHOICE82, value9);
-            editor.putBoolean(CHECKSTETHO, checkBox.isChecked());
+            editor.putString(CHOICE82, breathSounds);
+            editor.putBoolean(STETHOSCOPE_USED, checkBox.isChecked());
             editor.apply();
 
             String pt = sharedPreferences.getString(POINT2, "");
             int point = Integer.parseInt(pt);
 
             Instructions instructions = new Instructions();
-            int pot = instructions.GetWheezing(value9, point);
+            int pot = instructions.GetWheezing(breathSounds, point);
             editor.putString(POINT2, String.valueOf(pot));
             editor.apply();
 
@@ -223,16 +205,16 @@ private void saveData() {
 
     private void loadData() {
         SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
-        value9 = sharedPreferences.getString(CHOICE8, "");
-        check1 = sharedPreferences.getBoolean(CHECKSTETHO, false);
+        breathSounds = sharedPreferences.getString(WHEEZING_SOUNDS, "");
+        check1 = sharedPreferences.getBoolean(STETHOSCOPE_USED, false);
     }
 
     private void updateViews() {
-        if (value9.equals("Wheezing")){
+        if (breathSounds.equals("Wheezing")){
             radioButton1.setChecked(true);
-        }else if (value9.equals("Noisy breathing")){
+        }else if (breathSounds.equals("Noisy breathing")){
             radioButton2.setChecked(true);
-        }else if (value9.equals("Normal breathing")){
+        }else if (breathSounds.equals("Normal breathing")){
             radioButton3.setChecked(true);
         }else {
             radioButton1.setChecked(false);
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/navigation/AccountFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/navigation/AccountFragment.java
index 9c30072..fbcd83a 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/navigation/AccountFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/navigation/AccountFragment.java
@@ -53,7 +53,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         etUsername = view.findViewById(R.id.username);
         etPassword = view.findViewById(R.id.password);
 
-        jsonPlaceHolder = ApiClient.getClient().create(JsonPlaceHolder.class);
+        jsonPlaceHolder = ApiClient.getClient(ApiClient.BASE_URL).create(JsonPlaceHolder.class);
         databaseHelper = new DatabaseHelper(getActivity());
 
         loginBtn.setOnClickListener(new View.OnClickListener() {
@@ -90,6 +90,7 @@ public void onResponse(Call<Token> call, Response<Token> response) {
 
                 loginBtn.setEnabled(true);
                 progressBar.setVisibility(View.INVISIBLE);
+                System.out.println(response.body());
 
                 token = response.body().getToken();
                 String code = response.body().getInformation().getCode();
diff --git a/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker.java b/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker.java
index 9a2e3b4..b1b3e72 100644
--- a/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker.java
+++ b/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker.java
@@ -2,27 +2,22 @@
 
 import static android.content.Context.MODE_PRIVATE;
 import static android.content.Context.NOTIFICATION_SERVICE;
-import static android.content.Context.VIBRATOR_SERVICE;
 
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DATE;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.REASSESS;
-import static com.ug.air.alrite.Fragments.Patient.Initials.CIN;
-import static com.ug.air.alrite.Fragments.Patient.Initials.PIN;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE2;
-import static com.ug.air.alrite.Fragments.Patient.Sex.CHOICE;
+import static com.ug.air.alrite.Fragments.Patient.Initials.CHILD_INITIALS;
+import static com.ug.air.alrite.Fragments.Patient.Initials.PARENT_INITIALS;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_YEARS;
+import static com.ug.air.alrite.Fragments.Patient.Sex.SEX;
 
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
-import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
-import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.util.Log;
 
@@ -35,14 +30,9 @@
 import androidx.work.WorkerParameters;
 
 import com.ug.air.alrite.BuildConfig;
-import com.ug.air.alrite.Fragments.Patient.Bronchodilator;
 import com.ug.air.alrite.R;
 
 import java.io.File;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
 
 public class NotifyWorker extends Worker {
 
@@ -89,10 +79,10 @@ private void readData() {
                         if (name.equals(filename)){
                             SharedPreferences sharedPreferences = getApplicationContext().getSharedPreferences(name, MODE_PRIVATE);
                             SharedPreferences.Editor editor = sharedPreferences.edit();
-                            String cin = sharedPreferences.getString(CIN, "");
-                            String pin = sharedPreferences.getString(PIN, "");
-                            String age = sharedPreferences.getString(AGE2, "");
-                            String gender = sharedPreferences.getString(CHOICE, "");
+                            String cin = sharedPreferences.getString(CHILD_INITIALS, "");
+                            String pin = sharedPreferences.getString(PARENT_INITIALS, "");
+                            String age = sharedPreferences.getString(AGE_IN_YEARS, "");
+                            String gender = sharedPreferences.getString(SEX, "");
                             String[] split = age.split("\\.");
                             String ag = split[0] + " years and " + split[1] + " months";
                             editor.putBoolean(REASSESS, true);
diff --git a/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker2.java b/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker2.java
index d61155c..e902435 100644
--- a/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker2.java
+++ b/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker2.java
@@ -2,13 +2,12 @@
 
 import static android.content.Context.MODE_PRIVATE;
 import static android.content.Context.NOTIFICATION_SERVICE;
-import static android.content.Context.VIBRATOR_SERVICE;
 
-import static com.ug.air.alrite.Activities.PatientActivity.INCOMPLETE;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.BRONCHODILATOR;
+import static com.ug.air.alrite.Activities.PatientActivity.ASSESS_INCOMPLETE;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USED_BRONCHODILATOR;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DATE;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator2.REASON;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.BRONC;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.AFTER_BRONCHODILATOR;
 
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -17,10 +16,8 @@
 import android.content.SharedPreferences;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
-import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
-import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.util.Log;
 
@@ -33,8 +30,6 @@
 import androidx.work.WorkerParameters;
 
 import com.ug.air.alrite.BuildConfig;
-import com.ug.air.alrite.Models.Item;
-import com.ug.air.alrite.Models.Patient;
 import com.ug.air.alrite.R;
 
 import java.io.File;
@@ -91,9 +86,9 @@ private void readData2() {
                         if (!name.equals("sharedPrefs") && !name.equals("counter_file")){
                             SharedPreferences sharedPreferences = getApplicationContext().getSharedPreferences(name, MODE_PRIVATE);
                             SharedPreferences.Editor editor = sharedPreferences.edit();
-                            String bron = sharedPreferences.getString(BRONCHODILATOR, "");
-                            String fin = sharedPreferences.getString(BRONC, "");
-                            String incomplete = sharedPreferences.getString(INCOMPLETE, "");
+                            String bron = sharedPreferences.getString(USED_BRONCHODILATOR, "");
+                            String fin = sharedPreferences.getString(AFTER_BRONCHODILATOR, "");
+                            String incomplete = sharedPreferences.getString(ASSESS_INCOMPLETE, "");
                             if (incomplete.isEmpty() && bron.equals("Bronchodialtor Given") && fin.isEmpty()){
                                 String date = sharedPreferences.getString(DATE, "");
                                 try {
@@ -104,7 +99,7 @@ private void readData2() {
                                     if (minutes >= 30 && minutes < 240){
                                         value = value + 1;
                                     }else if (minutes >= 240){
-                                        editor.putString(BRONCHODILATOR, "Bronchodialtor Not Given");
+                                        editor.putString(USED_BRONCHODILATOR, "Bronchodialtor Not Given");
                                         editor.putString(REASON, "A 4 hour time period elapsed");
                                         editor.apply();
                                     }
diff --git a/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker3.java b/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker3.java
index ce93819..66a2ace 100644
--- a/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker3.java
+++ b/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker3.java
@@ -3,12 +3,11 @@
 import static android.content.Context.MODE_PRIVATE;
 import static android.content.Context.NOTIFICATION_SERVICE;
 
-import static com.ug.air.alrite.Activities.PatientActivity.INCOMPLETE;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.BRONCHODILATOR;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.BRONC;
+import static com.ug.air.alrite.Activities.PatientActivity.ASSESS_INCOMPLETE;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USED_BRONCHODILATOR;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.AFTER_BRONCHODILATOR;
 import static com.ug.air.alrite.Fragments.Patient.Initials.STUDY_ID;
 
-import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -16,14 +15,12 @@
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.os.Build;
-import android.os.Handler;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
-import androidx.work.ForegroundInfo;
 import androidx.work.WorkManager;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
@@ -78,7 +75,7 @@ public Result doWork() {
 
     private void readData3() {
 //        createForeInfo();
-        jsonPlaceHolder = ApiClient.getClient().create(JsonPlaceHolder.class);
+        jsonPlaceHolder = ApiClient.getClient(ApiClient.BASE_URL).create(JsonPlaceHolder.class);
         File src = new File("/data/data/" + BuildConfig.APPLICATION_ID + "/shared_prefs");
         if (src.exists()){
             contents = src.listFiles();
@@ -90,9 +87,9 @@ private void readData3() {
                             String names = name.replace(".xml", "");
                             SharedPreferences sharedPreferences = getApplicationContext().getSharedPreferences(names, MODE_PRIVATE);
                             SharedPreferences.Editor editor = sharedPreferences.edit();
-                            String bron = sharedPreferences.getString(BRONCHODILATOR, "");
-                            String fin = sharedPreferences.getString(BRONC, "");
-                            String incomplete = sharedPreferences.getString(INCOMPLETE, "");
+                            String bron = sharedPreferences.getString(USED_BRONCHODILATOR, "");
+                            String fin = sharedPreferences.getString(AFTER_BRONCHODILATOR, "");
+                            String incomplete = sharedPreferences.getString(ASSESS_INCOMPLETE, "");
 
                             if (!incomplete.isEmpty() || (bron.isEmpty() || bron.equals("Bronchodialtor Not Given") || !fin.isEmpty())){
                                 String studyID = sharedPreferences.getString(STUDY_ID, "");
diff --git a/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker4.java b/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker4.java
index 8b725ec..b6b7fd2 100644
--- a/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker4.java
+++ b/app/src/main/java/com/ug/air/alrite/Worker/NotifyWorker4.java
@@ -71,7 +71,7 @@ public Result doWork() {
     }
 
     private void readData3() {
-        jsonPlaceHolder = ApiClient.getClient().create(JsonPlaceHolder.class);
+        jsonPlaceHolder = ApiClient.getClient(ApiClient.BASE_URL).create(JsonPlaceHolder.class);
         File src = new File("/data/data/" + BuildConfig.APPLICATION_ID + "/shared_prefs/counter_file.xml");
         if (src.exists()){
             RequestBody filePart = RequestBody.create(MediaType.parse("*/*"), src);
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index e097d7a..c422c4a 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -38,7 +38,7 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:textColorHint="#B9B8B8"
             app:passwordToggleEnabled="true">
             <EditText

From d84ab46a537fd19d8adb9dee2cedd5c4f3de6af2 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Sun, 14 May 2023 17:28:21 -0700
Subject: [PATCH 27/50] Fixed some issues with getting the app to run, moved
 http request to app startup rather than each assessment startup

---
 .../ug/air/alrite/APIs/DecisionTreeJSON.java  |   2 +-
 .../alrite/Activities/PatientActivity.java    | 122 ++++++++-------
 .../air/alrite/Activities/SplashActivity.java |  62 +++++++-
 .../alrite/Activities/TextInputExample.json   | 141 ++++++++++++++----
 .../Patient/MultipleChoiceFragment.java       |   2 +-
 .../Patient/MultipleSelectionFragment.java    |   7 +-
 6 files changed, 249 insertions(+), 87 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java b/app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java
index 46020e0..4ca3a56 100644
--- a/app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java
+++ b/app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java
@@ -6,6 +6,6 @@
 
 public interface DecisionTreeJSON {
 
-    @GET("/alrite/apis/workflows/test/")
+    @GET("/alrite/apis/workflows/IMCI/")
     Call<String> getJson();
 }
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index c0e6adf..395c5d7 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -15,6 +15,7 @@
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.SECOND;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
@@ -23,6 +24,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -50,6 +52,7 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.lang.reflect.Array;
+import java.nio.file.Files;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -69,7 +72,7 @@
 import retrofit2.Retrofit;
 import retrofit2.Response;
 
-public class PatientActivity extends AppCompatActivity implements MultipleChoiceFragment.onGetResultListener {
+public class PatientActivity extends AppCompatActivity implements MultipleChoiceFragment.onGetResultListener, MultipleSelectionFragment.onGetResultListener, TextInputFragment.onGetResultListener {
 
     public static final String SHARED_PREFS = "sharedPrefs";
     public static final String INCOMPLETE = "incomplete";
@@ -94,7 +97,11 @@ protected void onCreate(Bundle savedInstanceState) {
             FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
             if (frag == 1){
                 // fragmentTransaction.add(R.id.fragment_container, new Initials());
-                getJSONFromBackend();
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    getJSONFromBackend();
+                } else {
+                    System.out.println("Cant read from file because it's too old of an SDK build version");
+                }
             }else if (frag == 2){
                 fragmentTransaction.add(R.id.fragment_container, new ActivePatients());
             }else {
@@ -276,6 +283,11 @@ private void doLogic(String file) {
     public static final String TEXT_INPUT = "TextInput";
     public static final String DIAGNOSIS_PAGE = "Diagnosis Page";
     public static final String TITLE = "title";
+    public static final String IS_DIAGNOSIS_PAGE = "isDiagnosisPage";
+    public static final String NULL = "null";
+    public static final String DEFAULT_LINK = "defaultLink";
+    public static final String TARGET_VALUE_ID = "targetValueID";
+    public static final String VALUE_ID = "valueID";
 
      // Full JSON infos to call getNextPage
      JSONArray pages;
@@ -293,7 +305,7 @@ private void doLogic(String file) {
     int MinValue; //The minimum value allowed to be inputted
     int MaxValue; //The maximum value allowed to be inputted
     int diagnosisCutoff; //The minimum value to be inputted in order to get the diagnosis
-     JSONObject pageID;
+    JSONObject pageID;
     String targetValue_id; // for text input
     String targetValueID; // for multiple selection
 
@@ -313,7 +325,7 @@ private void implementEditableDecisionTree(JSONObject json) throws JSONException
         pages = json.getJSONArray(PAGES);
         // This is just an array because it needs to be mutable: think of it as
         // its own element
-        String nextPage = pages.getJSONObject(0).getString(PAGE_ID);
+        String nextPage = pages.getJSONObject(2).getString(PAGE_ID);
 
         // Handling the intent
 
@@ -373,7 +385,7 @@ private void getNextPage(String nextPageID) throws JSONException {
 
         // If the next page would be the final page, then the assessment is over!
         // So, start up the diagnosis activity
-        if (nextPageJSON.get(TITLE).equals(DIAGNOSIS_PAGE)) {
+        if ((Boolean) nextPageJSON.get(IS_DIAGNOSIS_PAGE)) {
             exitActivity();
             return;
         }
@@ -381,60 +393,51 @@ private void getNextPage(String nextPageID) throws JSONException {
 
         // Then, for each component that we're given within the page, display a
         // fragment for that component.
-        for (int i = 0; i < nextPageContent.length(); i++) {
-            JSONObject nextPageComponent = nextPageContent.getJSONObject(i);
-            String nextPageComponentType = nextPageComponent.getString(COMPONENT);
-
-            // Multiple choice option(s):
-            if (nextPageComponentType.equals(MULTIPLE_CHOICE)) {
-                Boolean isMultiSelect = nextPageComponent.getBoolean(MULTISELECT);
-                if (isMultiSelect) {
-                    createMultiSelectFragment(nextPageComponent);
-                } else {
-                    createMultipleChoiceFragment(nextPageComponent);
-                }
-
-            // Text input option:
-            } else if (nextPageComponentType.equals(TEXT_INPUT)) {
-                createTextInputFragment(nextPageComponent);
-
-            // There was an issue with identifying the page...
+        JSONObject nextPageComponent = nextPageContent.getJSONObject(0);
+        String nextPageComponentType = nextPageComponent.getString(COMPONENT);
+
+        // Multiple choice option(s):
+        if (nextPageComponentType.equals(MULTIPLE_CHOICE)) {
+            Boolean isMultiSelect = nextPageComponent.getBoolean(MULTISELECT);
+            if (isMultiSelect) {
+                createMultiSelectFragment(nextPageComponent);
             } else {
-                throw new IllegalStateException("should never get here lol");
+                createMultipleChoiceFragment(nextPageComponent);
             }
+
+        // Text input option:
+        } else if (nextPageComponentType.equals(TEXT_INPUT)) {
+            createTextInputFragment(nextPageComponent);
+
+        // There was an issue with identifying the page...
+        } else {
+            throw new IllegalStateException("should never get here lol");
         }
     }
 
     /**
      * Essentially, make an asynchronous API call to get the HTTP
      */
+    @RequiresApi(api = Build.VERSION_CODES.O)
     private void getJSONFromBackend() {
-        DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.TEMP_SERV_URL).create(DecisionTreeJSON.class);
-        Call<String> call = dtJson.getJson();
-        call.enqueue(new Callback<String>() {
-            @Override
-            public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
-                if (!response.isSuccessful()) {
-                    System.out.println("no site, plase try again");
-                    return;
-                }
+        File assessment = new File(getFilesDir(), "assessment.json");
 
-                // We've received a response! We can turn this into a JSONObject
-                // and store the result locally
-                try {
-                    assert response.body() != null;
-                    JSONObject json = new JSONObject(response.body());
-                    implementEditableDecisionTree(json);
-                } catch (JSONException | IOException e) {
-                    throw new RuntimeException(e);
-                }
+        try {
+            BufferedReader br = Files.newBufferedReader(assessment.toPath());
+            StringBuilder sb = new StringBuilder();
+            String line;
+            while ((line = br.readLine()) != null) {
+                sb.append(line);
             }
 
-            @Override
-            public void onFailure(Call<String> call, Throwable t) {
-                throw new RuntimeException(t);
-            }
-        });
+            String json = sb.toString();
+
+            br.close();
+
+            implementEditableDecisionTree(new JSONObject(json));
+        } catch (Exception e) {
+            System.out.println("did a bad: " + e);
+        }
     }
 
     /**
@@ -465,14 +468,14 @@ private void createMultipleChoiceFragment(JSONObject nextPageComponent) throws J
      */
     private void createTextInputFragment(JSONObject page) throws JSONException {
         // Collect the important arguments from the component
-        question = page.getString("text");
-        InputHint = page.getString("text");
-        InputInformation = page.getString("");
-        SkipInformation = page.getString("");
-        MinValue = page.getInt("");
-        MaxValue = page.getInt("");
-        diagnosisCutoff = page.getInt("");
-        targetValue_id = page.getString("valueID");
+        question = page.getString(LABEL);
+        InputHint = "none right now";
+        InputInformation = "none right now";
+        SkipInformation = "none right now";
+        MinValue = 0;
+        MaxValue = 100;
+        diagnosisCutoff = 50;
+        targetValue_id = page.getString(VALUE_ID);
 
         // Get the new page's fragment, and set a listener for when the next button
         // is clicked
@@ -491,7 +494,7 @@ private void createTextInputFragment(JSONObject page) throws JSONException {
     private void createMultiSelectFragment(JSONObject page) throws JSONException {
         question = page.getString(LABEL);
         choices = JSONArrayToListOfJSONObjects(page.getJSONArray(CHOICES));
-        targetValueID = page.getString("targetValueID");
+        targetValueID = page.getString(VALUE_ID);
 
         // Get the new page's fragment
         // set a listener for when the next button is clicked
@@ -513,6 +516,11 @@ private void createMultiSelectFragment(JSONObject page) throws JSONException {
     public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONException {
         String diagnosis = choices.get(choiceIndex - 1).getString(TEXT);
         String nextPageName = choices.get(choiceIndex - 1).getString(LINK);
+
+        // If the link is null, then we should go to the default page
+        if (nextPageName.equals(NULL)) {
+            nextPageName = pageID.getString(DEFAULT_LINK);
+        }
         System.out.println("NEXT PAGE NAME:" + nextPageName);
 
         // Enter the diagnosis into the editor
@@ -527,6 +535,7 @@ public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONExce
         }
     }
 
+    @Override
     public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOptionIds) throws JSONException {
         // add the selected choices to the diagnosis
         for (int choiceIndex : chosenOptionIds) {
@@ -553,6 +562,7 @@ public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOpti
         }
     }
 
+    @Override
     public void getResultFromTextInputFragment(int numberInputted) throws JSONException {
         String diagnosis = String.valueOf(numberInputted);
         JSONObject foundLink = getContentFromPageID(pageID, targetValue_id);;
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
index 548da9f..55597e3 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
@@ -2,12 +2,15 @@
 
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.REASSESS;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentTransaction;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
@@ -16,6 +19,8 @@
 import android.view.animation.AlphaAnimation;
 import android.widget.LinearLayout;
 
+import com.ug.air.alrite.APIs.ApiClient;
+import com.ug.air.alrite.APIs.DecisionTreeJSON;
 import com.ug.air.alrite.BuildConfig;
 import com.ug.air.alrite.Database.DatabaseHelper;
 import com.ug.air.alrite.Fragments.navigation.AccountFragment;
@@ -23,10 +28,14 @@
 import com.ug.air.alrite.Utils.Counter;
 import com.ug.air.alrite.Utils.Credentials;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
+import java.io.Writer;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -34,8 +43,9 @@
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
 import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 import retrofit2.Retrofit;
 import retrofit2.http.GET;
 
@@ -113,6 +123,7 @@ private void createFileCounter() {
             editor.apply();
         }
         checkDatabase();
+        getCurrentAssessmentIfConnectedToInternet();
     }
 
     private void checkDatabase() {
@@ -132,4 +143,53 @@ private void checkDatabase() {
         startActivity(i);
         finish();
     }
+
+    private void getCurrentAssessmentIfConnectedToInternet() {
+        if (isNetworkAvailable()) {
+            DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.TEMP_SERV_URL).create(DecisionTreeJSON.class);
+            Call<String> call = dtJson.getJson();
+            call.enqueue(new Callback<String>() {
+                @Override
+                public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
+                    if (!response.isSuccessful()) {
+                        System.out.println("no site, plase try again");
+                        return;
+                    }
+
+                    // We've received a response! We can turn this into a JSONObject
+                    // and store the result locally
+                    try {
+                        assert response.body() != null;
+                        JSONObject json = new JSONObject(response.body());
+
+                        File directory = getFilesDir();
+                        File assessment = new File(directory, "assessment.json");
+                        if (assessment.exists()) {
+                            assessment.delete();
+                            assessment = new File(directory, "assessment.json");
+                        }
+                        Writer output = null;
+                        output = new BufferedWriter(new FileWriter(assessment));
+                        output.write(json.toString());
+                        output.close();
+
+                    } catch (JSONException | IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+
+                @Override
+                public void onFailure(Call<String> call, Throwable t) {
+                    throw new RuntimeException(t);
+                }
+            });
+        }
+    }
+
+    private boolean isNetworkAvailable() {
+        ConnectivityManager connectivityManager
+                = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo activeNetworkInfo = connectivityManager != null ? connectivityManager.getActiveNetworkInfo() : null;
+        return activeNetworkInfo != null && activeNetworkInfo.isConnected();
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json b/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
index eb4e827..56233d0 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
+++ b/app/src/main/java/com/ug/air/alrite/Activities/TextInputExample.json
@@ -1,29 +1,68 @@
 {
-  "name": "test",
+  "name": "IMCI",
   "pages": [
     {
       "pageID": "page_1",
       "title": "Patient Details",
       "content": [
         {
-          "label": "Enter child's age:",
+          "label": "Enter parent or guardian's initials:",
+          "type": "default",
+          "valueID": "guardian_initials",
+          "component": "TextInput"
+        },
+        {
+          "label": "Enter child's initials:",
+          "type": "default",
+          "valueID": "child_initials",
+          "component": "TextInput"
+        }
+      ],
+      "defaultLink": "page_2",
+      "isDiagnosisPage": false
+    },
+    {
+      "pageID": "page_2",
+      "title": "Patient Details",
+      "content": [
+        {
+          "label": "What is the child's sex?",
+          "valueID": "patient_sex",
+          "multiselect": false,
+          "choices": [
+            {
+              "text": "Male",
+              "value": "male",
+              "link": "null"
+            },
+            {
+              "text": "Female",
+              "value": "female",
+              "link": "null"
+            }
+          ],
+          "component": "MultipleChoice"
+        },
+        {
+          "label": "How old is the child?",
           "type": "numeric",
-          "valueID": "age",
+          "valueID": "child_age",
           "units": "years",
           "component": "TextInput"
         },
         {
-          "type": "<",
-          "valueID": "age",
-          "threshold": "6",
-          "satisfiedLink": "page_2",
-          "notSatisfiedLink": "page_4"
+          "label": "What is the child's weight?",
+          "type": "numeric",
+          "valueID": "child_weight",
+          "units": "kg",
+          "component": "TextInput"
         }
       ],
-      "defaultLink": "page_2"
+      "defaultLink": "page_3",
+      "isDiagnosisPage": false
     },
     {
-      "pageID": "page_2",
+      "pageID": "page_3",
       "title": "Assess Patient",
       "content": [
         {
@@ -32,18 +71,23 @@
           "multiselect": true,
           "choices": [
             {
-              "text": "Uncontrolled jerking or convulsions",
-              "value": "convulsions",
+              "text": "Unable to drink or breastfeed",
+              "value": "unable to drink",
               "link": "page_1"
             },
             {
-              "text": "Unresponsive or no awareness of surroundings",
+              "text": "Vomiting everything",
+              "value": "vomiting",
+              "link": "page_1"
+            },
+            {
+              "text": "Unresponsive, no awareness of surroundings",
               "value": "unresponsive",
               "link": "page_1"
             },
             {
-              "text": "Vomiting everything",
-              "value": "vomiting",
+              "text": "Convulsions (uncontrolled jerking / seizures)",
+              "value": "convlusions",
               "link": "page_1"
             }
           ],
@@ -52,35 +96,82 @@
         {
           "type": "at_least_one",
           "targetValueID": "child_symptoms",
-          "satisfiedLink": "page_3",
+          "satisfiedLink": "page_8",
           "component": "Selection"
         }
       ],
-      "defaultLink": "page_4"
+      "defaultLink": "page_6",
+      "isDiagnosisPage": false
     },
     {
-      "pageID": "page_3",
+      "pageID": "page_8",
       "title": "Severe Disease",
       "content": [
         {
-          "fileName": "test.mp3",
-          "label": "something something idk",
-          "component": "MediaItem"
+          "text": "Give the first dose of antibiotic-intramuscular injection, Ampicillin and Gentamicin. Oral amoxicillin otherwise.",
+          "component": "Paragraph"
+        },
+        {
+          "text": "For AMPICILLIN: Dilute 500mg vial with 2.1ml sterile water (500mg/2.5ml). Give 5ml ONE TIME via intramuscular injection. If referral is not possible or delayed, repeat the same dose of AMPICILLIN every 6 hours.",
+          "component": "Paragraph"
+        },
+        {
+          "text": "For GENTAMICIN: (2ml/40mg/ml vial). Give 2.8-35.ml ONE TIME via intramuscular injection. If referral is not possible or delayed, repeat gentamicin once daily.",
+          "component": "Paragraph"
+        },
+        {
+          "text": "If wheezing now, give salbutamol 4-6 puffs with spacer or 1 nebulization (2.5-5mg) if available while awaiting referral. Do not delay referral.",
+          "component": "Paragraph"
         }
       ],
-      "defaultLink": "page_4"
+      "defaultLink": "page_6",
+      "isDiagnosisPage": false
+    },
+    {
+      "pageID": "page_6",
+      "title": "Patient's History (1/3)",
+      "content": [
+        {
+          "label": "Does the child have a cough or difficulty breathing?",
+          "valueID": "child_has_cough",
+          "multiselect": false,
+          "choices": [
+            {
+              "text": "Yes",
+              "value": "true",
+              "link": "null"
+            },
+            {
+              "text": "No",
+              "value": "false",
+              "link": "null"
+            }
+          ],
+          "component": "MultipleChoice"
+        }
+      ],
+      "defaultLink": "page_7",
+      "isDiagnosisPage": false
+    },
+    {
+      "pageID": "page_7",
+      "title": "Patient's History (2/3)",
+      "content": [],
+      "defaultLink": "page_4",
+      "isDiagnosisPage": false
     },
     {
       "pageID": "page_4",
       "title": "Diagnosis Page",
       "content": [],
-      "defaultLink": "page_1"
+      "defaultLink": "page_1",
+      "isDiagnosisPage": true
     }
   ],
   "meta": {
     "version": 4,
-    "apipath": "/alrite/apis/workflows/test/4/",
-    "time_created": "2023-05-01 23:01:05.383028+00:00",
+    "apipath": "/alrite/apis/workflows/IMCI/4/",
+    "time_created": "2023-05-11 19:44:23.369807+00:00",
     "created_by": null
   }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
index 2719ef9..cbd327f 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
@@ -112,7 +112,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         choiceGroup = view.findViewById(R.id.mc_options);
 
         // If we've already seen this page, reload our past choices
-        loadSelectedChoiceIfAlreadySelected();
+        // loadSelectedChoiceIfAlreadySelected();
 
         // This is a listener for, if the next button is pressed, whether we can go
         // on or not, and what information should be sent up
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
index b90cdf4..b5da193 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
@@ -25,7 +25,7 @@
 public class MultipleSelectionFragment extends Fragment {
 
     public interface onGetResultListener {
-        public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOptions) throws JSONException;
+        void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOptions) throws JSONException;
         void getLastPage() throws JSONException;
     }
     onGetResultListener getResultListener;
@@ -109,6 +109,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         CheckBox choice5 = view.findViewById(R.id.choice5);
         choice5.setText(choices.get(4));
 
+        choiceGroup = new ArrayList<>();
         choiceGroup.add(choice1);
         choiceGroup.add(choice2);
         choiceGroup.add(choice3);
@@ -156,8 +157,8 @@ public void onClick(View v) {
                 // Send the result back up to main: a listener there will trigger
                 // and start the next fragment sequence up
                 try {
-                        getResultListener.getResultFromMultipleSelectionFragment(chosenOptionIds);  // adding to the diagnosis
-                    } catch (JSONException ex) {
+                    getResultListener.getResultFromMultipleSelectionFragment(chosenOptionIds);  // adding to the diagnosis
+                } catch (JSONException ex) {
                     throw new RuntimeException(ex);
                 }
             }

From f1f15fb6a2afd39d4755479b4d1fd033dbf2f625 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Mon, 15 May 2023 14:37:29 -0700
Subject: [PATCH 28/50] Added diagnosis activity, beginning two pages, and
 edited patient activity to be more correct Also moved HTTP get to splash
 activity page

---
 app/src/main/AndroidManifest.xml              |   4 +
 .../ug/air/alrite/APIs/DecisionTreeJSON.java  |   5 +-
 .../Activities/DiagnosisActivityModified.java | 480 ++++++++++++++++++
 .../alrite/Activities/PatientActivity.java    |  60 ++-
 .../air/alrite/Activities/SplashActivity.java |   7 +-
 .../Fragments/Patient/InitialsModified.java   | 179 +++++++
 .../alrite/Fragments/Patient/SexModified.java | 399 +++++++++++++++
 7 files changed, 1104 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java
 create mode 100644 app/src/main/java/com/ug/air/alrite/Fragments/Patient/InitialsModified.java
 create mode 100644 app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bcbfcdc..74cbac7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,10 @@
             android:name=".Activities.DiagnosisActivity"
             android:exported="true">
         </activity>
+        <activity
+            android:name=".Activities.DiagnosisActivityModified"
+            android:exported="true">
+        </activity>
         <activity
             android:name=".Activities.PatientActivity"
             android:exported="true"
diff --git a/app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java b/app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java
index 4ca3a56..39d2133 100644
--- a/app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java
+++ b/app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java
@@ -3,9 +3,10 @@
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
+import retrofit2.http.Path;
 
 public interface DecisionTreeJSON {
 
-    @GET("/alrite/apis/workflows/IMCI/")
-    Call<String> getJson();
+    @GET("/alrite/apis/workflows/{workflow_id}/")
+    Call<String> getJson(@Path("workflow_id") String workflow_id);
 }
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java b/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java
new file mode 100644
index 0000000..dd3d5f0
--- /dev/null
+++ b/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java
@@ -0,0 +1,480 @@
+package com.ug.air.alrite.Activities;
+
+import static com.ug.air.alrite.Activities.FinalActivity.S6;
+import static com.ug.air.alrite.Activities.FinalActivity.S7;
+import static com.ug.air.alrite.Activities.PatientActivity.ASSESS_INCOMPLETE;
+import static com.ug.air.alrite.Fragments.Patient.Allergies.CHOICEY2;
+import static com.ug.air.alrite.Fragments.Patient.Assess.FINAL_DIAGNOSIS;
+import static com.ug.air.alrite.Fragments.Patient.Assess.SEVERE_SYMPTOMS;
+import static com.ug.air.alrite.Fragments.Patient.Breathless.S5;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.BRONCHODILATOR_WAS_GIVEN;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DATE;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DURATION;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.FILENAME;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USED_BRONCHODILATOR;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USERNAME;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.UUIDS;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator2.BDIAGNOSIS;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator2.REASON;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.AFTER_BRONCHODILATOR;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.B3DIAGNOSIS;
+import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.CHOICE7;
+import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.CHOICE72;
+import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.CIDIAGNOSIS;
+import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.POINT;
+import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.POINT2;
+import static com.ug.air.alrite.Fragments.Patient.Cough.DIFFICULTY_BREATHING;
+import static com.ug.air.alrite.Fragments.Patient.Cough.NODIAGNOSIS;
+import static com.ug.air.alrite.Fragments.Patient.CoughD.DAY1;
+import static com.ug.air.alrite.Fragments.Patient.Eczema.CHOICEX2;
+import static com.ug.air.alrite.Fragments.Patient.FTouch.FTDIAGNOSIS;
+import static com.ug.air.alrite.Fragments.Patient.FTouch.TOUCH;
+import static com.ug.air.alrite.Fragments.Patient.HIVCare.CHOICEHC;
+import static com.ug.air.alrite.Fragments.Patient.HIVStatus.CHOICE3;
+import static com.ug.air.alrite.Fragments.Patient.HIVStatus.HDIAGNOSIS;
+import static com.ug.air.alrite.Fragments.Patient.Initials.CHILD_INITIALS;
+import static com.ug.air.alrite.Fragments.Patient.Initials.INITIAL_DATE;
+import static com.ug.air.alrite.Fragments.Patient.Initials.PARENT_INITIALS;
+import static com.ug.air.alrite.Fragments.Patient.Kerosene.ADIAGNOSIS;
+import static com.ug.air.alrite.Fragments.Patient.Kerosene.CHOICET2;
+import static com.ug.air.alrite.Fragments.Patient.Kerosene.TUDIAGNOSIS;
+import static com.ug.air.alrite.Fragments.Patient.Nasal.CHOICEGN;
+import static com.ug.air.alrite.Fragments.Patient.Oxygen.OXY;
+import static com.ug.air.alrite.Fragments.Patient.RRCounter.FASTBREATHING;
+import static com.ug.air.alrite.Fragments.Patient.RRCounter.FASTBREATHING2;
+import static com.ug.air.alrite.Fragments.Patient.RRCounter.INITIAL_DATE_2;
+import static com.ug.air.alrite.Fragments.Patient.RRCounter.SECOND;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_MONTHS;
+import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_YEARS;
+import static com.ug.air.alrite.Fragments.Patient.Sex.KILO;
+import static com.ug.air.alrite.Fragments.Patient.Sex.MDIAGNOSIS;
+import static com.ug.air.alrite.Fragments.Patient.Sex.MUAC;
+import static com.ug.air.alrite.Fragments.Patient.Sex.SEX;
+import static com.ug.air.alrite.Fragments.Patient.Smoke.CHOICET1;
+import static com.ug.air.alrite.Fragments.Patient.Stridor.CHOICE6;
+import static com.ug.air.alrite.Fragments.Patient.Temperature.TDIAGNOSIS;
+import static com.ug.air.alrite.Fragments.Patient.Temperature.TEMP;
+import static com.ug.air.alrite.Fragments.Patient.WheezD.CHOICEX;
+import static com.ug.air.alrite.Fragments.Patient.WheezY.DAY2;
+import static com.ug.air.alrite.Fragments.Patient.Wheezing.CHOICE82;
+import static com.ug.air.alrite.Fragments.Patient.Wheezing.WHEEZING_SOUNDS;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.ug.air.alrite.Adapters.AssessmentAdapter;
+import com.ug.air.alrite.Adapters.DiagnosisAdapter;
+import com.ug.air.alrite.Adapters.SummaryAdapter;
+import com.ug.air.alrite.BuildConfig;
+import com.ug.air.alrite.Models.Assessment;
+import com.ug.air.alrite.Models.Diagnosis;
+import com.ug.air.alrite.Models.Summary;
+import com.ug.air.alrite.R;
+import com.ug.air.alrite.Utils.Calculations.Instructions;
+import com.ug.air.alrite.Utils.Credentials;
+
+import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+public class DiagnosisActivityModified extends AppCompatActivity {
+
+    LinearLayout summaryTabLayout, summaryExpandedLayout, diagnosisTabLayout, diagnosisExpandedLayout;
+    Button btnExit, btnExit2, btnContinue, btnSave;
+    ImageView summaryTabIcon, diagnosisTabIcon;
+    RecyclerView summaryListRV, diagnosisListRV;
+    TextView txtInitials, txtAge, txtGender;
+    DiagnosisAdapter diagnosisAdapter;
+    SummaryAdapter summaryAdapter;
+    List<Summary> summaryList;
+    List<String> messages = new ArrayList<>();;
+    List messageList = new ArrayList<>();;
+    public static final String SHARED_PREFS = "sharedPrefs";
+    public static final String DATE_2 = "end_date_2";
+    public static final String PENDING = "pending";
+    public static final String DURATION_2 = "duration_2";
+    SharedPreferences sharedPreferences, sharedPreferences1;
+    SharedPreferences.Editor editor, editor1;
+    String ageInYears, uniqueID, ageInMonths, folder, isPending;
+    float ag;
+    Dialog dialog;
+    RecyclerView recyclerView;
+    LinearLayout linearLayout_instruction;
+    TextView txtDiagnosis;
+    ArrayList<Assessment> assessments;
+    List messages2;
+    AssessmentAdapter assessmentAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_diagnosis);
+
+        // Get references to page objects
+        txtAge = findViewById(R.id.patient_age);
+        txtGender = findViewById(R.id.patient_sex);
+        txtInitials = findViewById(R.id.initials);
+        summaryTabIcon = findViewById(R.id.accordion);
+        summaryTabLayout = findViewById(R.id.clickable);
+        summaryExpandedLayout = findViewById(R.id.summary2);
+        summaryListRV = findViewById(R.id.recyclerView1);
+        diagnosisTabIcon = findViewById(R.id.accordion2);
+        diagnosisTabLayout = findViewById(R.id.clickable2);
+        diagnosisExpandedLayout = findViewById(R.id.summary3);
+        btnExit = findViewById(R.id.btnExit);
+        btnSave = findViewById(R.id.btnExit2);
+        diagnosisListRV = findViewById(R.id.recyclerView2);
+
+        // Get an editor for our shared preferences
+        sharedPreferences = getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+        editor = sharedPreferences.edit();
+
+        // Save the patient's age, for reference in the diagnosis instructions
+        ageInMonths = sharedPreferences.getString(AGE_IN_MONTHS, "");
+
+        // At the top of the page, display the patient's initials, age, and gender
+        String initials = sharedPreferences.getString(CHILD_INITIALS, "");
+        ageInYears = sharedPreferences.getString(AGE_IN_YEARS, "");
+        String[] ageInYearsSplit = ageInYears.split("\\.");
+        String gender = sharedPreferences.getString(SEX, "");
+        txtInitials.setText(initials);
+        txtAge.setText("Age: " + ageInYearsSplit[0] + " years and " + ageInYearsSplit[1] + " months");
+        txtGender.setText("Gender: " + gender);
+
+        // Click on the summary tab to expand it to show a summary of the patient's health
+        summaryTabLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (summaryExpandedLayout.getVisibility() == View.GONE){
+                    summaryExpandedLayout.setVisibility(View.VISIBLE);
+                    summaryTabIcon.setImageResource(R.drawable.ic_sub);
+                }else{
+                    summaryExpandedLayout.setVisibility(View.GONE);
+                    summaryTabIcon.setImageResource(R.drawable.ic_add);
+                }
+            }
+        });
+
+        // Add the list to be expanded + a manager to expand it
+        LinearLayoutManager summaryLayoutManager = new LinearLayoutManager(DiagnosisActivityModified.this);
+        summaryAdapter = new SummaryAdapter(buildSummaryList());
+        summaryListRV.setAdapter(summaryAdapter);
+        summaryListRV.setLayoutManager(summaryLayoutManager);
+
+        // Same for diagnosis tab
+        diagnosisTabLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (diagnosisExpandedLayout.getVisibility() == View.GONE){
+                    diagnosisExpandedLayout.setVisibility(View.VISIBLE);
+                    diagnosisTabIcon.setImageResource(R.drawable.ic_sub);
+                }else{
+                    diagnosisExpandedLayout.setVisibility(View.GONE);
+                    diagnosisTabIcon.setImageResource(R.drawable.ic_add);
+                }
+            }
+        });
+
+        LinearLayoutManager diagnosisLayoutManager = new LinearLayoutManager(DiagnosisActivityModified.this);
+        diagnosisAdapter = new DiagnosisAdapter(buildDiagnosisList());
+        diagnosisListRV.setAdapter(diagnosisAdapter);
+        diagnosisListRV.setLayoutManager(diagnosisLayoutManager);
+
+        // Inside of the expanded diagnosis tab, if we click on one of the diagnoses,
+        // expand the tab and give instructions on what to do
+        diagnosisAdapter.setOnItemClickListener(new DiagnosisAdapter.OnItemClickListener() {
+            @Override
+            public void onClick(int position) {
+                Diagnosis diagnosis = buildDiagnosisList().get(position);
+                String dia = diagnosis.getDiagnosis();
+                showInstructions(dia);
+//                Toast.makeText(DiagnosisActivity.this, dia, Toast.LENGTH_SHORT).show();
+            }
+        });
+
+        // If we click "save and complete" then set PENDING to false and
+        btnExit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                isPending = "not pending";
+                saveForm();
+            }
+        });
+
+        btnSave.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                isPending = "pending";
+                saveForm();
+            }
+        });
+    }
+
+    private void showInstructions(String dia) {
+        dialog = new Dialog(this);
+        dialog.setContentView(R.layout.assessment_layout);
+        dialog.setCancelable(true);
+        Window window = dialog.getWindow();
+        window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+
+        linearLayout_instruction = dialog.findViewById(R.id.diagnosis);
+        txtDiagnosis = dialog.findViewById(R.id.txtDiagnosis);
+        recyclerView = dialog.findViewById(R.id.recyclerView1);
+        btnExit2 = dialog.findViewById(R.id.btnSave);
+        btnContinue = dialog.findViewById(R.id.btnContinue);
+
+        linearLayout_instruction.setBackgroundColor(getResources().getColor(R.color.severeDiagnosisColor));
+        txtDiagnosis.setText("Diagnosis: " + dia);
+
+        recyclerView.setHasFixedSize(true);
+        recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
+
+        List<Assessment> assessments = new ArrayList<>();
+        assessmentAdapter = new AssessmentAdapter(assessments);
+
+//        messages2 = createList(dia);
+
+        for (int i = 0; i < messageList.size(); i++){
+            Assessment assessment = new Assessment((Integer) messageList.get(i));
+            assessments.add(assessment);
+        }
+        recyclerView.setAdapter(assessmentAdapter);
+
+        btnExit2.setVisibility(View.GONE);
+        btnContinue.setText("Close");
+
+        btnContinue.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+
+        dialog.getWindow().setGravity(Gravity.CENTER);
+        dialog.show();
+
+    }
+
+    private List<Diagnosis> buildDiagnosisList() {
+        List<Diagnosis> diagnosisList = new ArrayList<>();
+        return diagnosisList;
+    }
+
+    private List<Assessment> buildSubItemList(String s) {
+        List<Assessment> assessmentList = new ArrayList<>();
+
+        for (int i=0; i < messageList.size(); i++) {
+            Assessment assessment = new Assessment((Integer) messageList.get(i));
+            assessmentList.add(assessment);
+        }
+        return assessmentList;
+    }
+
+    private List<Summary> buildSummaryList(){
+        summaryList = new ArrayList<>();
+        String pin = sharedPreferences.getString(PARENT_INITIALS, "");
+        String weight = sharedPreferences.getString(KILO, "");
+        String muac = sharedPreferences.getString(MUAC, "");
+
+        addToSummaryList("Parent's initials", pin);
+        addToSummaryList("Child's weight", weight);
+        addToSummaryList("MUAC value", muac);
+
+        Map<String, ?> all = sharedPreferences.getAll();
+        System.out.println(all);
+        for (Map.Entry<String, ?> x : all.entrySet()) {
+            String question = x.getKey();
+            if (question.substring(0, 2).equals("?:")) {
+                addToSummaryList(question, (String) x.getValue());
+            }
+        }
+
+        return summaryList;
+    }
+
+    private void addToSummaryList(String s, String pin) {
+        if (!pin.isEmpty()){
+            Summary summary = new Summary(s, pin);
+            summaryList.add(summary);
+        }
+    }
+
+    private void addToDiagnosisList(String s) {
+        if (!s.isEmpty()){
+            messages.add(s);
+        }
+    }
+
+    private void saveForm() {
+
+        String file = sharedPreferences.getString(FILENAME, "");
+
+        Date currentTime = Calendar.getInstance().getTime();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss", Locale.getDefault());
+        String formattedDate = df.format(currentTime);
+
+        Credentials credentials = new Credentials();
+        String username = credentials.creds(DiagnosisActivityModified.this).getUsername();
+
+        uniqueID = UUID.randomUUID().toString();
+
+        if (file.isEmpty()){
+
+            getDuration(currentTime);
+
+            editor.putString(USERNAME, username);
+            editor.putString(DATE, formattedDate);
+            editor.putString(UUIDS, uniqueID);
+            editor.putString(PENDING, isPending);
+            editor.putString(ASSESS_INCOMPLETE, "complete");
+            editor.apply();
+
+            String filename = formattedDate + "_" + uniqueID;
+            editor.putString(FILENAME, filename);
+            editor.apply();
+//            Toast.makeText(this, "empty", Toast.LENGTH_SHORT).show();
+            doLogic(filename);
+        }else {
+            editor.putString(PENDING, isPending);
+            editor.putString(ASSESS_INCOMPLETE, "complete");
+            String filename = formattedDate + "_" + uniqueID;
+            editor.putString(FILENAME, filename);
+            editor.putString(DATE, formattedDate);
+            editor.apply();
+
+            getDuration2(currentTime);
+//            Toast.makeText(this, "not empty", Toast.LENGTH_SHORT).show();
+            doLogic(filename);
+        }
+
+    }
+
+    private void getDuration(Date currentTime) {
+        String initial_date = sharedPreferences.getString(INITIAL_DATE, "");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss", Locale.getDefault());
+        try {
+            Date d1 = format.parse(initial_date);
+
+            long diff = currentTime.getTime() - d1.getTime();//as given
+
+            long minutes = TimeUnit.MILLISECONDS.toMinutes(diff);
+            String duration = String.valueOf(minutes);
+            editor.putString(DURATION, duration);
+            editor.apply();
+            Log.d("Difference in time", "getTimeDifference: " + minutes);
+
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void getDuration2(Date currentTime) {
+        String initial_date = sharedPreferences.getString(INITIAL_DATE_2, "");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss", Locale.getDefault());
+        try {
+            Date d1 = format.parse(initial_date);
+
+            long diff = currentTime.getTime() - d1.getTime();//as given
+
+            long minutes = TimeUnit.MILLISECONDS.toMinutes(diff);
+            String duration = String.valueOf(minutes);
+            editor.putString(DURATION_2, duration);
+            editor.apply();
+            Log.d("Difference in time", "getTimeDifference: " + minutes);
+
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void doLogic(String file) {
+        // Create a new shared preferences object + editor
+        sharedPreferences1 = getSharedPreferences(file, Context.MODE_PRIVATE);
+        editor1 = sharedPreferences1.edit();
+
+        // Put all values from the current Shared Preferences object into the shared
+        // preferences for the given file
+        Map<String, ?> all = sharedPreferences.getAll();
+        for (Map.Entry<String, ?> x : all.entrySet()) {
+            if (x.getValue().getClass().equals(String.class))  editor1.putString(x.getKey(),  (String)x.getValue());
+//            else if (x.getValue().getClass().equals(Boolean.class)) editor1.putBoolean(x.getKey(), (Boolean)x.getValue());
+        }
+        editor1.commit();
+        editor.clear();
+        editor.commit();
+
+        String filename = sharedPreferences1.getString(SECOND, "");
+        if (!filename.isEmpty()){
+            filename = filename + ".xml";
+            File src = new File("/data/data/" + BuildConfig.APPLICATION_ID + "/shared_prefs/" + filename);
+            if (src.exists()){
+                src.delete();
+//                Toast.makeText(this, "filename", Toast.LENGTH_SHORT).show();
+            }else{
+//                Toast.makeText(this, "no file filename", Toast.LENGTH_SHORT).show();
+            }
+        }
+
+        String bron = sharedPreferences1.getString(USED_BRONCHODILATOR, "");
+        String fin = sharedPreferences1.getString(AFTER_BRONCHODILATOR, "");
+        Intent intent;
+        if (bron.equals("Bronchodialtor Given") && fin.isEmpty()){
+            intent = new Intent(DiagnosisActivityModified.this, Dashboard.class);
+        }else{
+            if (isPending.equals("not pending")){
+                intent = new Intent(DiagnosisActivityModified.this, FinalActivity.class);
+                intent.putExtra("filename", file);
+            }else {
+                editor1.putString(SECOND, file);
+                editor1.apply();
+                intent = new Intent(DiagnosisActivityModified.this, Dashboard.class);
+            }
+        }
+
+        startActivity(intent);
+
+    }
+
+    @Override
+    public void onBackPressed() {
+        Intent intent = getIntent();
+        if (intent.hasExtra("filename")){
+            Bundle bundle = new Bundle();
+            Intent intent2 = new Intent(this, PatientActivity.class);
+            bundle.putInt("Fragment", 3);
+            intent2.putExtras(bundle);
+            startActivity(intent2);
+            finish();
+        }else{
+            Toast.makeText(this, "Please click the Save button", Toast.LENGTH_SHORT).show();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 395c5d7..9091dc6 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -34,6 +34,8 @@
 import com.ug.air.alrite.APIs.ApiClient;
 import com.ug.air.alrite.APIs.DecisionTreeJSON;
 import com.ug.air.alrite.Fragments.Patient.ActivePatients;
+import com.ug.air.alrite.Fragments.Patient.Initials;
+import com.ug.air.alrite.Fragments.Patient.InitialsModified;
 import com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment;
 import com.ug.air.alrite.Fragments.Patient.MultipleSelectionFragment;
 import com.ug.air.alrite.Fragments.Patient.OtherPatients;
@@ -96,9 +98,9 @@ protected void onCreate(Bundle savedInstanceState) {
             frag = intent.getExtras().getInt("Fragment");
             FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
             if (frag == 1){
-                // fragmentTransaction.add(R.id.fragment_container, new Initials());
+//                fragmentTransaction.add(R.id.fragment_container, new Initials());
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    getJSONFromBackend();
+                    fragmentTransaction.add(R.id.fragment_container, new InitialsModified());
                 } else {
                     System.out.println("Cant read from file because it's too old of an SDK build version");
                 }
@@ -288,6 +290,8 @@ private void doLogic(String file) {
     public static final String DEFAULT_LINK = "defaultLink";
     public static final String TARGET_VALUE_ID = "targetValueID";
     public static final String VALUE_ID = "valueID";
+    public static final String SATISFIED_LINK = "satisfiedLink";
+    public static final String NOT_SATISFIED_LINK = "notSatisfiedLink";
 
      // Full JSON infos to call getNextPage
      JSONArray pages;
@@ -314,7 +318,6 @@ private void doLogic(String file) {
      * @throws JSONException
      * @throws IOException
      */
-    // TODO: ensure that the strings are not hard-coded in the future
     private void implementEditableDecisionTree(JSONObject json) throws JSONException, IOException {
 //        DecisionTreeJSON json = ApiClient.getClient(ApiClient.TEMP_SERV_URL)
 //                                    .create(DecisionTreeJSON.class);
@@ -325,7 +328,7 @@ private void implementEditableDecisionTree(JSONObject json) throws JSONException
         pages = json.getJSONArray(PAGES);
         // This is just an array because it needs to be mutable: think of it as
         // its own element
-        String nextPage = pages.getJSONObject(2).getString(PAGE_ID);
+        String nextPage = pages.getJSONObject(0).getString(PAGE_ID);
 
         // Handling the intent
 
@@ -411,7 +414,8 @@ private void getNextPage(String nextPageID) throws JSONException {
 
         // There was an issue with identifying the page...
         } else {
-            throw new IllegalStateException("should never get here lol");
+            System.out.println("should never get here lol: just go to the next page");
+            getNextPage(pageID.getString(DEFAULT_LINK));
         }
     }
 
@@ -419,7 +423,7 @@ private void getNextPage(String nextPageID) throws JSONException {
      * Essentially, make an asynchronous API call to get the HTTP
      */
     @RequiresApi(api = Build.VERSION_CODES.O)
-    private void getJSONFromBackend() {
+    public void getJSONFromBackend() {
         File assessment = new File(getFilesDir(), "assessment.json");
 
         try {
@@ -445,7 +449,7 @@ private void getJSONFromBackend() {
      * the activity.
      */
     private void exitActivity() {
-        startActivity(new Intent(PatientActivity.this, DiagnosisActivity.class));
+        startActivity(new Intent(PatientActivity.this, DiagnosisActivityModified.class));
         this.finish();
     }
 
@@ -524,8 +528,7 @@ public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONExce
         System.out.println("NEXT PAGE NAME:" + nextPageName);
 
         // Enter the diagnosis into the editor
-        editor.putString(question, diagnosis);
-        editor.apply();
+        enterSymptomIntoEditor(question, diagnosis);
 
         // Decide on the next page based on the result
         try {
@@ -538,12 +541,12 @@ public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONExce
     @Override
     public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOptionIds) throws JSONException {
         // add the selected choices to the diagnosis
-        for (int choiceIndex : chosenOptionIds) {
-            String diagnosis = choices.get(choiceIndex - 1).getString(TEXT);
+        String allDiagnoses = choices.get(chosenOptionIds.get(0)).getString(TEXT);
+        for (int i = 1; i < chosenOptionIds.size(); i++) {
+            allDiagnoses += ", " + choices.get(i).getString(TEXT);
             // Enter the diagnosis into the editor
-            editor.putString(question, diagnosis);
-            editor.apply();
         }
+        enterSymptomIntoEditor(question, allDiagnoses);
 
         JSONObject foundLink = getContentFromPageID(pageID, targetValueID);
         String NextPage;
@@ -568,33 +571,32 @@ public void getResultFromTextInputFragment(int numberInputted) throws JSONExcept
         JSONObject foundLink = getContentFromPageID(pageID, targetValue_id);;
         String NextPage;
         if(foundLink == null) {
-            NextPage =  pageID.getString("defaultLink");
+            NextPage =  pageID.getString(DEFAULT_LINK);
         } else {
             // Replace BranchedLink with whatever the name is for the link field
             // once the branched link logic is completed in the JSON file
             if(foundLink.get("type").equals(">")) {
                 if (numberInputted > diagnosisCutoff) {
-                    NextPage = foundLink.getString("satisfiedLink");
+                    NextPage = foundLink.getString(SATISFIED_LINK);
                 } else {
-                    NextPage = foundLink.getString("notSatisfiedLink");
+                    NextPage = foundLink.getString(NOT_SATISFIED_LINK);
                 }
             } else if(foundLink.get("type").equals("<")) {
                 if (numberInputted < diagnosisCutoff) {
-                    NextPage = foundLink.getString("satisfiedLink");
+                    NextPage = foundLink.getString(SATISFIED_LINK);
                 } else {
-                    NextPage = foundLink.getString("notSatisfiedLink");
+                    NextPage = foundLink.getString(NOT_SATISFIED_LINK);
                 }
             } else {
                 if (numberInputted == diagnosisCutoff) {
-                    NextPage = foundLink.getString("satisfiedLink");
+                    NextPage = foundLink.getString(SATISFIED_LINK);
                 } else {
-                    NextPage = foundLink.getString("notSatisfiedLink");
+                    NextPage = foundLink.getString(NOT_SATISFIED_LINK);
                 }
             }
         }
         // Enter the diagnosis into the editor
-        editor.putString(question, diagnosis);
-        editor.apply();
+        enterSymptomIntoEditor(question, diagnosis);
         try {
             getNextPage(NextPage);
         } catch(JSONException e) {
@@ -614,16 +616,16 @@ public JSONObject getContentFromPageID(JSONObject pageid, String targetValueID)
         if(pageid != null) {
             try {
                 // Get the content from the JSONArray
-                contentVal = pageid.getJSONArray("content");
+                contentVal = pageid.getJSONArray(CONTENT);
             } catch (JSONException e) {
                 throw new RuntimeException(e);
             }
-            for(int i = 0; i < contentVal.length(); i++ ) {
+            for(int i = 0; i < contentVal.length(); i++) {
                 // Check to see if the ID's match up
                 // With the build in has method
                 JSONObject RetrievedTargetID = ((JSONObject)contentVal.get(i));
-                if ( RetrievedTargetID.has("targetValueID")) {
-                    if(RetrievedTargetID.get("targetValueID").equals(targetValueID)) {
+                if ( RetrievedTargetID.has(TARGET_VALUE_ID)) {
+                    if(RetrievedTargetID.get(TARGET_VALUE_ID).equals(targetValueID)) {
                         return RetrievedTargetID;
                     }
                 }
@@ -659,4 +661,10 @@ private int findIndexInPagesGivenPageId(String pageID) throws JSONException {
         }
         return -1;
     }
+
+    public void enterSymptomIntoEditor(String question, String symptom) {
+        // Enter the diagnosis into the editor
+        editor.putString("?: " + question, symptom);
+        editor.apply();
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
index 55597e3..09ab63a 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
@@ -67,6 +67,9 @@ public class SplashActivity extends AppCompatActivity {
     public static final String WHEEZING_COUNT = "wheezing_count";
     public static final String CHESTINDRWAING_COUNT = "chest_indrawing_count";
     public static final String ECZEMA_COUNT = "eczema_count";
+
+    // TODO: change this if you want to get from online
+    Boolean shouldGetNewAssessment = true;
     SharedPreferences sharedPreferences;
     SharedPreferences.Editor editor;
 
@@ -145,9 +148,9 @@ private void checkDatabase() {
     }
 
     private void getCurrentAssessmentIfConnectedToInternet() {
-        if (isNetworkAvailable()) {
+        if (isNetworkAvailable() && shouldGetNewAssessment) {
             DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.TEMP_SERV_URL).create(DecisionTreeJSON.class);
-            Call<String> call = dtJson.getJson();
+            Call<String> call = dtJson.getJson("Fever_Logic");
             call.enqueue(new Callback<String>() {
                 @Override
                 public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/InitialsModified.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/InitialsModified.java
new file mode 100644
index 0000000..be4a8bd
--- /dev/null
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/InitialsModified.java
@@ -0,0 +1,179 @@
+package com.ug.air.alrite.Fragments.Patient;
+
+import static com.ug.air.alrite.Fragments.Patient.RRCounter.SECOND;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.ug.air.alrite.Activities.Dashboard;
+import com.ug.air.alrite.R;
+import com.ug.air.alrite.Utils.Credentials;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+
+public class InitialsModified extends Fragment {
+
+   View view;
+   EditText etChildInitials, etParentInitials, etStudy, etCode;
+   Button back, next;
+   String childInitials, parentInitials, formattedDate, studyId, code, h_code, counter, filename;
+   public static final String CHILD_INITIALS = "patient_initials";
+    public static final String  VERSION = "app_version";
+   public static final String PARENT_INITIALS = "parent_initials";
+   public static final String STUDY_ID = "study_id";
+    public static final String STUDY_ID_2 = "study_id_2";
+   public static final String INITIAL_DATE = "start_date";
+   public static final String SHARED_PREFS = "sharedPrefs";
+   SharedPreferences sharedPreferences, sharedPreferences1;
+   SharedPreferences.Editor editor;
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        view = inflater.inflate(R.layout.fragment_initials, container, false);
+
+        etChildInitials = view.findViewById(R.id.cin);
+        etCode = view.findViewById(R.id.code);
+        etStudy = view.findViewById(R.id.studyId);
+        etParentInitials = view.findViewById(R.id.pin);
+        next = view.findViewById(R.id.next);
+        back = view.findViewById(R.id.back);
+
+        Intent intent = getActivity().getIntent();
+        // If ____, then we can combine the data for
+        // Otherwise, just get the current activity's shared preferences
+        if (intent.hasExtra("filename")) {
+            filename = intent.getExtras().getString("filename");
+            sharedPreferences1 = requireActivity().getSharedPreferences(filename, Context.MODE_PRIVATE);
+            sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+            editor = sharedPreferences.edit();
+            Map<String, ?> all = sharedPreferences1.getAll();
+            for (Map.Entry<String, ?> x : all.entrySet()) {
+                if (x.getValue().getClass().equals(String.class))  editor.putString(x.getKey(),  (String)x.getValue());
+            }
+            editor.commit();
+            editor.putString(SECOND, filename);
+            editor.apply();
+
+        } else {
+            sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+        }
+
+        // Get an editor for the shared preferences
+        editor = sharedPreferences.edit();
+
+        // Get the parent's initials and the child's initials and store them in
+        // the fragment, if they exist: otherwise ""
+        loadData();
+
+        // Get the credentials for the current user, and set the current variables
+        // to those values
+        updateViews();
+
+        next.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                childInitials = etChildInitials.getText().toString();
+                parentInitials = etParentInitials.getText().toString();
+                studyId = etStudy.getText().toString();
+
+                if (childInitials.isEmpty() || parentInitials.isEmpty() || studyId.equals("0") || studyId.isEmpty()){
+                    Toast.makeText(getActivity(), "Please fill in all the fields", Toast.LENGTH_SHORT).show();
+                }else {
+                    saveData();
+                }
+            }
+        });
+
+        back.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(getActivity(), Dashboard.class));
+            }
+        });
+
+        return view;
+    }
+
+    private void saveData() {
+
+        String new_study = etCode.getText().toString();
+        new_study = new_study + "_" + studyId;
+        editor.putString(CHILD_INITIALS, childInitials);
+        editor.putString(PARENT_INITIALS, parentInitials);
+        editor.putString(VERSION, "2");
+        editor.putString(STUDY_ID_2, studyId);
+        editor.putString(STUDY_ID, new_study);
+        if (formattedDate.isEmpty()){
+            Date currentTime = Calendar.getInstance().getTime();
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss", Locale.getDefault());
+            String formattedDate = df.format(currentTime);
+
+            editor.putString(INITIAL_DATE, formattedDate);
+        }
+        editor.apply();
+
+        int count = Integer.valueOf(counter);
+        int count2 = Integer.valueOf(studyId);
+
+//        Toast.makeText(getActivity(), count + " " + count2, Toast.LENGTH_SHORT).show();
+
+        if (count == count2){
+            count = count+1;
+            String ct = String.valueOf(count);
+            Credentials credentials = new Credentials();
+            credentials.counting(getActivity(), ct);
+        }
+
+        FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
+        fr.replace(R.id.fragment_container, new SexModified());
+        fr.addToBackStack(null);
+        fr.commit();
+    }
+
+    private void loadData() {
+        parentInitials = sharedPreferences.getString(PARENT_INITIALS, "");
+        childInitials = sharedPreferences.getString(CHILD_INITIALS, "");
+        studyId = sharedPreferences.getString(STUDY_ID_2, "");
+        formattedDate = sharedPreferences.getString(INITIAL_DATE, "");
+    }
+
+    private void updateViews() {
+        etParentInitials.setText(parentInitials);
+        etChildInitials.setText(childInitials);
+
+        Credentials credentials = new Credentials();
+        credentials.creds2(getActivity());
+        code = credentials.creds2(getActivity()).getCode();
+        h_code = credentials.creds2(getActivity()).getH_code();
+        counter = credentials.creds2(getActivity()).getCounter();
+        etCode.setText("AL"+h_code + "" + code);
+        etCode.setEnabled(false);
+
+        if (studyId.isEmpty()){
+            etStudy.setText(counter);
+        }else{
+            etStudy.setText(studyId);
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java
new file mode 100644
index 0000000..5bb62a2
--- /dev/null
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java
@@ -0,0 +1,399 @@
+package com.ug.air.alrite.Fragments.Patient;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.ug.air.alrite.Activities.PatientActivity;
+import com.ug.air.alrite.R;
+import com.ug.air.alrite.Utils.XML.ItemFactory;
+
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.Objects;
+
+
+public class SexModified extends Fragment {
+    View view;
+    EditText etYears, etKilo, etKilo2, etMonths, etMuac;
+    Button buttonBack, buttonNext;
+    LinearLayout linearLayout;
+    RadioGroup rgSex;
+    RadioButton rbMale, rbFemale;
+    String ageInMonths, ageInYearsAndMonths, weight, text, kg, fileName, months, years, muac, diagnosis, score, message;
+    Spinner spinner;
+    Dialog dialog;
+    String value_sex = "none";
+    private static final int YES = 0;
+    private static final int NO = 1;
+    public static final String MDIAGNOSIS = "diagnosis_malnutrition";
+    public static final String AGE_IN_MONTHS = "age";
+    public static final String AGE_IN_YEARS = "age2";
+    public static final String KILO = "weight";
+    public static final String MUAC = "muac";
+    public static final String SEX = "gender";
+    public static final String SHARED_PREFS = "sharedPrefs";
+    SharedPreferences sharedPreferences, sharedPreferences1;
+    SharedPreferences.Editor editor;
+    Bundle bundle;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        view = inflater.inflate(R.layout.fragment_sex, container, false);
+
+        buttonNext = view.findViewById(R.id.next);
+        buttonBack = view.findViewById(R.id.back);
+        rgSex = view.findViewById(R.id.radioGroup);
+        rbMale = view.findViewById(R.id.yes);
+        rbFemale = view.findViewById(R.id.no);
+        etYears = view.findViewById(R.id.years);
+        etMonths = view.findViewById(R.id.months);
+        etKilo = view.findViewById(R.id.kg1);
+        etMuac = view.findViewById(R.id.muac);
+        linearLayout = view.findViewById(R.id.linearMUAC);
+
+        rgSex.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+                View radioButton = rgSex.findViewById(checkedId);
+                int index = rgSex.indexOfChild(radioButton);
+
+                switch (index) {
+                    case YES:
+                        value_sex = "Male";
+                        break;
+                    case NO:
+                        value_sex = "Female";
+                        break;
+
+                    default:
+                        break;
+                }
+            }
+        });
+
+        etKilo.addTextChangedListener(textListenerWeight);
+        etYears.addTextChangedListener(textListenerYears);
+        etMonths.addTextChangedListener(textListenerMonths);
+        etMuac.addTextChangedListener(textListenerMUAC);
+
+
+        sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+        editor = sharedPreferences.edit();
+
+        loadData();
+        updateViews();
+
+        buttonNext.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                years = etYears.getText().toString();
+                months = etMonths.getText().toString();
+                kg = etKilo.getText().toString();
+                muac = etMuac.getText().toString();
+//                kg2 = etKilo2.getText().toString();
+
+                if (value_sex.equals("none") || years.isEmpty() || months.isEmpty()){
+                    Toast.makeText(getActivity(), "Please fill in all the fields", Toast.LENGTH_SHORT).show();
+                }else{
+                    int year = Integer.parseInt(years);
+                    int ageInMos = (year*12) + Integer.parseInt(months);
+                    ageInMonths = String.valueOf(ageInMonths);
+                    ageInYearsAndMonths = years + "." + months;
+                    weight = kg;
+                    saveData();
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        ((PatientActivity) Objects.requireNonNull(getActivity())).getJSONFromBackend();
+                    }
+                }
+            }
+        });
+
+        buttonBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
+                fr.replace(R.id.fragment_container, new Initials());
+                fr.commit();
+            }
+        });
+
+        return view;
+    }
+
+    public TextWatcher textListenerWeight = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            kg = etKilo.getText().toString();
+            if (!kg.isEmpty()){
+                float k1 = Float.parseFloat(kg);
+                if (k1 > 30.0){
+                    etKilo.setError("The maximum kilograms for a child has to be 30.0kgs");
+                    buttonNext.setEnabled(false);
+                }else if (k1 < 0.5){
+                    etKilo.setError("The minimum kilograms for a child has to be 0.5kgs");
+                    buttonNext.setEnabled(false);
+                }else {
+                    buttonNext.setEnabled(true);
+                }
+
+            }
+
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+
+        }
+    };
+
+    public TextWatcher textListenerMUAC = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            muac = etMuac.getText().toString();
+            if (!muac.isEmpty()){
+                float k1 = Float.parseFloat(muac);
+                if (k1 > 40.0){
+                    etMuac.setError("The maximum value for MUAC has to be 40.0cm");
+                    buttonNext.setEnabled(false);
+                }else if (k1 < 9.0){
+                    etMuac.setError("The minimum value for MUAC has to be 9.0cm");
+                    buttonNext.setEnabled(false);
+                }else {
+                    buttonNext.setEnabled(true);
+                }
+            }
+
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+
+        }
+    };
+
+    public TextWatcher textListenerYears = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            years = etYears.getText().toString();
+            if (!years.isEmpty()){
+                int yr = Integer.parseInt(years);
+                if (yr > 4){
+                    etYears.setError("The maximum number of years should be 4");
+                    buttonNext.setEnabled(false);
+                }else {
+                    buttonNext.setEnabled(true);
+                }
+            }
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+
+        }
+    };
+
+    public TextWatcher textListenerMonths = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            months = etMonths.getText().toString();
+            if (!months.isEmpty()){
+                int mt = Integer.parseInt(months);
+                if (mt > 11){
+                    etMonths.setError("The maximum number of months should be 11");
+                    buttonNext.setEnabled(false);
+                }else {
+                    buttonNext.setEnabled(true);
+                }
+            }
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+
+        }
+    };
+
+    private void saveData() {
+        diagnosis = "";
+        if(!weight.isEmpty()){
+            editor.putString(KILO, weight);
+            editor.apply();
+            float we = Float.parseFloat(weight);
+            ItemFactory itemFactory = new ItemFactory();
+            try {
+                if (value_sex.equals("Male")){
+                    score = itemFactory.GetMaleItem(requireActivity(), ageInMonths, we);
+                }else{
+                    score = itemFactory.GetFemaleItem(requireActivity(), ageInMonths, we);
+                }
+                makeDecisions();
+
+            } catch (XmlPullParserException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }else{
+            editor.remove(KILO);
+            moveToNext();
+        }
+
+    }
+
+    private void loadData() {
+        ageInMonths = sharedPreferences.getString(AGE_IN_MONTHS, "");
+        ageInYearsAndMonths = sharedPreferences.getString(AGE_IN_YEARS, "");
+        muac = sharedPreferences.getString(MUAC, "");
+        weight = sharedPreferences.getString(KILO, "");
+        value_sex = sharedPreferences.getString(SEX, "");
+    }
+
+    private void updateViews() {
+        if (value_sex.equals("Male")){
+            rbMale.setChecked(true);
+        }else if (value_sex.equals("Female")){
+            rbFemale.setChecked(true);
+        }else {
+            rbMale.setChecked(false);
+            rbFemale.setChecked(false);
+        }
+
+        if (!weight.isEmpty()){
+            etKilo.setText(weight);
+        }
+        if (!muac.isEmpty()){
+            etMuac.setText(muac);
+        }
+
+        if (!ageInYearsAndMonths.isEmpty()) {
+            String[] separated = ageInYearsAndMonths.split("\\.");
+            etYears.setText(separated[0]);
+            etMonths.setText(separated[1]);
+        }
+    }
+
+    private void makeDecisions() {
+        if (score.equals("acceptable")){
+            moveToNext();
+        }else if (score.equals("above 2")){
+            message = "This child’s weight is greater than 2 SD, above average. Are you sure you entered the right weight?";
+            diagnosis = "none";
+            showDialog(message);
+        }else if (score.equals("below 2")){
+            message = "This child’s weight is less than 2 SD, below average. The child may have Moderate Acute Malnutrition.. Are you sure you entered the right weight?";
+            diagnosis = "Moderate acute malnutrition";
+            showDialog(message);
+        }else {
+            message = "This child’s weight is less than 3 SD, below average. The child may have Severe Acute Malnutrition.. Are you sure you entered the right weight?";
+            diagnosis = "Severe acute malnutrition";
+            showDialog(message);
+        }
+    }
+
+    private void showDialog(String message) {
+        dialog = new Dialog(getActivity());
+        dialog.setContentView(R.layout.assess);
+        dialog.setCancelable(true);
+
+        TextView txtMessage = dialog.findViewById(R.id.message);
+        Button btnSave = dialog.findViewById(R.id.ContinueButton);
+        Button btnNo = dialog.findViewById(R.id.cancel);
+
+        btnSave.setText("Yes");
+        btnNo.setVisibility(View.VISIBLE);
+
+        txtMessage.setText(message);
+
+        btnSave.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                dialog.dismiss();
+                if (!diagnosis.equals("none")){
+                    editor.putString(MDIAGNOSIS, diagnosis);
+                    editor.apply();
+                }
+                moveToNext();
+            }
+        });
+
+        btnNo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+                etKilo.setText("");
+                etKilo.requestFocus();
+                Toast.makeText(getActivity(), "Please check your scale and enter the weight again", Toast.LENGTH_LONG).show();
+            }
+        });
+
+        dialog.show();
+    }
+
+    private void moveToNext() {
+        if (!muac.isEmpty()){
+            editor.putString(MUAC, muac);
+            if (diagnosis.isEmpty() || diagnosis.equals("none")){
+                float mw = Float.parseFloat(muac);
+                if (mw < 11.5){
+                    diagnosis = "Severe Acute malnutrition";
+                }else if (mw >= 11.5 && mw <= 12.4){
+                    diagnosis = "Moderate acute malnutrition";
+                }else {
+                    diagnosis = "none";
+                }
+
+                if (!diagnosis.equals("none")){
+                    editor.putString(MDIAGNOSIS, diagnosis);
+                }
+            }
+        }
+
+        editor.putString(AGE_IN_MONTHS, ageInMonths);
+        editor.putString(AGE_IN_YEARS, ageInYearsAndMonths);
+        editor.putString(SEX, value_sex);
+        editor.apply();
+    }
+}
\ No newline at end of file

From 04e9f16fae091a8c636de327f9be44f1b4ae8291 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Mon, 15 May 2023 14:41:14 -0700
Subject: [PATCH 29/50] Use this URL to get from remote for the demo

---
 app/src/main/java/com/ug/air/alrite/APIs/ApiClient.java         | 1 +
 .../main/java/com/ug/air/alrite/Activities/SplashActivity.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/ug/air/alrite/APIs/ApiClient.java b/app/src/main/java/com/ug/air/alrite/APIs/ApiClient.java
index 4afc053..9c4f10d 100644
--- a/app/src/main/java/com/ug/air/alrite/APIs/ApiClient.java
+++ b/app/src/main/java/com/ug/air/alrite/APIs/ApiClient.java
@@ -16,6 +16,7 @@
 public class ApiClient {
     public static final String BASE_URL = "http://140.142.142.94/alrite/apis/";
     public static final String TEMP_SERV_URL = "http://10.0.2.2:8000";
+    public static final String REMOTE_URL_TEMP = "http://54.190.44.215:8000";
 
     //    private static final String BASE_URL = "http://10.0.2.2:8000/alrite/apis/";
     private static Retrofit retrofit;
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
index 09ab63a..3963093 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
@@ -149,7 +149,7 @@ private void checkDatabase() {
 
     private void getCurrentAssessmentIfConnectedToInternet() {
         if (isNetworkAvailable() && shouldGetNewAssessment) {
-            DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.TEMP_SERV_URL).create(DecisionTreeJSON.class);
+            DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.REMOTE_URL_TEMP).create(DecisionTreeJSON.class);
             Call<String> call = dtJson.getJson("Fever_Logic");
             call.enqueue(new Callback<String>() {
                 @Override

From a185c5a091d2260f84cc80ee0ff783c00359e9f0 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Mon, 15 May 2023 15:22:27 -0700
Subject: [PATCH 30/50] Text input works fully now

---
 .../Activities/DiagnosisActivityModified.java    |  4 ++--
 .../air/alrite/Activities/PatientActivity.java   | 12 ++----------
 .../ug/air/alrite/Activities/SplashActivity.java |  2 +-
 .../Fragments/Patient/TextInputFragment.java     | 16 ++++++++--------
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java b/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java
index dd3d5f0..ed8c2ba 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java
@@ -311,8 +311,8 @@ private List<Summary> buildSummaryList(){
         System.out.println(all);
         for (Map.Entry<String, ?> x : all.entrySet()) {
             String question = x.getKey();
-            if (question.substring(0, 2).equals("?:")) {
-                addToSummaryList(question, (String) x.getValue());
+            if (question.substring(0, 3).equals("?: ")) {
+                addToSummaryList(question.substring(3), (String) x.getValue());
             }
         }
 
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 9091dc6..22ea48d 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -569,29 +569,21 @@ public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOpti
     public void getResultFromTextInputFragment(int numberInputted) throws JSONException {
         String diagnosis = String.valueOf(numberInputted);
         JSONObject foundLink = getContentFromPageID(pageID, targetValue_id);;
-        String NextPage;
-        if(foundLink == null) {
-            NextPage =  pageID.getString(DEFAULT_LINK);
-        } else {
+        String NextPage = pageID.getString(DEFAULT_LINK);
+        if(foundLink != null) {
             // Replace BranchedLink with whatever the name is for the link field
             // once the branched link logic is completed in the JSON file
             if(foundLink.get("type").equals(">")) {
                 if (numberInputted > diagnosisCutoff) {
                     NextPage = foundLink.getString(SATISFIED_LINK);
-                } else {
-                    NextPage = foundLink.getString(NOT_SATISFIED_LINK);
                 }
             } else if(foundLink.get("type").equals("<")) {
                 if (numberInputted < diagnosisCutoff) {
                     NextPage = foundLink.getString(SATISFIED_LINK);
-                } else {
-                    NextPage = foundLink.getString(NOT_SATISFIED_LINK);
                 }
             } else {
                 if (numberInputted == diagnosisCutoff) {
                     NextPage = foundLink.getString(SATISFIED_LINK);
-                } else {
-                    NextPage = foundLink.getString(NOT_SATISFIED_LINK);
                 }
             }
         }
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
index 3963093..09ab63a 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
@@ -149,7 +149,7 @@ private void checkDatabase() {
 
     private void getCurrentAssessmentIfConnectedToInternet() {
         if (isNetworkAvailable() && shouldGetNewAssessment) {
-            DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.REMOTE_URL_TEMP).create(DecisionTreeJSON.class);
+            DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.TEMP_SERV_URL).create(DecisionTreeJSON.class);
             Call<String> call = dtJson.getJson("Fever_Logic");
             call.enqueue(new Callback<String>() {
                 @Override
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
index 412086c..0f4e270 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
@@ -47,12 +47,12 @@ public interface onGetResultListener {
     SharedPreferences.Editor editor;
     Dialog dialog;
     TextView txtMessage;
-    public static final String IHint = "";
-    public static final String IInformation = "";
-    public static final String SInformation = "";
-    public static final String min_value = "";
-    public static final String max_value = "";
-    public static final String minValueforDiagnosis = "";
+    public static final String IHint = "IHint";
+    public static final String IInformation = "IInformation";
+    public static final String SInformation = "SInformation";
+    public static final String min_value = "min_value";
+    public static final String max_value = "max_value";
+    public static final String minValueforDiagnosis = "minValueforDiagnosis";
     String question;
     String InputHint;
     String InputInformation;
@@ -107,8 +107,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         TextView questionDisplay = view.findViewById(R.id.ti_question);
         questionDisplay.setText(question);
-        TextView InputHintDisplay = view.findViewById(R.id.IHint);
-        InputHintDisplay.setText(InputHint);
+        etDay = view.findViewById(R.id.IHint);
+        etDay.setHint(InputHint);
         TextView InputInformationDisplay = view.findViewById(R.id.ti_IInformation);
         InputInformationDisplay.setText(InputInformation);
         TextView SkipInformationDisplay = view.findViewById(R.id.ti_SInformation);

From b9228510c2584e25e59b2ef9d32482bfb2a6d369 Mon Sep 17 00:00:00 2001
From: evasy <yitongshan2016@yahoo.com>
Date: Mon, 15 May 2023 15:33:00 -0700
Subject: [PATCH 31/50] small changes

---
 .../java/com/ug/air/alrite/Activities/PatientActivity.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 22ea48d..20bb02c 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -551,10 +551,10 @@ public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOpti
         JSONObject foundLink = getContentFromPageID(pageID, targetValueID);
         String NextPage;
         if (foundLink == null) {
-            NextPage =  pageID.getString("defaultLink");
+            NextPage =  pageID.getString(DEFAULT_LINK);
         }
         else {
-            NextPage = foundLink.getString("satisfiedLink");
+            NextPage = foundLink.getString(SATISFIED_LINK);
         }
 
         // Decide on the next page based on the result

From d125095eb9c59659a79e6863b98b8ea971e3f16c Mon Sep 17 00:00:00 2001
From: evasy <yitongshan2016@yahoo.com>
Date: Mon, 15 May 2023 16:08:31 -0700
Subject: [PATCH 32/50] text input text version

---
 .../Patient/TextInputTextFragment.java        | 201 ++++++++++++++++++
 1 file changed, 201 insertions(+)
 create mode 100644 app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputTextFragment.java

diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputTextFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputTextFragment.java
new file mode 100644
index 0000000..d905522
--- /dev/null
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputTextFragment.java
@@ -0,0 +1,201 @@
+package com.ug.air.alrite.Fragments.Patient;
+
+import static com.ug.air.alrite.Fragments.Patient.FTouch.TOUCH;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.ug.air.alrite.R;
+
+import org.json.JSONException;
+
+
+public class TextInputTextFragment extends Fragment {
+    //Fragment wise should be done may need listener for skip
+    public interface onGetResultListener {
+        void getResultFromTextInputTextFragment(String TextInputted) throws JSONException;
+        void getLastPage() throws JSONException;
+    }
+    onGetResultListener getResultListener;
+    View view;
+    EditText etDay;
+    Button back, next, btnSkip, btnSave;
+    String userInput, diagnosis;
+    public static final String Question = "What is the childs temperature";
+    public static final String TDIAGNOSIS = "diagnosis_fever";
+    public static final String SHARED_PREFS = "sharedPrefs";
+    SharedPreferences sharedPreferences;
+    SharedPreferences.Editor editor;
+    Dialog dialog;
+    TextView txtMessage;
+    public static final String IHint = "IHint";
+    public static final String IInformation = "IInformation";
+    public static final String SInformation = "SInformation";
+    String question;
+    String InputHint;
+    String InputInformation;
+    String SkipInformation;
+
+    /**
+     * This creates a new MultipleChoiceFragment with a separate constructor, so
+     * that we can retain the given information and return the fragment
+     *
+     * @param question the question at the top of the page
+     * @param InputHint the input hint for the user
+     * @param InputInformation the input hint for the user
+     * @param SkipInformation the input hint for the user
+     * @return the fragment to be used in the future
+     */
+    public static TextInputTextFragment newInstance(String question, String InputHint, String InputInformation, String SkipInformation) throws JSONException {
+        TextInputTextFragment tif = new TextInputTextFragment();
+        Bundle args = new Bundle();
+        args.putString(Question, question);
+        args.putString(IHint, InputHint);
+        args.putString(IInformation, InputInformation);
+        args.putString(SInformation, SkipInformation);
+        tif.setArguments(args);
+        return tif;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        view = inflater.inflate(R.layout.text_input, container, false);
+        sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+        editor = sharedPreferences.edit();
+
+        assert getArguments() != null;
+        question = getArguments().getString(Question);
+        InputHint = getArguments().getString(IHint);
+        InputInformation = getArguments().getString(IInformation);
+        SkipInformation = getArguments().getString(SInformation);
+
+        TextView questionDisplay = view.findViewById(R.id.ti_question);
+        questionDisplay.setText(question);
+        etDay = view.findViewById(R.id.IHint);
+        etDay.setHint(InputHint);
+        TextView InputInformationDisplay = view.findViewById(R.id.ti_IInformation);
+        InputInformationDisplay.setText(InputInformation);
+        TextView SkipInformationDisplay = view.findViewById(R.id.ti_SInformation);
+        SkipInformationDisplay.setText(SkipInformation);
+
+        next = view.findViewById(R.id.next);
+        back = view.findViewById(R.id.back);
+        btnSkip = view.findViewById(R.id.skip);
+
+        etDay.requestFocus();
+
+        loadData();
+        updateViews();
+
+
+
+        next.setOnClickListener(new View.OnClickListener() {
+            //if there is nothing inputted
+            //get the int result from the id and get the text from there!
+            @Override
+            public void onClick(View v) {
+                userInput = etDay.getText().toString();
+                if (userInput.isEmpty()){
+                    Toast.makeText(getActivity(), "Please fill in the field before you continue", Toast.LENGTH_SHORT).show();
+                } else{
+                    saveData();
+                }
+            }
+        });
+
+        back.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                back.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        try {
+                            getResultListener.getLastPage();
+                        } catch (JSONException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                });
+            }
+        });
+
+        btnSkip.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
+                fr.replace(R.id.fragment_container, new FTouch());
+                fr.addToBackStack(null);
+                fr.commit();
+            }
+        });
+
+        return view;
+    }
+
+    /**
+     * This is where we do what we usually do in the onAttach section, except that
+     * we also add a listener for sending the result of the Text Input up to
+     * the activity
+     *
+     * @param activity the PatientActivity that we're running this fragment on
+     */
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        try {
+            getResultListener = (TextInputTextFragment.onGetResultListener) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.toString() + " must implement onSomeEventListener");
+        }
+    }
+
+    private void saveData() {
+        deleteSharedPreferences();
+        try {
+            getResultListener.getResultFromTextInputTextFragment(userInput);
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    private void loadData() {
+        userInput = sharedPreferences.getString(Question, "");
+    }
+
+    private void updateViews() {
+        if (!userInput.isEmpty()){
+            etDay.setText(userInput);
+            btnSkip.setEnabled(false);
+        }else {
+            btnSkip.setEnabled(true);
+        }
+    }
+
+    private void deleteSharedPreferences() {
+        editor.remove(TOUCH);
+        editor.remove(TDIAGNOSIS);
+        editor.apply();
+    }
+}
\ No newline at end of file

From 5303d72e2fe57cdf7b63d691f3566b07afa4ed00 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Mon, 15 May 2023 16:16:47 -0700
Subject: [PATCH 33/50] New TextInputTextFragment implemented, but broken lol

---
 .../alrite/Activities/PatientActivity.java    | 63 +++++++++++++++++--
 .../air/alrite/Activities/SplashActivity.java |  2 +-
 2 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 20bb02c..0d97883 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -40,6 +40,7 @@
 import com.ug.air.alrite.Fragments.Patient.MultipleSelectionFragment;
 import com.ug.air.alrite.Fragments.Patient.OtherPatients;
 import com.ug.air.alrite.Fragments.Patient.TextInputFragment;
+import com.ug.air.alrite.Fragments.Patient.TextInputTextFragment;
 import com.ug.air.alrite.R;
 import com.ug.air.alrite.Utils.Credentials;
 
@@ -74,7 +75,9 @@
 import retrofit2.Retrofit;
 import retrofit2.Response;
 
-public class PatientActivity extends AppCompatActivity implements MultipleChoiceFragment.onGetResultListener, MultipleSelectionFragment.onGetResultListener, TextInputFragment.onGetResultListener {
+public class PatientActivity extends AppCompatActivity implements
+        MultipleChoiceFragment.onGetResultListener, MultipleSelectionFragment.onGetResultListener,
+        TextInputFragment.onGetResultListener, TextInputTextFragment.onGetResultListener {
 
     public static final String SHARED_PREFS = "sharedPrefs";
     public static final String INCOMPLETE = "incomplete";
@@ -292,6 +295,12 @@ private void doLogic(String file) {
     public static final String VALUE_ID = "valueID";
     public static final String SATISFIED_LINK = "satisfiedLink";
     public static final String NOT_SATISFIED_LINK = "notSatisfiedLink";
+    public static final String TYPE = "type";
+    public static final String THRESHOLD = "threshold";
+    public static final String NUMERIC_TYPE = "numeric";
+    public static final String ALPHANUMERIC_TYPE = "alphanumeric";
+    public static final String TEXT_TYPE = "text";
+    public static final String ANY_TYPE = "any";
 
      // Full JSON infos to call getNextPage
      JSONArray pages;
@@ -410,7 +419,11 @@ private void getNextPage(String nextPageID) throws JSONException {
 
         // Text input option:
         } else if (nextPageComponentType.equals(TEXT_INPUT)) {
-            createTextInputFragment(nextPageComponent);
+            if (nextPageJSON.getString(TYPE).equals(NUMERIC_TYPE)) {
+                createTextInputFragment(nextPageComponent);
+            } else {
+                createTextInputTextFragment(nextPageComponent);
+            }
 
         // There was an issue with identifying the page...
         } else {
@@ -490,6 +503,27 @@ private void createTextInputFragment(JSONObject page) throws JSONException {
         completeFragmentTransaction(ti_fragment);
     }
 
+    /**
+     * Create the TextInputTextFragment
+     *
+     * @param nextPageComponent the component to be displayed on screen
+     * @throws JSONException because json
+     */
+    private void createTextInputTextFragment(JSONObject nextPageComponent) throws JSONException {
+        question = nextPageComponent.getString(LABEL);
+        InputHint = "none right now";
+        InputInformation = "none right now";
+        SkipInformation = "none right now";
+        targetValue_id = nextPageComponent.getString(VALUE_ID);
+
+        // Get the new page's fragment, and set a listener for when the next button
+        // is clicked
+        TextInputTextFragment tit_fragment = TextInputTextFragment.newInstance(question, InputHint, InputInformation, SkipInformation);
+
+        // Replace and commit the fragment
+        completeFragmentTransaction(tit_fragment);
+    }
+
     /**
      * Fragment for multiple selection
      *
@@ -543,7 +577,7 @@ public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOpti
         // add the selected choices to the diagnosis
         String allDiagnoses = choices.get(chosenOptionIds.get(0)).getString(TEXT);
         for (int i = 1; i < chosenOptionIds.size(); i++) {
-            allDiagnoses += ", " + choices.get(i).getString(TEXT);
+            allDiagnoses += "\n" + choices.get(i).getString(TEXT);
             // Enter the diagnosis into the editor
         }
         enterSymptomIntoEditor(question, allDiagnoses);
@@ -568,7 +602,7 @@ public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOpti
     @Override
     public void getResultFromTextInputFragment(int numberInputted) throws JSONException {
         String diagnosis = String.valueOf(numberInputted);
-        JSONObject foundLink = getContentFromPageID(pageID, targetValue_id);;
+        JSONObject foundLink = getContentFromPageID(pageID, targetValue_id);
         String NextPage = pageID.getString(DEFAULT_LINK);
         if(foundLink != null) {
             // Replace BranchedLink with whatever the name is for the link field
@@ -596,6 +630,27 @@ public void getResultFromTextInputFragment(int numberInputted) throws JSONExcept
         }
     }
 
+    @Override
+    public void getResultFromTextInputTextFragment(String textInputted) throws JSONException {
+        String recordedSymptom = textInputted;
+        JSONObject logicComponent = getContentFromPageID(pageID, targetValue_id);
+        String nextPage = pageID.getString(DEFAULT_LINK);
+        if (logicComponent != null) {
+            if (logicComponent.getString(TYPE).equals("=")) {
+                if (recordedSymptom.equals(logicComponent.getString(THRESHOLD))) {
+                    nextPage = logicComponent.getString(SATISFIED_LINK);
+                }
+            }
+        }
+
+        enterSymptomIntoEditor(question, recordedSymptom);
+        try {
+            getNextPage(nextPage);
+        } catch(JSONException e) {
+            throw new RuntimeException();
+        }
+    }
+
     /**
      * Takes the page id and returns where we wish to go
      *
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
index 09ab63a..3963093 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
@@ -149,7 +149,7 @@ private void checkDatabase() {
 
     private void getCurrentAssessmentIfConnectedToInternet() {
         if (isNetworkAvailable() && shouldGetNewAssessment) {
-            DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.TEMP_SERV_URL).create(DecisionTreeJSON.class);
+            DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.REMOTE_URL_TEMP).create(DecisionTreeJSON.class);
             Call<String> call = dtJson.getJson("Fever_Logic");
             call.enqueue(new Callback<String>() {
                 @Override

From cae7c775eee92c6a7319d4a6b9963229fb51b074 Mon Sep 17 00:00:00 2001
From: evasy <yitongshan2016@yahoo.com>
Date: Mon, 15 May 2023 16:30:47 -0700
Subject: [PATCH 34/50] ArrayList<JSONObject> for foundlinks

---
 .../alrite/Activities/PatientActivity.java    | 62 +++++++++++++++----
 1 file changed, 49 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 0d97883..59a83ff 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -602,22 +602,27 @@ public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOpti
     @Override
     public void getResultFromTextInputFragment(int numberInputted) throws JSONException {
         String diagnosis = String.valueOf(numberInputted);
-        JSONObject foundLink = getContentFromPageID(pageID, targetValue_id);
+        ArrayList<JSONObject> foundLinks = getContentFromPageIDArray(pageID, targetValue_id);
         String NextPage = pageID.getString(DEFAULT_LINK);
-        if(foundLink != null) {
+        if(!foundLinks.isEmpty()) {
             // Replace BranchedLink with whatever the name is for the link field
             // once the branched link logic is completed in the JSON file
-            if(foundLink.get("type").equals(">")) {
-                if (numberInputted > diagnosisCutoff) {
-                    NextPage = foundLink.getString(SATISFIED_LINK);
-                }
-            } else if(foundLink.get("type").equals("<")) {
-                if (numberInputted < diagnosisCutoff) {
-                    NextPage = foundLink.getString(SATISFIED_LINK);
-                }
-            } else {
-                if (numberInputted == diagnosisCutoff) {
-                    NextPage = foundLink.getString(SATISFIED_LINK);
+            for (JSONObject foundLink : foundLinks) {
+                if (foundLink.get("type").equals(">")) {
+                    if (numberInputted > Integer.parseInt(foundLink.getString(THRESHOLD))) {
+                        NextPage = foundLink.getString(SATISFIED_LINK);
+                        break;
+                    }
+                } else if (foundLink.get("type").equals("<")) {
+                    if (numberInputted < Integer.parseInt(foundLink.getString(THRESHOLD))) {
+                        NextPage = foundLink.getString(SATISFIED_LINK);
+                        break;
+                    }
+                } else {
+                    if (numberInputted == Integer.parseInt(foundLink.getString(THRESHOLD))) {
+                        NextPage = foundLink.getString(SATISFIED_LINK);
+                        break;
+                    }
                 }
             }
         }
@@ -681,6 +686,37 @@ public JSONObject getContentFromPageID(JSONObject pageid, String targetValueID)
         return null;
     }
 
+    /**
+     * Takes the page id and returns a list of targetids
+     *
+     * @param pageid the page ID we wish to use
+     * @param targetValueID the valueID of the current component that we are using
+     * @return
+     */
+    public ArrayList<JSONObject> getContentFromPageIDArray(JSONObject pageid, String targetValueID) throws JSONException {
+        JSONArray contentVal;
+        ArrayList<JSONObject> RetrievedTargetIDs = new ArrayList<>();
+        if(pageid != null) {
+            try {
+                // Get the content from the JSONArray
+                contentVal = pageid.getJSONArray(CONTENT);
+            } catch (JSONException e) {
+                throw new RuntimeException(e);
+            }
+            for(int i = 0; i < contentVal.length(); i++) {
+                // Check to see if the ID's match up
+                // With the build in has method
+                JSONObject RetrievedTargetID = ((JSONObject)contentVal.get(i));
+                if ( RetrievedTargetID.has(TARGET_VALUE_ID)) {
+                    if(RetrievedTargetID.get(TARGET_VALUE_ID).equals(targetValueID)) {
+                        RetrievedTargetIDs.add(RetrievedTargetID);
+                    }
+                }
+            }
+        }
+        return RetrievedTargetIDs;
+    }
+
     /**
      * Listener for clicking the back button: calls up the next page based on the
      * current backstack of pages

From 7734f337b853dd5d2374c9a21bd31f72efd54bc1 Mon Sep 17 00:00:00 2001
From: Navkiran <nav1123@icloud.com>
Date: Mon, 15 May 2023 16:50:08 -0700
Subject: [PATCH 35/50] Added more code for the textInput

---
 .../air/alrite/Activities/SplashActivity.java |   2 +-
 .../air/alrite/Fragments/Patient/Assess.java  |  70 ------------
 .../Fragments/Patient/ParagraphFragment.java  | 100 ++++++++++++++++++
 app/src/main/res/layout/paragraph.xml         |   6 ++
 4 files changed, 107 insertions(+), 71 deletions(-)
 create mode 100644 app/src/main/java/com/ug/air/alrite/Fragments/Patient/ParagraphFragment.java
 create mode 100644 app/src/main/res/layout/paragraph.xml

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
index 09ab63a..3963093 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
@@ -149,7 +149,7 @@ private void checkDatabase() {
 
     private void getCurrentAssessmentIfConnectedToInternet() {
         if (isNetworkAvailable() && shouldGetNewAssessment) {
-            DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.TEMP_SERV_URL).create(DecisionTreeJSON.class);
+            DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.REMOTE_URL_TEMP).create(DecisionTreeJSON.class);
             Call<String> call = dtJson.getJson("Fever_Logic");
             call.enqueue(new Callback<String>() {
                 @Override
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Assess.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Assess.java
index 336af37..fa3d943 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Assess.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Assess.java
@@ -250,79 +250,9 @@ private void checkIfNone() {
             fr.replace(R.id.fragment_container, new Cough());
             fr.addToBackStack(null);
             fr.commit();
-        }else{
-            displayDialog();
         }
     }
 
-    private void displayDialog() {
-        dialog = new Dialog(getActivity());
-        dialog.setContentView(R.layout.assessment_layout);
-        dialog.setCancelable(true);
-        Window window = dialog.getWindow();
-        window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
-
-        linearLayout_instruction = dialog.findViewById(R.id.diagnosis);
-        txtDiagnosis = dialog.findViewById(R.id.txtDiagnosis);
-        recyclerView = dialog.findViewById(R.id.recyclerView1);
-        btnExit = dialog.findViewById(R.id.btnSave);
-        btnContinue = dialog.findViewById(R.id.btnContinue);
-
-        linearLayout_instruction.setBackgroundColor(getResources().getColor(R.color.severeDiagnosisColor));
-        txtDiagnosis.setText(R.string.severe);
-        diagnosis = txtDiagnosis.getText().toString();
-        diagnosis = diagnosis.replace("Diagnosis: ", "");
-
-        recyclerView.setHasFixedSize(true);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
-
-        assessments = new ArrayList<>();
-        assessmentAdapter = new AssessmentAdapter(assessments);
-
-        String age = sharedPreferences.getString(AGE_IN_MONTHS, "");
-        String weight = sharedPreferences.getString(KILO, "");
-        int ag = Integer.parseInt(age);
-
-        Instructions instructions = new Instructions();
-        messages = instructions.GetInstructions(ag, weight, s);
-
-        for (int i = 0; i < messages.size(); i++){
-            Assessment assessment = new Assessment((Integer) messages.get(i));
-            assessments.add(assessment);
-        }
-        recyclerView.setAdapter(assessmentAdapter);
-        
-        btnExit.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finalDiagnosis();
-                editor.putString(DIAGNOSIS, diagnosis);
-                editor.apply();
-                dialog.dismiss();
-//                Toast.makeText(getActivity(), diagnosis, Toast.LENGTH_SHORT).show();
-                startActivity(new Intent(getActivity(), DiagnosisActivity.class));
-            }
-        });
-
-        btnContinue.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finalDiagnosis();
-                editor.putString(DIAGNOSIS, diagnosis);
-                editor.apply();
-                dialog.dismiss();
-                FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
-                fr.replace(R.id.fragment_container, new Cough());
-                fr.addToBackStack(null);
-                fr.commit();
-            }
-        });
-
-//        dialog.getWindow().setLayout(650, WindowManager.LayoutParams.MATCH_PARENT);
-        dialog.getWindow().setGravity(Gravity.CENTER);
-        dialog.show();
-    }
-
     private void finalDiagnosis() {
         editor.putString(FINAL_DIAGNOSIS, "Severe Pneumonia OR very Severe Disease");
         editor.apply();
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ParagraphFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ParagraphFragment.java
new file mode 100644
index 0000000..9c71507
--- /dev/null
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ParagraphFragment.java
@@ -0,0 +1,100 @@
+//package com.ug.air.alrite.Fragments.Patient;
+//
+//import static com.ug.air.alrite.Fragments.Patient.FTouch.TOUCH;
+//
+//import android.app.Activity;
+//import android.app.Dialog;
+//import android.content.Context;
+//import android.content.SharedPreferences;
+//import android.graphics.Color;
+//import android.graphics.Typeface;
+//import android.os.Bundle;
+//import android.text.Editable;
+//import android.text.TextWatcher;
+//import android.view.Gravity;
+//import android.view.LayoutInflater;
+//import android.view.View;
+//import android.view.ViewGroup;
+//import android.view.WindowManager;
+//import android.widget.Button;
+//import android.widget.EditText;
+//import android.widget.TextView;
+//import android.widget.Toast;
+//
+//import androidx.fragment.app.Fragment;
+//import androidx.fragment.app.FragmentTransaction;
+//
+//import com.ug.air.alrite.R;
+//
+//import org.json.JSONException;
+//
+//
+//public class ParagraphFragment extends Fragment {
+//    //Fragment wise should be done may need listener for skip
+//    public interface onGetResultListener {
+//        void getResultFromTextInputFragment(int choiceIndex) throws JSONException;
+//
+//        void getLastPage() throws JSONException;
+//    }
+//
+//    onGetResultListener getResultListener;
+//    View view;
+//    EditText etDay;
+//    Button back, next, btnSkip, btnSave;
+//    String userInput, diagnosis;
+//    public static final String Question = "What is the childs temperature";
+//    public static final String TDIAGNOSIS = "diagnosis_fever";
+//    public static final String SHARED_PREFS = "sharedPrefs";
+//    SharedPreferences sharedPreferences;
+//    SharedPreferences.Editor editor;
+//    Dialog dialog;
+//    TextView txtMessage;
+//    public static final String text = "";
+//    String text;
+//    String question;
+//
+//    public static ParagraphFragment newInstance(String question, String content) throws JSONException {
+//        ParagraphFragment pf = new ParagraphFragment();
+//        Bundle args = new Bundle();
+//        args.putString(Question, question);
+//        args.putString(text, content);
+//        pf.setArguments(args);
+//        return pf;
+//    }
+//    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+//                             Bundle savedInstanceState) {
+//
+//        next.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//            }
+//        });
+//
+//        back.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                back.setOnClickListener(new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View view) {
+//                        try {
+//                            getResultListener.getLastPage();
+//                        } catch (JSONException e) {
+//                            throw new RuntimeException(e);
+//                        }
+//                    }
+//                });
+//            }
+//        });
+//
+//        btnSkip.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
+//                fr.replace(R.id.fragment_container, new FTouch());
+//                fr.addToBackStack(null);
+//                fr.commit();
+//            }
+//        });
+//
+//        return view;
+//    }
\ No newline at end of file
diff --git a/app/src/main/res/layout/paragraph.xml b/app/src/main/res/layout/paragraph.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout/paragraph.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From a846ae1384bf48dd2041e4deb776fe677c9b5c1c Mon Sep 17 00:00:00 2001
From: Navkiran <nav1123@icloud.com>
Date: Tue, 16 May 2023 02:17:36 -0700
Subject: [PATCH 36/50] Paragraph Fragment almost completed one error only

---
 .../alrite/Activities/PatientActivity.java    |  31 ++-
 .../Fragments/Patient/ParagraphFragment.java  | 222 ++++++++++--------
 app/src/main/res/layout/fragment_touch.xml    |   7 +-
 app/src/main/res/layout/paragraph.xml         | 107 ++++++++-
 app/src/main/res/values/strings.xml           |   3 +
 5 files changed, 263 insertions(+), 107 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 59a83ff..4b69f82 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -39,6 +39,7 @@
 import com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment;
 import com.ug.air.alrite.Fragments.Patient.MultipleSelectionFragment;
 import com.ug.air.alrite.Fragments.Patient.OtherPatients;
+import com.ug.air.alrite.Fragments.Patient.ParagraphFragment;
 import com.ug.air.alrite.Fragments.Patient.TextInputFragment;
 import com.ug.air.alrite.Fragments.Patient.TextInputTextFragment;
 import com.ug.air.alrite.R;
@@ -82,7 +83,6 @@ public class PatientActivity extends AppCompatActivity implements
     public static final String SHARED_PREFS = "sharedPrefs";
     public static final String INCOMPLETE = "incomplete";
 
-
     public static final String ASSESS_INCOMPLETE = "incomplete";
     SharedPreferences sharedPreferences, sharedPreferences1;
     SharedPreferences.Editor editor, editor1;
@@ -321,6 +321,7 @@ private void doLogic(String file) {
     JSONObject pageID;
     String targetValue_id; // for text input
     String targetValueID; // for multiple selection
+    String paragraph; //Content for paragraph fragment
 
     /**
      *
@@ -541,6 +542,24 @@ private void createMultiSelectFragment(JSONObject page) throws JSONException {
         // Replace and commit the fragment
         completeFragmentTransaction(ms_fragment);
     }
+    /**
+     * Create the ParagraphFragment
+     *
+     * @param nextPageComponent the component to be displayed on screen
+     * @throws JSONException because json
+     */
+    private void createParagraphFragment(JSONObject nextPageComponent) throws JSONException {
+        question = nextPageComponent.getString(LABEL);
+        paragraph = "nothing at the moment, but content goes here";
+        targetValue_id = nextPageComponent.getString(VALUE_ID);
+
+        // Get the new page's fragment, and set a listener for when the next button
+        // is clicked
+        ParagraphFragment p_fragment = ParagraphFragment.newInstance(question, paragraph);
+
+        // Replace and commit the fragment
+        completeFragmentTransaction(p_fragment);
+    }
 
     /**
      * Listener for clicking the next button: we can move to the correct next
@@ -655,7 +674,15 @@ public void getResultFromTextInputTextFragment(String textInputted) throws JSONE
             throw new RuntimeException();
         }
     }
-
+    @Override
+    public void getResultFromParagraphFragment() throws JSONException {
+        String nextPage = pageID.getString(DEFAULT_LINK);
+        try {
+            getNextPage(nextPage);
+        } catch(JSONException e) {
+            throw new RuntimeException();
+        }
+    }
     /**
      * Takes the page id and returns where we wish to go
      *
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ParagraphFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ParagraphFragment.java
index 9c71507..4931bb3 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ParagraphFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ParagraphFragment.java
@@ -1,100 +1,122 @@
-//package com.ug.air.alrite.Fragments.Patient;
-//
-//import static com.ug.air.alrite.Fragments.Patient.FTouch.TOUCH;
-//
-//import android.app.Activity;
-//import android.app.Dialog;
-//import android.content.Context;
-//import android.content.SharedPreferences;
-//import android.graphics.Color;
-//import android.graphics.Typeface;
-//import android.os.Bundle;
-//import android.text.Editable;
-//import android.text.TextWatcher;
-//import android.view.Gravity;
-//import android.view.LayoutInflater;
-//import android.view.View;
-//import android.view.ViewGroup;
-//import android.view.WindowManager;
-//import android.widget.Button;
-//import android.widget.EditText;
-//import android.widget.TextView;
-//import android.widget.Toast;
-//
-//import androidx.fragment.app.Fragment;
-//import androidx.fragment.app.FragmentTransaction;
-//
-//import com.ug.air.alrite.R;
-//
-//import org.json.JSONException;
-//
-//
-//public class ParagraphFragment extends Fragment {
-//    //Fragment wise should be done may need listener for skip
-//    public interface onGetResultListener {
-//        void getResultFromTextInputFragment(int choiceIndex) throws JSONException;
-//
-//        void getLastPage() throws JSONException;
-//    }
-//
-//    onGetResultListener getResultListener;
-//    View view;
-//    EditText etDay;
-//    Button back, next, btnSkip, btnSave;
-//    String userInput, diagnosis;
-//    public static final String Question = "What is the childs temperature";
-//    public static final String TDIAGNOSIS = "diagnosis_fever";
-//    public static final String SHARED_PREFS = "sharedPrefs";
-//    SharedPreferences sharedPreferences;
-//    SharedPreferences.Editor editor;
-//    Dialog dialog;
-//    TextView txtMessage;
-//    public static final String text = "";
-//    String text;
-//    String question;
-//
-//    public static ParagraphFragment newInstance(String question, String content) throws JSONException {
-//        ParagraphFragment pf = new ParagraphFragment();
-//        Bundle args = new Bundle();
-//        args.putString(Question, question);
-//        args.putString(text, content);
-//        pf.setArguments(args);
-//        return pf;
-//    }
-//    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-//                             Bundle savedInstanceState) {
-//
-//        next.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//            }
-//        });
-//
-//        back.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                back.setOnClickListener(new View.OnClickListener() {
-//                    @Override
-//                    public void onClick(View view) {
-//                        try {
-//                            getResultListener.getLastPage();
-//                        } catch (JSONException e) {
-//                            throw new RuntimeException(e);
-//                        }
-//                    }
-//                });
-//            }
-//        });
-//
-//        btnSkip.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
-//                fr.replace(R.id.fragment_container, new FTouch());
-//                fr.addToBackStack(null);
-//                fr.commit();
-//            }
-//        });
-//
-//        return view;
-//    }
\ No newline at end of file
+package com.ug.air.alrite.Fragments.Patient;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.fragment.app.Fragment;
+
+import com.ug.air.alrite.Activities.PatientActivity;
+import com.ug.air.alrite.R;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+public class ParagraphFragment extends Fragment {
+
+    public interface onGetResultListener {
+        void getResultFromParagraphFragment() throws JSONException;
+        void getLastPage() throws JSONException;
+    }
+    onGetResultListener getResultListener;
+
+    public static final String SHARED_PREFS = "sharedPrefs";
+    public static final String QUESTION = "question";
+    public static final String PARAGRAPH = "paragraph";
+    public static final String DEFAULT = "**default string**";
+    String previousResponse;
+    String question;
+    String paragraph;
+    View view;
+    Button backButton, nextButton;
+    SharedPreferences sharedPreferences;
+    SharedPreferences.Editor editor;
+
+    /**
+     * This is where we do what we usually do in the onAttach section, except that
+     * we also add a listener for sending the result of the Multiple Choice up to
+     * the activity
+     *
+     * @param activity the PatientActivity that we're running this fragment on
+     */
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        try {
+            getResultListener = (onGetResultListener) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.toString() + " must implement onSomeEventListener");
+        }
+    }
+
+    /**
+     * This creates a new MultipleChoiceFragment with a separate constructor, so
+     * that we can retain the given information and return the fragment
+     *
+     * @param question the question at the top of the page
+     * @return the fragment to be used in the future
+     */
+    public static ParagraphFragment newInstance(String question, String paragraph) throws JSONException {
+        ParagraphFragment pf = new ParagraphFragment();
+        Bundle args = new Bundle();
+        args.putString(QUESTION, question);
+        args.putString(PARAGRAPH, paragraph);
+        pf.setArguments(args);
+        return pf;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        view = inflater.inflate(R.layout.paragraph, container, false);
+        sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+        editor = sharedPreferences.edit();
+
+        assert getArguments() != null;
+        question = getArguments().getString(QUESTION);
+        paragraph = getArguments().getString(PARAGRAPH);
+
+        TextView questionDisplay = view.findViewById(R.id.p_question);
+        questionDisplay.setText(question);
+        TextView paragraphDisplay = view.findViewById(R.id.p_information);
+        paragraphDisplay.setText(paragraph);
+
+        nextButton = view.findViewById(R.id.next);
+        backButton = view.findViewById(R.id.back);
+
+        nextButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                try {
+                    getResultListener.getResultFromParagraphFragment();
+                } catch (JSONException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+
+        backButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                try {
+                    getResultListener.getLastPage();
+                } catch (JSONException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+
+        return view;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_touch.xml b/app/src/main/res/layout/fragment_touch.xml
index b52f75a..7de6625 100644
--- a/app/src/main/res/layout/fragment_touch.xml
+++ b/app/src/main/res/layout/fragment_touch.xml
@@ -107,10 +107,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:layout_margin="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="10dp"
                 android:background="@drawable/primary_button"
                 android:text="next"
-                android:textColor="@color/white"/>
+                android:textColor="@color/white" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/paragraph.xml b/app/src/main/res/layout/paragraph.xml
index 77d9ef6..6d4dd9b 100644
--- a/app/src/main/res/layout/paragraph.xml
+++ b/app/src/main/res/layout/paragraph.xml
@@ -1,6 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".Fragments.Patient.Fever">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="?actionBarSize"
+        android:background="@color/green_main"
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp"
+        android:orientation="vertical"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:text="Patient's Examination"
+            android:textColor="@color/white"
+            android:textSize="18sp"/>
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/buttons"
+            android:layout_marginEnd="0dp"
+            android:layout_marginBottom="10dp"
+            android:fadeScrollbars="true"
+            android:padding="10dp"
+            android:scrollbars="none">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/p_question"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="25dp"
+                    android:gravity="center_horizontal"
+                    android:text="@string/p_question"
+                    android:textColor="@color/black"
+                    android:textSize="18sp" />
+                <TextView
+                    android:id="@+id/p_information"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="25dp"
+                    android:gravity="center_horizontal"
+                    android:text="@string/p_paragraph"
+                    android:textColor="@color/black"
+                    android:textSize="18sp" />
+
+
+            </LinearLayout>
+
+        </ScrollView>
+
+        <RelativeLayout
+            android:id="@+id/buttons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true">
+
+            <Button
+                android:id="@+id/back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/bg_button"
+                android:text="Back"
+                android:textColor="@color/white" />
+
+            <Button
+                android:id="@+id/next"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/primary_button"
+                android:text="next"
+                android:textColor="@color/white" />
+
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6586ae2..bb78007 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -281,4 +281,7 @@
     <string name="ti_maxval">%s</string>
     <string name="ti_minvalforDiagnosis">%s</string>
 
+    <!--   New Strings for the paragraph input -->
+    <string name="p_question">%s</string>
+    <string name="p_paragraph">%s</string>
 </resources>
\ No newline at end of file

From 8df5548fceb1b2f13c9b64be6dc1a7f1d90792c5 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Tue, 16 May 2023 15:40:45 -0700
Subject: [PATCH 37/50] Fixed paragraph stuff a little

---
 .../alrite/Activities/PatientActivity.java    | 36 ++++++++++------
 .../alrite/Fragments/Patient/SexModified.java |  2 +-
 .../Fragments/Patient/TextInputFragment.java  |  4 +-
 .../ug/air/alrite/Utils/XML/ItemFactory.java  | 43 +++++++++++--------
 4 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 4b69f82..8456921 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -78,7 +78,8 @@
 
 public class PatientActivity extends AppCompatActivity implements
         MultipleChoiceFragment.onGetResultListener, MultipleSelectionFragment.onGetResultListener,
-        TextInputFragment.onGetResultListener, TextInputTextFragment.onGetResultListener {
+        TextInputFragment.onGetResultListener, TextInputTextFragment.onGetResultListener,
+        ParagraphFragment.onGetResultListener {
 
     public static final String SHARED_PREFS = "sharedPrefs";
     public static final String INCOMPLETE = "incomplete";
@@ -301,6 +302,7 @@ private void doLogic(String file) {
     public static final String ALPHANUMERIC_TYPE = "alphanumeric";
     public static final String TEXT_TYPE = "text";
     public static final String ANY_TYPE = "any";
+    public static final String PARAGRAPH = "Paragraph";
 
      // Full JSON infos to call getNextPage
      JSONArray pages;
@@ -420,12 +422,16 @@ private void getNextPage(String nextPageID) throws JSONException {
 
         // Text input option:
         } else if (nextPageComponentType.equals(TEXT_INPUT)) {
-            if (nextPageJSON.getString(TYPE).equals(NUMERIC_TYPE)) {
+            if (nextPageComponent.getString(TYPE).equals(NUMERIC_TYPE)) {
                 createTextInputFragment(nextPageComponent);
             } else {
                 createTextInputTextFragment(nextPageComponent);
             }
 
+        // Paragraph option:
+        } else if (nextPageComponentType.equals(PARAGRAPH)) {
+            createParagraphFragment(nextPageComponent);
+
         // There was an issue with identifying the page...
         } else {
             System.out.println("should never get here lol: just go to the next page");
@@ -550,7 +556,7 @@ private void createMultiSelectFragment(JSONObject page) throws JSONException {
      */
     private void createParagraphFragment(JSONObject nextPageComponent) throws JSONException {
         question = nextPageComponent.getString(LABEL);
-        paragraph = "nothing at the moment, but content goes here";
+        paragraph = nextPageComponent.getString(TEXT);
         targetValue_id = nextPageComponent.getString(VALUE_ID);
 
         // Get the new page's fragment, and set a listener for when the next button
@@ -581,7 +587,7 @@ public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONExce
         System.out.println("NEXT PAGE NAME:" + nextPageName);
 
         // Enter the diagnosis into the editor
-        enterSymptomIntoEditor(question, diagnosis);
+        enterSymptomIntoEditor(pageID, diagnosis);
 
         // Decide on the next page based on the result
         try {
@@ -599,7 +605,7 @@ public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOpti
             allDiagnoses += "\n" + choices.get(i).getString(TEXT);
             // Enter the diagnosis into the editor
         }
-        enterSymptomIntoEditor(question, allDiagnoses);
+        enterSymptomIntoEditor(pageID, allDiagnoses);
 
         JSONObject foundLink = getContentFromPageID(pageID, targetValueID);
         String NextPage;
@@ -619,7 +625,7 @@ public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOpti
     }
 
     @Override
-    public void getResultFromTextInputFragment(int numberInputted) throws JSONException {
+    public void getResultFromTextInputFragment(Float numberInputted) throws JSONException {
         String diagnosis = String.valueOf(numberInputted);
         ArrayList<JSONObject> foundLinks = getContentFromPageIDArray(pageID, targetValue_id);
         String NextPage = pageID.getString(DEFAULT_LINK);
@@ -628,12 +634,17 @@ public void getResultFromTextInputFragment(int numberInputted) throws JSONExcept
             // once the branched link logic is completed in the JSON file
             for (JSONObject foundLink : foundLinks) {
                 if (foundLink.get("type").equals(">")) {
-                    if (numberInputted > Integer.parseInt(foundLink.getString(THRESHOLD))) {
+                    if (numberInputted > Float.parseFloat(foundLink.getString(THRESHOLD))) {
+                        NextPage = foundLink.getString(SATISFIED_LINK);
+                        break;
+                    }
+                } else if (foundLink.get("type").equals("<")) {
+                    if (numberInputted < Float.parseFloat(foundLink.getString(THRESHOLD))) {
                         NextPage = foundLink.getString(SATISFIED_LINK);
                         break;
                     }
                 } else if (foundLink.get("type").equals("<")) {
-                    if (numberInputted < Integer.parseInt(foundLink.getString(THRESHOLD))) {
+                    if (numberInputted < Float.parseFloat(foundLink.getString(THRESHOLD))) {
                         NextPage = foundLink.getString(SATISFIED_LINK);
                         break;
                     }
@@ -646,7 +657,7 @@ public void getResultFromTextInputFragment(int numberInputted) throws JSONExcept
             }
         }
         // Enter the diagnosis into the editor
-        enterSymptomIntoEditor(question, diagnosis);
+        enterSymptomIntoEditor(pageID, diagnosis);
         try {
             getNextPage(NextPage);
         } catch(JSONException e) {
@@ -667,13 +678,14 @@ public void getResultFromTextInputTextFragment(String textInputted) throws JSONE
             }
         }
 
-        enterSymptomIntoEditor(question, recordedSymptom);
+        enterSymptomIntoEditor(pageID, recordedSymptom);
         try {
             getNextPage(nextPage);
         } catch(JSONException e) {
             throw new RuntimeException();
         }
     }
+
     @Override
     public void getResultFromParagraphFragment() throws JSONException {
         String nextPage = pageID.getString(DEFAULT_LINK);
@@ -772,9 +784,9 @@ private int findIndexInPagesGivenPageId(String pageID) throws JSONException {
         return -1;
     }
 
-    public void enterSymptomIntoEditor(String question, String symptom) {
+    public void enterSymptomIntoEditor(JSONObject page, String symptom) throws JSONException {
         // Enter the diagnosis into the editor
-        editor.putString("?: " + question, symptom);
+        editor.putString("?: " + page.getString(TITLE), symptom);
         editor.apply();
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java
index 5bb62a2..8c7da81 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java
@@ -120,7 +120,7 @@ public void onClick(View v) {
                 }else{
                     int year = Integer.parseInt(years);
                     int ageInMos = (year*12) + Integer.parseInt(months);
-                    ageInMonths = String.valueOf(ageInMonths);
+                    ageInMonths = String.valueOf(ageInMos);
                     ageInYearsAndMonths = years + "." + months;
                     weight = kg;
                     saveData();
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
index 0f4e270..cef51b5 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
@@ -32,7 +32,7 @@
 public class TextInputFragment extends Fragment {
     //Fragment wise should be done may need listener for skip
     public interface onGetResultListener {
-        void getResultFromTextInputFragment(int choiceIndex) throws JSONException;
+        void getResultFromTextInputFragment(Float choiceIndex) throws JSONException;
         void getLastPage() throws JSONException;
     }
     onGetResultListener getResultListener;
@@ -218,7 +218,7 @@ public void afterTextChanged(Editable s) {
     private void saveData() {
         deleteSharedPreferences();
 
-        int tp = Integer.parseInt(userInput);
+        Float tp = Float.parseFloat(userInput);
         try {
             getResultListener.getResultFromTextInputFragment(tp);
         } catch (JSONException e) {
diff --git a/app/src/main/java/com/ug/air/alrite/Utils/XML/ItemFactory.java b/app/src/main/java/com/ug/air/alrite/Utils/XML/ItemFactory.java
index 41ba170..f6e6ba5 100644
--- a/app/src/main/java/com/ug/air/alrite/Utils/XML/ItemFactory.java
+++ b/app/src/main/java/com/ug/air/alrite/Utils/XML/ItemFactory.java
@@ -1,8 +1,6 @@
 package com.ug.air.alrite.Utils.XML;
 
 import android.content.Context;
-import android.util.Log;
-import android.widget.Toast;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -21,7 +19,7 @@ public class ItemFactory {
 
     public String GetMaleItem(Context context, String age, float weight) throws XmlPullParserException, IOException {
 
-        List<String> elements = new ArrayList<>();
+        List<String> elements;
         String diagnosis;
 
         XmlPullParserFactory parserFactory = XmlPullParserFactory.newInstance();
@@ -30,7 +28,7 @@ public String GetMaleItem(Context context, String age, float weight) throws XmlP
         parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
         parser.setInput(inputStream, null);
         parser.nextTag();
-        elements = readFeed(context, parser, age);
+        elements = readFeed(parser, age);
         String negative3 = elements.get(0);
         String negative2 = elements.get(1);
         String positive2 = elements.get(2);
@@ -44,7 +42,7 @@ public String GetMaleItem(Context context, String age, float weight) throws XmlP
         }else if (weight > p2){
 //            greater than 2 SD above average
             diagnosis = "above 2";
-        }else if (weight < n2 && weight >= n3){
+        }else if (weight >= n3){
 //            less than 2 SD below average, moderate malnutrition
             diagnosis = "below 2";
         }else{
@@ -58,7 +56,7 @@ public String GetMaleItem(Context context, String age, float weight) throws XmlP
 
     public String GetFemaleItem(Context context, String age, float weight) throws XmlPullParserException, IOException {
 
-        List<String> elements = new ArrayList<>();
+        List<String> elements;
         String diagnosis;
 
         XmlPullParserFactory parserFactory = XmlPullParserFactory.newInstance();
@@ -67,7 +65,8 @@ public String GetFemaleItem(Context context, String age, float weight) throws Xm
         parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
         parser.setInput(inputStream, null);
         parser.nextTag();
-        elements = readFeed(context, parser, age);
+        elements = readFeed(parser, age);
+        System.out.println(elements);
         String negative3 = elements.get(0);
         String negative2 = elements.get(1);
         String positive2 = elements.get(2);
@@ -81,7 +80,7 @@ public String GetFemaleItem(Context context, String age, float weight) throws Xm
         }else if (weight > p2){
 //            greater than 2 SD above average
             diagnosis = "above 2";
-        }else if (weight < n2 && weight >= n3){
+        }else if (weight >= n3){
 //            less than 2 SD below average, moderate malnutrition
             diagnosis = "below 2";
         }else{
@@ -93,7 +92,7 @@ public String GetFemaleItem(Context context, String age, float weight) throws Xm
 
     }
 
-    private List readFeed(Context context, XmlPullParser parser, String year) throws IOException, XmlPullParserException {
+    private List<String> readFeed(XmlPullParser parser, String year) throws IOException, XmlPullParserException {
         ArrayList<Item> items = new ArrayList<>();
 
         parser.require(XmlPullParser.START_TAG, ns, "root");
@@ -137,16 +136,22 @@ private Item readEntry(XmlPullParser parser) throws XmlPullParserException, IOEx
                 continue;
             }
             String name = parser.getName();
-            if (name.equals("age")) {
-                age = readAge(parser);
-            } else if (name.equals("negative3")) {
-                negative3 = readNegative3(parser);
-            } else if (name.equals("negative2")) {
-                negative2 = readNegative2(parser);
-            } else if (name.equals("positive2")) {
-                positive2 = readPositive2(parser);
-            } else {
-                skip(parser);
+            switch (name) {
+                case "age":
+                    age = readAge(parser);
+                    break;
+                case "negative3":
+                    negative3 = readNegative3(parser);
+                    break;
+                case "negative2":
+                    negative2 = readNegative2(parser);
+                    break;
+                case "positive2":
+                    positive2 = readPositive2(parser);
+                    break;
+                default:
+                    skip(parser);
+                    break;
             }
         }
         return new Item(age, negative3, negative2, positive2);

From 9b33751016e26ab331e0417e10eace7f5eb5fe38 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Tue, 16 May 2023 16:31:20 -0700
Subject: [PATCH 38/50] The back button works again

---
 .../com/ug/air/alrite/Activities/PatientActivity.java  | 10 ++++++++--
 .../com/ug/air/alrite/Activities/SplashActivity.java   |  4 ++--
 .../ug/air/alrite/Fragments/Patient/SexModified.java   |  6 ++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 8456921..0577a26 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -40,6 +40,7 @@
 import com.ug.air.alrite.Fragments.Patient.MultipleSelectionFragment;
 import com.ug.air.alrite.Fragments.Patient.OtherPatients;
 import com.ug.air.alrite.Fragments.Patient.ParagraphFragment;
+import com.ug.air.alrite.Fragments.Patient.SexModified;
 import com.ug.air.alrite.Fragments.Patient.TextInputFragment;
 import com.ug.air.alrite.Fragments.Patient.TextInputTextFragment;
 import com.ug.air.alrite.R;
@@ -764,10 +765,15 @@ public ArrayList<JSONObject> getContentFromPageIDArray(JSONObject pageid, String
      */
     @Override
     public void getLastPage() throws JSONException {
-        // TODO: exit to main activity, if it's the first page
-
         // Get the last page JSON object that we put on to the backstack
         backstack.remove(backstack.size() - 1);
+
+        // go to the SexModified , if it's the first page
+        if (backstack.isEmpty()) {
+            completeFragmentTransaction(new SexModified());
+            return;
+        }
+
         String backPageName = backstack.get(backstack.size() - 1);
 
         getNextPage(backPageName);
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
index 3963093..38b3ee4 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
@@ -149,8 +149,8 @@ private void checkDatabase() {
 
     private void getCurrentAssessmentIfConnectedToInternet() {
         if (isNetworkAvailable() && shouldGetNewAssessment) {
-            DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.REMOTE_URL_TEMP).create(DecisionTreeJSON.class);
-            Call<String> call = dtJson.getJson("Fever_Logic");
+            DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.TEMP_SERV_URL).create(DecisionTreeJSON.class);
+            Call<String> call = dtJson.getJson("IMCI");
             call.enqueue(new Callback<String>() {
                 @Override
                 public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java
index 8c7da81..a04d74e 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java
@@ -135,7 +135,7 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
-                fr.replace(R.id.fragment_container, new Initials());
+                fr.replace(R.id.fragment_container, new InitialsModified());
                 fr.commit();
             }
         });
@@ -271,9 +271,7 @@ private void saveData() {
                 }
                 makeDecisions();
 
-            } catch (XmlPullParserException e) {
-                e.printStackTrace();
-            } catch (IOException e) {
+            } catch (XmlPullParserException | IOException e) {
                 e.printStackTrace();
             }
         }else{

From 4d20f6ef00a30470a9a4eb7fd6ec872b6126fdc7 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Tue, 16 May 2023 16:32:52 -0700
Subject: [PATCH 39/50] Plus one more change lol

---
 .../main/java/com/ug/air/alrite/Activities/PatientActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 0577a26..8134b62 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -650,7 +650,7 @@ public void getResultFromTextInputFragment(Float numberInputted) throws JSONExce
                         break;
                     }
                 } else {
-                    if (numberInputted == Integer.parseInt(foundLink.getString(THRESHOLD))) {
+                    if (numberInputted == Float.parseFloat(foundLink.getString(THRESHOLD))) {
                         NextPage = foundLink.getString(SATISFIED_LINK);
                         break;
                     }

From 434469db49f13aef39a0c4197b169fcfd3429331 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Tue, 16 May 2023 16:47:43 -0700
Subject: [PATCH 40/50] Fixed paragraph a little more

---
 .../com/ug/air/alrite/Activities/PatientActivity.java    | 3 +--
 .../air/alrite/Fragments/Patient/ParagraphFragment.java  | 9 ++-------
 app/src/main/res/layout/paragraph.xml                    | 9 ---------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 8134b62..2e78c6d 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -556,13 +556,12 @@ private void createMultiSelectFragment(JSONObject page) throws JSONException {
      * @throws JSONException because json
      */
     private void createParagraphFragment(JSONObject nextPageComponent) throws JSONException {
-        question = nextPageComponent.getString(LABEL);
         paragraph = nextPageComponent.getString(TEXT);
         targetValue_id = nextPageComponent.getString(VALUE_ID);
 
         // Get the new page's fragment, and set a listener for when the next button
         // is clicked
-        ParagraphFragment p_fragment = ParagraphFragment.newInstance(question, paragraph);
+        ParagraphFragment p_fragment = ParagraphFragment.newInstance(paragraph);
 
         // Replace and commit the fragment
         completeFragmentTransaction(p_fragment);
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ParagraphFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ParagraphFragment.java
index 4931bb3..7c70659 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ParagraphFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/ParagraphFragment.java
@@ -36,7 +36,6 @@ public interface onGetResultListener {
     public static final String PARAGRAPH = "paragraph";
     public static final String DEFAULT = "**default string**";
     String previousResponse;
-    String question;
     String paragraph;
     View view;
     Button backButton, nextButton;
@@ -64,13 +63,12 @@ public void onAttach(Activity activity) {
      * This creates a new MultipleChoiceFragment with a separate constructor, so
      * that we can retain the given information and return the fragment
      *
-     * @param question the question at the top of the page
+     * @param paragraph the text at the top of the page
      * @return the fragment to be used in the future
      */
-    public static ParagraphFragment newInstance(String question, String paragraph) throws JSONException {
+    public static ParagraphFragment newInstance(String paragraph) throws JSONException {
         ParagraphFragment pf = new ParagraphFragment();
         Bundle args = new Bundle();
-        args.putString(QUESTION, question);
         args.putString(PARAGRAPH, paragraph);
         pf.setArguments(args);
         return pf;
@@ -84,11 +82,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         editor = sharedPreferences.edit();
 
         assert getArguments() != null;
-        question = getArguments().getString(QUESTION);
         paragraph = getArguments().getString(PARAGRAPH);
 
-        TextView questionDisplay = view.findViewById(R.id.p_question);
-        questionDisplay.setText(question);
         TextView paragraphDisplay = view.findViewById(R.id.p_information);
         paragraphDisplay.setText(paragraph);
 
diff --git a/app/src/main/res/layout/paragraph.xml b/app/src/main/res/layout/paragraph.xml
index 6d4dd9b..4f009a8 100644
--- a/app/src/main/res/layout/paragraph.xml
+++ b/app/src/main/res/layout/paragraph.xml
@@ -45,15 +45,6 @@
                 android:layout_margin="10dp"
                 android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/p_question"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="25dp"
-                    android:gravity="center_horizontal"
-                    android:text="@string/p_question"
-                    android:textColor="@color/black"
-                    android:textSize="18sp" />
                 <TextView
                     android:id="@+id/p_information"
                     android:layout_width="match_parent"

From 9d794636ccffb53147925b1adad581d4f06d70e9 Mon Sep 17 00:00:00 2001
From: evasy <yitongshan2016@yahoo.com>
Date: Tue, 16 May 2023 16:48:01 -0700
Subject: [PATCH 41/50] make multiple select able to go to the next page
 without any selections

---
 .../alrite/Activities/PatientActivity.java    | 24 ++++++++++++-------
 .../Patient/MultipleSelectionFragment.java    |  8 +++----
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 0577a26..6b58c7b 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -601,20 +601,26 @@ public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONExce
     @Override
     public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOptionIds) throws JSONException {
         // add the selected choices to the diagnosis
-        String allDiagnoses = choices.get(chosenOptionIds.get(0)).getString(TEXT);
-        for (int i = 1; i < chosenOptionIds.size(); i++) {
-            allDiagnoses += "\n" + choices.get(i).getString(TEXT);
-            // Enter the diagnosis into the editor
-        }
-        enterSymptomIntoEditor(pageID, allDiagnoses);
 
-        JSONObject foundLink = getContentFromPageID(pageID, targetValueID);
         String NextPage;
-        if (foundLink == null) {
+
+        if (chosenOptionIds.isEmpty()) {
             NextPage =  pageID.getString(DEFAULT_LINK);
         }
         else {
-            NextPage = foundLink.getString(SATISFIED_LINK);
+            String allDiagnoses = choices.get(chosenOptionIds.get(0)).getString(TEXT);
+            for (int i = 1; i < chosenOptionIds.size(); i++) {
+                allDiagnoses += "\n" + choices.get(i).getString(TEXT);
+                // Enter the diagnosis into the editor
+            }
+            enterSymptomIntoEditor(pageID, allDiagnoses);
+
+            JSONObject foundLink = getContentFromPageID(pageID, targetValueID);
+            if (foundLink == null) {
+                NextPage = pageID.getString(DEFAULT_LINK);
+            } else {
+                NextPage = foundLink.getString(SATISFIED_LINK);
+            }
         }
 
         // Decide on the next page based on the result
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
index b5da193..7ac107c 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
@@ -140,10 +140,10 @@ public void onClick(View v) {
                         chosenOptions.add(id);
                     }
                 }
-                if (chosenOptions.size() < 1) {
-                    Toast.makeText(getActivity(), "Please select at least one of the options", Toast.LENGTH_SHORT).show();
-                    return;
-                }
+//                if (chosenOptions.size() < 1) {
+//                    Toast.makeText(getActivity(), "Please select at least one of the options", Toast.LENGTH_SHORT).show();
+//                    return;
+//                }
 
                 // Get the indices of the choices in the set of buttons: relies on the
                 // buttons having names with their index at the end

From 66193a4baab80bee387d88c81348c305f1e56cb0 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Tue, 16 May 2023 16:52:06 -0700
Subject: [PATCH 42/50] Fixed paragraph a little more little more

---
 .../java/com/ug/air/alrite/Activities/PatientActivity.java    | 1 -
 .../java/com/ug/air/alrite/Activities/SplashActivity.java     | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 17380d2..543d631 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -557,7 +557,6 @@ private void createMultiSelectFragment(JSONObject page) throws JSONException {
      */
     private void createParagraphFragment(JSONObject nextPageComponent) throws JSONException {
         paragraph = nextPageComponent.getString(TEXT);
-        targetValue_id = nextPageComponent.getString(VALUE_ID);
 
         // Get the new page's fragment, and set a listener for when the next button
         // is clicked
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
index 38b3ee4..f43f8b7 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
@@ -149,8 +149,8 @@ private void checkDatabase() {
 
     private void getCurrentAssessmentIfConnectedToInternet() {
         if (isNetworkAvailable() && shouldGetNewAssessment) {
-            DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.TEMP_SERV_URL).create(DecisionTreeJSON.class);
-            Call<String> call = dtJson.getJson("IMCI");
+            DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.REMOTE_URL_TEMP).create(DecisionTreeJSON.class);
+            Call<String> call = dtJson.getJson("Demo_Workflow");
             call.enqueue(new Callback<String>() {
                 @Override
                 public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {

From 4c0760e28db2ab30dff611e5c214ab0ffd018cbd Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Wed, 24 May 2023 15:27:51 -0700
Subject: [PATCH 43/50] Arbitrary number of options for MC and some work on
 text input lol

---
 .../alrite/Activities/PatientActivity.java    | 337 +++++++++---------
 .../air/alrite/Activities/SplashActivity.java |   2 +-
 .../Patient/MultipleChoiceFragment.java       |  64 ++--
 .../Fragments/Patient/TextInputFragment.java  | 177 +++------
 app/src/main/res/layout/multiple_choice.xml   |  71 ++--
 app/src/main/res/layout/text_input.xml        |   1 +
 6 files changed, 295 insertions(+), 357 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 543d631..b364bf1 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -14,7 +14,6 @@
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.INITIAL_DATE_2;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.SECOND;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
@@ -31,10 +30,7 @@
 import android.widget.Button;
 
 import com.makeramen.roundedimageview.BuildConfig;
-import com.ug.air.alrite.APIs.ApiClient;
-import com.ug.air.alrite.APIs.DecisionTreeJSON;
 import com.ug.air.alrite.Fragments.Patient.ActivePatients;
-import com.ug.air.alrite.Fragments.Patient.Initials;
 import com.ug.air.alrite.Fragments.Patient.InitialsModified;
 import com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment;
 import com.ug.air.alrite.Fragments.Patient.MultipleSelectionFragment;
@@ -52,11 +48,7 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
-import java.lang.reflect.Array;
 import java.nio.file.Files;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -65,22 +57,12 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.ResponseBody;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Retrofit;
-import retrofit2.Response;
-
 public class PatientActivity extends AppCompatActivity implements
         MultipleChoiceFragment.onGetResultListener, MultipleSelectionFragment.onGetResultListener,
-        TextInputFragment.onGetResultListener, TextInputTextFragment.onGetResultListener,
-        ParagraphFragment.onGetResultListener {
+        TextInputFragment.onGetResultListener, ParagraphFragment.onGetResultListener {
 
     public static final String SHARED_PREFS = "sharedPrefs";
     public static final String INCOMPLETE = "incomplete";
@@ -304,41 +286,61 @@ private void doLogic(String file) {
     public static final String TEXT_TYPE = "text";
     public static final String ANY_TYPE = "any";
     public static final String PARAGRAPH = "Paragraph";
-
-     // Full JSON infos to call getNextPage
-     JSONArray pages;
-
-     // Information gotten from JSON for the current page
-     // Information gotten from JSON
-     String question;
-     ArrayList<JSONObject> choices;
-     ArrayList<String> backstack;
-     // Other than question there is more information needed
-     // from the JSON for text input
-     String InputHint; //The preview text shown in the input bubble (enter the value here)  *optional (prefer this not to be optional)
-    String InputInformation; //Extra stuff below the input bubble telling user more information (its in celcius) *optional
-    String SkipInformation; //Text shown above the skip button telling user when to skip (no thermometer available) *optional
-    int MinValue; //The minimum value allowed to be inputted
-    int MaxValue; //The maximum value allowed to be inputted
+    public static final String SYMPTOM_TYPE = "?: ";
+
+    // Full JSON infos to call getNextPage
+    JSONArray pages;
+
+    // Information gotten from JSON for the current page
+    // Information gotten from JSON
+    String question;
+    ArrayList<JSONObject> choices;
+    ArrayList<String> backstack;
+
+    // Other than question there is more information needed
+    // from the JSON for text input
+    String inputType;
+    String inputHint; //The preview text shown in the input bubble (enter the value here)  *optional (prefer this not to be optional)
+    String inputInformation; //Extra stuff below the input bubble telling user more information (its in celcius) *optional
+    String skipInformation; //Text shown above the skip button telling user when to skip (no thermometer available) *optional
+    int minValue; //The minimum value allowed to be inputted
+    int maxValue; //The maximum value allowed to be inputted
     int diagnosisCutoff; //The minimum value to be inputted in order to get the diagnosis
-    JSONObject pageID;
+    public enum INPUT_TYPES {
+        numeric,
+        alphanumeric,
+        text,
+        any;
+    }
+    public enum COMPARISON_TYPES {
+        G(">"),
+        L("<"),
+        GE(">="),
+        LE("<="),
+        EQ("=");
+
+        public final String symbol;
+
+        COMPARISON_TYPES(String symbol) {
+            this.symbol = symbol;
+        }
+    }
+    JSONObject nextPageJSON;
     String targetValue_id; // for text input
     String targetValueID; // for multiple selection
     String paragraph; //Content for paragraph fragment
 
     /**
+     * This is the function that is called to set up the process of looping through
+     * the pages until we get to the diagnosis page
      *
      * @throws JSONException
      * @throws IOException
      */
     private void implementEditableDecisionTree(JSONObject json) throws JSONException, IOException {
-//        DecisionTreeJSON json = ApiClient.getClient(ApiClient.TEMP_SERV_URL)
-//                                    .create(DecisionTreeJSON.class);
-//        Call<String> call = DecisionTreeJSON.getJson();
-//        System.out.println(json);
-
         backstack = new ArrayList<>();
         pages = json.getJSONArray(PAGES);
+
         // This is just an array because it needs to be mutable: think of it as
         // its own element
         String nextPage = pages.getJSONObject(0).getString(PAGE_ID);
@@ -351,21 +353,6 @@ private void implementEditableDecisionTree(JSONObject json) throws JSONException
         getNextPage(nextPage);
     }
 
-    /**
-     * NOTE: THIS SHOULD ONLY BE USED FOR SINGLE-LAYER ARRAYS
-     *
-     * @param jsonArray
-     * @return
-     * @throws JSONException
-     */
-    private ArrayList<JSONObject> JSONArrayToListOfJSONObjects(JSONArray jsonArray) throws JSONException {
-        ArrayList<JSONObject> ret = new ArrayList<>();
-        for (int i = 0; i < jsonArray.length(); i++) {
-            ret.add(jsonArray.getJSONObject(i));
-        }
-        return ret;
-    }
-
     /**
      * This will add the given fragment to the back stack, and do a transaction
      * which replaces the current fragment with the given fragment
@@ -396,7 +383,7 @@ private void getNextPage(String nextPageID) throws JSONException {
         }
 
         // Get all of the items that should be displayed on the page
-        JSONObject nextPageJSON = pages.getJSONObject(findIndexInPagesGivenPageId(nextPageID));
+        nextPageJSON = pages.getJSONObject(findIndexInPagesGivenPageId(nextPageID));
         JSONArray nextPageContent = nextPageJSON.getJSONArray(CONTENT);
 
         // If the next page would be the final page, then the assessment is over!
@@ -405,43 +392,50 @@ private void getNextPage(String nextPageID) throws JSONException {
             exitActivity();
             return;
         }
-        pageID = nextPageJSON;
+
+        // Since we're not implementing multiple types of data input per page at
+        // the moment, we should default to having the index be 0:
+        int contentIndex = 0;
 
         // Then, for each component that we're given within the page, display a
         // fragment for that component.
-        JSONObject nextPageComponent = nextPageContent.getJSONObject(0);
+        JSONObject nextPageComponent = nextPageContent.getJSONObject(contentIndex);
         String nextPageComponentType = nextPageComponent.getString(COMPONENT);
 
-        // Multiple choice option(s):
-        if (nextPageComponentType.equals(MULTIPLE_CHOICE)) {
-            Boolean isMultiSelect = nextPageComponent.getBoolean(MULTISELECT);
-            if (isMultiSelect) {
-                createMultiSelectFragment(nextPageComponent);
-            } else {
-                createMultipleChoiceFragment(nextPageComponent);
-            }
-
-        // Text input option:
-        } else if (nextPageComponentType.equals(TEXT_INPUT)) {
-            if (nextPageComponent.getString(TYPE).equals(NUMERIC_TYPE)) {
-                createTextInputFragment(nextPageComponent);
-            } else {
-                createTextInputTextFragment(nextPageComponent);
-            }
-
-        // Paragraph option:
-        } else if (nextPageComponentType.equals(PARAGRAPH)) {
-            createParagraphFragment(nextPageComponent);
-
-        // There was an issue with identifying the page...
-        } else {
-            System.out.println("should never get here lol: just go to the next page");
-            getNextPage(pageID.getString(DEFAULT_LINK));
+        switch (nextPageComponentType) {
+            // Multiselect and multiple choice options:
+            case MULTIPLE_CHOICE:
+                boolean isMultiSelect = nextPageComponent.getBoolean(MULTISELECT);
+                String valueID = getValueID(nextPageJSON, contentIndex);
+                if (isMultiSelect) {
+                    createMultiSelectFragment(nextPageComponent);
+                } else {
+                    createMultipleChoiceFragment(nextPageComponent, valueID);
+                }
+                break;
+
+            // Text input option:
+            case TEXT_INPUT:
+                valueID = getValueID(nextPageJSON, contentIndex);
+                createTextInputFragment(nextPageComponent, valueID);
+                break;
+
+            // Paragraph option:
+            case PARAGRAPH:
+                createParagraphFragment(nextPageComponent);
+                break;
+
+            // There was an issue with identifying the page... just go to the next page instead
+            default:
+                System.out.println("should never get here lol: just go to the next page");
+                getNextPage(nextPageJSON.getString(DEFAULT_LINK));
+                break;
         }
     }
 
     /**
-     * Essentially, make an asynchronous API call to get the HTTP
+     * Get the copy of the workflow that we have stored on the device and turn it
+     * into a JSONObject
      */
     @RequiresApi(api = Build.VERSION_CODES.O)
     public void getJSONFromBackend() {
@@ -474,62 +468,51 @@ private void exitActivity() {
         this.finish();
     }
 
-    private void createMultipleChoiceFragment(JSONObject nextPageComponent) throws JSONException {
+    /**
+     * NOTE: THIS SHOULD ONLY BE USED FOR SINGLE-LAYER ARRAYS
+     *
+     * @param jsonArray
+     * @return
+     * @throws JSONException
+     */
+    private ArrayList<JSONObject> JSONArrayToListOfJSONObjects(JSONArray jsonArray) throws JSONException {
+        ArrayList<JSONObject> ret = new ArrayList<>();
+        for (int i = 0; i < jsonArray.length(); i++) {
+            ret.add(jsonArray.getJSONObject(i));
+        }
+        return ret;
+    }
+
+    private void createMultipleChoiceFragment(JSONObject nextPageComponent, String valueID) throws JSONException {
         // Collect the important arguments from the component
         question = nextPageComponent.getString(LABEL);
         choices = JSONArrayToListOfJSONObjects(nextPageComponent.getJSONArray(CHOICES));
 
         // Get the new page's fragment, and set a listener for when the next button
         // is clicked
-        MultipleChoiceFragment mc_fragment = MultipleChoiceFragment.newInstance(question, choices);
+        MultipleChoiceFragment mc_fragment = MultipleChoiceFragment.newInstance(question, choices, valueID);
 
         // Replace and commit the fragment
         completeFragmentTransaction(mc_fragment);
     }
+
     /**
      * Creating the Fragment for Text Input
      *
      * @throws JSONException because we use json objects
      */
-    private void createTextInputFragment(JSONObject page) throws JSONException {
+    private void createTextInputFragment(JSONObject nextPageComponent, String valueID) throws JSONException {
         // Collect the important arguments from the component
-        question = page.getString(LABEL);
-        InputHint = "none right now";
-        InputInformation = "none right now";
-        SkipInformation = "none right now";
-        MinValue = 0;
-        MaxValue = 100;
-        diagnosisCutoff = 50;
-        targetValue_id = page.getString(VALUE_ID);
-
-        // Get the new page's fragment, and set a listener for when the next button
-        // is clicked
-        TextInputFragment ti_fragment = TextInputFragment.newInstance(question, InputHint, InputInformation, SkipInformation,
-        MinValue, MaxValue, diagnosisCutoff);
-
-        // Replace and commit the fragment
-        completeFragmentTransaction(ti_fragment);
-    }
-
-    /**
-     * Create the TextInputTextFragment
-     *
-     * @param nextPageComponent the component to be displayed on screen
-     * @throws JSONException because json
-     */
-    private void createTextInputTextFragment(JSONObject nextPageComponent) throws JSONException {
         question = nextPageComponent.getString(LABEL);
-        InputHint = "none right now";
-        InputInformation = "none right now";
-        SkipInformation = "none right now";
-        targetValue_id = nextPageComponent.getString(VALUE_ID);
+        inputType = nextPageComponent.getString(TYPE);
+        targetValue_id = valueID;
 
         // Get the new page's fragment, and set a listener for when the next button
         // is clicked
-        TextInputTextFragment tit_fragment = TextInputTextFragment.newInstance(question, InputHint, InputInformation, SkipInformation);
+        TextInputFragment ti_fragment = TextInputFragment.newInstance(question, inputType, valueID);
 
         // Replace and commit the fragment
-        completeFragmentTransaction(tit_fragment);
+        completeFragmentTransaction(ti_fragment);
     }
 
     /**
@@ -576,17 +559,17 @@ private void createParagraphFragment(JSONObject nextPageComponent) throws JSONEx
      */
     @Override
     public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONException {
-        String diagnosis = choices.get(choiceIndex - 1).getString(TEXT);
-        String nextPageName = choices.get(choiceIndex - 1).getString(LINK);
+        String diagnosis = choices.get(choiceIndex).getString(TEXT);
+        String nextPageName = choices.get(choiceIndex).getString(LINK);
 
         // If the link is null, then we should go to the default page
         if (nextPageName.equals(NULL)) {
-            nextPageName = pageID.getString(DEFAULT_LINK);
+            nextPageName = nextPageJSON.getString(DEFAULT_LINK);
         }
         System.out.println("NEXT PAGE NAME:" + nextPageName);
 
         // Enter the diagnosis into the editor
-        enterSymptomIntoEditor(pageID, diagnosis);
+        enterSymptomIntoEditor(nextPageJSON, diagnosis);
 
         // Decide on the next page based on the result
         try {
@@ -603,19 +586,19 @@ public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOpti
         String NextPage;
 
         if (chosenOptionIds.isEmpty()) {
-            NextPage =  pageID.getString(DEFAULT_LINK);
+            NextPage =  nextPageJSON.getString(DEFAULT_LINK);
         }
         else {
-            String allDiagnoses = choices.get(chosenOptionIds.get(0)).getString(TEXT);
+            String allDiagnoses = choices.get(chosenOptionIds.get(0) - 1).getString(TEXT);
             for (int i = 1; i < chosenOptionIds.size(); i++) {
                 allDiagnoses += "\n" + choices.get(i).getString(TEXT);
                 // Enter the diagnosis into the editor
             }
-            enterSymptomIntoEditor(pageID, allDiagnoses);
+            enterSymptomIntoEditor(nextPageJSON, allDiagnoses);
 
-            JSONObject foundLink = getContentFromPageID(pageID, targetValueID);
+            JSONObject foundLink = getContentFromPageID(nextPageJSON, targetValueID);
             if (foundLink == null) {
-                NextPage = pageID.getString(DEFAULT_LINK);
+                NextPage = nextPageJSON.getString(DEFAULT_LINK);
             } else {
                 NextPage = foundLink.getString(SATISFIED_LINK);
             }
@@ -630,60 +613,39 @@ public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOpti
     }
 
     @Override
-    public void getResultFromTextInputFragment(Float numberInputted) throws JSONException {
-        String diagnosis = String.valueOf(numberInputted);
-        ArrayList<JSONObject> foundLinks = getContentFromPageIDArray(pageID, targetValue_id);
-        String NextPage = pageID.getString(DEFAULT_LINK);
-        if(!foundLinks.isEmpty()) {
-            // Replace BranchedLink with whatever the name is for the link field
-            // once the branched link logic is completed in the JSON file
-            for (JSONObject foundLink : foundLinks) {
-                if (foundLink.get("type").equals(">")) {
-                    if (numberInputted > Float.parseFloat(foundLink.getString(THRESHOLD))) {
-                        NextPage = foundLink.getString(SATISFIED_LINK);
-                        break;
-                    }
-                } else if (foundLink.get("type").equals("<")) {
-                    if (numberInputted < Float.parseFloat(foundLink.getString(THRESHOLD))) {
-                        NextPage = foundLink.getString(SATISFIED_LINK);
-                        break;
-                    }
-                } else if (foundLink.get("type").equals("<")) {
-                    if (numberInputted < Float.parseFloat(foundLink.getString(THRESHOLD))) {
-                        NextPage = foundLink.getString(SATISFIED_LINK);
-                        break;
-                    }
-                } else {
-                    if (numberInputted == Float.parseFloat(foundLink.getString(THRESHOLD))) {
-                        NextPage = foundLink.getString(SATISFIED_LINK);
+    public void getResultFromTextInputFragment(String inputted) throws JSONException {
+        // First, we get the next page where this will lead eventually, or the default
+        ArrayList<JSONObject> foundLinks = getContentFromPageIDArray(nextPageJSON, targetValue_id);
+        String nextPage = nextPageJSON.getString(DEFAULT_LINK);
+
+        // Next, we get the type of the object that was passed up from the TextInput:
+        // was it a number, or a string?
+        if (inputType.equals(INPUT_TYPES.numeric.name())) {
+            Float diagnosis = Float.valueOf(inputted);
+            if(!foundLinks.isEmpty()) {
+                // Replace BranchedLink with whatever the name is for the link field
+                // once the branched link logic is completed in the JSON file
+                for (JSONObject foundLink : foundLinks) {
+                    String compType = foundLink.getString(TYPE);
+                    float threshold = Float.parseFloat(foundLink.getString(THRESHOLD));
+                    // greater than
+                    if ((compType.equals(COMPARISON_TYPES.G.symbol) && diagnosis < threshold)
+                    || (compType.equals(COMPARISON_TYPES.L.symbol) && diagnosis < threshold)
+                    || (compType.equals(COMPARISON_TYPES.GE.symbol) && diagnosis >= threshold)
+                    || (compType.equals(COMPARISON_TYPES.LE.symbol) && diagnosis <= threshold)
+                    || (compType.equals(COMPARISON_TYPES.EQ.symbol) && diagnosis == threshold)) {
+                        nextPage = foundLink.getString(SATISFIED_LINK);
                         break;
                     }
                 }
+                enterSymptomIntoEditor(nextPageJSON, String.valueOf(diagnosis));
             }
-        }
-        // Enter the diagnosis into the editor
-        enterSymptomIntoEditor(pageID, diagnosis);
-        try {
-            getNextPage(NextPage);
-        } catch(JSONException e) {
-            throw new RuntimeException();
-        }
-    }
-
-    @Override
-    public void getResultFromTextInputTextFragment(String textInputted) throws JSONException {
-        String recordedSymptom = textInputted;
-        JSONObject logicComponent = getContentFromPageID(pageID, targetValue_id);
-        String nextPage = pageID.getString(DEFAULT_LINK);
-        if (logicComponent != null) {
-            if (logicComponent.getString(TYPE).equals("=")) {
-                if (recordedSymptom.equals(logicComponent.getString(THRESHOLD))) {
-                    nextPage = logicComponent.getString(SATISFIED_LINK);
-                }
-            }
+        } else {
+            // In the case that we're comparing strings, we'll compare equality with .equals,
+            // and everything else with strict < or >
         }
 
-        enterSymptomIntoEditor(pageID, recordedSymptom);
+        // Finally, we go to the decided next page
         try {
             getNextPage(nextPage);
         } catch(JSONException e) {
@@ -693,13 +655,14 @@ public void getResultFromTextInputTextFragment(String textInputted) throws JSONE
 
     @Override
     public void getResultFromParagraphFragment() throws JSONException {
-        String nextPage = pageID.getString(DEFAULT_LINK);
+        String nextPage = nextPageJSON.getString(DEFAULT_LINK);
         try {
             getNextPage(nextPage);
         } catch(JSONException e) {
             throw new RuntimeException();
         }
     }
+
     /**
      * Takes the page id and returns where we wish to go
      *
@@ -794,9 +757,27 @@ private int findIndexInPagesGivenPageId(String pageID) throws JSONException {
         return -1;
     }
 
+    /**
+     * Abstracts away the process of adding a symptom to the sharedPreference object
+     *
+     * @param page is the page in the workflow that we're entering a symptom for
+     * @param symptom is the associated value to enter in given the page
+     * @throws JSONException because we look at JSON
+     */
     public void enterSymptomIntoEditor(JSONObject page, String symptom) throws JSONException {
         // Enter the diagnosis into the editor
-        editor.putString("?: " + page.getString(TITLE), symptom);
+        editor.putString(SYMPTOM_TYPE + getValueID(page, 0), symptom);
         editor.apply();
     }
+
+    /**
+     * Function to get the ValueID (official name for a piece of content)
+     *
+     * @param page is the page in the workflow that the valueID is on
+     * @param contentIndex is the index within the content array that this valueID refers to
+     * @return a string that is the valueID
+     */
+    public String getValueID(JSONObject page, int contentIndex) throws JSONException {
+        return page.getJSONArray(CONTENT).getJSONObject(contentIndex).getString(VALUE_ID);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
index f43f8b7..38b7bbf 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
@@ -150,7 +150,7 @@ private void checkDatabase() {
     private void getCurrentAssessmentIfConnectedToInternet() {
         if (isNetworkAvailable() && shouldGetNewAssessment) {
             DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.REMOTE_URL_TEMP).create(DecisionTreeJSON.class);
-            Call<String> call = dtJson.getJson("Demo_Workflow");
+            Call<String> call = dtJson.getJson("test");
             call.enqueue(new Callback<String>() {
                 @Override
                 public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
index cbd327f..176c5f0 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
@@ -1,5 +1,8 @@
 package com.ug.air.alrite.Fragments.Patient;
 
+import static com.ug.air.alrite.Activities.PatientActivity.SYMPTOM_TYPE;
+import static com.ug.air.alrite.Activities.PatientActivity.VALUE_ID;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -8,6 +11,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
@@ -34,12 +38,15 @@ public interface onGetResultListener {
     public static final String SHARED_PREFS = "sharedPrefs";
     public static final String QUESTION = "question";
     public static final String CHOICES = "choices";
+    public static final String VALUE_ID = "valueID";
     public static final String DEFAULT = "**default string**";
     String previousResponse;
     String question;
     ArrayList<String> choices;
+    String valueID;
     View view;
     RadioGroup choiceGroup;
+    ArrayList<RadioButton> choiceButtonList;
     Button backButton, nextButton;
     SharedPreferences sharedPreferences;
     SharedPreferences.Editor editor;
@@ -69,12 +76,13 @@ public void onAttach(Activity activity) {
      * @param choices the given choices for the user to choose from
      * @return the fragment to be used in the future
      */
-    public static MultipleChoiceFragment newInstance(String question, ArrayList<JSONObject> choices) throws JSONException {
+    public static MultipleChoiceFragment newInstance(String question, ArrayList<JSONObject> choices, String valueID) throws JSONException {
         MultipleChoiceFragment mfc = new MultipleChoiceFragment();
         Bundle args = new Bundle();
         args.putString(QUESTION, question);
         ArrayList<String> text_choices = getTextFromChoices(choices);
         args.putStringArrayList(CHOICES, text_choices);
+        args.putString(VALUE_ID, valueID);
         mfc.setArguments(args);
         return mfc;
     }
@@ -91,28 +99,31 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         assert getArguments() != null;
         question = getArguments().getString(QUESTION);
         choices = getArguments().getStringArrayList(CHOICES);
+        valueID = getArguments().getString(VALUE_ID);
 
         // Then, set the information for each question/choice to line up with our givens
         TextView questionDisplay = view.findViewById(R.id.mc_question);
         questionDisplay.setText(question);
 
-        // TODO: create buttons in here, and then choose their ids more easily
-        // Currently storing 3 radio buttons will update later
-        // Set for demo might add more or create optimized loop
-        RadioButton choice1 = view.findViewById(R.id.choice1);
-        choice1.setText(choices.get(0));
-        RadioButton choice2 = view.findViewById(R.id.choice2);
-        choice2.setText(choices.get(1));
-        RadioButton choice3 = view.findViewById(R.id.choice3);
-        choice3.setText(choices.get(2));
+        // Create the RadioGroup and RadioButtons that will be displayed on the page
+        // within the given multiple_choice_layout on the layout for the fragment
+        LinearLayout multipleChoiceLayout = view.findViewById(R.id.multiple_choice_layout);
+        choiceGroup = new RadioGroup(this.getContext());
+        multipleChoiceLayout.addView(choiceGroup);
+        choiceButtonList = new ArrayList<>();
+        for (String choiceText : choices) {
+            RadioButton but = new RadioButton(this.getContext());
+            choiceGroup.addView(but);
+            but.setText(choiceText);
+            choiceButtonList.add(but);
+        }
 
         // All of the buttons/things that we'll need to reference
         nextButton = view.findViewById(R.id.next);
         backButton = view.findViewById(R.id.back);
-        choiceGroup = view.findViewById(R.id.mc_options);
 
         // If we've already seen this page, reload our past choices
-        // loadSelectedChoiceIfAlreadySelected();
+        loadSelectedChoiceIfAlreadySelected();
 
         // This is a listener for, if the next button is pressed, whether we can go
         // on or not, and what information should be sent up
@@ -128,17 +139,19 @@ public void onClick(View v) {
                     return;
                 }
 
-                // Get the index of the choice in the set of buttons: relies on the
-                // buttons having names with their index at the end
-                String chosenOptionId = v.getResources().getResourceName(chosenOption);
-                int index = Integer.parseInt(chosenOptionId.substring(chosenOptionId.length() - 1));
-
-                // Send the result back up to main: a listener there will trigger
-                // and start the next fragment sequence up
-                try {
-                    getResultListener.getResultFromMultipleChoiceFragment(index);
-                } catch (JSONException e) {
-                    throw new RuntimeException(e);
+                // Get the index of the choice in the set of buttons, starting at index 0
+                for (int i = 0; i < choiceButtonList.size(); i++) {
+                    RadioButton choiceButton = choiceButtonList.get(i);
+                    if (choiceButton.getId() == chosenOption) {
+                        // Send the result back up to main: a listener there will trigger
+                        // and start the next fragment sequence up
+                        try {
+                            getResultListener.getResultFromMultipleChoiceFragment(i);
+                        } catch (JSONException e) {
+                            throw new RuntimeException(e);
+                        }
+                        return;
+                    }
                 }
             }
         });
@@ -164,12 +177,11 @@ public void onClick(View view) {
      */
     private void loadSelectedChoiceIfAlreadySelected() {
         SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
-        previousResponse = sharedPreferences.getString(question, DEFAULT);
+        previousResponse = sharedPreferences.getString(SYMPTOM_TYPE + valueID, DEFAULT);
 
         for (int i = 0; i < choices.size(); i++) {
             if (previousResponse.equals(choices.get(i))) {
-                RadioGroup allChoices = view.findViewById(R.id.mc_options);
-                allChoices.check(i);
+                ((RadioButton) choiceGroup.getChildAt(i)).setChecked(true);
                 return;
             }
         }
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
index cef51b5..07f4859 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
@@ -1,6 +1,9 @@
 package com.ug.air.alrite.Fragments.Patient;
 
+import static com.ug.air.alrite.Activities.PatientActivity.SYMPTOM_TYPE;
 import static com.ug.air.alrite.Fragments.Patient.FTouch.TOUCH;
+import static com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment.DEFAULT;
+import static com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment.VALUE_ID;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -18,21 +21,23 @@
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.RadioButton;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 
+import com.ug.air.alrite.Activities.PatientActivity;
 import com.ug.air.alrite.R;
 
 import org.json.JSONException;
 
 
 public class TextInputFragment extends Fragment {
-    //Fragment wise should be done may need listener for skip
+
     public interface onGetResultListener {
-        void getResultFromTextInputFragment(Float choiceIndex) throws JSONException;
+        void getResultFromTextInputFragment(String inputted) throws JSONException;
         void getLastPage() throws JSONException;
     }
     onGetResultListener getResultListener;
@@ -40,23 +45,18 @@ public interface onGetResultListener {
     EditText etDay;
     Button back, next, btnSkip, btnSave;
     String userInput, diagnosis;
-    public static final String Question = "What is the childs temperature";
-    public static final String TDIAGNOSIS = "diagnosis_fever";
+    public static final String QUESTION = "What is the childs temperature";
+    public static final String INPUT_TYPE = "waht is ths inmput type";
+    public static final String VALUEID = "what valid for this thing";
+
     public static final String SHARED_PREFS = "sharedPrefs";
     SharedPreferences sharedPreferences;
     SharedPreferences.Editor editor;
     Dialog dialog;
     TextView txtMessage;
-    public static final String IHint = "IHint";
-    public static final String IInformation = "IInformation";
-    public static final String SInformation = "SInformation";
-    public static final String min_value = "min_value";
-    public static final String max_value = "max_value";
-    public static final String minValueforDiagnosis = "minValueforDiagnosis";
     String question;
-    String InputHint;
-    String InputInformation;
-    String SkipInformation;
+    String inputType;
+    String valueID;
     int MinValue;
     int MaxValue;
     int diagnosisCutoff;
@@ -65,25 +65,13 @@ public interface onGetResultListener {
      * that we can retain the given information and return the fragment
      *
      * @param question the question at the top of the page
-     * @param InputHint the input hint for the user
-     * @param InputInformation the input hint for the user
-     * @param SkipInformation the input hint for the user
-     * @param MinValue the input hint for the user
-     * @param MaxValue the input hint for the user
-     * @param diagnosisCutoff the input hint for the user
      * @return the fragment to be used in the future
      */
-    public static TextInputFragment newInstance(String question, String InputHint, String InputInformation, String SkipInformation,
-                                                int MinValue, int MaxValue, int diagnosisCutoff) throws JSONException {
+    public static TextInputFragment newInstance(String question, String inputType, String valueID) throws JSONException {
         TextInputFragment tif = new TextInputFragment();
         Bundle args = new Bundle();
-        args.putString(Question, question);
-        args.putString(IHint, InputHint);
-        args.putString(IInformation, InputInformation);
-        args.putString(SInformation, SkipInformation);
-        args.putInt(min_value ,MinValue);
-        args.putInt(max_value ,MaxValue);
-        args.putInt(minValueforDiagnosis , diagnosisCutoff);
+        args.putString(QUESTION, question);
+        args.putString(INPUT_TYPE, inputType);
         tif.setArguments(args);
         return tif;
 }
@@ -96,35 +84,27 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
         editor = sharedPreferences.edit();
 
+        // Get the arguments that were passed in upon creation
         assert getArguments() != null;
-        question = getArguments().getString(Question);
-        InputHint = getArguments().getString(IHint);
-        InputInformation = getArguments().getString(IInformation);
-        SkipInformation = getArguments().getString(SInformation);
-        MinValue = getArguments().getInt(min_value);
-        MaxValue = getArguments().getInt(max_value);
-        diagnosisCutoff = getArguments().getInt(minValueforDiagnosis);
+        question = getArguments().getString(QUESTION);
+        inputType = getArguments().getString(INPUT_TYPE);
+        valueID = getArguments().getString(VALUEID);
 
         TextView questionDisplay = view.findViewById(R.id.ti_question);
         questionDisplay.setText(question);
         etDay = view.findViewById(R.id.IHint);
-        etDay.setHint(InputHint);
-        TextView InputInformationDisplay = view.findViewById(R.id.ti_IInformation);
-        InputInformationDisplay.setText(InputInformation);
-        TextView SkipInformationDisplay = view.findViewById(R.id.ti_SInformation);
-        SkipInformationDisplay.setText(SkipInformation);
+        etDay.requestFocus();
+
+        // If there is any information for the skip button, display it: otherwise,
+        // make the text box invisible
 
         next = view.findViewById(R.id.next);
         back = view.findViewById(R.id.back);
-        btnSkip = view.findViewById(R.id.skip);
 
-        etDay.requestFocus();
+        loadSelectedChoiceIfAlreadySelected();
 
-        loadData();
-        updateViews();
-
-
-        etDay.addTextChangedListener(textWatcher);
+        // For now, don't worry about this
+        // etDay.addTextChangedListener(textWatcher);
 
         next.setOnClickListener(new View.OnClickListener() {
             //if there is nothing inputted
@@ -156,16 +136,6 @@ public void onClick(View view) {
             }
         });
 
-        btnSkip.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
-                fr.replace(R.id.fragment_container, new FTouch());
-                fr.addToBackStack(null);
-                fr.commit();
-            }
-        });
-
         return view;
     }
 
@@ -185,6 +155,7 @@ public void onAttach(Activity activity) {
             throw new ClassCastException(activity.toString() + " must implement onSomeEventListener");
         }
     }
+
     TextWatcher textWatcher = new TextWatcher() {
         @Override
         public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -194,85 +165,49 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
         public void onTextChanged(CharSequence s, int start, int before, int count) {
             userInput = etDay.getText().toString();
             if (!userInput.isEmpty()){
-                float dy = Float.parseFloat(userInput);
-                btnSkip.setEnabled(false);
-                if (dy < MinValue){
-                    etDay.setError("You have entered a value below the minimum");
-                    next.setEnabled(false);
-                }else if (dy > MaxValue) {
-                    etDay.setError("You have entered a value above the maximum");
-                    next.setEnabled(false);
+                if (userInput.equals(PatientActivity.INPUT_TYPES.numeric.name())) {
+                    //TODO: in the future, if we add a min and max value to be passed in,
+                    // we can update this
+//                    float dy = Float.parseFloat(userInput);
+//                    btnSkip.setEnabled(false);
+//                    if (dy < MinValue) {
+//                        etDay.setError("You have entered a value below the minimum");
+//                        next.setEnabled(false);
+//                    } else if (dy > MaxValue) {
+//                        etDay.setError("You have entered a value above the maximum");
+//                        next.setEnabled(false);
+//                    } else {
+//                        btnSkip.setEnabled(true);
+//                        next.setEnabled(true);
+//                    }
                 } else {
-                    btnSkip.setEnabled(true);
-                    next.setEnabled(true);
+                    //TODO: in the future, if we add a min and max value to be passed in,
+                    // we can update this
                 }
             }
         }
 
         @Override
-        public void afterTextChanged(Editable s) {
-
-        }
+        public void afterTextChanged(Editable s) {}
     };
 
     private void saveData() {
-        deleteSharedPreferences();
-
-        Float tp = Float.parseFloat(userInput);
         try {
-            getResultListener.getResultFromTextInputFragment(tp);
+            getResultListener.getResultFromTextInputFragment(userInput);
         } catch (JSONException e) {
             throw new RuntimeException(e);
         }
-
     }
 
-    private void loadData() {
-        userInput = sharedPreferences.getString(Question, "");
-    }
-
-    private void updateViews() {
-        if (!userInput.isEmpty()){
-            etDay.setText(userInput);
-            btnSkip.setEnabled(false);
-        }else {
-            btnSkip.setEnabled(true);
-        }
-    }
-
-    private void deleteSharedPreferences() {
-        editor.remove(TOUCH);
-        editor.remove(TDIAGNOSIS);
-        editor.apply();
-    }
-
-    private void showDialog() {
-        dialog = new Dialog(getActivity());
-        dialog.setContentView(R.layout.assess);
-        dialog.setCancelable(true);
-
-        txtMessage = dialog.findViewById(R.id.message);
-        btnSave = dialog.findViewById(R.id.ContinueButton);
-
-        btnSave.setText("Continue");
-
-        txtMessage.setText("Popup text for the user indicating message");
-        txtMessage.setTextColor(Color.parseColor("#FF0000"));
-        txtMessage.setTypeface(Typeface.DEFAULT_BOLD);
-
-        btnSave.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                dialog.dismiss();
-                FragmentTransaction fr = requireActivity().getSupportFragmentManager().beginTransaction();
-                fr.replace(R.id.fragment_container, new Oxygen());
-                fr.addToBackStack(null);
-                fr.commit();
-            }
-        });
+    /**
+     * In the case that we're creating this view again after we've already stepped
+     * through this option, pre-select the choice that we already made, so that we
+     * don't get inconsistent answers from this
+     */
+    private void loadSelectedChoiceIfAlreadySelected() {
+        SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+        String previousResponse = sharedPreferences.getString(SYMPTOM_TYPE + valueID, DEFAULT);
 
-        dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
-        dialog.getWindow().setGravity(Gravity.CENTER);
-        dialog.show();
+        etDay.setText(previousResponse);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/multiple_choice.xml b/app/src/main/res/layout/multiple_choice.xml
index 0d87f53..a9d02f5 100644
--- a/app/src/main/res/layout/multiple_choice.xml
+++ b/app/src/main/res/layout/multiple_choice.xml
@@ -55,39 +55,48 @@
                     android:textColor="@color/black"
                     android:textSize="18sp" />
 
-                <RadioGroup
-                    android:id="@+id/mc_options"
+                <LinearLayout
+                    android:id="@+id/multiple_choice_layout"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp">
-
-                    <RadioButton
-                        android:id="@+id/choice1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:buttonTint="@color/black"
-                        android:text="@string/choice1"
-                        android:textSize="18sp" />
-
-                    <RadioButton
-                        android:id="@+id/choice2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:buttonTint="@color/black"
-                        android:text="@string/choice2"
-                        android:textSize="18sp" />
-
-                    <RadioButton
-                        android:id="@+id/choice3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:buttonTint="@color/black"
-                        android:text="%s"
-                        android:textSize="18sp" />
-
-                </RadioGroup>
+                    android:layout_margin="10dp"
+                    android:orientation="vertical">
+
+<!--                    <RadioGroup-->
+<!--                        android:id="@+id/mc_options"-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:layout_marginTop="20dp">-->
+<!--    -->
+<!--                        <RadioButton-->
+<!--                            android:id="@+id/choice1"-->
+<!--                            android:layout_width="wrap_content"-->
+<!--                            android:layout_height="wrap_content"-->
+<!--                            android:buttonTint="@color/black"-->
+<!--                            android:text="@string/choice1"-->
+<!--                            android:textSize="18sp" />-->
+<!--    -->
+<!--                        <RadioButton-->
+<!--                            android:id="@+id/choice2"-->
+<!--                            android:layout_width="wrap_content"-->
+<!--                            android:layout_height="wrap_content"-->
+<!--                            android:layout_marginTop="10dp"-->
+<!--                            android:buttonTint="@color/black"-->
+<!--                            android:text="@string/choice2"-->
+<!--                            android:textSize="18sp" />-->
+<!--    -->
+<!--                        <RadioButton-->
+<!--                            android:id="@+id/choice3"-->
+<!--                            android:layout_width="wrap_content"-->
+<!--                            android:layout_height="wrap_content"-->
+<!--                            android:layout_marginTop="10dp"-->
+<!--                            android:buttonTint="@color/black"-->
+<!--                            android:text="%s"-->
+<!--                            android:textSize="18sp" />-->
+<!--    -->
+<!--                    </RadioGroup>-->
+
+                </LinearLayout>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/text_input.xml b/app/src/main/res/layout/text_input.xml
index 0be2831..96735e3 100644
--- a/app/src/main/res/layout/text_input.xml
+++ b/app/src/main/res/layout/text_input.xml
@@ -85,6 +85,7 @@
                     android:textSize="12sp" />
 
                 <LinearLayout
+                    android:id="@+id/skipLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"

From a45cd7fbba35bb01b6df41d6d64a4c8aa5b9d994 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Mon, 15 May 2023 16:16:47 -0700
Subject: [PATCH 44/50] New TextInputTextFragment implemented, but broken lol

---
 .../alrite/Activities/PatientActivity.java    | 400 ++++++++----------
 1 file changed, 167 insertions(+), 233 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index b364bf1..0d97883 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -14,6 +14,7 @@
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.INITIAL_DATE_2;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.SECOND;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
@@ -30,13 +31,14 @@
 import android.widget.Button;
 
 import com.makeramen.roundedimageview.BuildConfig;
+import com.ug.air.alrite.APIs.ApiClient;
+import com.ug.air.alrite.APIs.DecisionTreeJSON;
 import com.ug.air.alrite.Fragments.Patient.ActivePatients;
+import com.ug.air.alrite.Fragments.Patient.Initials;
 import com.ug.air.alrite.Fragments.Patient.InitialsModified;
 import com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment;
 import com.ug.air.alrite.Fragments.Patient.MultipleSelectionFragment;
 import com.ug.air.alrite.Fragments.Patient.OtherPatients;
-import com.ug.air.alrite.Fragments.Patient.ParagraphFragment;
-import com.ug.air.alrite.Fragments.Patient.SexModified;
 import com.ug.air.alrite.Fragments.Patient.TextInputFragment;
 import com.ug.air.alrite.Fragments.Patient.TextInputTextFragment;
 import com.ug.air.alrite.R;
@@ -48,7 +50,11 @@
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
 import java.io.IOException;
+import java.lang.reflect.Array;
 import java.nio.file.Files;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -57,16 +63,26 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.ResponseBody;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Retrofit;
+import retrofit2.Response;
+
 public class PatientActivity extends AppCompatActivity implements
         MultipleChoiceFragment.onGetResultListener, MultipleSelectionFragment.onGetResultListener,
-        TextInputFragment.onGetResultListener, ParagraphFragment.onGetResultListener {
+        TextInputFragment.onGetResultListener, TextInputTextFragment.onGetResultListener {
 
     public static final String SHARED_PREFS = "sharedPrefs";
     public static final String INCOMPLETE = "incomplete";
 
+
     public static final String ASSESS_INCOMPLETE = "incomplete";
     SharedPreferences sharedPreferences, sharedPreferences1;
     SharedPreferences.Editor editor, editor1;
@@ -285,62 +301,40 @@ private void doLogic(String file) {
     public static final String ALPHANUMERIC_TYPE = "alphanumeric";
     public static final String TEXT_TYPE = "text";
     public static final String ANY_TYPE = "any";
-    public static final String PARAGRAPH = "Paragraph";
-    public static final String SYMPTOM_TYPE = "?: ";
-
-    // Full JSON infos to call getNextPage
-    JSONArray pages;
-
-    // Information gotten from JSON for the current page
-    // Information gotten from JSON
-    String question;
-    ArrayList<JSONObject> choices;
-    ArrayList<String> backstack;
-
-    // Other than question there is more information needed
-    // from the JSON for text input
-    String inputType;
-    String inputHint; //The preview text shown in the input bubble (enter the value here)  *optional (prefer this not to be optional)
-    String inputInformation; //Extra stuff below the input bubble telling user more information (its in celcius) *optional
-    String skipInformation; //Text shown above the skip button telling user when to skip (no thermometer available) *optional
-    int minValue; //The minimum value allowed to be inputted
-    int maxValue; //The maximum value allowed to be inputted
-    int diagnosisCutoff; //The minimum value to be inputted in order to get the diagnosis
-    public enum INPUT_TYPES {
-        numeric,
-        alphanumeric,
-        text,
-        any;
-    }
-    public enum COMPARISON_TYPES {
-        G(">"),
-        L("<"),
-        GE(">="),
-        LE("<="),
-        EQ("=");
-
-        public final String symbol;
 
-        COMPARISON_TYPES(String symbol) {
-            this.symbol = symbol;
-        }
-    }
-    JSONObject nextPageJSON;
+     // Full JSON infos to call getNextPage
+     JSONArray pages;
+
+     // Information gotten from JSON for the current page
+     // Information gotten from JSON
+     String question;
+     ArrayList<JSONObject> choices;
+     ArrayList<String> backstack;
+     // Other than question there is more information needed
+     // from the JSON for text input
+     String InputHint; //The preview text shown in the input bubble (enter the value here)  *optional (prefer this not to be optional)
+    String InputInformation; //Extra stuff below the input bubble telling user more information (its in celcius) *optional
+    String SkipInformation; //Text shown above the skip button telling user when to skip (no thermometer available) *optional
+    int MinValue; //The minimum value allowed to be inputted
+    int MaxValue; //The maximum value allowed to be inputted
+    int diagnosisCutoff; //The minimum value to be inputted in order to get the diagnosis
+    JSONObject pageID;
     String targetValue_id; // for text input
     String targetValueID; // for multiple selection
-    String paragraph; //Content for paragraph fragment
 
     /**
-     * This is the function that is called to set up the process of looping through
-     * the pages until we get to the diagnosis page
      *
      * @throws JSONException
      * @throws IOException
      */
     private void implementEditableDecisionTree(JSONObject json) throws JSONException, IOException {
+//        DecisionTreeJSON json = ApiClient.getClient(ApiClient.TEMP_SERV_URL)
+//                                    .create(DecisionTreeJSON.class);
+//        Call<String> call = DecisionTreeJSON.getJson();
+//        System.out.println(json);
+
         backstack = new ArrayList<>();
         pages = json.getJSONArray(PAGES);
-
         // This is just an array because it needs to be mutable: think of it as
         // its own element
         String nextPage = pages.getJSONObject(0).getString(PAGE_ID);
@@ -353,6 +347,21 @@ private void implementEditableDecisionTree(JSONObject json) throws JSONException
         getNextPage(nextPage);
     }
 
+    /**
+     * NOTE: THIS SHOULD ONLY BE USED FOR SINGLE-LAYER ARRAYS
+     *
+     * @param jsonArray
+     * @return
+     * @throws JSONException
+     */
+    private ArrayList<JSONObject> JSONArrayToListOfJSONObjects(JSONArray jsonArray) throws JSONException {
+        ArrayList<JSONObject> ret = new ArrayList<>();
+        for (int i = 0; i < jsonArray.length(); i++) {
+            ret.add(jsonArray.getJSONObject(i));
+        }
+        return ret;
+    }
+
     /**
      * This will add the given fragment to the back stack, and do a transaction
      * which replaces the current fragment with the given fragment
@@ -383,7 +392,7 @@ private void getNextPage(String nextPageID) throws JSONException {
         }
 
         // Get all of the items that should be displayed on the page
-        nextPageJSON = pages.getJSONObject(findIndexInPagesGivenPageId(nextPageID));
+        JSONObject nextPageJSON = pages.getJSONObject(findIndexInPagesGivenPageId(nextPageID));
         JSONArray nextPageContent = nextPageJSON.getJSONArray(CONTENT);
 
         // If the next page would be the final page, then the assessment is over!
@@ -392,50 +401,39 @@ private void getNextPage(String nextPageID) throws JSONException {
             exitActivity();
             return;
         }
-
-        // Since we're not implementing multiple types of data input per page at
-        // the moment, we should default to having the index be 0:
-        int contentIndex = 0;
+        pageID = nextPageJSON;
 
         // Then, for each component that we're given within the page, display a
         // fragment for that component.
-        JSONObject nextPageComponent = nextPageContent.getJSONObject(contentIndex);
+        JSONObject nextPageComponent = nextPageContent.getJSONObject(0);
         String nextPageComponentType = nextPageComponent.getString(COMPONENT);
 
-        switch (nextPageComponentType) {
-            // Multiselect and multiple choice options:
-            case MULTIPLE_CHOICE:
-                boolean isMultiSelect = nextPageComponent.getBoolean(MULTISELECT);
-                String valueID = getValueID(nextPageJSON, contentIndex);
-                if (isMultiSelect) {
-                    createMultiSelectFragment(nextPageComponent);
-                } else {
-                    createMultipleChoiceFragment(nextPageComponent, valueID);
-                }
-                break;
-
-            // Text input option:
-            case TEXT_INPUT:
-                valueID = getValueID(nextPageJSON, contentIndex);
-                createTextInputFragment(nextPageComponent, valueID);
-                break;
-
-            // Paragraph option:
-            case PARAGRAPH:
-                createParagraphFragment(nextPageComponent);
-                break;
-
-            // There was an issue with identifying the page... just go to the next page instead
-            default:
-                System.out.println("should never get here lol: just go to the next page");
-                getNextPage(nextPageJSON.getString(DEFAULT_LINK));
-                break;
+        // Multiple choice option(s):
+        if (nextPageComponentType.equals(MULTIPLE_CHOICE)) {
+            Boolean isMultiSelect = nextPageComponent.getBoolean(MULTISELECT);
+            if (isMultiSelect) {
+                createMultiSelectFragment(nextPageComponent);
+            } else {
+                createMultipleChoiceFragment(nextPageComponent);
+            }
+
+        // Text input option:
+        } else if (nextPageComponentType.equals(TEXT_INPUT)) {
+            if (nextPageJSON.getString(TYPE).equals(NUMERIC_TYPE)) {
+                createTextInputFragment(nextPageComponent);
+            } else {
+                createTextInputTextFragment(nextPageComponent);
+            }
+
+        // There was an issue with identifying the page...
+        } else {
+            System.out.println("should never get here lol: just go to the next page");
+            getNextPage(pageID.getString(DEFAULT_LINK));
         }
     }
 
     /**
-     * Get the copy of the workflow that we have stored on the device and turn it
-     * into a JSONObject
+     * Essentially, make an asynchronous API call to get the HTTP
      */
     @RequiresApi(api = Build.VERSION_CODES.O)
     public void getJSONFromBackend() {
@@ -468,53 +466,64 @@ private void exitActivity() {
         this.finish();
     }
 
-    /**
-     * NOTE: THIS SHOULD ONLY BE USED FOR SINGLE-LAYER ARRAYS
-     *
-     * @param jsonArray
-     * @return
-     * @throws JSONException
-     */
-    private ArrayList<JSONObject> JSONArrayToListOfJSONObjects(JSONArray jsonArray) throws JSONException {
-        ArrayList<JSONObject> ret = new ArrayList<>();
-        for (int i = 0; i < jsonArray.length(); i++) {
-            ret.add(jsonArray.getJSONObject(i));
-        }
-        return ret;
-    }
-
-    private void createMultipleChoiceFragment(JSONObject nextPageComponent, String valueID) throws JSONException {
+    private void createMultipleChoiceFragment(JSONObject nextPageComponent) throws JSONException {
         // Collect the important arguments from the component
         question = nextPageComponent.getString(LABEL);
         choices = JSONArrayToListOfJSONObjects(nextPageComponent.getJSONArray(CHOICES));
 
         // Get the new page's fragment, and set a listener for when the next button
         // is clicked
-        MultipleChoiceFragment mc_fragment = MultipleChoiceFragment.newInstance(question, choices, valueID);
+        MultipleChoiceFragment mc_fragment = MultipleChoiceFragment.newInstance(question, choices);
 
         // Replace and commit the fragment
         completeFragmentTransaction(mc_fragment);
     }
-
     /**
      * Creating the Fragment for Text Input
      *
      * @throws JSONException because we use json objects
      */
-    private void createTextInputFragment(JSONObject nextPageComponent, String valueID) throws JSONException {
+    private void createTextInputFragment(JSONObject page) throws JSONException {
         // Collect the important arguments from the component
-        question = nextPageComponent.getString(LABEL);
-        inputType = nextPageComponent.getString(TYPE);
-        targetValue_id = valueID;
+        question = page.getString(LABEL);
+        InputHint = "none right now";
+        InputInformation = "none right now";
+        SkipInformation = "none right now";
+        MinValue = 0;
+        MaxValue = 100;
+        diagnosisCutoff = 50;
+        targetValue_id = page.getString(VALUE_ID);
 
         // Get the new page's fragment, and set a listener for when the next button
         // is clicked
-        TextInputFragment ti_fragment = TextInputFragment.newInstance(question, inputType, valueID);
+        TextInputFragment ti_fragment = TextInputFragment.newInstance(question, InputHint, InputInformation, SkipInformation,
+        MinValue, MaxValue, diagnosisCutoff);
 
         // Replace and commit the fragment
         completeFragmentTransaction(ti_fragment);
     }
 
+    /**
+     * Create the TextInputTextFragment
+     *
+     * @param nextPageComponent the component to be displayed on screen
+     * @throws JSONException because json
+     */
+    private void createTextInputTextFragment(JSONObject nextPageComponent) throws JSONException {
+        question = nextPageComponent.getString(LABEL);
+        InputHint = "none right now";
+        InputInformation = "none right now";
+        SkipInformation = "none right now";
+        targetValue_id = nextPageComponent.getString(VALUE_ID);
+
+        // Get the new page's fragment, and set a listener for when the next button
+        // is clicked
+        TextInputTextFragment tit_fragment = TextInputTextFragment.newInstance(question, InputHint, InputInformation, SkipInformation);
+
+        // Replace and commit the fragment
+        completeFragmentTransaction(tit_fragment);
+    }
+
     /**
      * Fragment for multiple selection
      *
@@ -532,22 +541,6 @@ private void createMultiSelectFragment(JSONObject page) throws JSONException {
         // Replace and commit the fragment
         completeFragmentTransaction(ms_fragment);
     }
-    /**
-     * Create the ParagraphFragment
-     *
-     * @param nextPageComponent the component to be displayed on screen
-     * @throws JSONException because json
-     */
-    private void createParagraphFragment(JSONObject nextPageComponent) throws JSONException {
-        paragraph = nextPageComponent.getString(TEXT);
-
-        // Get the new page's fragment, and set a listener for when the next button
-        // is clicked
-        ParagraphFragment p_fragment = ParagraphFragment.newInstance(paragraph);
-
-        // Replace and commit the fragment
-        completeFragmentTransaction(p_fragment);
-    }
 
     /**
      * Listener for clicking the next button: we can move to the correct next
@@ -559,17 +552,17 @@ private void createParagraphFragment(JSONObject nextPageComponent) throws JSONEx
      */
     @Override
     public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONException {
-        String diagnosis = choices.get(choiceIndex).getString(TEXT);
-        String nextPageName = choices.get(choiceIndex).getString(LINK);
+        String diagnosis = choices.get(choiceIndex - 1).getString(TEXT);
+        String nextPageName = choices.get(choiceIndex - 1).getString(LINK);
 
         // If the link is null, then we should go to the default page
         if (nextPageName.equals(NULL)) {
-            nextPageName = nextPageJSON.getString(DEFAULT_LINK);
+            nextPageName = pageID.getString(DEFAULT_LINK);
         }
         System.out.println("NEXT PAGE NAME:" + nextPageName);
 
         // Enter the diagnosis into the editor
-        enterSymptomIntoEditor(nextPageJSON, diagnosis);
+        enterSymptomIntoEditor(question, diagnosis);
 
         // Decide on the next page based on the result
         try {
@@ -582,26 +575,20 @@ public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONExce
     @Override
     public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOptionIds) throws JSONException {
         // add the selected choices to the diagnosis
+        String allDiagnoses = choices.get(chosenOptionIds.get(0)).getString(TEXT);
+        for (int i = 1; i < chosenOptionIds.size(); i++) {
+            allDiagnoses += "\n" + choices.get(i).getString(TEXT);
+            // Enter the diagnosis into the editor
+        }
+        enterSymptomIntoEditor(question, allDiagnoses);
 
+        JSONObject foundLink = getContentFromPageID(pageID, targetValueID);
         String NextPage;
-
-        if (chosenOptionIds.isEmpty()) {
-            NextPage =  nextPageJSON.getString(DEFAULT_LINK);
+        if (foundLink == null) {
+            NextPage =  pageID.getString(DEFAULT_LINK);
         }
         else {
-            String allDiagnoses = choices.get(chosenOptionIds.get(0) - 1).getString(TEXT);
-            for (int i = 1; i < chosenOptionIds.size(); i++) {
-                allDiagnoses += "\n" + choices.get(i).getString(TEXT);
-                // Enter the diagnosis into the editor
-            }
-            enterSymptomIntoEditor(nextPageJSON, allDiagnoses);
-
-            JSONObject foundLink = getContentFromPageID(nextPageJSON, targetValueID);
-            if (foundLink == null) {
-                NextPage = nextPageJSON.getString(DEFAULT_LINK);
-            } else {
-                NextPage = foundLink.getString(SATISFIED_LINK);
-            }
+            NextPage = foundLink.getString(SATISFIED_LINK);
         }
 
         // Decide on the next page based on the result
@@ -613,49 +600,50 @@ public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOpti
     }
 
     @Override
-    public void getResultFromTextInputFragment(String inputted) throws JSONException {
-        // First, we get the next page where this will lead eventually, or the default
-        ArrayList<JSONObject> foundLinks = getContentFromPageIDArray(nextPageJSON, targetValue_id);
-        String nextPage = nextPageJSON.getString(DEFAULT_LINK);
-
-        // Next, we get the type of the object that was passed up from the TextInput:
-        // was it a number, or a string?
-        if (inputType.equals(INPUT_TYPES.numeric.name())) {
-            Float diagnosis = Float.valueOf(inputted);
-            if(!foundLinks.isEmpty()) {
-                // Replace BranchedLink with whatever the name is for the link field
-                // once the branched link logic is completed in the JSON file
-                for (JSONObject foundLink : foundLinks) {
-                    String compType = foundLink.getString(TYPE);
-                    float threshold = Float.parseFloat(foundLink.getString(THRESHOLD));
-                    // greater than
-                    if ((compType.equals(COMPARISON_TYPES.G.symbol) && diagnosis < threshold)
-                    || (compType.equals(COMPARISON_TYPES.L.symbol) && diagnosis < threshold)
-                    || (compType.equals(COMPARISON_TYPES.GE.symbol) && diagnosis >= threshold)
-                    || (compType.equals(COMPARISON_TYPES.LE.symbol) && diagnosis <= threshold)
-                    || (compType.equals(COMPARISON_TYPES.EQ.symbol) && diagnosis == threshold)) {
-                        nextPage = foundLink.getString(SATISFIED_LINK);
-                        break;
-                    }
+    public void getResultFromTextInputFragment(int numberInputted) throws JSONException {
+        String diagnosis = String.valueOf(numberInputted);
+        JSONObject foundLink = getContentFromPageID(pageID, targetValue_id);
+        String NextPage = pageID.getString(DEFAULT_LINK);
+        if(foundLink != null) {
+            // Replace BranchedLink with whatever the name is for the link field
+            // once the branched link logic is completed in the JSON file
+            if(foundLink.get("type").equals(">")) {
+                if (numberInputted > diagnosisCutoff) {
+                    NextPage = foundLink.getString(SATISFIED_LINK);
+                }
+            } else if(foundLink.get("type").equals("<")) {
+                if (numberInputted < diagnosisCutoff) {
+                    NextPage = foundLink.getString(SATISFIED_LINK);
+                }
+            } else {
+                if (numberInputted == diagnosisCutoff) {
+                    NextPage = foundLink.getString(SATISFIED_LINK);
                 }
-                enterSymptomIntoEditor(nextPageJSON, String.valueOf(diagnosis));
             }
-        } else {
-            // In the case that we're comparing strings, we'll compare equality with .equals,
-            // and everything else with strict < or >
         }
-
-        // Finally, we go to the decided next page
+        // Enter the diagnosis into the editor
+        enterSymptomIntoEditor(question, diagnosis);
         try {
-            getNextPage(nextPage);
+            getNextPage(NextPage);
         } catch(JSONException e) {
             throw new RuntimeException();
         }
     }
 
     @Override
-    public void getResultFromParagraphFragment() throws JSONException {
-        String nextPage = nextPageJSON.getString(DEFAULT_LINK);
+    public void getResultFromTextInputTextFragment(String textInputted) throws JSONException {
+        String recordedSymptom = textInputted;
+        JSONObject logicComponent = getContentFromPageID(pageID, targetValue_id);
+        String nextPage = pageID.getString(DEFAULT_LINK);
+        if (logicComponent != null) {
+            if (logicComponent.getString(TYPE).equals("=")) {
+                if (recordedSymptom.equals(logicComponent.getString(THRESHOLD))) {
+                    nextPage = logicComponent.getString(SATISFIED_LINK);
+                }
+            }
+        }
+
+        enterSymptomIntoEditor(question, recordedSymptom);
         try {
             getNextPage(nextPage);
         } catch(JSONException e) {
@@ -693,37 +681,6 @@ public JSONObject getContentFromPageID(JSONObject pageid, String targetValueID)
         return null;
     }
 
-    /**
-     * Takes the page id and returns a list of targetids
-     *
-     * @param pageid the page ID we wish to use
-     * @param targetValueID the valueID of the current component that we are using
-     * @return
-     */
-    public ArrayList<JSONObject> getContentFromPageIDArray(JSONObject pageid, String targetValueID) throws JSONException {
-        JSONArray contentVal;
-        ArrayList<JSONObject> RetrievedTargetIDs = new ArrayList<>();
-        if(pageid != null) {
-            try {
-                // Get the content from the JSONArray
-                contentVal = pageid.getJSONArray(CONTENT);
-            } catch (JSONException e) {
-                throw new RuntimeException(e);
-            }
-            for(int i = 0; i < contentVal.length(); i++) {
-                // Check to see if the ID's match up
-                // With the build in has method
-                JSONObject RetrievedTargetID = ((JSONObject)contentVal.get(i));
-                if ( RetrievedTargetID.has(TARGET_VALUE_ID)) {
-                    if(RetrievedTargetID.get(TARGET_VALUE_ID).equals(targetValueID)) {
-                        RetrievedTargetIDs.add(RetrievedTargetID);
-                    }
-                }
-            }
-        }
-        return RetrievedTargetIDs;
-    }
-
     /**
      * Listener for clicking the back button: calls up the next page based on the
      * current backstack of pages
@@ -732,15 +689,10 @@ public ArrayList<JSONObject> getContentFromPageIDArray(JSONObject pageid, String
      */
     @Override
     public void getLastPage() throws JSONException {
+        // TODO: exit to main activity, if it's the first page
+
         // Get the last page JSON object that we put on to the backstack
         backstack.remove(backstack.size() - 1);
-
-        // go to the SexModified , if it's the first page
-        if (backstack.isEmpty()) {
-            completeFragmentTransaction(new SexModified());
-            return;
-        }
-
         String backPageName = backstack.get(backstack.size() - 1);
 
         getNextPage(backPageName);
@@ -757,27 +709,9 @@ private int findIndexInPagesGivenPageId(String pageID) throws JSONException {
         return -1;
     }
 
-    /**
-     * Abstracts away the process of adding a symptom to the sharedPreference object
-     *
-     * @param page is the page in the workflow that we're entering a symptom for
-     * @param symptom is the associated value to enter in given the page
-     * @throws JSONException because we look at JSON
-     */
-    public void enterSymptomIntoEditor(JSONObject page, String symptom) throws JSONException {
+    public void enterSymptomIntoEditor(String question, String symptom) {
         // Enter the diagnosis into the editor
-        editor.putString(SYMPTOM_TYPE + getValueID(page, 0), symptom);
+        editor.putString("?: " + question, symptom);
         editor.apply();
     }
-
-    /**
-     * Function to get the ValueID (official name for a piece of content)
-     *
-     * @param page is the page in the workflow that the valueID is on
-     * @param contentIndex is the index within the content array that this valueID refers to
-     * @return a string that is the valueID
-     */
-    public String getValueID(JSONObject page, int contentIndex) throws JSONException {
-        return page.getJSONArray(CONTENT).getJSONObject(contentIndex).getString(VALUE_ID);
-    }
 }
\ No newline at end of file

From 8f7b220edb2fabae5afd1a3eb99f3167b48bcada Mon Sep 17 00:00:00 2001
From: evasy <yitongshan2016@yahoo.com>
Date: Mon, 5 Jun 2023 02:58:02 -0700
Subject: [PATCH 45/50] arbitrary number of options for multiselect

---
 .../alrite/Activities/PatientActivity.java    | 12 +--
 .../Patient/MultipleSelectionFragment.java    | 63 +++++++------
 app/src/main/res/layout/multiple_select.xml   | 90 ++++++++++---------
 3 files changed, 91 insertions(+), 74 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index b364bf1..6126129 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -408,7 +408,7 @@ private void getNextPage(String nextPageID) throws JSONException {
                 boolean isMultiSelect = nextPageComponent.getBoolean(MULTISELECT);
                 String valueID = getValueID(nextPageJSON, contentIndex);
                 if (isMultiSelect) {
-                    createMultiSelectFragment(nextPageComponent);
+                    createMultiSelectFragment(nextPageComponent, valueID);
                 } else {
                     createMultipleChoiceFragment(nextPageComponent, valueID);
                 }
@@ -520,14 +520,14 @@ private void createTextInputFragment(JSONObject nextPageComponent, String valueI
      *
      * @throws JSONException because we use json objects
      */
-    private void createMultiSelectFragment(JSONObject page) throws JSONException {
-        question = page.getString(LABEL);
-        choices = JSONArrayToListOfJSONObjects(page.getJSONArray(CHOICES));
-        targetValueID = page.getString(VALUE_ID);
+    private void createMultiSelectFragment(JSONObject nextPageComponent, String valueID) throws JSONException {
+        question = nextPageComponent.getString(LABEL);
+        choices = JSONArrayToListOfJSONObjects(nextPageComponent.getJSONArray(CHOICES));
+        targetValueID = nextPageComponent.getString(VALUE_ID);
 
         // Get the new page's fragment
         // set a listener for when the next button is clicked
-        MultipleSelectionFragment ms_fragment = MultipleSelectionFragment.newInstance(question, choices);
+        MultipleSelectionFragment ms_fragment = MultipleSelectionFragment.newInstance(question, choices, valueID);
 
         // Replace and commit the fragment
         completeFragmentTransaction(ms_fragment);
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
index 7ac107c..2b3c132 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
@@ -1,5 +1,8 @@
 package com.ug.air.alrite.Fragments.Patient;
 
+import static com.ug.air.alrite.Activities.PatientActivity.SYMPTOM_TYPE;
+import static com.ug.air.alrite.Activities.PatientActivity.VALUE_ID;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -9,6 +12,8 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -34,6 +39,8 @@ public interface onGetResultListener {
     public static final String QUESTION = "question";
     public static final String CHOICES = "choices";
     public static final String DEFAULT = "**default string**";
+    public static final String VALUE_ID = "valueID";
+    String valueID;
     String previousResponse;
     String question;
     ArrayList<String> choices; // list of the texts of the checkboxes
@@ -68,12 +75,13 @@ public void onAttach(Activity activity) {
      * @param choices the given choices for the user to choose from
      * @return the fragment to be used in the future
      */
-    public static MultipleSelectionFragment newInstance(String question, ArrayList<JSONObject> choices) throws JSONException {
+    public static MultipleSelectionFragment newInstance(String question, ArrayList<JSONObject> choices, String valueID) throws JSONException {
         MultipleSelectionFragment msc = new MultipleSelectionFragment();
         Bundle args = new Bundle();
         args.putString(QUESTION, question);
         ArrayList<String> text_choices = getTextFromChoices(choices);
         args.putStringArrayList(CHOICES, text_choices);
+        args.putString(VALUE_ID, valueID);
         msc.setArguments(args);
         return msc;
     }
@@ -89,6 +97,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         assert getArguments() != null;
         question = getArguments().getString(QUESTION);
         choices = getArguments().getStringArrayList(CHOICES); // list of strings
+        valueID = getArguments().getString(VALUE_ID);
 
         // Then, set the information for each question/choice to line up with our givens
         TextView questionDisplay = view.findViewById(R.id.mc_question);
@@ -98,24 +107,15 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         // Currently storing 5 checkboxes will update later
         // might add more or create optimized loop
 
-        CheckBox choice1 = view.findViewById(R.id.choice1);
-        choice1.setText(choices.get(0));
-        CheckBox choice2 = view.findViewById(R.id.choice2);
-        choice2.setText(choices.get(1));
-        CheckBox choice3 = view.findViewById(R.id.choice3);
-        choice3.setText(choices.get(2));
-        CheckBox choice4 = view.findViewById(R.id.choice4);
-        choice4.setText(choices.get(3));
-        CheckBox choice5 = view.findViewById(R.id.choice5);
-        choice5.setText(choices.get(4));
+        LinearLayout multipleSelectLayout = view.findViewById(R.id.multiple_select_layout);
 
         choiceGroup = new ArrayList<>();
-        choiceGroup.add(choice1);
-        choiceGroup.add(choice2);
-        choiceGroup.add(choice3);
-        choiceGroup.add(choice4);
-        choiceGroup.add(choice5);
-        System.out.println(choiceGroup);
+        for (String choiceText : choices) {
+            CheckBox c = new CheckBox(this.getContext());
+            multipleSelectLayout.addView(c); //?
+            c.setText(choiceText);
+            choiceGroup.add(c);
+        }
 
 
         // All of the buttons/things that we'll need to reference
@@ -123,7 +123,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         backButton = view.findViewById(R.id.back);
 
         // If we've already seen this page, reload our past choices
-        // loadSelectedChoicesIfAlreadySelected();
+        loadSelectedChoicesIfAlreadySelected();
 
         // This is a listener for, if the next button is pressed, whether we can go
         // on or not, and what information should be sent up
@@ -140,6 +140,7 @@ public void onClick(View v) {
                         chosenOptions.add(id);
                     }
                 }
+//                // do not allow selection number less than 1
 //                if (chosenOptions.size() < 1) {
 //                    Toast.makeText(getActivity(), "Please select at least one of the options", Toast.LENGTH_SHORT).show();
 //                    return;
@@ -147,7 +148,7 @@ public void onClick(View v) {
 
                 // Get the indices of the choices in the set of buttons: relies on the
                 // buttons having names with their index at the end
-                ArrayList<Integer> chosenOptionIds = new ArrayList<Integer>();
+                ArrayList<Integer> chosenOptionIds = new ArrayList<>();
                 for (int c : chosenOptions) {
                     String chosenOptionId = v.getResources().getResourceName(c);
                     int index = Integer.parseInt(chosenOptionId.substring(chosenOptionId.length() - 1));
@@ -182,15 +183,23 @@ public void onClick(View view) {
     /**
      * In the case that we're creating this view again after we've already stepped
      * through this option, pre-select the choice that we already made, so that we
-     * don't get inconsistent answers from this
+     * don't get inconsistent answers from this.
      */
-//    private void loadSelectedChoicesIfAlreadySelected() {
-//
-//        SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
-//        previousResponse = sharedPreferences.getString(question, DEFAULT);
-//
-//        //
-//    }
+    private void loadSelectedChoicesIfAlreadySelected() {
+        SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+        previousResponse = sharedPreferences.getString(SYMPTOM_TYPE + valueID, DEFAULT);
+        String[] selectedOptionsHistory = previousResponse.split("\n"); // split by \n
+
+
+        for (int i = 0; i < choices.size(); i++) {
+            for (String temp : selectedOptionsHistory) {
+                if (temp.equals(choices.get(i))) {
+                    ((CheckBox) choiceGroup.get(i)).setChecked(true);
+                    return;
+                }
+            }
+        }
+    }
 
     /**
      * This is used specifically for newInstance, and relies on the JSON being set
diff --git a/app/src/main/res/layout/multiple_select.xml b/app/src/main/res/layout/multiple_select.xml
index 45ee34e..a30dfaa 100644
--- a/app/src/main/res/layout/multiple_select.xml
+++ b/app/src/main/res/layout/multiple_select.xml
@@ -55,49 +55,57 @@
                     android:textColor="@color/black"
                     android:textSize="18sp" />
 
-                <CheckBox
-                    android:id="@+id/choice1"
+                <LinearLayout
+                    android:id="@+id/multiple_select_layout"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:buttonTint="@color/black"
-                    android:text="@string/choice1"
-                    android:textSize="18sp" />
-
-                <CheckBox
-                    android:id="@+id/choice2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:buttonTint="@color/black"
-                    android:text="@string/choice2"
-                    android:textSize="18sp" />
-
-                <CheckBox
-                    android:id="@+id/choice3"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:buttonTint="@color/black"
-                    android:text="%s"
-                    android:textSize="18sp" />
-
-                <CheckBox
-                    android:id="@+id/choice4"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:buttonTint="@color/black"
-                    android:text="%s"
-                    android:textSize="18sp" />
-
-                <CheckBox
-                    android:id="@+id/choice5"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:buttonTint="@color/black"
-                    android:text="%s"
-                    android:textSize="18sp" />
+                    android:layout_margin="10dp"
+                    android:orientation="vertical">
+                </LinearLayout>
+
+<!--                <CheckBox-->
+<!--                    android:id="@+id/choice1"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:buttonTint="@color/black"-->
+<!--                    android:text="@string/choice1"-->
+<!--                    android:textSize="18sp" />-->
+
+<!--                <CheckBox-->
+<!--                    android:id="@+id/choice2"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginTop="10dp"-->
+<!--                    android:buttonTint="@color/black"-->
+<!--                    android:text="@string/choice2"-->
+<!--                    android:textSize="18sp" />-->
+
+<!--                <CheckBox-->
+<!--                    android:id="@+id/choice3"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginTop="10dp"-->
+<!--                    android:buttonTint="@color/black"-->
+<!--                    android:text="%s"-->
+<!--                    android:textSize="18sp" />-->
+
+<!--                <CheckBox-->
+<!--                    android:id="@+id/choice4"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginTop="10dp"-->
+<!--                    android:buttonTint="@color/black"-->
+<!--                    android:text="%s"-->
+<!--                    android:textSize="18sp" />-->
+
+<!--                <CheckBox-->
+<!--                    android:id="@+id/choice5"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginTop="10dp"-->
+<!--                    android:buttonTint="@color/black"-->
+<!--                    android:text="%s"-->
+<!--                    android:textSize="18sp" />-->
             </LinearLayout>
 
         </ScrollView>

From 4e93c45d8deb945a6e5347c99020206e9ae4050b Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Mon, 5 Jun 2023 16:22:07 -0700
Subject: [PATCH 46/50] It works for the workflow still, but it has issues with
 connecting to the backend in the other patients part

---
 app/build.gradle                              |   1 +
 .../com/ug/air/alrite/APIs/ApiClient.java     |   4 +-
 ...sionTreeJSON.java => BackendRequests.java} |   9 +-
 .../alrite/Activities/DiagnosisActivity.java  |  12 +-
 .../Activities/DiagnosisActivityModified.java | 228 ++++------------
 .../air/alrite/Activities/FinalActivity.java  |  35 ++-
 .../alrite/Activities/PatientActivity.java    | 224 ++++++++++------
 .../air/alrite/Activities/SplashActivity.java |  17 +-
 .../Fragments/Patient/Bronchodilator.java     |   8 +-
 .../Fragments/Patient/InitialsModified.java   |  21 +-
 .../Patient/MultipleChoiceFragment.java       |  12 +-
 .../Patient/MultipleSelectionFragment.java    |  11 +-
 .../Fragments/Patient/OtherPatients.java      | 249 +++++++++++++-----
 .../Fragments/Patient/TextInputFragment.java  |  12 +-
 .../air/alrite/Utils/BackendPostRequest.java  |  13 +
 app/src/main/res/layout/text_input.xml        |   1 -
 16 files changed, 462 insertions(+), 395 deletions(-)
 rename app/src/main/java/com/ug/air/alrite/APIs/{DecisionTreeJSON.java => BackendRequests.java} (50%)
 create mode 100644 app/src/main/java/com/ug/air/alrite/Utils/BackendPostRequest.java

diff --git a/app/build.gradle b/app/build.gradle
index d1eca40..594f1dd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -58,4 +58,5 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor:4.4.1'
     implementation 'com.squareup.retrofit2:converter-scalars:2.5.0'
     implementation 'com.squareup.picasso:picasso:2.8'
+    implementation "com.squareup.retrofit2:adapter-rxjava2:2.4.0"
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/APIs/ApiClient.java b/app/src/main/java/com/ug/air/alrite/APIs/ApiClient.java
index 9c4f10d..7ca2dc3 100644
--- a/app/src/main/java/com/ug/air/alrite/APIs/ApiClient.java
+++ b/app/src/main/java/com/ug/air/alrite/APIs/ApiClient.java
@@ -8,11 +8,10 @@
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
 import retrofit2.converter.scalars.ScalarsConverterFactory;
 
-
-
 public class ApiClient {
     public static final String BASE_URL = "http://140.142.142.94/alrite/apis/";
     public static final String TEMP_SERV_URL = "http://10.0.2.2:8000";
@@ -42,6 +41,7 @@ public static Retrofit getClient(String URL) {
                     .client(okHttpClient)
                     .addConverterFactory(ScalarsConverterFactory.create())
                     .addConverterFactory(GsonConverterFactory.create(gson))
+                    .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
                     .build();
         }
         return retrofit;
diff --git a/app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java b/app/src/main/java/com/ug/air/alrite/APIs/BackendRequests.java
similarity index 50%
rename from app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java
rename to app/src/main/java/com/ug/air/alrite/APIs/BackendRequests.java
index 39d2133..038cdc5 100644
--- a/app/src/main/java/com/ug/air/alrite/APIs/DecisionTreeJSON.java
+++ b/app/src/main/java/com/ug/air/alrite/APIs/BackendRequests.java
@@ -1,12 +1,19 @@
 package com.ug.air.alrite.APIs;
 
+import com.ug.air.alrite.Utils.BackendPostRequest;
+
+import io.reactivex.Observable;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
+import retrofit2.http.POST;
 import retrofit2.http.Path;
 
-public interface DecisionTreeJSON {
+public interface BackendRequests {
 
     @GET("/alrite/apis/workflows/{workflow_id}/")
     Call<String> getJson(@Path("workflow_id") String workflow_id);
+
+    @POST("/alrite/data/test/13/")
+    Observable<String> postToBackend(@Body BackendPostRequest body);
 }
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivity.java
index 88e1c14..08bad53 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivity.java
@@ -11,8 +11,8 @@
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USED_BRONCHODILATOR;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DATE;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DURATION;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.FILENAME;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USERNAME;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.PATIENT_ASSESSMENT_ID;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.CLINICIAN_USERNAME;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.UUIDS;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator2.BDIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator2.REASON;
@@ -567,7 +567,7 @@ else if (s.equals("Wheezing illness (Bronchodilator response)")){
 
     private void saveForm() {
 
-        String file = sharedPreferences.getString(FILENAME, "");
+        String file = sharedPreferences.getString(PATIENT_ASSESSMENT_ID, "");
 
         Date currentTime = Calendar.getInstance().getTime();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss", Locale.getDefault());
@@ -582,7 +582,7 @@ private void saveForm() {
 
             getDuration(currentTime);
 
-            editor.putString(USERNAME, username);
+            editor.putString(CLINICIAN_USERNAME, username);
             editor.putString(DATE, formattedDate);
             editor.putString(UUIDS, uniqueID);
             editor.putString(PENDING, isPending);
@@ -590,7 +590,7 @@ private void saveForm() {
             editor.apply();
 
             String filename = formattedDate + "_" + uniqueID;
-            editor.putString(FILENAME, filename);
+            editor.putString(PATIENT_ASSESSMENT_ID, filename);
             editor.apply();
 //            Toast.makeText(this, "empty", Toast.LENGTH_SHORT).show();
             doLogic(filename);
@@ -598,7 +598,7 @@ private void saveForm() {
             editor.putString(PENDING, isPending);
             editor.putString(ASSESS_INCOMPLETE, "complete");
             String filename = formattedDate + "_" + uniqueID;
-            editor.putString(FILENAME, filename);
+            editor.putString(PATIENT_ASSESSMENT_ID, filename);
             editor.putString(DATE, formattedDate);
             editor.apply();
 
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java b/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java
index ed8c2ba..19a3a57 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java
@@ -1,63 +1,20 @@
 package com.ug.air.alrite.Activities;
 
-import static com.ug.air.alrite.Activities.FinalActivity.S6;
-import static com.ug.air.alrite.Activities.FinalActivity.S7;
-import static com.ug.air.alrite.Activities.PatientActivity.ASSESS_INCOMPLETE;
-import static com.ug.air.alrite.Fragments.Patient.Allergies.CHOICEY2;
-import static com.ug.air.alrite.Fragments.Patient.Assess.FINAL_DIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Assess.SEVERE_SYMPTOMS;
-import static com.ug.air.alrite.Fragments.Patient.Breathless.S5;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.BRONCHODILATOR_WAS_GIVEN;
+import static com.ug.air.alrite.Activities.PatientActivity.DIAGNOSES_ID;
+import static com.ug.air.alrite.Activities.PatientActivity.SUMMARY_ID;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DATE;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DURATION;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.FILENAME;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USED_BRONCHODILATOR;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USERNAME;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.PATIENT_ASSESSMENT_ID;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.CLINICIAN_USERNAME;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.UUIDS;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator2.BDIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator2.REASON;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.AFTER_BRONCHODILATOR;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.B3DIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.CHOICE7;
-import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.CHOICE72;
-import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.CIDIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.POINT;
-import static com.ug.air.alrite.Fragments.Patient.ChestIndrawing.POINT2;
-import static com.ug.air.alrite.Fragments.Patient.Cough.DIFFICULTY_BREATHING;
-import static com.ug.air.alrite.Fragments.Patient.Cough.NODIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.CoughD.DAY1;
-import static com.ug.air.alrite.Fragments.Patient.Eczema.CHOICEX2;
-import static com.ug.air.alrite.Fragments.Patient.FTouch.FTDIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.FTouch.TOUCH;
-import static com.ug.air.alrite.Fragments.Patient.HIVCare.CHOICEHC;
-import static com.ug.air.alrite.Fragments.Patient.HIVStatus.CHOICE3;
-import static com.ug.air.alrite.Fragments.Patient.HIVStatus.HDIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Initials.CHILD_INITIALS;
 import static com.ug.air.alrite.Fragments.Patient.Initials.INITIAL_DATE;
 import static com.ug.air.alrite.Fragments.Patient.Initials.PARENT_INITIALS;
-import static com.ug.air.alrite.Fragments.Patient.Kerosene.ADIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Kerosene.CHOICET2;
-import static com.ug.air.alrite.Fragments.Patient.Kerosene.TUDIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Nasal.CHOICEGN;
-import static com.ug.air.alrite.Fragments.Patient.Oxygen.OXY;
-import static com.ug.air.alrite.Fragments.Patient.RRCounter.FASTBREATHING;
-import static com.ug.air.alrite.Fragments.Patient.RRCounter.FASTBREATHING2;
-import static com.ug.air.alrite.Fragments.Patient.RRCounter.INITIAL_DATE_2;
-import static com.ug.air.alrite.Fragments.Patient.RRCounter.SECOND;
 import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_MONTHS;
 import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_YEARS;
 import static com.ug.air.alrite.Fragments.Patient.Sex.KILO;
-import static com.ug.air.alrite.Fragments.Patient.Sex.MDIAGNOSIS;
 import static com.ug.air.alrite.Fragments.Patient.Sex.MUAC;
 import static com.ug.air.alrite.Fragments.Patient.Sex.SEX;
-import static com.ug.air.alrite.Fragments.Patient.Smoke.CHOICET1;
-import static com.ug.air.alrite.Fragments.Patient.Stridor.CHOICE6;
-import static com.ug.air.alrite.Fragments.Patient.Temperature.TDIAGNOSIS;
-import static com.ug.air.alrite.Fragments.Patient.Temperature.TEMP;
-import static com.ug.air.alrite.Fragments.Patient.WheezD.CHOICEX;
-import static com.ug.air.alrite.Fragments.Patient.WheezY.DAY2;
-import static com.ug.air.alrite.Fragments.Patient.Wheezing.CHOICE82;
-import static com.ug.air.alrite.Fragments.Patient.Wheezing.WHEEZING_SOUNDS;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -87,16 +44,15 @@
 import com.ug.air.alrite.Models.Diagnosis;
 import com.ug.air.alrite.Models.Summary;
 import com.ug.air.alrite.R;
-import com.ug.air.alrite.Utils.Calculations.Instructions;
 import com.ug.air.alrite.Utils.Credentials;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.nio.file.Files;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -117,12 +73,10 @@ public class DiagnosisActivityModified extends AppCompatActivity {
     List<String> messages = new ArrayList<>();;
     List messageList = new ArrayList<>();;
     public static final String SHARED_PREFS = "sharedPrefs";
-    public static final String DATE_2 = "end_date_2";
-    public static final String PENDING = "pending";
-    public static final String DURATION_2 = "duration_2";
-    SharedPreferences sharedPreferences, sharedPreferences1;
-    SharedPreferences.Editor editor, editor1;
-    String ageInYears, uniqueID, ageInMonths, folder, isPending;
+    SharedPreferences summaryPrefs, diagnosesPrefs;
+    SharedPreferences.Editor summaryEditor, diagnosesEditor;
+    String summaryPrefsID, diagnosesPrefsID;
+    String ageInYears, ageInMonths, isPending;
     float ag;
     Dialog dialog;
     RecyclerView recyclerView;
@@ -153,17 +107,21 @@ protected void onCreate(Bundle savedInstanceState) {
         diagnosisListRV = findViewById(R.id.recyclerView2);
 
         // Get an editor for our shared preferences
-        sharedPreferences = getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
-        editor = sharedPreferences.edit();
+        summaryPrefsID = getIntent().getStringExtra(SUMMARY_ID);
+        summaryPrefs = getSharedPreferences(summaryPrefsID, Context.MODE_PRIVATE);
+        summaryEditor = summaryPrefs.edit();
+        diagnosesPrefsID = getIntent().getStringExtra(DIAGNOSES_ID);
+        diagnosesPrefs = getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+        diagnosesEditor = diagnosesPrefs.edit();
 
         // Save the patient's age, for reference in the diagnosis instructions
-        ageInMonths = sharedPreferences.getString(AGE_IN_MONTHS, "");
+        ageInMonths = summaryPrefs.getString(AGE_IN_MONTHS, "");
 
         // At the top of the page, display the patient's initials, age, and gender
-        String initials = sharedPreferences.getString(CHILD_INITIALS, "");
-        ageInYears = sharedPreferences.getString(AGE_IN_YEARS, "");
+        String initials = summaryPrefs.getString(CHILD_INITIALS, "");
+        ageInYears = summaryPrefs.getString(AGE_IN_YEARS, "");
         String[] ageInYearsSplit = ageInYears.split("\\.");
-        String gender = sharedPreferences.getString(SEX, "");
+        String gender = summaryPrefs.getString(SEX, "");
         txtInitials.setText(initials);
         txtAge.setText("Age: " + ageInYearsSplit[0] + " years and " + ageInYearsSplit[1] + " months");
         txtGender.setText("Gender: " + gender);
@@ -282,6 +240,13 @@ public void onClick(View v) {
 
     }
 
+    /**
+     * Create a list of all of the current diagnoses (in the future, this should
+     * happen within the diagnosis activity)
+     * TODO: implement gathering diagnosis in the editor, then in the app
+     *
+     * @return a list of diagnoses for the patient
+     */
     private List<Diagnosis> buildDiagnosisList() {
         List<Diagnosis> diagnosisList = new ArrayList<>();
         return diagnosisList;
@@ -299,21 +264,19 @@ private List<Assessment> buildSubItemList(String s) {
 
     private List<Summary> buildSummaryList(){
         summaryList = new ArrayList<>();
-        String pin = sharedPreferences.getString(PARENT_INITIALS, "");
-        String weight = sharedPreferences.getString(KILO, "");
-        String muac = sharedPreferences.getString(MUAC, "");
+        String pin = summaryPrefs.getString(PARENT_INITIALS, "");
+        String weight = summaryPrefs.getString(KILO, "");
+        String muac = summaryPrefs.getString(MUAC, "");
 
         addToSummaryList("Parent's initials", pin);
         addToSummaryList("Child's weight", weight);
         addToSummaryList("MUAC value", muac);
 
-        Map<String, ?> all = sharedPreferences.getAll();
+        Map<String, ?> all = summaryPrefs.getAll();
         System.out.println(all);
         for (Map.Entry<String, ?> x : all.entrySet()) {
-            String question = x.getKey();
-            if (question.substring(0, 3).equals("?: ")) {
-                addToSummaryList(question.substring(3), (String) x.getValue());
-            }
+            // TODO: prevent non-summary results from showing
+            addToSummaryList(x.getKey(), (String) x.getValue());
         }
 
         return summaryList;
@@ -332,71 +295,34 @@ private void addToDiagnosisList(String s) {
         }
     }
 
+    // TODO: implement logic for revisiting page upon the use of a bronchodilator
+    /**
+     * After confirming the information on the diagnosis page, we complete the assessment
+     * and move to the FinalActivity which confirms the collected information.
+     */
     private void saveForm() {
-
-        String file = sharedPreferences.getString(FILENAME, "");
-
+        // We get the current date and time
         Date currentTime = Calendar.getInstance().getTime();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss", Locale.getDefault());
         String formattedDate = df.format(currentTime);
+        enterDurationIntoSharedPrefs(currentTime);
 
+        // We get the current clinician's username
         Credentials credentials = new Credentials();
         String username = credentials.creds(DiagnosisActivityModified.this).getUsername();
 
-        uniqueID = UUID.randomUUID().toString();
-
-        if (file.isEmpty()){
-
-            getDuration(currentTime);
-
-            editor.putString(USERNAME, username);
-            editor.putString(DATE, formattedDate);
-            editor.putString(UUIDS, uniqueID);
-            editor.putString(PENDING, isPending);
-            editor.putString(ASSESS_INCOMPLETE, "complete");
-            editor.apply();
-
-            String filename = formattedDate + "_" + uniqueID;
-            editor.putString(FILENAME, filename);
-            editor.apply();
-//            Toast.makeText(this, "empty", Toast.LENGTH_SHORT).show();
-            doLogic(filename);
-        }else {
-            editor.putString(PENDING, isPending);
-            editor.putString(ASSESS_INCOMPLETE, "complete");
-            String filename = formattedDate + "_" + uniqueID;
-            editor.putString(FILENAME, filename);
-            editor.putString(DATE, formattedDate);
-            editor.apply();
-
-            getDuration2(currentTime);
-//            Toast.makeText(this, "not empty", Toast.LENGTH_SHORT).show();
-            doLogic(filename);
-        }
-
-    }
-
-    private void getDuration(Date currentTime) {
-        String initial_date = sharedPreferences.getString(INITIAL_DATE, "");
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss", Locale.getDefault());
-        try {
-            Date d1 = format.parse(initial_date);
-
-            long diff = currentTime.getTime() - d1.getTime();//as given
-
-            long minutes = TimeUnit.MILLISECONDS.toMinutes(diff);
-            String duration = String.valueOf(minutes);
-            editor.putString(DURATION, duration);
-            editor.apply();
-            Log.d("Difference in time", "getTimeDifference: " + minutes);
+        // Put the assessment info into the SharedPrefs
+        summaryEditor.putString(CLINICIAN_USERNAME, username);
+        summaryEditor.putString(DATE, formattedDate);
+        summaryEditor.apply();
 
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
+        // Go to the final activity, since we aren't using a bronchodilator and therefore
+        // aren't revisiting this page (currently)
+        startFinalActivity(summaryPrefsID);
     }
 
-    private void getDuration2(Date currentTime) {
-        String initial_date = sharedPreferences.getString(INITIAL_DATE_2, "");
+    private void enterDurationIntoSharedPrefs(Date currentTime) {
+        String initial_date = summaryPrefs.getString(INITIAL_DATE, "");
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss", Locale.getDefault());
         try {
             Date d1 = format.parse(initial_date);
@@ -405,8 +331,8 @@ private void getDuration2(Date currentTime) {
 
             long minutes = TimeUnit.MILLISECONDS.toMinutes(diff);
             String duration = String.valueOf(minutes);
-            editor.putString(DURATION_2, duration);
-            editor.apply();
+            summaryEditor.putString(DURATION, duration);
+            summaryEditor.apply();
             Log.d("Difference in time", "getTimeDifference: " + minutes);
 
         } catch (ParseException e) {
@@ -414,52 +340,10 @@ private void getDuration2(Date currentTime) {
         }
     }
 
-    private void doLogic(String file) {
-        // Create a new shared preferences object + editor
-        sharedPreferences1 = getSharedPreferences(file, Context.MODE_PRIVATE);
-        editor1 = sharedPreferences1.edit();
-
-        // Put all values from the current Shared Preferences object into the shared
-        // preferences for the given file
-        Map<String, ?> all = sharedPreferences.getAll();
-        for (Map.Entry<String, ?> x : all.entrySet()) {
-            if (x.getValue().getClass().equals(String.class))  editor1.putString(x.getKey(),  (String)x.getValue());
-//            else if (x.getValue().getClass().equals(Boolean.class)) editor1.putBoolean(x.getKey(), (Boolean)x.getValue());
-        }
-        editor1.commit();
-        editor.clear();
-        editor.commit();
-
-        String filename = sharedPreferences1.getString(SECOND, "");
-        if (!filename.isEmpty()){
-            filename = filename + ".xml";
-            File src = new File("/data/data/" + BuildConfig.APPLICATION_ID + "/shared_prefs/" + filename);
-            if (src.exists()){
-                src.delete();
-//                Toast.makeText(this, "filename", Toast.LENGTH_SHORT).show();
-            }else{
-//                Toast.makeText(this, "no file filename", Toast.LENGTH_SHORT).show();
-            }
-        }
-
-        String bron = sharedPreferences1.getString(USED_BRONCHODILATOR, "");
-        String fin = sharedPreferences1.getString(AFTER_BRONCHODILATOR, "");
-        Intent intent;
-        if (bron.equals("Bronchodialtor Given") && fin.isEmpty()){
-            intent = new Intent(DiagnosisActivityModified.this, Dashboard.class);
-        }else{
-            if (isPending.equals("not pending")){
-                intent = new Intent(DiagnosisActivityModified.this, FinalActivity.class);
-                intent.putExtra("filename", file);
-            }else {
-                editor1.putString(SECOND, file);
-                editor1.apply();
-                intent = new Intent(DiagnosisActivityModified.this, Dashboard.class);
-            }
-        }
-
-        startActivity(intent);
-
+    private void startFinalActivity(String file) {
+        Intent finalActivityIntent = new Intent(DiagnosisActivityModified.this, FinalActivity.class);
+        finalActivityIntent.putExtra("filename", file);
+        startActivity(finalActivityIntent);
     }
 
     @Override
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/FinalActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/FinalActivity.java
index 4d8cfae..422943e 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/FinalActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/FinalActivity.java
@@ -1,5 +1,9 @@
 package com.ug.air.alrite.Activities;
 
+import static com.ug.air.alrite.Activities.DiagnosisActivityModified.SHARED_PREFS;
+import static com.ug.air.alrite.Activities.PatientActivity.DIAGNOSES_ID;
+import static com.ug.air.alrite.Activities.PatientActivity.SUMMARY_ID;
+
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Context;
@@ -15,26 +19,34 @@
 
 import com.ug.air.alrite.R;
 
+import org.json.JSONObject;
+
+import java.util.Map;
+
 public class FinalActivity extends AppCompatActivity {
 
     CheckBox checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6, checkBox7, checkBox8, checkBox9, checkBox10, checkBox11, checkBox12, checkBox13, checkBox14;
     EditText etOther1, etOther2;
     Button btnSave;
-    String s1, s2, diagnosis, treatment, filename;
+    String s1, s2, diagnosis, treatment;
     public static final String S6 = "clinician_treatment";
     public static final String S7 = "clinician_diagnosis";
-    SharedPreferences sharedPreferences;
-    SharedPreferences.Editor editor;
+    SharedPreferences summaryPrefs, diagnosesPrefs;
+    SharedPreferences.Editor summaryEditor, diagnosesEditor;
+    String summaryPrefsID, diagnosesPrefsID;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_final);
 
-        filename = getIntent().getStringExtra("filename");
-
-        sharedPreferences = getSharedPreferences(filename, Context.MODE_PRIVATE);
-        editor = sharedPreferences.edit();
+        // Get an editor for our shared preferences
+        summaryPrefsID = getIntent().getStringExtra(SUMMARY_ID);
+        summaryPrefs = getSharedPreferences(summaryPrefsID, Context.MODE_PRIVATE);
+        summaryEditor = summaryPrefs.edit();
+        diagnosesPrefsID = getIntent().getStringExtra(DIAGNOSES_ID);
+        diagnosesPrefs = getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
+        diagnosesEditor = diagnosesPrefs.edit();
 
         btnSave = findViewById(R.id.btnExit);
         etOther1 = findViewById(R.id.otherText);
@@ -160,10 +172,11 @@ private void checkedList2() {
     }
 
     private void saveData() {
-        editor.putString(S7, s1);
-        editor.putString(S6, s2);
-        editor.apply();
-        editor.commit();
+        diagnosesEditor.putString(S7, s1);
+        diagnosesEditor.putString(S6, s2);
+        diagnosesEditor.commit();
+
+        // Finally, we can exit: go back to the dashboard home page
         startActivity(new Intent(FinalActivity.this, Dashboard.class));
         finish();
     }
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index fa5476b..93b53e8 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -4,8 +4,8 @@
 import static com.ug.air.alrite.Activities.DiagnosisActivity.DURATION_2;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DATE;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DURATION;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.FILENAME;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USERNAME;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.PATIENT_ASSESSMENT_ID;
+import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.CLINICIAN_USERNAME;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.UUIDS;
 import static com.ug.air.alrite.Fragments.Patient.Initials.CHILD_INITIALS;
 import static com.ug.air.alrite.Fragments.Patient.Initials.INITIAL_DATE;
@@ -38,7 +38,6 @@
 import com.ug.air.alrite.Fragments.Patient.ParagraphFragment;
 import com.ug.air.alrite.Fragments.Patient.SexModified;
 import com.ug.air.alrite.Fragments.Patient.TextInputFragment;
-import com.ug.air.alrite.Fragments.Patient.TextInputTextFragment;
 import com.ug.air.alrite.R;
 import com.ug.air.alrite.Utils.Credentials;
 
@@ -48,7 +47,6 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -68,8 +66,8 @@ public class PatientActivity extends AppCompatActivity implements
     public static final String INCOMPLETE = "incomplete";
 
     public static final String ASSESS_INCOMPLETE = "incomplete";
-    SharedPreferences sharedPreferences, sharedPreferences1;
-    SharedPreferences.Editor editor, editor1;
+    SharedPreferences sharedPreferences, sharedPreferences1, patientSummaryPrefs, patientDiagnosesPrefs;
+    SharedPreferences.Editor editor, editor1, patientSummaryEditor, patientDiagnosesEditor;
     int frag = 0;
 
     @Override
@@ -137,7 +135,7 @@ public void onClick(View view) {
                         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss", Locale.getDefault());
                         String formattedDate = df.format(currentTime);
 
-                        String file = sharedPreferences.getString(FILENAME, "");
+                        String file = sharedPreferences.getString(PATIENT_ASSESSMENT_ID, "");
 
                         Credentials credentials = new Credentials();
                         String username = credentials.creds(PatientActivity.this).getUsername();
@@ -149,7 +147,7 @@ public void onClick(View view) {
                             String uniqueID = UUID.randomUUID().toString();
 
                             editor.putString(DATE, formattedDate);
-                            editor.putString(USERNAME, username);
+                            editor.putString(CLINICIAN_USERNAME, username);
                             editor.putString(UUIDS, uniqueID);
                             editor.putString(INCOMPLETE, "incomplete");
                             editor.apply();
@@ -265,31 +263,29 @@ private void doLogic(String file) {
     public static final String LABEL = "label";
     public static final String CHOICES = "choices";
     public static final String TEXT = "text";
-    public static final String VALUE = "value";
     public static final String LINK = "link";
     public static final String CONTENT = "content";
     public static final String MULTIPLE_CHOICE = "MultipleChoice";
     public static final String TEXT_INPUT = "TextInput";
-    public static final String DIAGNOSIS_PAGE = "Diagnosis Page";
-    public static final String TITLE = "title";
     public static final String IS_DIAGNOSIS_PAGE = "isDiagnosisPage";
     public static final String NULL = "null";
     public static final String DEFAULT_LINK = "defaultLink";
     public static final String TARGET_VALUE_ID = "targetValueID";
     public static final String VALUE_ID = "valueID";
     public static final String SATISFIED_LINK = "satisfiedLink";
-    public static final String NOT_SATISFIED_LINK = "notSatisfiedLink";
     public static final String TYPE = "type";
     public static final String THRESHOLD = "threshold";
-    public static final String NUMERIC_TYPE = "numeric";
-    public static final String ALPHANUMERIC_TYPE = "alphanumeric";
-    public static final String TEXT_TYPE = "text";
-    public static final String ANY_TYPE = "any";
     public static final String PARAGRAPH = "Paragraph";
-    public static final String SYMPTOM_TYPE = "?: ";
+    public static final String META = "meta";
+    public static final String APIPATH = "apipath";
+    public static final String SUMMARY_ID = "SUMMARY_ID";
+    public static final String DIAGNOSES_ID = "DIAGNOSES_ID";
+
 
     // Full JSON infos to call getNextPage
     JSONArray pages;
+    String summaryPrefsID;
+    String diagnosesPrefsID;
 
     // Information gotten from JSON for the current page
     // Information gotten from JSON
@@ -300,12 +296,6 @@ private void doLogic(String file) {
     // Other than question there is more information needed
     // from the JSON for text input
     String inputType;
-    String inputHint; //The preview text shown in the input bubble (enter the value here)  *optional (prefer this not to be optional)
-    String inputInformation; //Extra stuff below the input bubble telling user more information (its in celcius) *optional
-    String skipInformation; //Text shown above the skip button telling user when to skip (no thermometer available) *optional
-    int minValue; //The minimum value allowed to be inputted
-    int maxValue; //The maximum value allowed to be inputted
-    int diagnosisCutoff; //The minimum value to be inputted in order to get the diagnosis
     public enum INPUT_TYPES {
         numeric,
         alphanumeric,
@@ -330,14 +320,39 @@ public enum COMPARISON_TYPES {
     String targetValueID; // for multiple selection
     String paragraph; //Content for paragraph fragment
 
+    /**
+     * Get the copy of the workflow that we have stored on the device and turn it
+     * into a JSONObject
+     */
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    public void getJSONFromBackend() {
+        File assessment = new File(getFilesDir(), "assessment.json");
+
+        try {
+            BufferedReader br = Files.newBufferedReader(assessment.toPath());
+            StringBuilder sb = new StringBuilder();
+            String line;
+            while ((line = br.readLine()) != null) {
+                sb.append(line);
+            }
+
+            String json = sb.toString();
+
+            br.close();
+
+            implementEditableDecisionTree(new JSONObject(json));
+        } catch (Exception e) {
+            System.out.println("did a bad: " + e);
+        }
+    }
+
     /**
      * This is the function that is called to set up the process of looping through
      * the pages until we get to the diagnosis page
      *
-     * @throws JSONException
-     * @throws IOException
+     * @throws JSONException for working with JSONObject
      */
-    private void implementEditableDecisionTree(JSONObject json) throws JSONException, IOException {
+    private void implementEditableDecisionTree(JSONObject json) throws JSONException {
         backstack = new ArrayList<>();
         pages = json.getJSONArray(PAGES);
 
@@ -345,7 +360,31 @@ private void implementEditableDecisionTree(JSONObject json) throws JSONException
         // its own element
         String nextPage = pages.getJSONObject(0).getString(PAGE_ID);
 
-        // Handling the intent
+        // Create a shared preferences object for the current patient
+        // TODO: better security for the SharedPreferences
+        String patientInfoID = createUniquePatientInfoID();
+        summaryPrefsID = patientInfoID + "_Summary";
+        diagnosesPrefsID = patientInfoID + "_Diagnoses";
+
+        patientSummaryPrefs = getSharedPreferences(summaryPrefsID, Context.MODE_PRIVATE);
+        patientSummaryEditor = patientSummaryPrefs.edit();
+        patientSummaryEditor.putString(SUMMARY_ID, summaryPrefsID);
+        patientSummaryEditor.putString(APIPATH, json.getJSONObject(META).getString(APIPATH));
+        patientSummaryEditor.apply();
+
+        patientDiagnosesPrefs = getSharedPreferences(diagnosesPrefsID, Context.MODE_PRIVATE);
+        patientDiagnosesEditor = patientDiagnosesPrefs.edit();
+        patientDiagnosesEditor.putString(DIAGNOSES_ID, diagnosesPrefsID);
+        patientDiagnosesEditor.apply();
+
+        // Clear out the old editor so that it can be used again for a new patient
+        Map<String, ?> currPatientInfos = sharedPreferences.getAll();
+        for (String info : currPatientInfos.keySet()) {
+            patientSummaryEditor.putString(info, (String) currPatientInfos.get(info));
+        }
+        patientSummaryEditor.apply();
+        editor.clear();
+        editor.apply();
 
         // Continue looping through each page in sequence: depending on the component,
         // inflate a new fragment for that component type
@@ -402,60 +441,29 @@ private void getNextPage(String nextPageID) throws JSONException {
         JSONObject nextPageComponent = nextPageContent.getJSONObject(contentIndex);
         String nextPageComponentType = nextPageComponent.getString(COMPONENT);
 
-        switch (nextPageComponentType) {
+        if (nextPageComponentType.equals(MULTIPLE_CHOICE)) {
             // Multiselect and multiple choice options:
-            case MULTIPLE_CHOICE:
-                boolean isMultiSelect = nextPageComponent.getBoolean(MULTISELECT);
-                String valueID = getValueID(nextPageJSON, contentIndex);
-                if (isMultiSelect) {
-                    createMultiSelectFragment(nextPageComponent, valueID);
-                } else {
-                    createMultipleChoiceFragment(nextPageComponent, valueID);
-                }
-                break;
-
-            // Text input option:
-            case TEXT_INPUT:
-                valueID = getValueID(nextPageJSON, contentIndex);
-                createTextInputFragment(nextPageComponent, valueID);
-                break;
-
-            // Paragraph option:
-            case PARAGRAPH:
-                createParagraphFragment(nextPageComponent);
-                break;
-
-            // There was an issue with identifying the page... just go to the next page instead
-            default:
-                System.out.println("should never get here lol: just go to the next page");
-                getNextPage(nextPageJSON.getString(DEFAULT_LINK));
-                break;
-        }
-    }
-
-    /**
-     * Get the copy of the workflow that we have stored on the device and turn it
-     * into a JSONObject
-     */
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    public void getJSONFromBackend() {
-        File assessment = new File(getFilesDir(), "assessment.json");
-
-        try {
-            BufferedReader br = Files.newBufferedReader(assessment.toPath());
-            StringBuilder sb = new StringBuilder();
-            String line;
-            while ((line = br.readLine()) != null) {
-                sb.append(line);
+            boolean isMultiSelect = nextPageComponent.getBoolean(MULTISELECT);
+            String valueID = getValueID(nextPageJSON, contentIndex);
+            if (isMultiSelect) {
+                createMultiSelectFragment(nextPageComponent, valueID);
+            } else {
+                createMultipleChoiceFragment(nextPageComponent, valueID);
             }
 
-            String json = sb.toString();
+        // Text input option:
+        } else if (nextPageComponentType.equals(TEXT_INPUT)) {
+            String valueID = getValueID(nextPageJSON, contentIndex);
+            createTextInputFragment(nextPageComponent, valueID);
 
-            br.close();
+        // Paragraph option:
+        } else if (nextPageComponentType.equals(PARAGRAPH)) {
+            createParagraphFragment(nextPageComponent);
 
-            implementEditableDecisionTree(new JSONObject(json));
-        } catch (Exception e) {
-            System.out.println("did a bad: " + e);
+        // There was an issue with identifying the page... just go to the next page instead
+        } else {
+            System.out.println("should never get here lol: just go to the next page");
+            getNextPage(nextPageJSON.getString(DEFAULT_LINK));
         }
     }
 
@@ -464,7 +472,11 @@ public void getJSONFromBackend() {
      * the activity.
      */
     private void exitActivity() {
-        startActivity(new Intent(PatientActivity.this, DiagnosisActivityModified.class));
+        Intent intent = new Intent(PatientActivity.this, DiagnosisActivityModified.class);
+        intent.putExtra(SUMMARY_ID, summaryPrefsID);
+        intent.putExtra(DIAGNOSES_ID, diagnosesPrefsID);
+
+        startActivity(intent);
         this.finish();
     }
 
@@ -490,7 +502,8 @@ private void createMultipleChoiceFragment(JSONObject nextPageComponent, String v
 
         // Get the new page's fragment, and set a listener for when the next button
         // is clicked
-        MultipleChoiceFragment mc_fragment = MultipleChoiceFragment.newInstance(question, choices, valueID);
+        MultipleChoiceFragment mc_fragment =
+                MultipleChoiceFragment.newInstance(question, choices, valueID, summaryPrefsID);
 
         // Replace and commit the fragment
         completeFragmentTransaction(mc_fragment);
@@ -509,7 +522,8 @@ private void createTextInputFragment(JSONObject nextPageComponent, String valueI
 
         // Get the new page's fragment, and set a listener for when the next button
         // is clicked
-        TextInputFragment ti_fragment = TextInputFragment.newInstance(question, inputType, valueID);
+        TextInputFragment ti_fragment =
+                TextInputFragment.newInstance(question, inputType, valueID, summaryPrefsID);
 
         // Replace and commit the fragment
         completeFragmentTransaction(ti_fragment);
@@ -520,18 +534,20 @@ private void createTextInputFragment(JSONObject nextPageComponent, String valueI
      *
      * @throws JSONException because we use json objects
      */
-    private void createMultiSelectFragment(JSONObject page) throws JSONException {
+    private void createMultiSelectFragment(JSONObject page, String valueID) throws JSONException {
         question = page.getString(LABEL);
         choices = JSONArrayToListOfJSONObjects(page.getJSONArray(CHOICES));
         targetValueID = page.getString(VALUE_ID);
 
         // Get the new page's fragment
         // set a listener for when the next button is clicked
-        MultipleSelectionFragment ms_fragment = MultipleSelectionFragment.newInstance(question, choices);
+        MultipleSelectionFragment ms_fragment =
+                MultipleSelectionFragment.newInstance(question, choices, valueID, summaryPrefsID);
 
         // Replace and commit the fragment
         completeFragmentTransaction(ms_fragment);
     }
+
     /**
      * Create the ParagraphFragment
      *
@@ -621,10 +637,10 @@ public void getResultFromTextInputFragment(String inputted) throws JSONException
         // Next, we get the type of the object that was passed up from the TextInput:
         // was it a number, or a string?
         if (inputType.equals(INPUT_TYPES.numeric.name())) {
+            // If it was a number, we can then go through and run all of the comparison types for
+            // each comparison logic component
             Float diagnosis = Float.valueOf(inputted);
             if(!foundLinks.isEmpty()) {
-                // Replace BranchedLink with whatever the name is for the link field
-                // once the branched link logic is completed in the JSON file
                 for (JSONObject foundLink : foundLinks) {
                     String compType = foundLink.getString(TYPE);
                     float threshold = Float.parseFloat(foundLink.getString(THRESHOLD));
@@ -638,11 +654,30 @@ public void getResultFromTextInputFragment(String inputted) throws JSONException
                         break;
                     }
                 }
-                enterSymptomIntoEditor(nextPageJSON, String.valueOf(diagnosis));
             }
+            enterSymptomIntoEditor(nextPageJSON, String.valueOf(diagnosis));
         } else {
             // In the case that we're comparing strings, we'll compare equality with .equals,
-            // and everything else with strict < or >
+            // and the other ones it doesn't make sense to compare, so we'll just say that
+            // it doesn't work
+            if(!foundLinks.isEmpty()) {
+                for (JSONObject foundLink : foundLinks) {
+                    String compType = foundLink.getString(TYPE);
+                    String other = foundLink.getString(THRESHOLD);
+                    // all cases where equals is included
+                    if ((compType.equals(COMPARISON_TYPES.GE.symbol) ||
+                        compType.equals(COMPARISON_TYPES.LE.symbol) ||
+                        compType.equals(COMPARISON_TYPES.EQ.symbol)) &&
+                        inputted.equals(other)) {
+
+                        nextPage = foundLink.getString(SATISFIED_LINK);
+                        break;
+
+                    // If we don't have an equals, just go to the default page
+                    }
+                }
+            }
+            enterSymptomIntoEditor(nextPageJSON, inputted);
         }
 
         // Finally, we go to the decided next page
@@ -766,8 +801,8 @@ private int findIndexInPagesGivenPageId(String pageID) throws JSONException {
      */
     public void enterSymptomIntoEditor(JSONObject page, String symptom) throws JSONException {
         // Enter the diagnosis into the editor
-        editor.putString(SYMPTOM_TYPE + getValueID(page, 0), symptom);
-        editor.apply();
+        patientSummaryEditor.putString(getValueID(page, 0), symptom);
+        patientSummaryEditor.apply();
     }
 
     /**
@@ -780,4 +815,19 @@ public void enterSymptomIntoEditor(JSONObject page, String symptom) throws JSONE
     public String getValueID(JSONObject page, int contentIndex) throws JSONException {
         return page.getJSONArray(CONTENT).getJSONObject(contentIndex).getString(VALUE_ID);
     }
+
+    /**
+     * Create a unique ID which is used for uniquely storing patient data on the
+     * current device
+     *
+     * @return the unique ID
+     */
+    public String createUniquePatientInfoID() {
+        String patientInitials = sharedPreferences.getString(CHILD_INITIALS, "");
+        Date currentTime = Calendar.getInstance().getTime();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss", Locale.getDefault());
+        String formattedDate = df.format(currentTime);
+
+        return patientInitials + "_" + formattedDate;
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
index 38b7bbf..60a02bf 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
@@ -1,10 +1,7 @@
 package com.ug.air.alrite.Activities;
 
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.REASSESS;
-
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.FragmentTransaction;
 
 import android.content.Context;
 import android.content.Intent;
@@ -13,17 +10,15 @@
 import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.os.Handler;
-import android.util.Log;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.animation.AlphaAnimation;
 import android.widget.LinearLayout;
 
 import com.ug.air.alrite.APIs.ApiClient;
-import com.ug.air.alrite.APIs.DecisionTreeJSON;
+import com.ug.air.alrite.APIs.BackendRequests;
 import com.ug.air.alrite.BuildConfig;
 import com.ug.air.alrite.Database.DatabaseHelper;
-import com.ug.air.alrite.Fragments.navigation.AccountFragment;
 import com.ug.air.alrite.R;
 import com.ug.air.alrite.Utils.Counter;
 import com.ug.air.alrite.Utils.Credentials;
@@ -36,18 +31,10 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
 
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
-import retrofit2.http.GET;
 
 public class SplashActivity extends AppCompatActivity {
 
@@ -149,7 +136,7 @@ private void checkDatabase() {
 
     private void getCurrentAssessmentIfConnectedToInternet() {
         if (isNetworkAvailable() && shouldGetNewAssessment) {
-            DecisionTreeJSON dtJson = ApiClient.getClient(ApiClient.REMOTE_URL_TEMP).create(DecisionTreeJSON.class);
+            BackendRequests dtJson = ApiClient.getClient(ApiClient.REMOTE_URL_TEMP).create(BackendRequests.class);
             Call<String> call = dtJson.getJson("test");
             call.enqueue(new Callback<String>() {
                 @Override
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator.java
index b94a2d9..9804741 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/Bronchodilator.java
@@ -71,9 +71,9 @@ public class Bronchodilator extends Fragment {
     SharedPreferences sharedPreferences, sharedPreferences2;
     SharedPreferences.Editor editor, editor2;
     public static final String DATE = "end_date";
-    public static final String FILENAME = "filename";
+    public static final String PATIENT_ASSESSMENT_ID = "filename";
     public static final String UUIDS = "patient_uuid";
-    public static final String USERNAME = "clinician";
+    public static final String CLINICIAN_USERNAME = "clinician";
     public static final String DURATION = "duration";
     TextView txtDisease, txtDefinition, txtOk, txtDiagnosis;
     LinearLayout linearLayoutDisease;
@@ -239,7 +239,7 @@ private void startBackGroundTask() {
 
         Credentials credentials = new Credentials();
         String username = credentials.creds(getActivity()).getUsername();
-        editor.putString(USERNAME, username);
+        editor.putString(CLINICIAN_USERNAME, username);
 
         uniqueID = UUID.randomUUID().toString();
 
@@ -247,7 +247,7 @@ private void startBackGroundTask() {
         editor.putString(UUIDS, uniqueID);
 
         filename = formattedDate + "_" + uniqueID;
-        editor.putString(FILENAME, filename);
+        editor.putString(PATIENT_ASSESSMENT_ID, filename);
         editor.apply();
 
         Data inputData = new Data.Builder()
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/InitialsModified.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/InitialsModified.java
index be4a8bd..2426589 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/InitialsModified.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/InitialsModified.java
@@ -57,26 +57,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         back = view.findViewById(R.id.back);
 
         Intent intent = getActivity().getIntent();
-        // If ____, then we can combine the data for
-        // Otherwise, just get the current activity's shared preferences
-        if (intent.hasExtra("filename")) {
-            filename = intent.getExtras().getString("filename");
-            sharedPreferences1 = requireActivity().getSharedPreferences(filename, Context.MODE_PRIVATE);
-            sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
-            editor = sharedPreferences.edit();
-            Map<String, ?> all = sharedPreferences1.getAll();
-            for (Map.Entry<String, ?> x : all.entrySet()) {
-                if (x.getValue().getClass().equals(String.class))  editor.putString(x.getKey(),  (String)x.getValue());
-            }
-            editor.commit();
-            editor.putString(SECOND, filename);
-            editor.apply();
-
-        } else {
-            sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
-        }
-
-        // Get an editor for the shared preferences
+        sharedPreferences = requireActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
         editor = sharedPreferences.edit();
 
         // Get the parent's initials and the child's initials and store them in
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
index 176c5f0..ffb538e 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
@@ -1,6 +1,6 @@
 package com.ug.air.alrite.Fragments.Patient;
 
-import static com.ug.air.alrite.Activities.PatientActivity.SYMPTOM_TYPE;
+import static com.ug.air.alrite.Activities.PatientActivity.SUMMARY_ID;
 import static com.ug.air.alrite.Activities.PatientActivity.VALUE_ID;
 
 import android.app.Activity;
@@ -44,6 +44,7 @@ public interface onGetResultListener {
     String question;
     ArrayList<String> choices;
     String valueID;
+    String summaryPrefsID;
     View view;
     RadioGroup choiceGroup;
     ArrayList<RadioButton> choiceButtonList;
@@ -76,13 +77,14 @@ public void onAttach(Activity activity) {
      * @param choices the given choices for the user to choose from
      * @return the fragment to be used in the future
      */
-    public static MultipleChoiceFragment newInstance(String question, ArrayList<JSONObject> choices, String valueID) throws JSONException {
+    public static MultipleChoiceFragment newInstance(String question, ArrayList<JSONObject> choices, String valueID, String summaryPrefsID) throws JSONException {
         MultipleChoiceFragment mfc = new MultipleChoiceFragment();
         Bundle args = new Bundle();
         args.putString(QUESTION, question);
         ArrayList<String> text_choices = getTextFromChoices(choices);
         args.putStringArrayList(CHOICES, text_choices);
         args.putString(VALUE_ID, valueID);
+        args.putString(SUMMARY_ID, summaryPrefsID);
         mfc.setArguments(args);
         return mfc;
     }
@@ -100,6 +102,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         question = getArguments().getString(QUESTION);
         choices = getArguments().getStringArrayList(CHOICES);
         valueID = getArguments().getString(VALUE_ID);
+        summaryPrefsID = getArguments().getString(SUMMARY_ID);
 
         // Then, set the information for each question/choice to line up with our givens
         TextView questionDisplay = view.findViewById(R.id.mc_question);
@@ -176,8 +179,9 @@ public void onClick(View view) {
      * don't get inconsistent answers from this
      */
     private void loadSelectedChoiceIfAlreadySelected() {
-        SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
-        previousResponse = sharedPreferences.getString(SYMPTOM_TYPE + valueID, DEFAULT);
+        SharedPreferences sharedPreferences =
+                this.getActivity().getSharedPreferences(summaryPrefsID, Context.MODE_PRIVATE);
+        previousResponse = sharedPreferences.getString(valueID, DEFAULT);
 
         for (int i = 0; i < choices.size(); i++) {
             if (previousResponse.equals(choices.get(i))) {
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
index 2b3c132..a41c4f4 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
@@ -1,6 +1,6 @@
 package com.ug.air.alrite.Fragments.Patient;
 
-import static com.ug.air.alrite.Activities.PatientActivity.SYMPTOM_TYPE;
+import static com.ug.air.alrite.Activities.PatientActivity.SUMMARY_ID;
 import static com.ug.air.alrite.Activities.PatientActivity.VALUE_ID;
 
 import android.app.Activity;
@@ -41,6 +41,7 @@ public interface onGetResultListener {
     public static final String DEFAULT = "**default string**";
     public static final String VALUE_ID = "valueID";
     String valueID;
+    String summaryPrefsID;
     String previousResponse;
     String question;
     ArrayList<String> choices; // list of the texts of the checkboxes
@@ -75,13 +76,14 @@ public void onAttach(Activity activity) {
      * @param choices the given choices for the user to choose from
      * @return the fragment to be used in the future
      */
-    public static MultipleSelectionFragment newInstance(String question, ArrayList<JSONObject> choices, String valueID) throws JSONException {
+    public static MultipleSelectionFragment newInstance(String question, ArrayList<JSONObject> choices, String valueID, String summaryPrefsID) throws JSONException {
         MultipleSelectionFragment msc = new MultipleSelectionFragment();
         Bundle args = new Bundle();
         args.putString(QUESTION, question);
         ArrayList<String> text_choices = getTextFromChoices(choices);
         args.putStringArrayList(CHOICES, text_choices);
         args.putString(VALUE_ID, valueID);
+        args.putString(SUMMARY_ID, summaryPrefsID);
         msc.setArguments(args);
         return msc;
     }
@@ -98,6 +100,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         question = getArguments().getString(QUESTION);
         choices = getArguments().getStringArrayList(CHOICES); // list of strings
         valueID = getArguments().getString(VALUE_ID);
+        summaryPrefsID = getArguments().getString(SUMMARY_ID);
 
         // Then, set the information for each question/choice to line up with our givens
         TextView questionDisplay = view.findViewById(R.id.mc_question);
@@ -186,8 +189,8 @@ public void onClick(View view) {
      * don't get inconsistent answers from this.
      */
     private void loadSelectedChoicesIfAlreadySelected() {
-        SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
-        previousResponse = sharedPreferences.getString(SYMPTOM_TYPE + valueID, DEFAULT);
+        SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(summaryPrefsID, Context.MODE_PRIVATE);
+        previousResponse = sharedPreferences.getString(valueID, DEFAULT);
         String[] selectedOptionsHistory = previousResponse.split("\n"); // split by \n
 
 
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java
index 9df7b9d..82dd68e 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java
@@ -2,6 +2,7 @@
 
 import static android.content.Context.MODE_PRIVATE;
 import static com.ug.air.alrite.Activities.DiagnosisActivity.PENDING;
+import static com.ug.air.alrite.Activities.PatientActivity.APIPATH;
 import static com.ug.air.alrite.Activities.PatientActivity.ASSESS_INCOMPLETE;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DATE;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USED_BRONCHODILATOR;
@@ -11,10 +12,14 @@
 import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_YEARS;
 import static com.ug.air.alrite.Fragments.Patient.Sex.SEX;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
@@ -22,7 +27,6 @@
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -33,6 +37,7 @@
 import android.widget.Toast;
 
 import com.ug.air.alrite.APIs.ApiClient;
+import com.ug.air.alrite.APIs.BackendRequests;
 import com.ug.air.alrite.APIs.JsonPlaceHolder;
 import com.ug.air.alrite.Activities.DiagnosisActivity;
 import com.ug.air.alrite.Activities.PatientActivity;
@@ -42,18 +47,35 @@
 import com.ug.air.alrite.Models.History;
 import com.ug.air.alrite.Models.Item;
 import com.ug.air.alrite.R;
+import com.ug.air.alrite.Utils.BackendPostRequest;
 import com.ug.air.alrite.Utils.Credentials;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.nio.file.Files;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
+import io.reactivex.Observable;
+import io.reactivex.Scheduler;
+import io.reactivex.functions.Consumer;
+import io.reactivex.functions.Function;
+import io.reactivex.schedulers.Schedulers;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
+import okhttp3.internal.concurrent.TaskRunner;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -120,13 +142,7 @@ public void onRefresh() {
             public void onItemClick(int position) {
                 History history = (History) items.get(position).getObject();
                 String name = history.getFilename();
-                String incomplete = history.getIncomplete();
-                if (incomplete.equals("incomplete")){
-                    intent = new Intent(getActivity(), PatientActivity.class);
-                    intent.putExtra("Fragment", 1);
-                }else {
-                    intent = new Intent(getActivity(), DiagnosisActivity.class);
-                }
+                intent = new Intent(getActivity(), DiagnosisActivity.class);
 
                 intent.putExtra("filename", name);
                 startActivity(intent);
@@ -137,7 +153,17 @@ public void onItemClick(int position) {
         btnSubmit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                submitData();
+                if (isNetworkAvailable()) {
+                    try {
+                        sendAllCompletedAssessmentDataToBackend();
+                    } catch (JSONException e) {
+                        throw new RuntimeException(e);
+                    }
+                } else {
+                    Toast.makeText(getActivity(),
+                            "Please connect to the internet before submitting.",
+                            Toast.LENGTH_SHORT).show();
+                }
             }
         });
 
@@ -200,68 +226,163 @@ private void accessSharedFile2(){
         }
     }
 
-    private void submitData() {
+    @SuppressLint("CheckResult")
+    private void sendAllCompletedAssessmentDataToBackend() throws JSONException {
+        // Stop user from doing anything to mess this up and show them a progress bar
         progressBar.setVisibility(View.VISIBLE);
         btnSubmit.setEnabled(false);
-        Credentials credentials = new Credentials();
-        Cursor res = databaseHelper.getData("1");
-        while (res.moveToNext()){
-            token =  res.getString(2);
+
+        // Get the data with ID = 1 from the local user database, and get the token in that data
+        Cursor localUserData = databaseHelper.getData("1");
+        localUserData.moveToNext();
+        token =  localUserData.getString(2);
+
+        // Get the folder of all current assessments that have not been sent to the backend
+        ArrayList<String> assessmentsToBeSent = getValidAssessments();
+
+        // For every pair of patient info, turn them into proper JSONObjects and
+        // put them in the array to be sent to the backend
+        HashMap<BackendPostRequest, String> requestToApipath = new HashMap<>();
+
+        // Create requests for each pair of patient info
+        for (int i = 0; i < assessmentsToBeSent.size(); i+=2) {
+            String diagnosesIDxml = assessmentsToBeSent.get(i);
+            String diagnosesID = diagnosesIDxml.substring(0, diagnosesIDxml.length() - 4);
+            String summaryIDxml = assessmentsToBeSent.get(i+1);
+            String summaryID = summaryIDxml.substring(0, summaryIDxml.length() - 4);
+            SharedPreferences diagnosesPrefs = getContext().getSharedPreferences(diagnosesID, MODE_PRIVATE);
+            SharedPreferences summaryPrefs = getContext().getSharedPreferences(summaryID, MODE_PRIVATE);
+
+            // TODO: implement diagnoses stuff later
+            diagnosesPrefs.edit().clear().apply();
+
+            // Get all items from the shared preferences object and create a request with them
+            String apipath = "";
+            Map<String, ?> summaryPrefItems = summaryPrefs.getAll();
+            HashMap<String, String> summaryPrefMap = new HashMap<>();
+            for (String item : summaryPrefItems.keySet()) {
+                if (item.equals(APIPATH)) {
+                    apipath = item;
+                } else {
+                    summaryPrefMap.put(item, (String) summaryPrefItems.get(item));
+                }
+            }
+            summaryPrefs.edit().clear().apply();
+
+            BackendPostRequest nextRequest = new BackendPostRequest(summaryPrefMap, "");
+            requestToApipath.put(nextRequest, apipath);
         }
-        File src = new File("/data/data/" + BuildConfig.APPLICATION_ID + "/shared_prefs");
-        if (src.exists()){
-            contents = src.listFiles();
-            if (contents.length != 0) {
-                for (File f : contents) {
-                    if (f.isFile()) {
-                        String name = f.getName();
-                        if (!name.equals("sharedPrefs.xml") && !name.equals("counter_file.xml")) {
-                            String names = name.replace(".xml", "");
-                            SharedPreferences sharedPreferences = requireActivity().getSharedPreferences(names, MODE_PRIVATE);
-                            SharedPreferences.Editor editor = sharedPreferences.edit();
-                            String bron = sharedPreferences.getString(USED_BRONCHODILATOR, "");
-                            String fin = sharedPreferences.getString(AFTER_BRONCHODILATOR, "");
-                            String pending = sharedPreferences.getString(PENDING, "");
-                            String incomplete = sharedPreferences.getString(ASSESS_INCOMPLETE, "");
-
-                            if (!pending.equals("pending") && (bron.isEmpty() || bron.equals("Bronchodialtor Not Given") || !fin.isEmpty())){
-                                File patient = new File("/data/data/" + BuildConfig.APPLICATION_ID + "/shared_prefs/" + name);
-                                RequestBody filePart = RequestBody.create(MediaType.parse("*/*"), patient);
-                                MultipartBody.Part fileUpload = MultipartBody.Part.createFormData("patient", patient.getName() ,filePart);
-
-                                Call<String> call = jsonPlaceHolder.sendFile("Token " + token, fileUpload);
-                                call.enqueue(new Callback<String>() {
-                                    @Override
-                                    public void onResponse(Call<String> call, Response<String> response) {
-                                        if (!response.isSuccessful()){
-                                            Log.d("Alrite server issue", "There is an issue with the server" );
-                                            return;
-                                        }
-                                        String message = response.body();
-                                        Log.d("Alrite app: ", "Sever response: " + message);
-                                        patient.delete();
-                                    }
-
-                                    @Override
-                                    public void onFailure(Call<String> call, Throwable t) {
-                                        Log.d("Alrite server issue", "No internet connection" );
-//                                    Toast.makeText(getActivity(), "Please turn on your internet connection", Toast.LENGTH_SHORT).show();
-                                    }
-                                });
-                            }
+        System.out.println(requestToApipath);
 
-                        }
+        // We'll chunk all of the requests and send them to the backend: if there
+        // were any that didn't go through, we'll not delete the files so that the
+        // user can try again.
+        BackendRequests backendRequests = ApiClient.getClient(ApiClient.REMOTE_URL_TEMP)
+                .create(BackendRequests.class);
+        List<Observable<?>> requests = new ArrayList<>();
+        for (BackendPostRequest currRequest : requestToApipath.keySet()) {
+            String apipath = requestToApipath.get(currRequest);
+            requests.add(backendRequests.postToBackend(currRequest));
+        }
+
+        Observable.zip(
+            requests,
+            (s -> s))
+            .subscribeOn(Schedulers.io())
+            .subscribe(
+                // Will be triggered if all requests will end successfully (4xx and 5xx also are successful requests too)
+                new Consumer<Object>() {
+                    @Override
+                    public void accept(Object o) throws Exception {
+                        // On success tell the user we're ok
+                        System.out.println(o);
+
+                        progressBar.setVisibility(View.GONE);
+                        btnSubmit.setEnabled(true);
+                    }
+                },
+
+                // Will be triggered if any error during requests will happen
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable e) throws Exception {
+                        System.out.println("there was an error getting requests: " + e);
+                        progressBar.setVisibility(View.GONE);
+                        btnSubmit.setEnabled(true);
                     }
                 }
-                progressBar.setVisibility(View.GONE);
-                btnSubmit.setEnabled(true);
-            }else {
-                progressBar.setVisibility(View.GONE);
-                btnSubmit.setEnabled(true);
+            );
+    }
+
+    private ArrayList<String> getValidAssessments() {
+        ArrayList<String> assessmentsToBeSent = new ArrayList<>();
+
+        File assessments = new File("/data/data/" + BuildConfig.APPLICATION_ID + "/shared_prefs");
+        File[] assessmentsList = assessments.listFiles();
+        // if no files in the folder, send nothing back
+        if (assessmentsList == null) {
+            return assessmentsToBeSent;
+        }
+
+        // Validate files
+        for (File assessment : assessmentsList) {
+            // If this is not a file, skip
+            if (!assessment.isFile()) {
+                System.out.println("not a file!");
+                continue;
+            }
+
+            // If the file is a permanent tracker file, skip
+            String filename = assessment.getName();
+            if (filename.equals("sharedPrefs.xml") || filename.equals("counter_file.xml")) {
+                System.out.println("Permanent file: don't send to backend");
+                continue;
             }
-        }else {
-            progressBar.setVisibility(View.GONE);
-            btnSubmit.setEnabled(true);
+
+            // Otherwise, we're good to send it to the backend! Add the file to
+            // the list of files to send to the backend
+            assessmentsToBeSent.add(filename);
+        }
+
+        // Sort the files, so that summary and diagnosis are next to each other
+        Collections.sort(assessmentsToBeSent);
+        return assessmentsToBeSent;
+    }
+
+    private boolean isNetworkAvailable() {
+        ConnectivityManager connectivityManager
+                = (ConnectivityManager) getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo activeNetworkInfo = connectivityManager != null ? connectivityManager.getActiveNetworkInfo() : null;
+        return activeNetworkInfo != null && activeNetworkInfo.isConnected();
+    }
+
+    private void deleteLocalPatientFiles() {
+        File assessments = new File("/data/data/" + BuildConfig.APPLICATION_ID + "/shared_prefs");
+        File[] assessmentsList = assessments.listFiles();
+        // if no files in the folder, send nothing back
+        if (assessmentsList == null) {
+            return;
+        }
+
+        // Validate files
+        for (File assessment : assessmentsList) {
+            // If this is not a file, skip
+            if (!assessment.isFile()) {
+                System.out.println("not a file!");
+                continue;
+            }
+
+            // If the file is a permanent tracker file, skip
+            String filename = assessment.getName();
+            if (filename.equals("sharedPrefs.xml") || filename.equals("counter_file.xml")) {
+                System.out.println("Permanent file: don't send to backend");
+                continue;
+            }
+
+            // Otherwise, we're good to send it to the backend! Add the file to
+            // the list of files to send to the backend
+            //assessment.delete();
+            System.out.println("fake delete file");
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
index 07f4859..d899a37 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
@@ -1,6 +1,6 @@
 package com.ug.air.alrite.Fragments.Patient;
 
-import static com.ug.air.alrite.Activities.PatientActivity.SYMPTOM_TYPE;
+import static com.ug.air.alrite.Activities.PatientActivity.SUMMARY_ID;
 import static com.ug.air.alrite.Fragments.Patient.FTouch.TOUCH;
 import static com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment.DEFAULT;
 import static com.ug.air.alrite.Fragments.Patient.MultipleChoiceFragment.VALUE_ID;
@@ -57,6 +57,7 @@ public interface onGetResultListener {
     String question;
     String inputType;
     String valueID;
+    String summaryPrefsID;
     int MinValue;
     int MaxValue;
     int diagnosisCutoff;
@@ -67,11 +68,13 @@ public interface onGetResultListener {
      * @param question the question at the top of the page
      * @return the fragment to be used in the future
      */
-    public static TextInputFragment newInstance(String question, String inputType, String valueID) throws JSONException {
+    public static TextInputFragment newInstance(String question, String inputType, String valueID, String summaryPrefsID) {
         TextInputFragment tif = new TextInputFragment();
         Bundle args = new Bundle();
         args.putString(QUESTION, question);
         args.putString(INPUT_TYPE, inputType);
+        args.putString(VALUEID, valueID);
+        args.putString(SUMMARY_ID, summaryPrefsID);
         tif.setArguments(args);
         return tif;
 }
@@ -89,6 +92,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         question = getArguments().getString(QUESTION);
         inputType = getArguments().getString(INPUT_TYPE);
         valueID = getArguments().getString(VALUEID);
+        summaryPrefsID = getArguments().getString(SUMMARY_ID);
 
         TextView questionDisplay = view.findViewById(R.id.ti_question);
         questionDisplay.setText(question);
@@ -205,8 +209,8 @@ private void saveData() {
      * don't get inconsistent answers from this
      */
     private void loadSelectedChoiceIfAlreadySelected() {
-        SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(SHARED_PREFS, Context.MODE_PRIVATE);
-        String previousResponse = sharedPreferences.getString(SYMPTOM_TYPE + valueID, DEFAULT);
+        SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(summaryPrefsID, Context.MODE_PRIVATE);
+        String previousResponse = sharedPreferences.getString(valueID, "");
 
         etDay.setText(previousResponse);
     }
diff --git a/app/src/main/java/com/ug/air/alrite/Utils/BackendPostRequest.java b/app/src/main/java/com/ug/air/alrite/Utils/BackendPostRequest.java
new file mode 100644
index 0000000..c771a1a
--- /dev/null
+++ b/app/src/main/java/com/ug/air/alrite/Utils/BackendPostRequest.java
@@ -0,0 +1,13 @@
+package com.ug.air.alrite.Utils;
+
+import java.util.HashMap;
+
+public class BackendPostRequest {
+    HashMap<String, String> summary;
+    String diagnoses;
+
+    public BackendPostRequest(HashMap<String, String> summary, String diagnoses) {
+        this.summary = summary;
+        this.diagnoses = diagnoses;
+    }
+}
diff --git a/app/src/main/res/layout/text_input.xml b/app/src/main/res/layout/text_input.xml
index 96735e3..2380abe 100644
--- a/app/src/main/res/layout/text_input.xml
+++ b/app/src/main/res/layout/text_input.xml
@@ -71,7 +71,6 @@
                         android:background="@drawable/text_input_bg"
                         android:gravity="center"
                         android:hint="@string/ti_IHint"
-                        android:inputType="numberDecimal"
                         android:maxLength="4" />
 
                 </LinearLayout>

From 030a39619eb01ed5190624c4b0d824ce4242e5d0 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Mon, 5 Jun 2023 17:39:40 -0700
Subject: [PATCH 47/50] The June 6 edition minus bugs in the other patients
 section lol

---
 .../ug/air/alrite/APIs/BackendRequests.java   |  6 ++--
 .../alrite/Activities/PatientActivity.java    |  6 ++--
 .../air/alrite/Activities/SplashActivity.java |  6 ++--
 .../Fragments/Patient/OtherPatients.java      | 34 +++++++++++--------
 4 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/APIs/BackendRequests.java b/app/src/main/java/com/ug/air/alrite/APIs/BackendRequests.java
index 038cdc5..7d70cd8 100644
--- a/app/src/main/java/com/ug/air/alrite/APIs/BackendRequests.java
+++ b/app/src/main/java/com/ug/air/alrite/APIs/BackendRequests.java
@@ -14,6 +14,8 @@ public interface BackendRequests {
     @GET("/alrite/apis/workflows/{workflow_id}/")
     Call<String> getJson(@Path("workflow_id") String workflow_id);
 
-    @POST("/alrite/data/test/13/")
-    Observable<String> postToBackend(@Body BackendPostRequest body);
+    @POST("/apis/data/{workflow_id}/{workflow_version}/")
+    Observable<String> postToBackend(@Path("workflow_id") String workflow_id,
+                                    @Path("workflow_version") String workflow_version,
+                                    @Body BackendPostRequest body);
 }
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index 93b53e8..be13716 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -277,7 +277,8 @@ private void doLogic(String file) {
     public static final String THRESHOLD = "threshold";
     public static final String PARAGRAPH = "Paragraph";
     public static final String META = "meta";
-    public static final String APIPATH = "apipath";
+    public static final String VERSION = "version";
+    public static final String NAME = "name";
     public static final String SUMMARY_ID = "SUMMARY_ID";
     public static final String DIAGNOSES_ID = "DIAGNOSES_ID";
 
@@ -369,7 +370,8 @@ private void implementEditableDecisionTree(JSONObject json) throws JSONException
         patientSummaryPrefs = getSharedPreferences(summaryPrefsID, Context.MODE_PRIVATE);
         patientSummaryEditor = patientSummaryPrefs.edit();
         patientSummaryEditor.putString(SUMMARY_ID, summaryPrefsID);
-        patientSummaryEditor.putString(APIPATH, json.getJSONObject(META).getString(APIPATH));
+        patientSummaryEditor.putString(VERSION, json.getJSONObject(META).getString(VERSION));
+        patientSummaryEditor.putString(NAME, json.getString(NAME));
         patientSummaryEditor.apply();
 
         patientDiagnosesPrefs = getSharedPreferences(diagnosesPrefsID, Context.MODE_PRIVATE);
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
index 60a02bf..a5aec0d 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/SplashActivity.java
@@ -56,7 +56,7 @@ public class SplashActivity extends AppCompatActivity {
     public static final String ECZEMA_COUNT = "eczema_count";
 
     // TODO: change this if you want to get from online
-    Boolean shouldGetNewAssessment = true;
+    Boolean shouldGetNewAssessmentOnStartup = true;
     SharedPreferences sharedPreferences;
     SharedPreferences.Editor editor;
 
@@ -135,9 +135,9 @@ private void checkDatabase() {
     }
 
     private void getCurrentAssessmentIfConnectedToInternet() {
-        if (isNetworkAvailable() && shouldGetNewAssessment) {
+        if (isNetworkAvailable() && shouldGetNewAssessmentOnStartup) {
             BackendRequests dtJson = ApiClient.getClient(ApiClient.REMOTE_URL_TEMP).create(BackendRequests.class);
-            Call<String> call = dtJson.getJson("test");
+            Call<String> call = dtJson.getJson("June_6_Demo");
             call.enqueue(new Callback<String>() {
                 @Override
                 public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java
index 82dd68e..20116c4 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java
@@ -2,8 +2,9 @@
 
 import static android.content.Context.MODE_PRIVATE;
 import static com.ug.air.alrite.Activities.DiagnosisActivity.PENDING;
-import static com.ug.air.alrite.Activities.PatientActivity.APIPATH;
 import static com.ug.air.alrite.Activities.PatientActivity.ASSESS_INCOMPLETE;
+import static com.ug.air.alrite.Activities.PatientActivity.NAME;
+import static com.ug.air.alrite.Activities.PatientActivity.VERSION;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DATE;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USED_BRONCHODILATOR;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.AFTER_BRONCHODILATOR;
@@ -27,6 +28,7 @@
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
+import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -66,6 +68,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import io.reactivex.Observable;
 import io.reactivex.Scheduler;
@@ -242,7 +245,7 @@ private void sendAllCompletedAssessmentDataToBackend() throws JSONException {
 
         // For every pair of patient info, turn them into proper JSONObjects and
         // put them in the array to be sent to the backend
-        HashMap<BackendPostRequest, String> requestToApipath = new HashMap<>();
+        HashMap<BackendPostRequest, Pair<String, String>> requestToApipath = new HashMap<>();
 
         // Create requests for each pair of patient info
         for (int i = 0; i < assessmentsToBeSent.size(); i+=2) {
@@ -254,23 +257,26 @@ private void sendAllCompletedAssessmentDataToBackend() throws JSONException {
             SharedPreferences summaryPrefs = getContext().getSharedPreferences(summaryID, MODE_PRIVATE);
 
             // TODO: implement diagnoses stuff later
-            diagnosesPrefs.edit().clear().apply();
+            // diagnosesPrefs.edit().clear().apply();
 
             // Get all items from the shared preferences object and create a request with them
-            String apipath = "";
+            String version = "";
+            String name = "";
             Map<String, ?> summaryPrefItems = summaryPrefs.getAll();
             HashMap<String, String> summaryPrefMap = new HashMap<>();
             for (String item : summaryPrefItems.keySet()) {
-                if (item.equals(APIPATH)) {
-                    apipath = item;
+                if (item.equals(VERSION)) {
+                    version = (String) summaryPrefItems.get(item);
+                } else if (item.equals(NAME)) {
+                    name = (String) summaryPrefItems.get(item);
                 } else {
                     summaryPrefMap.put(item, (String) summaryPrefItems.get(item));
                 }
             }
-            summaryPrefs.edit().clear().apply();
+            // summaryPrefs.edit().clear().apply();
 
             BackendPostRequest nextRequest = new BackendPostRequest(summaryPrefMap, "");
-            requestToApipath.put(nextRequest, apipath);
+            requestToApipath.put(nextRequest, new Pair<>(name, version));
         }
         System.out.println(requestToApipath);
 
@@ -281,8 +287,8 @@ private void sendAllCompletedAssessmentDataToBackend() throws JSONException {
                 .create(BackendRequests.class);
         List<Observable<?>> requests = new ArrayList<>();
         for (BackendPostRequest currRequest : requestToApipath.keySet()) {
-            String apipath = requestToApipath.get(currRequest);
-            requests.add(backendRequests.postToBackend(currRequest));
+            Pair<String, String> workflowInfo = Objects.requireNonNull(requestToApipath.get(currRequest));
+            requests.add(backendRequests.postToBackend(workflowInfo.first, workflowInfo.second, currRequest));
         }
 
         Observable.zip(
@@ -296,9 +302,6 @@ private void sendAllCompletedAssessmentDataToBackend() throws JSONException {
                     public void accept(Object o) throws Exception {
                         // On success tell the user we're ok
                         System.out.println(o);
-
-                        progressBar.setVisibility(View.GONE);
-                        btnSubmit.setEnabled(true);
                     }
                 },
 
@@ -307,11 +310,12 @@ public void accept(Object o) throws Exception {
                     @Override
                     public void accept(Throwable e) throws Exception {
                         System.out.println("there was an error getting requests: " + e);
-                        progressBar.setVisibility(View.GONE);
-                        btnSubmit.setEnabled(true);
                     }
                 }
             );
+
+        progressBar.setVisibility(View.GONE);
+        btnSubmit.setEnabled(true);
     }
 
     private ArrayList<String> getValidAssessments() {

From c0192c7f1c60026306dda4416825a8057345f3c9 Mon Sep 17 00:00:00 2001
From: evasy <yitongshan2016@yahoo.com>
Date: Mon, 5 Jun 2023 18:17:41 -0700
Subject: [PATCH 48/50] fix bugs

---
 .../Fragments/MutipleSelectionComponent.java  | 61 -------------------
 .../Patient/MultipleSelectionFragment.java    | 43 +++++--------
 2 files changed, 15 insertions(+), 89 deletions(-)
 delete mode 100644 app/src/main/java/com/ug/air/alrite/Fragments/MutipleSelectionComponent.java

diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/MutipleSelectionComponent.java b/app/src/main/java/com/ug/air/alrite/Fragments/MutipleSelectionComponent.java
deleted file mode 100644
index 37ea69b..0000000
--- a/app/src/main/java/com/ug/air/alrite/Fragments/MutipleSelectionComponent.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ug.air.alrite.Fragments;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * List of choices that the user will make
- * Depending on the type of question the
- * items added to the list will differ
- * */
-
-public class MutipleSelectionComponent {
-    private Map<Integer, String> MultipleSelect;
-    private Map<Boolean, String> TrueOrFalse;
-
-    /**
-     * Constructor
-     * Creates a new, empty list
-     */
-    public MutipleSelectionComponent() {
-        this.MultipleSelect = new HashMap<>();
-        this.TrueOrFalse = new HashMap<>();
-    }
-
-    /**
-     * Add a new choice into the table
-     * Index of the list will be the choice number
-     * @param ChoiceName Value to provide into the list
-     * that corresponds to its value
-     * @param ChoiceValue Value which corresponds to the numbering
-     * of the choice within the Map
-    */
-//    public void addBooleanValue(Boolean ChoiceValue, String ChoiceName) {
-//            if(ChoiceName == null) {
-//                throw new IllegalArgumentException("Need to have an input for the string");
-//            }
-//            if(ChoiceValue != true || ChoiceValue != false) {
-//                throw new IllegalArgumentException("For a true or false value we need to have a" +
-//                        "true or false choice answer");
-//            }
-//            this.TrueOrFalse.put(ChoiceValue, ChoiceName);
-//    }
-
-    /**
-     * Add a new choice into the table
-     * Index of the list will be the choice number
-     * @param ChoiceName Value to provide into the list
-     * that corresponds to its value
-     * @param ChoiceNum Value which corresponds to the numbering
-     * of the choice within the Map
-     */
-    public void addMultipleChoiceValue(Integer ChoiceNum, String ChoiceName) {
-        if(ChoiceName == null) {
-            throw new IllegalArgumentException("Need to have an input for the string");
-        }
-        if(ChoiceNum == -1) {
-            throw new IllegalArgumentException("Cannot have choice number be negative");
-        }
-        this.MultipleSelect.put(ChoiceNum, ChoiceName);
-    }
-}
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
index a41c4f4..d10f15c 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
@@ -19,6 +19,7 @@
 
 import androidx.fragment.app.Fragment;
 
+import com.ug.air.alrite.Activities.PatientActivity;
 import com.ug.air.alrite.R;
 
 import org.json.JSONException;
@@ -134,37 +135,22 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
             @Override
             public void onClick(View v) {
                 // we need to see which choices are selected
-                // store the ids
-                ArrayList<Integer> chosenOptions = new ArrayList<Integer>();
-                for (CheckBox choice : choiceGroup) {
-                    if (choice.isChecked()) {
-                        // get the id of this choice
-                        int id = choice.getId();
-                        chosenOptions.add(id);
-                    }
-                }
-//                // do not allow selection number less than 1
-//                if (chosenOptions.size() < 1) {
-//                    Toast.makeText(getActivity(), "Please select at least one of the options", Toast.LENGTH_SHORT).show();
-//                    return;
-//                }
-
-                // Get the indices of the choices in the set of buttons: relies on the
-                // buttons having names with their index at the end
+                // store the indices and the result back up to main:
+                // a listener there will trigger and start the next fragment sequence up
                 ArrayList<Integer> chosenOptionIds = new ArrayList<>();
-                for (int c : chosenOptions) {
-                    String chosenOptionId = v.getResources().getResourceName(c);
-                    int index = Integer.parseInt(chosenOptionId.substring(chosenOptionId.length() - 1));
-                    chosenOptionIds.add(index);
+                for (int i = 0; i < choiceGroup.size(); i++) {
+                    if (choiceGroup.get(i).isChecked()) {
+                        // get the index of this choice
+                        chosenOptionIds.add(i);
+                    }
                 }
 
-                // Send the result back up to main: a listener there will trigger
-                // and start the next fragment sequence up
                 try {
-                    getResultListener.getResultFromMultipleSelectionFragment(chosenOptionIds);  // adding to the diagnosis
-                } catch (JSONException ex) {
-                    throw new RuntimeException(ex);
+                    getResultListener.getResultFromMultipleSelectionFragment(chosenOptionIds);
+                } catch (JSONException e) {
+                    throw new RuntimeException(e);
                 }
+                return;
             }
         });
 
@@ -198,10 +184,11 @@ private void loadSelectedChoicesIfAlreadySelected() {
             for (String temp : selectedOptionsHistory) {
                 if (temp.equals(choices.get(i))) {
                     ((CheckBox) choiceGroup.get(i)).setChecked(true);
-                    return;
                 }
             }
         }
+
+        return;
     }
 
     /**
@@ -215,7 +202,7 @@ private void loadSelectedChoicesIfAlreadySelected() {
     private static ArrayList<String> getTextFromChoices(ArrayList<JSONObject> list) throws JSONException {
         ArrayList<String> ret = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
-            ret.add(list.get(i).getString("text"));
+            ret.add(list.get(i).getString(PatientActivity.TEXT));
         }
         return ret;
     }

From bad8ef1b19b6b01590ec01e1a98330230fc0c8d6 Mon Sep 17 00:00:00 2001
From: evasy <yitongshan2016@yahoo.com>
Date: Tue, 6 Jun 2023 10:59:00 -0700
Subject: [PATCH 49/50] fix bugs

---
 .../com/ug/air/alrite/Activities/PatientActivity.java    | 9 ++++++---
 .../Fragments/Patient/MultipleSelectionFragment.java     | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index be13716..f38c7d6 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -607,9 +607,12 @@ public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOpti
             NextPage =  nextPageJSON.getString(DEFAULT_LINK);
         }
         else {
-            String allDiagnoses = choices.get(chosenOptionIds.get(0) - 1).getString(TEXT);
-            for (int i = 1; i < chosenOptionIds.size(); i++) {
-                allDiagnoses += "\n" + choices.get(i).getString(TEXT);
+            String allDiagnoses = "";
+            for (int i = 0; i < chosenOptionIds.size(); i++) {
+                allDiagnoses += choices.get(chosenOptionIds.get(i) - 1).getString(TEXT);
+                if (i != chosenOptionIds.size() - 1) {
+                    allDiagnoses += "\n";
+                }
                 // Enter the diagnosis into the editor
             }
             enterSymptomIntoEditor(nextPageJSON, allDiagnoses);
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
index d10f15c..88c916e 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleSelectionFragment.java
@@ -141,7 +141,7 @@ public void onClick(View v) {
                 for (int i = 0; i < choiceGroup.size(); i++) {
                     if (choiceGroup.get(i).isChecked()) {
                         // get the index of this choice
-                        chosenOptionIds.add(i);
+                        chosenOptionIds.add(i+1);
                     }
                 }
 

From f57376cf458d21047bc95c127418cd9694d9b9d1 Mon Sep 17 00:00:00 2001
From: fnehren <78833738+fnehren@users.noreply.github.com>
Date: Tue, 6 Jun 2023 14:52:24 -0700
Subject: [PATCH 50/50] The June 6 edition

---
 app/build.gradle                              |   1 +
 .../Activities/DiagnosisActivityModified.java |  26 ++---
 .../alrite/Activities/PatientActivity.java    |  68 +++++++----
 .../Fragments/Patient/InitialsModified.java   |   4 +-
 .../Patient/MultipleChoiceFragment.java       |   2 +-
 .../Fragments/Patient/OtherPatients.java      | 107 ++++++++++--------
 .../alrite/Fragments/Patient/SexModified.java |  10 +-
 .../Fragments/Patient/TextInputFragment.java  |   2 +-
 .../Patient/TextInputTextFragment.java        |   2 -
 .../air/alrite/Utils/BackendPostRequest.java  |   4 +-
 app/src/main/res/layout/text_input.xml        |  29 +----
 11 files changed, 131 insertions(+), 124 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 594f1dd..8f4e97b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -59,4 +59,5 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-scalars:2.5.0'
     implementation 'com.squareup.picasso:picasso:2.8'
     implementation "com.squareup.retrofit2:adapter-rxjava2:2.4.0"
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java b/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java
index 19a3a57..6a56d26 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/DiagnosisActivityModified.java
@@ -7,14 +7,13 @@
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.PATIENT_ASSESSMENT_ID;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.CLINICIAN_USERNAME;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.UUIDS;
-import static com.ug.air.alrite.Fragments.Patient.Initials.CHILD_INITIALS;
-import static com.ug.air.alrite.Fragments.Patient.Initials.INITIAL_DATE;
-import static com.ug.air.alrite.Fragments.Patient.Initials.PARENT_INITIALS;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_MONTHS;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_YEARS;
-import static com.ug.air.alrite.Fragments.Patient.Sex.KILO;
-import static com.ug.air.alrite.Fragments.Patient.Sex.MUAC;
-import static com.ug.air.alrite.Fragments.Patient.Sex.SEX;
+import static com.ug.air.alrite.Fragments.Patient.InitialsModified.CHILD_INITIALS;
+import static com.ug.air.alrite.Fragments.Patient.InitialsModified.INITIAL_DATE;
+import static com.ug.air.alrite.Fragments.Patient.SexModified.AGE_IN_MONTHS;
+import static com.ug.air.alrite.Fragments.Patient.SexModified.AGE_IN_YEARS;
+import static com.ug.air.alrite.Fragments.Patient.SexModified.KILO;
+import static com.ug.air.alrite.Fragments.Patient.SexModified.MUAC;
+import static com.ug.air.alrite.Fragments.Patient.SexModified.SEX;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -264,11 +263,9 @@ private List<Assessment> buildSubItemList(String s) {
 
     private List<Summary> buildSummaryList(){
         summaryList = new ArrayList<>();
-        String pin = summaryPrefs.getString(PARENT_INITIALS, "");
         String weight = summaryPrefs.getString(KILO, "");
         String muac = summaryPrefs.getString(MUAC, "");
 
-        addToSummaryList("Parent's initials", pin);
         addToSummaryList("Child's weight", weight);
         addToSummaryList("MUAC value", muac);
 
@@ -276,7 +273,7 @@ private List<Summary> buildSummaryList(){
         System.out.println(all);
         for (Map.Entry<String, ?> x : all.entrySet()) {
             // TODO: prevent non-summary results from showing
-            addToSummaryList(x.getKey(), (String) x.getValue());
+            addToSummaryList(x.getKey(), x.getValue().toString());
         }
 
         return summaryList;
@@ -318,7 +315,7 @@ private void saveForm() {
 
         // Go to the final activity, since we aren't using a bronchodilator and therefore
         // aren't revisiting this page (currently)
-        startFinalActivity(summaryPrefsID);
+        startFinalActivity();
     }
 
     private void enterDurationIntoSharedPrefs(Date currentTime) {
@@ -340,9 +337,10 @@ private void enterDurationIntoSharedPrefs(Date currentTime) {
         }
     }
 
-    private void startFinalActivity(String file) {
+    private void startFinalActivity() {
         Intent finalActivityIntent = new Intent(DiagnosisActivityModified.this, FinalActivity.class);
-        finalActivityIntent.putExtra("filename", file);
+        finalActivityIntent.putExtra(SUMMARY_ID, summaryPrefsID);
+        finalActivityIntent.putExtra(DIAGNOSES_ID, diagnosesPrefsID);
         startActivity(finalActivityIntent);
     }
 
diff --git a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
index f38c7d6..b3e8d13 100644
--- a/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
+++ b/app/src/main/java/com/ug/air/alrite/Activities/PatientActivity.java
@@ -10,6 +10,8 @@
 import static com.ug.air.alrite.Fragments.Patient.Initials.CHILD_INITIALS;
 import static com.ug.air.alrite.Fragments.Patient.Initials.INITIAL_DATE;
 import static com.ug.air.alrite.Fragments.Patient.Initials.PARENT_INITIALS;
+import static com.ug.air.alrite.Fragments.Patient.Initials.STUDY_ID;
+import static com.ug.air.alrite.Fragments.Patient.Initials.STUDY_ID_2;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.FASTBREATHING2;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.INITIAL_DATE_2;
 import static com.ug.air.alrite.Fragments.Patient.RRCounter.SECOND;
@@ -66,8 +68,8 @@ public class PatientActivity extends AppCompatActivity implements
     public static final String INCOMPLETE = "incomplete";
 
     public static final String ASSESS_INCOMPLETE = "incomplete";
-    SharedPreferences sharedPreferences, sharedPreferences1, patientSummaryPrefs, patientDiagnosesPrefs;
-    SharedPreferences.Editor editor, editor1, patientSummaryEditor, patientDiagnosesEditor;
+    SharedPreferences sharedPreferences, sharedPreferences1, patientSummaryPrefs, patientDiagnosesPrefs, developerPrefs;
+    SharedPreferences.Editor editor, editor1, patientSummaryEditor, patientDiagnosesEditor, developerEditor;
     int frag = 0;
 
     @Override
@@ -287,6 +289,7 @@ private void doLogic(String file) {
     JSONArray pages;
     String summaryPrefsID;
     String diagnosesPrefsID;
+    String developerPrefsID;
 
     // Information gotten from JSON for the current page
     // Information gotten from JSON
@@ -362,31 +365,41 @@ private void implementEditableDecisionTree(JSONObject json) throws JSONException
         String nextPage = pages.getJSONObject(0).getString(PAGE_ID);
 
         // Create a shared preferences object for the current patient
-        // TODO: better security for the SharedPreferences
+        // TODO: better security for the SharedPreferences (use EncryptedSharedPreferences)
         String patientInfoID = createUniquePatientInfoID();
         summaryPrefsID = patientInfoID + "_Summary";
         diagnosesPrefsID = patientInfoID + "_Diagnoses";
+        developerPrefsID = patientInfoID + "_DevInfo";
 
         patientSummaryPrefs = getSharedPreferences(summaryPrefsID, Context.MODE_PRIVATE);
         patientSummaryEditor = patientSummaryPrefs.edit();
-        patientSummaryEditor.putString(SUMMARY_ID, summaryPrefsID);
-        patientSummaryEditor.putString(VERSION, json.getJSONObject(META).getString(VERSION));
-        patientSummaryEditor.putString(NAME, json.getString(NAME));
-        patientSummaryEditor.apply();
 
         patientDiagnosesPrefs = getSharedPreferences(diagnosesPrefsID, Context.MODE_PRIVATE);
         patientDiagnosesEditor = patientDiagnosesPrefs.edit();
+        // MUST INCLUDE THIS: code in OtherPatients was written with the intent that there
+        // would be at least one diagnosis lol
         patientDiagnosesEditor.putString(DIAGNOSES_ID, diagnosesPrefsID);
         patientDiagnosesEditor.apply();
 
+        developerPrefs = getSharedPreferences(developerPrefsID, Context.MODE_PRIVATE);
+        developerEditor = developerPrefs.edit();
+        developerEditor.putString(VERSION, json.getJSONObject(META).getString(VERSION));
+        developerEditor.putString(NAME, json.getString(NAME));
+        developerEditor.apply();
+
         // Clear out the old editor so that it can be used again for a new patient
         Map<String, ?> currPatientInfos = sharedPreferences.getAll();
         for (String info : currPatientInfos.keySet()) {
-            patientSummaryEditor.putString(info, (String) currPatientInfos.get(info));
+            if (info.equals("app_version") || info.equals(STUDY_ID) || info.equals(STUDY_ID_2)
+                || info.equals("age") || info.equals("start_date")) {
+                developerEditor.putString(info, (String) currPatientInfos.get(info));
+            } else {
+                patientSummaryEditor.putString(info, (String) currPatientInfos.get(info));
+            }
         }
         patientSummaryEditor.apply();
-        editor.clear();
-        editor.apply();
+        developerEditor.apply();
+        editor.clear().apply();
 
         // Continue looping through each page in sequence: depending on the component,
         // inflate a new fragment for that component type
@@ -577,17 +590,15 @@ private void createParagraphFragment(JSONObject nextPageComponent) throws JSONEx
      */
     @Override
     public void getResultFromMultipleChoiceFragment(int choiceIndex) throws JSONException {
+        // Enter the diagnosis into the editor
         String diagnosis = choices.get(choiceIndex).getString(TEXT);
-        String nextPageName = choices.get(choiceIndex).getString(LINK);
+        enterStringIntoSummaryEditor(nextPageJSON, diagnosis);
 
         // If the link is null, then we should go to the default page
+        String nextPageName = choices.get(choiceIndex).getString(LINK);
         if (nextPageName.equals(NULL)) {
             nextPageName = nextPageJSON.getString(DEFAULT_LINK);
         }
-        System.out.println("NEXT PAGE NAME:" + nextPageName);
-
-        // Enter the diagnosis into the editor
-        enterSymptomIntoEditor(nextPageJSON, diagnosis);
 
         // Decide on the next page based on the result
         try {
@@ -615,7 +626,7 @@ public void getResultFromMultipleSelectionFragment(ArrayList<Integer> chosenOpti
                 }
                 // Enter the diagnosis into the editor
             }
-            enterSymptomIntoEditor(nextPageJSON, allDiagnoses);
+            enterStringIntoSummaryEditor(nextPageJSON, allDiagnoses);
 
             JSONObject foundLink = getContentFromPageID(nextPageJSON, targetValueID);
             if (foundLink == null) {
@@ -660,7 +671,7 @@ public void getResultFromTextInputFragment(String inputted) throws JSONException
                     }
                 }
             }
-            enterSymptomIntoEditor(nextPageJSON, String.valueOf(diagnosis));
+            enterFloatIntoSummaryEditor(nextPageJSON, diagnosis);
         } else {
             // In the case that we're comparing strings, we'll compare equality with .equals,
             // and the other ones it doesn't make sense to compare, so we'll just say that
@@ -682,7 +693,7 @@ public void getResultFromTextInputFragment(String inputted) throws JSONException
                     }
                 }
             }
-            enterSymptomIntoEditor(nextPageJSON, inputted);
+            enterStringIntoSummaryEditor(nextPageJSON, inputted);
         }
 
         // Finally, we go to the decided next page
@@ -801,15 +812,28 @@ private int findIndexInPagesGivenPageId(String pageID) throws JSONException {
      * Abstracts away the process of adding a symptom to the sharedPreference object
      *
      * @param page is the page in the workflow that we're entering a symptom for
-     * @param symptom is the associated value to enter in given the page
+     * @param symptom is the associated string to enter in given the page
      * @throws JSONException because we look at JSON
      */
-    public void enterSymptomIntoEditor(JSONObject page, String symptom) throws JSONException {
+    public void enterStringIntoSummaryEditor(JSONObject page, String symptom) throws JSONException {
         // Enter the diagnosis into the editor
         patientSummaryEditor.putString(getValueID(page, 0), symptom);
         patientSummaryEditor.apply();
     }
 
+    /**
+     * Abstracts away the process of adding a symptom to the sharedPreference object
+     *
+     * @param page is the page in the workflow that we're entering a symptom for
+     * @param symptom is the associated float to enter in given the page
+     * @throws JSONException because we look at JSON
+     */
+    public void enterFloatIntoSummaryEditor(JSONObject page, Float symptom) throws JSONException {
+        // Enter the diagnosis into the editor
+        patientSummaryEditor.putFloat(getValueID(page, 0), symptom);
+        patientSummaryEditor.apply();
+    }
+
     /**
      * Function to get the ValueID (official name for a piece of content)
      *
@@ -835,4 +859,8 @@ public String createUniquePatientInfoID() {
 
         return patientInitials + "_" + formattedDate;
     }
+
+    public Boolean isDiagnosisPage(JSONObject page) throws JSONException {
+        return (Boolean) page.get(IS_DIAGNOSIS_PAGE);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/InitialsModified.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/InitialsModified.java
index 2426589..2cfe3a6 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/InitialsModified.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/InitialsModified.java
@@ -32,9 +32,9 @@ public class InitialsModified extends Fragment {
    EditText etChildInitials, etParentInitials, etStudy, etCode;
    Button back, next;
    String childInitials, parentInitials, formattedDate, studyId, code, h_code, counter, filename;
-   public static final String CHILD_INITIALS = "patient_initials";
+   public static final String CHILD_INITIALS = "Patient Initials";
     public static final String  VERSION = "app_version";
-   public static final String PARENT_INITIALS = "parent_initials";
+   public static final String PARENT_INITIALS = "Parent Initials";
    public static final String STUDY_ID = "study_id";
     public static final String STUDY_ID_2 = "study_id_2";
    public static final String INITIAL_DATE = "start_date";
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
index ffb538e..b384ee7 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/MultipleChoiceFragment.java
@@ -126,7 +126,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         backButton = view.findViewById(R.id.back);
 
         // If we've already seen this page, reload our past choices
-        loadSelectedChoiceIfAlreadySelected();
+        // loadSelectedChoiceIfAlreadySelected();
 
         // This is a listener for, if the next button is pressed, whether we can go
         // on or not, and what information should be sent up
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java
index 20116c4..fa94680 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/OtherPatients.java
@@ -1,17 +1,13 @@
 package com.ug.air.alrite.Fragments.Patient;
 
 import static android.content.Context.MODE_PRIVATE;
-import static com.ug.air.alrite.Activities.DiagnosisActivity.PENDING;
-import static com.ug.air.alrite.Activities.PatientActivity.ASSESS_INCOMPLETE;
 import static com.ug.air.alrite.Activities.PatientActivity.NAME;
 import static com.ug.air.alrite.Activities.PatientActivity.VERSION;
 import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.DATE;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator.USED_BRONCHODILATOR;
-import static com.ug.air.alrite.Fragments.Patient.Bronchodilator3.AFTER_BRONCHODILATOR;
-import static com.ug.air.alrite.Fragments.Patient.Initials.CHILD_INITIALS;
-import static com.ug.air.alrite.Fragments.Patient.Initials.PARENT_INITIALS;
-import static com.ug.air.alrite.Fragments.Patient.Sex.AGE_IN_YEARS;
-import static com.ug.air.alrite.Fragments.Patient.Sex.SEX;
+import static com.ug.air.alrite.Fragments.Patient.InitialsModified.CHILD_INITIALS;
+import static com.ug.air.alrite.Fragments.Patient.InitialsModified.PARENT_INITIALS;
+import static com.ug.air.alrite.Fragments.Patient.SexModified.AGE_IN_YEARS;
+import static com.ug.air.alrite.Fragments.Patient.SexModified.SEX;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -71,6 +67,7 @@
 import java.util.Objects;
 
 import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.Scheduler;
 import io.reactivex.functions.Consumer;
 import io.reactivex.functions.Function;
@@ -189,38 +186,36 @@ private void accessSharedFile2(){
                 }
                 Collections.reverse(files);
                 for(String name : files){
-                    if (!name.equals("sharedPrefs.xml") && !name.equals("counter_file.xml")){
+                    if (!name.equals("sharedPrefs.xml") && !name.equals("counter_file.xml")
+                        && name.endsWith("_Summary.xml")){
+
                         String names = name.replace(".xml", "");
                         SharedPreferences sharedPreferences = this.getActivity().getSharedPreferences(names, Context.MODE_PRIVATE);
-                        String bron = sharedPreferences.getString(USED_BRONCHODILATOR, "");
-                        String incomplete = sharedPreferences.getString(ASSESS_INCOMPLETE, "");
-                        String pending = sharedPreferences.getString(PENDING, "");
-                        String fin = sharedPreferences.getString(AFTER_BRONCHODILATOR, "");
-                        if (bron.isEmpty() || bron.equals("Bronchodialtor Not Given") || !fin.isEmpty()){
-                            cin = sharedPreferences.getString(CHILD_INITIALS, "");
-                            pin = sharedPreferences.getString(PARENT_INITIALS, "");
-                            age = sharedPreferences.getString(AGE_IN_YEARS, "");
-                            gender = sharedPreferences.getString(SEX, "");
-                            dat = sharedPreferences.getString(DATE, "");
-                            if (age.isEmpty()){
-                               ag = "0 years 0 months";
-                               gender = "";
-                            }else {
-                                String[] split = age.split("\\.");
-                                ag = split[0] + " years and " + split[1] + " months";
-                            }
-
-                            try {
-                                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
-                                Date date = df.parse(dat);
-                                SimpleDateFormat df1 = new SimpleDateFormat("EEE, d MMM yyyy HH:mm");
-                                String formattedDate = df1.format(date);
-                                History history = new History("Age: " + ag, "Gender: " + gender, cin, "Parent/Guardian: " + pin, formattedDate, names, pending, incomplete);
-                                items.add(new Item(1, history));
-                            } catch (ParseException e) {
-                                e.printStackTrace();
-                            }
+                        cin = sharedPreferences.getString(CHILD_INITIALS, "");
+                        pin = sharedPreferences.getString(PARENT_INITIALS, "");
+                        age = sharedPreferences.getString(AGE_IN_YEARS, "");
+                        gender = sharedPreferences.getString(SEX, "");
+                        dat = sharedPreferences.getString(DATE, "");
+
+                        if (age.isEmpty()){
+                           ag = "0 years 0 months";
+                           gender = "";
+                        }else {
+                            String[] split = age.split("\\.");
+                            ag = split[0] + " years and " + split[1] + " months";
+                        }
+
+                        try {
+                            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
+                            Date date = df.parse(dat);
+                            SimpleDateFormat df1 = new SimpleDateFormat("EEE, d MMM yyyy HH:mm");
+                            String formattedDate = df1.format(date);
+                            History history = new History("Age: " + ag, "Gender: " + gender, cin, "Parent/Guardian: " + pin, formattedDate, "fname", "no", "no");
+                            items.add(new Item(1, history));
+                        } catch (ParseException e) {
+                            e.printStackTrace();
                         }
+
                     }
                 }
             }else {
@@ -248,11 +243,15 @@ private void sendAllCompletedAssessmentDataToBackend() throws JSONException {
         HashMap<BackendPostRequest, Pair<String, String>> requestToApipath = new HashMap<>();
 
         // Create requests for each pair of patient info
-        for (int i = 0; i < assessmentsToBeSent.size(); i+=2) {
-            String diagnosesIDxml = assessmentsToBeSent.get(i);
+        for (int i = 0; i < assessmentsToBeSent.size(); i+=3) {
+            // Alphabetical order
+            String developerIDxml = assessmentsToBeSent.get(i);
+            String developerID = developerIDxml.substring(0, developerIDxml.length() - 4);
+            String diagnosesIDxml = assessmentsToBeSent.get(i+1);
             String diagnosesID = diagnosesIDxml.substring(0, diagnosesIDxml.length() - 4);
-            String summaryIDxml = assessmentsToBeSent.get(i+1);
+            String summaryIDxml = assessmentsToBeSent.get(i+2);
             String summaryID = summaryIDxml.substring(0, summaryIDxml.length() - 4);
+            SharedPreferences developerPrefs = getContext().getSharedPreferences(developerID, MODE_PRIVATE);
             SharedPreferences diagnosesPrefs = getContext().getSharedPreferences(diagnosesID, MODE_PRIVATE);
             SharedPreferences summaryPrefs = getContext().getSharedPreferences(summaryID, MODE_PRIVATE);
 
@@ -260,20 +259,27 @@ private void sendAllCompletedAssessmentDataToBackend() throws JSONException {
             // diagnosesPrefs.edit().clear().apply();
 
             // Get all items from the shared preferences object and create a request with them
-            String version = "";
-            String name = "";
             Map<String, ?> summaryPrefItems = summaryPrefs.getAll();
-            HashMap<String, String> summaryPrefMap = new HashMap<>();
+            HashMap<String, Object> summaryPrefMap = new HashMap<>();
             for (String item : summaryPrefItems.keySet()) {
+                summaryPrefMap.put(item, summaryPrefItems.get(item));
+
+            }
+            // summaryPrefs.edit().clear().apply();
+
+            // Add all items from developer preferences into the summary preferences
+            String version = "";
+            String name = "";
+            Map<String, ?> developerPrefItems = developerPrefs.getAll();
+            for (String item : developerPrefItems.keySet()) {
                 if (item.equals(VERSION)) {
-                    version = (String) summaryPrefItems.get(item);
+                    version = (String) developerPrefItems.get(item);
                 } else if (item.equals(NAME)) {
-                    name = (String) summaryPrefItems.get(item);
+                    name = (String) developerPrefItems.get(item);
                 } else {
-                    summaryPrefMap.put(item, (String) summaryPrefItems.get(item));
+                    summaryPrefMap.put(item, developerPrefItems.get(item));
                 }
             }
-            // summaryPrefs.edit().clear().apply();
 
             BackendPostRequest nextRequest = new BackendPostRequest(summaryPrefMap, "");
             requestToApipath.put(nextRequest, new Pair<>(name, version));
@@ -294,6 +300,7 @@ private void sendAllCompletedAssessmentDataToBackend() throws JSONException {
         Observable.zip(
             requests,
             (s -> s))
+            .observeOn(AndroidSchedulers.mainThread())
             .subscribeOn(Schedulers.io())
             .subscribe(
                 // Will be triggered if all requests will end successfully (4xx and 5xx also are successful requests too)
@@ -301,7 +308,9 @@ private void sendAllCompletedAssessmentDataToBackend() throws JSONException {
                     @Override
                     public void accept(Object o) throws Exception {
                         // On success tell the user we're ok
+                        Toast.makeText(getActivity(), "Patient forms have been successfully submitted.", Toast.LENGTH_SHORT).show();
                         System.out.println(o);
+                        deleteLocalPatientFiles();
                     }
                 },
 
@@ -385,8 +394,8 @@ private void deleteLocalPatientFiles() {
 
             // Otherwise, we're good to send it to the backend! Add the file to
             // the list of files to send to the backend
-            //assessment.delete();
-            System.out.println("fake delete file");
+            assessment.delete();
         }
+        getActivity().recreate();
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java
index a04d74e..f698784 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/SexModified.java
@@ -47,11 +47,11 @@ public class SexModified extends Fragment {
     private static final int YES = 0;
     private static final int NO = 1;
     public static final String MDIAGNOSIS = "diagnosis_malnutrition";
-    public static final String AGE_IN_MONTHS = "age";
-    public static final String AGE_IN_YEARS = "age2";
-    public static final String KILO = "weight";
-    public static final String MUAC = "muac";
-    public static final String SEX = "gender";
+    public static final String AGE_IN_MONTHS = "Age in months";
+    public static final String AGE_IN_YEARS = "Age in years";
+    public static final String KILO = "Weight";
+    public static final String MUAC = "MUAC";
+    public static final String SEX = "Gender";
     public static final String SHARED_PREFS = "sharedPrefs";
     SharedPreferences sharedPreferences, sharedPreferences1;
     SharedPreferences.Editor editor;
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
index d899a37..7eab393 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputFragment.java
@@ -105,7 +105,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         next = view.findViewById(R.id.next);
         back = view.findViewById(R.id.back);
 
-        loadSelectedChoiceIfAlreadySelected();
+        // loadSelectedChoiceIfAlreadySelected();
 
         // For now, don't worry about this
         // etDay.addTextChangedListener(textWatcher);
diff --git a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputTextFragment.java b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputTextFragment.java
index d905522..5c49217 100644
--- a/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputTextFragment.java
+++ b/app/src/main/java/com/ug/air/alrite/Fragments/Patient/TextInputTextFragment.java
@@ -96,8 +96,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         etDay.setHint(InputHint);
         TextView InputInformationDisplay = view.findViewById(R.id.ti_IInformation);
         InputInformationDisplay.setText(InputInformation);
-        TextView SkipInformationDisplay = view.findViewById(R.id.ti_SInformation);
-        SkipInformationDisplay.setText(SkipInformation);
 
         next = view.findViewById(R.id.next);
         back = view.findViewById(R.id.back);
diff --git a/app/src/main/java/com/ug/air/alrite/Utils/BackendPostRequest.java b/app/src/main/java/com/ug/air/alrite/Utils/BackendPostRequest.java
index c771a1a..a958869 100644
--- a/app/src/main/java/com/ug/air/alrite/Utils/BackendPostRequest.java
+++ b/app/src/main/java/com/ug/air/alrite/Utils/BackendPostRequest.java
@@ -3,10 +3,10 @@
 import java.util.HashMap;
 
 public class BackendPostRequest {
-    HashMap<String, String> summary;
+    HashMap<String, Object> summary;
     String diagnoses;
 
-    public BackendPostRequest(HashMap<String, String> summary, String diagnoses) {
+    public BackendPostRequest(HashMap<String, Object> summary, String diagnoses) {
         this.summary = summary;
         this.diagnoses = diagnoses;
     }
diff --git a/app/src/main/res/layout/text_input.xml b/app/src/main/res/layout/text_input.xml
index 2380abe..04461c9 100644
--- a/app/src/main/res/layout/text_input.xml
+++ b/app/src/main/res/layout/text_input.xml
@@ -80,36 +80,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
-                    android:text="@string/ti_IInformation"
+                    android:text=""
                     android:textSize="12sp" />
 
-                <LinearLayout
-                    android:id="@+id/skipLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/ti_SInformation"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        android:text="@string/ti_SInformation"
-                        android:textSize="12sp" />
-
-                    <Button
-                        android:id="@+id/skip"
-                        android:layout_width="wrap_content"
-                        android:layout_height="30dp"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginBottom="10dp"
-                        android:background="@drawable/bg_button"
-                        android:text="Skip"
-                        android:textColor="@color/color_background" />
-
-                </LinearLayout>
 
             </LinearLayout>