------------------------------------------------------------
revno: 21912
committer: Abyot Asalefew Gizaw <ab...@dhis2.org>
branch nick: dhis2
timestamp: Tue 2016-02-09 08:36:15 +0100
message:
bug fix in future date of program stage data elements and program attributes
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addProgramStageForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateProgramStageForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/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-program/src/main/webapp/dhis-web-maintenance-program/javascript/addProgramStageForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addProgramStageForm.js 2015-03-19 11:14:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addProgramStageForm.js 2016-02-09 07:36:15 +0000
@@ -13,7 +13,7 @@
option.attr("valuetype", "optionset");
}
else {
- option.attr("valuetype", item.type);
+ option.attr("valuetype", item.valueType);
}
return option;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js 2015-11-18 12:44:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js 2016-02-09 07:36:15 +0000
@@ -178,7 +178,7 @@
html += "<td onmousedown='select(event,this)'>" + item.text + "</td>";
html += "<td align='center'><input type='checkbox' name='displayed' value='" + item.value + "'></td>"
html += "<td align='center'><input type='checkbox' name='mandatory'></td>";
- if( jQuery(item).attr('valuetype') =='date'){
+ if( jQuery(item).attr('valuetype') =='DATE'){
html += "<td align='center'><input type='checkbox' name='allowFutureDate'></td>";
}
else{
@@ -203,7 +203,7 @@
html += "<td onmousedown='select(this)'>" + item.text + "</td>";
html += "<td align='center'><input type='checkbox' name='displayed' value='" + item.value + "'></td>";
html += "<td align='center'><input type='checkbox' name='mandatory'></td>";
- if( jQuery(item).attr('valuetype') =='date'){
+ if( jQuery(item).attr('valuetype') =='DATE'){
html += "<td align='center'><input type='checkbox' name='allowFutureDate'></td>";
}
else{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js 2015-10-23 03:41:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js 2016-02-09 07:36:15 +0000
@@ -115,7 +115,7 @@
html += "<td align='center'><input type='checkbox' name='compulsory'></td>";
html += "<td align='center'><input type='checkbox' name='allowProvided'></td>";
html += "<td align='center'><input type='checkbox' name='displayInReport'></td>";
- if( jQuery(item).attr('valuetype') =='date'){
+ if( jQuery(item).attr('valuetype') =='DATE'){
html += "<td align='center'><input type='checkbox' name='allowFutureDate'></td>";
}
else{
@@ -139,7 +139,7 @@
html += "<td align='center'><input type='checkbox' name='allowProvided'></td>";
html += "<td align='center'><input type='checkbox' name='displayInReport'></td>";
- if( jQuery(item).attr('valuetype') =='date'){
+ if( jQuery(item).attr('valuetype') =='DATE'){
html += "<td align='center'><input type='checkbox' name='allowFutureDate'></td>";
}
else{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateProgramStageForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateProgramStageForm.js 2015-03-19 11:14:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateProgramStageForm.js 2016-02-09 07:36:15 +0000
@@ -18,7 +18,7 @@
option.attr( "valuetype", "optionset" );
}
else{
- option.attr( "valuetype", item.type );
+ option.attr( "valuetype", item.valueType );
}
var flag = false;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm 2015-12-03 16:47:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm 2016-02-09 07:36:15 +0000
@@ -346,7 +346,7 @@
<td align="center"><input type="checkbox" name="displayed" value="attr_$programAttribute.attribute.id" #if($programAttribute.displayInList == true ) checked #end #if($program.programType.value=="without_registration") disabled #end /></td>
<td align="center"><input type="checkbox" name="mandatory" #if($programAttribute.mandatory == "true" ) checked #end #if($program.tprogramType.value=="without_registration") disabled #end /></td>
<td align="center">
- #if($attribute.valueType=='date')
+ #if($attribute.valueType=='DATE')
<input type="checkbox" name="allowFutureDate" #if($programAttribute.allowFutureDate == "true" ) checked #end #if($program.programType.value=="without_registration") disabled #end />
#else
<input type="hidden" name="allowFutureDate" />
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
