dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19725
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8728: Remove unused file and minor fix for visit schedule function.
------------------------------------------------------------
revno: 8728
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-10-26 12:42:01 +0700
message:
Remove unused file and minor fix for visit schedule function.
removed:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.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-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-10-23 03:47:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-10-26 05:42:01 +0000
@@ -864,13 +864,7 @@
/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
</action>
-
- <action name="viewRecord"
- class="org.hisp.dhis.caseentry.action.caseentry.ProgramStageCustomDataEntryAction">
- <result name="success" type="velocity">/content.vm</result>
- <param name="page">/dhis-web-caseentry/programStageDataEntryForm.vm</param>
- </action>
-
+
<!-- SMS Reminder -->
<action name="smsReminderSelect"
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js 2012-10-23 03:47:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js 2012-10-26 05:42:01 +0000
@@ -37,6 +37,8 @@
,function(){
jQuery("#viewRecordsDiv :input" ).attr("disabled", true);
jQuery("#viewRecordsDiv :input" ).datepicker("destroy");
+ showById("reportTitle");
+ hideById("patientInforTB");
jQuery(".ui-combobox" ).hide();
hideById('inputCriteriaDiv');
})
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2012-10-22 06:58:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-<div id='patientInforTB'>
- <table>
- #if( $patient )
- <tr>
- <td>
- <span class='bold'>$i18n.getString( "full_name" ):</span>
- </td>
- <td>
- $encoder.htmlEncode( $patient.getFullName() ) ( $i18n.getString( "$patient.gender" ) )
- </td>
- <td class='bold text-column' style="vertical-align:top">$i18n.getString('program'): </td>
- <td style="vertical-align:right">$program.name</td>
- </tr>
- <tr>
- <td>
- <span class='bold'>$i18n.getString( "date_of_birth" ):</span>
- </td>
- <td>
- $format.formatDate( $patient.birthDate ) ( $encoder.htmlEncode( $patient.getAge() ) )
- </td>
- <td class='bold text-column' style="vertical-align:top">$i18n.getString('program_stage'): </td>
- <td style="vertical-align:right">$programStageInstance.programStage.name</td>
- </tr>
- <tr><td> </td></tr>
- #end
-
- #if( $programStageInstance )
- <tr>
- <th><label for="executionDate">$programStageInstance.programStage.reportDateDescription </label></th>
- <th><input type="text" id="executionDate" name="executionDate" value="$!format.formatDate( $programStageInstance.executionDate )" onchange="saveExecutionDate( $programStageInstance.programInstance.program.id, $programStageInstance.id, byId('executionDate') )" > </th>
- <script type="text/javascript">
- datePickerValid( 'executionDate', false );
- </script>
- <th><label for="dueDate"> $i18n.getString( "due_date" ) </label></th>
- <th><input type="text" id="dueDate" name="dueDate" value="$!format.formatDate( $programStageInstance.dueDate )" disabled="disabled"> </th>
- </tr>
- #end
- </table>
-</div>
-
-<input type='hidden' id="programId" name="programId" type="text" readonly="readonly" value="$encoder.htmlEncode( $program.name )" style="min-width:350px">
-<input id="programStageId" name="programStageId" type="hidden" value="$programStage.id" style="min-width:350px">
-
-<p></p>
-#parse( "dhis-web-commons/loader/loader.vm" )
-<form id='dataEntryFormDiv' name='dataEntryFormDiv' >
- #parse( "dhis-web-caseentry/dataEntryForm.vm" )
-</form>
-
-<script type="text/javascript">
- jQuery('#patientForm').ready( function(){
- enable('validationBtn');
- #if($programStageInstance.completed=='true')
- disable('completeBtn');
- enable('uncompleteBtn');
- #else
- enable('completeBtn');
- disable('uncompleteBtn');
- #end
- });
-
- var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
- var i18n_value_must_number = '$encoder.jsEscape( $i18n.getString( "value_must_number" ) , "'")';
- var i18n_value_must_positive_integer = '$encoder.jsEscape( $i18n.getString( "value_must_positive_integer" ) , "'")';
- var i18n_value_must_negative_integer = '$encoder.jsEscape( $i18n.getString( "value_must_negative_integer" ) , "'")';
- var i18n_invalid_date = '$encoder.jsEscape( $i18n.getString( "invalid_date" ) , "'")' + ".\n "
- + '$encoder.jsEscape( $i18n.getString( "format_date" ) , "'")' + " '"
- + dateFormat.replace('yy', 'yyyy') + " '" ;
- var i18n_saving_value_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_status_code" ) , "'")';
- var i18n_saving_value_failed_error_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_error_code" ) , "'")';
- var i18n_searching_patient_failed = '$encoder.jsEscape( $i18n.getString( "searching_patient_failed" ) , "'")';
- var i18n_complete_confirm_message = '$encoder.jsEscape( $i18n.getString( "complete_confirm_message" ) , "'")';
- var i18n_incomplete_confirm_message = '$encoder.jsEscape( $i18n.getString( "incomplete_confirm_message" ) , "'")';
- var i18n_error_required_field = '$encoder.jsEscape( $i18n.getString( "error_required_field" ) , "'")';
- var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
- var i18n_date_is_greater_then_or_equals_due_date = '$encoder.jsEscape( $i18n.getString( "date_is_greater_then_or_equals_due_date" ) , "'")';
- var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'")';
-</script>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm 2012-10-23 03:47:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm 2012-10-26 05:42:01 +0000
@@ -1,5 +1,83 @@
-<h3>$i18n.getString('records_for') $organisationUnit.name $i18n.getString('at') $programStage.name $i18n.getString('on') $format.formatDate($programStageInstance.executionDate)</h3>
-<hr>
+<div id='reportTitle' name='reportTitle' style="display:none;">
+ <h3>$i18n.getString('records_for') $organisationUnit.name $i18n.getString('at') $programStage.name $i18n.getString('on') $format.formatDate($programStageInstance.executionDate)</h3>
+ <hr/>
+</div>
+
+<div id='patientInforTB'>
+ <table>
+ #if( $patient )
+ <tr>
+ <td>
+ <span class='bold'>$i18n.getString( "full_name" ):</span>
+ </td>
+ <td>
+ $encoder.htmlEncode( $patient.getFullName() ) ( $i18n.getString( "$patient.gender" ) )
+ </td>
+ <td class='bold text-column' style="vertical-align:top">$i18n.getString('program'): </td>
+ <td style="vertical-align:right">$program.name</td>
+ </tr>
+ <tr>
+ <td>
+ <span class='bold'>$i18n.getString( "date_of_birth" ):</span>
+ </td>
+ <td>
+ $format.formatDate( $patient.birthDate ) ( $encoder.htmlEncode( $patient.getAge() ) )
+ </td>
+ <td class='bold text-column' style="vertical-align:top">$i18n.getString('program_stage'): </td>
+ <td style="vertical-align:right">$programStageInstance.programStage.name</td>
+ </tr>
+ <tr><td> </td></tr>
+ #end
+
+ #if( $programStageInstance )
+ <tr>
+ <th><label for="executionDate">$programStageInstance.programStage.reportDateDescription </label></th>
+ <th><input type="text" id="executionDate" name="executionDate" value="$!format.formatDate( $programStageInstance.executionDate )" onchange="saveExecutionDate( $programStageInstance.programInstance.program.id, $programStageInstance.id, byId('executionDate') )" > </th>
+ <script type="text/javascript">
+ datePickerValid( 'executionDate', false );
+ </script>
+ <th><label for="dueDate"> $i18n.getString( "due_date" ) </label></th>
+ <th><input type="text" id="dueDate" name="dueDate" value="$!format.formatDate( $programStageInstance.dueDate )" disabled="disabled"> </th>
+ </tr>
+ #end
+ </table>
+</div>
+
+<input type='hidden' id="programId" name="programId" type="text" readonly="readonly" value="$encoder.htmlEncode( $program.name )" style="min-width:350px">
+<input id="programStageId" name="programStageId" type="hidden" value="$programStage.id" style="min-width:350px">
+
+<p></p>
+#parse( "dhis-web-commons/loader/loader.vm" )
<form id='dataEntryFormDiv' name='dataEntryFormDiv' >
#parse( "dhis-web-caseentry/dataEntryForm.vm" )
-</form>
\ No newline at end of file
+</form>
+
+<script type="text/javascript">
+ jQuery('#patientForm').ready( function(){
+ enable('validationBtn');
+ #if($programStageInstance.completed=='true')
+ disable('completeBtn');
+ enable('uncompleteBtn');
+ #else
+ enable('completeBtn');
+ disable('uncompleteBtn');
+ #end
+ });
+
+ var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
+ var i18n_value_must_number = '$encoder.jsEscape( $i18n.getString( "value_must_number" ) , "'")';
+ var i18n_value_must_positive_integer = '$encoder.jsEscape( $i18n.getString( "value_must_positive_integer" ) , "'")';
+ var i18n_value_must_negative_integer = '$encoder.jsEscape( $i18n.getString( "value_must_negative_integer" ) , "'")';
+ var i18n_invalid_date = '$encoder.jsEscape( $i18n.getString( "invalid_date" ) , "'")' + ".\n "
+ + '$encoder.jsEscape( $i18n.getString( "format_date" ) , "'")' + " '"
+ + dateFormat.replace('yy', 'yyyy') + " '" ;
+ var i18n_saving_value_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_status_code" ) , "'")';
+ var i18n_saving_value_failed_error_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_error_code" ) , "'")';
+ var i18n_searching_patient_failed = '$encoder.jsEscape( $i18n.getString( "searching_patient_failed" ) , "'")';
+ var i18n_complete_confirm_message = '$encoder.jsEscape( $i18n.getString( "complete_confirm_message" ) , "'")';
+ var i18n_incomplete_confirm_message = '$encoder.jsEscape( $i18n.getString( "incomplete_confirm_message" ) , "'")';
+ var i18n_error_required_field = '$encoder.jsEscape( $i18n.getString( "error_required_field" ) , "'")';
+ var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
+ var i18n_date_is_greater_then_or_equals_due_date = '$encoder.jsEscape( $i18n.getString( "date_is_greater_then_or_equals_due_date" ) , "'")';
+ var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'")';
+</script>
\ No newline at end of file
