dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17086
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-10-13 18:02:01 +0200
message:
  tracker capture - print feature for tei list
added:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css
modified:
  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/index.html
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/screen.css
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-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-tracker-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-10-09 15:37:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-10-13 16:02:01 +0000
@@ -154,7 +154,7 @@
     "visit": "Visit",
     "visits": "Visits",
     "current_selections": "Current selections",
-    "org_unit": "Org unit",
+    "org_unit": "Organisation unit",
     "org_unit_scope": "Org unit scope",
     "SELECTED": "Selected",
     "CHILDREN": "Immediate children",

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html	2014-10-13 14:47:39 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html	2014-10-13 16:02:01 +0000
@@ -112,6 +112,7 @@
 
         <link type="text/css" rel="stylesheet" href="styles/style.css">
         <link type="text/css" rel="stylesheet" media="screen" href="styles/screen.css">
+        <link type="text/css" rel="stylesheet" media="print" href="styles/print.css">
 
         <script type="text/javascript" src="../main.js"></script>
 

=== added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css	2014-10-13 16:02:01 +0000
@@ -0,0 +1,13 @@
+/*
+To change this license header, choose License Headers in Project Properties.
+To change this template file, choose Tools | Templates
+and open the template in the editor.
+*/
+/* 
+    Created on : Oct 13, 2014, 5:16:38 PM
+    Author     : abyot
+*/
+
+#header, #leftBar, .not-printable {
+    display: none;
+}
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/screen.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/screen.css	2014-08-18 10:01:22 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/screen.css	2014-10-13 16:02:01 +0000
@@ -14,4 +14,8 @@
     padding: 0;
     background-color: white;
     font-size: 10pt;
+}
+
+.not-for-screen {
+    display: none;
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2014-10-13 15:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2014-10-13 16:02:01 +0000
@@ -31,7 +31,7 @@
             <span ng-if='showReportDiv'>
                 {{selectedProgram.name}} {{'report'| translate}}
             </span>
-            <div class="pull-right">
+            <div class="pull-right not-printable">
                 <div class="btn-group" dropdown is-open="status.isopen">
                     <button type="button" class="btn btn-default dropdown-toggle" ng-disabled="trackedEntityList.rows.length <= 0">
                         <i class="fa fa-cog" title="{{'settings'| translate}}"></i>
@@ -50,6 +50,14 @@
     <!--- selected org unit ends  -->
 
     <!--- search, registration and reporting menu begins -->
+    <div class="row vertical-spacing not-for-screen">
+        <div class="col-md-4">
+            <h4>{{'org_unit' | translate}}</h4>
+        </div>
+        <div class="col-md-4">
+            <input type="text" class="form-control" ng-disabled='true' value="{{selectedOrgUnit.name}}">
+        </div>
+    </div>
     <div class="row"> 
         <div id="selectDropDownParent" class="input-group col-md-4">            
             <button type="button" class="select-dropdown-button form-control" ng-show="programs.length > 0">{{selectedProgram ? selectedProgram.name : 'please_select_a_program'| translate}}</button>
@@ -66,7 +74,7 @@
                 </ul>
             </div>                
         </div>
-        <div id="searchDropDownParent" class="input-group col-md-4">
+        <div id="searchDropDownParent" class="input-group col-md-4 not-printable">
             <input type="text" placeholder="{{'type_here_for_simple_search'| translate}}" ng-model="searchText" class="form-control expanded" d2-enter="search(searchMode.freeText)" ng-class="{true: 'invalid-input'} [!searchText && emptySearchText]" ng-focus="showHideSearch()" ng-disabled="showRegistrationDiv || showReportDiv">
             <div class="input-group-btn">
                 <button class="btn btn-default search-dropdown-button trim" type="button" title="{{'advanced_search'| translate}}" data-toggle="dropdown" ng-click="showHideSearch()" ng-disabled="showRegistrationDiv || showReportDiv"><i class="fa fa-caret-down"></i></button>
@@ -187,7 +195,7 @@
                 </div>
             </div>                
         </div>        
-        <div class="col-md-4 trim">            
+        <div class="col-md-4 trim not-printable">            
             <button type="button" 
                     class="btn btn-success"
                     ng-disabled="showRegistrationDiv || showReportDiv"
@@ -200,6 +208,12 @@
                     ng-click="showRegistration()">                    
                 {{'register'| translate}}
             </button>
+            <button type="button" 
+                    class="btn btn-info"
+                    ng-if="teiCount > 0"
+                    onclick="javascript:window.print()">                    
+                {{'print'| translate}}
+            </button>
         </div>
     </div>
     <!--- search, registration and reporting menu ends -->