dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #22755
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11037: Change entry form of Visit Schedule is similar to data entry form of Multi Idividual Record.
------------------------------------------------------------
revno: 11037
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-05-28 14:32:37 +0700
message:
Change entry form of Visit Schedule is similar to data entry form of Multi Idividual Record.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.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/dataentryRecords.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js
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/multiDataEntry.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.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/activityPlanSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm 2013-05-28 03:10:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm 2013-05-28 07:32:37 +0000
@@ -238,6 +238,8 @@
var i18n_clear = '$encoder.jsEscape( $i18n.getString( "clear" ) , "'")';
var i18n_insert_a_report_date = '$encoder.jsEscape( $i18n.getString( "insert_a_report_date" ) , "'")';
var i18n_comment_added = '$encoder.jsEscape( $i18n.getString( "comment_added" ) , "'")';
+ var i18n_comment = '$encoder.jsEscape( $i18n.getString( "comment" ) , "'")';
+ var i18n_message = '$encoder.jsEscape( $i18n.getString( "message" ) , "'")';
setDateRange();
</script>
=== 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-05-23 02:30:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2013-05-28 07:32:37 +0000
@@ -62,8 +62,7 @@
<td class='coordinates1'></td>
<td colspan='3'>
<table>
- <tbody id="commentTB">
- </tbody>
+ <tbody id="commentTB"></tbody>
</table>
</td>
</tr>
@@ -71,7 +70,7 @@
</table>
<br>
-
+
#if( $customDataEntryFormCode )
#parse( "/dhis-web-caseentry/customDataEntryForm.vm" )
#elseif( $sections && $sections.size() > 0 )
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm 2013-05-06 08:28:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm 2013-05-28 07:32:37 +0000
@@ -36,7 +36,7 @@
<th>$i18n.getString('system_identifier')</th>
#end
- <th>$i18n.getString( "program_stage" )</th>
+ <th>$i18n.getString( "events" )</th>
<th>$i18n.getString( "operations" )</th>
</tr>
</thead>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js 2013-05-27 05:30:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js 2013-05-28 07:32:37 +0000
@@ -106,7 +106,7 @@
{
jQuery('[id=programStageInstanceId]').val(programStageInstanceId);
jQuery('.stage-object-selected').attr('psuid',programStageUid);
- $('#contentDataRecord' ).load("dataentryform.action",
+ $('#contentDataRecord' ).load("viewProgramStageRecords.action",
{
programStageInstanceId: programStageInstanceId
}, function(){
@@ -115,7 +115,6 @@
jQuery('#programStageUid').val(programStageUid);
showById('reportDateDiv');
showById('patientInforTB');
- showById('postCommentTbl');
showById('entryForm');
showById('inputCriteriaDiv');
}).dialog(
=== 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-05-27 04:44:50 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2013-05-28 07:32:37 +0000
@@ -814,6 +814,7 @@
"<tr>",
"<td>" + item.createdDate + "</td>",
"<td>" + item.creator + "</td>",
+ "<td>" + i18n_comment + "</td>",
"<td>" + item.text + "</td>",
"</tr>"
].join(' ');
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js 2013-05-28 03:10:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js 2013-05-28 07:32:37 +0000
@@ -141,7 +141,6 @@
{
setFieldValue( 'programStageInstanceId', programStageInstanceId );
showById('patientInforTB');
- showById('postCommentTbl');
}).dialog(
{
title:i18n_program_stage,
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2013-05-21 07:51:32 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2013-05-28 07:32:37 +0000
@@ -326,7 +326,6 @@
programStageInstanceId: programStageInstanceId
},function( )
{
- showById('postCommentTbl');
var executionDate = jQuery('#executionDate').val();
var completed = jQuery('#entryFormContainer input[id=completed]').val();
var irregular = jQuery('#entryFormContainer input[id=irregular]').val();
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm 2013-05-28 03:10:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm 2013-05-28 07:32:37 +0000
@@ -82,4 +82,6 @@
var i18n_main_form_link = '$encoder.jsEscape( $i18n.getString( "multiple_individual_records_management" ), "'")';
var i18n_patient_details_and_history = '$encoder.jsEscape( $i18n.getString( "patient_details_and_history" ), "'")';
var i18n_insert_a_report_date = '$encoder.jsEscape( $i18n.getString( "insert_a_report_date" ) , "'")';
+ var i18n_comment = '$encoder.jsEscape( $i18n.getString( "comment" ) , "'")';
+ var i18n_message = '$encoder.jsEscape( $i18n.getString( "message" ) , "'")';
</script>
