From b78f5c88d4d500eed3f46002ed3e733057a698f3 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 25 Sep 2018 12:07:18 +0530 Subject: [PATCH] Studymaterial report changes --- Apollo/api/application/models/Calltracking_model.php | 1 + Apollo/api/application/models/Reports_model.php | 8 +++++++- .../controllers/report_study_material_statusCtrl.js | 4 ++-- Apollo/assets/views/report_studymaterialstatus.html | 12 ++++++++---- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index c03f257a..925a2fd7 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -219,6 +219,7 @@ class Calltracking_model extends CI_Model { $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID'); $this->db->join(BRANCH.' as BR', 'BR.BranchCode = STB.BranchCode'); $this->db->where('ST.IsActive',$status); + $this->db->where('STB.IsActive',$status); $this->db->where('BR.IsActive',$status); if($userType== ADMIN){ $this->db->where('STB.BranchCode',$branchID); diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index e7d54cfd..53197f04 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -9,7 +9,7 @@ class Reports_model extends CI_Model { public function status($bat=null,$br=null,$u=null){ - $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(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,bal.balpayable as Balance_fee,ifnull(sfp.bdate,'-') as Initial_paid_date, ifnull(std.AlternateNumber,'-') as AlternateNumber,ifnull(std.address,'-') as address,cm.uid as univID + $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(bal.balpayable,0) as Balance_fee,ifnull(sfp.bdate,'-') as Initial_paid_date, ifnull(std.AlternateNumber,'-') as AlternateNumber,ifnull(std.address,'-') as address,cm.uid as univID,ifnull(apdate.appdate,'-') as appdate 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 @@ -36,6 +36,12 @@ order by CourseID) as cm (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,AlternateNumber,PresentAddress as address FROM T_StudentDetails where IsActive = 1) as std on std.sid=sms.sid left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.semyr=sms.sem +left join (SELECT rd.StudentID as sid,rd.CourseID as cid,max(if(list.ListName = 'SENT TO UNIVERSITY', afs.AppFormDate,'-')) as appdate,Sem_Year as sem +FROM T_Registration_Details rd +left join T_ApplicationFormStatus afs on afs.Registration_Details_ID=rd.ID +left join T_PickListDetails list on list.ListCode=afs.ListCode +left join T_Course_Fees_Details cf on cf.ID=rd.FeeType +group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=sms.sem where sms.branch = '".$br."' "; diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index c44e5c88..5baa4742 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -161,7 +161,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentId,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem as SemYear,University,Status as StudyMaterial_Status,Date,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentId,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem as SemYear,University,CAST(Balance_fee AS NUMBER) as BalanceFee,Date,Status as StudyMaterial_Status INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]); }; @@ -297,7 +297,7 @@ $scope.exportExcel= function () { submit: function (form, myModel,loading,selectedStudents) { var comments = []; for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ - comments [stuid] ="Call Tracking For Study Material Status Report"; + comments [stuid] ="Call Tracking For Study Material Status Report - Sem:"+selectedStudents[stuid].Sem + " - Study Material Status:" +selectedStudents[stuid].Status + " - Balance Fee:" +selectedStudents[stuid].Balance_fee; } if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; diff --git a/Apollo/assets/views/report_studymaterialstatus.html b/Apollo/assets/views/report_studymaterialstatus.html index 0ccfd92b..09f46ce0 100755 --- a/Apollo/assets/views/report_studymaterialstatus.html +++ b/Apollo/assets/views/report_studymaterialstatus.html @@ -92,9 +92,11 @@ Course Sem/Year University + Balance Fee + Application Send to Univ Date Study Material Status Date - Balance Fee + @@ -108,11 +110,13 @@ {{p.Student_name}} {{p.Father_name}} {{p.Course_name}} - {{p.Sem_year}}({{p.Sem}}) + {{p.Sem}} {{p.University}} + {{p.Balance_fee || '0'}} + {{p.appdate}} {{p.Status}} - {{p.Date}} - {{p.Balance_fee}} + {{p.Date}} +