#24 | Fields addition to activity and distribution forms

Author: mahalakshme

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

@@ -48,4 +48,6 @@ public interface ActivityConstants {
     String MALE_STUDENT = "Number of students (Male)";
     String FEMALE_STUDENT = "Number of students (Female)";
     String YES = "Yes";
+    String NO_OF_PLANTATION = "Number of Plantation - S2S";
+    String NO_OF_SEED_BALLS = "Number of Seed Balls - S2S";
 }

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

@@ -45,6 +45,7 @@ public interface DistributionConstants {
     String NUMBER_OF_RECEIVERS = "Total Number of Receivers";
     String ANY_OTHER_DOCUMENT_SUBMITTED = "Any Other Document Submitted";
     String CENTERS_NAME = "Centre’s Name";
+    String IS_CENTER_A_SCHOOL_ANGANWADI_LEARNING_CENTRE = "Is Centre a School/Anganwadi/Learning Centre?";
     String PROVIDED_MATERIAL = "Share a Brief Provided Material";
     String MATERIAL_MAKES_DIFFERENCE = "How the Material Makes a Difference";
     String MATERIAL_GIVEN_FOR = "Material Given for";

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

@@ -36,6 +36,8 @@
         "NoofdaysofParticipationS2S",
         "NoofdaysofParticipationNJPC",
         "ActivityConductedWithStudents",
+        "NumberofPlantationS2S",
+        "NumberofSeedBallsS2S",
         "TypeOfSchool",
         "S2SPhotograph",
         "NJPCPhotograph",
@@ -161,6 +163,11 @@ public class ActivityDTO {
     private int maleStudent;
     @JsonProperty("NumberOfStudentsFemale")
     private int femaleStudent;
+    @JsonProperty("NumberofPlantationS2S")
+    private int noOfPlantationS2S;
+    @JsonProperty("NumberofSeedBallsS2S")
+    private int noOfSeedBallsS2S;
+
     /**
      * No args constructor for use in serialization
      */
@@ -799,4 +806,24 @@ public int getFemaleStudent() {
     public void setFemaleStudent(int femaleStudent) {
         this.femaleStudent = femaleStudent;
     }
+
+    @JsonProperty("NumberofPlantationS2S")
+    public int getNoOfPlantationS2S() {
+        return noOfPlantationS2S;
+    }
+
+    @JsonProperty("NumberofPlantationS2S")
+    public void setNoOfPlantationS2S(int noOfPlantationS2S) {
+        this.noOfPlantationS2S = noOfPlantationS2S;
+    }
+
+    @JsonProperty("NumberofSeedBallsS2S")
+    public int getNoOfSeedBallsS2S() {
+        return noOfSeedBallsS2S;
+    }
+
+    @JsonProperty("NumberofSeedBallsS2S")
+    public void setNoOfSeedBallsS2S(int noOfSeedBallsS2S) {
+        this.noOfSeedBallsS2S = noOfSeedBallsS2S;
+    }
 }

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

@@ -13,7 +13,7 @@
         "activities", "surveyedBy", "monitoredByOrDistributor", "approvedOrVerifiedBy", "teamOrExternal", "nameOfPOC",
         "pocContactNo", "reachedTo", "totalNumberOfReceivers", "groupName", "anyOtherDocumentSubmitted", "reportsCrosschecked",
         "name", "gender", "age", "fatherMotherName", "phoneNumber", "presentOccupation", "monthlyIncome", "noOfFamilyMember",
-        "centreName", "shareABriefProvidedMaterial", "howtheMaterialMakesaDifference", "materialGivenFor", "noOfIndividualReached",
+        "centreName", "IsCenteraSchoolAnganwadiLearning", "shareABriefProvidedMaterial", "howtheMaterialMakesaDifference", "materialGivenFor", "noOfIndividualReached",
         "remarks", "TypeOfSchool", "SchoolAanganwadiLearningCenterName","UndertakingFormPhotographs","ReceiverListPhotographs",
         "OtherDetails","materialProvidedAsPartOfRahat"})
 public class DistributionDTO {
@@ -96,6 +96,8 @@ public class DistributionDTO {
     private Integer noOfFamilyMember;
     @JsonProperty("centreName")
     private String centreName;
+    @JsonProperty("IsCenteraSchoolAnganwadiLearning")
+    private String IsCenteraSchoolAnganwadiLearning;
     @JsonProperty("shareABriefProvidedMaterial")
     private String shareABriefProvidedMaterial;
     @JsonProperty("howtheMaterialMakesaDifference")
@@ -636,6 +638,16 @@ public void setCentreName(String centreName) {
         this.centreName = centreName;
     }
 
+    @JsonProperty("IsCenteraSchoolAnganwadiLearning")
+    public String getIsCenteraSchoolAnganwadiLearning() {
+        return IsCenteraSchoolAnganwadiLearning;
+    }
+
+    @JsonProperty("IsCenteraSchoolAnganwadiLearning")
+    public void setIsCenteraSchoolAnganwadiLearning(String isCenteraSchoolAnganwadiLearning) {
+        IsCenteraSchoolAnganwadiLearning = isCenteraSchoolAnganwadiLearning;
+    }
+
     @JsonProperty("shareABriefProvidedMaterial")
     public String getShareABriefProvidedMaterial() {
         return shareABriefProvidedMaterial;

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

@@ -103,6 +103,8 @@ private ActivityDTO createActivityRequest(Subject subject) {
         if (studentActivities != null) {
             activityDTO.setActivityConductedWithStudents(String.join(";", studentActivities));
         }
+        activityDTO.setNoOfPlantationS2S((Integer) subject.getObservation(NO_OF_PLANTATION));
+        activityDTO.setNoOfSeedBallsS2S((Integer) subject.getObservation(NO_OF_SEED_BALLS));
         activityDTO.setOtherDetails((String) subject.getObservation(OTHER_ACTIVITY));
         activityDTO.setSchoolAanganwadiLearningCenterName((String) subject.getObservation(SCHOOL_AANGANWADI_LEARNINGCENTER_NAME));
 

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

@@ -157,6 +157,7 @@ else if (subject.getObservation(TYPE_OF_INITIATIVE).equals(VAAPSI)) {
         } else if (subject.getObservation(TYPE_OF_INITIATIVE).equals(SPECIFIC_INITIATIVE)) {
             distributionDTO.setTypeOfInitiative((String) subject.getObservation(TYPE_OF_INITIATIVE));
             distributionDTO.setCentreName((String) subject.getObservation(CENTERS_NAME));
+            distributionDTO.setIsCenteraSchoolAnganwadiLearning((String) subject.getObservation(IS_CENTER_A_SCHOOL_ANGANWADI_LEARNING_CENTRE));
             distributionDTO.setShareABriefProvidedMaterial((String) subject.getObservation(PROVIDED_MATERIAL));
             distributionDTO.setHowtheMaterialMakesaDifference((String) subject.getObservation(MATERIAL_MAKES_DIFFERENCE));
             distributionDTO.setMaterialGivenFor((String) subject.getObservation(MATERIAL_GIVEN_FOR));