dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #37224
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19048: tracker-capture: printing tei program details report
------------------------------------------------------------
revno: 19048
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-04-28 18:02:56 +0200
message:
tracker-capture: printing tei program details report
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-details.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.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/report/program-details.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-details.html 2015-04-23 09:00:46 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-details.html 2015-04-28 16:02:56 +0000
@@ -125,6 +125,6 @@
</div>
</div>
<div class="modal-footer">
- <button class="btn btn-default" data-ng-click="close()">{{'close'| translate}}</button>
- <button class="btn btn-primary" d2-print print-element-id="printSection">{{'print'| translate}}</button>
+ <button class="btn btn-default" ng-click="close()">{{'close'| translate}}</button>
+ <button class="btn btn-primary" ng-click="print('printSection')">{{'print'| translate}}</button>
</div>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report-controller.js 2015-04-23 09:00:46 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report-controller.js 2015-04-28 16:02:56 +0000
@@ -166,7 +166,20 @@
$scope.showProgramReportDetailsDiv = false;
};
- $scope.print = function(){
+ $scope.print = function(divName){
$scope.showProgramReportDetailsDiv = false;
+ var printContents = document.getElementById(divName).innerHTML;
+ var popupWin = window.open('', '_blank', 'fullscreen=1');
+ popupWin.document.open();
+ popupWin.document.write('<html>\n\
+ <head>\n\
+ <link rel="stylesheet" type="text/css" href="../dhis-web-commons/bootstrap/css/bootstrap.min.css" />\n\
+ <link rel="stylesheet" type="text/css" href="../dhis-web-commons/css/print.css" />\n\
+ <link rel="stylesheet" type="text/css" href="styles/style.css" />\n\
+ <link rel="stylesheet" type="text/css" href="styles/print.css" />\n\
+ </head>\n\
+ <body onload="window.print()">' + printContents +
+ '</html>');
+ popupWin.document.close();
};
});
\ No newline at end of file
=== 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 2015-04-20 12:01:21 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html 2015-04-28 16:02:56 +0000
@@ -122,7 +122,6 @@
<link type="text/css" rel="stylesheet" href="../dhis-web-commons/font-awesome/css/font-awesome.min.css"/>
- <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/light_blue/light_blue.css"/>
<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/widgets.css"/>
<link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/css/menu.css">
<link type="text/css" rel="stylesheet" media="print" href="../dhis-web-commons/css/print.css">
