Merge branch 'goonj-feb-2025-phase1'

Author: vedfordev

goonj/src/main/java/org/avni_integration_service/goonj/domain/ActivityConstants.java

@@ -44,4 +44,8 @@ public interface ActivityConstants {
     String FORM_CROSS_CHECKED ="Form Cross Checked?";
     String REMARKS ="Remarks";
     String OTHER_ACTIVITY = "Specify other activity";
+    String EDUCATION_AND_HEALTH = "Education And Health";
+    String MALE_STUDENT = "Number of students (Male)";
+    String FEMALE_STUDENT = "Number of students (Female)";
+    String YES = "Yes";
 }

goonj/src/main/java/org/avni_integration_service/goonj/domain/DistributionConstants.java

@@ -72,4 +72,5 @@ public interface DistributionConstants {
     String RECEIVER_LIST_PHOTOGRAPHS = "Receiver List Photographs";
     String TYPE_OF_COMMUNITY = "Type Of Community";
     String ANY_OTHER_MATERIAL_GIVEN = "Details for Any other (SI)";
+    String EDUCTION_AND_HEALTH = "Education and Health";
 }

goonj/src/main/java/org/avni_integration_service/goonj/dto/ActivityDTO.java

@@ -152,6 +152,12 @@ public class ActivityDTO {
     private String remarks;
     @JsonProperty("OtherDetails")
     private String otherDetails;
+    @JsonProperty("EducationandHealth")
+    private boolean isEducationAndHealth;
+    @JsonProperty("NumberOfStudentsMale")
+    private int maleStudent;
+    @JsonProperty("NumberOfStudentsFemale")
+    private int femaleStudent;
     /**
      * No args constructor for use in serialization
      */
@@ -171,6 +177,9 @@ public ActivityDTO() {
      * @param noofparticipantsS2S
      * @param nos
      * @param typeofInitiative
+     * @param isEducationAndHealth
+     * @param maleStudent
+     * @param femaleStudent
      * @param diameter
      * @param activityEndDate
      * @param measurementType
@@ -217,7 +226,7 @@ public ActivityDTO(String sourceId, String nameOfAccount, String activityCategor
                        int noofparticipantsMaleCFW, int noofparticipantsMaleNJPC, int noofparticipantsNJPCOther,
                        int noofparticipantsCFWOther, Long noofparticipantsS2S,
                        Long noofWorkingDays, Integer nos, String objectiveofCFWwork, String schoolAanganwadiLearningCenterName,
-                       String state, String typeofInitiative, String otherObjective, String otherSubType,
+                       String state, String typeofInitiative, boolean isEducationAndHealth,int maleStudent,int femaleStudent, String otherObjective, String otherSubType,
                        String createdBy, String modifiedBy, String beforeImplementationPhotograph, String duringImplementationPhotograph,
                        String afterImplementationPhotograph, String wasUndertakingFormFilled, String formCrossChecked, String remarks,
                        String otherDetails) {
@@ -261,6 +270,9 @@ public ActivityDTO(String sourceId, String nameOfAccount, String activityCategor
         this.schoolAanganwadiLearningCenterName = schoolAanganwadiLearningCenterName;
         this.state = state;
         this.typeofInitiative = typeofInitiative;
+        this.isEducationAndHealth = isEducationAndHealth;
+        this.maleStudent = maleStudent;
+        this.femaleStudent = femaleStudent;
         this.createdBy = createdBy;
         this.modifiedBy = modifiedBy;
         this.beforeImplementationPhotograph = beforeImplementationPhotograph;
@@ -742,4 +754,34 @@ public String getOtherDetails() {
     public void setOtherDetails(String otherDetails) {
         this.otherDetails = otherDetails;
     }
+
+    @JsonProperty("EducationandHealth")
+    public boolean isEducationAndHealth() {
+        return isEducationAndHealth;
+    }
+
+    @JsonProperty("EducationandHealth")
+    public void setEducationAndHealth(boolean educationAndHealth) {
+        isEducationAndHealth = educationAndHealth;
+    }
+
+    @JsonProperty("NumberOfStudentsMale")
+    public int getMaleStudent() {
+        return maleStudent;
+    }
+
+    @JsonProperty("NumberOfStudentsMale")
+    public void setMaleStudent(int maleStudent) {
+        this.maleStudent = maleStudent;
+    }
+
+    @JsonProperty("NumberOfStudentsFemale")
+    public int getFemaleStudent() {
+        return femaleStudent;
+    }
+
+    @JsonProperty("NumberOfStudentsFemale")
+    public void setFemaleStudent(int femaleStudent) {
+        this.femaleStudent = femaleStudent;
+    }
 }

goonj/src/main/java/org/avni_integration_service/goonj/repository/ActivityRepository.java

@@ -156,6 +156,17 @@ private ActivityDTO createActivityRequest(Subject subject) {
             activityDTO.setNoofparticipantsNJPCOther((Integer) subject.getObservation(NUMBER_OF_PARTICIPANTS_OTHER));
             /* Photograph fields */
             activityDTO.setNjpcPhotograph(getPhotographStrings(PHOTOGRAPH, subject));
+            /*Education fields*/
+            String educationAndHealth = (String) subject.getObservation(EDUCATION_AND_HEALTH);
+            if(educationAndHealth!=null && educationAndHealth.equals(YES)){
+                activityDTO.setEducationAndHealth(true);
+                activityDTO.setMaleStudent((int)subject.getObservation(MALE_STUDENT));
+                activityDTO.setFemaleStudent((int)subject.getObservation(FEMALE_STUDENT));
+                activityDTO.setSchoolAanganwadiLearningCenterName((String)subject.getObservation(SCHOOL_AANGANWADI_LEARNINGCENTER_NAME));
+            }
+            else{
+                activityDTO.setEducationAndHealth(false);
+            }
         }
         activityDTO.setWasUndertakingFormFilled((String) subject.getObservation(WAS_DISCLAIMER_FORM_FILLED));
         activityDTO.setRemarks((String) subject.getObservation(REMARKS));

goonj/src/main/java/org/avni_integration_service/goonj/repository/DistributionRepository.java

@@ -162,7 +162,12 @@ else if (subject.getObservation(TYPE_OF_INITIATIVE).equals(VAAPSI)) {
             distributionDTO.setNoOfFamiliesReached((Integer) subject.getObservation(NUMBER_OF_FAMILIES_REACHED));
             distributionDTO.setNoOfIndividualReached((Integer) subject.getObservation(NUMBER_OF_INDIVIDUALS_REACHED));
 
-        } else {
+        } else if(subject.getObservation(TYPE_OF_INITIATIVE).equals(EDUCTION_AND_HEALTH)){
+            distributionDTO.setTypeOfInitiative((String) subject.getObservation(TYPE_OF_INITIATIVE));
+            distributionDTO.setSchoolAanganwadiLearningCenterName((String) subject.getObservation(SCHOOL_ANGANWADI_NAME));
+            distributionDTO.setTypeOfSchool((String) subject.getObservation(TYPE_OF_SCHOOL));
+        }
+        else {
             distributionDTO.setTypeOfInitiative((String) subject.getObservation(TYPE_OF_INITIATIVE));
         }
         distributionDTO.setReportsCrosschecked((String) subject.getObservation(REPORTS_CROSS_CHECKED));