dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40031
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20271: minor
------------------------------------------------------------
revno: 20271
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-09-21 17:21:43 +0200
message:
minor
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.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/event-capture.appcache'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache 2015-09-17 11:21:04 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache 2015-09-21 15:21:43 +0000
@@ -122,7 +122,8 @@
views/modal.html
views/notes.html
views/buttons-section.html
-views/indicators-section.html
+views/indicators.html
+views/warnings.html
../dhis-web-commons/fonts/LiberationSans-Regular-webfont.eot
../dhis-web-commons/fonts/LiberationSans-Regular-webfont.woff
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2015-09-21 08:48:11 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2015-09-21 15:21:43 +0000
@@ -115,7 +115,7 @@
<div ng-switch-when="NUMBER">
<input type="number"
d2-number-validator
- number-type={{prStDes[eventGridColumn.id].dataElement.numberType}}
+ number-type={{eventGridColumn.valueType}}
ng-model="currentEvent[eventGridColumn.id]"
ng-required={{eventGridColumn.compulsory}}
name="foo"
@@ -126,7 +126,7 @@
<div ng-switch-when="INTEGER">
<input type="number"
d2-number-validator
- number-type={{prStDes[eventGridColumn.id].dataElement.numberType}}
+ number-type={{eventGridColumn.valueType}}
ng-model="currentEvent[eventGridColumn.id]"
ng-required={{eventGridColumn.compulsory}}
name="foo"
@@ -137,7 +137,7 @@
<div ng-switch-when="INTEGER_POSITIVE">
<input type="number"
d2-number-validator
- number-type={{prStDes[eventGridColumn.id].dataElement.numberType}}
+ number-type={{eventGridColumn.valueType}}
ng-model="currentEvent[eventGridColumn.id]"
ng-required={{eventGridColumn.compulsory}}
name="foo"
@@ -148,7 +148,7 @@
<div ng-switch-when="INTEGER_NEGATIVE">
<input type="number"
d2-number-validator
- number-type={{prStDes[eventGridColumn.id].dataElement.numberType}}
+ number-type={{eventGridColumn.valueType}}
ng-model="currentEvent[eventGridColumn.id]"
ng-required={{eventGridColumn.compulsory}}
name="foo"
@@ -159,7 +159,7 @@
<div ng-switch-when="INTEGER_ZERO_OR_POSITIVE">
<input type="number"
d2-number-validator
- number-type={{prStDes[eventGridColumn.id].dataElement.numberType}}
+ number-type={{eventGridColumn.valueType}}
ng-model="currentEvent[eventGridColumn.id]"
ng-required={{eventGridColumn.compulsory}}
name="foo"
@@ -377,7 +377,7 @@
<div ng-switch-when="NUMBER">
<input type="number"
d2-number-validator
- number-type={{prStDes[de.dataElement.id].dataElement.numberType}}
+ number-type={{prStDes[de.dataElement.id].dataElement.valueType}}
ng-model="currentEvent[de.dataElement.id]"
ng-required={{prStDes[de.dataElement.id].compulsory}}
name="foo"
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js 2015-09-17 11:21:04 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js 2015-09-21 15:21:43 +0000
@@ -350,7 +350,6 @@
newInputField = '<input type="text" ' +
this.getAttributesAsString(attributes) +
' ng-model="currentEvent.' + fieldId + '"' +
- ' style="width:100%;" ' +
' input-field-id="' + fieldId + '"' +
' d2-date ' +
' d2-date-validator ' +
@@ -372,7 +371,6 @@
var commonInputFieldProperty = this.getAttributesAsString(attributes) +
' ng-model="currentEvent.' + fieldId + '" ' +
- ' style="width:100%;" ' +
' input-field-id="' + fieldId + '"' +
' ng-class="{{getInputNotifcationClass(prStDes.' + fieldId + '.dataElement.id, true)}}" ' +
' ng-disabled="isHidden(prStDes.' + fieldId + '.dataElement.id) || selectedEnrollment.status===\'CANCELLED\' || selectedEnrollment.status===\'COMPLETED\' || currentEvent[uid]==\'uid\' || currentEvent.editingNotAllowed"' +
@@ -383,7 +381,7 @@
if (prStDe.dataElement.optionSetValue) {
var optionSetId = prStDe.dataElement.optionSet.id;
newInputField = '<ui-select theme="select2" ' + commonInputFieldProperty + ' on-select="saveDatavalue(prStDes.' + fieldId + ', outerForm.' + fieldId + ')" >' +
- '<ui-select-match allow-clear="true" style="width:100%;" placeholder="' + $translate.instant('select_or_search') + '">{{$select.selected.name || $select.selected}}</ui-select-match>' +
+ '<ui-select-match allow-clear="true" placeholder="' + $translate.instant('select_or_search') + '">{{$select.selected.name || $select.selected}}</ui-select-match>' +
'<ui-select-choices ' +
' repeat="option.name as option in optionSets.' + optionSetId + '.options | filter: $select.search | limitTo:30">' +
'<span ng-bind-html="option.name | highlight: $select.search"></span>' +
@@ -491,7 +489,6 @@
var commonInputFieldProperty = ' name="' + fieldName + '"' +
' element-id="' + i + '"' +
- ' style="width:100%;" ' +
this.getAttributesAsString(attributes) +
' d2-focus-next-on-enter' +
' ng-model="selectedTei.' + attId + '" ' +
@@ -503,7 +500,7 @@
if (att.optionSetValue) {
var optionSetId = att.optionSet.id;
newInputField = '<ui-select theme="select2" ' + commonInputFieldProperty + ' on-select="teiValueUpdated(selectedTei,\'' + attId + '\')" >' +
- '<ui-select-match style="width:100%;" allow-clear="true" placeholder="' + $translate.instant('select_or_search') + '">{{$select.selected.name || $select.selected}}</ui-select-match>' +
+ '<ui-select-match allow-clear="true" placeholder="' + $translate.instant('select_or_search') + '">{{$select.selected.name || $select.selected}}</ui-select-match>' +
'<ui-select-choices ' +
'repeat="option.name as option in optionSets.' + optionSetId + '.options | filter: $select.search | limitTo:30">' +
'<span ng-bind-html="option.name | highlight: $select.search"></span>' +
