Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes : ps

Browse Source
This commit is contained in:
Sanjeev 2021-04-03 20:36:28 +05:30
parent 80dd3a636d
commit c8cdfe6c8e
5 changed files with 96 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Apollo/api/application/models/Broadcast_model.php
View File

@ -266,14 +266,27 @@ class Broadcast_model extends CI_Model {
continue; continue;
} }
} }
$this->db->insert_batch('T_BroadcastStatus', $data); $this->db->db_debug = false;
if ($this->db->affected_rows() >= 1) { $res = $this->db->insert_batch('T_BroadcastStatus', $data);
$result['msgStatus'] = true;
$result['message'] = "Successfully Messages Sent!!"; if(!$res)
} else { {
$error = $this->db->error();
//
$result['msgStatus'] = false; $result['msgStatus'] = false;
$result['error'] = $error;
$result['message'] = "error!!"; $result['message'] = "error!!";
} }
else
{
if ($this->db->affected_rows() >= 1) {
$result['msgStatus'] = true;
$result['message'] = "Successfully Messages Sent!!";
} else {
$result['msgStatus'] = false;
$result['message'] = "error!!";
}
}
// print_r($data); // print_r($data);
// exit(); // exit();
// $msgID = $arrss[1]; // $msgID = $arrss[1];

10
Apollo/api/application/models/Calltracking_model.php
View File

@ -457,8 +457,14 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
$this->mailsend($Email, $msg); $this->mailsend($Email, $msg);
$this->db->db_debug = false;
$this->db->insert_batch('T_BroadcastStatus', $data); $res = $this->db->insert_batch('T_BroadcastStatus', $data);
if(!$res){
$error = $this->db->error();
$result['msgStatus'] = false;
$result['error'] = $error;
$result['message'] = "error!!";
}
} }

105
Apollo/api/application/models/Reports_model.php
View File

@ -202,64 +202,53 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
FROM T_Students_Fees_Status FROM T_Students_Fees_Status
LEFT JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Students_Fees_Status.BatchCode LEFT JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Students_Fees_Status.BatchCode
GROUP BY sid,fid,cid,batch) AS sfs GROUP BY sid,fid,cid,batch) AS sfs
LEFT JOIN LEFT JOIN
(SELECT c.ID,StudentID AS sid,c.CourseID AS cid,c.BranchCode AS branch,c.ListCode AS lcode,p.ListName,c.CertificationType AS ctype,c.CDate AS cdate,c.Sem AS sem,c.CreatedOn FROM T_CertificationStatus c (SELECT c.ID,StudentID AS sid,c.CourseID AS cid,c.BranchCode AS branch,c.ListCode AS lcode,p.ListName,c.CertificationType AS ctype,c.CDate AS cdate,c.Sem AS sem,c.CreatedOn
LEFT JOIN T_PickListDetails p ON p.ListCode=c.ListCode FROM T_CertificationStatus c
WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus GROUP BY StudentID,CourseID,BranchCode,Sem) LEFT JOIN T_PickListDetails p ON p.ListCode=c.ListCode
GROUP BY sid,sem,cid,lcode,branch) AS sms WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus GROUP BY StudentID,CourseID,BranchCode,Sem)
GROUP BY sid,sem,cid,lcode,branch) AS sms
ON sfs.sid=sms.sid AND sms.cid=sfs.ftype and sms.branch ='".$br."' ON sfs.sid=sms.sid AND sms.cid=sfs.ftype and sms.branch ='".$br."'
LEFT JOIN
LEFT JOIN (SELECT StudentID AS sid,FeesId AS fid,BillDate AS bdate,sum(BillAmount) AS bamount,BillNO AS billno
(SELECT StudentID AS sid,FeesId AS fid,BillDate AS bdate,sum(BillAmount) AS bamount,BillNO AS billno FROM T_Students_Fees_PaidDetails FROM T_Students_Fees_PaidDetails
WHERE IsActive = 1 WHERE IsActive = 1
GROUP BY sid,fid) AS sfp GROUP BY sid,fid) AS sfp
ON sfp.sid=sfs.sid AND sfp.fid=sfs.fid
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
LEFT JOIN ON cfd.cid=sfs.ftype
(SELECT ID AS cid,CourseID AS ccid,FeesType AS ftype,Sem_Year AS syear FROM T_Course_Fees_Details) AS cfd LEFT JOIN
(SELECT ListCode AS lcode,ListName AS STATUS FROM T_PickListDetails) AS list
ON cfd.cid=sfs.ftype
LEFT JOIN
(SELECT ListCode AS lcode,ListName AS STATUS FROM T_PickListDetails) AS `list`
ON list.lcode=sms.lcode ON list.lcode=sms.lcode
LEFT JOIN
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
(SELECT CourseID AS cid,cm.UniversityID AS cuid,u.UniversityID AS uid,CourseName AS course,UniversityName AS uname,cm.BranchCode AS branch FROM T_CourseMaster AS cm LEFT JOIN T_UniversityMaster AS u ON u.UniversityID=cm.UniversityID
LEFT JOIN T_UniversityMaster AS u ON u.UniversityID=cm.UniversityID GROUP BY cid ORDER BY CourseID) AS cm
GROUP BY cid
ORDER BY CourseID) AS cm
ON cm.cid=cfd.ccid ON cm.cid=cfd.ccid
LEFT JOIN
LEFT JOIN (SELECT StudentID AS sid,MobileNumber AS phone,IsActive AS active,concat(FirstName,' ',Lastname) AS NAME,Fathername AS father,PermanentAddress AS address,AlternateNumber FROM T_StudentDetails) AS std
(SELECT StudentID AS sid,MobileNumber AS phone,IsActive AS active,concat(FirstName,' ',Lastname) AS NAME,Fathername AS father,PermanentAddress AS address,AlternateNumber FROM T_StudentDetails) AS std ON std.sid=sfs.sid
LEFT JOIN
ON std.sid=sfs.sid (SELECT StudentID AS sid,UniversityID AS uid,CourseID AS cid,EnrollmentID AS eid,BranchID AS branch,ifnull(STATUS,'-') AS coursestatus FROM T_Student_CourseDetails) AS scd
ON scd.sid=sfs.sid AND scd.cid = sfs.cid
LEFT JOIN (SELECT StudentID AS sid,UniversityID AS uid,CourseID AS cid,EnrollmentID AS eid,BranchID AS branch,ifnull(STATUS,'-') AS coursestatus FROM T_Student_CourseDetails) AS scd LEFT JOIN
(SELECT ID,StudentID AS sid,Sem,CourseID,Comments,
ON scd.sid=sfs.sid AND scd.cid = sfs.cid IF(ListName = 'SENT TO UNIVERSITY', AnsDate,'-') AS ansdate,CourierDetails AS courierdetails
FROM T_AnswerBookletStatus abs
LEFT JOIN (SELECT ID,StudentID AS sid,Sem,CourseID,Comments, LEFT JOIN T_PickListDetails `list` ON list.ListCode=abs.ListCode
IF(ListName = 'SENT TO UNIVERSITY', AnsDate,'-') AS ansdate,CourierDetails AS courierdetails WHERE AnsDate IS NOT NULL AND ID IN (SELECT max(ID) FROM T_AnswerBookletStatus WHERE AnsDate IS NOT NULL GROUP BY StudentID,Sem,CourseID)
FROM T_AnswerBookletStatus abs GROUP BY sid,Sem,CourseID) AS andate
LEFT JOIN T_PickListDetails `list` ON list.ListCode=abs.ListCode ON andate.sid = sfs.sid AND andate.Sem = cfd.syear AND andate.CourseID = sfs.ftype
WHERE AnsDate IS NOT NULL AND ID IN (SELECT max(ID) FROM T_AnswerBookletStatus WHERE AnsDate IS NOT NULL GROUP BY StudentID,Sem,CourseID) LEFT JOIN
GROUP BY sid,Sem,CourseID) AS andate (SELECT rd.StudentID AS sid,rd.CourseID AS cid,max(IF(list.ListName = 'SENT TO UNIVERSITY', afs.AppFormDate,'-')) AS appdate,Sem_Year AS sem
ON andate.sid = sfs.sid AND andate.Sem = cfd.syear AND andate.CourseID = sfs.ftype FROM T_Registration_Details rd
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 LEFT JOIN T_ApplicationFormStatus afs ON afs.Registration_Details_ID=rd.ID
FROM T_Registration_Details rd LEFT JOIN T_PickListDetails `list` ON list.ListCode=afs.ListCode
LEFT JOIN T_ApplicationFormStatus afs ON afs.Registration_Details_ID=rd.ID LEFT JOIN T_Course_Fees_Details cf ON cf.ID=rd.FeeType
LEFT JOIN T_PickListDetails `list` ON list.ListCode=afs.ListCode GROUP BY sid,sem) AS apdate
LEFT JOIN T_Course_Fees_Details cf ON cf.ID=rd.FeeType ON apdate.sid=sfs.sid AND apdate.sem=cfd.syear
GROUP BY sid,sem) AS apdate LEFT JOIN BalFees bal ON bal.student=sfs.sid AND bal.feestype=sfs.ftype AND bal.semyr=cfd.syear AND bal.totalpayable is not null
ON apdate.sid=sfs.sid AND apdate.sem=cfd.syear
LEFT JOIN BalFees bal ON bal.student=sfs.sid AND bal.feestype=sfs.ftype AND bal.semyr=cfd.syear AND bal.totalpayable is not null
where std.active = 1 and sfs.branch = '".$br."' "; where std.active = 1 and sfs.branch = '".$br."' ";
if ($bat!= ''){ if ($bat!= ''){
@ -277,7 +266,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
else{ else{
$getStatusName =$this->db->query("Select ListName from T_PickListDetails where ListCode = '".$st."' and BranchCode = '".$br."' and IsActive ='1'")->row(); $getStatusName =$this->db->query("Select ListName from T_PickListDetails where ListCode = '".$st."' and BranchCode = '".$br."' and IsActive ='1'")->row();
if($getStatusName->ListName == "BLANK"){ if($getStatusName->ListName == "BLANK"){
$sql.="and list.lcode IS null OR list.status = 'BLANK'"; $sql.="and ((list.lcode IS null) OR (list.status = 'BLANK'))";
}else{ }else{
$sql.="and list.lcode = '".$st."'"; } $sql.="and list.lcode = '".$st."'"; }
} }
@ -293,7 +282,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
$sql.=" and sfs.fid IS not null"; $sql.=" and sfs.fid IS not null";
$sql.=" AND (scd.coursestatus IS NULL OR (scd.coursestatus != 'Refund_issued' AND scd.coursestatus != 'Discontinued' AND scd.coursestatus != 'Cancelled'))"; $sql.=" AND (scd.coursestatus IS NULL OR (scd.coursestatus != 'Refund_issued' AND scd.coursestatus != 'Discontinued' AND scd.coursestatus != 'Cancelled'))";
$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,Sem_year";
// print_r($sql);die(); // print_r($sql);die();
$leadDet=$this->db->query($sql); $leadDet=$this->db->query($sql);
$mstatusDetails = $leadDet->result(); $mstatusDetails = $leadDet->result();
if (count($mstatusDetails) > 0) { if (count($mstatusDetails) > 0) {

13
Apollo/api/application/models/StatusUpdation_model.php
View File

@ -775,10 +775,19 @@ class StatusUpdation_model extends CI_Model {
} }
$this->db->insert_batch('T_BroadcastStatus', $data); // $this->db->insert_batch('T_BroadcastStatus', $data);
return $output; // return $output;
$res = $this->db->insert_batch('T_BroadcastStatus', $data);
if(!$res)
{
$error = $this->db->error();
return $error;
}else{
return $output;
}
} }
public function mailsend($arr, $msg, $sub) { public function mailsend($arr, $msg, $sub) {

18
Apollo/api/application/models/Student_model.php
View File

@ -1141,7 +1141,7 @@ if(count($qry)>0)
$userId = $Arr['MobileNumber']; $userId = $Arr['MobileNumber'];
$getUnivName = $this->getUnivName($courseArr['UniversityID'], $courseArr['BranchID']); $getUnivName = $this->getUnivName($courseArr['UniversityID'], $courseArr['BranchID']);
$getCourseName = $this->getCourseName($courseArr['CourseID'], $courseArr['BranchID']); $getCourseName = $this->getCourseName($courseArr['CourseID'], $courseArr['BranchID']);
$msg = "Thanks for registering with us for Course $getCourseName -$getUnivName. For more details, please login to www.apollodec.com. User ID :$userId, Password :abc123 APOLLO DEC"; $msg = "Thanks for registering with us for Course $getCourseName -$getUnivName. For more details, please login to www.apollodec.com. User ID :$userId, Password :abc123. APOLLO DEC";
$arr = $userId; $arr = $userId;
$this->smssend($arr, $msg); $this->smssend($arr, $msg);
$emailId = $Arr['EmailID']; $emailId = $Arr['EmailID'];
@ -1810,8 +1810,6 @@ public function testsmsandmailflow(){
$output = curl_exec($ch); $output = curl_exec($ch);
curl_close($ch); curl_close($ch);
$arrss = explode('<br>', $output); $arrss = explode('<br>', $output);
$time = date('Y-m-d H:i:s'); $time = date('Y-m-d H:i:s');
@ -1837,10 +1835,18 @@ public function testsmsandmailflow(){
} }
} }
$this->db->db_debug = false;
$res = $this->db->insert_batch('T_BroadcastStatus', $data);
if(!$res)
{
$error = $this->db->error();
return $error;
$this->db->insert_batch('T_BroadcastStatus', $data); }else{
return $output;
return $output; }
} }
public function mailsend($arr, $msg, $sub) { public function mailsend($arr, $msg, $sub) {