From a918b0aba4fb7c1fa2078005d4673e06fd8d163a Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 19 Sep 2018 18:24:33 +0530 Subject: [PATCH] daybook pdf change --- Apollo/assets/js/controllers/daybookCtrl.js | 9 ++++++++- Apollo/assets/js/controllers/daybookadminCtrl.js | 7 ++++++- Apollo/assets/js/controllers/daybooksuperadminCtrl.js | 7 ++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js index cca98a50..b7776ecf 100644 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -197,6 +197,8 @@ $scope.dayBookApprovalAccess = ''; var o = {}; var intDataSNo = 1; var intDate = 0; + + // var arrForeach = datas.reverse(); // for() // var ememem = datas[7-1]; @@ -204,10 +206,15 @@ $scope.dayBookApprovalAccess = ''; for(var i = datas.length ; i > 0; --i){ var element = datas[i-1]; var value = {}; + var Lastname=''; + if(element.Lastname != null) + { + var Lastname = element.Lastname; + } value['SNo'] = element.ORDER_ID; value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-'; var ListName = element.ListName; - value['PaidReceivedToFrom'] = element.PaidTo +' '+element.Lastname || '-'; + value['PaidReceivedToFrom'] = element.PaidTo +' '+Lastname || '-'; var Sem = element.FeePaymentDetails || '-'; var Course = element.CourseName || '-'; var University = element.UniversityName || '-'; diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js index dec4defa..f0b93e2a 100644 --- a/Apollo/assets/js/controllers/daybookadminCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminCtrl.js @@ -206,10 +206,15 @@ $scope.dayBookApprovalAccess = ''; for(var i = datas.length ; i > 0; --i){ var element = datas[i-1]; var value = {}; + var Lastname=''; + if(element.Lastname != null) + { + var Lastname = element.Lastname; + } value['SNo'] = element.ORDER_ID; value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-'; var ListName = element.ListName; - value['PaidReceivedToFrom'] = element.PaidTo +' '+element.Lastname|| '-'; + value['PaidReceivedToFrom'] = element.PaidTo +' '+Lastname|| '-'; var Sem = element.FeePaymentDetails || '-'; var Course = element.CourseName || '-'; var University = element.UniversityName || '-'; diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index c9223e97..bb945107 100644 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -299,10 +299,15 @@ $scope.loadStaring = true; for(var i = datas.length ; i > 0; --i){ var element = datas[i-1]; var value = {}; + var Lastname=''; + if(element.Lastname != null) + { + var Lastname = element.Lastname; + } value['SNo'] = element.ORDER_ID; value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-'; var ListName = element.ListName; - value['PaidReceivedToFrom'] = element.PaidTo +' ' +element.Lastname || '-'; + value['PaidReceivedToFrom'] = element.PaidTo +' ' +Lastname || '-'; var Sem = element.FeePaymentDetails || '-'; var Course = element.CourseName || '-'; var University = element.UniversityName || '-';