dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #41917
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21387: changes for print functionality
------------------------------------------------------------
revno: 21387
committer: jijukjose <jijukjose@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-12-09 14:25:16 +0100
message:
changes for print functionality
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
=== 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-08 12:51:21 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2015-12-09 13:25:16 +0000
@@ -1,7 +1,35 @@
<div id='printSection' class="panel panel-info" ng-controller="DataEntryController">
+
+ <table class="table-borderless table-striped not-for-screen">
+ <tr class="col-md-12">
+ <td class="col-md-6">
+ {{'enrolling_orgunit' | translate}}
+ </td>
+ <td class="col-md-6">
+ <input type="text" class="form-control" value={{selectedEnrollment.orgUnitName}} ng-disabled="true"/>
+ </td>
+ </tr>
+ <tr class="col-md-12">
+ <td class="col-md-6">
+ {{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">
+ {{selectedProgram.incidentDateLabel}}
+ </td>
+ <td class="col-md-6">
+ <input type="text" value={{selectedEnrollment.incidentDate}} ng-disabled="true"/>
+ </td>
+ </tr>
+ </table>
+
<div class="panel-heading handle bold">
{{dataentryWidget.title| translate}}
- <span class="pull-right widget-link print-div">
+ <span class="pull-right widget-link">
<a href ng-click="toggleEventsTableDisplay()" title="{{showEventsAsTables ? 'toggle_table_view_off' : 'toggle_table_view_on'| translate}}" ng-show="stagesCanBeShownAsTable"><span ng-if="!showEventsAsTables"><i class="fa fa-bars vertical-center"></i></span><span ng-if="showEventsAsTables"><i class="fa fa-square vertical-center"></i></span></a>
<a href ng-click="filterEvents = !filterEvents" title="{{filterEvents ? 'list_events' : 'filter_events'| translate}}" ng-show="eventFilteringRequired"><span ng-if="!filterEvents"><i class="fa fa-filter vertical-center"></i></span><span ng-if="filterEvents"><i class="fa fa-list vertical-center"></i></span></a>
<a href ng-click="toggleLegend()" title="{{'event_color_legend'| translate}}" class="small-horizonal-spacing"><i class="fa fa-info-circle vertical-center"></i></a>
@@ -76,7 +104,7 @@
<div ng-if="!selectedEnrollment || !selectedEnrollment.enrollment" class="alert alert-danger">{{notEnrolledLabel}}</div>
- <form name="outerForm" novalidate class="print-div">
+ <form name="outerForm" novalidate>
<div ng-if="currentEvent">
<!-- event dates/scheduling begin -->