diff --git a/Apollo/api/application/controllers/StatusUpdation_Controller.php b/Apollo/api/application/controllers/StatusUpdation_Controller.php index 0b2eae72..da2aafec 100755 --- a/Apollo/api/application/controllers/StatusUpdation_Controller.php +++ b/Apollo/api/application/controllers/StatusUpdation_Controller.php @@ -228,4 +228,4 @@ class StatusUpdation_Controller extends REST_Controller { } } -} +} \ No newline at end of file diff --git a/Apollo/api/application/controllers/Student_Controller.php b/Apollo/api/application/controllers/Student_Controller.php index fa7ee9e3..413842e1 100755 --- a/Apollo/api/application/controllers/Student_Controller.php +++ b/Apollo/api/application/controllers/Student_Controller.php @@ -250,7 +250,7 @@ class Student_Controller extends REST_Controller { public function getListofStuPendingDocDetails_post() { $StudentID = $this->post('exceptId'); $localdata = $this->post('localData'); - $studentPendingDocDetails = $this->student_model->getStudent_PendingDoc_Details($StudentID, $localdata ); + $studentPendingDocDetails = $this->student_model->getStudent_PendingDoc_Details($StudentID, $localdata); if ($studentPendingDocDetails) { $studentPendingDocDetails['status'] = REST_Controller::HTTP_OK; // Set the response and exit @@ -619,4 +619,4 @@ class Student_Controller extends REST_Controller { } } -} +} \ 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 b50daeef..64f8d24e 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -513,10 +513,9 @@ class StatusUpdation_model extends CI_Model { // get student details $this->db->select('PLD.ListCode'); $this->db->from(PICK_LIST_DETAILS . ' as PLD'); - $this->db->like('PLD.ListName', 'ISSUED TO STUDENT','after'); + $this->db->where('PLD.ListName', 'ISSUED TO STUDENTS'); $this->db->where('PLD.ListCode', $fromDetails[0]['ListCode']); $this->db->where('PLD.IsActive', '1'); - $this->db->where('PLD.BranchCode', $reqDetails['localBranchID']); $checkStatus = $this->db->get()->last_row(); if ($checkStatus) { $studentDetails = $this->studentInfo($fromDetails); @@ -526,7 +525,7 @@ class StatusUpdation_model extends CI_Model { $arrayDetails['University'] = $studentDetails->UniversityName; $arrayDetails['Course'] = $studentDetails->CourseName; $arrayDetails['StatusCode'] = $fromDetails[0]['ListCode']; - $arrayDetails['CreatedBranch'] = $reqDetails['localBranchID']; + $arrayDetails['CreatedBranch'] = $fromDetails[0]['BranchCode']; $arrayDetails['CreatedOn'] = $fromDetails[0]['CreatedOn']; $arrayDetails['FollowupOn'] = $fromDetails[0]['AnsDate']; $arrayDetails['FollowupComments'] = $fromDetails[0]['Comments']; @@ -551,7 +550,6 @@ class StatusUpdation_model extends CI_Model { $this->db->select('ActivityID,ActivityName'); $this->db->like('ActivityName', 'Answer Booklet', 'after'); $this->db->where('IsActive', '1'); - $this->db->where('BranchCode', $reqDetails['localBranchID']); $activityDetails = $this->db->get(ACTIVITY)->last_row(); if ($activityDetails) { $newLeadDetails['MobileNumber'] = $arrayDetails['MobileNumber']; @@ -570,7 +568,6 @@ class StatusUpdation_model extends CI_Model { $track_Details['StatusCode'] = $arrayDetails['StatusCode']; $track_Details['CreatedBy'] = $arrayDetails['CreatedBy']; $track_Details['CreatedOn'] = $arrayDetails['CreatedOn']; - $track_Details['UpdatedOn'] = $arrayDetails['CreatedOn']; $track_Details['CreatedBranch'] = $arrayDetails['CreatedBranch']; $this->db->insert(LEAD_TRACKING, $track_Details); // this if for insert tracking details @@ -585,6 +582,105 @@ class StatusUpdation_model extends CI_Model { } } + // hide tracking updated code + /*$this->db->select('LD.LeadID,LT.TrackingID'); + $this->db->from(LEAD_DETAILS.' as LD'); + $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID'); + $this->db->where('LD.MobileNumber',$arrayDetails['MobileNumber']); + $this->db->where('LT.ActivityStatus',$activityDetails->ActivityID); + $this->db->like('LT.University',$arrayDetails['University'],'after'); + $this->db->like('LT.Course',$arrayDetails['Course'],'after'); + $leadDet=$this->db->get()->last_row(); + + if($leadDet){ + $this->db->select('FollowupOn'); + $this->db->where('TrackingID',$leadDet->TrackingID); + // $this->db->order_by('InteractionId','DESC'); + $existFollowupOn = $this->db->get(LEAD_TRACKING_FOLLOWUP)->last_row(); + // upate tracking status + $changeStatusCode['StatusCode'] = $arrayDetails['StatusCode']; + $changeStatusCode['UpdatedBy'] = $arrayDetails['CreatedBy']; + $changeStatusCode['UpdatedOn'] = $arrayDetails['CreatedOn']; + $changeStatusCode['CreatedBranch']=$arrayDetails['CreatedBranch']; + + $this->db->where('TrackingID',$leadDet->TrackingID); + $this->db->update(LEAD_TRACKING, $changeStatusCode); + // end update status + $updateTrackDetails['TrackingID'] = $leadDet->TrackingID; + $updateTrackDetails['FollowupOn'] = $existFollowupOn->FollowupOn; + $updateTrackDetails['FollowupComments'] = $arrayDetails['FollowupComments']; + $updateTrackDetails['CreatedBy'] = $arrayDetails['CreatedBy']; + $updateTrackDetails['CreatedOn'] = $arrayDetails['CreatedOn']; + $this->db->insert(LEAD_TRACKING_FOLLOWUP, $updateTrackDetails); + + } + + else{ + $this->db->select('LeadID'); + $this->db->where('MobileNumber',$arrayDetails['MobileNumber']); + $checkLeadDet=$this->db->get(LEAD_DETAILS)->last_row(); + if($checkLeadDet){ + $updateLeadDetails['LeadID'] = $checkLeadDet->LeadID; + $updateLeadDetails['ActivityStatus'] = $activityDetails->ActivityID; + $updateLeadDetails['University'] = $arrayDetails['University']; + $updateLeadDetails['Course'] = $arrayDetails['Course']; + $updateLeadDetails['AssignedTo'] = $arrayDetails['CreatedBy']; + $updateLeadDetails['StatusCode'] = $arrayDetails['StatusCode']; + $updateLeadDetails['CreatedBy'] = $arrayDetails['CreatedBy']; + $updateLeadDetails['CreatedOn'] = $arrayDetails['CreatedOn']; + $updateLeadDetails['CreatedBranch']=$arrayDetails['CreatedBranch']; + $this->db->insert(LEAD_TRACKING, $updateLeadDetails); + // this if for insert tracking details + if($this->db->affected_rows() == '1'){ + $followup_Details['TrackingID']=$this->db->insert_id(); + $followup_Details['FollowupOn']=$arrayDetails['FollowupOn']; + $followup_Details['FollowupComments']=$arrayDetails['FollowupComments']; + $followup_Details['CreatedBy'] = $arrayDetails['CreatedBy']; + $followup_Details['CreatedOn'] = $arrayDetails['CreatedOn']; + $this->db->insert(LEAD_TRACKING_FOLLOWUP, $followup_Details); + // this if for insert follow up details + + } + + } + else{ + $newLeadDetails['MobileNumber'] = $arrayDetails['MobileNumber']; + $newLeadDetails['LeadName'] = $arrayDetails['LeadName']; + $newLeadDetails['CreatedBy'] = $arrayDetails['CreatedBy']; + $newLeadDetails['CreatedOn'] = $arrayDetails['CreatedOn']; + $this->db->insert(LEAD_DETAILS, $newLeadDetails); + // 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(); + $track_Details['ActivityStatus'] = $activityDetails->ActivityID; + $track_Details['University'] = $arrayDetails['University']; + $track_Details['Course'] = $arrayDetails['Course']; + $track_Details['AssignedTo'] = $arrayDetails['CreatedBy']; + $track_Details['StatusCode'] = $arrayDetails['StatusCode']; + $track_Details['CreatedBy'] = $arrayDetails['CreatedBy']; + $track_Details['CreatedOn'] = $arrayDetails['CreatedOn']; + $track_Details['CreatedBranch']=$arrayDetails['CreatedBranch']; + $this->db->insert(LEAD_TRACKING, $track_Details); + // this if for insert tracking details + if($this->db->affected_rows() == '1'){ + $insertfollowup_Details['TrackingID']=$this->db->insert_id(); + $insertfollowup_Details['FollowupOn']=$arrayDetails['FollowupOn']; + $insertfollowup_Details['FollowupComments']=$arrayDetails['FollowupComments']; + $insertfollowup_Details['CreatedBy'] = $arrayDetails['CreatedBy']; + $insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn']; + $this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details); + // this if for insert follow up details + + } + + + } + + } + + + }*/ } } return true; @@ -603,7 +699,6 @@ class StatusUpdation_model extends CI_Model { $this->db->where('CFM.CertificateName', 'APPLICATION'); $this->db->where('CFM.CertificationID', $fromDetails[0]['CertificationType']); $this->db->where('CFM.IsActive', '1'); - $this->db->where('CFM.BranchCode', $reqDetails['localBranchID']); $checkApplicationStatus = $this->db->get()->last_row(); if ($checkApplicationStatus) { // get student details @@ -612,7 +707,6 @@ class StatusUpdation_model extends CI_Model { $this->db->where('PLD.ListName', 'PENDING'); $this->db->where('PLD.ListCode', $fromDetails[0]['ListCode']); $this->db->where('PLD.IsActive', '1'); - $this->db->where('PLD.BranchCode', $reqDetails['localBranchID']); $checkStatus = $this->db->get()->last_row(); if ($checkStatus) { $studentDetails = $this->studentInfoForDocumentStatus($fromDetails); @@ -622,7 +716,7 @@ class StatusUpdation_model extends CI_Model { $arrayDetails['University'] = $studentDetails->UniversityName; $arrayDetails['Course'] = $studentDetails->CourseName; $arrayDetails['StatusCode'] = $fromDetails[0]['ListCode']; - $arrayDetails['CreatedBranch'] = $reqDetails['localBranchID']; + $arrayDetails['CreatedBranch'] = $fromDetails[0]['BranchCode']; $arrayDetails['CreatedOn'] = $fromDetails[0]['CreatedOn']; $arrayDetails['FollowupOn'] = $fromDetails[0]['AppDate']; $arrayDetails['FollowupComments'] = $fromDetails[0]['Comments']; @@ -647,7 +741,6 @@ class StatusUpdation_model extends CI_Model { $this->db->select('ActivityID,ActivityName'); $this->db->like('ActivityName', 'Application', 'after'); $this->db->where('IsActive', '1'); - $this->db->where('BranchCode', $reqDetails['localBranchID']); $activityDetails = $this->db->get(ACTIVITY)->last_row(); if ($activityDetails) { $newLeadDetails['MobileNumber'] = $arrayDetails['MobileNumber']; @@ -666,7 +759,6 @@ class StatusUpdation_model extends CI_Model { $track_Details['StatusCode'] = $arrayDetails['StatusCode']; $track_Details['CreatedBy'] = $arrayDetails['CreatedBy']; $track_Details['CreatedOn'] = $arrayDetails['CreatedOn']; - $track_Details['UpdatedOn'] = $arrayDetails['CreatedOn']; $track_Details['CreatedBranch'] = $arrayDetails['CreatedBranch']; $this->db->insert(LEAD_TRACKING, $track_Details); // this if for insert tracking details @@ -681,6 +773,105 @@ class StatusUpdation_model extends CI_Model { } } + /// hide seperate track id + /* $this->db->select('LD.LeadID,LT.TrackingID'); + $this->db->from(LEAD_DETAILS.' as LD'); + $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID'); + $this->db->where('LD.MobileNumber',$arrayDetails['MobileNumber']); + $this->db->where('LT.ActivityStatus',$activityDetails->ActivityID); + $this->db->like('LT.University',$arrayDetails['University'],'after'); + $this->db->like('LT.Course',$arrayDetails['Course'],'after'); + $leadDet=$this->db->get()->last_row(); + + if($leadDet){ + $this->db->select('FollowupOn'); + $this->db->where('TrackingID',$leadDet->TrackingID); + // $this->db->order_by('InteractionId','DESC'); + $existFollowupOn = $this->db->get(LEAD_TRACKING_FOLLOWUP)->last_row(); + // upate tracking status + $changeStatusCode['StatusCode'] = $arrayDetails['StatusCode']; + $changeStatusCode['UpdatedBy'] = $arrayDetails['CreatedBy']; + $changeStatusCode['UpdatedOn'] = $arrayDetails['CreatedOn']; + $changeStatusCode['CreatedBranch']=$arrayDetails['CreatedBranch']; + + $this->db->where('TrackingID',$leadDet->TrackingID); + $this->db->update(LEAD_TRACKING, $changeStatusCode); + // end update status + $updateTrackDetails['TrackingID'] = $leadDet->TrackingID; + $updateTrackDetails['FollowupOn'] = $arrayDetails['FollowupOn']; + $updateTrackDetails['FollowupComments'] = $arrayDetails['FollowupComments']; + $updateTrackDetails['CreatedBy'] = $arrayDetails['CreatedBy']; + $updateTrackDetails['CreatedOn'] = $arrayDetails['CreatedOn']; + $this->db->insert(LEAD_TRACKING_FOLLOWUP, $updateTrackDetails); + + } + + else{ + $this->db->select('LeadID'); + $this->db->where('MobileNumber',$arrayDetails['MobileNumber']); + $checkLeadDet=$this->db->get(LEAD_DETAILS)->last_row(); + if($checkLeadDet){ + $updateLeadDetails['LeadID'] = $checkLeadDet->LeadID; + $updateLeadDetails['ActivityStatus'] = $activityDetails->ActivityID; + $updateLeadDetails['University'] = $arrayDetails['University']; + $updateLeadDetails['Course'] = $arrayDetails['Course']; + $updateLeadDetails['AssignedTo'] = $arrayDetails['CreatedBy']; + $updateLeadDetails['StatusCode'] = $arrayDetails['StatusCode']; + $updateLeadDetails['CreatedBy'] = $arrayDetails['CreatedBy']; + $updateLeadDetails['CreatedOn'] = $arrayDetails['CreatedOn']; + $updateLeadDetails['CreatedBranch']=$arrayDetails['CreatedBranch']; + $this->db->insert(LEAD_TRACKING, $updateLeadDetails); + // this if for insert tracking details + if($this->db->affected_rows() == '1'){ + $followup_Details['TrackingID']=$this->db->insert_id(); + $followup_Details['FollowupOn']=$arrayDetails['FollowupOn']; + $followup_Details['FollowupComments']=$arrayDetails['FollowupComments']; + $followup_Details['CreatedBy'] = $arrayDetails['CreatedBy']; + $followup_Details['CreatedOn'] = $arrayDetails['CreatedOn']; + $this->db->insert(LEAD_TRACKING_FOLLOWUP, $followup_Details); + // this if for insert follow up details + + } + + } + else{ + $newLeadDetails['MobileNumber'] = $arrayDetails['MobileNumber']; + $newLeadDetails['LeadName'] = $arrayDetails['LeadName']; + $newLeadDetails['CreatedBy'] = $arrayDetails['CreatedBy']; + $newLeadDetails['CreatedOn'] = $arrayDetails['CreatedOn']; + $this->db->insert(LEAD_DETAILS, $newLeadDetails); + // 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(); + $track_Details['ActivityStatus'] = $activityDetails->ActivityID; + $track_Details['University'] = $arrayDetails['University']; + $track_Details['Course'] = $arrayDetails['Course']; + $track_Details['AssignedTo'] = $arrayDetails['CreatedBy']; + $track_Details['StatusCode'] = $arrayDetails['StatusCode']; + $track_Details['CreatedBy'] = $arrayDetails['CreatedBy']; + $track_Details['CreatedOn'] = $arrayDetails['CreatedOn']; + $track_Details['CreatedBranch']=$arrayDetails['CreatedBranch']; + $this->db->insert(LEAD_TRACKING, $track_Details); + // this if for insert tracking details + if($this->db->affected_rows() == '1'){ + $insertfollowup_Details['TrackingID']=$this->db->insert_id(); + $insertfollowup_Details['FollowupOn']=$arrayDetails['FollowupOn']; + $insertfollowup_Details['FollowupComments']=$arrayDetails['FollowupComments']; + $insertfollowup_Details['CreatedBy'] = $arrayDetails['CreatedBy']; + $insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn']; + $this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details); + // this if for insert follow up details + + } + + + } + + } + + + }*/ } } return true; @@ -696,13 +887,12 @@ class StatusUpdation_model extends CI_Model { * created by kms * */ public function studentInfo($details = null) { - $this->db->select('ST.Firstname,ST.MobileNumber,US.UniversityName,CU.CourseName'); $this->db->from(COURSE_FEES . ' as CF'); $this->db->join(STUDENTCOURSE . ' as STC', 'STC.CourseID = CF.CourseID'); $this->db->join(STUDENTS . ' as ST', 'ST.StudentID = STC.StudentID'); $this->db->join(COURSE . ' as CU', 'CU.CourseID = STC.CourseID'); - $this->db->join(UNIVERSITY . ' as US', 'US.UniversityID = STC.UniversityID AND STC.BranchID=US.BranchCode'); + $this->db->join(UNIVERSITY . ' as US', 'US.UniversityID = STC.UniversityID'); $this->db->where('ST.StudentID', $details[0]['StudentID']); $this->db->where('CF.ID', $details[0]['CourseID']); $leadDet = $this->db->get()->last_row(); @@ -721,7 +911,7 @@ class StatusUpdation_model extends CI_Model { $this->db->from(STUDENTCOURSE . ' as STC'); $this->db->join(STUDENTS . ' as ST', 'ST.StudentID = STC.StudentID'); $this->db->join(COURSE . ' as CU', 'CU.CourseID = STC.CourseID'); - $this->db->join(UNIVERSITY . ' as US', 'US.UniversityID = STC.UniversityID AND STC.BranchID=US.BranchCode'); + $this->db->join(UNIVERSITY . ' as US', 'US.UniversityID = STC.UniversityID'); $this->db->where('ST.StudentID', $details[0]['StudentID']); $this->db->where('STC.CourseID', $details[0]['CourseID']); $leadDet = $this->db->get()->last_row(); @@ -731,4 +921,4 @@ class StatusUpdation_model extends CI_Model { return false; } } -} +} \ No newline at end of file diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php index f5a7d87a..7d111baa 100755 --- a/Apollo/api/application/models/Student_model.php +++ b/Apollo/api/application/models/Student_model.php @@ -315,7 +315,7 @@ class Student_model extends CI_Model { ORDER BY S.CreatedOn"; } // ### query branch code changed from student branch code to student course branch code - // AND S.BranchCode = '$loginUserBranchId' -> SC.BranchCode = '$loginUserBranchId + // AND S.BranchCode = '$loginUserBranchId' -> SC.BranchCode = '$loginUserBranchId } $stuDetails = $this->db->query($subQuery); $checkArr = $stuDetails->result(); @@ -443,7 +443,7 @@ class Student_model extends CI_Model { $result['existingStudentDetailsStatus'] = true; return $result; } - + // check exist public function check_exist($data, $checkData) { if ($checkData == 'studentId') { @@ -708,7 +708,7 @@ class Student_model extends CI_Model { } catch(Exception $e) { // echo "Error :"; - + } finally { $results['message'] = 'Deleted Successfully.'; @@ -927,7 +927,7 @@ class Student_model extends CI_Model { // Update Student Course Details public function update_student_course($reqArr, $id) { - $this->db->select('*'); + $this->db->select('*'); $this->db->from(STUDENTCOURSE); $this->db->where('StudentID', $reqArr['StudentID']); $this->db->where('CourseID', $reqArr['CourseID']); @@ -963,7 +963,7 @@ class Student_model extends CI_Model { return $result; } } - + /* * update followup details for application status in call tracking * created by kms @@ -1040,7 +1040,7 @@ class Student_model extends CI_Model { $insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn']; $this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details); // this if for insert follow up details - + } } } else { @@ -1070,4 +1070,4 @@ class Student_model extends CI_Model { return false; } } -} +} \ No newline at end of file