From 7190f919f5252e1045a73abdc56a4d8b78004899 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 21 Aug 2018 10:23:26 +0530 Subject: [PATCH 1/5] report issue fixes --- Apollo/api/application/controllers/Report.php | 8 +-- .../api/application/models/Reports_model.php | 51 +++++++++---------- Apollo/assets/i18n/en.json | 6 +-- .../js/controllers/report_app_pendingCtrl.js | 2 +- .../js/controllers/report_balfeeCtrl.js | 4 +- .../js/controllers/report_doc_pendingCtrl.js | 2 +- .../controllers/report_markcard_statusCtrl.js | 2 +- .../report_study_material_statusCtrl.js | 2 +- .../assets/views/report_answer_booklets.html | 2 +- .../views/report_application_pending.html | 4 +- .../assets/views/report_exam_writing_fee.html | 13 +++-- Apollo/assets/views/report_expense.html | 2 +- .../views/report_studymaterialstatus.html | 2 +- 13 files changed, 46 insertions(+), 54 deletions(-) diff --git a/Apollo/api/application/controllers/Report.php b/Apollo/api/application/controllers/Report.php index 10ffdf1b..e61fc126 100755 --- a/Apollo/api/application/controllers/Report.php +++ b/Apollo/api/application/controllers/Report.php @@ -383,10 +383,8 @@ class Report extends REST_Controller { } - - - - + + public function getAllUniversity_post() { @@ -443,8 +441,6 @@ class Report extends REST_Controller { } - - diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 532b02e6..0461f0fb 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -34,7 +34,7 @@ order by CourseID) 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,AlternateNumber,PresentAddress as address FROM T_StudentDetails where IsActive = 1) 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 +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 sms.branch = '".$br."' "; @@ -433,26 +433,24 @@ group by sid } public function app_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,ifnull(sfp.bdate,'-') as Admission_date, - ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,sms.adate as appdate + $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(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,ifnull(sfp.bdate,'-') as Admission_date, + sms.adate as appdate,ifnull(reg.formtype,'-') as formtype,sfs.batch as batch 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 + (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,app.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 CertificateName like 'APPLICATION%' and list.ListName != 'SENT TO UNIVERSITY' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode) -group by sid,cid,lcode,branch) 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) - as sfs on sfs.sid=sms.sid and sms.cid=sfs.cid +where CertificateName like 'APPLICATION%' and list.ListName != 'SENT TO UNIVERSITY' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode,CertificationType,ListCode) +group by sid,cid,lcode,branch,ctype) as sms +left join +(select StudentID as sid,CourseID as cid,BatchCode as batch,FeesID as fid from T_Students_Fees_Status) as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid 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) group by sid,fid,billno) - as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid + as sfp on sfp.sid=sfs.sid and sfs.fid=sfp.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=sfs.cid and cfd.cid=sfs.ftype + (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 @@ -463,6 +461,9 @@ left join 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 +left join +(Select StudentID as sid,CourseID as cid,BatchCode as bcode,FeeType as ftype,BranchCode as branch,RegistrationType as formtype from T_Registration_Details) as reg on reg.sid=sms.sid and reg.cid=sms.cid + where std.active = 1 and sms.branch = '".$br."' "; @@ -476,7 +477,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,Branch_code,Sem_year"; @@ -618,26 +619,23 @@ left join } public function examfee($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(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfs.cid,'-') as Course_id,ifnull(sms.cmts,'-') as Comments,ifnull(sms.stf,'-') as Amount,ifnull(sms.branch,'-') as Branch_code,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(cfd.syear,'-') as Sem_year,ifnull(sms.batch,'-') as Batch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.cid,'-') as Course_id,ifnull(sms.cmts,'-') as Comments,ifnull(sms.stf,'-') as Amount,ifnull(sms.branch,'-') as Branch_code,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber from (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,Comments as cmts,BranchCode as branch FROM T_Students_Fees_Status where STFOrWR != '' -group by sid,batch,cid) as sms -left join - (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype FROM T_Students_Fees_Status - group by sid,cid,batch) as sfs on sfs.sid=sms.sid and sfs.fid=sms.fid +group by sid,fid,batch,cid) as sms 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=sfs.cid + (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 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=scd.cid and cfd.cid=sfs.ftype + (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 and cfd.cid=sms.ftype 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 where std.active = 1 and sms.branch = '".$br."' @@ -646,7 +644,7 @@ left join if ($bat!= ''){ - $sql.=" and sfs.batch = '".$bat."'"; + $sql.=" and sms.batch = '".$bat."'"; } if ($u!= ''){ @@ -837,10 +835,7 @@ from T_Lead_Tracking_Followup as ltf $batchDetails = $this->db->get(BATCH); return $batchDetails->result(); } - - - - public function GetAllUniversity($branchId) + public function GetAllUniversity($branchId) { $this->db->select('UniversityID,UniversityName'); $this->db->from('T_UniversityMaster'); @@ -886,7 +881,7 @@ left JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_ left JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Registration_Details.BatchCode WHERE T_Registration_Details.RegistrationType = ? and str_to_date(DOJ,?)>=? and str_to_date(DOJ,?)<=? and T_Registration_Details.RegistrationMode=?'; -$query = $this->db->query($subQuery,array(NewReg,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1')); +$query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1')); $searchDetails =$query->result(); diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 142041a4..43b1900a 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -83,16 +83,16 @@ "studmatstatus": "STUDY MATERIAL STATUS ", "mstatus": "MARK CARD STATUS ", "certificate_status": "CERTIFICATE STATUS ", - "certificate_mark_status": "MARKCARD/CERTIFICATE ISSUED STATUS ", + "certificate_mark_status": "MARKS CARD/ CERTIFICATES - RECEIVED/ ISSUED STATUS REPORT", "expense": "EXPENSE REPORT ", "answer_booklets": "ANSWER BOOKLETS STATUS REPORT ", - "app_pending": "APPLICATION PENDING STUDENT LIST REPORT", + "app_pending": "NEW & RE-REG FORM STATUS REPORT", "doc_pending": "STUDENT DOCUMENTS PENDING REPORT", "wav_ref": "WAIVER AND REFERAL REPORT", "examfee": "EXAM WRITING FEE REPORT", "balfee": "FEE BALANCE REPORT", "lead": "LEAD TRACKING REPORT", - "newreg":"NEW REG REPORT" + "newreg":"NEW REG REPORT" }, "student": { diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index 626616b6..4a860046 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -150,7 +150,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,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,Status as ApplicationPendingStatus INTO XLS("Application_pending_student_list.xls",?) FROM ?',[mystyle,$scope.app_pending_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as InititalPaymentDate,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,Status as ApplicationPendingStatus,formtype as FormType,appdate as Date INTO XLS("Application_pending_student_list.xls",?) FROM ?',[mystyle,$scope.app_pending_data]); }; diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index 28a22b1f..54d58da3 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -173,10 +173,10 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", } //Export to excel var mystyle = { - sheetid: 'BALANCE FEE STATUS REPORT', + sheetid: 'FEE BALANCE REPORT', headers: true, caption: { - title:'BALANCE FEE STATUS REPORT', + title:'FEE BALANCE REPORT', width: '300px', style:'font-size:50px;' }, diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index a82e9624..605ba51f 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -150,7 +150,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,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,adate as DocumentAppliedDate,certname as DocumentName,Status as DocumentPendingStatus INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,fdate as Followupdate,certname as DocumentName INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]); }; /*modal controller * */ diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index 0c588387..7792ce41 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -150,7 +150,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Roll_NO as RollNO,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,Status as MarkCardStatus,Date as Date INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Roll_NO as RollNO,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,appdate as ApplicationSentDate,ansdate as AnswerBookletSentDate,Status as MarkCardStatus,Date as Date INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]); }; /*modal controller * */ diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index ab3ec6ac..9c169537 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -142,7 +142,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,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,Status as StudyMaterial_Status,CAST(Balance_fee AS NUMBER) as BalanceFee,Date INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,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,Status as StudyMaterial_Status,Date,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]); }; diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html index eca1e330..efed3b3f 100755 --- a/Apollo/assets/views/report_answer_booklets.html +++ b/Apollo/assets/views/report_answer_booklets.html @@ -119,7 +119,7 @@ td,th { {{p.Sem_year}}({{p.Sem}}) {{p.Phone_number}} {{p.University}} - {{p.balance}} + {{p.balance}} {{p.issuedate}} {{p.rcvedate}} {{p.Status}} diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index 9b43233e..02d43f09 100755 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -102,7 +102,8 @@ Sem/Year Phone No University - Application Status + Application Pending Status + Form Type Date @@ -122,6 +123,7 @@ {{p.Phone_number}} {{p.University}} {{p.Status}} + {{p.formtype}} {{p.appdate}} diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html index 1d4f32f4..0f3e1135 100755 --- a/Apollo/assets/views/report_exam_writing_fee.html +++ b/Apollo/assets/views/report_exam_writing_fee.html @@ -89,7 +89,7 @@ - + Sum of Exam Writing Fee @@ -131,16 +131,15 @@ + + + + Total - - - - - - {{ getstf() }} + {{ getstf() }} diff --git a/Apollo/assets/views/report_expense.html b/Apollo/assets/views/report_expense.html index da35b07f..f1df729e 100755 --- a/Apollo/assets/views/report_expense.html +++ b/Apollo/assets/views/report_expense.html @@ -81,7 +81,7 @@
- + diff --git a/Apollo/assets/views/report_studymaterialstatus.html b/Apollo/assets/views/report_studymaterialstatus.html index 38872579..854dabe2 100755 --- a/Apollo/assets/views/report_studymaterialstatus.html +++ b/Apollo/assets/views/report_studymaterialstatus.html @@ -120,7 +120,7 @@ {{p.University}} {{p.Status}} {{p.Date}} - {{p.Balance_fee}} + {{p.Balance_fee}} From 4a4624de4b691eb1b577fe49549a0b8ada61e8d3 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 21 Aug 2018 10:57:00 +0530 Subject: [PATCH 2/5] daybook approval --- Apollo/assets/views/daybook/dayBookApproval.html | 8 +++++--- Apollo/assets/views/daybook/dayBookadminApproval.html | 6 +++--- .../assets/views/daybook/daybooksuperAdminApproval.html | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Apollo/assets/views/daybook/dayBookApproval.html b/Apollo/assets/views/daybook/dayBookApproval.html index 6d05da34..cfe19d6c 100755 --- a/Apollo/assets/views/daybook/dayBookApproval.html +++ b/Apollo/assets/views/daybook/dayBookApproval.html @@ -69,7 +69,8 @@ -
+ + + Type is Required -
+ --> +
diff --git a/Apollo/assets/views/daybook/dayBookadminApproval.html b/Apollo/assets/views/daybook/dayBookadminApproval.html index 4a4a2241..df1ac54c 100755 --- a/Apollo/assets/views/daybook/dayBookadminApproval.html +++ b/Apollo/assets/views/daybook/dayBookadminApproval.html @@ -76,7 +76,7 @@

-
+ + Type is Required -
+
-->
diff --git a/Apollo/assets/views/daybook/daybooksuperAdminApproval.html b/Apollo/assets/views/daybook/daybooksuperAdminApproval.html index 96ec626a..37d0a046 100755 --- a/Apollo/assets/views/daybook/daybooksuperAdminApproval.html +++ b/Apollo/assets/views/daybook/daybooksuperAdminApproval.html @@ -51,7 +51,7 @@

-
+
From 15a73cff5c773dbcc4786268b5569d3b9ced3259 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 21 Aug 2018 11:03:40 +0530 Subject: [PATCH 3/5] sms group actice deactive --- Apollo/assets/views/sendSMS/sendSMSsuperadmin.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html b/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html index 2048e6de..33b44d01 100755 --- a/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html +++ b/Apollo/assets/views/sendSMS/sendSMSsuperadmin.html @@ -368,7 +368,7 @@
From bbd0fab01fb9efbdaafdbcdbeed0dd411f641f37 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 21 Aug 2018 11:24:35 +0530 Subject: [PATCH 4/5] datacorrection change --- .../js/controllers/datacorrectionCtrl.js | 33 ++++++++++++------- Apollo/assets/views/edit_daybookentries.html | 2 +- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/Apollo/assets/js/controllers/datacorrectionCtrl.js b/Apollo/assets/js/controllers/datacorrectionCtrl.js index ba1bcf06..eeab03dc 100644 --- a/Apollo/assets/js/controllers/datacorrectionCtrl.js +++ b/Apollo/assets/js/controllers/datacorrectionCtrl.js @@ -130,25 +130,34 @@ app.controller('datacorrectionCtrl', ["$scope","$rootScope","toaster", "$filter" - $scope.updatestatus = function (myModel, form, loading) - { -//alert(myModel.ID) +$scope.updatestatus = function (myModel, form, loading) +{ -//alert(myModel.Reason); +var firstError = null; + if (form.$invalid) { + + var field = null, firstError = null; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$name; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[name=' + firstError + ']').focus(); + swal("Please Enter Reason!", "", "error"); + } else { var d = new Date(myModel.Date); -// console.log(d.getUTCDate()); // Hours -// console.log(d.getUTCMonth()); -// console.log(d.getUTCFullYear()); - var mdate = d.getUTCDate() + 1; var mmonth = d.getUTCMonth() + 1; var myear = d.getUTCFullYear(); var CDate = mdate+"-"+mmonth+"-"+myear; //console.log(CDate) - - var IsActive = ''; if(myModel.IsActive == true) @@ -189,8 +198,10 @@ else if(myModel.IsActive == false) $scope.close(); }); + + } - }; +}; diff --git a/Apollo/assets/views/edit_daybookentries.html b/Apollo/assets/views/edit_daybookentries.html index f6a89d89..49c3874c 100644 --- a/Apollo/assets/views/edit_daybookentries.html +++ b/Apollo/assets/views/edit_daybookentries.html @@ -73,7 +73,7 @@ -
+
From 2df91944f1a3f9f26097a44e2a348245e4230dd4 Mon Sep 17 00:00:00 2001 From: velz Date: Tue, 21 Aug 2018 11:57:36 +0530 Subject: [PATCH 5/5] YEAR HALLTICKET ISEEUE FIXED:VELZ --- .../application/models/Hallticket_model.php | 17 ++++++----- .../js/controllers/generateHallTicketCtrl.js | 8 +++--- .../views/hallticket/hallTicketPDF.html | 28 +++++++++---------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php index 055c008c..7248a4ea 100755 --- a/Apollo/api/application/models/Hallticket_model.php +++ b/Apollo/api/application/models/Hallticket_model.php @@ -810,7 +810,7 @@ class Hallticket_model extends CI_Model } - array_splice($id['FeeDetails'][$key2],0,6,$in1); + array_splice($id['FeeDetails'][$key2],0,6,$in1[0]); } @@ -832,7 +832,7 @@ class Hallticket_model extends CI_Model // } - array_splice($id['FeeDetails'][$key2],0,6,$in2); + array_splice($id['FeeDetails'][$key2],0,6,$in2[0]); } @@ -854,7 +854,7 @@ class Hallticket_model extends CI_Model // } - array_splice($id['FeeDetails'][$key2],0,6,$in3); + array_splice($id['FeeDetails'][$key2],0,6,$in3[0]); } @@ -876,7 +876,7 @@ class Hallticket_model extends CI_Model // } - array_splice($id['FeeDetails'][$key2],0,6,$in4); + array_splice($id['FeeDetails'][$key2],0,6,$in4[0]); } $studentIDs['NUMTYPE'] = 'YEAR'; @@ -1031,8 +1031,10 @@ class Hallticket_model extends CI_Model { foreach($studentIDs as $student) { + if(!empty($student['FeeDetails'])) { + foreach($student['FeeDetails'][0] as $key => $fees) { @@ -1045,16 +1047,13 @@ class Hallticket_model extends CI_Model $HallTicketStudentID = $this->db->insert_id(); $this->db->trans_complete(); - foreach($fees as $subject) - { - - $tempSubjectArray = array('HallTicket_Student_ID'=>$HallTicketStudentID,'SubjectCode'=>$subject->SubjectID,'ExamDate'=>$subject->ScheduleDate,'FromTime'=>$subject->FromTime,'EndTime'=>$subject->ToTime); + $tempSubjectArray = array('HallTicket_Student_ID'=>$HallTicketStudentID,'SubjectCode'=>$fees->SubjectID,'ExamDate'=>$fees->ScheduleDate,'FromTime'=>$fees->FromTime,'EndTime'=>$fees->ToTime); $this->db->trans_start(); $this->db->insert('T_Hallticket_Subject_Details',$tempSubjectArray); $this->db->trans_complete(); - } + } } } diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index 32eee39c..8007c128 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -638,28 +638,28 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun switch(i) { case 0: - var firstTableID = tableid+'year10'; + var firstTableID = tableid+'year1'+key; //var SecTableID = tableid+'year11'; semName = 'YEAR1'; break; case 1: - var firstTableID = tableid+'year20'; + var firstTableID = tableid+'year2'+key; //var SecTableID = tableid+'year21'; semName = 'YEAR2'; break; case 2: - var firstTableID = tableid+'year30'; + var firstTableID = tableid+'year3'+key; //var SecTableID = tableid+'year31'; semName = 'YEAR3'; break; case 4: - var firstTableID = tableid+'year40'; + var firstTableID = tableid+'year4'+key; //var SecTableID = tableid+'year41'; semName = 'YEAR4'; diff --git a/Apollo/assets/views/hallticket/hallTicketPDF.html b/Apollo/assets/views/hallticket/hallTicketPDF.html index 87143cf7..45633dc3 100755 --- a/Apollo/assets/views/hallticket/hallTicketPDF.html +++ b/Apollo/assets/views/hallticket/hallTicketPDF.html @@ -71,7 +71,7 @@ - +
@@ -79,8 +79,8 @@ - - + + @@ -88,16 +88,16 @@ -
0{{sub.SemesterID}}0{{sub.SemesterID-1}}{{sub.SubjectCode}}{{sub.SubjectName}}{{sub.ScheduleDate | date: "dd-MM-y" }}{{sub.FromTime}} - {{sub.ToTime}} 
0{{sub.SemesterID}}{{sub.SubjectCode}}{{sub.SubjectName}}{{sub.ScheduleDate | date: "dd-MM-y" }}{{sub.FromTime}} - {{sub.ToTime}} 
+
- + - - + + @@ -105,16 +105,16 @@ -
Sem/Year
Paper Code
Subject Name
Date
Time
Inv.sign
Sem/Year
Paper Code
Subject Name
Date
Time
Inv.sign
0{{sub.SemesterID-1}}0{{sub.SemesterID-2}}{{sub.SubjectCode}}{{sub.SubjectName}}{{sub.ScheduleDate | date: "dd-MM-y" }}{{sub.FromTime }} - {{sub.ToTime }} 
0{{sub.SemesterID-1}}{{sub.SubjectCode}}{{sub.SubjectName}}{{sub.ScheduleDate | date: "dd-MM-y" }}{{sub.FromTime }} - {{sub.ToTime }} 
+
- + - - + + @@ -122,7 +122,7 @@ -
Sem/Year
Paper Code
Subject Name
Date
Time
Inv.sign
Sem/Year
Paper Code
Subject Name
Date
Time
Inv.sign
0{{sub.SemesterID-2}}0{{sub.SemesterID-3}}{{sub.SubjectCode}}{{sub.SubjectName}}{{sub.ScheduleDate | date: "dd-MM-y" }}{{sub.FromTime}} - {{sub.ToTime | date :"hh:mm: a"}} 
0{{sub.SemesterID-2}}{{sub.SubjectCode}}{{sub.SubjectName}}{{sub.ScheduleDate | date: "dd-MM-y" }}{{sub.FromTime}} - {{sub.ToTime | date :"hh:mm: a"}} 
+
@@ -130,8 +130,8 @@ - - + +
0{{sub.SemesterID-3}}0{{sub.SemesterID-4}}{{sub.SubjectCode}}{{sub.SubjectName}}{{sub.ScheduleDate | date: "dd-MM-y" }}{{sub.FromTime }} - {{sub.ToTime}} 
0{{sub.SemesterID-3}}{{sub.SubjectCode}}{{sub.SubjectName}}{{sub.ScheduleDate | date: "dd-MM-y" }}{{sub.FromTime }} - {{sub.ToTime}}