From 7190f919f5252e1045a73abdc56a4d8b78004899 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 21 Aug 2018 10:23:26 +0530 Subject: [PATCH 01/18] 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 02/18] 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 03/18] 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 04/18] 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 05/18] 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 @@ - - + + From 0993b710b6970f7c6d225e8ca2c1c0e936a1a460 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 21 Aug 2018 12:10:04 +0530 Subject: [PATCH 06/18] fees status changes --- .../application/models/Fees_status_model.php | 94 +++++++++++++++---- 1 file changed, 76 insertions(+), 18 deletions(-) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 326dcfb1..c800e9cd 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -1759,29 +1759,79 @@ class Fees_status_model extends CI_Model if($row->ProgramType==REGULARFEES OR $row->ProgramType==LATERALFEES){ foreach ($singleFeesDetails as $Fees){ - $insertStudyBook['Sem']=$Fees; - // insert study material details - $this->db->insert(STUDY_MATERIAL_STATUS, $insertStudyBook); - // insert answer booklet details - $this->db->insert(ANSWER_BOOKLET, $insertStudyBook); + // check study material status exist or not + $this->db->select('CourseID'); + $this->db->where('CourseID',$row->FeesType); + $this->db->where('Sem',$Fees); + $this->db->where('BranchCode',$feesDetails['UpdatedBy']); + $this->db->where('StudentID',$feesDetails['StudentID']); + $existStudyMaterialDetails = $this->db->get(STUDY_MATERIAL_STATUS); + if($existStudyMaterialDetails->num_rows()<1){ - // insert mark card details - $insertMark['Sem']=$Fees; - $this->db->insert(CERTIFICATION_STATUS, $insertMark); + // insert study material details + $this->db->insert(STUDY_MATERIAL_STATUS, $insertStudyBook); + } + // check answer book;et exist or not + + $this->db->select('CourseID'); + $this->db->where('CourseID',$row->FeesType); + $this->db->where('BranchCode',$feesDetails['UpdatedBy']); + $this->db->where('StudentID',$feesDetails['StudentID']); + $existAnsBookDetails = $this->db->get(ANSWER_BOOKLET); + if($existAnsBookDetails->num_rows()<1) { + // insert answer booklet details + $this->db->insert(ANSWER_BOOKLET, $insertStudyBook); + } + // check certificate exist or not + $this->db->select('CourseID'); + $this->db->where('CourseID',$row->FeesType); + $this->db->where('Sem',$row->Sem_Year); + $this->db->where('BranchCode',$feesDetails['UpdatedBy']); + $this->db->where('StudentID',$feesDetails['StudentID']); + $existAnsBookDetails = $this->db->get(CERTIFICATION_STATUS); + if($existAnsBookDetails->num_rows()<1) { + // insert mark card details + $insertMark['Sem'] = $row->Sem_Year; + $this->db->insert(CERTIFICATION_STATUS, $insertMark); + } } } else{ - $insertStudyBook['Sem']=$row->Sem_Year; - // insert study material details - $this->db->insert(STUDY_MATERIAL_STATUS, $insertStudyBook); - // insert answer booklet details - $this->db->insert(ANSWER_BOOKLET, $insertStudyBook); - // insert mark card details - $insertMark['Sem']=$row->Sem_Year; - $this->db->insert(CERTIFICATION_STATUS, $insertMark); + $insertStudyBook['Sem'] = $row->Sem_Year; + $this->db->select('CourseID'); + $this->db->where('CourseID',$row->FeesType); + $this->db->where('BranchCode',$feesDetails['UpdatedBy']); + $this->db->where('StudentID',$feesDetails['StudentID']); + $existStudyMaterialDetails = $this->db->get(STUDY_MATERIAL_STATUS); + if($existStudyMaterialDetails->num_rows()<1) { + + // insert study material details + $this->db->insert(STUDY_MATERIAL_STATUS, $insertStudyBook); + } + // check answer book;et exist or not + $this->db->select('CourseID'); + $this->db->where('CourseID',$row->FeesType); + $this->db->where('BranchCode',$feesDetails['UpdatedBy']); + $this->db->where('StudentID',$feesDetails['StudentID']); + $existAnsBookDetails = $this->db->get(ANSWER_BOOKLET); + if($existAnsBookDetails->num_rows()<1) { + // insert answer booklet details + $this->db->insert(ANSWER_BOOKLET, $insertStudyBook); + } + // check certificate exist or not + $this->db->select('CourseID'); + $this->db->where('CourseID',$row->FeesType); + $this->db->where('BranchCode',$feesDetails['UpdatedBy']); + $this->db->where('StudentID',$feesDetails['StudentID']); + $existAnsBookDetails = $this->db->get(CERTIFICATION_STATUS); + if($existAnsBookDetails->num_rows()<1) { + // insert mark card details + $insertMark['Sem'] = $row->Sem_Year; + $this->db->insert(CERTIFICATION_STATUS, $insertMark); + } } @@ -1805,8 +1855,16 @@ class Fees_status_model extends CI_Model $insertDocs['CreatedBy']=$feesDetails['CreatedBy']; $insertDocs['CreatedOn']=$feesDetails['CreatedOn']; $insertDocs['CertificationType']=$getEndFeesDetails->CertificationID; - // insert application details - $this->db->insert(APPLICATION_STATUS,$insertDocs); + $this->db->select('CourseID'); + $this->db->where('CourseID',$courseID); + $this->db->where('BranchCode',$feesDetails['UpdatedBy']); + $this->db->where('StudentID',$feesDetails['StudentID']); + $this->db->where('CertificationType',$getEndFeesDetails->CertificationID); + $existAnsBookDetails = $this->db->get(CERTIFICATION_STATUS); + if($existAnsBookDetails->num_rows()<1) { + // insert application details + $this->db->insert(APPLICATION_STATUS, $insertDocs); + } } From df0e38c070399b5f15334951267cd0916b41a0ca Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 21 Aug 2018 12:14:28 +0530 Subject: [PATCH 07/18] fees status model changes --- Apollo/api/application/models/Fees_status_model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index c800e9cd..1707a9b3 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -1860,8 +1860,8 @@ class Fees_status_model extends CI_Model $this->db->where('BranchCode',$feesDetails['UpdatedBy']); $this->db->where('StudentID',$feesDetails['StudentID']); $this->db->where('CertificationType',$getEndFeesDetails->CertificationID); - $existAnsBookDetails = $this->db->get(CERTIFICATION_STATUS); - if($existAnsBookDetails->num_rows()<1) { + $existApplicationDetails = $this->db->get(APPLICATION_STATUS); + if($existApplicationDetails->num_rows()<1) { // insert application details $this->db->insert(APPLICATION_STATUS, $insertDocs); } From 7c6d8f5b9f557e44ade5d8a68fd02a9e8b19f29f Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 21 Aug 2018 12:22:42 +0530 Subject: [PATCH 08/18] fees status model branch code check --- Apollo/api/application/models/Fees_status_model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 1707a9b3..4b6896d3 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -1843,6 +1843,7 @@ class Fees_status_model extends CI_Model else{ $this->db->select('CertificationID'); $this->db->where('CertificateName',$fetchData[0]->FeesType); + $this->db->where('BranchCode',$feesDetails['UpdatedBy']); $this->db->where('IsActive','1'); $getEndFeesDetails = $this->db->get(CERTIFICATION_MASTER)->last_row(); if($getEndFeesDetails){ From 289059c6dd9ca805a33b2231a2286dee12411dee Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 21 Aug 2018 12:35:39 +0530 Subject: [PATCH 09/18] new registration universitycheck --- Apollo/api/application/models/Reports_model.php | 4 ++-- Apollo/assets/js/controllers/newreg_reportCtrl.js | 14 ++++++++++---- Apollo/assets/views/newreg_report.html | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 0461f0fb..2ec17b71 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -879,9 +879,9 @@ JOIN T_StudentDetails ON T_StudentDetails.StudentID=T_Student_CourseDetails.Stud JOIN T_UniversityMaster ON T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID JOIN T_CourseMaster ON T_CourseMaster.CourseID=T_Student_CourseDetails.CourseID left JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_CourseDetails.CourseID and T_Registration_Details.StudentID=T_Student_CourseDetails.StudentID 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=?'; +WHERE T_Registration_Details.RegistrationType = ? and str_to_date(DOJ,?)>=? and str_to_date(DOJ,?)<=? and T_Registration_Details.RegistrationMode=? and T_Student_CourseDetails.UniversityID=?'; -$query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%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',$university)); $searchDetails =$query->result(); diff --git a/Apollo/assets/js/controllers/newreg_reportCtrl.js b/Apollo/assets/js/controllers/newreg_reportCtrl.js index ac7c32c1..4430940c 100644 --- a/Apollo/assets/js/controllers/newreg_reportCtrl.js +++ b/Apollo/assets/js/controllers/newreg_reportCtrl.js @@ -83,11 +83,13 @@ app.controller('newreg_reportCtrl', ["$scope","$rootScope","toaster", "$filter", //$scope.opinctotal=''; $scope.newreglist=''; $scope.isLoaderShow =''; +$scope.load = ''; +$scope.isShow= ''; $scope.getDetails = function (form,myModel) { // alert('in') - console.log(form.$dirty); + //console.log(form.$dirty); var from = $scope.filters.from_date; var to = $scope.filters.to_date; var university = myModel.myUnivSearch @@ -110,16 +112,20 @@ $scope.isLoaderShow =''; $http(getstudentdetails).then(function (response) { - if(response.data.status == 200) + if(response.data.status == 200 && response.data.searchst==true) { + + console.log(response.data); $scope.newreglist = response.data.details; - $scope.isLoaderShow = true; + $scope.isShow=true; + $scope.isLoaderShow=false; } else { - $scope.isLoaderShow=false; + $scope.isLoaderShow=true; + $scope.isShow=false; } diff --git a/Apollo/assets/views/newreg_report.html b/Apollo/assets/views/newreg_report.html index 9882e15b..d9564c94 100644 --- a/Apollo/assets/views/newreg_report.html +++ b/Apollo/assets/views/newreg_report.html @@ -156,10 +156,10 @@
-

{{load}}

+

No Records Found !!

-
+
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}} 
From ab7c53599b2d342cf9f26569325912cad69d8dcb Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 21 Aug 2018 14:21:10 +0530 Subject: [PATCH 10/18] fees status select box changes --- Apollo/assets/views/status-update/fees_status.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Apollo/assets/views/status-update/fees_status.html b/Apollo/assets/views/status-update/fees_status.html index aed584e9..31c99c09 100755 --- a/Apollo/assets/views/status-update/fees_status.html +++ b/Apollo/assets/views/status-update/fees_status.html @@ -82,10 +82,9 @@ - + + From 67e4b13149f55b631ce2fbdf6890332e24757590 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 21 Aug 2018 14:21:26 +0530 Subject: [PATCH 11/18] dashboard changes --- .../application/models/Dashboard_model.php | 66 ++++++++++++++++++- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/Apollo/api/application/models/Dashboard_model.php b/Apollo/api/application/models/Dashboard_model.php index 0c4b2b77..9393025c 100755 --- a/Apollo/api/application/models/Dashboard_model.php +++ b/Apollo/api/application/models/Dashboard_model.php @@ -81,7 +81,6 @@ class Dashboard_model extends CI_Model $this->db->where('BranchCode',$details['localBranchID']); $getUnivDetails = $this->db->get(); if($getUnivDetails->result()){ - $resultDetails['resultStatus']=true; foreach ($getUnivDetails->result() as $rows){ $fetchDetails['UniversityID']=$rows->UniversityID; $fetchDetails['UniversityName']=$rows->UniversityName; @@ -103,9 +102,12 @@ class Dashboard_model extends CI_Model $resultDetails['universityFeesDetails']=$getFeesArray; } else{ - $resultDetails['resultStatus']=false; + $resultDetails['details']=false; $resultDetails['Message']="No records found!"; + $resultDetails['universityFeesDetails']=false; } + $resultDetails['batchFeesDetails']=$this->getBatchPendingFees($details['localBranchID']); + return $resultDetails; } /* @@ -116,7 +118,6 @@ class Dashboard_model extends CI_Model $feesDetails=array(); $feesDetails['UniversityID']=$universityID; $feesDetails['UniversityName']=$universityName; - $this->db->select("SUM(SFS.CourseFees) as PayableFees"); $this->db->from( STUDENTS_FEES_STATUS . ' as SFS'); $this->db->join( COURSE . ' as CU', 'CU.CourseID = SFS.CourseID'); @@ -138,6 +139,7 @@ class Dashboard_model extends CI_Model $this->db->join( COURSE . ' as CU', 'CU.CourseID = SFS.CourseID'); $this->db->where('CU.UniversityID',$universityID); $this->db->where('CU.BranchCode',$branchCode); + $this->db->where('SFP.IsActive','1'); $this->db->order_by('CU.CourseID','DESC'); $getUnivPaidFeesDetails = $this->db->get(); if($getUnivPaidFeesDetails->result()){ @@ -153,6 +155,64 @@ class Dashboard_model extends CI_Model } + /* + * get batch pending fees details + * created by kms + * */ + public function getBatchPendingFees($branchCode=null){ + $this->db->distinct(); + $this->db->select('BatchCode,BatchName'); + $this->db->from(BATCH); + $this->db->order_by('BatchID','DESC'); + $this->db->where('BranchCode',$branchCode); + $getBatchDetails = $this->db->get(); + if($getBatchDetails->result()){ + foreach ($getBatchDetails->result() as $bRows){ + $batchFeesDetails['BatchCode']=$bRows->BatchCode; + $batchFeesDetails['BatchName']=$bRows->BatchName; + $this->db->select("SUM(SFS.CourseFees) as PayableFees"); + $this->db->from( STUDENTS_FEES_STATUS . ' as SFS'); + $this->db->where('SFS.BatchCode',$bRows->BatchCode); + $this->db->where('SFS.BranchCode',$branchCode); + $getBatchFeesDetails = $this->db->get(); + if($getBatchFeesDetails->result()){ + foreach ($getBatchFeesDetails->result() as $bpayableRow){ + $batchFeesDetails['PayableFees']=$bpayableRow->PayableFees; + } + } + else{ + $batchFeesDetails['PayableFees']=0; + } + // get paid details + $this->db->select("SUM(SFP.BillAmount) as PaidFees"); + $this->db->from( STUDENTS_FEES_PAID . ' as SFP'); + $this->db->join( STUDENTS_FEES_STATUS . ' as SFS', 'SFS.FeesID = SFP.FeesId'); + $this->db->where('SFP.IsActive','1'); + $this->db->where('SFS.BatchCode',$bRows->BatchCode); + $this->db->where('SFS.BranchCode',$branchCode); + $getBatchPaidFeesDetails = $this->db->get(); + if($getBatchPaidFeesDetails->result()){ + foreach ($getBatchPaidFeesDetails->result() as $bpaidRow){ + $batchFeesDetails['PaidFees']=$bpaidRow->PaidFees; + } + } + else{ + $batchFeesDetails['PaidFees']=0; + } + $fetchBatchFees[]=$batchFeesDetails; + + } + + return $fetchBatchFees; + } + else{ + return false; + } + + + + } + } \ No newline at end of file From 65f06548b7bbacf502c96a5312f4465a48261a8c Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 21 Aug 2018 14:21:35 +0530 Subject: [PATCH 12/18] dashboard changes --- Apollo/assets/js/controllers/dashboardCtrl.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Apollo/assets/js/controllers/dashboardCtrl.js b/Apollo/assets/js/controllers/dashboardCtrl.js index e98ad427..56cc608f 100755 --- a/Apollo/assets/js/controllers/dashboardCtrl.js +++ b/Apollo/assets/js/controllers/dashboardCtrl.js @@ -292,6 +292,7 @@ app.controller('OnotherCtrl', ["$scope", "toaster", "$filter", "$http", "API_POI $scope.getUniversityRegisteredDetails = function () { $scope.registerdStudentDetails=""; $scope.universityFeesDetails=""; + $scope.batchFeesDetails=""; $scope.notEmptyRegistration=true; var req = { method: 'POST', @@ -308,10 +309,13 @@ app.controller('OnotherCtrl', ["$scope", "toaster", "$filter", "$http", "API_POI $scope.notEmptyRegistration=response.data.resultStatus; $scope.registerdStudentDetails=response.data.details; $scope.universityFeesDetails=response.data.universityFeesDetails; + $scope.batchFeesDetails=response.data.batchFeesDetails; + } else { $scope.registerdStudentDetails=""; $scope.universityFeesDetails=""; + $scope.batchFeesDetails=""; $scope.notEmptyRegistration=false; } }); From deb65fe8e4571130ab10695a2e7c4dcd865bc454 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 21 Aug 2018 14:21:45 +0530 Subject: [PATCH 13/18] dashboard changes --- Apollo/assets/views/dashboard.html | 55 ++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/Apollo/assets/views/dashboard.html b/Apollo/assets/views/dashboard.html index b7ca4661..411bd88e 100755 --- a/Apollo/assets/views/dashboard.html +++ b/Apollo/assets/views/dashboard.html @@ -23,6 +23,7 @@
+
@@ -97,6 +98,8 @@
+ +
@@ -179,6 +182,8 @@
+ +
@@ -259,6 +264,7 @@
+
@@ -272,21 +278,21 @@
+
-
+
view more
-
+
view more
- @@ -299,8 +305,21 @@
+ +
+
+ + view more + +
+ +
+ + view more + +
@@ -315,6 +334,36 @@
+ + + +
+
+ + view more + +
+ +
+ + view more + +
+ + + + + + + + + + + +
Batch Code{{batchFees.BatchCode}}Batch Name{{batchFees.BatchName}}Payable Fees{{batchFees.PayableFees}}Paid Fees{{batchFees.PaidFees}}Balance Fees{{batchFees.PayableFees-batchFees.PaidFees}}
+
+ +
From 6d34903943188bfc3d55d003a06b609454f48eef Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 21 Aug 2018 14:22:18 +0530 Subject: [PATCH 14/18] added new log --- Apollo/assets/images/logo.png | Bin 4107 -> 4167 bytes 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 Apollo/assets/images/logo.png diff --git a/Apollo/assets/images/logo.png b/Apollo/assets/images/logo.png old mode 100755 new mode 100644 index 95ad2fde6d58918f7a7083b5943e5411f75f4b19..b518ade7d81a5a2d322732bcd6fa88bece3724ef GIT binary patch literal 4167 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 HcR%r8qfy2% literal 4107 zcmV+m5cKbfP)=Ns$`cR}1QC^05DUukSVSqHxKI&MQ3M1x^;Qv{jroU2HS$w5FX-7n8b7o$tJG$$O8t z$AnCBPx6O%@Bg3kpZ%P>F=B)YDyX1>3M#0ef(k19-$6@Di$_LA#{5~cX6fu%pPHKL z!I;Y^w>0we^OuyDm#4k>;)@=R@KRAxF$rj%FkwQkMx#09;o)&ADk|z&LPEmYwzjq~ zTlh^)O@8U=>GSjQ^0bcZt3W|P!CZ8a;tZ}iC@CpPj*gDr9vT|@l&h=jDK9UtQ6QOch_ZEh`C3t>*emB|U^HHNl{fpmvTJG-dH^z<~`&3$5TCycNbLY;D z1Me#9boR<`2=H(TJ#;&RtH7Q;do<{@5+2@jadEkgZg2bh``K6s*ytG<8QF=THv$6#-<~*eV&mGiYmE%v+uQ42SXh`qgl>iQXBhKm)@?Ay zn_@(0>73Dr7?Egk+K9EawLZxGEC#zB5D@U^Y15`vHa9ni8m>8e_N-@SX69^U=)#cS zu-}j9tJv8+M{En60d_kE1Byly&& zkq^lJIK=k8zCJfww2F(1{c*I%QPMBdr%$gkogYpkZrZfTbM)xZ&%xVwiHV6To_z92 zoAT7x*Q0`vH*w4#utl0P`;G_-3ObI0zo3Ts&zm=I5(>CQDp+m}$5A5+goTCG<8?Rs z`}^IMb15k)=|td7c=#0taj};cb(rq05c9W$=Zq0anW<7As;jFbm2)tD ziswnt*O`5BXx)GVtZ)dC6xu;5`-J>F zSXePkfe?$0ja_63&lw}qjLa4zQXeAac+HwM!9?a~5fKshI>fXAXtmnseSCcS>GCwn zx#2P*^?HWXb^ew)voC#s7xn%VWIAa#65S&5`}_l>-<>>paxj(AeE31^V+{2NOSsM$ z5r=8SVQw5gd|0pW`1tq?BI$dC*4fRp383(Ypm~*yGI%*LTt-B`TAcD{{>C}8uK?-v z43T`vZUnAX%80n@TpJGQ7>UB|DCcLQC(<0Qqed((E!E-}m*`yIRL+q$7D3~`7+{Ls zOq&3PT8$(8G-b+^2<6;x8Ig{(liuPAyoB0bZ64@W52B+Rb}g0;4Wz@7zGwdLqi+9*wPvd)rBx$ zQZI*eONtSpaUDfoGdGyO#{ADj;CFb}%TuRLolOfqn6}9T^Q9BUVG^8@c!b{j8`$HA zgoK1}<=k)?k>+qGjoMdSCPdg?Z64?kj*?Elw`(yS=nE+NOS~qX!#Hz;s414aCotD= z_3Bll_Fpj~0w3bA*xaDr7E^cUL`6kKx3si)nesqQOvZD+#ki%;3Qaxlf{!m2E?hX+ zN#BV(HqICkIhKo4QWKrJWq0n}Iag}pUvT)p+FVR3jgsz@PEm62RcnJazsR-A{Q2|8 z8Pag3u`z``d-nKHL;CT)Zc`_*2exh7=1K~C7oq!(962(GzhJ?FIB9n9=saim3Jwmw z1pZ-1@u-EdG&bK8AT`eHOF0Ter(cmlI;}1gWx=F0Enl%|H_>Kw&^exzw9B>F0z*1? z!iWMed>Fw$r!G!)6qgj5F1!)xwT9;_Dk>u2?Vr^1a%XrVy5Gb(o^cd!&YU@(q|-l= z0nV3{lnlu{wg7&mNxM$NH`nSyA}R*&{|x0lW)I=~{CqNt*EwyJ5oy4>Ck9#(Rr~=^LD2rnz;@AA-LhpuLpF zO#8+gZ`iztsQ_*MTsq$C$at7eJA&(4yN%J))8kHNcti||Jo}T9k|O*1`Ybwto@MT_*&cqfgxa^*@l6jzQX zen`}Rjqs;9UYDAhs)N@!qBJfmE2{|Q+(!mEBXtLU-lYr7u|$)(P-MMC?Z3&|i_mx$ zXO!o7W(US@QE<0z-KxO}o|3ySqFhqsi$s<++{e(vXa&EltW4y&U+Nq9pAucarP*0Q zrpbi=ICPhgl9EzP`fR7)=#x$!{$Asp?ZBdj6e7?^ID3|(ipGHVQYZdS=NBu-bgWt! zd;?E&>^`3rKoJvA)-LvWo5=i{aSa9D!b5Ljj31>7rHT0)#%QRjstU42kL%Ph=shfr z4~qH-{7<22cA%FdhPc#d9~!PIa8Khjm#yK79z-98_&9udBKRc&o;o^~mT`ry^v+#I-f?_Rr8ivk-rZqzh3Hfq_-V}O<`V@!K{ zyTb+C7IbuUcu0-Fdvj^q%Ou?(XeP}<)QJ-(+-*}B3eP|PydR3y!n37e@d^8d3l}u- zq^+;7w}d-J^kE6Vp`pQ>ESN|slN%xB$Wua7Ih%+b?~E)esGx!hDyX1>3M#0ef(k0A zpn?i2sG!2|fV_HMSy}1LUyF}~4B_a}qwZ_gtnq&4nP*0tn{RDx)o8U^@7~_tA@^)| z@80dv)YLTU?AfzJ=3aT_70>hM&s)7$dgaO$mzQ6D+3Tg3Ub1-a(iu2%j7oAQwYURq6mhVSLMn?98goJd- zm^^v%t{F3CEXl~o&?F`%`b9@a>%VE>++8s-F`b;3C;R&#x_HWzDbezD0lY`#Nxa~P zhlf8rZ{EBh=4x5L54>*qJ9FmDl0%0Mxq<5!8ymYiE-tPlDk|#Hfwu^D=H}+=zwtmp z0pK*U_kM5=PMtbc=4QxTQBhGO{Ix)DKX{$Y=b3wbqp+|rG$|=*J9G~q+wQEata@{DWybGQ@_A;e~eEL@^X3d)A6(1izUt~{DPZyaw^YiodFO#LF zrmjX$kEW%ib;FcRxBLdbDkmprA^e4Pc6PczBNe*s(C9`d z`xy-d1qFItl$Ms(Aj?GP-3Q%+?0JYi?lx;g5TC>wv==X4)K*nhg|WDSbCn=#!@|P! zuO{;Qg?sL~NB?Z>z<~pvix)4R3XX;m*wfP!k&=>fztFgR`Enpp;EvJ~_wC!Ke-i!R zgAe*ZuN4QFj-s>(bAjXKwY9bW1N+ZmeWmC&Yhc-9k!Mw~Qh(mwf`hY^K`7==Addqbnq@Z77f zzUl@OA$a<9d2mbA>_zG2(A7?uFu~{>iJ+jMV1#LHZ*TX-fgUu+BY35(YZx3=lRlBA(?7ldYtTF2)9;uZ;O-5rh<` zCFL3^%hlCY3(fn$i}3gNUuKR+j8W&~<0GHCtv4L-XY?`@3a|F_^V@B@&ezwsMvMsG zMn7eOSQ z%IgP)bBYmBs3&Xow6wGsH6tkB73PZ&d=qum>I+U}jAWc`t+_dKk%*##q5Ht`WoTG)oKV+)c4lfsys=!G6Xm#}p+}!j=l;0TtVHC6C;K76Xy;iSY9l2!55=vWz59#<2DW*WdBXVQcty^dGc{jp) zV8o{uE?lTn&TZMUB?jY$!M7hNe$a>~PMnZbdl)0?8x;PYM9vWTO>Iqvr(;CtX*njH zu4KMLWS3*Wbc$q0b$1?2r+O zj&_7>r|z_qw%YL4xzbc%L~o2ZN7gXEmb9~xO{($O7KjbLkHe-Kj5GKp>y8~eJn6>j zsBi1QTSu3+6@}!8_i^kEzRrXNZ|cMB0VQbQr<#2m5wr#+-iOffGDqb5bKE2^OR;_( z4blTER;-9Lm8ZVG-WPsaWF7m}vVS|u3Kj$KyGfCiy48-;%r;O^JoKAIRvc}Me4|M^ z9gGx8$sBah0$2;*ih0+0)|xBv3&G6;x0`1r=0KL51Oi{{e~!1+^1xC%*sy002ov JPDHLkV1mOl2l)U1 From a732e0c9dd3c50b754eb85553293c12ebed9c529 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 21 Aug 2018 15:23:51 +0530 Subject: [PATCH 15/18] dashboard changes --- Apollo/assets/views/dashboard.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Apollo/assets/views/dashboard.html b/Apollo/assets/views/dashboard.html index 411bd88e..6e35d5ad 100755 --- a/Apollo/assets/views/dashboard.html +++ b/Apollo/assets/views/dashboard.html @@ -309,13 +309,13 @@
-
+
view more
-
+
view more @@ -338,13 +338,13 @@
-
+
view more
-
+
view more From e4d9536bb450c4c84f6ae1970540a7a7456b4f82 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 21 Aug 2018 15:38:23 +0530 Subject: [PATCH 16/18] excelname --- .../js/controllers/newreg_reportCtrl.js | 65 +++++++++++++++---- 1 file changed, 54 insertions(+), 11 deletions(-) diff --git a/Apollo/assets/js/controllers/newreg_reportCtrl.js b/Apollo/assets/js/controllers/newreg_reportCtrl.js index 4430940c..d193bc8b 100644 --- a/Apollo/assets/js/controllers/newreg_reportCtrl.js +++ b/Apollo/assets/js/controllers/newreg_reportCtrl.js @@ -85,6 +85,8 @@ $scope.newreglist=''; $scope.isLoaderShow =''; $scope.load = ''; $scope.isShow= ''; +$scope.fromd=''; +$scope.tod=''; $scope.getDetails = function (form,myModel) { // alert('in') @@ -92,9 +94,44 @@ $scope.isShow= ''; //console.log(form.$dirty); var from = $scope.filters.from_date; var to = $scope.filters.to_date; - var university = myModel.myUnivSearch + var university = myModel.myUnivSearch ; // console.log(from) + + + + +var f = new Date(from), +month = '' + (f.getMonth() + 1), +day = '' + f.getDate(), +year = f.getFullYear(); + +if (month.length < 2) month = '0' + month; +if (day.length < 2) day = '0' + day; + +var from_dt = [day, month ,year].join('-'); + + + +var t = new Date(to), +month = '' + (t.getMonth() + 1), +day = '' + t.getDate(), +year = t.getFullYear(); + +if (month.length < 2) month = '0' + month; +if (day.length < 2) day = '0' + day; + +var to_dt = [day, month ,year].join('-'); + + +$scope.fromd = from_dt; +$scope.tod = to_dt; + + + + + + var getstudentdetails = { method: 'POST', @@ -136,12 +173,23 @@ $scope.isShow= ''; - var mystyle = { - sheetid: 'New Registration List', + + + + + $scope.exportData = function () + { + //alert() + + $scope.sam = 'New-Registration List from '+$scope.fromd+' to '+$scope.tod; + + + var mystyle = { + sheetid:$scope.sam, headers: true, caption: { - title:'New Registration List', - width: '500px', + title: $scope.sam, + width: '1000px', style:'font-size:50px;bold:true' }, // style:'background:#00FF00', @@ -150,12 +198,7 @@ $scope.isShow= ''; }, }; - - - - $scope.exportData = function () - { - //alert() + console.log(mystyle); From 16f16bbebaa9c352b2271cc1d8130e957f47340f Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 21 Aug 2018 16:40:02 +0530 Subject: [PATCH 17/18] newregisterreport --- Apollo/api/application/models/Reports_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 2ec17b71..a2f44e14 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -879,7 +879,7 @@ JOIN T_StudentDetails ON T_StudentDetails.StudentID=T_Student_CourseDetails.Stud JOIN T_UniversityMaster ON T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID JOIN T_CourseMaster ON T_CourseMaster.CourseID=T_Student_CourseDetails.CourseID left JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_CourseDetails.CourseID and T_Registration_Details.StudentID=T_Student_CourseDetails.StudentID 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=? and T_Student_CourseDetails.UniversityID=?'; +WHERE T_Registration_Details.RegistrationType = ? and str_to_date(DOJ,?)>=? and str_to_date(DOJ,?)<=? and T_Registration_Details.RegistrationMode=? and T_Student_CourseDetails.UniversityID=? group by T_Registration_Details.StudentID'; $query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1',$university)); From 91011bf63b72c5d1fc41002783fdb9ff17c4e5a3 Mon Sep 17 00:00:00 2001 From: sriramv Date: Tue, 21 Aug 2018 16:46:45 +0530 Subject: [PATCH 18/18] reregister PDF Change --- .../assets/js/controllers/feesStatusCtrl.js | 270 ++++++++++-------- .../reregistration/reregistrationformpdf.html | 34 ++- 2 files changed, 166 insertions(+), 138 deletions(-) diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index becec604..99e94d3b 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -2323,7 +2323,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout", //testing for print $scope.printPdf = function (print) { - + var innerContents = document.getElementById(print).innerHTML; var popupWinindow = window.open('', '_blank', 'width=1200,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no'); @@ -2565,148 +2565,168 @@ $scope.open = function(coursefiltered,Subjects,sem){ }); }; $scope.generatePDF = function(){ - var sem = "Sem/Year:"+$scope.sem; + var innerContents = document.getElementById("reregisterform").innerHTML; + + var popupWinindow = window.open('', '_blank', 'width=1200,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no'); + popupWinindow.document.open(); + popupWinindow.document.write(''); + popupWinindow.document.write(''); + popupWinindow.document.write(innerContents); + popupWinindow.document.write('
'); + popupWinindow.document.write('
'); + popupWinindow.document.write('
'); + popupWinindow.document.write('
'); + //popupWinindow.document.write(innerContents); + popupWinindow.document.write(''); + popupWinindow.document.close(); + popupWinindow.focus(); + popupWinindow.print(); + popupWinindow.close(); + // var sem = "Sem/Year:"+$scope.sem; - var universityaddress = encodeURIComponent($scope.Course.Address).replace(/[%2C %20]/g,' '); - $scope.universityAddress = universityaddress.replace(" "," ");; - $scope.universitydetails = "Mobile: "+$scope.Course.UnivMobileNumber+",E-mail id:"+$scope.Course.EmailID; - $scope.Enroll = "Enrolment No: "; - $scope.courseDetails = "Course Name: "+$scope.Course.CourseName+" specialization: "+$scope.Course.Specilization +sem + // var universityaddress = encodeURIComponent($scope.Course.Address).replace(/[%2C %20]/g,' '); + // $scope.universityAddress = universityaddress.replace(" "," ");; + // $scope.universitydetails = "Mobile: "+$scope.Course.UnivMobileNumber+",E-mail id:"+$scope.Course.EmailID; + // $scope.Enroll = "Enrolment No: "; + // $scope.courseDetails = "Course Name: "+$scope.Course.CourseName+" specialization: "+$scope.Course.Specilization +sem - $scope.StudentName = "Name of the Candidate: "+$scope.Course.Firstname +' '+ $scope.Course.Lastname; - $scope.StudentFatername = "Father's Name: "+$scope.Course.Fathername; - $scope.StudentMotherName = "Mother's Name: "+$scope.Course.MotherName; - //var str = $scope.Student.PresentAddress; + // $scope.StudentName = "Name of the Candidate: "+$scope.Course.Firstname +' '+ $scope.Course.Lastname; + // $scope.StudentFatername = "Father's Name: "+$scope.Course.Fathername; + // $scope.StudentMotherName = "Mother's Name: "+$scope.Course.MotherName; + // //var str = $scope.Student.PresentAddress; - var str = encodeURIComponent($scope.Course.PermanentAddress).replace(/[%2C %20 %0A]/g,' '); + // var str = encodeURIComponent($scope.Course.PermanentAddress).replace(/[%2C %20 %0A]/g,' '); - // str.replace("%0A"," "); - // str.replace("%20"," "); - // str.replace("%2C"," "); - $scope.StudnetAddress = "Address: "+ str.replace(" "," "); - $scope.StudentPin = "Pincode: .................. Mobile No: "+$scope.Course.MobileNumber+" Email ID: "+$scope.Course.EmailID; + // // str.replace("%0A"," "); + // // str.replace("%20"," "); + // // str.replace("%2C"," "); + // $scope.StudnetAddress = "Address: "+ str.replace(" "," "); + // $scope.StudentPin = "Pincode: .................. Mobile No: "+$scope.Course.MobileNumber+" Email ID: "+$scope.Course.EmailID; - // var sem1 = doc.autoTableHtmlToJson(document.getElementById(subject)); - var universityname = $scope.Course.UniversityName; - var universityCap = universityname.toUpperCase(); - var doc = new jsPDF('A4'); - var img = document.getElementById("logo"); - var canvas = document.createElement("canvas"); - canvas.width = 100; - canvas.height = 100; - var ctx = canvas.getContext("2d"); - ctx.drawImage(img, 0, 0,100,100); - var dataURL = canvas.toDataURL("image/png"); + // // var sem1 = doc.autoTableHtmlToJson(document.getElementById(subject)); + // var universityname = $scope.Course.UniversityName; + // var universityCap = universityname.toUpperCase(); + // var doc = new jsPDF('A4'); + // var img = document.getElementById("logo"); + // var canvas = document.createElement("canvas"); + // canvas.width = 100; + // canvas.height = 100; + // var ctx = canvas.getContext("2d"); + // ctx.drawImage(img, 0, 0,100,100); + // var dataURL = canvas.toDataURL("image/png"); - doc.rect(10, 10, 190, 280); + // doc.rect(10, 10, 190, 280); - doc.text(70, 20, universityCap); - doc.text(80, 26,$scope.universityAddress); - doc.addImage(dataURL, 'jpeg', 50, 13, 10, 10); - doc.setFontSize(14); - doc.text(70,32,"RE-REGISTRATION FORM"); - doc.setFontSize(12); + // doc.text(70, 20, universityCap); + // doc.text(80, 26,$scope.universityAddress); + // doc.addImage(dataURL, 'jpeg', 50, 13, 10, 10); + // doc.setFontSize(14); + // doc.text(70,32,"RE-REGISTRATION FORM"); + // doc.setFontSize(12); - doc.text(40,42,$scope.universitydetails); - doc.setFontSize(10); - doc.setFontSize(10); - var formdetails = "The form should be complete in all respects and to be filled by student in English CAPITAL letters in blue /black ink."; - var details = doc.splitTextToSize(formdetails,200); - doc.text(15,50,details); + // doc.text(40,42,$scope.universitydetails); + // doc.setFontSize(10); + // doc.setFontSize(10); + // var formdetails = "The form should be complete in all respects and to be filled by student in English CAPITAL letters in blue /black ink."; + // var details = doc.splitTextToSize(formdetails,200); + // doc.text(15,50,details); - doc.setFontSize(12); - doc.line(10, 45, 200, 45); - var col = 45; - var EnLen = $scope.Course.EnrollmentID.length; - //console.log(EnLen); - var k = 0; - if(EnLen !=0){ - while( k<= EnLen-1){ - //console.log(k); + // doc.setFontSize(12); + // doc.line(10, 45, 200, 45); + // var col = 45; + // var EnLen = $scope.Course.EnrollmentID.length; + // //console.log(EnLen); + // var k = 0; + // if(EnLen !=0){ + // while( k<= EnLen-1){ + // //console.log(k); - doc.text(15,60,$scope.Enroll);doc.rect(col,57,5,5); - col = col+1; - doc.text(col,61,$scope.Course.EnrollmentID[k]); - col = parseInt(col)+4; - k++; - } - }else{ - doc.text(15,60,$scope.Enroll); doc.rect(45,55,5,5);doc.rect(50,55,5,5);doc.rect(55,55,5,5);doc.rect(60,55,5,5);doc.rect(65,55,5,5);doc.rect(70,55,5,5);doc.rect(75,55,5,5);doc.rect(80,55,5,5);doc.rect(85,55,5,5);doc.rect(90,55,5,5);doc.rect(95,55,5,5);doc.rect(100,55,5,5);doc.rect(105,55,5,5);doc.rect(110,55,5,5);doc.rect(115,55,5,5);doc.rect(120,55,5,5);doc.rect(125,55,5,5); - // doc.text(46,59,$scope.Student.EnrollmentID[0]);doc.text(51,59,$scope.Student.EnrollmentID[1]);doc.text(56,59,$scope.Student.EnrollmentID[2]);doc.text(61,59,$scope.Student.EnrollmentID[3]);doc.text(66,59,$scope.Student.EnrollmentID[4]); - // doc.text(71,59,$scope.Student.EnrollmentID[5]);doc.text(76,59,$scope.Student.EnrollmentID[6]);doc.text(81,59,$scope.Student.EnrollmentID[7]);doc.text(86,59,$scope.Student.EnrollmentID[8]);doc.text(91,59,$scope.Student.EnrollmentID[9]); - // doc.text(96,59,$scope.Student.EnrollmentID[10]);doc.text(101,59,$scope.Student.EnrollmentID[11]);doc.text(106,59,$scope.Student.EnrollmentID[12]); - // //doc.text(111,59,$scope.Student.EnrollmentID[13]);doc.text(116,59,$scope.Student.EnrollmentID[14]);doc.text(121,59,$scope.Student.EnrollmentID[15]); - } - doc.setFontSize(10); - doc.text(15,70,$scope.courseDetails); - doc.setFontSize(12); - doc.text(15,80,"Examination Session: January ");doc.rect(73,77,5,5);doc.text(80,80,"June");doc.rect(90,77,5,5);doc.text(100,80,"Semester Mode");doc.rect(131,77,5,5);doc.text(140,80,"Yearly Mode");doc.rect(165,77,5,5); - // doc.autoTable(sem1.columns, sem1.data, {margin: {top: 100},theme:'grid'}); + // doc.text(15,60,$scope.Enroll);doc.rect(col,57,5,5); + // col = col+1; + // doc.text(col,61,$scope.Course.EnrollmentID[k]); + // col = parseInt(col)+4; + // k++; + // } + // }else{ + // doc.text(15,60,$scope.Enroll); doc.rect(45,55,5,5);doc.rect(50,55,5,5);doc.rect(55,55,5,5);doc.rect(60,55,5,5);doc.rect(65,55,5,5);doc.rect(70,55,5,5);doc.rect(75,55,5,5);doc.rect(80,55,5,5);doc.rect(85,55,5,5);doc.rect(90,55,5,5);doc.rect(95,55,5,5);doc.rect(100,55,5,5);doc.rect(105,55,5,5);doc.rect(110,55,5,5);doc.rect(115,55,5,5);doc.rect(120,55,5,5);doc.rect(125,55,5,5); + // // doc.text(46,59,$scope.Student.EnrollmentID[0]);doc.text(51,59,$scope.Student.EnrollmentID[1]);doc.text(56,59,$scope.Student.EnrollmentID[2]);doc.text(61,59,$scope.Student.EnrollmentID[3]);doc.text(66,59,$scope.Student.EnrollmentID[4]); + // // doc.text(71,59,$scope.Student.EnrollmentID[5]);doc.text(76,59,$scope.Student.EnrollmentID[6]);doc.text(81,59,$scope.Student.EnrollmentID[7]);doc.text(86,59,$scope.Student.EnrollmentID[8]);doc.text(91,59,$scope.Student.EnrollmentID[9]); + // // doc.text(96,59,$scope.Student.EnrollmentID[10]);doc.text(101,59,$scope.Student.EnrollmentID[11]);doc.text(106,59,$scope.Student.EnrollmentID[12]); + // // //doc.text(111,59,$scope.Student.EnrollmentID[13]);doc.text(116,59,$scope.Student.EnrollmentID[14]);doc.text(121,59,$scope.Student.EnrollmentID[15]); + // } + // doc.setFontSize(10); + // doc.text(15,70,$scope.courseDetails); + // doc.setFontSize(12); + // doc.text(15,80,"Examination Session: January ");doc.rect(73,77,5,5);doc.text(80,80,"June");doc.rect(90,77,5,5);doc.text(100,80,"Semester Mode");doc.rect(131,77,5,5);doc.text(140,80,"Yearly Mode");doc.rect(165,77,5,5); + // // doc.autoTable(sem1.columns, sem1.data, {margin: {top: 100},theme:'grid'}); - doc.line(10, 83, 200, 83); - doc.text(15,88,$scope.StudentName); - doc.text(60,89,"......................................................................................................................"); - doc.text(15,95,$scope.StudentFatername); - doc.text(43,96,"...................................................................................................................................."); - doc.text(15,102,$scope.StudentMotherName); - doc.text(43,103,"...................................................................................................................................."); + // doc.line(10, 83, 200, 83); + // doc.text(15,88,$scope.StudentName); + // doc.text(60,89,"......................................................................................................................"); + // doc.text(15,95,$scope.StudentFatername); + // doc.text(43,96,"...................................................................................................................................."); + // doc.text(15,102,$scope.StudentMotherName); + // doc.text(43,103,"...................................................................................................................................."); - doc.text(15,110,$scope.StudnetAddress); - doc.text(30,111,"................................................................................................................................................"); - doc.text(15,121,$scope.StudentPin); - doc.text - doc.line(10, 125, 200,125); - doc.text(45,130,"SUBJECT / PAPER IN WHICH CANDIDATE APPEARING") - doc.line(10, 131, 200, 131); - doc.text(20,135,"SR.NO"); + // doc.text(15,110,$scope.StudnetAddress); + // doc.text(30,111,"................................................................................................................................................"); + // doc.text(15,121,$scope.StudentPin); + // doc.text + // doc.line(10, 125, 200,125); + // doc.text(45,130,"SUBJECT / PAPER IN WHICH CANDIDATE APPEARING") + // doc.line(10, 131, 200, 131); + // doc.text(20,135,"SR.NO"); - doc.text(60,135,"Subject Code"); - doc.text(110,135,"Subject/Paper Code"); - doc.line(10,137,200,137); - var row = 137; - var no = 1; - //console.log(); - angular.forEach($scope.Subject[0],function(subjectData,key){ - //for(var i=0;i<=$scope.Subject[key].length-1;i++){ - // console.log(subjectData); - doc.line(10,row,200,row); - no = no.toString(); - doc.text(20,row+5,no); - doc.text(65,row+5,subjectData.SubjectCode); - doc.setFontSize(10); - doc.text(100,row+5,subjectData.SubjectName); + // doc.text(60,135,"Subject Code"); + // doc.text(110,135,"Subject/Paper Code"); + // doc.line(10,137,200,137); + // var row = 137; + // var no = 1; + // //console.log(); + // angular.forEach($scope.Subject[0],function(subjectData,key){ + // //for(var i=0;i<=$scope.Subject[key].length-1;i++){ + // // console.log(subjectData); + // doc.line(10,row,200,row); + // no = no.toString(); + // doc.text(20,row+5,no); + // doc.text(65,row+5,subjectData.SubjectCode); + // doc.setFontSize(10); + // doc.text(100,row+5,subjectData.SubjectName); - row = row+6; - no = parseInt(no)+1; - doc.line(10,row,200,row); + // row = row+6; + // no = parseInt(no)+1; + // doc.line(10,row,200,row); - }); - var index = 14; - var len = index-$scope.Subject[0].length; - //console.log(len); - for(var j=0;j<=len;j++){ - if(no <=9){ - no = no.toString(); - doc.text(20,row+5,no); - }else{ - no = no.toString(); - doc.text(19,row+5,no); - } - // doc.text(75,row+5,"--"); - // doc.text(120,row+5,"--"); - row = row+6; + // }); + // var index = 14; + // var len = index-$scope.Subject[0].length; + // //console.log(len); + // for(var j=0;j<=len;j++){ + // if(no <=9){ + // no = no.toString(); + // doc.text(20,row+5,no); + // }else{ + // no = no.toString(); + // doc.text(19,row+5,no); + // } + // // doc.text(75,row+5,"--"); + // // doc.text(120,row+5,"--"); + // row = row+6; - no = parseInt(no)+1; - doc.line(10,row,200,row); - } - doc.line(10,240,200,240); - doc.text(15,250,"Fees Details: Cash / Cheque / DD"); - doc.text(15,260,"DD No / Cheque No ....................... Dated ............... Bank ...................."); - doc.text(15,270,"Amount ..................."); - doc.text(150,280,"Signature of Candidate"); + // no = parseInt(no)+1; + // doc.line(10,row,200,row); + // } + // doc.line(10,240,200,240); + // doc.text(15,250,"Fees Details: Cash / Cheque / DD"); + // doc.text(15,260,"DD No / Cheque No ....................... Dated ............... Bank ...................."); + // doc.text(15,270,"Amount ..................."); + // doc.text(150,280,"Signature of Candidate"); - doc.save($scope.Course.Firstname +'_'+ $scope.Course.Lastname+'_'+$scope.sem+'.pdf'); + // doc.save($scope.Course.Firstname +'_'+ $scope.Course.Lastname+'_'+$scope.sem+'.pdf'); } diff --git a/Apollo/assets/views/reregistration/reregistrationformpdf.html b/Apollo/assets/views/reregistration/reregistrationformpdf.html index 2b4692c5..1bf0516f 100755 --- a/Apollo/assets/views/reregistration/reregistrationformpdf.html +++ b/Apollo/assets/views/reregistration/reregistrationformpdf.html @@ -1,8 +1,9 @@ -
+ +
- +
@@ -57,7 +58,7 @@
- +
@@ -85,27 +86,30 @@

+
Name of the Cadidate:
+ - - - + + + - + + - - + + + - -
- + + + +
 SUBJECT / PAPER IN WHICH CANDIDATE APPEARING 
 SL.NO Subject Code Subject / Paper Code S.No Subject Code Subject / Paper Code
{{$index+1}}{{sub.SubjectCode}}{{$index+1}}{{sub.SubjectCode}} {{sub.SubjectName}}

 Fees Details: Cash / Cheque / DD

@@ -114,11 +118,15 @@

Signature of Candidate
+




-
\ No newline at end of file +
+