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

daybook pdf arragement

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-09-19 18:11:53 +05:30
parent 9f96539089
commit 65086f431f
3 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,7 +207,7 @@ $scope.dayBookApprovalAccess = '';
value['SNo'] = element.ORDER_ID; value['SNo'] = element.ORDER_ID;
value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-'; value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
var ListName = element.ListName; var ListName = element.ListName;
value['PaidReceivedToFrom'] = element.PaidTo || '-'; value['PaidReceivedToFrom'] = element.PaidTo +' '+element.Lastname || '-';
var Sem = element.FeePaymentDetails || '-'; var Sem = element.FeePaymentDetails || '-';
var Course = element.CourseName || '-'; var Course = element.CourseName || '-';
var University = element.UniversityName || '-'; var University = element.UniversityName || '-';
@ -253,11 +253,12 @@ $scope.dayBookApprovalAccess = '';
col_4: { text: 'University / Course/ Sem', style: 'tableHeader', alignment: 'center', bold: true }, col_4: { text: 'University / Course/ Sem', style: 'tableHeader', alignment: 'center', bold: true },
col_5: { text: 'Type', style: 'tableHeader', alignment: 'center', bold: true }, col_5: { text: 'Type', style: 'tableHeader', alignment: 'center', bold: true },
col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true }, col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true },
col_7: { text: 'Comments', 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_7: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true },
col_9: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true }, col_8: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true },
col_10: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, col_9: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true },
col_11: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, col_10: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true },
col_11: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true },
} }
} }
var body = []; var body = [];
@ -289,11 +290,12 @@ $scope.dayBookApprovalAccess = '';
row.push(data.UnivCourseSem.toString()); row.push(data.UnivCourseSem.toString());
row.push(data.Type.toString()); row.push(data.Type.toString());
row.push(data.ReceiptNo.toString()); row.push(data.ReceiptNo.toString());
row.push(data.Comments.toString()); // row.push(data.Comments.toString());
row.push(data.ModeofPayment.toString()); row.push(data.ModeofPayment.toString());
row.push(data.Status.toString()); row.push(data.Status.toString());
row.push(data.Amount.toString()); row.push(data.Amount.toString());
row.push(data.Balance.toString()); row.push(data.Balance.toString());
row.push(data.Comments.toString());
body.push(row); body.push(row);
} }
} }

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

@ -209,7 +209,7 @@ $scope.dayBookApprovalAccess = '';
value['SNo'] = element.ORDER_ID; value['SNo'] = element.ORDER_ID;
value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-'; value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
var ListName = element.ListName; var ListName = element.ListName;
value['PaidReceivedToFrom'] = element.PaidTo || '-'; value['PaidReceivedToFrom'] = element.PaidTo +' '+element.Lastname|| '-';
var Sem = element.FeePaymentDetails || '-'; var Sem = element.FeePaymentDetails || '-';
var Course = element.CourseName || '-'; var Course = element.CourseName || '-';
var University = element.UniversityName || '-'; var University = element.UniversityName || '-';
@ -255,11 +255,12 @@ $scope.dayBookApprovalAccess = '';
col_4: { text: 'University / Course/ Sem', style: 'tableHeader', alignment: 'center', bold: true }, col_4: { text: 'University / Course/ Sem', style: 'tableHeader', alignment: 'center', bold: true },
col_5: { text: 'Type', style: 'tableHeader', alignment: 'center', bold: true }, col_5: { text: 'Type', style: 'tableHeader', alignment: 'center', bold: true },
col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true }, col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true },
col_7: { text: 'Comments', 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_7: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true },
col_9: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true }, col_8: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true },
col_10: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, col_9: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true },
col_11: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, col_10: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true },
col_11: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true },
} }
} }
var body = []; var body = [];
@ -291,11 +292,12 @@ $scope.dayBookApprovalAccess = '';
row.push(data.UnivCourseSem.toString()); row.push(data.UnivCourseSem.toString());
row.push(data.Type.toString()); row.push(data.Type.toString());
row.push(data.ReceiptNo.toString()); row.push(data.ReceiptNo.toString());
row.push(data.Comments.toString()); // row.push(data.Comments.toString());
row.push(data.ModeofPayment.toString()); row.push(data.ModeofPayment.toString());
row.push(data.Status.toString()); row.push(data.Status.toString());
row.push(data.Amount.toString()); row.push(data.Amount.toString());
row.push(data.Balance.toString()); row.push(data.Balance.toString());
row.push(data.Comments.toString());
body.push(row); body.push(row);
} }
} }

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

@ -302,7 +302,7 @@ $scope.loadStaring = true;
value['SNo'] = element.ORDER_ID; value['SNo'] = element.ORDER_ID;
value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-'; value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
var ListName = element.ListName; var ListName = element.ListName;
value['PaidReceivedToFrom'] = element.PaidTo || '-'; value['PaidReceivedToFrom'] = element.PaidTo +' ' +element.Lastname || '-';
var Sem = element.FeePaymentDetails || '-'; var Sem = element.FeePaymentDetails || '-';
var Course = element.CourseName || '-'; var Course = element.CourseName || '-';
var University = element.UniversityName || '-'; var University = element.UniversityName || '-';
@ -314,6 +314,7 @@ $scope.loadStaring = true;
value['Status'] = element.Status || '-'; value['Status'] = element.Status || '-';
value['Amount'] = (ListName == 'Expense' ? '-' : '+') + ' ' + element.Amount || '-'; value['Amount'] = (ListName == 'Expense' ? '-' : '+') + ' ' + element.Amount || '-';
value['Balance'] = element.Balance || '-'; value['Balance'] = element.Balance || '-';
o[intDate] = value; o[intDate] = value;
intDate++; intDate++;
intDataSNo++; intDataSNo++;
@ -348,11 +349,12 @@ $scope.loadStaring = true;
col_4: { text: 'University / Course/ Sem', style: 'tableHeader', alignment: 'center', bold: true }, col_4: { text: 'University / Course/ Sem', style: 'tableHeader', alignment: 'center', bold: true },
col_5: { text: 'Type', style: 'tableHeader', alignment: 'center', bold: true }, col_5: { text: 'Type', style: 'tableHeader', alignment: 'center', bold: true },
col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true }, col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true },
col_7: { text: 'Comments', 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_7: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true },
col_9: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true }, col_8: { text: 'Status', style: 'tableHeader', alignment: 'center', bold: true },
col_10: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true }, col_9: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true },
col_11: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true }, col_10: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true },
col_11: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true },
} }
} }
var body = []; var body = [];
@ -384,11 +386,12 @@ $scope.loadStaring = true;
row.push(data.UnivCourseSem.toString()); row.push(data.UnivCourseSem.toString());
row.push(data.Type.toString()); row.push(data.Type.toString());
row.push(data.ReceiptNo.toString()); row.push(data.ReceiptNo.toString());
row.push(data.Comments.toString()); // row.push(data.Comments.toString());
row.push(data.ModeofPayment.toString()); row.push(data.ModeofPayment.toString());
row.push(data.Status.toString()); row.push(data.Status.toString());
row.push(data.Amount.toString()); row.push(data.Amount.toString());
row.push(data.Balance.toString()); row.push(data.Balance.toString());
row.push(data.Comments.toString());
body.push(row); body.push(row);
} }
} }