diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 7907a74d..5685165d 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -168,7 +168,7 @@ group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=cfd.syear } public function certificate_status($bat=null,$br=null,$u=null,$from=null,$to=null){ - $sql = "select sms.sid,sms.cid,sms.status,sms.adate,sms.acmts,sms.ctype,sms.certname,((sfs.cf + sfs.stf + sfs.others) - sfb.bamount) as balance,sfb.bamount,sfp.BillDate as initialPaid,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,cm.uid as univID + $sql = "select sms.sid,sms.cid,sms.status,sms.adate,sms.acmts,sms.ctype,sms.certname,((sfs.cf + sfs.stf + sfs.others) - sfb.bamount) as balance,sfs.cf , sfs.stf , sfs.others,sfb.bamount,sfp.BillDate as initialPaid,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,cm.uid as univID from (SELECT app.ID,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,AppDate as adate,app.Comments as acmts,CertificationType as ctype,CertificateName as certname FROM T_ApplicationStatus as app @@ -179,17 +179,18 @@ from left join (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others FROM T_Students_Fees_Status - group by sid,fid) + group by sid,cid) as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid left join - (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails + (SELECT sfp.StudentID as sid,sfp.FeesId as fid,sfs.CourseID as cid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails sfp +left join T_Students_Fees_Status sfs on sfs.FeesId=sfp.FeesId where IsActive = 1 - group by fid,sid) - as sfb on sfb.fid=sfs.fid and sfb.sid=sfs.sid + group by sid,cid) + as sfb on sfb.sid=sms.sid left join (select ID,StudentId,FeesID,BillDate from T_Students_Fees_PaidDetails where ID in (select min(ID) from T_Students_Fees_PaidDetails group by FeesID) - group by FeesID) as sfp on sfp.FeesID=sfs.fid + group by FeesID) as sfp on sfp.FeesID=sfb.fid left join (SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course, UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm @@ -218,12 +219,12 @@ left join $fromd= date("Y-m-d",strtotime($from)); $tod=date("Y-m-d",strtotime($to)); - $sql.="and STR_TO_DATE(ams.adate,'%d-%m-%Y') >= '".$fromd."' - and STR_TO_DATE(ams.adate,'%d-%m-%Y') <= '".$tod."'"; + $sql.="and STR_TO_DATE(sms.adate,'%d-%m-%Y') >= '".$fromd."' + and STR_TO_DATE(sms.adate,'%d-%m-%Y') <= '".$tod."'"; } $sql.=" group by sms.sid,sms.cid,ctype,univID"; - + // echo $sql; $leadDet=$this->db->query($sql); $cert_statusDetails = $leadDet->result(); if (count($cert_statusDetails) > 0) { @@ -239,36 +240,41 @@ left join } public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){ - $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.idate,'-') as idate,ifnull(sms.istatus,'-') as istatus,ifnull(sms.rdate,'-') as rdate,ifnull(sms.rstatus,'-') as rstatus,ifnull(sms.acmts,'-') as cmnts,sms.certname as Certificate_name - from - (SELECT c.ID as id,StudentID as sid,c.CourseID as cid,c.BranchCode as branch,c.ListCode as lcode,p.ListName as status,c.CertificationType as ctype,c.CDate as adate,c.Comments as acmts,c.CertificationType as certname,if(max(p.ListName)='ISSUED TO STUDENT',p.ListName,'-') as istatus,if(max(p.ListName)='ISSUED TO STUDENT',c.CDate,'-') as idate,if(max(p.ListName)='RECEIVED',p.ListName,'-') as rstatus,if(max(p.ListName)='RECEIVED',c.CDate,'-') as rdate -FROM T_CertificationStatus c - left join T_PickListDetails p on p.ListCode=c.ListCode - left join T_CertificationMaster cm on cm.CertificationID=c.CertificationType -WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem,CertificationType) - and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED') -group by sid,sem,cid,branch,ctype + $sql = "select sms.ID,sms.sid,sms.cid,sms.fid,sms.sem as Sem_year,sms.certname as Certificate_name,sms.ctype, +sms.issuedate,sms.istatus, +sms.rcvedate,sms.rstatus,sms.acmts,((sfs.cf + sfs.stf + sfs.others) - ifnull(sfb.bamount,0)) as Balance_fee,sfs.cf , sfs.stf , sfs.others,sfb.bamount,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,cm.course as course_name,cm.uname as University,mdate +from +(select c.ID,c.StudentID as sid,sfs.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,Sem as sem,c.CertificationType as certname,c.CertificationType as ctype,CDate as mdate, +max(if(ListName = 'ISSUED TO STUDENT', CDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus, +max(if(ListName = 'RECEIVED', CDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,c.Comments as acmts +from T_CertificationStatus c +left join T_Students_Fees_Status sfs on sfs.FeesType=c.CourseID and sfs.StudentID=c.StudentID +left join T_PickListDetails list on list.ListCode=c.ListCode +where CDate is not null and (list.ListName like 'ISSUED TO STUDENT' or list.ListName like 'RECEIVED%' ) +group by sid,cid,sem,ctype union -SELECT app.ID as id,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,app.CertificationType as ctype,app.AppDate as adate,app.Comments as acmts,cm.CertificateName as certname,if(max(p.ListName)='ISSUED TO STUDENT',p.ListName,'-') as istatus,if(max(p.ListName)='ISSUED TO STUDENT',app.AppDate,'-') as idate,if(max(p.ListName)='RECEIVED',p.ListName,'-') as rstatus,if(max(p.ListName)='RECEIVED',app.AppDate,'-') as rdate - FROM T_ApplicationStatus as app - left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType - left join T_PickListDetails p on p.ListCode=app.ListCode - where CertificateName not like 'APPLICATION%' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode,CertificationType) and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED') - group by sid,cid,lcode,branch,ctype) as sms - +select a.ID,a.StudentID as sid,a.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,'-' as sem,cm.CertificateName as certname,a.CertificationType as ctype,AppDate as mdate, +max(if(ListName = 'ISSUED TO STUDENT', AppDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus, +max(if(ListName = 'RECEIVED', AppDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,a.Comments as acmts +from T_ApplicationStatus a +left join +T_Students_Fees_Status sfs on sfs.StudentID=a.StudentID and sfs.CourseID=a.CourseID +left join T_CertificationMaster cm on cm.CertificationID=a.CertificationType +left join T_PickListDetails list on list.ListCode=a.ListCode +where AppDate is not null and a.ID in (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,CertificationType) +group by sid,cid,ctype) as sms left join (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others FROM T_Students_Fees_Status - group by sid,fid,cid,batch) + group by sid,cid) as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid left join - (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails + (SELECT sfp.StudentID as sid,sfp.FeesId as fid,sfs.FeesType as ftype,sfs.CourseID as cid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails sfp +left join T_Students_Fees_Status sfs on sfs.FeesId=sfp.FeesId where IsActive = 1 - group by sid,fid,billno) - as sfp on sfp.sid=sms.sid and sfp.fid=sfs.fid -left join - (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=sms.cid -left join + group by sid,cid) + as sfb on sfb.sid=sms.sid and sfb.fid=sms.fid and (sfb.ftype=sms.cid or sfb.cid=sms.cid) + left join (SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course, UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID @@ -277,8 +283,10 @@ left join as cm on cm.cid=sms.cid left join (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid -left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid - where std.active = 1 and sms.branch = '".$br."' +left join + (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid + + where sms.branch = '".$br."' "; if ($bat!= ''){ @@ -295,13 +303,13 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen $fromd= date("Y-m-d",strtotime($from)); $tod=date("Y-m-d",strtotime($to)); - $sql.="and STR_TO_DATE(sfp.bdate,'%d-%m-%Y') >= '".$fromd."' - and STR_TO_DATE(sfp.bdate,'%d-%m-%Y') <= '".$tod."'"; + $sql.="and STR_TO_DATE(sms.mdate,'%d-%m-%Y') >= '".$fromd."' + and STR_TO_DATE(sms.mdate,'%d-%m-%Y') <= '".$tod."'"; } - $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem_year,Certificate_name"; - + + //echo $sql; $leadDet=$this->db->query($sql); $mcert_statusDetails = $leadDet->result(); @@ -916,46 +924,42 @@ $query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$from //echo $det['university'];die() ; - $this->db->select('T_Student_CourseDetails.UniversityID,UniversityName, - SUM(IF(ModeOfPayment ="CASH", BillAmount, 0)) AS Cash, - SUM(IF(ModeOfPayment ="CHEQUE",BillAmount, 0)) AS Cheque, - SUM(IF(ModeOfPayment ="REFERRAL", BillAmount, 0)) AS Referal, - SUM(IF(ModeOfPayment ="ONLINE TRANSACTION",BillAmount, 0)) AS Onlinec, - SUM(IF(ModeOfPayment ="WAIVER",BillAmount, 0)) AS WAIVER, - SUM(IF(ModeOfPayment ="Credit/Debit Card",BillAmount, 0)) AS Card, - SUM(T_Students_Fees_PaidDetails.BillAmount) AS Total'); - $this->db->from('T_Students_Fees_PaidDetails'); - $this->db->join('T_Student_CourseDetails','T_Student_CourseDetails.StudentID=T_Students_Fees_PaidDetails.StudentID'); - $this->db->join('T_UniversityMaster','T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID'); + $this->db->select('d.UniversityID,UniversityName, + sum(IF(ModeOfPayment ="CASH", BillAmount, 0)) AS Cash, + sum(IF(ModeOfPayment ="CHEQUE", BillAmount, 0)) AS Cheque, + sum(IF(ModeOfPayment ="REFERRAL", BillAmount, 0)) AS Referal, + sum(IF(ModeOfPayment ="ONLINE TRANSACTION", BillAmount, 0)) AS Onlinec, + sum(IF(ModeOfPayment ="WAIVER",BillAmount, 0)) AS WAIVER, + sum(IF(ModeOfPayment ="Credit/Debit Card",BillAmount, 0)) AS Card, + sum(a.BillAmount) AS Total,a.CreatedOn'); + $this->db->from('T_Students_Fees_PaidDetails a'); + $this->db->join('T_Students_Fees_Status b','b.FeesId = a.FeesID','left'); + $this->db->join('T_CourseMaster c','c.CourseID = b.CourseID','left'); + $this->db->join('T_UniversityMaster d','d.UniversityID=c.UniversityID','left'); + // $this->db->where('T_Students_Fees_PaidDetails.CreatedOn BETWEEN "'.date('Y-m-d', strtotime($start_date)). '" and "'. date('Y-m-d', strtotime($end_date)).'"'); - $this->db->where("date_format(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')>=",date('Y-m-d', strtotime($start_date))); + $this->db->where("date_format(a.CreatedOn,'%Y-%m-%d')>=",date('Y-m-d', strtotime($start_date))); - $this->db->where("date_format(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')<=",date('Y-m-d', strtotime($end_date))); + $this->db->where("date_format(a.CreatedOn,'%Y-%m-%d')<=",date('Y-m-d', strtotime($end_date))); - - // $this->db->where(' BillDate <= str_to_date("'.$end_date.'",%d-%m-%Y)'); - - + - $this->db->where('T_Students_Fees_PaidDetails.IsActive','1'); + $this->db->where('a.IsActive','1'); if($det['university']!='') { - $this->db->where('T_Student_CourseDetails.UniversityID',$det['university']); + $this->db->where('d.UniversityID',$det['university']); } $this->db->group_by('UniversityID'); $feeDetails = $this->db->get()->result(); - // print_r( $this->db->last_query()); - // die(); - - // print_r($feeDetails); + if($feeDetails) { diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 92ed8081..270f919f 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -224,7 +224,7 @@ class StatusUpdation_model extends CI_Model { $results['preStatusDetails'] = false; $results['message'] = 'No record found'; } - } else if ($reqDetailsFor == 'CERTIFICATE_STATUS') { + } else if ($reqDetailsFor == 'APPICATION_STATUS') { $searchFor = 'A001'; $searchTableFor = APPLICATION_STATUS; $this->db->select('t1.*, t4.Firstname, t5.ListName, t6.CertificateName'); diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index 5e2bc1e7..46e3a8df 100755 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -221,7 +221,7 @@ var rows1 = ''; value['VoucherBillNumber'] = element.VoucherNumber || '-'; value['PaidReceivedToFrom'] = element.PaidTo || '-'; value['Sem'] = element.FeePaymentDetails || '-'; - value['Course'] = element.CourseName || '-'; + // value['Course'] = element.CourseName || '-'; // value['University'] = element.UniversityName || '-'; // value['Type'] = element.TypeName || '-'; // value['ReceiptNo'] = element.ReceiptNo || '-'; @@ -271,7 +271,7 @@ var headers = { col_3:{ text: 'Voucher Number Bill Number', style: 'tableHeader', alignment: 'center' }, col_4:{ text: 'Paid To Received From', style: 'tableHeader', alignment: 'center' }, col_5:{ text: 'Sem', style: 'tableHeader', alignment: 'center'}, - col_6:{ text: 'Course', style: 'tableHeader', alignment: 'center'}, + // col_6:{ text: 'Course', style: 'tableHeader', alignment: 'center'}, // col_7:{ text: 'University', style: 'tableHeader', alignment: 'center'}, // col_8:{ text: 'Type', style: 'tableHeader', alignment: 'center'}, // col_9:{ text: 'Receipt No', style: 'tableHeader', alignment: 'center'}, @@ -291,7 +291,7 @@ for (var key in headers){ row.push( header.col_3 ); row.push( header.col_4 ); row.push( header.col_5 ); - row.push( header.col_6 ); + // row.push( header.col_6 ); // row.push( header.col_7 ); // row.push( header.col_8 ); // row.push( header.col_9 ); @@ -313,7 +313,7 @@ for (var key in rows1) row.push( data.VoucherBillNumber.toString() ); row.push( data.PaidReceivedToFrom.toString() ); row.push( data.Sem.toString() ); - row.push( data.Course.toString() ); + // row.push( data.Course.toString() ); // row.push( data.University.toString() ); // row.push( data.Type.toString() ); // row.push( data.ReceiptNo.toString() ); @@ -327,15 +327,15 @@ for (var key in rows1) var docDefinition = { - pageMargins: [40,155,40,55], + pageMargins: [40,165,40,55], pageOrientation: 'landscape', header: function() { return { - margin: 40, + margin: 2, columns: [ { }, - { text:['Resumen disciplinario'], + { text:['DAYBOOK DETAILS'], alignment: 'left',bold:true,margin:[-405,80,0,0],fontSize: 24} ] } @@ -357,7 +357,7 @@ var docDefinition = { // [ 'Value 1', 'Value 2', 'Value 3', 'Value 4' ], // [ { text: 'Bold value', bold: true }, 'Val 2', 'Val 3', 'Val 4' ] // ] - widths: [ '*', '*', '*', '*', '*' ], + widths: [ '40', 'auto', 'auto', 'auto', 'auto'], headerRows: 2, // keepWithHeaderRows: 1, body: body @@ -387,7 +387,7 @@ var docDefinition = { } }; - alert(JSON.stringify(rows1)); + // alert(JSON.stringify(rows1)); // pdfMake.createPdf(docDefinition).download(); pdfMake.createPdf(docDefinition).print(); } diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index 8bd39ea3..4d44014c 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -299,7 +299,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod //console.log(selectedStudents);return false; var comments = []; for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ - comments [stuid] ="Call Tracking For Report Answer Booklet Details - BalanceFee:"+selectedStudents[stuid].balance + " - IssuedDate:" +selectedStudents[stuid].issuedate; + comments [stuid] ="Call Tracking For Report Answer Booklet Details - BalanceFee:"+selectedStudents[stuid].balance + " - IssuedToStudentDate:" +selectedStudents[stuid].issuedate; } if(isNaN(myModel.date)){ diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index 788ed1c1..c20f334f 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -297,6 +297,10 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod $scope.trackForm = { submit: function (form, myModel,loading,selectedStudents) { + var comments = []; + for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ + comments [stuid] ="Call Tracking For Report Application Details :"+selectedStudents[stuid].Course_name + " - Status:" +selectedStudents[stuid].StatusName; + } //console.log(selectedStudents); if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; @@ -354,7 +358,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod assignedTo: myModel.assignedTo, status: myModel.status, referedBy: myModel.referedBy, - comments:"Call Tracking For Report Application Details ", + comments:comments, enquiryStatus:myModel.enquiryStatus, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index e78ed61c..befbaa56 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -349,6 +349,10 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", $scope.trackForm = { submit: function (form, myModel,loading,selectedStudents) { + var comments = []; + for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ + comments [stuid] ="Call Tracking For Report Balence Fee:"+selectedStudents[stuid].balance + " - RegistrationDate:" +selectedStudents[stuid].regdate; + } //console.log(selectedStudents); if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; @@ -406,7 +410,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", assignedTo: myModel.assignedTo, status: myModel.status, referedBy: myModel.referedBy, - comments:"Call Tracking For Report ExamFees Details ", + comments:comments, enquiryStatus:myModel.enquiryStatus, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index 411b1980..cd859572 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -98,7 +98,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod }); // disable submit - $scope.$watchCollection('filters.from_date', function (newValue,oldValue) { + $scope.$watchCollection('univModel.from_date', function (newValue,oldValue) { if(newValue==undefined || newValue=='' || newValue==null){ $scope.disableSubmit=true; } @@ -110,7 +110,11 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod }); $scope.onSubmit = function () { - $scope.filterUniv = angular.fromJson($scope.univModel.university); + if($scope.univModel.university !== null && $scope.univModel.university !== '' ){ + $scope.filterUniv = angular.fromJson($scope.univModel.university); + }else { + $scope.filterUniv = ''; + } //alert($scope.batch.name); $scope.cert_data = ''; $scope.message = ''; diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index 474f4a24..c0491250 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -294,6 +294,10 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod $scope.trackForm = { submit: function (form, myModel,loading,selectedStudents) { + var comments = []; + for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ + comments [stuid] ="Call Tracking For Report Document Pending:"+selectedStudents[stuid].Course_name + " - Followupdate:" +selectedStudents[stuid].Followupdate; + } //console.log(selectedStudents); if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index 53c9dc44..5384fd15 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -308,6 +308,10 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", $scope.trackForm = { submit: function (form, myModel,loading,selectedStudents) { + var comments = []; + for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ + comments [stuid] ="Call Tracking For Report Exam Writing Fees Details:"+selectedStudents[stuid].Course_name + " - ExamWritingFee:" +selectedStudents[stuid].ExamWritingFee; + } //console.log(selectedStudents); if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; @@ -365,7 +369,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", assignedTo: myModel.assignedTo, status: myModel.status, referedBy: myModel.referedBy, - comments:"Call Tracking For Report Exam Writing Fees Details ", + comments:comments, enquiryStatus:myModel.enquiryStatus, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index 67afe2f9..b2d7c8d8 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -47,6 +47,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco "to_date": "", }; + $scope.filters = function () { var filterlist = { @@ -99,7 +100,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco }); // disable submit - $scope.$watchCollection('filters.from_date', function (newValue,oldValue) { + $scope.$watchCollection('univModel.from_date', function (newValue,oldValue) { if(newValue==undefined || newValue=='' || newValue==null){ $scope.disableSubmit=true; } @@ -110,8 +111,21 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco }); $scope.onSubmit = function () { - $scope.filterUniv = angular.fromJson($scope.univModel.university); - //alert($scope.batch.name); + //alert($scope.univModel.from_date); + // if(angular.isString($scope.univModel.university) && $scope.univModel.university !== null){ + // $scope.filterUniv = angular.fromJson($scope.univModel.university); + // } + // else{ + // $scope.filterUniv =''; + // } + //alert($scope.univModel.university); + if($scope.univModel.university !== null && $scope.univModel.university !== '' ){ + $scope.filterUniv = angular.fromJson($scope.univModel.university); + }else { + $scope.filterUniv = ''; + } + + $scope.mark_cert_data = ''; $scope.message = ''; var response_data = { @@ -161,7 +175,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Document_fee_paid_date as DocumentFeePaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(Balance_fee AS NUMBER) as BalanceFee,Markcard_status as MarkcardStatus,Markcard_date as MarkcardDate,Markcard_comments as MarkcardComments,Certificate_name as CertificateName,Certificate_status as CertificateStatus,Certificate_date as CertificateDate,Certificate_comments as CertificateComments INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,course_name as CourseName,Sem_year as SemYear,Certificate_name as CertificateName,rstatus as ReceivedStatus,rcvedate as ReceivedDate,istatus as IssuedStatus,issuedate as IssuedDate,acmts as CertificateIssuedComments,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]); }; /** * Auto Call Tracking Sriram diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index 0a644f17..d0331da4 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -292,6 +292,10 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", $scope.trackForm = { submit: function (form, myModel,loading,selectedStudents) { + var comments = []; + for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ + comments [stuid] ="Call Tracking For Report MarkCard Details:"+selectedStudents[stuid].Balance_Fee + " - ApplicationDate:" +selectedStudents[stuid].appdate; + } //console.log(selectedStudents); if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; @@ -349,7 +353,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", assignedTo: myModel.assignedTo, status: myModel.status, referedBy: myModel.referedBy, - comments:"Call Tracking For Report MarkCard Details ", + comments:comments, enquiryStatus:myModel.enquiryStatus, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index 141c7968..b273ed7e 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -295,6 +295,10 @@ $scope.exportExcel= function () { $scope.trackForm = { submit: function (form, myModel,loading,selectedStudents) { + var comments = []; + for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ + comments [stuid] ="Call Tracking For Study Material Status Report:"+selectedStudents[stuid].Balance_fee + " - Date:" +selectedStudents[stuid].Date; + } if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; @@ -351,7 +355,7 @@ $scope.exportExcel= function () { assignedTo: myModel.assignedTo, status: myModel.status, referedBy: myModel.referedBy, - comments:"Call Tracking For Study Material Status Report ", + comments:comments, enquiryStatus:myModel.enquiryStatus, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, diff --git a/Apollo/assets/views/courseDetails.html b/Apollo/assets/views/courseDetails.html index 3d135d28..c8f4810a 100755 --- a/Apollo/assets/views/courseDetails.html +++ b/Apollo/assets/views/courseDetails.html @@ -13,9 +13,9 @@

{{ mainTitle }}

- + Add/View Course Details. - +
@@ -340,83 +340,8 @@
+
- {{myModelSemYear.FeesName}} - -
- -
-
- - - - - Invalid Sem/Year name -
-
- - - - - Enter a valid amount - -
-
-
- - -
-
-
-
- - - - Enter a valid name -
-
- - - - Enter a valid amount - -
- -
-
-
-
- -
-
- - - -
-
- +
+ +
+ + + + +
+ +
+
+ {{myModelSemYear.FeesName}} + +
+ + +
+ + + + + Invalid Sem/Year name +
+
+ + + + + Enter a valid amount + +
+
+
+ + +
+
+
+
+ + + + Enter a valid name +
+
+ + + + Enter a valid amount + +
+ +
+ +
+
+ +
+
diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html index 4d8a0385..f8ce665b 100755 --- a/Apollo/assets/views/daybook/daybook.html +++ b/Apollo/assets/views/daybook/daybook.html @@ -123,7 +123,7 @@ -
Date + Date Income/
Expense diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html index 84d364c5..e20bc2ee 100755 --- a/Apollo/assets/views/daybook/daybookadmin.html +++ b/Apollo/assets/views/daybook/daybookadmin.html @@ -123,7 +123,7 @@ -
Date + Date Income/
Expense diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index 3609c614..cdf76bc3 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -15,7 +15,6 @@
-
@@ -83,6 +82,20 @@ +
+ +
+ + +
+
+ + +
@@ -105,11 +118,10 @@ - - - - + + - + - + diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html index 6444ce49..69b882f3 100755 --- a/Apollo/assets/views/report_mark_certificate_status.html +++ b/Apollo/assets/views/report_mark_certificate_status.html @@ -70,7 +70,7 @@ td,th { - @@ -83,7 +83,7 @@ td,th { - @@ -142,17 +142,17 @@ td,th { + + - - - - + + @@ -162,17 +162,17 @@ td,th { + + - - - - + - + - - + + + diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html index 0937e42b..e8a1af2b 100755 --- a/Apollo/assets/views/report_waiver_referal.html +++ b/Apollo/assets/views/report_waiver_referal.html @@ -140,7 +140,7 @@ - + diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html index 2a8c911e..b1b7f339 100755 --- a/Apollo/assets/views/student/studentDetailsModal.html +++ b/Apollo/assets/views/student/studentDetailsModal.html @@ -395,7 +395,7 @@ - +
-
+ diff --git a/Apollo/assets/views/student/studentView.html b/Apollo/assets/views/student/studentView.html index 3f801367..b816eb9a 100755 --- a/Apollo/assets/views/student/studentView.html +++ b/Apollo/assets/views/student/studentView.html @@ -455,7 +455,7 @@ - +
-
+
Date + Date Income/
Expense diff --git a/Apollo/assets/views/editCourseDetails.html b/Apollo/assets/views/editCourseDetails.html index 319649e7..675f8cab 100755 --- a/Apollo/assets/views/editCourseDetails.html +++ b/Apollo/assets/views/editCourseDetails.html @@ -203,78 +203,87 @@
- {{myModelSemYear1.FeesName}} +
+
+ -
+ + Enter a valid amount -
-
-
- - - - - Invalid Sem/Year name -
-
- - - - - Enter a valid amount - -
-
-
- - -
-
-
- - - -
-
- - - - Enter a valid name -
-
- - - - Enter a valid amount - -
-
+ + +
+ + + + Enter a valid amount + +
+ + +
+
+ + + + Enter a valid amount + +
+
+ + + + Enter a valid amount + +
+
+ +
+
+ + + + Enter a valid amount + +
+
+ + + +
@@ -283,89 +292,81 @@
-
-
-
- - - Enter a valid amount +
+ {{myModelSemYear1.FeesName}} +
+ + +
+
+ + + + + Invalid Sem/Year name +
+
+ + + + + Enter a valid amount + +
+
+
+ + +
+
-
- +
+
+ + + Enter a valid name +
+
+ + + + Enter a valid amount + +
-
+ - -
-
- - - - Enter a valid amount - -
-
- - - - Enter a valid amount - -
-
- -
-
- - - - Enter a valid amount - -
-
- - - - -
+
+
diff --git a/Apollo/assets/views/feecollected.html b/Apollo/assets/views/feecollected.html index e2c12846..783e7ec4 100644 --- a/Apollo/assets/views/feecollected.html +++ b/Apollo/assets/views/feecollected.html @@ -112,7 +112,7 @@ @@ -83,7 +83,7 @@ td,th { - @@ -156,18 +156,18 @@ td,th {
{{p.SL_NO}}{{p.initialPaid}}{{p.Enrollment_id}}{{p.initialPaid || "-"}}{{p.Enrollment_id || "-"}} {{p.Student_name}} {{p.Father_name}} {{p.Course_name}} {{p.Phone_number}} {{p.University}}{{p.balance}}{{p.balance || "0"}} {{p.certname}} {{p.status}}{{p.adate}}{{p.adate || "-"}}
SL.No Student Name Father NamePhone NoUniversity Course Sem/YearPhone NoUniversityBalance FeeCertificates NameCertificates Name Received Status Received Date Issued Status Issued Date Certificate Issued CommentsBalance Fee
{{p.SL_NO}} {{p.Student_name}} {{p.Father_name}}{{p.Phone_number}}{{p.University}} {{p.course_name}} {{p.Sem_year}}{{p.Phone_number}}{{p.University}}{{p.Balance_fee}}{{p.Certificate_name}}{{p.Certificate_name}} {{p.rstatus}}{{p.rdate}}{{p.rcvedate}} {{p.istatus}}{{p.idate}}{{p.cmnts}}{{p.issuedate}}{{p.acmts}}{{p.Balance_fee}}
{{p.staffname}} {{p.Waiver_bill}} {{p.Waiver_amount}}{{p.Referal_bill}}{{p.Referal_bill}} {{p.Referal_amount}} {{p.Comments}}Document NameCertificate Name Status Date CommentsDocument NameCertificate Name Status Date Comments