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

daybook pdf download changes : kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-08-25 17:55:53 +05:30
parent c6cda4d07f
commit 054c4a5ca8
5 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Apollo/assets/js/controllers/daybookCtrl.js
View File

@ -382,9 +382,13 @@ $scope.dayBookApprovalAccess = '';
// pdfMake.createPdf(docDefinition).download('file.pdf', () => {
// console.log("success");
// });
pdfMake.createPdf(docDefinition).print(() => {
console.log("success");
// alert(JSON.stringify(rows1));
var returndata = pdfMake.createPdf(docDefinition).download('DAYBOOK DETAILS' + '( ' + $scope.searchData.date + ' - ' + $scope.searchData.dateTo + ' ).pdf', function(){
return true;
});
if(returndata){
$scope.loadStaring = false;
}
}

8
Apollo/assets/js/controllers/daybookadminCtrl.js
View File

@ -383,9 +383,13 @@ $scope.dayBookApprovalAccess = '';
// pdfMake.createPdf(docDefinition).download('file.pdf', () => {
// console.log("success");
// });
pdfMake.createPdf(docDefinition).print(() => {
console.log("success");
// alert(JSON.stringify(rows1));
var returndata = pdfMake.createPdf(docDefinition).download('DAYBOOK DETAILS' + '( ' + $scope.searchData.date + ' - ' + $scope.searchData.dateTo + ' ).pdf', function(){
return true;
});
if(returndata){
$scope.loadStaring = false;
}
}

18
Apollo/assets/js/controllers/daybooksuperadminCtrl.js
View File

@ -286,7 +286,7 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
$scope.generatePFD = function (datas) {
$scope.loadStaring = true;
// daybookDetails.generatePFD(datas,$scope.searchData.date, $scope.searchData.dateTo);
var o = {};
@ -391,7 +391,7 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
var docDefinition = {
pageMargins: [20, 85, 20, 50],
pageMargins: [10, 85, 20, 50],
pageOrientation: 'landscape',
header: function () {
return {
@ -474,12 +474,16 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
};
// alert(JSON.stringify(rows1));
// pdfMake.createPdf(docDefinition).download('file.pdf', () => {
// console.log("success");
// });
pdfMake.createPdf(docDefinition).print(() => {
console.log("success");
var returndata = pdfMake.createPdf(docDefinition).download('DAYBOOK DETAILS' + '( ' + $scope.searchData.date + ' - ' + $scope.searchData.dateTo + ' ).pdf', function(){
return true;
});
if(returndata){
$scope.loadStaring = false;
}
// pdfMake.createPdf(docDefinition).print();
// $scope.loadStaring = false;
// pdfMake.createPdf(docDefinition).open();
}

4
Apollo/assets/js/directives/pdf_make/pdfMake.js
View File

@ -154,14 +154,18 @@
}
}
if (blob) {
var status = true;
saveAs(blob, defaultFileName);
//
}
else {
var status = false;
throw 'Could not generate blob';
}
if (typeof cb === "function") {
cb();
}
return status;
});
};

3
Apollo/assets/views/daybook/daybooksuperadmin.html
View File

@ -83,6 +83,7 @@
</style>
<div class="row">
<!--<div ng-if="loadStaring" align='center' style="font-size: 14px;color: blue;">Generating...</div>-->
<!--<button ng-click="exportData()">export</button>-->
<div class="pull-right" ng-if="data">
<button ng-click="exportData()" class="btn btn-sm btn-default">
@ -93,7 +94,7 @@
</button>
</div>
</div>