From 054c4a5ca82262920d821f038b17476943d19b2c Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Sat, 25 Aug 2018 17:55:53 +0530
Subject: [PATCH] daybook pdf download changes : kdk

---
 Apollo/assets/js/controllers/daybookCtrl.js    |  8 ++++++--
 .../assets/js/controllers/daybookadminCtrl.js  |  8 ++++++--
 .../js/controllers/daybooksuperadminCtrl.js    | 18 +++++++++++-------
 .../assets/js/directives/pdf_make/pdfMake.js   |  4 ++++
 .../views/daybook/daybooksuperadmin.html       |  3 ++-
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js
index f311d628..b972fc3c 100755
--- a/Apollo/assets/js/controllers/daybookCtrl.js
+++ b/Apollo/assets/js/controllers/daybookCtrl.js
@@ -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;
+        }
     }
 
 
diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js
index c8b41bf1..3b6f817a 100755
--- a/Apollo/assets/js/controllers/daybookadminCtrl.js
+++ b/Apollo/assets/js/controllers/daybookadminCtrl.js
@@ -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;
+        }
     }
 
 
diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
index f2d32428..4afebd0b 100755
--- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
+++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
@@ -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();
     }
 
 
diff --git a/Apollo/assets/js/directives/pdf_make/pdfMake.js b/Apollo/assets/js/directives/pdf_make/pdfMake.js
index 04c014de..91d3ae97 100644
--- a/Apollo/assets/js/directives/pdf_make/pdfMake.js
+++ b/Apollo/assets/js/directives/pdf_make/pdfMake.js
@@ -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;
 	   });
 	};
 
diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html
index bb404f8e..4604dcfa 100755
--- a/Apollo/assets/views/daybook/daybooksuperadmin.html
+++ b/Apollo/assets/views/daybook/daybooksuperadmin.html
@@ -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>
-
+