dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16683
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-09-10 09:13:29 +0200
message:
  tracker capture - report for overdue events, WIP
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json


--
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/report/overdue-events-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js	2014-09-09 14:17:34 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js	2014-09-10 07:13:29 +0000
@@ -21,6 +21,7 @@
     $scope.selectedOuMode = 'SELECTED';
     $scope.report = {};
     $scope.displayMode = {};
+    $scope.printMode = false;
     
     //watch for selection of org unit from tree
     $scope.$watch('selectedOrgUnit', function() {

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html	2014-09-09 14:17:34 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html	2014-09-10 07:13:29 +0000
@@ -12,10 +12,7 @@
         <ul>
         </ul>
     </div>
-    <img id="ouwt_loader" src="../images/ajax-loader-bar.gif"/>
-    <!--- selected org unit begins -->
-    <input type="text" selected-org-unit ng-model="selectedOrgUnit.name" ng-hide=true>
-    <!--- selected org unit ends  -->
+    <img id="ouwt_loader" src="../images/ajax-loader-bar.gif"/>    
 </div>
 
 <div id="mainPage" class="page">
@@ -43,8 +40,14 @@
         <div class="row">
             <div class="col-sm-8 col-md-6">
                 <table class="table table-borderless table-striped">
+                    <tr ng-show='printMode'>
+                        <td class='col-sm-4 col-md-3 vertical-center'>{{'org_unit'| translate}}</td>
+                        <td class='col-sm-4 col-md-3'>                             
+                            <input type="text" selected-org-unit ng-model="selectedOrgUnit.name">                                                            
+                        </td>
+                    </tr>
                     <tr>
-                        <td class='col-sm-4 col-md-3 vertical-center'>
+                        <td class='col-sm-4 col-md-3'>
                             {{'program'| translate}}
                         </td>
                         <td class='col-sm-4 col-md-3'>
@@ -57,7 +60,7 @@
                         </td>
                     </tr>
                     <tr>
-                        <td class='col-sm-4 col-md-3 vertical-center'>{{'org_unit'| translate}}</td>
+                        <td class='col-sm-4 col-md-3 vertical-center'>{{'org_unit_scope'| translate}}</td>
                         <td class='col-sm-4 col-md-3'>                 
                             <label><input type="radio" ng-model="selectedOuMode" name="selected" value="SELECTED"> {{'SELECTED'| translate}}</label><br/>
                             <label><input type="radio" ng-model="selectedOuMode" name="children" value="CHILDREN"> {{'CHILDREN'| translate}}</label><br/>
@@ -66,16 +69,16 @@
                         </td>
                     </tr>
                     <tr>
-                        <label>                    
-                            <td class='col-sm-4 col-md-3 vertical-center'>
-                                {{'filter'| translate}}
-                            </td>
-                            <td>
-                                <label>
-                                    <input type="checkbox" ng-change="markForFollowup()" ng-model="displayMode.onlyMarkedFollowup"/>  {{'only_marked_for_followup' | translate}}
-                                </label>                                
-                            </td>
-                        </label>
+                    <label>                    
+                        <td class='col-sm-4 col-md-3 vertical-center'>
+                            {{'filter'| translate}}
+                        </td>
+                        <td class='col-sm-4 col-md-3'> 
+                            <label>
+                                <input type="checkbox" ng-change="markForFollowup()" ng-model="displayMode.onlyMarkedFollowup"/>  {{'only_marked_for_followup'| translate}}
+                            </label>                                
+                        </td>
+                    </label>
                     </tr>
                 </table>
             </div>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-09-09 12:54:28 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-09-10 07:13:29 +0000
@@ -146,6 +146,7 @@
     "visits": "Visits",
     "current_selections": "Current selections",
     "org_unit": "Org unit",
+    "org_unit_scope": "Org unit scope",
     "SELECTED": "Selected",
     "CHILDREN": "Immediate children",
     "DESCENDANTS": "All children",