From ee47ec8fbde8e1022cac9f1f85cad904b3ff27fd Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 20 Aug 2018 10:17:45 +0530 Subject: [PATCH] report issues --- .../controllers/Call_Tracking_Controller.php | 8 ++- .../api/application/models/Reports_model.php | 68 +++++++++---------- .../js/controllers/report_ans_bookletCtrl.js | 30 ++++++-- .../js/controllers/report_app_pendingCtrl.js | 21 +++++- .../js/controllers/report_balfeeCtrl.js | 22 +++++- .../js/controllers/report_certificateCtrl.js | 6 +- .../js/controllers/report_doc_pendingCtrl.js | 23 ++++++- .../js/controllers/report_examfeeCtrl.js | 21 +++++- .../js/controllers/report_expenseCtrl.js | 21 +++++- .../assets/js/controllers/report_leadCtrl.js | 21 +++++- .../report_markcard_certificateCtrl.js | 6 +- .../controllers/report_markcard_statusCtrl.js | 20 +++++- .../report_study_material_statusCtrl.js | 50 ++++++-------- .../controllers/report_waiver_referalCtrl.js | 20 +++++- .../assets/views/report_answer_booklets.html | 9 ++- .../views/report_application_pending.html | 9 ++- Apollo/assets/views/report_balance_fee.html | 9 ++- .../views/report_certificate_status.html | 1 + .../assets/views/report_document_pending.html | 15 ++-- .../assets/views/report_exam_writing_fee.html | 9 ++- Apollo/assets/views/report_expense.html | 30 ++++---- Apollo/assets/views/report_lead.html | 11 +-- .../views/report_mark_certificate_status.html | 17 ++--- .../assets/views/report_markcardstatus.html | 9 ++- .../views/report_studymaterialstatus.html | 9 ++- .../assets/views/report_waiver_referal.html | 19 +++--- 26 files changed, 334 insertions(+), 150 deletions(-) diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php index 72b913bd..412ed4d0 100755 --- a/Apollo/api/application/controllers/Call_Tracking_Controller.php +++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php @@ -415,13 +415,14 @@ class Call_Tracking_Controller extends REST_Controller { */ public function autoAddlead_post(){ $student = $this->post('student'); - //print_r($student);die; + $comments = $this->post('comments'); + //print_r($comments);die; if(!empty($student)){ $now = new DateTime(); $now->setTimezone(new DateTimezone('Asia/Kolkata')); //store lead details $Student_Id = ''; - foreach($student as $student){ + foreach($student as $index =>$student){ $lead_details['LeadName'] = $student['Student_name']; @@ -444,11 +445,12 @@ class Call_Tracking_Controller extends REST_Controller { $tracking_details['CreatedBranch'] = $this->post('branchId'); //store tracking followup details $tracking_followup_details['FollowupOn'] = $this->post('date'); - $tracking_followup_details['FollowupComments'] = $this->post('comments'); + $tracking_followup_details['FollowupComments'] = $comments[$index]; $tracking_followup_details['StatusName'] = $this->post('status'); $tracking_followup_details['AssignedStaff'] = $this->post('assignedTo'); //print_r(array($lead_details,$tracking_details,$tracking_followup_details)); + $leadDetails['leadDetails'] = $this->Calltracking_model->getaddautocall($lead_details,$tracking_details,$tracking_followup_details,$CreatedBy);// Check if the users data store contains users (in case the database result returns NULL) diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index f116fba3..1fd15252 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -250,49 +250,46 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } 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.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber + $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 ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode, - CertificationType as ctype,CDate as mdate,Sem as sem,Comments as mcmts - FROM T_CertificationStatus - WHERE ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem) - group by sid,sem,cid,lcode,branch) as sms -left join - (SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname + (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 +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 - where CertificationType != 'CERT024' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode) - group by sid,cid,lcode,branch) - as ams on ams.branch=sms.branch and ams.sid=sms.sid + 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 + 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 + (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) - as sfs on sfs.sid=sms.sid and sms.cid=sfs.ftype + 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 where IsActive = 1 group by sid,fid,billno) - as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid + 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.cid=sms.cid -left join - (SELECT ListCode as lcode,ListName as status FROM T_PickListDetails) - as list on list.lcode=sms.lcode -left join - (SELECT ListCode as lcode,ListName as astatus FROM T_PickListDetails) - as alist on alist.lcode=ams.lcode + (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 (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 group by cid order by CourseID) - as cm on cm.cid=cfd.ccid + 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 - 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 std.active = 1 and sms.branch = '".$br."' "; if ($bat!= ''){ @@ -314,7 +311,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } - $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem,Sem_year"; + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem_year,Certificate_name"; $leadDet=$this->db->query($sql); @@ -498,19 +495,16 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function doc_pending($bat=null,$br=null,$u=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(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,sms.adate, - ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber + $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(sfs.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,sms.follow_date as fdate from - (SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,list.ListName as status,app.ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname FROM T_ApplicationStatus as app -left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType -left join T_PickListDetails list on list.ListCode=app.ListCode -where list.ListName = 'PENDING' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode) -group by sid,cid,lcode,branch) as sms + (select StudentID as sid,Details as certname,DocumentDate as follow_date,StatusName as status +from T_Student_DocumentTrack_Details +where StatusName not like 'CLOSED') 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 + (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,BranchCode as branch FROM T_Students_Fees_Status group by sid,fid,cid,batch) - as sfs on sfs.sid=sms.sid and sms.cid=sfs.cid + as sfs on sfs.sid=sms.sid left join (SELECT ID,StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails WHERE IsActive = 1 and ID IN (SELECT min(ID) FROM T_Students_Fees_PaidDetails group by StudentID,FeesID) @@ -527,8 +521,8 @@ left join as cm on cm.cid=cfd.ccid 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 and scd.branch=sms.branch - 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 + where std.active = 1 and sfs.branch = '".$br."' "; @@ -542,7 +536,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen $sql.=" and cm.uid = '".$u."'"; } - $sql.="group by Student_id,Course_id,Batch_code,Branch_code,Sem_year "; + $sql.="group by Student_id,Course_id,Batch_code,Branch_code"; diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index 90bc2c36..1f0e9b59 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -82,8 +82,24 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod } }); } - - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.ans_book_data = ''; $scope.message = ''; @@ -115,6 +131,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod }); } + } var mystyle = { sheetid: 'ANSWER BOOKLET STATUS REPORT', headers: true, @@ -405,7 +422,12 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor $scope.trackForm = { submit: function (form, myModel,loading,selectedStudents) { - //console.log(selectedStudents); + //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; + } + if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; @@ -462,7 +484,7 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor assignedTo: myModel.assignedTo, status: myModel.status, referedBy: myModel.referedBy, - comments:"Call Tracking For Report Answer Booklet Details ", + comments:comments, enquiryStatus:myModel.enquiryStatus, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index 8cca0fef..626616b6 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -82,8 +82,24 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod } }); } - - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.app_pending_data = ''; $scope.message = ''; @@ -115,6 +131,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod }); } + } var mystyle = { sheetid: 'APPLICAITON PENDING STUDENT LIST REPORT', headers: true, diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index aab98246..28a22b1f 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -91,8 +91,24 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", }); } // response data - $scope.onSubmit = function () { - + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { $scope.balfee_data = ''; $scope.message = ''; var response_data = { @@ -154,7 +170,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", } - + } //Export to excel var mystyle = { sheetid: 'BALANCE FEE STATUS REPORT', diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index 81ffff7b..e3ca57f2 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -408,6 +408,10 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor $scope.trackForm = { submit: function (form, myModel,loading,selectedStudents) { //console.log(selectedStudents); + var comments = []; + for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ + comments [stuid] ="Call Tracking For Report Certificate Status - DocumentName:"+selectedStudents[stuid].Certificate_name + " - Status:" +selectedStudents[stuid].Certificate_status + " - Date:" +selectedStudents[stuid].Certificate_date; + } if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; @@ -464,7 +468,7 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor assignedTo: myModel.assignedTo, status: myModel.status, referedBy: myModel.referedBy, - comments:"Call Tracking For Report Certificate Details ", + comments:comments, enquiryStatus:myModel.enquiryStatus, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index b646cb4f..a82e9624 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -82,8 +82,25 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod } }); } - - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.doc_pending_data = ''; $scope.message = ''; @@ -113,7 +130,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod } }); - + } } var mystyle = { sheetid: 'DOCUMENT PENDING STUDENT LIST REPORT', diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index 35937f3b..66bca916 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -83,7 +83,24 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", }); } - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.examfee_data = ''; $scope.message = ''; @@ -120,7 +137,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", totalf += parseFloat(item.Amount); } return totalf; } - + } } var mystyle = { sheetid: 'EXAM WRITING FEE REPORT', diff --git a/Apollo/assets/js/controllers/report_expenseCtrl.js b/Apollo/assets/js/controllers/report_expenseCtrl.js index a70f785c..9a5d492b 100755 --- a/Apollo/assets/js/controllers/report_expenseCtrl.js +++ b/Apollo/assets/js/controllers/report_expenseCtrl.js @@ -63,7 +63,25 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle }); } - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$addDate; + firstError = form[field].$toDate; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[toDate=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.expense_data = ''; $scope.message = ''; @@ -95,6 +113,7 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle }); } + } var mystyle = { sheetid: 'EXPENSE REPORT', diff --git a/Apollo/assets/js/controllers/report_leadCtrl.js b/Apollo/assets/js/controllers/report_leadCtrl.js index ea0c30ca..c5716651 100644 --- a/Apollo/assets/js/controllers/report_leadCtrl.js +++ b/Apollo/assets/js/controllers/report_leadCtrl.js @@ -101,7 +101,25 @@ app.controller('report_leadCtrl', ["$scope", "$filter","$rootScope","$modal", "A }); } - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$addDate; + firstError = form[field].$toDate; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[toDate=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.lead_data = ''; $scope.message = ''; @@ -132,6 +150,7 @@ app.controller('report_leadCtrl', ["$scope", "$filter","$rootScope","$modal", "A }); } + } var mystyle = { sheetid: 'Lead REPORT', headers: true, diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index d4e31322..af4fe036 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -407,6 +407,10 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor $scope.trackForm = { submit: function (form, myModel,loading,selectedStudents) { //console.log(selectedStudents); + var comments = []; + for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ + comments [stuid] ="Call Tracking For Report Certificate Status - SemYear:"+selectedStudents[stuid].Sem_year + " - Balance:" +selectedStudents[stuid].Balance_fee + " - CertificateName:" +selectedStudents[stuid].Certificate_name + " - ReceivedStatus:" +selectedStudents[stuid].rstatus + " - ReceivedDate:" +selectedStudents[stuid].rdate; + } if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; @@ -463,7 +467,7 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor assignedTo: myModel.assignedTo, status: myModel.status, referedBy: myModel.referedBy, - comments:"Call Tracking For Report MarkCard-Certificate Details ", + comments:comments, enquiryStatus:myModel.enquiryStatus, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index d76fc58e..0c588387 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -83,7 +83,24 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", }); } - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.markcard_data = ''; $scope.message = ''; @@ -114,6 +131,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", }); } + } var mystyle = { sheetid: 'MARKCARD STATUS REPORT', headers: true, diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index f17415b7..ab3ec6ac 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -72,35 +72,26 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc } }); } - //dropdown values for batch - $scope.getBatch = function(Form,filters){ - $scope.batchValue= filters.university; - - var filterBatch = { - method: 'POST', - url: apiPoint.url + 'report_BatchName/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - branch : JSON.parse(localStorage.getItem('localObj')).localBranchID, - batch : $scope.batchValue - } - - }; - //console.log($scope.batchValue); - $scope.batchName = ""; - $http(filterBatch).then(function (response) { - if (response.data) { - - $scope.batchName = response.data.batchName; - console.log($scope.batchName); - } else { - } - }); - } + - $scope.onSubmit = function() { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.study_mat_data = ''; $scope.message = ''; @@ -130,7 +121,8 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc }); - } + } + } //Export to excel var mystyle = { sheetid: 'STUDY MATERIAL STATUS REPORT', diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index a7daf5f4..d668ee2e 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -50,7 +50,24 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S }); } - $scope.onSubmit = function () { + $scope.show = false; + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$batch; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { //alert($scope.batch.name); $scope.waiver_referal_data = ''; $scope.message = ''; @@ -95,6 +112,7 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S } return totalf; } } + } var mystyle = { sheetid: 'WAIVER AND REFERAL REPORT', diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html index a9e0e5a6..eca1e330 100755 --- a/Apollo/assets/views/report_answer_booklets.html +++ b/Apollo/assets/views/report_answer_booklets.html @@ -13,6 +13,7 @@ td,th { th{ text-align:center; } + .table>tbody>tr>td { padding: 2px; } /* .sort-icon { font-size: 9px; margin-left: 5px; @@ -28,7 +29,7 @@ td,th {
-
+
@@ -40,18 +41,20 @@ td,th { University - + Please select University.
- + Please select Batch.
diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index 5f07d8da..9b43233e 100755 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -15,6 +15,7 @@ th{ text-align:center; } + .table>tbody>tr>td { padding: 2px; } /* .sort-icon { font-size: 9px; margin-left: 5px; @@ -30,7 +31,7 @@
- +
@@ -42,18 +43,20 @@ University - + Please select University.
- + Please select Batch.
diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html index b7bf6f22..00ecb0b1 100755 --- a/Apollo/assets/views/report_balance_fee.html +++ b/Apollo/assets/views/report_balance_fee.html @@ -7,6 +7,7 @@
- +
@@ -38,7 +37,8 @@ + show-button-bar="true" required/> + Please select FromDate.
@@ -49,9 +49,10 @@ To Date + show-button-bar="true" required/> + Please select ToDate.
@@ -80,10 +81,11 @@
+
-
+
@@ -102,7 +104,7 @@ - + diff --git a/Apollo/assets/views/report_lead.html b/Apollo/assets/views/report_lead.html index 3325460b..ff7fbf09 100644 --- a/Apollo/assets/views/report_lead.html +++ b/Apollo/assets/views/report_lead.html @@ -13,6 +13,7 @@ td,th { th{ text-align:center; } + .table>tbody>tr>td { padding: 2px; } /* .sort-icon { font-size: 9px; margin-left: 5px; @@ -28,7 +29,7 @@ td,th {
- +
@@ -44,7 +45,8 @@ td,th { + show-button-bar="true" required/> + Please select FromDate.
@@ -55,9 +57,10 @@ td,th { To Date + show-button-bar="true" required/> + Please select ToDate.
diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html index 945b94a2..9b03961b 100755 --- a/Apollo/assets/views/report_mark_certificate_status.html +++ b/Apollo/assets/views/report_mark_certificate_status.html @@ -13,6 +13,7 @@ td,th { th{ text-align:center; } + .table>tbody>tr>td { padding: 2px; } /* .sort-icon { font-size: 9px; margin-left: 5px; @@ -131,8 +132,6 @@ td,th { - - @@ -153,21 +152,19 @@ td,th { - - - + - - - - - + + + + + diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html index dbcb0ab4..f9ac019a 100755 --- a/Apollo/assets/views/report_markcardstatus.html +++ b/Apollo/assets/views/report_markcardstatus.html @@ -13,13 +13,14 @@ th{ text-align:center; } + .table>tbody>tr>td { padding: 2px; }
- +
@@ -31,18 +32,20 @@ University - + Please select University.
- + Please select Batch.
{{p.SL_NO}} {{p.Expense_name}}{{p.Amount}}{{p.Amount}}
SL.NoDocument Fee Paid DateEnrollment ID Student Name Father Name Course
{{p.SL_NO}}{{p.Document_fee_paid_date}}{{p.Enrollment_id}} {{p.Student_name}} {{p.Father_name}} {{p.course_name}} {{p.Sem_year}} {{p.Phone_number}} {{p.University}}{{p.Balance_fee}}{{p.Balance_fee}} {{p.Certificate_name}}{{p.received_status}}{{p.received_date}}{{p.issued_status}}{{p.issued_date}}{{p.issued_comments}}{{p.rstatus}}{{p.rdate}}{{p.istatus}}{{p.idate}}{{p.cmnts}}