Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
dineshkumarkannan 2018-08-31 16:22:35 +05:30
commit 5426f9d045
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -2298,6 +2298,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout",
$scope.BranchLogo = ""; $scope.BranchLogo = "";
$scope.FeesReceiptTitle = ""; $scope.FeesReceiptTitle = "";
$scope.myPdfView = ''; $scope.myPdfView = '';
$scope.cur_url = '';
$scope.ShowHide = function (pdfValue,print) { $scope.ShowHide = function (pdfValue,print) {
$timeout(()=> { $timeout(()=> {
//alert(this.print); //alert(this.print);
@ -2316,6 +2317,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout",
$scope.BranchLogo = pdfValue.LogoPath; $scope.BranchLogo = pdfValue.LogoPath;
$scope.FeesReceiptTitle = pdfValue.FeesReceiptTitle; $scope.FeesReceiptTitle = pdfValue.FeesReceiptTitle;
$scope.receiptNo=pdfValue.ReceiptNo; $scope.receiptNo=pdfValue.ReceiptNo;
$scope.cur_url = window.location.hostname + window.location.pathname;
@ -2326,12 +2328,13 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout",
var printHtml = document.getElementById(print).outerHTML; var printHtml = document.getElementById(print).outerHTML;
//var currentPage = document.body.innerHTML; //var currentPage = document.body.innerHTML;
var popupWinindow = window.open('', '_blank', 'width=1200,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no');
var elementPage = '<html><head><style type="text/css" media="print">@media print {#Header, #Footer { display:none !important; }}</style></head><body>' + printHtml + '<br><br>' + printHtml + '</body>'; var elementPage = '<html><head><style type="text/css" media="print">@media print {#Header, #Footer { display:none !important; }}</style></head><body>' + printHtml + '<br><br>' + printHtml + '</body>';
document.body.innerHTML = elementPage; popupWinindow.document.body.innerHTML = elementPage;
window.print(); popupWinindow.print();
document.body.innerHTML = elementPage; popupWinindow.document.body.innerHTML = elementPage;
window.location.reload(); //window.location.reload();
document.close(); popupWinindow.document.close();
} }
// $scope.mouseLeave = function(){ // $scope.mouseLeave = function(){

4
Apollo/assets/views/status-update/updateFeesStatus.html
View File

@ -455,14 +455,14 @@
<tr class="title-row" style="height: 15px;"> <tr class="title-row" style="height: 15px;">
<td class="title-branch" ng-if="BranchLogo=='' || BranchLogo==null" style="width: 136px; height: 82px; color: white; font-size: 22px; text-align: center;" rowspan="3"> <td class="title-branch" ng-if="BranchLogo=='' || BranchLogo==null" style="width: 136px; height: 82px; color: white; font-size: 22px; text-align: center;" rowspan="3">
<div class="user-image"> <div class="user-image">
<img class="pull-center" ng-src="assets/images/logo1.png" alt="APP"> <img class="pull-center" ng-src="http://{{cur_url}}assets/images/logo1.png" alt="APP">
<!-- <img ng-src="{{userInfo.avatar}}" alt="" ng-if="!obj.flow.files.length && !noImage"> <!-- <img ng-src="{{userInfo.avatar}}" alt="" ng-if="!obj.flow.files.length && !noImage">
<img flow-img="obj.flow.files[0]" ng-if="obj.flow.files.length">--> <img flow-img="obj.flow.files[0]" ng-if="obj.flow.files.length">-->
</div> </div>
</td> </td>
<td class="title-branch" ng-if="BranchLogo!='' && BranchLogo!=null" style="width: 136px; height: 82px; color: white; font-size: 22px; text-align: center;" rowspan="3"> <td class="title-branch" ng-if="BranchLogo!='' && BranchLogo!=null" style="width: 136px; height: 82px; color: white; font-size: 22px; text-align: center;" rowspan="3">
<div class="user-image"> <div class="user-image">
<img class="pull-center" ng-src="images/{{BranchLogo}}" alt="APP"> <img class="pull-center" ng-src="http://{{cur_url}}images/{{BranchLogo}}" alt="APP">
<!-- <img ng-src="{{userInfo.avatar}}" alt="" ng-if="!obj.flow.files.length && !noImage"> <!-- <img ng-src="{{userInfo.avatar}}" alt="" ng-if="!obj.flow.files.length && !noImage">
<img flow-img="obj.flow.files[0]" ng-if="obj.flow.files.length">--> <img flow-img="obj.flow.files[0]" ng-if="obj.flow.files.length">-->
</div> </div>