From 45d9acb98959cf3208d34ef2037b8ab11e1ee8a5 Mon Sep 17 00:00:00 2001 From: sriramv Date: Fri, 29 Jun 2018 19:02:24 +0530 Subject: [PATCH 1/5] Auto Call Tracking :sriram --- Apollo/api/application/config/routes.php | 4 +- .../controllers/Call_Tracking_Controller.php | 92 ++++++ .../api/application/models/Reports_model.php | 42 +-- .../js/controllers/report_ans_bookletCtrl.js | 271 ++++++++++++++++- .../js/controllers/report_app_pendingCtrl.js | 268 ++++++++++++++++- .../js/controllers/report_balfeeCtrl.js | 272 +++++++++++++++++- .../js/controllers/report_certificateCtrl.js | 271 ++++++++++++++++- .../js/controllers/report_doc_pendingCtrl.js | 267 ++++++++++++++++- .../js/controllers/report_examfeeCtrl.js | 270 ++++++++++++++++- .../js/controllers/report_expenseCtrl.js | 2 +- .../report_markcard_certificateCtrl.js | 270 ++++++++++++++++- .../controllers/report_markcard_statusCtrl.js | 268 ++++++++++++++++- .../report_study_material_statusCtrl.js | 270 ++++++++++++++++- .../controllers/report_waiver_referalCtrl.js | 2 +- Apollo/assets/views/autoCalltracking.html | 266 +++++++++++++++++ .../assets/views/report_answer_booklets.html | 5 + .../views/report_application_pending.html | 5 + Apollo/assets/views/report_balance_fee.html | 5 + .../views/report_certificate_status.html | 5 + .../assets/views/report_document_pending.html | 5 + .../assets/views/report_exam_writing_fee.html | 5 + .../views/report_mark_certificate_status.html | 5 + .../assets/views/report_markcardstatus.html | 5 + .../views/report_studymaterialstatus.html | 5 + 24 files changed, 2830 insertions(+), 50 deletions(-) create mode 100644 Apollo/assets/views/autoCalltracking.html diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 63ead59e..160a050c 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -93,7 +93,9 @@ $route['getRecentLeadDetails'] = 'Call_Tracking_Controller/getRecentLeadDetails' $route['getRecentCloseDetails'] = 'Call_Tracking_Controller/getRecentCloseDetails'; $route['getRecentPendingDetails'] = 'Call_Tracking_Controller/getRecentPendingDetails'; $route['callAsImportantFlag'] = 'Call_Tracking_Controller/callAsImportantFlag'; - +// auto call track +$route['autoAddlead'] = 'Call_Tracking_Controller/autoAddlead'; +$route['autoTrackingDetails'] = 'Call_Tracking_Controller/autoTrackingDetails'; // university diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php index 391d5a6b..0a938390 100755 --- a/Apollo/api/application/controllers/Call_Tracking_Controller.php +++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php @@ -409,7 +409,99 @@ class Call_Tracking_Controller extends REST_Controller { } + /* + * Auto call tracking + * by sriram + */ + public function autoAddlead_post(){ + $student = $this->post('student'); + + if(!empty($student)){ + $now = new DateTime(); + $now->setTimezone(new DateTimezone('Asia/Kolkata')); + //store lead details + $Student_Id = ''; + foreach($student as $student){ + + if($Student_Id != $student['Student_id']){ + $lead_details['LeadName'] = $student['Student_name']; + $lead_details['MobileNumber'] = $student['Phone_number']; + $lead_details['IsNewEnquiry'] = 1; + $lead_details['CreatedBy'] = $this->post('createdBy'); + $lead_details['CreatedOn'] = $now->format('Y-m-d H:i:s'); + //store tracking details + $tracking_details['University'] = $student['University']; + $tracking_details['Course'] = $student['Course_name']; + $tracking_details['ActivityStatus'] = $this->post('activity'); + $tracking_details['AssignedTo'] = $this->post('assignedTo'); + $tracking_details['StatusCode'] = $this->post('status'); + $tracking_details['ReferredBy'] = $this->post('referedBy'); + $tracking_details['AlternateMobile'] = $student['AlternateNumber']; + $tracking_details['Address'] = $student['address']; + $tracking_details['CreatedBy'] = $this->post('createdBy'); + $tracking_details['CreatedOn'] = $now->format('Y-m-d H:i:s'); + $tracking_details['UpdatedOn'] = $now->format('Y-m-d H:i:s'); + $tracking_details['CreatedBranch'] = $this->post('branchId'); + //store tracking followup details + $tracking_followup_details['FollowupOn'] = $this->post('date'); + $tracking_followup_details['FollowupComments'] = $this->post('comments'); + $tracking_followup_details['CreatedBy'] = $this->post('createdBy'); + $tracking_followup_details['CreatedOn'] = $now->format('Y-m-d H:i:s'); + $tracking_followup_details['StatusName'] = $this->post('status'); + $tracking_followup_details['AssignedStaff'] = $this->post('assignedTo'); + //print_r(array($lead_details,$tracking_details,$tracking_followup_details)); + $leadDetails['leadDetails'] = $this->Calltracking_model->addleadDetails($lead_details,$tracking_details,$tracking_followup_details);// Check if the users data store contains users (in case the database result returns NULL) + } + + } + if (sizeof($leadDetails)>0) + { + $leadDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($leadDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'Something went wrong.please try again!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + } +} + +public function autoTrackingDetails_post(){ +// $student = $this->post('student'); +// if(!empty($student)){ +// foreach($student as $student){ +// $requestedBy = $this->post('requestedBy'); +// $mobileNumber = $student['Phone_number']; +// $branchID = $this->post('branchID'); +// $loginType = $this->post('userType'); +// $getLeadDetails['getLeadDetails'] = $this->Calltracking_model->getLeadDetails($requestedBy,$mobileNumber,$branchID,$loginType); +// } +// } +// // print_r($getLeadDetails);die; +// if (sizeof($getLeadDetails)>0) +// { +// $getLeadDetails['status'] = REST_Controller::HTTP_OK; +// // Set the response and exit +// $this->response($getLeadDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code +// } +// else +// { +// // Set the response and exit +// $this->response([ +// 'message' => 'No records found!', +// 'status' => REST_Controller::HTTP_NOT_FOUND +// ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code +// } +} +/* +* End of call tracking +*/ } \ No newline at end of file diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 220dd6c4..afbfb321 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,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(sfp.bdate,'-') as Initial_paid_date + $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, ifnull(std.AlternateNumber,'-') as AlternateNumber,ifnull(std.address,'-') as address 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 @@ -33,7 +33,7 @@ group by cid order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails where IsActive = 1) as std on std.sid=sms.sid + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,AlternateNumber,PresentAddress as address FROM T_StudentDetails where IsActive = 1) as std on std.sid=sms.sid left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch where sms.branch = '".$br."' "; @@ -92,7 +92,7 @@ where BranchCode = '".$br."'"; } public function markcard($bat=null,$br=null,$u=null){ - $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 + $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,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber 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) @@ -117,7 +117,7 @@ group by cid order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch where std.active = 1 and sms.branch = '".$br."' "; @@ -149,7 +149,7 @@ 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 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 + $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,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber 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 @@ -175,7 +175,7 @@ group by cid order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch where std.active = 1 and sms.branch = '".$br."' "; @@ -207,7 +207,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){ - $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-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 + $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,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber 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 @@ -247,7 +247,7 @@ left join order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch where std.active = 1 and sms.branch = '".$br."' "; @@ -320,7 +320,7 @@ 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 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 + $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,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber from (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,AnsDate as adate,Sem as sem FROM T_AnswerBookletStatus @@ -349,7 +349,7 @@ left join order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch where std.active = 1 and sms.branch = '".$br."' "; @@ -383,7 +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 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 + $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, + ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber 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 @@ -412,7 +413,7 @@ left join order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch where std.active = 1 and sms.branch = '".$br."' "; @@ -446,11 +447,11 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function doc_pending($bat=null,$br=null,$u=null){ - $sql = "SELECT ifnull(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 + $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,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber 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 + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sdt.StudentID left join (SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course, UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm @@ -502,7 +503,7 @@ 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 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 + $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,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber from (SELECT StudentID as sid,CommentsForStudent as cmts,FeesId as fid, IF(ModeOfPayment = 'WAIVER', BillNO,'-') AS waiver_bill, @@ -527,7 +528,7 @@ left join order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid where std.active = 1 and scd.branch = '".$br."' "; @@ -561,7 +562,7 @@ left join } public function examfee($bat=null,$br=null,$u=null){ - $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfs.cid,'-') as Course_id,ifnull(sms.cmts,'-') as Comments,ifnull(sms.stf,'-') as Amount,ifnull(sms.branch,'-') as Branch_code + $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfs.cid,'-') as Course_id,ifnull(sms.cmts,'-') as Comments,ifnull(sms.stf,'-') as Amount,ifnull(sms.branch,'-') as Branch_code,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber 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 != '' @@ -582,7 +583,7 @@ left join order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid where std.active = 1 and sms.branch = '".$br."' "; @@ -636,7 +637,8 @@ left join ifnull(MAX(CASE WHEN Installment = 9 THEN sfp.BillNO END),'-') as billno9, 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 + ifnull(MAX(CASE WHEN Installment = 10 THEN sfp.BillAmount END),0) as billamt10, + ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber 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 @@ -650,7 +652,7 @@ left join (SELECT UniversityID as uid,UniversityName as uname FROM T_UniversityMaster) as u on u.uid=cm.uid left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father,IsActive as active FROM T_StudentDetails where IsActive = 1) as std on std.sid=sfp.StudentID + (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father,IsActive as active,PermanentAddress as address,AlternateNumber FROM T_StudentDetails where IsActive = 1) as std on std.sid=sfp.StudentID left join (SELECT BatchCode as bcode,BatchName as batchname FROM T_BatchMaster) as b on b.bcode=sfs.batch left join diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index be7fe687..db8d6486 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -1,8 +1,41 @@ 'use strict'; /*** controller***/ -app.controller('report_ans_bookletCtrl', ["$scope", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService", - function ($scope, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService) { +app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$modal","API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService", + function ($scope, $filter,$rootScope,$modal, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService) { + /* + * auto call tracking + */ + $scope.userType=JSON.parse(localStorage.getItem('localObj')).localType; + $scope.myModel = { + + "date": new Date(), + "activity": "", + "assignedTo": "", + "status": "", + "referedBy": '', + "comments":'', + "enquiryStatus":'', + + "important":false, + "branch":"", + + }; + + //get current date + $scope.hideDateSearch=true; + $scope.modifyMinDate = moment(); + //$scope.minDate = $filter('date')($scope.modifyMinDate, 'MM-dd-yyyy'); + $scope.currentDate=$filter('date')(new Date(), 'dd-MM-yyyy'); + // get 30 plus date for follwup details + $scope.modifyDate = moment(); + $scope.modifyDate.add(30, 'days'); + $scope.futureDate = $filter('date')($scope.modifyDate, 'dd-MM-yyyy'); + $scope.myModel.date=$scope.currentDate; + // console.log($scope.currentDate); + /** + * End of the call tracking + */ // DataTables configurable options @@ -100,7 +133,7 @@ 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]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,Status as Status,Date as Date INTO XLS("Answer_booklet_status.xls",?) FROM ?',[mystyle,$scope.ans_book_data]); }; /*modal controller @@ -243,6 +276,238 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor }]); + /** + * Auto Call Tracking Sriram + */ + $scope.selectedStudentsID = []; + $scope.isCheckAll = function(e){ + var val = (e.target.checked ? true : false); + if(val) + { + // $scope.disable = false; + var len = $scope.ans_book_data.length; + var i = 0; + for(i=0;i +
+
+ +
+
+ + Add New Lead Details + + + +
+ +
+
+ + + Followup date is required. + +
+ +
+ +
+ + + Activity is required + + +
+
+ +
+ +
Please Wait...
+ + +
+
+ + + Status is required + + +
+ + +
+ +
+ +
Please Wait...
+ + +
+ +
+ + + + Assigned to is required + + +
+ + +
+ +
+ +
Please Wait...
+ + +
+ + + +
+
+ + + + + + + +
+ + + + + Invalid referred by name +
+ + + + + + + +
+ + + + +
+
+ + + + +
+
+
+
+
+
+ \ No newline at end of file diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html index 8abf5f01..b9455f67 100755 --- a/Apollo/assets/views/report_answer_booklets.html +++ b/Apollo/assets/views/report_answer_booklets.html @@ -69,6 +69,9 @@
+
+ +
@@ -80,6 +83,7 @@ + SL.No Enrollment ID Student Name @@ -96,6 +100,7 @@ + {{p.SL_NO}} {{p.Enrollment_id}} {{p.Student_name}} diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index 3c734fed..1ba7d3a3 100755 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -69,6 +69,9 @@
+
+ +
@@ -80,6 +83,7 @@ + SL.No Admission Date Enrollment ID @@ -97,6 +101,7 @@ + {{p.SL_NO}} {{p.Admission_date}} {{p.Enrollment_id}} diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html index 37657a7b..26b58ebd 100755 --- a/Apollo/assets/views/report_balance_fee.html +++ b/Apollo/assets/views/report_balance_fee.html @@ -69,6 +69,9 @@
+
+ +
@@ -98,6 +101,7 @@ + SL.No Enrollment ID Student Name @@ -139,6 +143,7 @@ + {{p.SL_NO}} {{p.eid}} {{p.Student_name}} diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html index 226886b3..b5e5d008 100755 --- a/Apollo/assets/views/report_certificate_status.html +++ b/Apollo/assets/views/report_certificate_status.html @@ -74,6 +74,9 @@
+
+ +
@@ -85,6 +88,7 @@ + SL.No Document Fee Paid Date Enrollment ID @@ -103,6 +107,7 @@ + {{p.SL_NO}} {{p.Document_fee_paid_date}} {{p.Enrollment_id}} diff --git a/Apollo/assets/views/report_document_pending.html b/Apollo/assets/views/report_document_pending.html index 568b1c3b..a9230b47 100755 --- a/Apollo/assets/views/report_document_pending.html +++ b/Apollo/assets/views/report_document_pending.html @@ -69,6 +69,9 @@
+
+ +
@@ -80,6 +83,7 @@ + SL.No Admission Date Enrollment ID @@ -97,6 +101,7 @@ + {{p.SL_NO}} {{p.Admission_date}} {{p.Enrollment_id}} diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html index 2720c971..6ca47c3d 100755 --- a/Apollo/assets/views/report_exam_writing_fee.html +++ b/Apollo/assets/views/report_exam_writing_fee.html @@ -69,6 +69,9 @@
+
+ +
@@ -85,6 +88,7 @@ --> + SL.No Enrollment ID Student Name @@ -103,6 +107,7 @@ + {{p.SL_NO}} {{p.Enrollment_id}} {{p.Student_name}} diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html index 3dca39ba..a137fb54 100755 --- a/Apollo/assets/views/report_mark_certificate_status.html +++ b/Apollo/assets/views/report_mark_certificate_status.html @@ -111,6 +111,9 @@
+
+ +
@@ -122,6 +125,7 @@ + SL.No Document Fee Paid Date Enrollment ID @@ -144,6 +148,7 @@ + {{p.SL_NO}} {{p.Document_fee_paid_date}} {{p.Enrollment_id}} diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html index 7d72a20b..cead8f47 100755 --- a/Apollo/assets/views/report_markcardstatus.html +++ b/Apollo/assets/views/report_markcardstatus.html @@ -75,6 +75,9 @@
+
+ +
@@ -84,6 +87,7 @@ + @@ -102,6 +106,7 @@ + diff --git a/Apollo/assets/views/report_studymaterialstatus.html b/Apollo/assets/views/report_studymaterialstatus.html index 4cc76754..de1c1984 100755 --- a/Apollo/assets/views/report_studymaterialstatus.html +++ b/Apollo/assets/views/report_studymaterialstatus.html @@ -79,6 +79,9 @@
+
+ +
@@ -87,6 +90,7 @@ + @@ -104,6 +108,7 @@ + From 238684e0a7eb914d8f46992e6658181b1e011608 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 2 Jul 2018 16:05:56 +0530 Subject: [PATCH 2/5] excel export field names renamed --- Apollo/assets/js/controllers/report_ans_bookletCtrl.js | 2 +- Apollo/assets/js/controllers/report_app_pendingCtrl.js | 2 +- Apollo/assets/js/controllers/report_certificateCtrl.js | 2 +- Apollo/assets/js/controllers/report_doc_pendingCtrl.js | 2 +- Apollo/assets/js/controllers/report_markcard_statusCtrl.js | 2 +- .../assets/js/controllers/report_study_material_statusCtrl.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index db8d6486..c35c524d 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -133,7 +133,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,Status as Status,Date as Date INTO XLS("Answer_booklet_status.xls",?) FROM ?',[mystyle,$scope.ans_book_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,Status as AnswerBookletStatus,Date as Date INTO XLS("Answer_booklet_status.xls",?) FROM ?',[mystyle,$scope.ans_book_data]); }; /*modal controller diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index abf649a9..6f5f5fa6 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -133,7 +133,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,Status as Status INTO XLS("Application_pending_student_list.xls",?) FROM ?',[mystyle,$scope.app_pending_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,Status as ApplicationPendingStatus INTO XLS("Application_pending_student_list.xls",?) FROM ?',[mystyle,$scope.app_pending_data]); }; diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index 1bfdac11..15daec08 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -131,7 +131,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Document_fee_paid_date as DocumentFeePaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(Balance_fee AS NUMBER) as Balance,Certificate_name as CertificateName,Status as Status,Date as Date INTO XLS("Certificate_status.xls",?) FROM ?',[mystyle,$scope.cert_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Document_fee_paid_date as DocumentFeePaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(Balance_fee AS NUMBER) as Balance,Certificate_name as CertificateName,Status as CertificateStatus,Date as Date INTO XLS("Certificate_status.xls",?) FROM ?',[mystyle,$scope.cert_data]); }; /*modal controller diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index e743ce6b..ac305e74 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -133,7 +133,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,Status as Status INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,DocumentPendingStatus as Status INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]); }; /*modal controller * */ diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index d3d561ab..f6fe4989 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -132,7 +132,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Roll_NO as RollNO,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(Balance_Fee AS NUMBER) as BalanceFee,Status as Status,Date as Date INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Roll_NO as RollNO,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(Balance_Fee AS NUMBER) as BalanceFee,Status as MarkCardStatus,Date as Date INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]); }; /*modal controller * */ diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index 182c3df0..3b71259a 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -133,7 +133,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentId,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University,Status as Status,,CAST(Balance_fee AS NUMBER) as BalanceFee,Date INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentId,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University,Status as StudyMaterial_Status,CAST(Balance_fee AS NUMBER) as BalanceFee,Date INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]); }; From f95ecd8f57f994a9ca706a0cce30ce55daea7cae Mon Sep 17 00:00:00 2001 From: sriramv Date: Mon, 2 Jul 2018 16:54:43 +0530 Subject: [PATCH 3/5] Auto call tracking issues Fixed Sriram --- .../controllers/Call_Tracking_Controller.php | 19 ++-- .../application/models/Calltracking_model.php | 101 ++++++++++++++++++ .../js/controllers/reregistrationformCtrl.js | 2 +- 3 files changed, 111 insertions(+), 11 deletions(-) diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php index 0a938390..4ec40ade 100755 --- a/Apollo/api/application/controllers/Call_Tracking_Controller.php +++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php @@ -423,12 +423,12 @@ class Call_Tracking_Controller extends REST_Controller { $Student_Id = ''; foreach($student as $student){ - if($Student_Id != $student['Student_id']){ + $lead_details['LeadName'] = $student['Student_name']; $lead_details['MobileNumber'] = $student['Phone_number']; $lead_details['IsNewEnquiry'] = 1; - $lead_details['CreatedBy'] = $this->post('createdBy'); - $lead_details['CreatedOn'] = $now->format('Y-m-d H:i:s'); + $CreatedBy = $this->post('createdBy'); + //store tracking details $tracking_details['University'] = $student['University']; @@ -439,22 +439,21 @@ class Call_Tracking_Controller extends REST_Controller { $tracking_details['ReferredBy'] = $this->post('referedBy'); $tracking_details['AlternateMobile'] = $student['AlternateNumber']; $tracking_details['Address'] = $student['address']; - $tracking_details['CreatedBy'] = $this->post('createdBy'); - $tracking_details['CreatedOn'] = $now->format('Y-m-d H:i:s'); - $tracking_details['UpdatedOn'] = $now->format('Y-m-d H:i:s'); + + $tracking_details['CreatedBranch'] = $this->post('branchId'); //store tracking followup details $tracking_followup_details['FollowupOn'] = $this->post('date'); $tracking_followup_details['FollowupComments'] = $this->post('comments'); - $tracking_followup_details['CreatedBy'] = $this->post('createdBy'); - $tracking_followup_details['CreatedOn'] = $now->format('Y-m-d H:i:s'); + $tracking_followup_details['StatusName'] = $this->post('status'); $tracking_followup_details['AssignedStaff'] = $this->post('assignedTo'); //print_r(array($lead_details,$tracking_details,$tracking_followup_details)); - $leadDetails['leadDetails'] = $this->Calltracking_model->addleadDetails($lead_details,$tracking_details,$tracking_followup_details);// Check if the users data store contains users (in case the database result returns NULL) - } + $leadDetails['leadDetails'] = $this->Calltracking_model->getaddautocall($lead_details,$tracking_details,$tracking_followup_details,$CreatedBy);// Check if the users data store contains users (in case the database result returns NULL) + } + // print_r($leadDetails);die; if (sizeof($leadDetails)>0) { $leadDetails['status'] = REST_Controller::HTTP_OK; diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index 6bedbb31..38e6600d 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -1328,4 +1328,105 @@ class Calltracking_model extends CI_Model { } + /* + *Auto Add Call Tracking Function + * Sriram + */ + + public function getaddautocall($lead_Details,$track_Details,$followup_Details,$CreatedBy){ + + $this->db->select('LD.LeadID,LTF.InteractionId,LT.TrackingID'); + $this->db->join('T_PickListDetails PD','PD.ListCode = LT.StatusCode','left'); + $this->db->join('T_Lead_Details LD','LD.LeadID = LT.LeadID','left'); + $this->db->join('T_Lead_Tracking_Followup LTF','LTF.TrackingID = LT.TrackingID','left'); + $this->db->join('T_ActivityMaster AM','AM.ActivityID = LT.ActivityStatus','left'); + $this->db->where('PD.ListName!="CLOSE"'); + + $this->db->where('LT.ActivityStatus',$track_Details['ActivityStatus']); + $this->db->where('LD.MobileNumber',$lead_Details['MobileNumber']); + $this->db->order_by('LD.LeadID','DESC'); + $this->db->limit(1); + $query = $this->db->get('T_Lead_Tracking LT'); + $res = $query->result(); + //print_r($res); + if(!empty($res) != 0){ + + $lead_Details['UpdatedOn'] = date('Y-m-d H:i:s'); + $lead_Details['UpdatedBy'] = $CreatedBy; + $track_Details['UpdatedOn'] = date('Y-m-d H:i:s'); + $track_Details['UpdatedBy'] = $CreatedBy; + $followup_Details['UpdatedOn'] = date('Y-m-d H:i:s'); + $followup_Details['UpdatedBy'] = $CreatedBy; + + $this->db->where('LeadID',$res[0]->LeadID); + $this->db->update('T_Lead_Details',$lead_Details); + if($this->db->affected_rows() > 0) { + + $this->db->where('TrackingID',$res[0]->TrackingID); + $this->db->update('T_Lead_Tracking',$track_Details); + if($this->db->affected_rows() >0){ + $this->db->where('InteractionId',$res[0]->InteractionId); + $this->db->update('T_Lead_Tracking_Followup',$followup_Details); + if($this->db->affected_rows() == '1'){ + $result['leadStatus'] = true; + $result['message'] = "Successfully lead details Updated"; + } + else{ + $result['leadStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + }else{ + $result['leadStatus'] = false; + $result['message'] = "Update Something went wrong.please try again"; + } + } else { + $result['leadStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + }else{ + $lead_Details['CreatedOn'] = date('Y-m-d H:i:s'); + $followup_Details['CreatedOn'] = date('Y-m-d H:i:s'); + $track_Details['CreatedOn'] = date('Y-m-d H:i:s'); + $lead_Details['CreatedBy'] = $CreatedBy; + $track_Details['CreatedBy'] = $CreatedBy; + $followup_Details['CreatedBy'] = $CreatedBy; + + $this->db->insert(LEAD_DETAILS, $lead_Details); + // this if for insert lead details + if($this->db->affected_rows() == '1'){ + // get and store insert id from db + $track_Details['LeadID']=$this->db->insert_id(); + $this->db->insert(LEAD_TRACKING, $track_Details); + // this if for insert tracking details + if($this->db->affected_rows() == '1'){ + $followup_Details['TrackingID']=$this->db->insert_id(); + $this->db->insert(LEAD_TRACKING_FOLLOWUP, $followup_Details); + // this if for insert follow up details + if($this->db->affected_rows() == '1'){ + $result['leadStatus'] = true; + $result['message'] = "Successfully lead details added"; + } + else{ + $result['leadStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + + } + else{ + $result['leadStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + + } + + else { + $result['leadStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + } + + + return $result; + } + } \ No newline at end of file diff --git a/Apollo/assets/js/controllers/reregistrationformCtrl.js b/Apollo/assets/js/controllers/reregistrationformCtrl.js index 252ece13..c0cd7191 100644 --- a/Apollo/assets/js/controllers/reregistrationformCtrl.js +++ b/Apollo/assets/js/controllers/reregistrationformCtrl.js @@ -364,7 +364,7 @@ app.controller('reregistrationformCtrl', ["$scope","$rootScope","toaster", "$fil // str.replace("%20"," "); // str.replace("%2C"," "); $scope.StudnetAddress = "Address: "+ str.replace(" "," "); - $scope.StudentPin = "Pincode: .................. Mobile No: "+Student.MobileNumber+"Email ID: "+Student.EmailID; + $scope.StudentPin = "Pincode: .................. Mobile No: "+Student.MobileNumber+" Email ID: "+Student.EmailID; // var sem1 = doc.autoTableHtmlToJson(document.getElementById(subject)); var universityname = $scope.university.universityName; From 13264aefe9e7ef2c0c35b4623e6f52125ccaca53 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 2 Jul 2018 18:39:10 +0530 Subject: [PATCH 4/5] export excel fields renamed --- Apollo/assets/js/controllers/report_balfeeCtrl.js | 2 +- Apollo/assets/js/controllers/report_doc_pendingCtrl.js | 2 +- Apollo/assets/js/controllers/report_examfeeCtrl.js | 2 +- Apollo/assets/js/controllers/report_waiver_referalCtrl.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index 15c3fe3f..eb86cf8f 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -143,7 +143,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,eid as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,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,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(Total AS NUMBER) as TotalFee,CAST(Paid_fee AS NUMBER) as FeesPaid,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]); }; diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index ac305e74..dc706e08 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -133,7 +133,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,DocumentPendingStatus as Status INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,Status as DocumentPendingStatus INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]); }; /*modal controller * */ diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index dd7dc263..18bce29f 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -146,7 +146,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(Amount AS NUMBER) as Amount,Comments as Comments INTO XLS("Exam_writing_fee_report.xls",?) FROM ?',[mystyle,$scope.examfee_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(Amount AS NUMBER) as ExamWritingFee,Comments as Comments INTO XLS("Exam_writing_fee_report.xls",?) FROM ?',[mystyle,$scope.examfee_data]); }; /*modal controller * */ diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index 48534dfe..2866e0eb 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -114,7 +114,7 @@ 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,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,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]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,Waiver_bill as WaiverBillNo,CAST(Waiver_amount AS NUMBER) as WaiverAmount,Referal_bill as ReferalBillNo,CAST(Referal_amount AS NUMBER) as ReferalAmount,Comments as Comments INTO XLS("Waiver_referal_report.xls",?) FROM ?',[mystyle,$scope.waiver_referal_data]); }; /*modal controller * */ From 18a8d80a04d9d5d4e8457c777cf1111f3182c738 Mon Sep 17 00:00:00 2001 From: sriramv Date: Mon, 2 Jul 2018 13:52:21 +0000 Subject: [PATCH 5/5] Calltracking_model.php Auto Call Tracking bug Fixed : sriram edited online with Bitbucket --- .../api/application/models/Calltracking_model.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index 38e6600d..2220ddbe 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -1335,7 +1335,7 @@ class Calltracking_model extends CI_Model { public function getaddautocall($lead_Details,$track_Details,$followup_Details,$CreatedBy){ - $this->db->select('LD.LeadID,LTF.InteractionId,LT.TrackingID'); + $this->db->select('LD.LeadID,LT.TrackingID'); $this->db->join('T_PickListDetails PD','PD.ListCode = LT.StatusCode','left'); $this->db->join('T_Lead_Details LD','LD.LeadID = LT.LeadID','left'); $this->db->join('T_Lead_Tracking_Followup LTF','LTF.TrackingID = LT.TrackingID','left'); @@ -1348,15 +1348,15 @@ class Calltracking_model extends CI_Model { $this->db->limit(1); $query = $this->db->get('T_Lead_Tracking LT'); $res = $query->result(); - //print_r($res); + //print_r($res);die; if(!empty($res) != 0){ $lead_Details['UpdatedOn'] = date('Y-m-d H:i:s'); $lead_Details['UpdatedBy'] = $CreatedBy; $track_Details['UpdatedOn'] = date('Y-m-d H:i:s'); $track_Details['UpdatedBy'] = $CreatedBy; - $followup_Details['UpdatedOn'] = date('Y-m-d H:i:s'); - $followup_Details['UpdatedBy'] = $CreatedBy; + $followup_Details['CreatedOn'] = date('Y-m-d H:i:s'); + $followup_Details['CreatedBy'] = $CreatedBy; $this->db->where('LeadID',$res[0]->LeadID); $this->db->update('T_Lead_Details',$lead_Details); @@ -1365,8 +1365,10 @@ class Calltracking_model extends CI_Model { $this->db->where('TrackingID',$res[0]->TrackingID); $this->db->update('T_Lead_Tracking',$track_Details); if($this->db->affected_rows() >0){ - $this->db->where('InteractionId',$res[0]->InteractionId); - $this->db->update('T_Lead_Tracking_Followup',$followup_Details); + $followup_Details['TrackingID'] = $res[0]->TrackingID; + + //$followup_Details['TrackingID']=$this->db->insert_id(); + $this->db->insert(LEAD_TRACKING_FOLLOWUP, $followup_Details); if($this->db->affected_rows() == '1'){ $result['leadStatus'] = true; $result['message'] = "Successfully lead details Updated";
SL.No Intial Payment Paid Date Enrollment ID
{{p.SL_NO}} {{p.Initial_paid_date}} {{p.Enrollment_id}}
SL.No Initial Payment Paid Date Enrollment ID
{{p.SL_NO}} {{p.Initial_paid_date}} {{p.Enrollment_id}}