dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19069
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8174: Show which facility that registered the data on top of each form/stage; Allow enter number and spe...
------------------------------------------------------------
revno: 8174
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-09-21 14:44:44 +0700
message:
Show which facility that registered the data on top of each form/stage;Allow enter number and special characters for person name.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm
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-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm
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/programStageInstanceFlow.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.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/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-09-21 07:05:52 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-09-21 07:44:44 +0000
@@ -116,13 +116,13 @@
</p>
<table>
<tr>
- <th><span id="reportDateDescriptionField2">$i18n.getString( "report_date" ) </label></th>
+ <th><span id="reportDateDescriptionField2">$i18n.getString( "report_date" ) </span> </th>
<th><input type="text" id="executionDate" name="executionDate" onchange="addNewEvent();"></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>
+ <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>
</table>
<div id='dataEntryFormDiv'></div>
=== 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-09-19 13:30:52 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2012-09-21 07:44:44 +0000
@@ -12,7 +12,7 @@
#end
$('#executionDate').unbind("change");
$('#executionDate').change(function() {
- saveExecutionDate( getFieldValue('programId'), getFieldValue('executionDate') );
+ saveExecutionDate( getFieldValue('programId'), $programStageInstance.id, byId('executionDate') );
});
entryFormContainerOnReady();
=== 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 2012-09-21 06:20:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2012-09-21 07:44:44 +0000
@@ -439,8 +439,7 @@
url: "saveExecutionDate.action",
data: params,
dataType: "xml",
- success: function( result ){
- handleResponse (result);
+ success: function( result ){
var selectedProgramStageInstance = jQuery( '#' + prefixId + getFieldValue('programStageInstanceId') );
var box = jQuery(".stage-object-selected");
var boxName = box.attr('psname') + getInnerHTML('enterKey') + executionDate;
@@ -454,6 +453,10 @@
var fieldId = "value_" + programStageInstanceId + "_date";
jQuery("#" + fieldId).css('background-color', SUCCESS_COLOR);
jQuery('#executionDate').val(executionDate);
+
+ jQuery("#org_" + programStageInstanceId ).html(getFieldValue("orgunitName"));
+
+ handleResponse (result);
},
error: function(request,status,errorThrown) {
handleHttpError (request);
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2012-09-11 07:31:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2012-09-21 07:44:44 +0000
@@ -23,7 +23,7 @@
<tr>
<td class='text-column'><label for="fullName">$i18n.getString( "full_name" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
<td class="input-column">
- <input type="text" id="fullName" name="fullName" class="{validate:{required:true, unicodechars:true, rangelength:[7,50]}}"/>
+ <input type="text" id="fullName" name="fullName" class="{validate:{required:true, rangelength:[7,50]}}"/>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2012-09-21 06:20:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2012-09-21 07:44:44 +0000
@@ -21,14 +21,14 @@
<br>
<table id='executionDateTB' name="executionDateTB" class='hidden'>
<tr>
- <th class='text-column'><span id="reportDateDescriptionField">$i18n.getString( "report_date" ) </span></th>
+ <th class='text-column'><span id="reportDateDescriptionField">$i18n.getString( "report_date" ) </span> </th>
<th><input type="text" id="executionDate" name="executionDate" class='criteria' value="$!format.formatDate( $programStageInstance.executionDate )" >
<script type="text/javascript">
datePickerValid( 'executionDate', false );
</script>
</th>
- <th class='text-column'><label for="dueDate">$i18n.getString( "due_date" ) </label></th>
- <th><input type="text" id="dueDate" name="dueDate" class='criteria' value="$!format.formatDate( $programStageInstance.dueDate )" readonly > </th>
+ <th class='text-column'><label for="dueDate">$i18n.getString( "due_date" ) </label></th>
+ <th><input type="text" id="dueDate" name="dueDate" class='criteria' value="$!format.formatDate( $programStageInstance.dueDate )" readonly > </th>
</tr>
</table>
</div>
=== modified 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-09-07 09:18:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2012-09-21 07:44:44 +0000
@@ -41,13 +41,13 @@
#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.id, getFieldValue('executionDate') )" ></th>
+ <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.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>
+ <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>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm 2012-09-21 06:20:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm 2012-09-21 07:44:44 +0000
@@ -9,11 +9,12 @@
<tr id='programStageIdTR_$!programInstance.id'>
#foreach( $programStageInstance in $programInstance.programStageInstances )
<td style='font-size:25px;'>→</td>
- <td>
+ <td style='text-align:center'>
#set($valueDate=$format.formatDate( $programStageInstance.dueDate ))
#if($!programStageInstance.executionDate)
#set($valueDate=$format.formatDate( $programStageInstance.executionDate ))
#end
+ <span id="org_$!programStageInstance.id"> $!programStageInstance.organisationUnit.name</span>
<input type="button" name="programStageBtn"
id="ps_$!programStageInstance.id"
psid="$programStageInstance.programStage.id"
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2012-09-21 03:50:11 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2012-09-21 07:44:44 +0000
@@ -81,7 +81,7 @@
<tr>
<td class='text-column'><label for="fullName">$i18n.getString( "full_name" )</label></td>
- <td class="input-column"><input type="text" id="fullName" name="fullName" value="$!patient.getFullName()" class="{validate:{required:true, unicodechars:true, rangelength:[7,50]}}"></td>
+ <td class="input-column"><input type="text" id="fullName" name="fullName" value="$!patient.getFullName()" class="{validate:{required:true, rangelength:[7,50]}}"></td>
</tr>
<tr>
