Bug Fixes

opensrp-chw/src/kk/assets/json.form/group_session.json

@@ -132,6 +132,13 @@
         "openmrs_entity": "concept",
         "openmrs_entity_id": "session_duration",
         "type": "hidden"
+      },
+      {
+        "key": "session_duration_minutes",
+        "openmrs_entity_parent": "",
+        "openmrs_entity": "concept",
+        "openmrs_entity_id": "session_duration_minutes",
+        "type": "hidden"
       }
     ]
   },

opensrp-chw/src/kk/java/org/smartregister/chw/fragment/GcFinalStepFragment.java

@@ -69,6 +69,8 @@ public class GcFinalStepFragment extends BaseGroupSessionRegisterFragment {
     CheckBox activityReview;
     CheckBox activityOne;
     CheckBox activityTwo;
+
+    CheckBox activityNutrition;
     CheckBox activityRecap;
     CheckBox activityClosingSong;
 
@@ -80,6 +82,9 @@ public class GcFinalStepFragment extends BaseGroupSessionRegisterFragment {
     CheckBox difficultReview;
     CheckBox difficultActivity1;
     CheckBox difficultActivity2;
+
+    CheckBox difficultNutrition;
+
     CheckBox difficultRecap;
     CheckBox difficultClosingSong;
 
@@ -94,6 +99,8 @@ public class GcFinalStepFragment extends BaseGroupSessionRegisterFragment {
 
     TextInputEditText etDurationInHours;
 
+    TextInputEditText etDurationMinutes;
+
     ProgressBar progressBar;
     MaterialButton submitButton;
 
@@ -196,6 +203,19 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
             }
         });
 
+        difficultNutrition = view.findViewById(R.id.difficult_nutrition_activity);
+
+        difficultNutrition.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if(isChecked){
+                     listOfDifficultActivities.add(KkConstants.GCActivities.NUTRITION_ACTIVITY);
+                }else{
+                    listOfDifficultActivities.remove(KkConstants.GCActivities.NUTRITION_ACTIVITY);
+                }
+            }
+        });
+
         difficultRecap = view.findViewById(R.id.difficult_recap_session);
         difficultRecap.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
@@ -321,6 +341,19 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
             }
         });
 
+        activityNutrition = view.findViewById(R.id.nutrition_activity);
+
+        activityNutrition.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if(isChecked){
+                     activitiesTookPlace.add(KkConstants.GCActivities.NUTRITION_ACTIVITY);
+                }else{
+                    activitiesTookPlace.remove(KkConstants.GCActivities.NUTRITION_ACTIVITY);
+                }
+            }
+        });
+
         activityRecap = view.findViewById(R.id.recap_session);
         activityRecap.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
@@ -484,6 +517,8 @@ public void onClick(View view) {
 
         etDurationInHours = view.findViewById(R.id.et_session_duration);
 
+        etDurationMinutes = view.findViewById(R.id.et_session_duration_minutes);
+
         progressBar = view.findViewById(R.id.progress_bar);
 
     }
@@ -517,7 +552,9 @@ public void getSessionDetails() {
         sessionModel.setCaregiversBroughtMaterials(caregiversBroughtMaterials);
         sessionModel.setTopicsCovered(topicsCovered);
         String durationString = etDurationInHours != null ? etDurationInHours.getText().toString().trim() : "";
+        String durationMinutesString = etDurationMinutes != null ? etDurationMinutes.getText().toString().trim() : "";
         sessionModel.setDurationInHours(!durationString.isEmpty() ? Integer.parseInt(durationString): 0);
+        sessionModel.setDurationInMinutes(!durationMinutesString.isEmpty() ? Integer.parseInt(durationMinutesString): 0);
         //Toast.makeText(getContext(), "Group Session Information Recorded", Toast.LENGTH_SHORT).show();
 
     }
@@ -596,12 +633,6 @@ private boolean validateFields(){
         if (durationString.isEmpty()) {
             isValid = false;
             etDurationInHours.setError("Please enter session duration");
-        } else {
-            int duration = Integer.parseInt(durationString);
-            if (duration <= 0) {
-                isValid = false;
-                etDurationInHours.setError("Duration must be greater than 0");
-            }
         }
 
         return isValid;

opensrp-chw/src/kk/java/org/smartregister/chw/model/GroupSessionModel.java

@@ -28,6 +28,7 @@ public class GroupSessionModel {
     private List<String> topicsCovered;
     private int durationInHours;
 
+    private int durationInMinutes;
     private boolean childrenDividedInGroups;
 
     public GroupSessionModel(){
@@ -178,4 +179,10 @@ public boolean isAnyDifficultActivities() {
         return anyDifficultActivities;
     }
 
+    public void setDurationInMinutes(int minutes) {
+        this.durationInMinutes = minutes;
+    }
+    public int getDurationInMinutes() {
+        return durationInMinutes;
+    }
 }

opensrp-chw/src/kk/java/org/smartregister/chw/util/KkConstants.java

@@ -130,6 +130,7 @@ public static class GCActivities {
         public static final String REVIEW_PREVIOUS_WEEK = "review_of_the_week";
         public static final String ACTIVITY_1 = "activity_1";
         public static final String ACTIVITY_2 = "activity_2";
+        public static final String NUTRITION_ACTIVITY = "nutrition";
         public static final String RECAP_SESSION = "recap_session";
         public static final String CLOSING_SONG = "closing_song";
     }
@@ -157,6 +158,8 @@ public static class GCJsonKeys {
         public static final String GC_SESSION_ID = "session_id";
         public static final String GC_SESSION_PLACE = "session_place";
         public static final String GC_SESSION_DURATION = "session_duration";
+
+        public static final String GC_SESSION_DURATION_MINUTES = "session_duration_minutes";
         public static final String GC_ACTIVITIES_TOOK_PLACE = "activities_took_place";
 
         public static final String GC_DIVIDE_CHILDREN_DIFFERENT_AGE_GROUPS = "divide_children_different_age_groups";

opensrp-chw/src/main/java/org/smartregister/chw/interactor/GroupSessionInteractor.java

@@ -327,6 +327,9 @@ private void processPopulatableFields(JSONObject field, GroupSessionModel sessio
             case KkConstants.GCJsonKeys.GC_SESSION_DURATION:
                 field.put(org.smartregister.chw.util.JsonFormUtils.VALUE, sessionModel.getDurationInHours());
                 break;
+            case KkConstants.GCJsonKeys.GC_SESSION_DURATION_MINUTES:
+                field.put(org.smartregister.chw.util.JsonFormUtils.VALUE, sessionModel.getDurationInMinutes());
+                break;
             case KkConstants.GCJsonKeys.GC_ACTIVITIES_TOOK_PLACE:
                 field.put(org.smartregister.chw.util.JsonFormUtils.VALUE, sessionModel.getActivitiesTookPlace());
                 break;