diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php
index eff15fac..09952634 100755
--- a/Apollo/api/application/config/routes.php
+++ b/Apollo/api/application/config/routes.php
@@ -332,3 +332,7 @@ $route['report_balfee'] = 'Report/balfee';
$route['report_lead'] = 'Report/lead';
$route['insertUniversityfile'] = 'UniversityFile_Controller/insertUniversityfile';
+//Application Form Details
+$route['getApplicationFromDetails'] = 'StatusUpdation_Controller/getApplicationFromDetails';
+$route['updateApplicationFormStatus'] = 'StatusUpdation_Controller/updateApplicationFormStatus';
+$route['getApplicationFormStatusList'] = 'StatusUpdation_Controller/getApplicationFormStatusList';
\ No newline at end of file
diff --git a/Apollo/api/application/controllers/StatusUpdation_Controller.php b/Apollo/api/application/controllers/StatusUpdation_Controller.php
index 604ad50c..5c079ef0 100755
--- a/Apollo/api/application/controllers/StatusUpdation_Controller.php
+++ b/Apollo/api/application/controllers/StatusUpdation_Controller.php
@@ -232,7 +232,6 @@ class StatusUpdation_Controller extends REST_Controller {
public function getApplicationFromDetails_post(){
$reqData = $this->post('data');
$reqBranch = $this->post('reqBranch');
- // print_r($reqData);exit();
$getApplicationFormDetails = $this->statusupdation_model->get_applicationFrom_details($reqData, $reqBranch); // Check if the employee exist
if ($getApplicationFormDetails) {
$getApplicationFormDetails['status'] = REST_Controller::HTTP_OK;
@@ -245,4 +244,38 @@ class StatusUpdation_Controller extends REST_Controller {
}
}
-}
\ No newline at end of file
+
+ public function updateApplicationFormStatus_post(){
+ $reqData = $this->post('data');
+ $reqBranch = $this->post('requestDetails');
+ $updateApplicationFormStatus = $this->statusupdation_model->update_applicationForm_status($reqData, $reqBranch); // Check if the employee exist
+ if ($updateApplicationFormStatus) {
+ $updateApplicationFormStatus['status'] = REST_Controller::HTTP_OK;
+ // Set the response and exit
+ $this->response($updateApplicationFormStatus, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+
+ } else {
+ // Set the response and exit
+ $this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+
+ }
+ }
+
+ public function getApplicationFormStatusList_post(){
+ $reqData = $this->post('data');
+ $reqBranch = $this->post('reqBranch');
+ $getApplicationFormStatusList = $this->statusupdation_model->get_ApplicationFormStatusDetails($reqData, $reqBranch); // Check if the employee exist
+ if ($getApplicationFormStatusList) {
+ $getApplicationFormStatusList['status'] = REST_Controller::HTTP_OK;
+ // Set the response and exit
+ $this->response($getApplicationFormStatusList, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+
+ } else {
+ // Set the response and exit
+ $this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+
+ }
+ }
+
+
+ }
\ No newline at end of file
diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php
index 4b6896d3..9b330645 100755
--- a/Apollo/api/application/models/Fees_status_model.php
+++ b/Apollo/api/application/models/Fees_status_model.php
@@ -507,6 +507,7 @@ class Fees_status_model extends CI_Model
$this->db->select('ReceiptNo');
$this->db->where('ReceiptNo', $feesPaidDetails['ReceiptNo']);
+ $this->db->where('IsActive', '1');
if($this->db->get(STUDENTS_FEES_PAID)->first_row() AND $feesPaidDetails['ReceiptNo']!=''){
$result['paidStatus'] = false;
$result['message'] = "This receipt number is already exist!";
diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index a2f44e14..e79297e8 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -360,7 +360,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,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,listdate.issuedate as issuedate,listdate.rcvedate as rcvedate,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as balance
+ $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,listdate.issuedate as issuedate,listdate.rcvedate as rcvedate,ifnull(((sfs.cf + sfs.stf + sfs.others)-(sfp.bamount)),0) as balance
from
(SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,AnsDate as
@@ -379,7 +379,7 @@ left join
group by sid,fid,billno)
as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid
left join
- (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.cid=sms.cid
+ (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=sfs.cid and cfd.cid=sfs.ftype
left join
(SELECT ListCode as lcode,ListName as status FROM T_PickListDetails)
as list on list.lcode=sms.lcode
@@ -394,13 +394,13 @@ left join
(SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
left join
- (select ID,StudentID as sid,
+ (select ID,StudentID as sid,Sem as sem,
max(if(ListName = 'ISSUED TO STUDENT', AnsDate,'-')) as issuedate,
max(if(ListName = 'RECEIVED FROM STUDENT', AnsDate,'-')) as rcvedate
from T_AnswerBookletStatus abs
left join T_PickListDetails list on list.ListCode=abs.ListCode where AnsDate is not null
-group by sid
-) as listdate on listdate.sid=sms.sid
+group by sid,Sem
+) as listdate on listdate.sid=sms.sid and listdate.sem=sms.sem
where std.active = 1 and sms.branch = '".$br."'
";
@@ -414,7 +414,7 @@ group by sid
$sql.=" and cm.uid = '".$u."'";
}
- $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem,Sem_year";
+ $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem";
@@ -537,7 +537,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
$sql.=" and cm.uid = '".$u."'";
}
- $sql.="group by Student_id,Course_id,Batch_code,Branch_code";
+ $sql.="group by Student_id,Course_id,Batch_code,Branch_code,certname";
@@ -563,16 +563,15 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
IF(ModeOfPayment = 'WAIVER', sum(BillAmount), 0) AS waiver,
IF(ModeOfPayment = 'REFERRAL', BillNO,'-') AS referal_bill,
IF(ModeOfPayment = 'REFERRAL', sum(BillAmount), 0) AS referal FROM T_Students_Fees_PaidDetails
- where IsActive = 1
- group by waiver_bill,referal_bill) as sms
+ where IsActive = 1 and ModeOfPayment = 'WAIVER' or ModeOfPayment = 'REFERRAL'
+ group by fid,waiver_bill,referal_bill) as sms
left join
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype FROM T_Students_Fees_Status
- group by sid,cid,batch) as sfs on sfs.sid=sms.sid and sfs.fid=sms.fid
+ group by sid,cid,fid,batch) as sfs on sfs.sid=sms.sid and sfs.fid=sms.fid
+ left join
+ (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=sfs.cid and cfd.cid=sfs.ftype
left join
- (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sfs.cid
-
-left join
- (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=scd.cid and cfd.cid=sfs.ftype
+ (SELECT 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
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
@@ -671,7 +670,7 @@ left join
}
public function balfee($bat=null,$br=null,$u=null){
- $sql = "SELECT ifnull(sfp.StudentID,'-') as Student_id,ifnull(scd.eid,'-') as eid,ifnull(std.name,'-') as Student_name,date_format(std.regdate,'%d-%m-%Y') as regdate,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,scd.EnrollmentID as eid,sfs.CourseID as cid,std.MobileNumber as Phone_number,FirstName as Student_name,Fathername as Father_name,PermanentAddress as address,AlternateNumber,date_format(std.CreatedOn,'%d-%m-%Y') as regdate,cm.CourseName as Course_name,u.UniversityName as University,sfp.FeesID as fid,(CourseFees + STFOrWR + Others) as Total,ifnull((sfp.BillAmount),0) as Paid_fee,((CourseFees + STFOrWR + Others) - sfp.BillAmount) as balance,cfd.Sem_Year as Sem_year,std.PermanentAddress as address,std.AlternateNumber as AlternateNumber,
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,
@@ -691,45 +690,30 @@ 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(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
- left join
- (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd
- on cfd.ccid=sfs.cid
- left join
- (SELECT CourseID as cid,UniversityID as uid,CourseName as course FROM T_CourseMaster) as cm
- on cm.cid=sfs.cid
- 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,PermanentAddress as address,AlternateNumber,CreatedOn as regdate 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
- (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 where IsActive = 1
- group by sid,fid) as sfb on sfb.sid=sfp.StudentID and sfb.fid=sfp.FeesID
-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
- where sfp.IsActive = 1 and br.brcode = '".$br."'
+ ifnull(MAX(CASE WHEN Installment = 10 THEN sfp.BillAmount END),0) as billamt10
+
+ FROM T_Students_Fees_PaidDetails as sfp
+ left join T_Students_Fees_Status sfs on sfs.FeesID=sfp.FeesID
+ left join T_Course_Fees_Details cfd on cfd.ID=sfs.FeesType
+ left join T_CourseMaster cm on cm.CourseID=sfs.CourseID
+ left join T_UniversityMaster u on u.UniversityID=cm.UniversityID
+ left join T_StudentDetails std on std.StudentID=sfp.StudentID and std.IsActive = 1
+ left join T_Student_CourseDetails scd on scd.StudentID=sfs.StudentID and scd.CourseID=sfs.CourseID
+ where sfp.IsActive = 1 and sfp.UpdatedBy = '".$br."'
";
if ($bat!= ''){
- $sql.=" and sfs.batch = '".$bat."'";
+ $sql.=" and sfs.BatchCode = '".$bat."'";
}
if ($u!= ''){
- $sql.=" and u.uid = '".$u."'";
+ $sql.=" and u.UniversityID = '".$u."'";
}
- $sql.=" group by Student_id,Batch_code,Course_id,Branch_code";
+ $sql.=" group by Student_id,fid";
@@ -860,7 +844,7 @@ from T_Lead_Tracking_Followup as ltf
}
- public function GetNewRegList($det)
+ public function GetNewRegList($det)
{
$fdate=$det['from'];
diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php
index 65345536..cdaba979 100755
--- a/Apollo/api/application/models/StatusUpdation_model.php
+++ b/Apollo/api/application/models/StatusUpdation_model.php
@@ -19,6 +19,8 @@ class StatusUpdation_model extends CI_Model {
$searchFor = 'C001';
} else if ($reqDetails == 'ANSWERBOOKLET_STATUS') {
$searchFor = 'B001';
+ } else if ($reqDetails == 'APPICATIONFORM_STATUS') {
+ $searchFor = 'L001';
}
return $searchFor;
}
@@ -316,7 +318,7 @@ class StatusUpdation_model extends CI_Model {
if( $statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED'){
$cerNamtToMsg = 'Answer booklet';
$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
- $getSemYearANDType = "$getSemYearMsg $cerNamtToMsg";
+ $getSemYearANDType = "$getSemYearMsg";
// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
// $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received.";
$mesg = "Answer booklet Received - Dear $studentName, Your answer booklet for $getSemYearANDType has been received.";
@@ -593,7 +595,7 @@ class StatusUpdation_model extends CI_Model {
$config = array(
'protocol' => 'smtp',
'smtp_host' => 'smtp.sendgrid.net',
- 'smtp_port' => 465,
+ 'smtp_port' => 587,
'smtp_user' => 'apikey',
'smtp_pass' => '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',
'mailtype' => 'html',
@@ -602,12 +604,13 @@ class StatusUpdation_model extends CI_Model {
$this->email->initialize($config);
$this->email->set_mailtype("html");
$this->email->set_newline("\r\n");
+ // print_r($this->email);exit();
//Email content
// $htmlContent = '