diff --git a/Apollo/api/application/config/database.php b/Apollo/api/application/config/database.php index 0c05e6a5..3b2c2906 100755 --- a/Apollo/api/application/config/database.php +++ b/Apollo/api/application/config/database.php @@ -78,8 +78,8 @@ $db['default'] = array( 'hostname' => 'apollodec.com', 'username' => 'apollod4_SIT', 'password' => 'apollosit1234', - // 'database' => 'apollod4_SIT', - 'database' => 'apollod4_ApolloDECNEWSIT', + 'database' => 'apollod4_SIT', + // 'database' => 'apollod4_ApolloDECNEWSIT', // 'username' => 'apollod4_DEV', // 'password' => 'apollo1234', diff --git a/Apollo/api/application/controllers/Report.php b/Apollo/api/application/controllers/Report.php index 1bd825fc..9e4f07c9 100755 --- a/Apollo/api/application/controllers/Report.php +++ b/Apollo/api/application/controllers/Report.php @@ -195,6 +195,11 @@ class Report extends REST_Controller { $u = $this->post('university'); $getStatus = $this->report_model->app_pending($bat,$br,$u); + $count = count($getStatus['app_pending_data']); + for ($i = 0;$i < $count;$i++) { + $getStatus['app_pending_data'][$i]->FormType = implode('-', array_map('ucfirst', explode('-', $getStatus['app_pending_data'][$i]->FormType))); + } + // die(); //print_r($getStatus); if ($getStatus) { diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index d614bfda..6fe14c2e 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -180,7 +180,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se } $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem,Sem_year"; - + print_r($sql);die(); $leadDet=$this->db->query($sql); $mstatusDetails = $leadDet->result(); if (count($mstatusDetails) > 0) { @@ -643,7 +643,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se - $sql = "SELECT + $sql1 = "SELECT APFS.ID as id, ifnull(APFS.Registration_Details_ID,'-') AS regid, APFS.ListCode as StatusCode, @@ -681,6 +681,44 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se "; +$sql ="SELECT +APFS.ID as id, +ifnull(APFS.Registration_Details_ID,'-') AS regid, + APFS.ListCode as StatusCode, + ifnull(APFS.AppFormDate,'-') as StatusUpdationOn, + ifnull(APFS.Comments,'-') as StatusComments, + PKL.ListName as StatusName, + concat(STU.Firstname,' ', STU.Lastname) as Student_name, + STU.Fathername as FatherName, + STU.MobileNumber as Phone_number, + STU.AlternateNumber as AlternateNumber, + STU.PresentAddress as address, + COUR.CourseName as Course_name, + UNIV.UniversityName as University, + ifnull(sfpd.BILL,'-') as InitialPayDate, + RD.Student_Fee_Status_Id as FeesStatusID, + ifnull(STU_COUR.EnrollmentID,'-') as EnrollmentNumber, + CFD.Sem_Year as Sem_Year, + RD.RegistrationType as FormType, + STU.StudentID as Student_id,ifnull(sfs.RollNo,'-') as StudentRollNo, + ifnull(STU_COUR.Status,'-') as StuCourStatus, + BALFEE.totalpayable as CourseFees, + BALFEE.totalpaid AS paidAmount, + BALFEE.balpayable AS balance +FROM T_ApplicationFormStatus AS APFS +LEFT JOIN T_Registration_Details AS RD ON RD.ID = APFS.Registration_Details_ID +LEFT JOIN T_PickListDetails AS PKL ON PKL.ListCode = APFS.ListCode +LEFT JOIN T_StudentDetails AS STU ON STU.StudentID = RD.StudentID +LEFT JOIN T_CourseMaster AS COUR ON COUR.CourseID = RD.CourseID +LEFT JOIN T_Student_CourseDetails AS STU_COUR ON STU_COUR.StudentID = RD.StudentID AND STU_COUR.CourseID = RD.CourseID and (STU_COUR.Status NOT IN ('Cancelled','Discontinued','Refund_issued') or STU_COUR.Status is null) +LEFT JOIN T_Course_Fees_Details AS CFD ON CFD.ID = RD.FeeType +LEFT JOIN T_UniversityMaster AS UNIV ON UNIV.UniversityID = COUR.UniversityID +LEFT JOIN BalFees AS BALFEE ON BALFEE.student = STU.StudentID +LEFT JOIN (SELECT FeesId AS FeeID, min(CreatedOn), BillDate AS BILL, BillAmount AS BillAmount FROM T_Students_Fees_PaidDetails GROUP BY FeesId) AS sfpd ON sfpd.FeeID = RD.Student_Fee_Status_Id +LEFT JOIN T_Students_Fees_Status as sfs ON sfs.FeesID=RD.Student_Fee_Status_Id and sfs.StudentID = RD.StudentID +WHERE STU.IsActive = '1' and APFS.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID) + +"; //sfs.RollNo as StudentRollNo // LEFT JOIN T_Students_Fees_Status as sfs ON sfs.FeesID=sfpd.FeeID @@ -742,6 +780,8 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se $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;