chore(TestServer) provide fhir test server credentials

nrf-mamas-hub · Nov 12, 2024 · a77964f · a77964f
1 parent fb35083
commit a77964f
Show file tree

Hide file tree

Showing 8 changed files with 348 additions and 8 deletions.
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/app/src/main/java/com/kabarak/kabarakmhis/fhir/data/Constants.kt b/app/src/main/java/com/kabarak/kabarakmhis/fhir/data/Constants.kt
@@ -6,7 +6,7 @@ import androidx.annotation.ColorInt
 object Constants {
 
     const val DEMO_API_SERVER="http://10.1.57.245:8080/fhir/"
-    const val DEMO_SERVER="http://10.1.57.245:8080/fhir/"
+    const val DEMO_SERVER="http://41.89.93.172/fhir/"
 
 //    const val DEMO_API_SERVER="https://api.mamashub.co.ke/"
 //    const val DEMO_SERVER="https://api.mamashub.co.ke/fhir/"

diff --git a/app/src/main/java/com/kabarak/kabarakmhis/network_request/interfaces/Interface.kt b/app/src/main/java/com/kabarak/kabarakmhis/network_request/interfaces/Interface.kt
@@ -61,11 +61,12 @@ interface Interface {
     fun getAllQuestionnaireResponses(): Call<ResponseBody>
 
 
-    @PUT("fhir/QuestionnaireResponse/{id}")
+    @PUT("QuestionnaireResponse/{id}")
     fun submitQuestionnaireResponse(
         @Path("id") id: String,
         @Body requestBody: RequestBody
     ): Call<ResponseBody>
 
 
+
 }
diff --git a/app/src/main/java/com/kabarak/kabarakmhis/network_request/requests/RetrofitCallsFhir.kt b/app/src/main/java/com/kabarak/kabarakmhis/network_request/requests/RetrofitCallsFhir.kt
@@ -4,6 +4,7 @@ import android.app.ProgressDialog
 import android.content.Context
 import android.util.Log
 import android.widget.Toast
+import com.kabarak.kabarakmhis.fhir.data.Constants.DEMO_API_SERVER
 import com.kabarak.kabarakmhis.fhir.data.Constants.DEMO_SERVER
 import com.kabarak.kabarakmhis.fhir.data.SYNC_VALUE
 import com.kabarak.kabarakmhis.helperclass.*

diff --git a/app/src/main/java/com/kabarak/kabarakmhis/new_designs/chw/FragmentConfirmChvPatient.kt b/app/src/main/java/com/kabarak/kabarakmhis/new_designs/chw/FragmentConfirmChvPatient.kt
@@ -24,7 +24,6 @@ import com.kabarak.kabarakmhis.fhir.FhirApplication
 import com.kabarak.kabarakmhis.helperclass.*
 import com.kabarak.kabarakmhis.new_designs.chw.viewmodel.AddChwPatientViewModel
 import com.kabarak.kabarakmhis.new_designs.data_class.*
-import com.kabarak.kabarakmhis.new_designs.new_patient.FragmentConfirmPatient.Companion.EXTRA_QUESTIONNAIRE_JSON_STRING
 import com.kabarak.kabarakmhis.new_designs.roomdb.KabarakViewModel
 import com.kabarak.kabarakmhis.new_designs.screens.ConfirmParentAdapter
 import com.kabarak.kabarakmhis.new_designs.screens.FragmentConfirmDetails

diff --git a/app/src/main/java/com/kabarak/kabarakmhis/pnc/ChildAdd.kt b/app/src/main/java/com/kabarak/kabarakmhis/pnc/ChildAdd.kt
@@ -32,7 +32,7 @@ class ChildAdd : AppCompatActivity() {
         retrofitCallsFhir = RetrofitCallsFhir()
 
         // Load the questionnaire JSON
-        questionnaireJsonString = getStringFromAssets("congenital_abnormalities.json")
+        questionnaireJsonString = getStringFromAssets("new-patient-registration.json")
 
         if (savedInstanceState == null && questionnaireJsonString != null) {
             supportFragmentManager.commit {
@@ -92,6 +92,7 @@ class ChildAdd : AppCompatActivity() {
                 override fun onResponse(call: Call<ResponseBody>, response: Response<ResponseBody>) {
                     if (response.isSuccessful) {
                         Toast.makeText(this@ChildAdd, "Successfully submitted!", Toast.LENGTH_SHORT).show()
+                        finish()
                         Log.d("ChildAdd", "Successfully submitted the questionnaire response.")
                     } else {
                         Toast.makeText(this@ChildAdd, "Submission failed: ${response.message()}", Toast.LENGTH_SHORT).show()

diff --git a/app/src/main/java/com/kabarak/kabarakmhis/pnc/ChildEdit.kt b/app/src/main/java/com/kabarak/kabarakmhis/pnc/ChildEdit.kt
@@ -166,6 +166,9 @@ class ChildEdit : AppCompatActivity() {
             val jsonParser = fhirContext.newJsonParser()
             val updatedResponseString = jsonParser.encodeResourceToString(updatedQuestionnaireResponse)
 
+            // Log the response (you can replace this with saving to a database or sending to a server)
+            Log.d("submitUpdatedResponse", updatedResponseString)
+
             // Submit the updated response back to the server
             retrofitCallsFhir.updateQuestionnaireResponse(responseId, updatedResponseString, object : Callback<ResponseBody> {
                 override fun onResponse(call: Call<ResponseBody>, response: Response<ResponseBody>) {
@@ -185,6 +188,7 @@ class ChildEdit : AppCompatActivity() {
                 override fun onFailure(call: Call<ResponseBody>, t: Throwable) {
                     CoroutineScope(Dispatchers.Main).launch {
                         Toast.makeText(this@ChildEdit, "Error occurred while updating: ${t.message}", Toast.LENGTH_SHORT).show()
+                        Log.e("Error", "Error occurred while updating questionnaire response", t)
                     }
                 }
             })

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -3,8 +3,7 @@
 
     <!--    Development Servers-->
     <string name="base_url">http://10.1.57.245:5000/</string>
-    <string name="fhir_url">http://10.1.57.245:8080/fhir/</string>
-
+    <string name="fhir_url">http://41.89.93.172/fhir/</string>
 
 
     <!--    Live Servers-->
@@ -69,8 +68,14 @@
     <string name="facility_from_facility">Facility from facility referral</string>
     <string name="clients_records">Clients Records</string>
     <string name="referrals_to_facility">Referrals to Facility</string>
-    <string name="first_fragment_label">hh</string>
-    <string name="second_fragment_label">fragment 2</string>
+    <string name="add_child">add child</string>
+    <string name="child_added_success">add child success</string>
+    <string name="child_saved_success">save child success</string>
+    <string name="child_saved_failed">save child failed</string>
+    <string name="child_deleted_success">delete child success</string>
+    <string name="child_deleted_failed">delete child failed</string>
+    <string name="child_updated_success">update child success</string>
+    <string name="child_updated_failed">update child failed</string>
 
     <string-array name="array_marital">
         <item>Married</item>