=== 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-01-17 10:50:24 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html	2015-01-19 17:16:47 +0000
@@ -25,7 +25,7 @@
                                    ng-class='getInputNotifcationClass(prStDe.dataElement.id,false)'
                                    ng-model="currentEvent[prStDe.dataElement.id]" 
                                    ng-required={{prStDe.compulsory}}
-                                   ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                   ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                    ng-blur="saveDatavalue(prStDe)" 
                                    name="foo"/>
                             <span ng-show="dataEntryOuterForm.submitted && dataEntryInnerForm.foo.$invalid" class="error">{{'number_required'| translate}}</span>
@@ -37,7 +37,7 @@
                                         ng-class='getInputNotifcationClass(prStDe.dataElement.id,false)'
                                         ng-model="currentEvent[prStDe.dataElement.id]" 
                                         ng-required={{prStDe.compulsory}} 
-                                        ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                        ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                         typeahead="option.name as option.name for option in optionSets[prStDe.dataElement.optionSet.id].options | filter:$viewValue | limitTo:20" 
                                         typeahead-open-on-focus 
                                         typeahead-editable="false"
@@ -51,7 +51,7 @@
                                             ng-class='getInputNotifcationClass(prStDe.dataElement.id,true)'
                                             name={{currentEvent[prStDe.dataElement.id]}}
                                             ng-required={{prStDe.compulsory}} 
-                                            ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                            ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                             ng-model="currentEvent[prStDe.dataElement.id]"
                                             ng-change="saveDatavalue(prStDe)" 
                                             value=""> {{'no_value' | translate}}<br>                                       
@@ -62,7 +62,7 @@
                                                 ng-class='getInputNotifcationClass(prStDe.dataElement.id,true)'
                                                 name={{currentEvent[prStDe.dataElement.id]}}
                                                 ng-required={{prStDe.compulsory}} 
-                                                ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                                ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                                 ng-model="currentEvent[prStDe.dataElement.id]"
                                                 ng-change="saveDatavalue(prStDe)" 
                                                 value={{option.name}}> {{option.name}}
@@ -75,7 +75,7 @@
                                     ng-class='getInputNotifcationClass(prStDe.dataElement.id,false)'
                                     ng-model="currentEvent[prStDe.dataElement.id]" 
                                     ng-required={{prStDe.compulsory}} 
-                                    ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                    ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                     ng-blur="saveDatavalue(prStDe)" 
                                     name="foo"/>
                             </div>
@@ -84,7 +84,7 @@
                             <select ng-class='getInputNotifcationClass(prStDe.dataElement.id,false)'
                                     ng-model="currentEvent[prStDe.dataElement.id]" 
                                     ng-required={{prStDe.compulsory}} 
-                                    ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                    ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                     ng-change="saveDatavalue(prStDe)" 
                                     name="foo">
                                 <option value="">{{'please_select'| translate}}</option>                        
@@ -101,7 +101,7 @@
                                    ng-class='getInputNotifcationClass(prStDe.dataElement.id,false)'
                                    ng-model="currentEvent[prStDe.dataElement.id]"
                                    ng-required={{prStDe.compulsory}}  
-                                   ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                   ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                    blur-or-change="saveDatavalue(prStDe)"
                                    name="foo"/>
                         </div>
@@ -110,7 +110,7 @@
                                    ng-class='getInputNotifcationClass(prStDe.dataElement.id,false)'
                                    ng-model="currentEvent[prStDe.dataElement.id]"                                                               
                                    ng-required={{prStDe.compulsory}} 
-                                   ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                   ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                    ng-change="saveDatavalue(prStDe)" 
                                    name="foo"/>
                         </div>
@@ -122,7 +122,7 @@
                 <div class="align-center" ng-show="prStDe.allowProvidedElsewhere">
                     <input type="checkbox" 
                            ng-model="currentEvent.providedElsewhere[prStDe.dataElement.id]" 
-                           ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                           ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                            ng-change="saveDatavalueLocation(prStDe)"/>                
                 </div>
             </td>
@@ -159,7 +159,7 @@
                                                    ng-class='getInputNotifcationClass(prStDes[de.dataElement.id].dataElement.id,false)'
                                                    ng-model="currentEvent[prStDes[de.dataElement.id].dataElement.id]" 
                                                    ng-required={{prStDes[de.dataElement.id].compulsory}}
-                                                   ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                                   ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                                    ng-blur="saveDatavalue(prStDes[de.dataElement.id])" 
                                                    name="foo"/>
                                             <span ng-show="dataEntryOuterForm.submitted && dataEntryInnerForm.foo.$invalid" class="error">{{'number_required'| translate}}</span>
@@ -171,7 +171,7 @@
                                                         ng-class='getInputNotifcationClass(prStDes[de.dataElement.id].dataElement.id,false)'
                                                         ng-model="currentEvent[prStDes[de.dataElement.id].dataElement.id]" 
                                                         ng-required={{prStDes[de.dataElement.id].compulsory}} 
-                                                        ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                                        ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                                         typeahead="option.name as option.name for option in optionSets[prStDes[de.dataElement.id].dataElement.optionSet.id].options | filter:$viewValue | limitTo:20" 
                                                         typeahead-open-on-focus 
                                                         typeahead-editable="false"
@@ -185,7 +185,7 @@
                                                             ng-class='getInputNotifcationClass(prStDes[de.dataElement.id].dataElement.id,true)'
                                                             name={{currentEvent[prStDes[de.dataElement.id].dataElement.id]}}
                                                             ng-required={{prStDes[de.dataElement.id].compulsory}} 
-                                                            ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                                            ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                                             ng-model="currentEvent[prStDes[de.dataElement.id].dataElement.id]"
                                                             ng-change="saveDatavalue(prStDes[de.dataElement.id])" 
                                                             value=""> {{'no_value' | translate}}<br>                                       
@@ -196,7 +196,7 @@
                                                                 ng-class='getInputNotifcationClass(prStDes[de.dataElement.id].dataElement.id,true)'
                                                                 name={{currentEvent[prStDes[de.dataElement.id].dataElement.id]}}
                                                                 ng-required={{prStDes[de.dataElement.id].compulsory}} 
-                                                                ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                                                ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                                                 ng-model="currentEvent[prStDes[de.dataElement.id].dataElement.id]"
                                                                 ng-change="saveDatavalue(prStDes[de.dataElement.id])" 
                                                                 value={{option.name}}> {{option.name}}
@@ -209,7 +209,7 @@
                                                     ng-class='getInputNotifcationClass(prStDes[de.dataElement.id].dataElement.id,false)'
                                                     ng-model="currentEvent[prStDes[de.dataElement.id].dataElement.id]" 
                                                     ng-required={{prStDes[de.dataElement.id].compulsory}} 
-                                                    ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                                    ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                                     ng-blur="saveDatavalue(prStDes[de.dataElement.id])" 
                                                     name="foo"/>
                                             </div>
@@ -218,7 +218,7 @@
                                             <select ng-class='getInputNotifcationClass(prStDes[de.dataElement.id].dataElement.id,false)'
                                                     ng-model="currentEvent[prStDes[de.dataElement.id].dataElement.id]" 
                                                     ng-required={{prStDes[de.dataElement.id].compulsory}} 
-                                                    ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                                    ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                                     ng-change="saveDatavalue(prStDes[de.dataElement.id])" 
                                                     name="foo">
                                                 <option value="">{{'please_select'| translate}}</option>                        
@@ -235,7 +235,7 @@
                                                    ng-class='getInputNotifcationClass(prStDes[de.dataElement.id].dataElement.id,false)'
                                                    ng-model="currentEvent[prStDes[de.dataElement.id].dataElement.id]"
                                                    ng-required={{prStDes[de.dataElement.id].compulsory}}  
-                                                   ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                                   ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                                    blur-or-change="saveDatavalue(prStDes[de.dataElement.id])"
                                                    name="foo"/>
                                         </div>
@@ -244,7 +244,7 @@
                                                    ng-class='getInputNotifcationClass(prStDes[de.dataElement.id].dataElement.id,false)'
                                                    ng-model="currentEvent[prStDes[de.dataElement.id].dataElement.id]"                                                               
                                                    ng-required={{prStDes[de.dataElement.id].compulsory}} 
-                                                   ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                                   ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                                    ng-change="saveDatavalue(prStDes[de.dataElement.id])" 
                                                    name="foo"/>
                                         </div>
@@ -256,7 +256,7 @@
                                 <div class="align-center" ng-show="prStDes[de.dataElement.id].allowProvidedElsewhere">
                                     <input type="checkbox" 
                                            ng-model="currentEvent.providedElsewhere[prStDes[de.dataElement.id].dataElement.id]"
-                                           ng-disabled="currentEvent.enrollmentStatus !== 'ACTIVE'" 
+                                           ng-disabled="selectedEnrollment.status !== 'ACTIVE'" 
                                            ng-change="saveDatavalueLocation(prStDes[de.dataElement.id])"/>                
                                 </div>
                             </td>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/plugins/dhis2/services.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/plugins/dhis2/services.js	2015-01-18 23:24:46 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/plugins/dhis2/services.js	2015-01-19 17:16:47 +0000
@@ -246,7 +246,7 @@
                                                 ' ng-model="currentEvent.' + fieldId + '"' +
                                                 ' input-field-id="' + fieldId + '"' +
                                                 ' ng-class="getInputNotifcationClass(prStDes.' + fieldId + '.dataElement.id,true)"' +
-                                                ' ng-disabled="currentEvent.enrollmentStatus===\'CANCELLED\' || currentEvent.enrollmentStatus===\'COMPLETED\'"' +
+                                                ' ng-disabled="selectedEnrollment.status===\'CANCELLED\' || selectedEnrollment.status===\'COMPLETED\'"' +
                                                 ' ng-blur="saveDatavalue(prStDes.'+ fieldId + ')"' + 
                                                 ' ng-required="{{prStDes.' + fieldId + '.compulsory}}">';
                             }
@@ -258,7 +258,7 @@
                                                 ' d2-validation ' +
                                                 ' ng-model="currentEvent.' + fieldId + '" ' +
                                                 ' input-field-id="' + fieldId + '"' +
-                                                ' ng-disabled="currentEvent.enrollmentStatus===\'CANCELLED\' || currentEvent.enrollmentStatus===\'COMPLETED\' || currentEvent[uid]==\'uid\'"' +
+                                                ' ng-disabled="selectedEnrollment.status===\'CANCELLED\' || selectedEnrollment.status===\'COMPLETED\' || currentEvent[uid]==\'uid\'"' +
                                                 ' ng-required="{{prStDes.' + fieldId + '.compulsory}}"' +
                                                 ' typeahead="option.name as option.name for option in optionSets.'+optionSetId+'.options | filter:$viewValue | limitTo:20"' +
                                                 ' typeahead-editable="false" ' +
@@ -275,7 +275,7 @@
                                                 ' d2-validation ' +
                                                 ' ng-model="currentEvent.' + fieldId + '" ' +
                                                 ' input-field-id="' + fieldId + '"' +
-                                                ' ng-disabled="currentEvent.enrollmentStatus===\'CANCELLED\' || currentEvent.enrollmentStatus===\'COMPLETED\' || currentEvent[uid]==\'uid\'"' +
+                                                ' ng-disabled="selectedEnrollment.status===\'CANCELLED\' || selectedEnrollment.status===\'COMPLETED\' || currentEvent[uid]==\'uid\'"' +
                                                 ' ng-class="getInputNotifcationClass(prStDes.' + fieldId + '.dataElement.id,true)"' +
                                                 ' ng-blur="saveDatavalue(prStDes.'+ fieldId + ')"' +
                                                 ' ng-required="prStDes.' + fieldId + '.compulsory"> ';                                     
@@ -288,7 +288,7 @@
                                                 ' ng-model="currentEvent.' + fieldId + '" ' +
                                                 ' input-field-id="' + fieldId + '"' +
                                                 ' ng-class="getInputNotifcationClass(prStDes.' + fieldId + '.dataElement.id,true)"' +
-                                                ' ng-disabled="currentEvent.enrollmentStatus===\'CANCELLED\' || currentEvent.enrollmentStatus===\'COMPLETED\'"' +
+                                                ' ng-disabled="selectedEnrollment.status===\'CANCELLED\' || selectedEnrollment.status===\'COMPLETED\'"' +
                                                 ' ng-change="saveDatavalue(prStDes.'+ fieldId + ')"' + 
                                                 ' ng-required="{{prStDes.' + fieldId + '.compulsory}}">' + 
                                                 '<option value="">{{\'please_select\'| translate}}</option>' +
@@ -306,7 +306,7 @@
                                                 ' d2-date ' +
                                                 ' max-date="' + maxDate + '"' +
                                                 ' ng-class="getInputNotifcationClass(prStDes.' + fieldId + '.dataElement.id,true)"' +
-                                                ' ng-disabled="currentEvent.enrollmentStatus===\'CANCELLED\' || currentEvent.enrollmentStatus===\'COMPLETED\'"' +
+                                                ' ng-disabled="selectedEnrollment.status===\'CANCELLED\' || selectedEnrollment.status===\'COMPLETED\'"' +
                                                 ' blur-or-change="saveDatavalue(prStDes.'+ fieldId + ')"' + 
                                                 ' ng-required="{{prStDes.' + fieldId + '.compulsory}}"> '; 
                             }
@@ -317,7 +317,7 @@
                                                 ' ng-model="currentEvent.' + fieldId + '"' +
                                                 ' input-field-id="' + fieldId + '"' +
                                                 ' ng-class="getInputNotifcationClass(prStDes.' + fieldId + '.dataElement.id,true)"' +
-                                                ' ng-disabled="currentEvent.enrollmentStatus===\'CANCELLED\' || currentEvent.enrollmentStatus===\'COMPLETED\'"' +
+                                                ' ng-disabled="selectedEnrollment.status===\'CANCELLED\' || selectedEnrollment.status===\'COMPLETED\'"' +
                                                 ' ng-change="saveDatavalue(prStDes.'+ fieldId + ')"' +
                                                 ' ng-required="{{prStDes.' + fieldId + '.compulsory}}"> ';
                             }