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-28 16:39:05 +05:30
commit c93cf75469
3 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Apollo/assets/images/logo1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

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

@ -2324,28 +2324,14 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout",
$scope.printPdf = function (print) { $scope.printPdf = function (print) {
var innerContents = document.getElementById(print).innerHTML; var printHtml = document.getElementById(print).outerHTML;
//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>';
popupWinindow.document.open(); document.body.innerHTML = elementPage;
popupWinindow.document.write('<html>'); window.print();
popupWinindow.document.write('<style type="text/css" media="print">'); document.body.innerHTML = elementPage;
popupWinindow.document.write('@page { size: portrait; }'); window.location.reload();
//popupWinindow.document.write('.title{border:3px solid black;}'); document.close();
popupWinindow.document.write('</style>');
popupWinindow.document.write(innerContents);
popupWinindow.document.write('</br>');
popupWinindow.document.write('</br>');
popupWinindow.document.write('</br>');
popupWinindow.document.write('</br>');
popupWinindow.document.write(innerContents);
popupWinindow.document.write('</html>');
popupWinindow.document.close();
popupWinindow.focus();
popupWinindow.print();
popupWinindow.close();
} }
// $scope.mouseLeave = function(){ // $scope.mouseLeave = function(){

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

@ -448,32 +448,32 @@
</table> </table>
<div id="print" after-render="printPdf"> <div id="print" pdf-save-content="{{billNo}}" after-render="printPdf">
<div ng-if="myPdfView"> <div ng-if="myPdfView">
<table style="border-collapse: collapse; color: black;" border="0" width="100%"> <table style="border-collapse: collapse; color: black;" border="0" width="100%">
<tbody class="title" style="border:3px solid black;"> <tbody class="title" style="border:3px solid black;">
<tr style="height: 23px;"> <tr class="title-row" style="height: 15px;">
<td 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/logo.png" alt="APP"> <img class="pull-center" ng-src="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 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="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>
</td> </td>
<div>
<td style="width: 136px; height: 23px; text-align: center; color: black; font-size: 20px;" colspan="3"><strong><!--APOLLO DISTANCE EDUCATION COLLEGE-->{{FeesReceiptTitle}}</strong> <td class="title-addr" style="width: 500px; height: 23px; text-align: center; color: black; font-size: 20px;" colspan="3" ><strong><!--APOLLO DISTANCE EDUCATION COLLEGE-->{{FeesReceiptTitle || "APOLLO DISTANCE EDUCATION COLLEGE"}}</strong>
</div>
</br> </br>
<!--<span style="font-size: 16px;">(A Group of SVE Trust)</span> <!--<span style="font-size: 16px;">(A Group of SVE Trust)</span>
</br>--> </br>-->
<span style="white-space:pre-wrap;font-size: 16px;">{{BranchAddr}}</span> <span style="font-size: 16px;text-align:left;">{{BranchAddr}}</span>
</td> </td>
</tr> </tr>
@ -524,7 +524,7 @@
<td style="width: 137px; height: 110px;"><strong style="font-size: 12px;">For APOLLO DISTANCE EDUCATION COLLEGE</strong></td> <td style="width: 137px; height: 110px;"><strong style="font-size: 12px;">For APOLLO DISTANCE EDUCATION COLLEGE</strong></td>
</tr> </tr>
<tr class="title" style="border:3px solid black;height: 42px;"> <tr class="title" style="border:3px solid black;height: 42px;">
<td style="width: 136px; height: 42px; color: black; font-size: 14px;text-align: center;" colspan="4">Note: Terms & Conditions will be applicable as per University norms Fees once paid will not be refunded at any reasons</td> <td style="width: 136px; height: 42px; color: black; font-size: 12px;text-align: center;" colspan="4">Note: Terms & Conditions will be applicable as per University norms Fees once paid will not be refunded at any reasons</td>
</tr> </tr>
</tbody> </tbody>