=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java' --- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2013-10-30 09:29:07 +0000 +++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2013-10-31 04:02:42 +0000 @@ -158,14 +158,21 @@ private MessageService messageService; private SmsSender smsSender; + + private PatientAttributeService patientAttributeService; + + private Collection patientIdentifierTypes; + private Collection patientAttributes; + + private Integer patientId; + @Autowired private OrganisationUnitService organisationUnitService; - - public PatientAttributeService getPatientAttributeService() - { - return patientAttributeService; - } + + // ------------------------------------------------------------------------- + // Setters + // ------------------------------------------------------------------------- public void setPatientIdentifierTypeService( PatientIdentifierTypeService patientIdentifierTypeService ) { @@ -189,51 +196,12 @@ this.smsSender = smsSender; } - private Collection patientIdentifierTypes; - - public Collection getPatientIdentifierTypes() - { - return patientIdentifierTypes; - } - - public void setPatientIdentifierTypes( Collection patientIdentifierTypes ) - { - this.patientIdentifierTypes = patientIdentifierTypes; - } - - private Collection patientAttributes; - - public Collection getPatientAttributes() - { - return patientAttributes; - } - - public void setPatientAttributes( Collection patientAttributes ) - { - this.patientAttributes = patientAttributes; - } - - private PatientAttributeService patientAttributeService; - public void setPatientAttributeService( PatientAttributeService patientAttributeService ) { this.patientAttributeService = patientAttributeService; } - private Integer patientId; - - public Integer getPatientId() - { - return patientId; - } - - public void setPatientId( Integer patientId ) - { - this.patientId = patientId; - } - - public void setProgramStageInstanceService( - org.hisp.dhis.program.ProgramStageInstanceService programStageInstanceService ) + public void setProgramStageInstanceService( ProgramStageInstanceService programStageInstanceService ) { this.programStageInstanceService = programStageInstanceService; } @@ -268,21 +236,11 @@ this.modelMapping = modelMapping; } - public PatientMobileSetting getSetting() - { - return setting; - } - public void setSetting( PatientMobileSetting setting ) { this.setting = setting; } - public org.hisp.dhis.patient.PatientAttribute getGroupByAttribute() - { - return groupByAttribute; - } - public void setGroupByAttribute( org.hisp.dhis.patient.PatientAttribute groupByAttribute ) { this.groupByAttribute = groupByAttribute; @@ -1817,6 +1775,7 @@ String programIdText ) throws NotAllowedException { + System.out.println("program IDDDDDDDDDDDDDDDDDDdd: "+programIdText); org.hisp.dhis.patient.Patient patientWeb = new org.hisp.dhis.patient.Patient(); patientWeb.setName( patient.getName() );