dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #20425
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9315: Resort orders of property fields in Add/Update program form.
------------------------------------------------------------
revno: 9315
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-12-14 15:30:30 +0700
message:
Resort orders of property fields in Add/Update program form.
modified:
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/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-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-12-12 04:43:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2012-12-14 08:30:30 +0000
@@ -289,7 +289,7 @@
add_more = Add more ...
inherit = Inherit
auto_generate_event = Auto-generate event
-events_generated_by_enrollment_date = Events generated by enrollment date
+generated_events_by_enrollment_date = Generate events by enrollment date
execute_success = Execute successfully
plus = Plus
diff_from = Different from
@@ -322,5 +322,5 @@
description_not_null = Description is not null
expression_not_null = Expression is not null
complete_allowed_only_if_validation_passes = Complete allowed only if validation passes
-ignore_overdue_events = Ignore overdue events
+ignore_to_generate_overdue_events = Ignore to generate overdue events
display_generate_event_box_after_completed = Display generate event box after 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 2012-12-10 04:03:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2012-12-14 08:30:30 +0000
@@ -37,24 +37,12 @@
</tr>
<tr>
- <td><label>$i18n.getString( "events_generated_by_enrollment_date" )</label></td>
- <td><input style="margin: 0;"type="checkbox" id="generatedByEnrollmentDate" name="generatedByEnrollmentDate" value='true'></td>
- <td></td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "ignore_overdue_events" )</label></td>
- <td><input style="margin: 0;"type="checkbox" id="ignoreOverdueEvents" name="ignoreOverdueEvents" value='true'></td>
- <td></td>
- </tr>
-
- <tr>
<th colspan="2">$i18n.getString( "form_details" )</th>
</tr>
<tr>
<td><label>$i18n.getString( "show_provided_provided_elsewhere" )</label></td>
- <td><input style="margin: 0;"type="checkbox" id="displayProvidedOtherFacility" name="displayProvidedOtherFacility" value='true' checked></td>
+ <td><input type="checkbox" id="displayProvidedOtherFacility" name="displayProvidedOtherFacility" value='true' checked></td>
<td></td>
</tr>
@@ -63,8 +51,20 @@
</tr>
<tr>
+ <td><label>$i18n.getString( "generated_events_by_enrollment_date" )</label></td>
+ <td><input type="checkbox" id="generatedByEnrollmentDate" name="generatedByEnrollmentDate" value='true'></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "ignore_to_generate_overdue_events" )</label></td>
+ <td><input type="checkbox" id="ignoreOverdueEvents" name="ignoreOverdueEvents" value='true'></td>
+ <td></td>
+ </tr>
+
+ <tr>
<td><label>$i18n.getString( "show_incident_date" )</label></td>
- <td><input style="margin: 0;"type="checkbox" id="displayIncidentDate" name="displayIncidentDate" value='true' checked onchange='programOnChange();'></td>
+ <td><input type="checkbox" id="displayIncidentDate" name="displayIncidentDate" value='true' checked onchange='programOnChange();'></td>
<td></td>
</tr>
=== 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-12-10 04:03:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2012-12-14 08:30:30 +0000
@@ -48,8 +48,8 @@
<p><label class="bold">$i18n.getString( "type" ):</label><br><span id="typeField"></span></p>
<p><label class="bold">$i18n.getString( "display_provided_other_facility_column" ):</label><br><span id="displayProvidedOtherFacilityField"></span></p>
<p><label class="bold">$i18n.getString( "display_date_of_incident" ):</label><br><span id="displayIncidentDateField"></span></p>
- <p><label class="bold">$i18n.getString( "events_generated_by_enrollment_date" ):</label><br><span id="generatedByEnrollmentDateField"></span></p>
- <p><label class="bold">$i18n.getString( "ignore_overdue_events" ):</label><br><span id="ignoreOverdueEventsField"></span></p>
+ <p><label class="bold">$i18n.getString( "generated_events_by_enrollment_date" ):</label><br><span id="generatedByEnrollmentDateField"></span></p>
+ <p><label class="bold">$i18n.getString( "ignore_to_generate_overdue_events" ):</label><br><span id="ignoreOverdueEventsField"></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 2012-12-10 04:03:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2012-12-14 08:30:30 +0000
@@ -4,7 +4,6 @@
<form id="updateProgramForm" name="updateProgramForm" action="updateProgram.action" method="post" onsubmit="selectAllById('selectedPropertyIds');" >
<input type="hidden" id="id" name="id" value="$program.id">
-
<table id="detailsList">
<thead>
<tr>
@@ -37,18 +36,6 @@
</tr>
<tr>
- <td><label>$i18n.getString( "events_generated_by_enrollment_date" )</label></td>
- <td><input type="checkbox" id="generatedByEnrollmentDate" name="generatedByEnrollmentDate" value='true' #if($program.generatedByEnrollmentDate=='true') checked #end #if( $program.type=='3' ) disabled #end ></td>
- <td></td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "ignore_overdue_events" )</label></td>
- <td><input style="margin: 0;"type="checkbox" id="ignoreOverdueEvents" name="ignoreOverdueEvents" value='true' #if($program.ignoreOverdueEvents=='true') checked #end #if( $program.type!='1' ) disabled #end ></td>></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" class="{validate:{required:true,number:true}}"></td>
<td></td>
@@ -68,9 +55,22 @@
<th colspan="2">$i18n.getString( "enrollment_details" )</th>
</tr>
+
+ <tr>
+ <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=='3' ) disabled #end ></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "ignore_to_generate_overdue_events" )</label></td>
+ <td><input type="checkbox" id="ignoreOverdueEvents" name="ignoreOverdueEvents" value='true' #if($program.ignoreOverdueEvents=='true') checked #end #if( $program.type!='1' ) disabled #end ></td>
+ <td></td>
+ </tr>
+
<tr>
<td><label>$i18n.getString( "show_incident_date" )</label></td>
- <td><input style="margin: 0;"type="checkbox" id="displayIncidentDate" name="displayIncidentDate" value='true' onchange='programOnChange();' #if( $program.type=='3' ) disabled #elseif($program.displayIncidentDate=='true') checked #end></td>
+ <td><input type="checkbox" id="displayIncidentDate" name="displayIncidentDate" value='true' onchange='programOnChange();' #if( $program.type=='3' ) disabled #elseif($program.displayIncidentDate=='true') checked #end></td>
<td></td>
</tr>
