dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31470
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16034: - Fixed bug - The comment text in Reschedule and set status tab of TEI dashboard is saved twice a...
------------------------------------------------------------
revno: 16034
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-07-09 10:43:23 +0700
message:
- Fixed bug - The comment text in Reschedule and set status tab of TEI dashboard is saved twice after clicking Save comment button.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.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/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2014-06-23 12:12:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2014-07-09 03:43:23 +0000
@@ -691,4 +691,6 @@
add_tracked_entity_instance_successfully = Add tracked entity instance successfully
search_by_attribute_value = Search by attribute value
filter_by_program = Filter by program
-users = Users
\ No newline at end of file
+users = Users
+message_is_sent = Message is sent
+messsage = Message
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2014-07-08 05:18:14 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2014-07-09 03:43:23 +0000
@@ -1395,8 +1395,7 @@
$('#pi_' + programInstanceId).removeClass("link-area-active");
$("#img_" + programInstanceId).attr('src', '');
}
-function loadActiveProgramStageRecords(programInstanceId,
- activeProgramStageInstanceId) {
+function loadActiveProgramStageRecords(programInstanceId, activeProgramStageInstanceId) {
hideById('programEnrollmentDiv');
if (programInstanceId == "")
return;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2014-07-08 06:30:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2014-07-09 03:43:23 +0000
@@ -174,7 +174,7 @@
</script>
</td>
<td>
- <input type='text' id='message_$programStageInstance.id' name='message_$programStageInstance.id' class="{validate:{required:true,maxlength:160}}" style="width:100%" onchange="addComment(byId('message_$programStageInstance.id'),'$programStageInstance.id')" >
+ <input type='text' id='message_$programStageInstance.id' name='message_$programStageInstance.id' class="{validate:{required:true,maxlength:160}}" style="width:100%" >
</td>
<td>
<input type='button' class='normal-button' onclick="addComment(byId('message_$programStageInstance.id'),'$programStageInstance.id')" value="$i18n.getString('save')" >