Ticket 6529|Updated changes for activity to set number of participants for NJPC education and health accordingly with Goonj salesforce changes.

Author: ramakanthk711

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

@@ -32,6 +32,7 @@
         "NoofparticipantsFemaleNJPC",
         "NoofparticipantsNJPCOther",
         "NoofparticipantsS2S",
+        "NoofparticipantsNJPC",
         "NoofdaysofParticipationS2S",
         "NoofdaysofParticipationNJPC",
         "ActivityConductedWithStudents",
@@ -116,6 +117,8 @@ public class ActivityDTO {
     private int noofparticipantsNJPCOther;
     @JsonProperty("NoofparticipantsCFWOther")
     private int noofparticipantsCFWOther;
+    @JsonProperty("NoofparticipantsNJPC")
+    private Long noofparticipantsNJPC;
     @JsonProperty("NoofparticipantsS2S")
     private Long noofparticipantsS2S;
     @JsonProperty("NoofWorkingDays")
@@ -175,6 +178,7 @@ public ActivityDTO() {
      * @param noofdaysofParticipationNJPC
      * @param noofWorkingDays
      * @param noofparticipantsS2S
+     * @param noofparticipantsNJPC
      * @param nos
      * @param typeofInitiative
      * @param isEducationAndHealth
@@ -224,7 +228,7 @@ public ActivityDTO(String sourceId, String nameOfAccount, String activityCategor
                        String localityVillageName, String tolaMohalla, String measurementType, Long noofdaysofParticipationNJPC,
                        Long noofdaysofParticipationS2S, int noofparticipantsFemaleCFW, int noofparticipantsFemaleNJPC,
                        int noofparticipantsMaleCFW, int noofparticipantsMaleNJPC, int noofparticipantsNJPCOther,
-                       int noofparticipantsCFWOther, Long noofparticipantsS2S,
+                       int noofparticipantsCFWOther, Long noofparticipantsS2S,Long noofparticipantsNJPC,
                        Long noofWorkingDays, Integer nos, String objectiveofCFWwork, String schoolAanganwadiLearningCenterName,
                        String state, String typeofInitiative, boolean isEducationAndHealth,int maleStudent,int femaleStudent, String otherObjective, String otherSubType,
                        String createdBy, String modifiedBy, String beforeImplementationPhotograph, String duringImplementationPhotograph,
@@ -262,6 +266,7 @@ public ActivityDTO(String sourceId, String nameOfAccount, String activityCategor
         this.noofparticipantsNJPCOther = noofparticipantsNJPCOther;
         this.noofparticipantsCFWOther = noofparticipantsCFWOther;
         this.noofparticipantsS2S = noofparticipantsS2S;
+        this.noofparticipantsNJPC = noofparticipantsNJPC;
         this.noofWorkingDays = noofWorkingDays;
         this.nos = nos;
         this.objectiveofCFWwork = objectiveofCFWwork;
@@ -590,6 +595,16 @@ public void setNoofparticipantsS2S(Long noofparticipantsS2S) {
         this.noofparticipantsS2S = noofparticipantsS2S;
     }
 
+    @JsonProperty("NoofparticipantsNJPC")
+    public Long getNoofparticipantsNJPC() {
+        return noofparticipantsNJPC;
+    }
+
+    @JsonProperty("NoofparticipantsNJPC")
+    public void setNoofparticipantsNJPC(Long noofparticipantsNJPC) {
+        this.noofparticipantsNJPC = noofparticipantsNJPC;
+    }
+
     @JsonProperty("NoofWorkingDays")
     public Long getNoofWorkingDays() {
         return noofWorkingDays;

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

@@ -164,7 +164,7 @@ private ActivityDTO createActivityRequest(Subject subject) {
                 activityDTO.setFemaleStudent((subject.getObservation(FEMALE_STUDENT) == null) ? 0 : (int)subject.getObservation(FEMALE_STUDENT));
                 int male = (subject.getObservation(MALE_STUDENT)==null) ? 0 : (int)subject.getObservation(MALE_STUDENT);
                 int female = (subject.getObservation(FEMALE_STUDENT)==null) ? 0 : (int)subject.getObservation(FEMALE_STUDENT);
-                activityDTO.setNoofparticipantsS2S(Long.valueOf((subject.getObservation(NUMBER_OF_PARTICIPANTS) == null) ? (male+female) : (Integer) subject.getObservation(NUMBER_OF_PARTICIPANTS)));
+                activityDTO.setNoofparticipantsNJPC(Long.valueOf((subject.getObservation(NUMBER_OF_PARTICIPANTS) == null) ? (male+female) : (Integer) subject.getObservation(NUMBER_OF_PARTICIPANTS)));
                 activityDTO.setSchoolAanganwadiLearningCenterName((String)subject.getObservation(SCHOOL_AANGANWADI_LEARNINGCENTER_NAME));
             }
             else{