fix dont send diagnosis 1,2,3,4 to graphql

Author: vaneck237

claimManagement/build.gradle

@@ -81,7 +81,7 @@ android {
         comoresDev{
             applicationIdSuffix ".comoresDev"
             resValue "string", "app_name_claims", "Claims Comores"
-            buildConfigField "String", "API_BASE_URL", '"https://dev.amg.km/"'
+            buildConfigField "String", "API_BASE_URL", '"https://test.amg.km/"'
             dimension 'std'
         }
 

claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java

@@ -580,8 +580,13 @@ private void fillClaimFromDatabase(String claimUUID) {
                         }
 
                         if(rgVisitType.getCheckedRadioButtonId() == R.id.rbReferral){
-                            etReferralCode.setEnabled(true);
-                            etReferalHF.setEnabled(true);
+                            if(isIntentReadonly()){
+                                disableView(etReferalHF);
+                                disableView(etReferralCode);
+                            }else{
+                                etReferralCode.setEnabled(true);
+                                etReferalHF.setEnabled(true);
+                            }
                         }else{
                             disableView(etReferalHF);
                             disableView(etReferralCode);

claimManagement/src/main/java/org/openimis/imisclaims/network/request/CreateClaimGraphQLRequest.java

@@ -44,7 +44,11 @@ public PostNewClaims.Result create(
             @NonNull int adminId,
             @NonNull int insureeId,
             @NonNull int diagnosisId,
-            @NonNull int referFromId
+            @NonNull int referFromId,
+            @NonNull int icd1Id,
+            @NonNull int icd2Id,
+            @NonNull int icd3Id,
+            @NonNull int icd4Id
     ) throws Exception{
 
         String claimServices = "";
@@ -128,6 +132,26 @@ public PostNewClaims.Result create(
             referFrom = " referFromId: " + referFromId;
         }
 
+        String icd1 = "";
+        if(icd1Id != 0){
+            icd1 = "icd1Id: "+ icd1Id;
+        }
+
+        String icd2 = "";
+        if(icd2Id != 0){
+            icd2 = "icd2Id: "+ icd2Id;
+        }
+
+        String icd3 = "";
+        if(icd3Id != 0){
+            icd3 = "icd3Id: "+ icd3Id;
+        }
+
+        String icd4 = "";
+        if(icd4Id != 0){
+            icd4 = "icd4Id: "+ icd4Id;
+        }
+
         String QUERY_DOCUMENT = QueryDocumentMinifier.minify(
                 "mutation {"
                         + "  createClaim(input: {"
@@ -137,6 +161,11 @@ public PostNewClaims.Result create(
                         + " dateFrom: \"" + DateUtils.toDateString(claim.getStartDate()) + "\""
                         + " dateTo: \"" + DateUtils.toDateString(claim.getEndDate()) + "\""
                         + " icdId: " + diagnosisId
+                        + icd1
+                        + icd2
+                        + icd3
+                        + icd4
+                        + " guaranteeId: \"" + claim.getGuaranteeNumber() + "\""
                         + " dateClaimed: \"" + DateUtils.toDateString(claim.getClaimDate()) + "\""
                         + referFrom
                         + " referralCode: \"" + claim.getReferralCode() + "\""

claimManagement/src/main/java/org/openimis/imisclaims/usecase/CreateClaims.java

@@ -48,12 +48,28 @@ public List<PostNewClaims.Result> execute(
             int insureeId = Integer.parseInt(new FetchInsuree().execute(pendingClaim.getChfId()));
             int adminId = Integer.parseInt(new FetchClaimAdmin().execute(pendingClaim.getClaimAdmin()));
             int icdId = Integer.parseInt(new FetchDiagnose().execute(pendingClaim.getIcdCode()));
+            int icd1Id = 0;
+            int icd2Id = 0;
+            int icd3Id = 0;
+            int icd4Id = 0;
+            if(pendingClaim.getIcdCode1() != null){
+                icd1Id = Integer.parseInt(new FetchDiagnose().execute(pendingClaim.getIcdCode1()));
+            }
+            if(pendingClaim.getIcdCode2() != null){
+                icd2Id = Integer.parseInt(new FetchDiagnose().execute(pendingClaim.getIcdCode2()));
+            }
+            if(pendingClaim.getIcdCode3() != null){
+                icd3Id = Integer.parseInt(new FetchDiagnose().execute(pendingClaim.getIcdCode3()));
+            }
+            if(pendingClaim.getIcdCode4() != null){
+                icd4Id = Integer.parseInt(new FetchDiagnose().execute(pendingClaim.getIcdCode4()));
+            }
             String hfId = sqlHandler.getHfId(pendingClaim.getHealthFacilityCode());
             int referFromId = 0;
             if(pendingClaim.getReferalHF() != null && !pendingClaim.getReferalHF().isEmpty()){
                 referFromId = Integer.parseInt(sqlHandler.getHfId(pendingClaim.getReferalHF()));
             }
-            results.add(createClaimGraphQLRequest.create(pendingClaim,Integer.parseInt(hfId),adminId,insureeId,icdId, referFromId));
+            results.add(createClaimGraphQLRequest.create(pendingClaim,Integer.parseInt(hfId),adminId,insureeId,icdId, referFromId, icd1Id, icd2Id, icd3Id, icd4Id));
         }
         return results;
     }

claimManagement/src/main/res/layout/activity_about.xml

@@ -43,7 +43,7 @@
             android:layout_height="match_parent"
             android:layout_marginStart="10dp"
             android:fontFamily="sans-serif-light"
-            android:text="2.1.0"
+            android:text="2.1.1"
             android:textColor="@color/white"
             android:textSize="18sp"
             android:typeface="monospace" />

claimManagement/src/main/res/layout/activity_claim.xml

@@ -145,7 +145,6 @@
                     android:ems="10"
                     android:fontFamily="sans-serif-light"
                     android:hint="@string/Diagnosis1"
-                    android:maxLength="6"
 
                     />
 
@@ -156,8 +155,7 @@
                     android:layout_weight="1"
                     android:ems="10"
                     android:fontFamily="sans-serif-light"
-                    android:hint="@string/Diagnosis2"
-                    android:maxLength="6" />
+                    android:hint="@string/Diagnosis2" />
             </LinearLayout>
 
             <LinearLayout
@@ -172,8 +170,7 @@
                     android:layout_weight="1"
                     android:ems="10"
                     android:fontFamily="sans-serif-light"
-                    android:hint="@string/Diagnosis3"
-                    android:maxLength="6" />
+                    android:hint="@string/Diagnosis3"/>
 
                 <AutoCompleteTextView
                     android:id="@+id/etDiagnosis4"
@@ -182,8 +179,7 @@
                     android:layout_weight="1"
                     android:ems="10"
                     android:fontFamily="sans-serif-light"
-                    android:hint="@string/Diagnosis4"
-                    android:maxLength="6" />
+                    android:hint="@string/Diagnosis4"/>
 
 
             </LinearLayout>