------------------------------------------------------------
revno: 20008
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Mon 2015-09-07 09:54:26 +0700
message:
minor type => valueType fixes in tracker apps
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js
--
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-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2015-09-03 15:33:49 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2015-09-07 02:54:26 +0000
@@ -197,12 +197,12 @@
$scope.filterTypes[prStDe.dataElement.id] = prStDe.dataElement.valueType;
- if(prStDe.dataElement.type === 'DATE' ||
- prStDe.dataElement.type === 'NUMBER' ||
- prStDe.dataElement.type === 'INTEGER' ||
- prStDe.dataElement.type === 'INTEGER_POSITIVE' ||
- prStDe.dataElement.type === 'INTEGER_NEGATIVE' ||
- prStDe.dataElement.type === 'INTEGER_ZERO_OR_POSITIVE'){
+ if(prStDe.dataElement.valueType === 'DATE' ||
+ prStDe.dataElement.valueType === 'NUMBER' ||
+ prStDe.dataElement.valueType === 'INTEGER' ||
+ prStDe.dataElement.valueType === 'INTEGER_POSITIVE' ||
+ prStDe.dataElement.valueType === 'INTEGER_NEGATIVE' ||
+ prStDe.dataElement.valueType === 'INTEGER_ZERO_OR_POSITIVE'){
$scope.filterText[prStDe.dataElement.id]= {};
}
});
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2015-09-03 20:50:06 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2015-09-07 02:54:26 +0000
@@ -486,7 +486,7 @@
if (oldValue !== value) {
if (value) {
- if (prStDe.dataElement.type === 'date') {
+ if (prStDe.dataElement.valueType === 'DATE') {
value = DateUtils.formatFromUserToApi(value);
}
if (prStDe.dataElement.optionSetValue) {
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
