← Back to branch summary

~stian-sandvold/dhis2/UserSettingFallback

« back to all changes in this revision

Viewing changes to dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java

  • Committer: Stian Sandvold
  • Date: 2016-03-14 12:16:33 UTC
  • mfrom: (21871.1.422 dhis2)
  • Revision ID: stian.sandvold@gmail.com-20160314121633-ojggeaoszdunzltj
merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java
112
112
        sql += " UNION ( " + sendMessageToUsersSql() + " ) ";
113
113
 
114
114
        sql += " UNION ( " + sendMessageToUserGroupsSql() + " ) ";
115
 
 
 
115
        
116
116
        SqlRowSet rs = jdbcTemplate.queryForRowSet( sql );
117
117
 
118
118
        Collection<SchedulingProgramObject> schedulingProgramObjects = new HashSet<>();
153
153
 
154
154
            SchedulingProgramObject schedulingProgramObject = new SchedulingProgramObject();
155
155
            schedulingProgramObject.setProgramStageInstanceId( programstageinstanceid );
156
 
            schedulingProgramObject.setPhoneNumber( rs.getString( "phonenumber" ) );
 
156
            schedulingProgramObject.setPhoneNumber( rs.getString( "PHONE_NUMBER" ) );
157
157
            schedulingProgramObject.setMessage( message );
158
158
 
159
159
            schedulingProgramObjects.add( schedulingProgramObject );
273
273
 
274
274
    private String sendMessageToTrackedEntityInstanceSql()
275
275
    {
276
 
        return "select psi.programstageinstanceid, pav.value as phonenumber, prm.templatemessage, org.name as orgunitName "
 
276
        return "select psi.programstageinstanceid, pav.value as PHONE_NUMBER, prm.templatemessage, org.name as orgunitName "
277
277
            + ",pg.name as programName, ps.name as programStageName, psi.duedate,(DATE(now()) - DATE(psi.duedate) ) as days_since_due_date "
278
278
            + "from trackedentityinstance p INNER JOIN programinstance pi "
279
279
            + "     ON p.trackedentityinstanceid=pi.trackedentityinstanceid "
295
295
            + EventStatus.ACTIVE.name()
296
296
            + "'     and prm.templatemessage is not NULL and prm.templatemessage != '' "
297
297
            + "     and pg.type='" + ProgramType.WITH_REGISTRATION.name() + "' and prm.daysallowedsendmessage is not null  "
298
 
            + "     and psi.executiondate is null and pa.valuetype='phoneNumber' "
 
298
            + "     and psi.executiondate is null and pa.valuetype='PHONE_NUMBER' "
299
299
            + "     and (  DATE(now()) - DATE(psi.duedate) ) = prm.daysallowedsendmessage "
300
300
            + "     and prm.whentosend is null and prm.sendto = " + TrackedEntityInstanceReminder.SEND_TO_TRACKED_ENTITY_INSTANCE;
301
301
    }
360
360
            + "               and psi.executiondate is null "
361
361
            + "               and (  DATE(now()) - DATE(psi.duedate) ) = prm.daysallowedsendmessage "
362
362
            + "               and prm.whentosend is null and prm.sendto = "
363
 
            + +TrackedEntityInstanceReminder.SEND_TO_ORGUGNIT_REGISTERED;
 
363
            + +TrackedEntityInstanceReminder.SEND_TO_REGISTERED_ORGUNIT;
364
364
    }
365
365
 
366
366
    private String sendMessageToUsersSql()
392
392
            + "       and psi.executiondate is null "
393
393
            + "       and (  DATE(now()) - DATE(psi.duedate) ) = prm.daysallowedsendmessage "
394
394
            + "       and prm.whentosend is null and prm.sendto = "
395
 
            + TrackedEntityInstanceReminder.SEND_TO_ALL_USERS_IN_ORGUGNIT_REGISTERED;
 
395
            + TrackedEntityInstanceReminder.SEND_TO_ALL_USERS_AT_REGISTERED_ORGUNIT;
396
396
    }
397
397
 
398
398
    private String sendMessageToUserGroupsSql()