dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19747
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-08-07 18:54:38 +0200
message:
  bug fix in updating skip logic for option selection
modified:
  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/eventList.html
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html


--
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/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html	2015-07-08 05:02:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html	2015-08-07 16:54:38 +0000
@@ -80,8 +80,8 @@
                                            theme="select2" 
                                            ng-required={{eventGridColumn.compulsory}}
                                            name="foo" 
-                                           input-field-id={{eventGridColumn.id}}
-                                           on-select="saveDatavalue()" 
+                                           input-field-id={{eventGridColumn.id}} 
+                                           on-select={{saveDatavalue()}} 
                                            class='form-control'>
                                     <ui-select-match allow-clear="true" class="form-control" placeholder="{{'select_or_search' | translate}}">{{$select.selected.name  || $select.selected}}</ui-select-match>
                                     <ui-select-choices  infinite-scroll="addMoreOptions()"
@@ -300,9 +300,9 @@
                                     <ui-select ng-model="currentEvent[de.dataElement.id]" 
                                                theme="select2" 
                                                ng-required={{prStDes[de.dataElement.id].compulsory}}
-                                               ng-app=""name="foo" 
-                                               ng-app=""input-field-id={{de.dataElement.id}} 
-                                               on-select="saveDataValue()"
+                                               name="foo" 
+                                               input-field-id={{de.dataElement.id}} 
+                                               on-select={{saveDatavalue()}} 
                                                class='form-control'>
                                         <ui-select-match allow-clear="true" class="form-control" placeholder="{{'select_or_search' | translate}}">{{$select.selected.name || $select.selected}}</ui-select-match>
                                         <ui-select-choices  infinite-scroll="addMoreOptions()"

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html	2015-06-15 11:04:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html	2015-08-07 16:54:38 +0000
@@ -140,7 +140,7 @@
                                                                ng-required={{eventGridColumn.compulsory}}
                                                                name="foo" 
                                                                d2-option-validator
-                                                               on-select="updateEventDataValue(dhis2Event,eventGridColumn.id)" 
+                                                               on-select={{updateEventDataValue(dhis2Event,eventGridColumn.id)}} 
                                                                on-remove="validateOptionOnRemove(eventGridColumn.compulsory)"
                                                                input-field-id={{eventGridColumn.id}}
                                                                style="width:100%;"

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html	2015-08-06 15:06:48 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html	2015-08-07 16:54:38 +0000
@@ -31,7 +31,7 @@
                                         ng-required={{prStDe.compulsory}} 
                                         ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed" 
                                         name="foo" 
-                                        on-select="saveDatavalue(prStDe, innerForm.foo)" 
+                                        on-select={{saveDatavalue(prStDe, innerForm.foo)}} 
                                         style="width:100%;">
                                 <ui-select-match allow-clear="true" ng-class={{getInputNotifcationClass(prStDe.dataElement.id,false)}} style="width:100%; height:34px; line-height:1.0; padding: 2px 6px; margin-top:5px" placeholder="{{'select_or_search' | translate}}">{{$select.selected.name  || $select.selected}}</ui-select-match>
                                 <ui-select-choices  infinite-scroll="addMoreOptions()"
@@ -203,7 +203,7 @@
                                                         ng-required={{prStDes[de.dataElement.id].compulsory}} 
                                                         ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed" 
                                                         name="foo" 
-                                                        on-select="saveDatavalue(prStDes[de.dataElement.id], innerForm.foo)" 
+                                                        on-select={{saveDatavalue(prStDes[de.dataElement.id], innerForm.foo)}} 
                                                         style="width:100%;">
                                                 <ui-select-match allow-clear="true" ng-class={{getInputNotifcationClass(prStDes[de.dataElement.id].dataElement.id,false)}} style="width:100%; height:34px; line-height:1.0; padding: 2px 6px; margin-top:5px" placeholder="{{'select_or_search' | translate}}">{{$select.selected.name  || $select.selected}}</ui-select-match>
                                                 <ui-select-choices  infinite-scroll="addMoreOptions()"