From 38139258ff853f33744d461f7370dbb3ddd58f2c Mon Sep 17 00:00:00 2001 From: Sanjeev Date: Thu, 10 Dec 2020 21:37:57 +0530 Subject: [PATCH] Changes : ps --- Apollo/api/application/controllers/Report.php | 36 +++++++++++----- .../api/application/models/Reports_model.php | 43 +++++++------------ .../models/StatusUpdation_model.php | 22 +++++----- 3 files changed, 53 insertions(+), 48 deletions(-) diff --git a/Apollo/api/application/controllers/Report.php b/Apollo/api/application/controllers/Report.php index ad9fbb13..5a56fd17 100755 --- a/Apollo/api/application/controllers/Report.php +++ b/Apollo/api/application/controllers/Report.php @@ -71,7 +71,13 @@ class Report extends REST_Controller { if ($getStatus) { $result = $this->report_model->getDefaultActivity('C001',$br); - if(!empty($result)){$getStatus['markcardstatus'] = $result;} + + if(!empty($result)){$getStatus['markcardstatus'] = $result; + $cnt = count($getStatus['markcardstatus']); + $getStatus['markcardstatus'][$cnt+1]["ListCode"] = "blank"; + $getStatus['markcardstatus'][$cnt+1]["ListName"] = "BLANK"; + $getStatus['markcardstatus'][$cnt+1]["StudentActivityCode"]= 'C001'; + } else{ $getStatus['markcardstatus'] = array();} $getStatus['status'] = REST_Controller::HTTP_OK; // Set the response and exit @@ -125,7 +131,12 @@ class Report extends REST_Controller { if ($getStatus) { $result = $this->report_model->getDefaultActivity('A001',$br); - if(!empty($result)){$getStatus['certificatestatus'] = $result;} + if(!empty($result)){$getStatus['certificatestatus'] = $result; + $cnt = count($getStatus['certificatestatus']); + $getStatus['certificatestatus'][$cnt+1]["StudentActivityCode"]= 'A001'; + $getStatus['certificatestatus'][$cnt+1]["ListCode"] = "blank"; + $getStatus['certificatestatus'][$cnt+1]["ListName"] = "BLANK"; + } else{ $getStatus['certificatestatus'] = array();} $getStatus['status'] = REST_Controller::HTTP_OK; // Set the response and exit @@ -255,14 +266,17 @@ class Report extends REST_Controller { $getStatus['university'][$cnt]["universityID"] = "all"; $getStatus['university'][$cnt]["universityName"] = "ALL"; $getStatus['university'][$cnt]["batchDetails"]= [];} - $getStatus['rollnostatus'] = $this->report_model->getAppPendingStatus($br); - if(!empty($getStatus['rollnostatus'])){ - $cnted = count($getStatus['rollnostatus']); - if($cnted>=0){ - $getStatus['rollnostatus'][$cnted]["ListCode"] = "all"; - $getStatus['rollnostatus'][$cnted]["ListName"] = "ALL"; - $getStatus['rollnostatus'][$cnted]["BranchCode"]= $br; - }} + + $getStatus['rollnostatus'][0]["ListCode"] = "pending"; + $getStatus['rollnostatus'][0]["ListName"] = "PENDING"; + $getStatus['rollnostatus'][0]["BranchCode"]= $br; + $getStatus['rollnostatus'][1]["ListCode"] = "received"; + $getStatus['rollnostatus'][1]["ListName"] = "RECEIVED"; + $getStatus['rollnostatus'][1]["BranchCode"]= $br; + $getStatus['rollnostatus'][2]["ListCode"] = "all"; + $getStatus['rollnostatus'][2]["ListName"] = "ALL"; + $getStatus['rollnostatus'][2]["BranchCode"]= $br; + $getStatus['status'] = REST_Controller::HTTP_OK; // Set the response and exit $this->response($getStatus, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code @@ -285,7 +299,7 @@ class Report extends REST_Controller { $from = $this->post('from'); $to = $this->post('to'); $updateddate = $this->post('updateddate'); - $getStatus = $this->report_model->app_pending($bat,$br,$u,$from,$st,$to,$updateddate); + $getStatus = $this->report_model->app_pending($bat,$br,$u,$st,$from,$to,$updateddate); if($getStatus['app_pendingList']){ $count = count($getStatus['app_pending_data']); for ($i = 0;$i < $count;$i++) { diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 8a9be978..4277837b 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -248,7 +248,9 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se } if ($st != ''){ - $sql.="and list.lcode = '".$st."'"; + if ($st == 'blank'){ + $sql.=" and (list.lcode IS NULL OR list.lcode = '')";} + else{ $sql.="and list.lcode = '".$st."'";} } if ($from != ''){ $fromd= date("Y-m-d",strtotime($from)); @@ -501,7 +503,11 @@ LEFT JOIN } if ($st != ''){ - $sql.=" and sms.lcode = '".$st."'"; + if($st == "blank"){ + $sql.=" and (sms.lcode IS NULL OR sms.lcode = '')"; + }else{ + $sql.=" and sms.lcode = '".$st."'"; + } } $sql.=" group by Student_id,cid,ctype"; $sql.=" ORDER BY sfb.bdate ASC"; @@ -1029,23 +1035,15 @@ WHERE $sql.=" and COUR.UniversityID = '".$u."'"; } } - - if($st != ''){ if($st=="all"){ - $resn = $this->db->query("select ListCode from T_PickListDetails where T_PickListDetails.IsActive = 1 and T_PickListDetails.BranchCode = ? and T_PickListDetails.ListName in ('RECEIVED','PENDING') order by T_PickListDetails.ListGroup desc;",array($br)); - $list = $resn->result(); - $q = []; - for($i = 0 ; $iUniversityID; - } - $sql.=" and APFS.ListCode in ('".implode("','",$q)."')"; - + $sql.=""; } - else{ - $sql.=" and APFS.ListCode = '".$st."'"; + else if($st=="pending") { + $sql.=" and (sfs.RollNo IS NULL OR sfs.RollNo = '')"; + } + else if($st=="received") { + $sql.=" and sfs.RollNo != ''"; } - } if ($from != ''){ $fromd= date("Y-m-d",strtotime($from)); $sql.="and STR_TO_DATE(BALFEE.CreatedOn,'%d-%m-%Y') >= '".$fromd."'"; @@ -1067,6 +1065,7 @@ WHERE $sql.=" ORDER BY StatusUpdationOn,InitialPayDate ASC "; $leadDet=$this->db->query($sql); + // print_r($sql);die(); $answer = $leadDet->result(); if (count($answer) > 0) { $results['app_pendingList'] = true; @@ -1075,10 +1074,7 @@ WHERE $results['app_pendingList'] = false; $results['message'] = 'No record found'; } - - - // print_r($this->db->last_query());die(); - + // print_r($this->db->last_query());die(); return $results; } @@ -1859,11 +1855,4 @@ if($feeDetails) } - public function getAppPendingStatus($br){ - $query = "select ListCode,ListName,BranchCode from T_PickListDetails where T_PickListDetails.IsActive = 1 and T_PickListDetails.BranchCode = ? and T_PickListDetails.ListName in ('RECEIVED','PENDING') order by T_PickListDetails.ListGroup desc;"; - $resn = $this->db->query($query,array($br)); - $list = $resn->result(); - $result = count($list) > 0 ? $list : array(); - return $result; - } } \ No newline at end of file diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index f416f1c7..ff7aa580 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -168,17 +168,19 @@ class StatusUpdation_model extends CI_Model { // echo $statuToMsg; // die(); - } else if($withoutspaceissue == 'ISSUEDTOSTUDENT' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') { + } + // else if($withoutspaceissue == 'ISSUEDTOSTUDENT' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') { - /// echo 'else if';die(); - $cerNamtToMsg = 'Mark Card'; - $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']); - $getSemYearANDType = "$getSemYearMsg $cerNamtToMsg"; - // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; - $mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg."; - $this->smssend($arr, $mesg); - $this->mailsend($arr, $mesg, $cerNamtToMsg); - } else { + // /// echo 'else if';die(); + // $cerNamtToMsg = 'Mark Card'; + // $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']); + // $getSemYearANDType = "$getSemYearMsg $cerNamtToMsg"; + // // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; + // $mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg."; + // $this->smssend($arr, $mesg); + // $this->mailsend($arr, $mesg, $cerNamtToMsg); + // } + else { } // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; // $mesg = "Status Update : $cerNamtToMsg - $statuToMsg $dateToMsg.";