dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21824
committer: Markus Bekken <markus.bekken@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2016-01-27 16:13:53 +0100
message:
  Keep model updated during registration
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-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-tracker-capture/components/registration/default-registration-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html	2016-01-20 13:50:57 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html	2016-01-27 15:13:53 +0000
@@ -55,7 +55,7 @@
                                name="foo" 
                                class="form-control input-with-audit"
                                ng-model="selectedTei[attribute.id]" 
-                               ng-model-options="{ updateOn: 'blur', allowInvalid: true }"
+                               ng-model-options="{ updateOn: 'default blur', allowInvalid: true }"
                                d2-attribute-validator 
                                attribute-data={{attribute}}
                                selected-program-id={{selectedProgram.id}}  
@@ -117,7 +117,7 @@
                                name="foo" 
                                class="form-control input-with-audit"
                                ng-model="selectedTei[attribute.id]"
-                               ng-model-options="{ updateOn: 'blur', allowInvalid: true }"
+                               ng-model-options="{ updateOn: 'default blur', allowInvalid: true }"
                                d2-attribute-validator 
                                attribute-data={{attribute}}
                                selected-program-id={{selectedProgram.id}}  
@@ -130,11 +130,11 @@
                         <d2-audit dataelement-id="{{attribute.id}}" dataelement-name="{{attribute.name}}" data-type="attribute" selected-tei-id={{selectedTei.trackedEntityInstance}}></d2-audit>
                     </span>
                     <span ng-switch-when="EMAIL">
-                        <input type="email" 
+                        <input type="email"
                                name="foo" 
                                class="form-control input-with-audit"
                                ng-model="selectedTei[attribute.id]"
-                               ng-model-options="{ updateOn: 'blur', allowInvalid: true }"
+                               ng-model-options="{ updateOn: 'default blur', allowInvalid: true }"
                                d2-attribute-validator 
                                attribute-data={{attribute}}
                                selected-program-id={{selectedProgram.id}}  
@@ -149,8 +149,8 @@
                                name="foo" 
                                class="form-control input-with-audit"
                                ng-model="selectedTei[attribute.id]" 
-                               ng-model-options="{ updateOn: 'blur', allowInvalid: true }" 
-                               d2-attribute-validator 
+                               d2-attribute-validator
+                               ng-model-options="{ updateOn: 'default blur', allowInvalid: true }" 
                                attribute-data={{attribute}}
                                selected-program-id={{selectedProgram.id}}  
                                selected-tei-id={{selectedTei.trackedEntityInstance}}  
@@ -165,12 +165,11 @@
                                name="foo" 
                                class="form-control-trimmed input-with-audit"
                                ng-model="selectedTei[attribute.id]" 
-                               ng-model-options="{ updateOn: 'blur', allowInvalid: true }"
+                               ng-model-options="{ updateOn: 'default blur', allowInvalid: true }"
                                d2-attribute-validator 
                                attribute-data={{attribute}}
                                selected-program-id={{selectedProgram.id}}  
-                               selected-tei-id={{selectedTei.trackedEntityInstance}}  
-                               ng-model-options="{ updateOn: 'blur', allowInvalid: true }"
+                               selected-tei-id={{selectedTei.trackedEntityInstance}}
                                ng-disabled="true" 
                                ng-blur="teiValueUpdated(selectedTei, attribute.id)"
                                style="width:75%;"
@@ -190,7 +189,7 @@
                                name="foo" 
                                class="form-control input-with-audit"
                                ng-model="selectedTei[attribute.id]" 
-                               ng-model-options="{ updateOn: 'blur', allowInvalid: true }"
+                               ng-model-options="{ updateOn: 'default blur', allowInvalid: true }"
                                d2-attribute-validator
                                attribute-data={{attribute}}
                                selected-program-id={{selectedProgram.id}}