dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21285
committer: jijukjose <jijukjose@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-12-03 11:00:28 +0100
message:
  modified for adding the completed checkbox
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.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/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties	2015-12-01 14:01:37 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties	2015-12-03 10:00:28 +0000
@@ -65,6 +65,8 @@
 recorded_comments=Recorded comments
 show_comments=Show comments
 new_event=New event
+completed_event=Event completion status
+is_event_complete=Completed
 data_element=Data element
 value=Value
 form_id=Form id

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html	2015-12-02 14:01:24 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html	2015-12-03 10:00:28 +0000
@@ -42,7 +42,8 @@
                         {{registeringUnitLabel}}
                     </div>
                     <div class="col-sm-8">
-                        <input type="text" class="form-control" selected-org-unit ng-model="selectedOrgUnit.name" value="{{selectedOrgUnit.name|| pleaseSelectLabel}}" disabled=""></td>
+                        <input type="text" class="form-control" selected-org-unit ng-model="selectedOrgUnit.name"
+                               value="{{selectedOrgUnit.name|| pleaseSelectLabel}}" disabled="">
                     </div>
                 </div>
                 <div class="row col-sm-12 small-vertical-spacing">
@@ -62,7 +63,7 @@
                     </div>
                 </div>
                 <div class="row col-sm-12 small-vertical-spacing" ng-if="selectedProgram" ng-repeat="category in selectedCategories">
-                    it is here
+
                     <div class="col-sm-4">
                         {{category.name}}
                     </div>
@@ -125,17 +126,7 @@
                     <div class="bordered-div">
                         <div ng-if="displayCustomForm" ng-include="'views/ec-custom-form.html'"></div>  
                         <div ng-if="!displayCustomForm" ng-include="'views/defaultForm.html'"></div>
-                        <table>
-                            <tbody>
-                                <tr>
-                                    <th colspan="2">The form completion status</th>
-                                </tr>
-                                <tr>
-                                    <td>Form Completed</td>
-                                    <td><input type="checkbox" ng-model="currentEvent.status" style="margin-left: 50px;"></td>
-                                </tr>
-                            </tbody>
-                        </table>
+                        <div ng-include="'views/completedForm.html'"></div>
                         <div ng-include="'views/comments-section.html'"></div>
                         <div ng-include="'views/buttons-section.html'"></div>
                     </div>