dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21410
committer: jijukjose <jijukjose@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-12-10 14:33:27 +0100
message:
  Moved the print only parts from data-entry.html to dataentry-print.html
added:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-print.html
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.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

=== added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-print.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-print.html	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-print.html	2015-12-10 13:33:27 +0000
@@ -0,0 +1,61 @@
+<div class="not-for-screen">
+  <table class="table table-bordered table-compact">
+    <tr ng-repeat="attribute in selectedTei.attributes" ng-show="attribute.show">
+      <td class="bold">
+        {{attribute.displayName}}
+      </td>
+      <td>
+     <span ng-switch="attribute.type">
+        <span ng-switch-when="bool">
+          <span ng-if="attribute.value === 'true'">{{'yes' | translate}}</span>
+          <span ng-if="attribute.value === 'false'">{{ 'no' | translate}}</span>
+        </span>
+        <span ng-switch-when="trueOnly">
+            <span ng-if="attribute.value">
+                <i class="fa fa-check"></i>
+            </span>
+        </span>
+        <span ng-switch-default>{{attribute.value}}</span>
+        </span>
+      </td>
+    </tr>
+  </table>
+
+  <table class="table table-bordered table-compact">
+    <tr class="col-md-12">
+      <td class="col-md-6 bold">
+        {{'enrolling_orgunit' | translate}}
+      </td>
+      <td class="col-md-6">
+        {{selectedEnrollment.orgUnitName}}
+      </td>
+    </tr>
+    <tr class="col-md-12">
+      <td class="col-md-6 bold">
+        {{selectedProgram.enrollmentDateLabel}}
+      </td>
+      <td class="col-md-6">
+        <input type="text" value={{selectedEnrollment.enrollmentDate}} ng-disabled="true"/>
+      </td>
+    </tr>
+    <tr class="col-md-12" ng-if="selectedProgram.displayIncidentDate">
+      <td class="col-md-6 bold">
+        {{selectedProgram.incidentDateLabel}}
+      </td>
+      <td class="col-md-6">
+        <input type="text" value={{selectedEnrollment.incidentDate}} ng-disabled="true"/>
+      </td>
+    </tr>
+  </table>
+
+  <table class="table table-bordered table-compact">
+    <tr ng-repeat="dataValue in currentEvent.dataValues">
+      <td class="bold">
+        {{prStDes[dataValue.dataElement].dataElement.formname?prStDes[dataValue.dataElement].dataElement.formname:prStDes[dataValue.dataElement].dataElement.name}}
+      </td>
+      <td>
+        {{dataValue.value}}
+      </td>
+    </tr>
+  </table>
+</div>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html	2015-12-10 10:59:55 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html	2015-12-10 13:33:27 +0000
@@ -1,5 +1,4 @@
 <div id="print-div" class="panel panel-info" ng-controller="DataEntryController">
-
     <div ng-include="'components/dataentry/dataentry-print.html'">
     </div>
     <div class="panel-heading handle bold">