From ec9e181f6a3cfa1021d76da55134b5829f0824e9 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 24 May 2018 19:28:41 +0530 Subject: [PATCH] Excel export and balance bug fixed in all reports --- Apollo/api/application/controllers/Report.php | 7 +- .../api/application/models/Reports_model.php | 192 +++++++----------- .../js/controllers/report_ans_bookletCtrl.js | 150 +++++++++++++- .../js/controllers/report_app_pendingCtrl.js | 152 +++++++++++++- .../js/controllers/report_balfeeCtrl.js | 157 +++++++++++++- .../js/controllers/report_certificateCtrl.js | 149 +++++++++++++- .../js/controllers/report_doc_pendingCtrl.js | 150 +++++++++++++- .../js/controllers/report_examfeeCtrl.js | 152 +++++++++++++- .../js/controllers/report_expenseCtrl.js | 11 +- .../report_markcard_certificateCtrl.js | 150 +++++++++++++- .../controllers/report_markcard_statusCtrl.js | 149 +++++++++++++- .../report_study_material_statusCtrl.js | 152 +++++++++++++- .../controllers/report_waiver_referalCtrl.js | 148 +++++++++++++- .../assets/views/report_answer_booklets.html | 21 +- .../views/report_application_pending.html | 21 +- Apollo/assets/views/report_balance_fee.html | 27 +-- .../views/report_certificate_status.html | 23 +-- .../assets/views/report_document_pending.html | 21 +- .../assets/views/report_exam_writing_fee.html | 21 +- Apollo/assets/views/report_expense.html | 2 +- .../views/report_mark_certificate_status.html | 23 +-- .../assets/views/report_markcardstatus.html | 21 +- .../views/report_studymaterialstatus.html | 23 +-- .../assets/views/report_waiver_referal.html | 24 +-- 24 files changed, 1648 insertions(+), 298 deletions(-) diff --git a/Apollo/api/application/controllers/Report.php b/Apollo/api/application/controllers/Report.php index b922ea59..fd0be293 100755 --- a/Apollo/api/application/controllers/Report.php +++ b/Apollo/api/application/controllers/Report.php @@ -141,7 +141,8 @@ class Report extends REST_Controller { $from = $this->post('from'); $to = $this->post('to'); - $getStatus = $this->report_model->expense($from,$to); + $br = $this->post('branch'); + $getStatus = $this->report_model->expense($from,$to,$br); //print_r($getStatus); if ($getStatus) { @@ -312,8 +313,8 @@ class Report extends REST_Controller { } public function filters_post() { - - $getStatus = $this->report_model->filters(); + $br = $this->post('branch'); + $getStatus = $this->report_model->filters($br); //print_r($getStatus); if ($getStatus) { diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index f37feaf5..5476a093 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -8,9 +8,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); class Reports_model extends CI_Model { public function status($bat=null,$br=null,$u=null){ - - $sql = "select @s:=@s+1 SL_NO,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(sms.branch,'-') as Branch,ifnull(sms.date,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_Code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.Status,'-') as Status,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(sfp.bdate,'-') as Initial_paid_date - from (SELECT @s:= 0) AS s, + + $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(sms.branch,'-') as Branch,ifnull(sms.date,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_Code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.Status,'-') as Status,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(sfp.bdate,'-') as Initial_paid_date + from (SELECT ID,StudentID as sid,CourseID as cid,ListCode as lcode,BranchCode as branch,SDate as date,Sem as sem FROM T_StudyMaterialStatus where ID in (SELECT max(ID) FROM T_StudyMaterialStatus group by StudentID,CourseID,BranchCode,Sem) group by sid,sem,cid,branch) as sms left join @@ -35,13 +35,9 @@ order by CourseID) as cm left join (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father 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 and scd.branch=sms.branch - where sms.sid != 'null' + where sms.branch = '".$br."' "; - if ($br!= ''){ - - $sql.=" and sms.branch = '".$br."'"; - - } + if ($bat!= ''){ $sql.=" and sfs.batch = '".$bat."'"; @@ -53,7 +49,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } $sql.=" group by Student_id,Course_id,Branch,Batch_code,Sem"; - $sql.=" order by SL_NO"; + $leadDet=$this->db->query($sql); $statusDetails = $leadDet->result(); if (count($statusDetails) > 0) { @@ -67,9 +63,9 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen return $results; } - public function filters(){ - $sql = "SELECT BatchCode as batch_code,BatchName as batch FROM T_BatchMaster - group by batch;"; + public function filters($br){ + $sql = "SELECT distinct BatchCode as batchcode,BatchName as batch FROM T_BatchMaster +where BranchCode = '".$br."'"; $b=$this->db->query($sql); $batch = $b->result(); if (count($batch) > 0) { @@ -79,17 +75,9 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen $results['batchlist'] = false; $results['message'] = 'No record found'; } - $sql = "SELECT BranchCode as brcode,BranchName as branch FROM T_BranchMaster"; - $b=$this->db->query($sql); - $batch = $b->result(); - if (count($batch) > 0) { - $results['branchlist'] = true; - $results['branch'] = $batch; - } else { - $results['branchlist'] = false; - $results['message'] = 'No record found'; - } - $sql = "SELECT UniversityID as uid,UniversityName as university FROM T_UniversityMaster"; + + $sql = "SELECT distinct UniversityID as uid,UniversityName as university FROM T_UniversityMaster + where BranchCode = '".$br."'"; $b=$this->db->query($sql); $batch = $b->result(); if (count($batch) > 0) { @@ -104,8 +92,8 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function markcard($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 SL_NO,ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(sfs.rollno,'-') as Roll_NO,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(sms.cdate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Initial_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_Fee - from (SELECT @s:= 0) AS s, + $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(sfs.rollno,'-') as Roll_NO,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(sms.cdate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Initial_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_Fee + from (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,CertificationType as ctype,CDate as cdate,Sem as sem FROM T_CertificationStatus WHERE ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem) group by sid,sem,cid,lcode,branch) as sms @@ -131,25 +119,21 @@ order by CourseID) as cm left join (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch - where std.active = 1 + where std.active = 1 and sms.branch = '".$br."' "; - if ($br!= ''){ - - $sql.=" and sms.branch = '".$br."'"; - - } + if ($bat!= ''){ - $sql.=" and b.bcode = '".$bat."'"; + $sql.=" and sfs.batch = '".$bat."'"; } if ($u!= ''){ - $sql.=" and u.uid = '".$u."'"; + $sql.=" and cm.uid = '".$u."'"; } $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem"; - $sql.=" order by SL_NO"; + $leadDet=$this->db->query($sql); $mstatusDetails = $leadDet->result(); if (count($mstatusDetails) > 0) { @@ -165,8 +149,8 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function certificate_status($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 SL_NO,ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(sms.certname,'-') as Certificate_name,ifnull(std.father,'-') as Father,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sms.adate,'-') as Date,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(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee - from (SELECT @s:= 0) AS s, + $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(sms.certname,'-') as Certificate_name,ifnull(std.father,'-') as Father,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sms.adate,'-') as Date,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(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee + from (SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname FROM T_ApplicationStatus as app left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType where CertificationType != 'CERT024' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode) @@ -193,16 +177,12 @@ order by CourseID) as cm left join (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch - where std.active = 1 + where std.active = 1 and sms.branch = '".$br."' "; - if ($br!= ''){ - - $sql.=" and sms.branch = '".$br."'"; - - } + if ($bat!= ''){ - $sql.=" and b.bcode = '".$bat."'"; + $sql.=" and sfs.batch = '".$bat."'"; } if ($u!= ''){ @@ -211,7 +191,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } $sql.=" group by Student_id,Course_id,Batch_code,Branch_code"; - $sql.=" order by SL_NO"; + $leadDet=$this->db->query($sql); $cert_statusDetails = $leadDet->result(); if (count($cert_statusDetails) > 0) { @@ -227,8 +207,8 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){ - $sql = "select @s:=@s+1 SL_NO,ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sfp.bamount),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments - from (SELECT @s:= 0) AS s, + $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sfp.bamount),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments + from (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode, CertificationType as ctype,CDate as mdate,Sem as sem,Comments as mcmts FROM T_CertificationStatus @@ -269,16 +249,12 @@ left join left join (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch - where std.active = 1 + where std.active = 1 and sms.branch = '".$br."' "; - if ($br!= ''){ - - $sql.=" and sms.branch = '".$br."'"; - - } + if ($bat!= ''){ - $sql.=" and b.bcode = '".$bat."'"; + $sql.=" and sfs.batch = '".$bat."'"; } if ($u!= ''){ @@ -286,16 +262,17 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen $sql.=" and cm.uid = '".$u."'"; } - if ($from and $to != ''){ - $fromd= date("Y-m-d",strtotime($from)); - $tod=date("Y-m-d",strtotime($to)); - + if ($from != '' and $to != ''){ + $fromd= date("d-m-Y",strtotime($from)); + $tod=date("d-m-Y",strtotime($to)); + $sql.="and sfp.bdate >= '".$fromd."' and sfp.bdate <= '".$tod."'"; } + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem"; - $sql.=" order by SL_NO"; + $leadDet=$this->db->query($sql); $mcert_statusDetails = $leadDet->result(); @@ -310,11 +287,11 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen return $results; } - public function expense($from=null,$to=null){ + public function expense($from=null,$to=null,$br=null){ - $sql = "SELECT ifnull(dbm.Date,'-') as date,ifnull(exp.TypeName,'-') as Expense_name,ifnull(sum(dbm.Amount),0) as Amount FROM T_Income_Outcome_Master exp + $sql = "SELECT ifnull(dbm.Date,'-') as date,ifnull(exp.TypeName,'-') as Expense_name,ifnull(sum(dbm.Amount),0) as Amount FROM (SELECT @s:= 0) AS s,T_Income_Outcome_Master exp join T_DayBookMaster dbm on dbm.Type=exp.ID - where dbm.Name = 'I001' and dbm.Status = 'Approved' + where dbm.Name = 'I001' and dbm.Status = 'Approved' and exp.BranchCode = '".$br."' "; if ($from and $to != ''){ @@ -343,8 +320,8 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function answer_booklet($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 SL_NO,ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status - from (SELECT @s:= 0) AS s, + $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status + from (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,AnsDate as adate,Sem as sem FROM T_AnswerBookletStatus WHERE ID IN (SELECT max(ID) FROM T_AnswerBookletStatus group by StudentID,CourseID,BranchCode,Sem) @@ -374,17 +351,12 @@ left join left join (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch - where std.active = 1 + where std.active = 1 and sms.branch = '".$br."' "; - if ($br!= ''){ - - $sql.=" and sms.branch = '".$br."'"; - - } if ($bat!= ''){ - $sql.=" and b.bcode = '".$bat."'"; + $sql.=" and sfs.batch = '".$bat."'"; } if ($u!= ''){ @@ -393,7 +365,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem"; - $sql.=" order by SL_NO"; + $leadDet=$this->db->query($sql); @@ -411,8 +383,8 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function app_pending($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 SL_NO,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(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Admission_date - from (SELECT @s:= 0) AS s, + $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(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Admission_date + from (SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname FROM T_ApplicationStatus as app left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType where CertificateName = 'APPLICATION' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode) @@ -442,17 +414,12 @@ left join left join (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch - where std.active = 1 + where std.active = 1 and sms.branch = '".$br."' "; - if ($br!= ''){ - - $sql.=" and sms.branch = '".$br."'"; - - } if ($bat!= ''){ - $sql.=" and b.bcode = '".$bat."'"; + $sql.=" and sfs.batch = '".$bat."'"; } if ($u!= ''){ @@ -461,7 +428,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } $sql.=" group by Student_id,Course_id,Batch_code,Branch_code"; - $sql.=" order by SL_NO"; + $leadDet=$this->db->query($sql); @@ -479,8 +446,8 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function doc_pending($bat=null,$br=null,$u=null){ - $sql = "SELECT @s:=@s+1 SL_NO,ifnull(sdt.StudentID,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(sfb.bdate,'-') as Admission_date,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(lt.CreatedBranch,'-') as Branch_code,ifnull(sfb.batch,'-') as Batch_code,ifnull(lt.Course,'-') as Course_name,ifnull(lt.University,'-') as University,ifnull(uc.cid,'-') as Course_id,ifnull(cfd.syear,'-') as Sem_year,ifnull(sdt.StatusName,'-') as Status - FROM (SELECT @s:= 0) AS s,T_Student_DocumentTrack_Details as sdt + $sql = "SELECT ifnull(sdt.StudentID,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(sfb.bdate,'-') as Admission_date,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(lt.CreatedBranch,'-') as Branch_code,ifnull(sfb.batch,'-') as Batch_code,ifnull(lt.Course,'-') as Course_name,ifnull(lt.University,'-') as University,ifnull(uc.cid,'-') as Course_id,ifnull(cfd.syear,'-') as Sem_year,ifnull(sdt.StatusName,'-') as Status + FROM T_Student_DocumentTrack_Details as sdt join T_Lead_Tracking as lt on lt.PendingDocStatus=sdt.ID left join (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sdt.StudentID @@ -502,15 +469,10 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen group by sid,fid,cid,batch) as sfs on sfs.fid=sfp.fid and sfs.sid=sfp.sid group by sfs.sid,sfs.cid) as sfb on sfb.sid=sdt.StudentID and sfb.cid=uc.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=sdt.StudentID and scd.cid=uc.cid and scd.branch=uc.branch - where std.active = 1 + where std.active = 1 and lt.CreatedBranch = '".$br."' "; - - if ($br!= ''){ - $sql.=" and lt.CreatedBranch = '".$br."'"; - - } if ($bat!= ''){ $sql.=" and sfb.batch = '".$bat."'"; @@ -522,7 +484,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } $sql.="group by Student_id,Course_id,Batch_code,Branch_code "; - $sql.=" order by SL_NO"; + $leadDet=$this->db->query($sql); @@ -540,8 +502,8 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function wav_ref($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 SL_NO,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(scd.branch,'-') as Branch_code,ifnull(sfs.cid,'-') as Course_id,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.waiver_bill,'-') as Waiver_bill,ifnull(sms.waiver,0) as Waiver_amount,ifnull(sms.referal_bill,'-') as Referal_bill,ifnull(sms.referal,0) as Referal_amount,ifnull(sms.cmts,'-') as Comments - from (SELECT @s:= 0) AS s, + $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(scd.branch,'-') as Branch_code,ifnull(sfs.cid,'-') as Course_id,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.waiver_bill,'-') as Waiver_bill,ifnull(sms.waiver,0) as Waiver_amount,ifnull(sms.referal_bill,'-') as Referal_bill,ifnull(sms.referal,0) as Referal_amount,ifnull(sms.cmts,'-') as Comments + from (SELECT StudentID as sid,CommentsForStudent as cmts,FeesId as fid, IF(ModeOfPayment = 'WAIVER', BillNO,'-') AS waiver_bill, IF(ModeOfPayment = 'WAIVER', sum(BillAmount), 0) AS waiver, @@ -566,18 +528,13 @@ left join as cm on cm.cid=cfd.ccid left join (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid - where std.active = 1 + where std.active = 1 and scd.branch = '".$br."' "; - - if ($br!= ''){ - $sql.=" and scd.branch = '".$br."'"; - - } if ($bat!= ''){ - $sql.=" and b.bcode = '".$bat."'"; + $sql.=" and sfs.batch = '".$bat."'"; } if ($u!= ''){ @@ -586,7 +543,7 @@ left join } $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Waiver_bill,Referal_bill"; - $sql.=" order by SL_NO"; + $leadDet=$this->db->query($sql); @@ -604,8 +561,8 @@ left join } public function examfee($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 SL_NO,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 - from (SELECT @s:= 0) AS s, + $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 + 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 @@ -626,18 +583,13 @@ left join as cm on cm.cid=cfd.ccid left join (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid - where std.active = 1 + where std.active = 1 and sms.branch = '".$br."' "; - - if ($br!= ''){ - $sql.=" and sms.branch = '".$br."'"; - - } if ($bat!= ''){ - $sql.=" and b.bcode = '".$bat."'"; + $sql.=" and sfs.batch = '".$bat."'"; } if ($u!= ''){ @@ -646,7 +598,7 @@ left join } $sql.=" group by Student_id,Course_id,Batch_code,Branch_code"; - $sql.=" order by SL_NO"; + $leadDet=$this->db->query($sql); @@ -664,7 +616,7 @@ left join } public function balfee($bat=null,$br=null,$u=null){ - $sql = "SELECT @s:=@s+1 SL_NO,ifnull(sfp.StudentID,'-') as Student_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.cid,'-') as Course_id,ifnull(cm.course,'-') as Course_name,ifnull(u.uname,'-') as University,ifnull(sfs.branch,'-') as Branch_code,ifnull(cfd.syear,'-') as Sem_year,ifnull((sfs.cf + sfs.stf + sfs.others),0) as Total,ifnull((sfb.bamount),0) as Paid_fee,ifnull(((sfs.cf + sfs.stf + sfs.others) - (sfb.bamount)),0) as balance, + $sql = "SELECT ifnull(sfp.StudentID,'-') as Student_id,ifnull(scd.eid,'-') as eid,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.cid,'-') as Course_id,ifnull(cm.course,'-') as Course_name,ifnull(u.uname,'-') as University,ifnull(sfs.branch,'-') as Branch_code,ifnull(cfd.syear,'-') as Sem_year,ifnull((sfs.cf + sfs.stf + sfs.others),0) as Total,ifnull((sfb.bamount),0) as Paid_fee,ifnull(((sfs.cf + sfs.stf + sfs.others) - (sfb.bamount)),0) as balance, ifnull(MAX(CASE WHEN Installment = 1 THEN sfp.BillNO END),'-') as billno1, ifnull(MAX(CASE WHEN Installment = 1 THEN sfp.BillAmount END),0) as billamt1, ifnull(MAX(CASE WHEN Installment = 2 THEN sfp.BillNO END),'-') as billno2, @@ -685,7 +637,7 @@ left join ifnull(MAX(CASE WHEN Installment = 9 THEN sfp.BillAmount END),0) as billamt9, ifnull(MAX(CASE WHEN Installment = 10 THEN sfp.BillNO END),'-') as billno10, ifnull(MAX(CASE WHEN Installment = 10 THEN sfp.BillAmount END),0) as billamt10 - FROM (SELECT @s:= 0) AS s,T_Students_Fees_PaidDetails as sfp + FROM T_Students_Fees_PaidDetails as sfp left join (SELECT FeesID as fid,BatchCode as batch,BranchCode as branch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others,Comments as cmts FROM T_Students_Fees_Status group by fid,sid,batch,branch) as sfs on sfs.fid=sfp.FeesID and sfs.sid=sfp.StudentID left join @@ -704,20 +656,16 @@ left join left join (SELECT BranchCode as brcode,BranchName as bname FROM T_BranchMaster) as br on br.brcode=sfp.UpdatedBy left join - (SELECT StudentID as sid,FeesID as fid,BillNo as billno,sum(BillAmount) as bamount FROM T_Students_Fees_PaidDetails + (SELECT StudentID as sid,FeesID as fid,BillNo as billno,sum(BillAmount) as bamount FROM T_Students_Fees_PaidDetails where IsActive = 1 group by sid,fid) as sfb on sfb.sid=sfp.StudentID and sfb.fid=sfp.FeesID - where sfp.IsActive = 1 +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=sfs.sid and scd.cid=sfs.cid and scd.branch=sfs.branch + where sfp.IsActive = 1 and br.brcode = '".$br."' "; - if ($br!= ''){ - - $sql.=" and br.brcode = '".$br."'"; - - } if ($bat!= ''){ - $sql.=" and b.bcode = '".$bat."'"; + $sql.=" and sfs.batch = '".$bat."'"; } if ($u!= ''){ @@ -726,7 +674,7 @@ left join } $sql.=" group by Student_id,Batch_code,Course_id,Branch_code"; - $sql.=" order by SL_NO"; + $leadDet=$this->db->query($sql); diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index ec6379e9..9b7e6c97 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -20,6 +20,10 @@ app.controller('report_ans_bookletCtrl', ["$scope", "API_POINTS", "$http", "Swee url: apiPoint.url + 'report_filters/', headers: { 'Content-Type': 'application/json' + }, + data: { + branch : JSON.parse(localStorage.getItem('localObj')).localBranchID + } }; @@ -45,7 +49,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "API_POINTS", "$http", "Swee 'Content-Type': 'application/json' }, data: { - branch: $scope.filters.branch, + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, university: $scope.filters.university, batch: $scope.filters.batch @@ -56,6 +60,8 @@ app.controller('report_ans_bookletCtrl', ["$scope", "API_POINTS", "$http", "Swee $http(response_data).then(function (response) { if (response.data.ans_bookletList == true) { $scope.ans_book_data = response.data.ans_book_data; + for(var i=0;i<$scope.ans_book_data.length;i++) + $scope.ans_book_data[i].SL_NO = i+1; } else { $scope.message = response.data.message; @@ -84,6 +90,148 @@ app.controller('report_ans_bookletCtrl', ["$scope", "API_POINTS", "$http", "Swee $scope.exportData = function () { alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,Date as Date,Sem_year as SemYear,Sem as Sem,Course_name as CourseName,University as University,Status as Status INTO XLS("Answer_booklet_status.xls",?) FROM ?',[mystyle,$scope.ans_book_data]); }; + +/*modal controller + * */ + app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) { + //Tooltip for print button + $scope.dynamicTooltip = 'Student View'; + + + + // $scope.items = ['item1', 'item2', 'item3']; + + $scope.open = function (studentDetails) { + + + // get student view details + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: studentDetails.Phone_number, + requestedFrom: 3, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus == true) { + $scope.courseEditLoading = false; + // $scope.studentDetails = response.data.studentDetails; + $scope.studentDetails = response.data; + // $scope.courseDetails = response.data.courseDetails; + var modalInstance = $modal.open({ + templateUrl: 'assets/views/student/studentDetailsModal.html', + controller: 'ModalInstanceCtrl', + // size: size, + resolve: { + items: function () { + return $scope.studentDetails; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + + } else { + swal("Failed!", "This student is not registerd", "warning"); + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + + }; + $scope.open1 = function (values,type) { + + var modalInstance1 = $modal.open({ + templateUrl: 'assets/views/student/studentPaymentModal.html', + controller: 'ModalInstanceCtrl1', + // size: size, + resolve: { + items1: function () { + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; + } + } + }); + + modalInstance1.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; + + $scope.printStudentDetails = function (details) { + $rootScope.pdfItems = details; + + var printInstance = $modal.open({ + templateUrl: 'assets/views/student/studentPdf.html', + controller: 'studentModalDemoCtrl', + }); + }; + + // generate pdf for student view + $scope.export = function(getName) { + kendo.drawing.drawDOM($("#exportthis")).then(function(group) { + kendo.drawing.pdf.saveAs(group, getName+".pdf"); + }); + } + + +}]); + +// Please note that $modalInstance represents a modal window (instance) dependency. +// It is not the same as the $modal service used above. + +app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "WordsService", function ($scope, $modalInstance, items, WordsService) { + + $scope.items = items; + $scope.selected = { + item: $scope.items[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "WordsService", function ($scope, $modalInstance, items1, WordsService) { + + $scope.items1 = items1.values; + $scope.selectedtype = items1.type; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); + }]); diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index c497807b..9de3b30d 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -20,6 +20,10 @@ app.controller('report_app_pendingCtrl', ["$scope", "API_POINTS", "$http", "Swee url: apiPoint.url + 'report_filters/', headers: { 'Content-Type': 'application/json' + }, + data: { + branch : JSON.parse(localStorage.getItem('localObj')).localBranchID + } }; @@ -45,7 +49,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "API_POINTS", "$http", "Swee 'Content-Type': 'application/json' }, data: { - branch: $scope.filters.branch, + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, university: $scope.filters.university, batch: $scope.filters.batch @@ -56,6 +60,8 @@ app.controller('report_app_pendingCtrl', ["$scope", "API_POINTS", "$http", "Swee $http(response_data).then(function (response) { if (response.data.app_pendingList == true) { $scope.app_pending_data = response.data.app_pending_data; + for(var i=0;i<$scope.app_pending_data.length;i++) + $scope.app_pending_data[i].SL_NO = i+1; } else { $scope.message = response.data.message; @@ -84,6 +90,150 @@ app.controller('report_app_pendingCtrl', ["$scope", "API_POINTS", "$http", "Swee $scope.exportData = function () { alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,Sem_year as SemYear,Course_name as CourseName,University as University,Status as Status,Admission_date as AdmissionDate INTO XLS("Application_pending_student_list.xls",?) FROM ?',[mystyle,$scope.app_pending_data]); }; + + +/*modal controller + * */ + app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) { + //Tooltip for print button + $scope.dynamicTooltip = 'Student View'; + + + + // $scope.items = ['item1', 'item2', 'item3']; + + $scope.open = function (studentDetails) { + + + // get student view details + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: studentDetails.Phone_number, + requestedFrom: 3, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus == true) { + $scope.courseEditLoading = false; + // $scope.studentDetails = response.data.studentDetails; + $scope.studentDetails = response.data; + // $scope.courseDetails = response.data.courseDetails; + var modalInstance = $modal.open({ + templateUrl: 'assets/views/student/studentDetailsModal.html', + controller: 'ModalInstanceCtrl', + // size: size, + resolve: { + items: function () { + return $scope.studentDetails; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + + } else { + swal("Failed!", "This student is not registerd", "warning"); + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + + }; + $scope.open1 = function (values,type) { + + var modalInstance1 = $modal.open({ + templateUrl: 'assets/views/student/studentPaymentModal.html', + controller: 'ModalInstanceCtrl1', + // size: size, + resolve: { + items1: function () { + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; + } + } + }); + + modalInstance1.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; + + $scope.printStudentDetails = function (details) { + $rootScope.pdfItems = details; + + var printInstance = $modal.open({ + templateUrl: 'assets/views/student/studentPdf.html', + controller: 'studentModalDemoCtrl', + }); + }; + + // generate pdf for student view + $scope.export = function(getName) { + kendo.drawing.drawDOM($("#exportthis")).then(function(group) { + kendo.drawing.pdf.saveAs(group, getName+".pdf"); + }); + } + + +}]); + +// Please note that $modalInstance represents a modal window (instance) dependency. +// It is not the same as the $modal service used above. + +app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "WordsService", function ($scope, $modalInstance, items, WordsService) { + + $scope.items = items; + $scope.selected = { + item: $scope.items[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "WordsService", function ($scope, $modalInstance, items1, WordsService) { + + $scope.items1 = items1.values; + $scope.selectedtype = items1.type; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); + + }]); diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index c90e5781..e3de5fc5 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -4,6 +4,9 @@ app.controller('report_balfeeCtrl', ["$scope", "API_POINTS", "$http", "SweetAler function ($scope, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window) { // to generate serial number + $scope.currentPage=1; + $scope.itemsPerPage=10; + // $scope.serial = 1; // $scope.itemPerPage=10 // $scope.indexCount = function(newPageNumber){ @@ -25,6 +28,10 @@ app.controller('report_balfeeCtrl', ["$scope", "API_POINTS", "$http", "SweetAler url: apiPoint.url + 'report_filters/', headers: { 'Content-Type': 'application/json' + }, + data: { + branch : JSON.parse(localStorage.getItem('localObj')).localBranchID + } }; @@ -50,7 +57,7 @@ app.controller('report_balfeeCtrl', ["$scope", "API_POINTS", "$http", "SweetAler 'Content-Type': 'application/json' }, data: { - branch: $scope.filters.branch, + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, university: $scope.filters.university, batch: $scope.filters.batch @@ -61,6 +68,8 @@ app.controller('report_balfeeCtrl', ["$scope", "API_POINTS", "$http", "SweetAler $http(response_data).then(function (response) { if (response.data.balfeeList == true) { $scope.balfee_data = response.data.balfee_data; + for(var i=0;i<$scope.balfee_data.length;i++) + $scope.balfee_data[i].SL_NO = i+1; } else { $scope.message = response.data.message; @@ -69,6 +78,8 @@ app.controller('report_balfeeCtrl', ["$scope", "API_POINTS", "$http", "SweetAler }); } + + //Export to excel var mystyle = { sheetid: 'BALANCE FEE STATUS REPORT', headers: true, @@ -87,9 +98,151 @@ app.controller('report_balfeeCtrl', ["$scope", "API_POINTS", "$http", "SweetAler $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,Course_name as CourseName,University as University,Sem_year as SemYear,CAST(Total AS NUMBER) as Total,CAST(Paid_fee AS NUMBER) as PaidFee,CAST(balance AS NUMBER) as Balance,billno1 as BillNO1,CAST(billamt1 AS NUMBER) as BillAmount1,billno2 as BillNO2,CAST(billamt2 AS NUMBER) as BillAmount2, billno3 as BillNO3, CAST(billamt3 AS NUMBER) as BillAmount3, billno4 as BillNO4, CAST(billamt4 AS NUMBER) as BillAmount4, billno5 as BillNO5,CAST(billamt5 AS NUMBER) as BillAmount5,billno6 as BillNO6,CAST(billamt6 AS NUMBER) as BillAmount6,billno7 as BillNo7,CAST(billamt7 AS NUMBER)as BillAmount7,billno8 as BillNO8,CAST(billamt8 AS NUMBER) as BillAmount8,billno9 as BillNO9,CAST(billamt9 AS NUMBER) as BillAmount9,billno10 as BillNO10,CAST(billamt10 AS NUMBER) as BillAmount10 INTO XLS("Balancefee_status.xls",?) FROM ?',[mystyle,$scope.balfee_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,eid as EnrollmentID,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,Course_name as CourseName,University as University,Sem_year as SemYear,CAST(Total AS NUMBER) as Total,CAST(Paid_fee AS NUMBER) as PaidFee,CAST(balance AS NUMBER) as Balance,billno1 as BillNO1,CAST(billamt1 AS NUMBER) as BillAmount1,billno2 as BillNO2,CAST(billamt2 AS NUMBER) as BillAmount2, billno3 as BillNO3, CAST(billamt3 AS NUMBER) as BillAmount3, billno4 as BillNO4, CAST(billamt4 AS NUMBER) as BillAmount4, billno5 as BillNO5,CAST(billamt5 AS NUMBER) as BillAmount5,billno6 as BillNO6,CAST(billamt6 AS NUMBER) as BillAmount6,billno7 as BillNo7,CAST(billamt7 AS NUMBER)as BillAmount7,billno8 as BillNO8,CAST(billamt8 AS NUMBER) as BillAmount8,billno9 as BillNO9,CAST(billamt9 AS NUMBER) as BillAmount9,billno10 as BillNO10,CAST(billamt10 AS NUMBER) as BillAmount10 INTO XLS("Balancefee_status.xls",?) FROM ?',[mystyle,$scope.balfee_data]); }; + + + /*modal controller + * */ +app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) { + //Tooltip for print button + $scope.dynamicTooltip = 'Student View'; + + + + // $scope.items = ['item1', 'item2', 'item3']; + + $scope.open = function (studentDetails) { + + + // get student view details + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: studentDetails.Phone_number, + requestedFrom: 3, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus == true) { + $scope.courseEditLoading = false; + // $scope.studentDetails = response.data.studentDetails; + $scope.studentDetails = response.data; + // $scope.courseDetails = response.data.courseDetails; + var modalInstance = $modal.open({ + templateUrl: 'assets/views/student/studentDetailsModal.html', + controller: 'ModalInstanceCtrl', + // size: size, + resolve: { + items: function () { + return $scope.studentDetails; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + + } else { + swal("Failed!", "This student is not registerd", "warning"); + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + + }; + $scope.open1 = function (values,type) { + + var modalInstance1 = $modal.open({ + templateUrl: 'assets/views/student/studentPaymentModal.html', + controller: 'ModalInstanceCtrl1', + // size: size, + resolve: { + items1: function () { + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; + } + } + }); + + modalInstance1.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; + + $scope.printStudentDetails = function (details) { + $rootScope.pdfItems = details; + + var printInstance = $modal.open({ + templateUrl: 'assets/views/student/studentPdf.html', + controller: 'studentModalDemoCtrl', + }); + }; + + // generate pdf for student view + $scope.export = function(getName) { + kendo.drawing.drawDOM($("#exportthis")).then(function(group) { + kendo.drawing.pdf.saveAs(group, getName+".pdf"); + }); + } + + +}]); + +// Please note that $modalInstance represents a modal window (instance) dependency. +// It is not the same as the $modal service used above. + +app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "WordsService", function ($scope, $modalInstance, items, WordsService) { + + $scope.items = items; + $scope.selected = { + item: $scope.items[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "WordsService", function ($scope, $modalInstance, items1, WordsService) { + + $scope.items1 = items1.values; + $scope.selectedtype = items1.type; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); }]); diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index ce229a74..1574c896 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -19,6 +19,10 @@ app.controller('report_certificateCtrl', ["$scope", "API_POINTS", "$http", "Swee url: apiPoint.url + 'report_filters/', headers: { 'Content-Type': 'application/json' + }, + data: { + branch : JSON.parse(localStorage.getItem('localObj')).localBranchID + } }; @@ -44,7 +48,7 @@ app.controller('report_certificateCtrl', ["$scope", "API_POINTS", "$http", "Swee 'Content-Type': 'application/json' }, data: { - branch: $scope.filters.branch, + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, university: $scope.filters.university, batch: $scope.filters.batch } @@ -54,6 +58,8 @@ app.controller('report_certificateCtrl', ["$scope", "API_POINTS", "$http", "Swee $http(response_data).then(function (response) { if (response.data.certList == true) { $scope.cert_data = response.data.cert_data; + for(var i=0;i<$scope.cert_data.length;i++) + $scope.cert_data[i].SL_NO = i+1; } else { $scope.message = response.data.message; @@ -83,6 +89,147 @@ app.controller('report_certificateCtrl', ["$scope", "API_POINTS", "$http", "Swee alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Certificate_name as CertificateName,Father as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,Date as Date,Sem_year as SemYear,Course_name as CourseName,University as University,Status as Status,Document_fee_paid_date as DocumentFeePaidDate,CAST(Balance_fee AS NUMBER) as Balance INTO XLS("Certificate_status.xls",?) FROM ?',[mystyle,$scope.cert_data]); }; + /*modal controller + * */ + app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) { + //Tooltip for print button + $scope.dynamicTooltip = 'Student View'; + + + + // $scope.items = ['item1', 'item2', 'item3']; + + $scope.open = function (studentDetails) { + + + // get student view details + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: studentDetails.Phone_number, + requestedFrom: 3, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus == true) { + $scope.courseEditLoading = false; + // $scope.studentDetails = response.data.studentDetails; + $scope.studentDetails = response.data; + // $scope.courseDetails = response.data.courseDetails; + var modalInstance = $modal.open({ + templateUrl: 'assets/views/student/studentDetailsModal.html', + controller: 'ModalInstanceCtrl', + // size: size, + resolve: { + items: function () { + return $scope.studentDetails; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + + } else { + swal("Failed!", "This student is not registerd", "warning"); + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + + }; + $scope.open1 = function (values,type) { + + var modalInstance1 = $modal.open({ + templateUrl: 'assets/views/student/studentPaymentModal.html', + controller: 'ModalInstanceCtrl1', + // size: size, + resolve: { + items1: function () { + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; + } + } + }); + + modalInstance1.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; + + $scope.printStudentDetails = function (details) { + $rootScope.pdfItems = details; + + var printInstance = $modal.open({ + templateUrl: 'assets/views/student/studentPdf.html', + controller: 'studentModalDemoCtrl', + }); + }; + + // generate pdf for student view + $scope.export = function(getName) { + kendo.drawing.drawDOM($("#exportthis")).then(function(group) { + kendo.drawing.pdf.saveAs(group, getName+".pdf"); + }); + } + + +}]); + +// Please note that $modalInstance represents a modal window (instance) dependency. +// It is not the same as the $modal service used above. + +app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "WordsService", function ($scope, $modalInstance, items, WordsService) { + + $scope.items = items; + $scope.selected = { + item: $scope.items[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "WordsService", function ($scope, $modalInstance, items1, WordsService) { + + $scope.items1 = items1.values; + $scope.selectedtype = items1.type; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); + }]); diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index 378b0e89..0a6b8432 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -20,6 +20,10 @@ app.controller('report_doc_pendingCtrl', ["$scope", "API_POINTS", "$http", "Swee url: apiPoint.url + 'report_filters/', headers: { 'Content-Type': 'application/json' + }, + data: { + branch : JSON.parse(localStorage.getItem('localObj')).localBranchID + } }; @@ -45,7 +49,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "API_POINTS", "$http", "Swee 'Content-Type': 'application/json' }, data: { - branch: $scope.filters.branch, + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, university: $scope.filters.university, batch: $scope.filters.batch @@ -56,6 +60,8 @@ app.controller('report_doc_pendingCtrl', ["$scope", "API_POINTS", "$http", "Swee $http(response_data).then(function (response) { if (response.data.doc_pendingList == true) { $scope.doc_pending_data = response.data.doc_pending_data; + for(var i=0;i<$scope.doc_pending_data.length;i++) + $scope.doc_pending_data[i].SL_NO = i+1; } else { $scope.message = response.data.message; @@ -84,6 +90,148 @@ app.controller('report_doc_pendingCtrl', ["$scope", "API_POINTS", "$http", "Swee $scope.exportData = function () { alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Admission_date as AdmissionDate,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,Course_name as CourseName,University as University,Sem_year as SemYear,Status as Status INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]); }; +/*modal controller + * */ + app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) { + //Tooltip for print button + $scope.dynamicTooltip = 'Student View'; + + + + // $scope.items = ['item1', 'item2', 'item3']; + + $scope.open = function (studentDetails) { + + + // get student view details + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: studentDetails.Phone_number, + requestedFrom: 3, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus == true) { + $scope.courseEditLoading = false; + // $scope.studentDetails = response.data.studentDetails; + $scope.studentDetails = response.data; + // $scope.courseDetails = response.data.courseDetails; + var modalInstance = $modal.open({ + templateUrl: 'assets/views/student/studentDetailsModal.html', + controller: 'ModalInstanceCtrl', + // size: size, + resolve: { + items: function () { + return $scope.studentDetails; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + + } else { + swal("Failed!", "This student is not registerd", "warning"); + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + + }; + $scope.open1 = function (values,type) { + + var modalInstance1 = $modal.open({ + templateUrl: 'assets/views/student/studentPaymentModal.html', + controller: 'ModalInstanceCtrl1', + // size: size, + resolve: { + items1: function () { + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; + } + } + }); + + modalInstance1.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; + + $scope.printStudentDetails = function (details) { + $rootScope.pdfItems = details; + + var printInstance = $modal.open({ + templateUrl: 'assets/views/student/studentPdf.html', + controller: 'studentModalDemoCtrl', + }); + }; + + // generate pdf for student view + $scope.export = function(getName) { + kendo.drawing.drawDOM($("#exportthis")).then(function(group) { + kendo.drawing.pdf.saveAs(group, getName+".pdf"); + }); + } + + +}]); + +// Please note that $modalInstance represents a modal window (instance) dependency. +// It is not the same as the $modal service used above. + +app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "WordsService", function ($scope, $modalInstance, items, WordsService) { + + $scope.items = items; + $scope.selected = { + item: $scope.items[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "WordsService", function ($scope, $modalInstance, items1, WordsService) { + + $scope.items1 = items1.values; + $scope.selectedtype = items1.type; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); + + }]); diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index e8c22103..6e62c641 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -20,6 +20,10 @@ app.controller('report_examfeeCtrl', ["$scope", "API_POINTS", "$http", "SweetAle url: apiPoint.url + 'report_filters/', headers: { 'Content-Type': 'application/json' + }, + data: { + branch : JSON.parse(localStorage.getItem('localObj')).localBranchID + } }; @@ -45,7 +49,7 @@ app.controller('report_examfeeCtrl', ["$scope", "API_POINTS", "$http", "SweetAle 'Content-Type': 'application/json' }, data: { - branch: $scope.filters.branch, + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, university: $scope.filters.university, batch: $scope.filters.batch @@ -56,6 +60,8 @@ app.controller('report_examfeeCtrl', ["$scope", "API_POINTS", "$http", "SweetAle $http(response_data).then(function (response) { if (response.data.examfeeList == true) { $scope.examfee_data = response.data.examfee_data; + for(var i=0;i<$scope.examfee_data.length;i++) + $scope.examfee_data[i].SL_NO = i+1; } else { $scope.message = response.data.message; @@ -97,6 +103,150 @@ app.controller('report_examfeeCtrl', ["$scope", "API_POINTS", "$http", "SweetAle $scope.exportData = function () { alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,Sem_year as SemYear,Course_name as CourseName,University as University,CAST(Amount AS NUMBER) as Amount,Comments as Comments INTO XLS("Exam_writing_fee_report.xls",?) FROM ?',[mystyle,$scope.examfee_data]); }; +/*modal controller + * */ + app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) { + //Tooltip for print button + $scope.dynamicTooltip = 'Student View'; + + + + // $scope.items = ['item1', 'item2', 'item3']; + + $scope.open = function (studentDetails) { + + + // get student view details + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: studentDetails.Phone_number, + requestedFrom: 3, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus == true) { + $scope.courseEditLoading = false; + // $scope.studentDetails = response.data.studentDetails; + $scope.studentDetails = response.data; + // $scope.courseDetails = response.data.courseDetails; + var modalInstance = $modal.open({ + templateUrl: 'assets/views/student/studentDetailsModal.html', + controller: 'ModalInstanceCtrl', + // size: size, + resolve: { + items: function () { + return $scope.studentDetails; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + + } else { + swal("Failed!", "This student is not registerd", "warning"); + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + + }; + $scope.open1 = function (values,type) { + + var modalInstance1 = $modal.open({ + templateUrl: 'assets/views/student/studentPaymentModal.html', + controller: 'ModalInstanceCtrl1', + // size: size, + resolve: { + items1: function () { + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; + } + } + }); + + modalInstance1.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; + + $scope.printStudentDetails = function (details) { + $rootScope.pdfItems = details; + + var printInstance = $modal.open({ + templateUrl: 'assets/views/student/studentPdf.html', + controller: 'studentModalDemoCtrl', + }); + }; + + // generate pdf for student view + $scope.export = function(getName) { + kendo.drawing.drawDOM($("#exportthis")).then(function(group) { + kendo.drawing.pdf.saveAs(group, getName+".pdf"); + }); + } + + +}]); + +// Please note that $modalInstance represents a modal window (instance) dependency. +// It is not the same as the $modal service used above. + +app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "WordsService", function ($scope, $modalInstance, items, WordsService) { + + $scope.items = items; + $scope.selected = { + item: $scope.items[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "WordsService", function ($scope, $modalInstance, items1, WordsService) { + + $scope.items1 = items1.values; + $scope.selectedtype = items1.type; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); + + + + }]); diff --git a/Apollo/assets/js/controllers/report_expenseCtrl.js b/Apollo/assets/js/controllers/report_expenseCtrl.js index fd1edf28..50712a5f 100755 --- a/Apollo/assets/js/controllers/report_expenseCtrl.js +++ b/Apollo/assets/js/controllers/report_expenseCtrl.js @@ -19,6 +19,10 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle url: apiPoint.url + 'report_filters/', headers: { 'Content-Type': 'application/json' + }, + data: { + branch : JSON.parse(localStorage.getItem('localObj')).localBranchID + } }; @@ -44,7 +48,7 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle 'Content-Type': 'application/json' }, data: { - + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, from : $scope.filters.from_date, to : $scope.filters.to_date } @@ -54,6 +58,9 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle $http(response_data).then(function (response) { if (response.data.expenseList == true) { $scope.expense_data = response.data.expense_data; + for(var i=0;i<$scope.expense_data.length;i++) + $scope.expense_data[i].SL_NO = i+1; + } else { $scope.message = response.data.message; @@ -81,7 +88,7 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle $scope.exportData = function () { - alasql('SELECT date as Date,Expense_name as ExpenseName,CAST(Amount as NUMBER) as Amount INTO XLS("Expense_report.xls",?) FROM ?',[mystyle,$scope.expense_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,date as Date,Expense_name as ExpenseName,CAST(Amount as NUMBER) as Amount INTO XLS("Expense_report.xls",?) FROM ?',[mystyle,$scope.expense_data]); }; }]); diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index 7d9fee05..a0332d04 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -21,6 +21,10 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "API_POINTS", "$htt url: apiPoint.url + 'report_filters/', headers: { 'Content-Type': 'application/json' + }, + data: { + branch : JSON.parse(localStorage.getItem('localObj')).localBranchID + } }; @@ -46,7 +50,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "API_POINTS", "$htt 'Content-Type': 'application/json' }, data: { - branch: $scope.filters.branch, + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, university: $scope.filters.university, batch: $scope.filters.batch, from : $scope.filters.from_date, @@ -58,6 +62,8 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "API_POINTS", "$htt $http(response_data).then(function (response) { if (response.data.mark_certList == true) { $scope.mark_cert_data = response.data.mark_cert_data; + for(var i=0;i<$scope.mark_cert_data.length;i++) + $scope.mark_cert_data[i].SL_NO = i+1; } else { $scope.message = response.data.message; @@ -86,6 +92,148 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "API_POINTS", "$htt $scope.exportData = function () { alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,course_name as CourseName,University as University,Document_fee_paid_date as DocumentFeePaidDate,CAST(Balance_fee AS NUMBER) as BalanceFee,Sem_year as SemYear,Sem as Sem,Markcard_status as MarkcardStatus,Markcard_date as MarkcardDate,Markcard_comments as MarkcardComments,Certificate_name as CertificateName,Certificate_status as CertificateStatus,Certificate_date as CertificateDate,Certificate_comments as CertificateComments INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]); }; +/*modal controller + * */ + app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) { + //Tooltip for print button + $scope.dynamicTooltip = 'Student View'; + + + + // $scope.items = ['item1', 'item2', 'item3']; + + $scope.open = function (studentDetails) { + + + // get student view details + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: studentDetails.Phone_number, + requestedFrom: 3, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus == true) { + $scope.courseEditLoading = false; + // $scope.studentDetails = response.data.studentDetails; + $scope.studentDetails = response.data; + // $scope.courseDetails = response.data.courseDetails; + var modalInstance = $modal.open({ + templateUrl: 'assets/views/student/studentDetailsModal.html', + controller: 'ModalInstanceCtrl', + // size: size, + resolve: { + items: function () { + return $scope.studentDetails; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + + } else { + swal("Failed!", "This student is not registerd", "warning"); + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + + }; + $scope.open1 = function (values,type) { + + var modalInstance1 = $modal.open({ + templateUrl: 'assets/views/student/studentPaymentModal.html', + controller: 'ModalInstanceCtrl1', + // size: size, + resolve: { + items1: function () { + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; + } + } + }); + + modalInstance1.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; + + $scope.printStudentDetails = function (details) { + $rootScope.pdfItems = details; + + var printInstance = $modal.open({ + templateUrl: 'assets/views/student/studentPdf.html', + controller: 'studentModalDemoCtrl', + }); + }; + + // generate pdf for student view + $scope.export = function(getName) { + kendo.drawing.drawDOM($("#exportthis")).then(function(group) { + kendo.drawing.pdf.saveAs(group, getName+".pdf"); + }); + } + + +}]); + +// Please note that $modalInstance represents a modal window (instance) dependency. +// It is not the same as the $modal service used above. + +app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "WordsService", function ($scope, $modalInstance, items, WordsService) { + + $scope.items = items; + $scope.selected = { + item: $scope.items[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "WordsService", function ($scope, $modalInstance, items1, WordsService) { + + $scope.items1 = items1.values; + $scope.selectedtype = items1.type; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); + + }]); diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index a40375f8..ee39251a 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -19,6 +19,10 @@ app.controller('report_markcard_statusCtrl', ["$scope", "API_POINTS", "$http", " url: apiPoint.url + 'report_filters/', headers: { 'Content-Type': 'application/json' + }, + data: { + branch : JSON.parse(localStorage.getItem('localObj')).localBranchID + } }; @@ -44,7 +48,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "API_POINTS", "$http", " 'Content-Type': 'application/json' }, data: { - branch: $scope.filters.branch, + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, university: $scope.filters.university, batch: $scope.filters.batch } @@ -54,6 +58,8 @@ app.controller('report_markcard_statusCtrl', ["$scope", "API_POINTS", "$http", " $http(response_data).then(function (response) { if (response.data.markcardList == true) { $scope.markcard_data = response.data.markcard_data; + for(var i=0;i<$scope.markcard_data.length;i++) + $scope.markcard_data[i].SL_NO = i+1; } else { $scope.message = response.data.message; @@ -82,7 +88,146 @@ app.controller('report_markcard_statusCtrl', ["$scope", "API_POINTS", "$http", " $scope.exportData = function () { alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Roll_NO as RollNO,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,Date as Date,Sem_year as SemYear,Sem as Sem,Course_name as CourseName,University as University,Status as Status,Initial_paid_date as InitialPaidDate,CAST(Balance_Fee AS NUMBER) as BalanceFee INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]); }; - + /*modal controller + * */ + app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) { + //Tooltip for print button + $scope.dynamicTooltip = 'Student View'; + + + + // $scope.items = ['item1', 'item2', 'item3']; + + $scope.open = function (studentDetails) { + + + // get student view details + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: studentDetails.Phone_number, + requestedFrom: 3, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus == true) { + $scope.courseEditLoading = false; + // $scope.studentDetails = response.data.studentDetails; + $scope.studentDetails = response.data; + // $scope.courseDetails = response.data.courseDetails; + var modalInstance = $modal.open({ + templateUrl: 'assets/views/student/studentDetailsModal.html', + controller: 'ModalInstanceCtrl', + // size: size, + resolve: { + items: function () { + return $scope.studentDetails; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + + } else { + swal("Failed!", "This student is not registerd", "warning"); + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + + }; + $scope.open1 = function (values,type) { + + var modalInstance1 = $modal.open({ + templateUrl: 'assets/views/student/studentPaymentModal.html', + controller: 'ModalInstanceCtrl1', + // size: size, + resolve: { + items1: function () { + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; + } + } + }); + + modalInstance1.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; + + $scope.printStudentDetails = function (details) { + $rootScope.pdfItems = details; + + var printInstance = $modal.open({ + templateUrl: 'assets/views/student/studentPdf.html', + controller: 'studentModalDemoCtrl', + }); + }; + + // generate pdf for student view + $scope.export = function(getName) { + kendo.drawing.drawDOM($("#exportthis")).then(function(group) { + kendo.drawing.pdf.saveAs(group, getName+".pdf"); + }); + } + + +}]); + +// Please note that $modalInstance represents a modal window (instance) dependency. +// It is not the same as the $modal service used above. + +app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "WordsService", function ($scope, $modalInstance, items, WordsService) { + + $scope.items = items; + $scope.selected = { + item: $scope.items[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "WordsService", function ($scope, $modalInstance, items1, WordsService) { + + $scope.items1 = items1.values; + $scope.selectedtype = items1.type; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index c77744cd..27d449d0 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -6,7 +6,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "API_POINTS", "$ht // DataTables configurable options - $scope.filters = { + $scope.filters = { "branch": "", "university": "", "batch": "", @@ -19,6 +19,10 @@ app.controller('report_study_material_statusCtrl', ["$scope", "API_POINTS", "$ht url: apiPoint.url + 'report_filters/', headers: { 'Content-Type': 'application/json' + }, + data: { + branch : JSON.parse(localStorage.getItem('localObj')).localBranchID + } }; @@ -44,7 +48,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "API_POINTS", "$ht 'Content-Type': 'application/json' }, data: { - branch : $scope.filters.branch, + branch : JSON.parse(localStorage.getItem('localObj')).localBranchID, university : $scope.filters.university, batch : $scope.filters.batch } @@ -54,6 +58,8 @@ app.controller('report_study_material_statusCtrl', ["$scope", "API_POINTS", "$ht $http(response_data).then(function (response) { if (response.data.statusList == true) { $scope.study_mat_data = response.data.statusr; + for(var i=0;i<$scope.study_mat_data.length;i++) + $scope.study_mat_data[i].SL_NO = i+1; } else { $scope.message = response.data.message; @@ -91,6 +97,148 @@ $scope.exportExcel= function () { FROM HTML("#data",{headers:true})'); } + /*modal controller + * */ + app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) { + //Tooltip for print button + $scope.dynamicTooltip = 'Student View'; + + + + // $scope.items = ['item1', 'item2', 'item3']; + + $scope.open = function (studentDetails) { + + + // get student view details + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: studentDetails.Phone_number, + requestedFrom: 3, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus == true) { + $scope.courseEditLoading = false; + // $scope.studentDetails = response.data.studentDetails; + $scope.studentDetails = response.data; + // $scope.courseDetails = response.data.courseDetails; + var modalInstance = $modal.open({ + templateUrl: 'assets/views/student/studentDetailsModal.html', + controller: 'ModalInstanceCtrl', + // size: size, + resolve: { + items: function () { + return $scope.studentDetails; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + + } else { + swal("Failed!", "This student is not registerd", "warning"); + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + + }; + $scope.open1 = function (values,type) { + + var modalInstance1 = $modal.open({ + templateUrl: 'assets/views/student/studentPaymentModal.html', + controller: 'ModalInstanceCtrl1', + // size: size, + resolve: { + items1: function () { + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; + } + } + }); + + modalInstance1.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; + + $scope.printStudentDetails = function (details) { + $rootScope.pdfItems = details; + + var printInstance = $modal.open({ + templateUrl: 'assets/views/student/studentPdf.html', + controller: 'studentModalDemoCtrl', + }); + }; + + // generate pdf for student view + $scope.export = function(getName) { + kendo.drawing.drawDOM($("#exportthis")).then(function(group) { + kendo.drawing.pdf.saveAs(group, getName+".pdf"); + }); + } + + +}]); + +// Please note that $modalInstance represents a modal window (instance) dependency. +// It is not the same as the $modal service used above. + +app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "WordsService", function ($scope, $modalInstance, items, WordsService) { + + $scope.items = items; + $scope.selected = { + item: $scope.items[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "WordsService", function ($scope, $modalInstance, items1, WordsService) { + + $scope.items1 = items1.values; + $scope.selectedtype = items1.type; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); + + }]); diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index f55dc086..45206748 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -20,6 +20,10 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S url: apiPoint.url + 'report_filters/', headers: { 'Content-Type': 'application/json' + }, + data: { + branch : JSON.parse(localStorage.getItem('localObj')).localBranchID + } }; @@ -46,7 +50,7 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S 'Content-Type': 'application/json' }, data: { - branch: $scope.filters.branch, + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, university: $scope.filters.university, batch: $scope.filters.batch @@ -57,7 +61,8 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S $http(response_data).then(function (response) { if (response.data.wav_refList == true) { $scope.waiver_referal_data = response.data.wav_ref_data; - + for(var i=0;i<$scope.waiver_referal_data.length;i++) + $scope.waiver_referal_data[i].SL_NO = i+1; } else { $scope.message = response.data.message; } @@ -99,7 +104,146 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S $scope.exportData = function () { alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,Sem_year as SemYear,Course_name as CourseName,University as University,Waiver_bill as WaiverBill,CAST(Waiver_amount AS NUMBER) as WaiverAmount,Referal_bill as ReferalBill,CAST(Referal_amount AS NUMBER) as ReferalAmount,Comments as Comments INTO XLS("Waiver_referal_report.xls",?) FROM ?',[mystyle,$scope.waiver_referal_data]); }; +/*modal controller + * */ + app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) { + //Tooltip for print button + $scope.dynamicTooltip = 'Student View'; + + + // $scope.items = ['item1', 'item2', 'item3']; + + $scope.open = function (studentDetails) { + + + // get student view details + var getcourse = { + method: 'POST', + url: apiPoint.url + 'getStudentBasicInfo/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: studentDetails.Phone_number, + requestedFrom: 3, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(getcourse).then(function (response) { + + if (response.data.status == 200 && response.data.studentStatus == true) { + $scope.courseEditLoading = false; + // $scope.studentDetails = response.data.studentDetails; + $scope.studentDetails = response.data; + // $scope.courseDetails = response.data.courseDetails; + var modalInstance = $modal.open({ + templateUrl: 'assets/views/student/studentDetailsModal.html', + controller: 'ModalInstanceCtrl', + // size: size, + resolve: { + items: function () { + return $scope.studentDetails; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + + } else { + swal("Failed!", "This student is not registerd", "warning"); + $scope.courseEditLoading = false; + $scope.studentDetails = ""; + $scope.courseDetails = ""; + + } + }); + + + }; + $scope.open1 = function (values,type) { + + var modalInstance1 = $modal.open({ + templateUrl: 'assets/views/student/studentPaymentModal.html', + controller: 'ModalInstanceCtrl1', + // size: size, + resolve: { + items1: function () { + var myvalues = + { + "values":values, + "type":type + }; + return myvalues; + } + } + }); + + modalInstance1.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + }; + + $scope.printStudentDetails = function (details) { + $rootScope.pdfItems = details; + + var printInstance = $modal.open({ + templateUrl: 'assets/views/student/studentPdf.html', + controller: 'studentModalDemoCtrl', + }); + }; + + // generate pdf for student view + $scope.export = function(getName) { + kendo.drawing.drawDOM($("#exportthis")).then(function(group) { + kendo.drawing.pdf.saveAs(group, getName+".pdf"); + }); + } + + +}]); + +// Please note that $modalInstance represents a modal window (instance) dependency. +// It is not the same as the $modal service used above. + +app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "WordsService", function ($scope, $modalInstance, items, WordsService) { + + $scope.items = items; + $scope.selected = { + item: $scope.items[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); +app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "WordsService", function ($scope, $modalInstance, items1, WordsService) { + + $scope.items1 = items1.values; + $scope.selectedtype = items1.type; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + + +}]); }]); diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html index 67bee5c3..1b945e9d 100755 --- a/Apollo/assets/views/report_answer_booklets.html +++ b/Apollo/assets/views/report_answer_booklets.html @@ -28,16 +28,7 @@
-
- - - -
+
@@ -79,7 +70,7 @@
- +
@@ -102,13 +93,13 @@ - + - + - + diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index 962217d1..a3153d39 100755 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -28,16 +28,7 @@
-
- - - -
+
@@ -79,7 +70,7 @@
-
{{$index + 1}}{{p.SL_NO}} {{p.Enrollment_id}}{{p.Student_id}}{{p.Student_name}} {{p.Father_name}} {{p.Course_name}} {{p.Sem_year}}({{p.Sem}}){{p.Phone_number}}{{p.Phone_number}} {{p.University}} {{p.Status}} {{p.Date}}
+
@@ -103,14 +94,14 @@ - + - + - + diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html index 74f95d9a..ba2a83a4 100755 --- a/Apollo/assets/views/report_balance_fee.html +++ b/Apollo/assets/views/report_balance_fee.html @@ -28,16 +28,7 @@
-
- - - -
+
@@ -81,7 +72,7 @@
-
{{$index + 1}}{{p.SL_NO}} {{p.Admission_date}} {{p.Enrollment_id}}{{p.Student_id}}{{p.Student_name}} {{p.Father_name}} {{p.Course_name}} {{p.Sem_year}}{{p.Phone_number}}{{p.Phone_number}} {{p.University}} {{p.Status}}
+
@@ -107,7 +98,7 @@ - + @@ -145,15 +136,15 @@ - + - - - + + + - + diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html index e266c70e..059e4055 100755 --- a/Apollo/assets/views/report_certificate_status.html +++ b/Apollo/assets/views/report_certificate_status.html @@ -28,16 +28,7 @@
-
- - - -
+
@@ -84,7 +75,7 @@
-
SL.NoStudent IDEnrollment ID Student Name Father Name Course
{{$index + 1}}{{p.Student_id}}{{p.Student_name}}{{p.SL_NO}}{{p.eid}}{{p.Student_name}} {{p.Father_name}} {{p.Course_name}} {{p.Sem_year}}{{p.Phone_number}}{{p.Phone_number}} {{p.University}} {{p.Total}} {{p.Paid_fee}}
+
@@ -109,14 +100,14 @@ - + - - + + - + diff --git a/Apollo/assets/views/report_document_pending.html b/Apollo/assets/views/report_document_pending.html index a1768c2f..f9a97a20 100755 --- a/Apollo/assets/views/report_document_pending.html +++ b/Apollo/assets/views/report_document_pending.html @@ -28,16 +28,7 @@
-
- - - -
+
@@ -79,7 +70,7 @@
-
{{$index + 1}}{{p.SL_NO}} {{p.Document_fee_paid_date}} {{p.Enrollment_id}}{{p.Student_name}}{{p.Father_name}}{{p.Student_name}}{{p.Father}} {{p.Course_name}} {{p.Sem_year}}{{p.Phone_number}}{{p.Phone_number}} {{p.University}} {{p.Balance_fee}} {{p.Certificate_name}}
+
@@ -103,14 +94,14 @@ - + - + - + diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html index e8f6c59d..5b6257de 100755 --- a/Apollo/assets/views/report_exam_writing_fee.html +++ b/Apollo/assets/views/report_exam_writing_fee.html @@ -28,16 +28,7 @@
-
- - - -
+
@@ -79,7 +70,7 @@
-
{{$index + 1}}{{p.SL_NO}} {{p.Admission_date}} {{p.Enrollment_id}}{{p.Student_name}}{{p.Student_name}} {{p.Father_name}} {{p.Course_name}} {{p.Sem_year}}{{p.Phone_number}}{{p.Phone_number}} {{p.University}} {{p.Status}}
+
@@ -109,13 +100,13 @@ - + - + - + diff --git a/Apollo/assets/views/report_expense.html b/Apollo/assets/views/report_expense.html index a721d938..284b2905 100755 --- a/Apollo/assets/views/report_expense.html +++ b/Apollo/assets/views/report_expense.html @@ -97,7 +97,7 @@ - + diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html index 86d70d48..2a003ada 100755 --- a/Apollo/assets/views/report_mark_certificate_status.html +++ b/Apollo/assets/views/report_mark_certificate_status.html @@ -28,16 +28,7 @@
-
- - - -
+
@@ -121,7 +112,7 @@
-
{{$index + 1}}{{p.SL_NO}} {{p.Enrollment_id}}{{p.Student_name}}{{p.Student_name}} {{p.Father_name}} {{p.Course_name}} {{p.Sem_year}}{{p.Phone_number}}{{p.Phone_number}} {{p.University}} {{p.Amount}} {{p.Comments}}
{{$index + 1}}{{p.SL_NO}} {{p.Expense_name}} {{p.Amount}}
+
@@ -150,14 +141,14 @@ - + - + - + - + diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html index d3cf4f23..bba19e3f 100755 --- a/Apollo/assets/views/report_markcardstatus.html +++ b/Apollo/assets/views/report_markcardstatus.html @@ -20,16 +20,7 @@
-
- - - -
+
@@ -112,14 +103,14 @@ - + - + - + diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html index b3a90be0..8284f0ee 100755 --- a/Apollo/assets/views/report_waiver_referal.html +++ b/Apollo/assets/views/report_waiver_referal.html @@ -26,16 +26,7 @@
-
- - - -
+
@@ -77,7 +68,7 @@
-
{{$index + 1}}{{p.SL_NO}} {{p.Document_fee_paid_date}} {{p.Enrollment_id}}{{p.Student_name}}{{p.Student_name}} {{p.Father_name}}{{p.Course_name}}{{p.course_name}} {{p.Sem_year}}{{p.Phone_number}}{{p.Phone_number}} {{p.University}} {{p.Balance_fee}} {{p.Markcard_status}}
{{$index + 1}}{{p.SL_NO}} {{p.Initial_paid_date}} {{p.Enrollment_id}}{{p.Student_name}}{{p.Student_name}} {{p.Father_name}} {{p.Course_name}} {{p.Sem_year}}({{p.Sem}}){{p.Phone_number}}{{p.Phone_number}} {{p.University}} {{p.Status}} {{p.Balance_fee}}
+
@@ -90,6 +81,7 @@ + @@ -103,6 +95,7 @@ + @@ -116,13 +109,14 @@ - + - + - + +
Sum of Waiver Fee Sum of Referal Fee Course Sem/Year Phone NoUniversity Waiver Bill No Waivers Amount Referal Bill No
{{$index + 1}}{{p.SL_NO}} {{p.Enrollment_id}}{{p.Student_name}}{{p.Student_name}} {{p.Father_name}} {{p.Course_name}} {{p.Sem_year}}{{p.Phone_number}}{{p.University}}{{p.Phone_number}} {{p.Waiver_bill}} {{p.Waiver_amount}} {{p.Referal_bill}}