diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js index dfd5d57e..c0361927 100755 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -216,6 +216,7 @@ $scope.dayBookApprovalAccess = ''; value['ReceiptNo'] = element.ReceiptNo || '-'; value['Comments'] = element.ReceiptNoComments || '-'; value['ModeofPayment'] = getSortCutModeofPayment(element.ModeOfPayment) || '-'; + value['Status'] = element.Status || '-'; value['Amount'] = (ListName == 'Expense' ? '-' : '+') + ' ' + element.Amount || '-'; value['Balance'] = element.Balance || '-'; o[intDate] = value; @@ -254,8 +255,9 @@ $scope.dayBookApprovalAccess = ''; col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true }, col_7: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true }, col_8: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true }, - col_9: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, - col_10: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, + col_9: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true }, + col_10: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, + col_11: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, } } var body = []; @@ -273,6 +275,7 @@ $scope.dayBookApprovalAccess = ''; row.push(header.col_8); row.push(header.col_9); row.push(header.col_10); + row.push(header.col_11); body.push(row); } } @@ -288,6 +291,7 @@ $scope.dayBookApprovalAccess = ''; row.push(data.ReceiptNo.toString()); row.push(data.Comments.toString()); row.push(data.ModeofPayment.toString()); + row.push(data.Status.toString()); row.push(data.Amount.toString()); row.push(data.Balance.toString()); body.push(row); @@ -383,12 +387,12 @@ $scope.dayBookApprovalAccess = ''; // 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; - } + // 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).download('DAYBOOK DETAILS' + '( ' + $scope.searchData.date + ' - ' + $scope.searchData.dateTo + ' ).pdf', function(res) { if(res === 'success'){ diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js index 253bfd4d..123797a1 100755 --- a/Apollo/assets/js/controllers/daybookadminCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminCtrl.js @@ -218,6 +218,7 @@ $scope.dayBookApprovalAccess = ''; value['ReceiptNo'] = element.ReceiptNo || '-'; value['Comments'] = element.ReceiptNoComments || '-'; value['ModeofPayment'] = getSortCutModeofPayment(element.ModeOfPayment) || '-'; + value['Status'] = element.Status || '-'; value['Amount'] = (ListName == 'Expense' ? '-' : '+') + ' ' + element.Amount || '-'; value['Balance'] = element.Balance || '-'; o[intDate] = value; @@ -256,8 +257,9 @@ $scope.dayBookApprovalAccess = ''; col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true }, col_7: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true }, col_8: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true }, - col_9: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, - col_10: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, + col_9: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true }, + col_10: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, + col_11: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, } } var body = []; @@ -275,6 +277,7 @@ $scope.dayBookApprovalAccess = ''; row.push(header.col_8); row.push(header.col_9); row.push(header.col_10); + row.push(header.col_11); body.push(row); } } @@ -290,6 +293,7 @@ $scope.dayBookApprovalAccess = ''; row.push(data.ReceiptNo.toString()); row.push(data.Comments.toString()); row.push(data.ModeofPayment.toString()); + row.push(data.Status.toString()); row.push(data.Amount.toString()); row.push(data.Balance.toString()); body.push(row); diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index 85776bdd..6935da58 100755 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -311,6 +311,7 @@ $scope.loadStaring = true; value['ReceiptNo'] = element.ReceiptNo || '-'; value['Comments'] = element.ReceiptNoComments || '-'; value['ModeofPayment'] = getSortCutModeofPayment(element.ModeOfPayment) || '-'; + value['Status'] = element.Status || '-'; value['Amount'] = (ListName == 'Expense' ? '-' : '+') + ' ' + element.Amount || '-'; value['Balance'] = element.Balance || '-'; o[intDate] = value; @@ -349,8 +350,9 @@ $scope.loadStaring = true; col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true }, col_7: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true }, col_8: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true }, - col_9: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, - col_10: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, + col_9: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true }, + col_10: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, + col_11: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, } } var body = []; @@ -368,6 +370,7 @@ $scope.loadStaring = true; row.push(header.col_8); row.push(header.col_9); row.push(header.col_10); + row.push(header.col_11); body.push(row); } } @@ -383,6 +386,7 @@ $scope.loadStaring = true; row.push(data.ReceiptNo.toString()); row.push(data.Comments.toString()); row.push(data.ModeofPayment.toString()); + row.push(data.Status.toString()); row.push(data.Amount.toString()); row.push(data.Balance.toString()); body.push(row); diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html index 0beb8894..03d30682 100644 --- a/Apollo/assets/views/status-update/application_status.html +++ b/Apollo/assets/views/status-update/application_status.html @@ -263,7 +263,7 @@