dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15987
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5928: (patient) Add Display provided other facility property for program.
------------------------------------------------------------
revno: 5928
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-02-13 09:41:24 +0700
message:
(patient) Add Display provided other facility property for program.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.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/java/org/hisp/dhis/program/DefaultProgramDataEntryService.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/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm
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 2011-12-15 02:50:32 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2012-02-13 02:41:24 +0000
@@ -80,6 +80,8 @@
private Boolean singleEvent;
private Boolean anonymous;
+
+ private Boolean displayProvidedOtherFacility;
// -------------------------------------------------------------------------
// Constructors
@@ -141,6 +143,16 @@
{
this.id = id;
}
+
+ public Boolean getDisplayProvidedOtherFacility()
+ {
+ return displayProvidedOtherFacility;
+ }
+
+ public void setDisplayProvidedOtherFacility( Boolean displayProvidedOtherFacility )
+ {
+ this.displayProvidedOtherFacility = displayProvidedOtherFacility;
+ }
public String getName()
{
=== 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 2012-02-11 14:51:09 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2012-02-13 02:41:24 +0000
@@ -149,6 +149,8 @@
upgradeCaseAggregationFormula();
upgradeProgramValidationFormula();
+
+ executeSql( "UPDATE program SET displayProvidedOtherFacility = false WHERE displayProvidedOtherFacility is null" );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java 2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java 2012-02-13 02:41:24 +0000
@@ -1090,7 +1090,7 @@
private String addProvidedByOtherFacilityCheckbox( String appendCode, PatientDataValue patientDataValue,
ProgramStage programStage )
{
- appendCode += "<label for=\"$PROGRAMSTAGEID_$DATAELEMENTID_facility\" title=\"is provided by another Facility ?\" ></label><input name=\"providedByAnotherFacility\" title=\"is provided by another Facility ?\" id=\"$PROGRAMSTAGEID_$DATAELEMENTID_facility\" type=\"checkbox\" style=\"display:$DISPLAY;\" ";
+ appendCode += "<label style=\"display:$DISPLAY;\" for=\"$PROGRAMSTAGEID_$DATAELEMENTID_facility\" title=\"is provided by another Facility ?\" ></label><input name=\"providedByAnotherFacility\" title=\"is provided by another Facility ?\" id=\"$PROGRAMSTAGEID_$DATAELEMENTID_facility\" type=\"checkbox\" ";
if ( patientDataValue != null && patientDataValue.isProvidedByAnotherFacility() )
{
@@ -1098,7 +1098,7 @@
}
appendCode += "onChange=\"updateProvidingFacility( $DATAELEMENTID, this )\" >";
- String display = (programStage.getProgram().getAnonymous()) ? "none" : "block";
+ String display = (programStage.getProgram().getDisplayProvidedOtherFacility() ) ? "none" : "block";
appendCode = appendCode.replace( "$DISPLAY", display );
return appendCode;
=== 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 2011-12-15 02:50:32 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml 2012-02-13 02:41:24 +0000
@@ -40,6 +40,8 @@
<property name="singleEvent" />
<property name="anonymous" />
-
+
+ <property name="displayProvidedOtherFacility" />
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java 2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java 2012-02-13 02:41:24 +0000
@@ -223,7 +223,7 @@
if ( dataEntryForm != null )
{
customDataEntryFormCode = programDataEntryService.prepareDataEntryFormForEntry( dataEntryForm
- .getHtmlCode(), patientDataValues, "", i18n, programStage, programStageInstance,
+ .getHtmlCode(), patientDataValues, program.getDisplayProvidedOtherFacility().toString(), i18n, programStage, programStageInstance,
organisationUnit );
}
}
=== 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 2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2012-02-13 02:41:24 +0000
@@ -55,14 +55,14 @@
<col id="noCol">
<col id="deCol">
<col id="entryCol">
- #if( $programStageInstance.programInstance.program.anonymous == 'false' )
+ #if( $programStageInstance.programInstance.program.displayProvidedOtherFacility == 'false' )
<col id="facilityCol">
#end
<tr>
<th>$i18n.getString( "nr" )</th>
<th>$i18n.getString( "data_element" )</th>
<th>$i18n.getString( "entry" )</th>
- #if( $programStageInstance.programInstance.program.anonymous == 'false' )
+ #if( $programStageInstance.programInstance.program.displayProvidedOtherFacility == 'false' )
<th>$i18n.getString( "provided_elsewhere" )</th>
#end
</tr>
@@ -119,7 +119,7 @@
##providedByAnotherFacility
#set( $id = $programStageDataElement.programStage.id + '_' + $programStageDataElement.dataElement.id + '_facility' )
- #if($programStageInstance.programInstance.program.anonymous == 'false')
+ #if($programStageInstance.programInstance.program.displayProvidedOtherFacility == 'false')
<td>
#if ( $patientDataValue.value )
#if( !$patientDataValue.providedByAnotherFacility )
=== 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 2011-12-15 02:50:32 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm 2012-02-13 02:41:24 +0000
@@ -5,6 +5,7 @@
"description": "$!encoder.jsEncode( ${program.description} )",
"singleEvent": "$!program.singleEvent",
"anonymous": "$!program.anonymous",
+ "displayProvidedOtherFacility": "$!program.displayProvidedOtherFacility",
"dateOfEnrollmentDescription": "$!encoder.jsEncode( ${program.dateOfEnrollmentDescription} )",
"dateOfIncidentDescription": "$!encoder.jsEncode( ${program.dateOfIncidentDescription} )",
"programStageCount": "${program.programStages.size()}",
=== 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 2011-12-16 06:45:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAction.java 2012-02-13 02:41:24 +0000
@@ -125,6 +125,13 @@
this.anonymous = anonymous;
}
+ private Boolean displayProvidedOtherFacility;
+
+ public void setDisplayProvidedOtherFacility( Boolean displayProvidedOtherFacility )
+ {
+ this.displayProvidedOtherFacility = displayProvidedOtherFacility;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -134,7 +141,8 @@
{
singleEvent = (singleEvent == null) ? false : singleEvent;
anonymous = (anonymous == null) ? false : anonymous;
-
+ displayProvidedOtherFacility = (displayProvidedOtherFacility == null) ? false : displayProvidedOtherFacility;
+
Program program = new Program();
program.setName( name );
@@ -145,6 +153,7 @@
program.setMaxDaysAllowedInputData( maxDaysAllowedInputData );
program.setSingleEvent( singleEvent );
program.setAnonymous( anonymous );
+ program.setDisplayProvidedOtherFacility( displayProvidedOtherFacility );
programService.saveProgram( program );
=== 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 2011-12-20 11:55:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.java 2012-02-13 02:41:24 +0000
@@ -122,6 +122,13 @@
this.anonymous = anonymous;
}
+ private Boolean displayProvidedOtherFacility;
+
+ public void setDisplayProvidedOtherFacility( Boolean displayProvidedOtherFacility )
+ {
+ this.displayProvidedOtherFacility = displayProvidedOtherFacility;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -131,6 +138,7 @@
{
singleEvent = (singleEvent == null) ? false : singleEvent;
anonymous = (anonymous == null) ? false : anonymous;
+ displayProvidedOtherFacility = (displayProvidedOtherFacility == null) ? false : displayProvidedOtherFacility;
Program program = programService.getProgram( id );
program.setName( name );
@@ -141,6 +149,7 @@
program.setMaxDaysAllowedInputData( maxDaysAllowedInputData );
program.setSingleEvent( singleEvent );
program.setAnonymous( anonymous );
+ program.setDisplayProvidedOtherFacility( displayProvidedOtherFacility );
programService.updateProgram( program );
=== 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 2012-02-06 03:59:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2012-02-13 02:41:24 +0000
@@ -400,4 +400,5 @@
data_element = Data element
condition = Condition
no_date_data_element_in_selected_program_stage = No data elements with date-type in the selected program stage
-shown_on_reports = Shown on reports
\ No newline at end of file
+shown_on_reports = Shown on reports
+display_provided_other_facility = Display provided other facility
\ 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 2011-12-15 02:50:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2012-02-13 02:41:24 +0000
@@ -46,6 +46,12 @@
</tr>
<tr>
+ <td><label>$i18n.getString( "display_provided_other_facility" )</label></td>
+ <td><input type="checkbox" id="displayProvidedOtherFacility" name="displayProvidedOtherFacility" value='true'></td>
+ <td></td>
+ </tr>
+
+ <tr>
<td><label>$i18n.getString( "date_of_enrollment_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="dateOfEnrollmentDescription" name="dateOfEnrollmentDescription" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
<td></td>
=== 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 2012-01-11 07:42:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2012-02-13 02:41:24 +0000
@@ -16,6 +16,9 @@
var anonymous = ( json.program.anonymous == 'true') ? i18n_yes : i18n_no;
setInnerHTML( 'anonymousField', anonymous );
+ var displayProvidedOtherFacility = ( json.program.displayProvidedOtherFacility == 'true') ? i18n_yes : i18n_no;
+ setInnerHTML( 'displayProvidedOtherFacilityField', displayProvidedOtherFacility );
+
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 2012-01-11 07:42:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2012-02-13 02:41:24 +0000
@@ -44,12 +44,13 @@
<div id="detailsArea" style="display:none">
<div style="float:right">
- <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
+ <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
</div>
<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
<p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
<p><label class="bold">$i18n.getString( "single_event" ):</label><br><span id="singleEventField"></span></p>
<p><label class="bold">$i18n.getString( "anonymous" ):</label><br><span id="anonymousField"></span></p>
+ <p><label class="bold">$i18n.getString( "display_provided_other_facility" ):</label><br><span id="displayProvidedOtherFacilityField"></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( "stage_in_program" ):</label><br><span id="programStageCountField"></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 2011-12-15 02:50:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2012-02-13 02:41:24 +0000
@@ -49,21 +49,27 @@
<td></td>
</tr>
- <tr>
+ <tr>
+ <td><label>$i18n.getString( "display_provided_other_facility" )</label></td>
+ <td><input type="checkbox" id="displayProvidedOtherFacility" name="displayProvidedOtherFacility" value='true' #if( $program.displayProvidedOtherFacility=='true' ) checked #end ></td>
+ <td></td>
+ </tr>
+
+ <tr>
<td><label>$i18n.getString( "version" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="version" name="version" value="$program.version" style="width:30em" class="{validate:{required:true,number:true}}"></td>
<td></td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td><label>$i18n.getString( "date_of_enrollment_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="dateOfEnrollmentDescription" name="dateOfEnrollmentDescription" value="$!program.dateOfEnrollmentDescription" style="width:30em" class="{validate:{required:true,minlength:4}}" #if( $program.singleEvent=='true' ) disabled #end></td>
<td></td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td><label>$i18n.getString( "date_of_incident_description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
<td><input type="text" id="dateOfIncidentDescription" name="dateOfIncidentDescription" value="$!program.dateOfIncidentDescription" style="width:30em" class="{validate:{required:true,minlength:4}}"></td>
<td></td>
- </tr>
+ </tr>
<tr>
<td><label>$i18n.getString( "no_max_days_allowed_input_data" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
