------------------------------------------------------------
revno: 10506
committer: Tran Chau <tran.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Wed 2013-04-10 11:22:14 +0700
message:
Add new remindCompleted property for program.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2013-04-10 03:13:47 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2013-04-10 04:22:14 +0000
@@ -109,9 +109,16 @@
private Boolean blockEntryForm = false;
private Set<UserAuthorityGroup> userRoles = new HashSet<UserAuthorityGroup>();
-
+
private Boolean onlyEnrollOnce = false;
-
+
+ /**
+ * Enabled this property to show a pop-up for confirming Complete a program
+ * after to complete a progam-stage
+ *
+ */
+ private Boolean remindCompleted = false;
+
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
@@ -201,6 +208,19 @@
this.version = version;
}
+ @JsonProperty
+ @JsonView( { DetailedView.class, ExportView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ public Boolean getRemindCompleted()
+ {
+ return remindCompleted;
+ }
+
+ public void setRemindCompleted( Boolean remindCompleted )
+ {
+ this.remindCompleted = remindCompleted;
+ }
+
@JsonProperty( value = "organisationUnits" )
@JsonSerialize( contentAs = BaseIdentifiableObject.class )
@JsonView( { DetailedView.class, ExportView.class } )
@@ -396,7 +416,7 @@
{
return programStage;
}
-
+
count++;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java 2013-04-10 03:13:47 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java 2013-04-10 04:22:14 +0000
@@ -76,7 +76,7 @@
private Program program;
private Set<ProgramStageInstance> programStageInstances = new HashSet<ProgramStageInstance>();
-
+
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2013-04-10 03:13:47 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2013-04-10 04:22:14 +0000
@@ -198,6 +198,10 @@
executeSql( "update caseaggregationcondition set \"operator\"='times' where \"operator\"='SUM'" );
+ executeSql( "update prorgam set \"operator\"='times' where \"operator\"='SUM'" );
+
+ executeSql( "update program set remindCompleted=false where remindCompleted is null" );
+
updateUid();
updateUidInDataEntryFrom();
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml 2013-03-01 07:34:20 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml 2013-04-10 04:22:14 +0000
@@ -73,7 +73,9 @@
<many-to-many class="org.hisp.dhis.user.UserAuthorityGroup"
column="userroleid" foreign-key="fk_program_userroles"/>
</set>
-
+
+ <property name="remindCompleted" />
+
<!-- Access properties -->
<many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_program_userid" />
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2013-04-10 03:13:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2013-04-10 04:22:14 +0000
@@ -29,6 +29,7 @@
<input type='hidden' name='validCompleteOnly' id='validCompleteOnly' value='$!programStageInstance.programStage.validCompleteOnly'>
<input type='hidden' name='currentUsername' id='currentUsername' value='$!currentUsername'>
<input type='hidden' name='blockEntryForm' id='blockEntryForm' value='$!programStageInstance.programInstance.program.blockEntryForm'>
+<input type='hidden' name='remindCompleted' id='remindCompleted' value='$!programStageInstance.programInstance.program.remindCompleted'>
<div id='entryForm' #if($!programStageInstance.executionDate) class='visible' #else class='hidden' #end>
<table style="width:600px;margin-top:-9px" class="listTable">
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2013-04-08 05:43:06 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2013-04-10 04:22:14 +0000
@@ -525,6 +525,11 @@
blockEntryForm();
}
+ var remindCompleted = jQuery('#entryFormContainer [id=remindCompleted]').val();
+ if( remindCompleted=='true' ){
+ unenrollmentForm(programInstanceId, 1);
+ }
+
disableCompletedButton(true);
enable('validationBtn');
var eventBox = jQuery('#ps_' + getFieldValue('programStageInstanceId'));
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm 2013-03-01 07:34:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm 2013-04-10 04:22:14 +0000
@@ -14,6 +14,7 @@
"noAttributes": "$!program.patientAttributes.size()",
"noIdentifierTypes": "$!program.patientIdentifierTypes.size()",
"blockEntryForm": "$!program.blockEntryForm",
- "onlyEnrollOnce": "$!program.onlyEnrollOnce"
+ "onlyEnrollOnce": "$!program.onlyEnrollOnce",
+ "remindCompleted": "$!program.remindCompleted"
}
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAction.java 2013-04-10 03:13:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAction.java 2013-04-10 04:22:14 +0000
@@ -94,7 +94,7 @@
{
this.patientAttributeService = patientAttributeService;
}
-
+
// -------------------------------------------------------------------------
// Input/Output
// -------------------------------------------------------------------------
@@ -164,7 +164,7 @@
private Boolean generateBydEnrollmentDate;
- public void setGeneratedByEnrollmentDate( Boolean generateBydEnrollmentDate )
+ public void setGenerateBydEnrollmentDate( Boolean generateBydEnrollmentDate )
{
this.generateBydEnrollmentDate = generateBydEnrollmentDate;
}
@@ -190,6 +190,14 @@
this.onlyEnrollOnce = onlyEnrollOnce;
}
+
+ private Boolean remindCompleted = false;
+
+ public void setRemindCompleted( Boolean remindCompleted )
+ {
+ this.remindCompleted = remindCompleted;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -203,6 +211,7 @@
ignoreOverdueEvents = (ignoreOverdueEvents == null) ? false : ignoreOverdueEvents;
blockEntryForm = (blockEntryForm == null) ? false : blockEntryForm;
onlyEnrollOnce = (onlyEnrollOnce == null) ? false : onlyEnrollOnce;
+ remindCompleted = (remindCompleted == null) ? false : remindCompleted;
Program program = new Program();
@@ -216,7 +225,8 @@
program.setDisplayIncidentDate( displayIncidentDate );
program.setBlockEntryForm( blockEntryForm );
program.setOnlyEnrollOnce( onlyEnrollOnce );
-
+ program.setRemindCompleted( remindCompleted );
+
if ( type == Program.MULTIPLE_EVENTS_WITH_REGISTRATION )
{
program.setGeneratedByEnrollmentDate( generateBydEnrollmentDate );
@@ -259,7 +269,7 @@
program.setPatientAttributes( patientAttributes );
programService.saveProgram( program );
-
+
if ( program.getType().equals( Program.SINGLE_EVENT_WITH_REGISTRATION )
|| program.getType().equals( Program.SINGLE_EVENT_WITHOUT_REGISTRATION ) )
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.java 2013-03-01 07:34:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.java 2013-04-10 04:22:14 +0000
@@ -178,15 +178,21 @@
{
this.blockEntryForm = blockEntryForm;
}
-
+
private Boolean onlyEnrollOnce = false;
-
+
public void setOnlyEnrollOnce( Boolean onlyEnrollOnce )
{
this.onlyEnrollOnce = onlyEnrollOnce;
}
-
-
+
+ private Boolean remindCompleted = false;
+
+ public void setRemindCompleted( Boolean remindCompleted )
+ {
+ this.remindCompleted = remindCompleted;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -199,6 +205,7 @@
generateBydEnrollmentDate = (generateBydEnrollmentDate == null) ? false : generateBydEnrollmentDate;
ignoreOverdueEvents = (ignoreOverdueEvents == null) ? false : ignoreOverdueEvents;
blockEntryForm = (blockEntryForm == null) ? false : blockEntryForm;
+ remindCompleted = (remindCompleted == null) ? false : remindCompleted;
Program program = programService.getProgram( id );
program.setName( name );
@@ -211,7 +218,8 @@
program.setDisplayIncidentDate( displayIncidentDate );
program.setBlockEntryForm( blockEntryForm );
program.setOnlyEnrollOnce( onlyEnrollOnce );
-
+ program.setRemindCompleted( remindCompleted );
+
if ( type == Program.MULTIPLE_EVENTS_WITH_REGISTRATION )
{
program.setGeneratedByEnrollmentDate( generateBydEnrollmentDate );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2013-04-09 02:22:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2013-04-10 04:22:14 +0000
@@ -374,4 +374,5 @@
enter_a_name = Please enter a name between 4 and 150 characters long.
save_unsuccess = Save unsuccessfully
validate_form = Validate form
-validate_success = The registration form passed validation successfully
\ No newline at end of file
+validate_success = The registration form passed validation successfully
+remind_completing_program_after_program_stage_completed = Remind completing program after a program stage completed
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2013-03-01 07:34:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2013-04-10 04:22:14 +0000
@@ -52,6 +52,12 @@
<td></td>
</tr>
+ <tr>
+ <td><label>$i18n.getString( "remind_completing_program_after_program_stage_completed" )</label></td>
+ <td><input type="checkbox" id="remindCompleted" name="remindCompleted" value='true' ></td>
+ <td></td>
+ </tr>
+
<tr name='nonAnonymous'>
<th colspan="2">$i18n.getString( "enrollment_details" )</th>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2013-04-02 05:15:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2013-04-10 04:22:14 +0000
@@ -35,6 +35,9 @@
var onlyEnrollOnce = ( json.program.onlyEnrollOnce == 'true') ? i18n_yes : i18n_no;
setInnerHTML( 'onlyEnrollOnceField', onlyEnrollOnce );
+ var remindCompleted = ( json.program.remindCompleted == 'true') ? i18n_yes : i18n_no;
+ setInnerHTML( 'remindCompletedField', remindCompleted );
+
setInnerHTML( 'dateOfEnrollmentDescriptionField', json.program.dateOfEnrollmentDescription );
setInnerHTML( 'dateOfIncidentDescriptionField', json.program.dateOfIncidentDescription );
setInnerHTML( 'programStageCountField', json.program.programStageCount );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2013-03-07 15:27:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2013-04-10 04:22:14 +0000
@@ -87,6 +87,7 @@
<p><label class="bold">$i18n.getString( "ignore_to_generate_overdue_events" ):</label><br><span id="ignoreOverdueEventsField"></span></p>
<p><label class="bold">$i18n.getString( "only_enroll_once" ):</label><br><span id="onlyEnrollOnceField"></span></p>
<p><label class="bold">$i18n.getString( "block_entry_form_after_completed" ):</label><br><span id="blockEntryFormField"></span></p>
+ <p><label class="bold">$i18n.getString( "remind_completing_program_after_program_stage_completed" ):</label><br><span id="remindCompletedField"></span></p>
<p><label class="bold">$i18n.getString( "date_of_enrollment_description" ):</label><br><span id="dateOfEnrollmentDescriptionField"></span></p>
<p><label class="bold">$i18n.getString( "date_of_incident_description" ):</label><br><span id="dateOfIncidentDescriptionField"></span></p>
<p><label class="bold">$i18n.getString( "number_of_attributes" ):</label><br><span id="noAttributesField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2013-03-01 07:34:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2013-04-10 04:22:14 +0000
@@ -56,12 +56,17 @@
<td><input type="checkbox" id="blockEntryForm" name="blockEntryForm" value='true' #if( $program.blockEntryForm=='true' ) checked #end ></td>
<td></td>
</tr>
+
+ <tr>
+ <td><label>$i18n.getString( "remind_completing_program_after_program_stage_completed" )</label></td>
+ <td><input type="checkbox" id="remindCompleted" name="remindCompleted" value='true' #if( $program.remindCompleted=='true' ) checked #end ></td>
+ <td></td>
+ </tr>
<tr name='nonAnonymous'>
<th colspan="2">$i18n.getString( "enrollment_details" )</th>
</tr>
-
<tr name='nonAnonymous'>
<td><label>$i18n.getString( "generated_events_by_enrollment_date" )</label></td>
<td><input type="checkbox" id="generatedByEnrollmentDate" name="generatedByEnrollmentDate" value='true' #if($program.generatedByEnrollmentDate=='true') checked #end #if( $program.type!='1' ) disabled #end ></td>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
