diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index d00e7b67..7c68d5cd 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -348,6 +348,9 @@ $route['report_examfee'] = 'Report/examfee'; $route['report_balfee'] = 'Report/balfee'; $route['report_lead'] = 'Report/lead'; $route['insertUniversityfile'] = 'UniversityFile_Controller/insertUniversityfile'; +//Data correction +$route['Stud_Merge'] = 'DataCorrection_Controller/StudMerge'; +$route['get_Mob'] = 'DataCorrection_Controller/getMob'; //Application Form Details $route['getApplicationFromDetails'] = 'StatusUpdation_Controller/getApplicationFromDetails'; diff --git a/Apollo/api/application/controllers/DataCorrection_Controller.php b/Apollo/api/application/controllers/DataCorrection_Controller.php index 70660b6f..e596b8f2 100644 --- a/Apollo/api/application/controllers/DataCorrection_Controller.php +++ b/Apollo/api/application/controllers/DataCorrection_Controller.php @@ -35,9 +35,32 @@ class DataCorrection_Controller extends REST_Controller { public function StudMerge_post() { - $toDelete = $this->post('toDelete'); - $toMerge = $this->post('toMerge'); - $getStatus = $this->Data_correction->Student_Merge($toDelete,$toMerge); + $name = $this->post('name'); + $getStatus = $this->Data_correction->Student_Merge($name); + //print_r($getStatus); + if ($getStatus) + { + $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 + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'No records found!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + + + } + + public function getMob_post() + { + $deleteNo = $this->post('deleteNo'); + $mergeNo = $this->post('mergeNo'); + $getStatus = $this->Data_correction->getMobile($deleteNo,$mergeNo); //print_r($getStatus); if ($getStatus) { diff --git a/Apollo/api/application/controllers/HallTickets_Controller.php b/Apollo/api/application/controllers/HallTickets_Controller.php index 7a6e1888..511d6dda 100755 --- a/Apollo/api/application/controllers/HallTickets_Controller.php +++ b/Apollo/api/application/controllers/HallTickets_Controller.php @@ -315,7 +315,13 @@ class HallTickets_Controller extends REST_Controller { $branchId = $this->post('branchId'); $Cdate = new DateTime('now',new DateTimeZone('Asia/Kolkata')); $CreatedOn = $Cdate->format('Y-m-d H:i:s'); - foreach($courseArray as $CourseDatialArray) +/////////check semcoursemapping//// + $data['subjectDetails'] = $this->Hallticket_model->getSubjectDetails($universityID,$tempCourseArray,$branchId); + $data['subjectDetails'] = $this->Hallticket_model->getExistDetailsfileupload($university,$courseArray,$branchId); + // print_r( $data['subjectDetails']); + if($data['subjectDetails'] == 1 ) + { + foreach($courseArray as $CourseDatialArray) { $course=$CourseDatialArray; $schedulemaster = array('UniversityID'=>$university,'CourseID'=>$course,'BranchCode'=>$branchId,'CreatedBy'=>$requestedBy,'CreatedOn'=>$CreatedOn); @@ -344,7 +350,27 @@ class HallTickets_Controller extends REST_Controller { 'status' => REST_Controller::HTTP_NOT_FOUND ], REST_Controller::HTTP_NOT_FOUND); - } + } + } + + // else if($data['subjectDetails'] == 0) + else + { + $this->response([ + 'message' => 'Please Mapping the course supject!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); + } + // else{ + + // $this->response([ + // 'message' => 'No records found!', + // 'status' => REST_Controller::HTTP_NOT_FOUND + // ], REST_Controller::HTTP_NOT_FOUND); + + // } +///////////////////// + } diff --git a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php index 1b50ad60..dda9badb 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -106,11 +106,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { public function getStudentUnivFeeCompareDetails_post(){ $searchData = $this->post('search'); - - $univID = $searchData['University']; - $sessionID = $searchData['Session']; - $getUnivStudentFeeCompare = $this->receive_model->getStudentUnivFeeCompareDetails($univID,$sessionID);// Check if the users data store contains users (in case the database result returns NULL) + $getUnivStudentFeeCompare = $this->receive_model->getStudentUnivFeeCompareDetails($searchData);// Check if the users data store contains users (in case the database result returns NULL) if ($getUnivStudentFeeCompare) { $getUnivStudentFeeCompare['status'] = REST_Controller::HTTP_OK; diff --git a/Apollo/api/application/models/Data_correction.php b/Apollo/api/application/models/Data_correction.php index f84ea742..4f912ab3 100644 --- a/Apollo/api/application/models/Data_correction.php +++ b/Apollo/api/application/models/Data_correction.php @@ -7,9 +7,15 @@ defined('BASEPATH') OR exit('No direct script access allowed'); class Data_Correction extends CI_Model { - Public function Student_Merge($toDelete=null,$toMerge=null) + Public function Student_Merge($name=null) { - $sql = ""; + $sql = "select scd.StudentID as Student_id,scd.CourseID as cid,Firstname as Student_name,std.MobileNumber as Phone_number,CourseName as Course_name,UniversityName as University +from T_Student_CourseDetails as scd +left join T_StudentDetails as std on std.StudentID = scd.StudentID and std.IsActive = 1 +left join T_CourseMaster AS cm ON cm.CourseID = scd.CourseID +left join T_UniversityMaster as univ on univ.UniversityID = scd.UniversityID +where Firstname like '".$name."' +group by Student_id,cid"; $b=$this->db->query($sql); $batch = $b->result(); if (count($batch) > 0) { @@ -21,6 +27,26 @@ class Data_Correction extends CI_Model } return $results; } + + Public function getMobile($deleteNo=null,$mergeNo=null) + { + $sql = "call SP_MERGE_STUDENT_DATA('".$deleteNo."','".$mergeNo."',@countRow); + "; + $a=$this->db->query($sql); + $sqlOut = " select @countRow as counts;"; + $b=$this->db->query($sqlOut); + $batch = $b->result(); + //echo $batch[0]->counts; + if ($batch[0]->counts > 0) { + $results['MergeStatus'] = true; + $results['after_Merge'] = $batch; + $results['message'] = 'Student details successfully merged'; + } else { + $results['MergeStatus'] = false; + $results['message'] = 'Can not Merge'; + } + return $results; + } diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php index b4927b14..b5dc11ca 100755 --- a/Apollo/api/application/models/Hallticket_model.php +++ b/Apollo/api/application/models/Hallticket_model.php @@ -183,19 +183,11 @@ class Hallticket_model extends CI_Model $courseDetails = $this->db->get('T_CourseMaster'); return $courseDetails->result(); } - - /* - * check existing data,only batchschedule. - * @params university id and CourseID - * created by Bala - * */ - - public function getExistDetails($universityID,$courseIDS,$branchId) +public function getExistDetailsfileupload($universityID,$courseIDS,$branchId) { - // echo $universityID; - // //foreach() - // print_r ($courseIDS); - // die(); + +// print_r($courseIDS); +// echo $universityID; $i=0; foreach($courseIDS as $c) { @@ -203,9 +195,9 @@ class Hallticket_model extends CI_Model // $tempCourseArray= $c['CourseID']; $this->db->select ('count(*) as count'); - $this->db->from('T_Batch_Schedule_Master'); + $this->db->from('T_SemSubMap_Master'); $this->db->where('UniversityID',$universityID); - $this->db->where('CourseID', $c); + $this->db->where('CourseID',$c); $result = $this->db->get(); $res = $result->result(); @@ -221,18 +213,45 @@ class Hallticket_model extends CI_Model } else { - //////////////////// - // $this->db->distinct(); - // $this->db->select('SubjectID,SubjectCode,SubjectName'); - // $this->db->from('T_SubjectMaster'); - // // //$this->db->join('T_SubjectMaster','T_CourseSubject_Details.SubjectID=T_SubjectMaster.SubjectID'); - // $this->db->where('T_SubjectMaster.IsActive','1'); - // // // $this->db->where('T_CourseSubject_Details.UniversityID',$universityID); - // $this->db->where_in('T_SubjectMaster.BranchCode',$branchId); - // $result = $this->db->get(); - // //echo $this->db->last_query(); - //return $result->result(); - ///////////////////////// + return 0; + } + } + /* + * check existing data,only batchschedule. + * @params university id and CourseID + * created by Bala + * */ + + public function getExistDetails($universityID,$courseIDS,$branchId) + { + + $i=0; + foreach($courseIDS as $c) + { + + // $tempCourseArray= $c['CourseID']; + + $this->db->select ('count(*) as count'); + $this->db->from('T_Batch_Schedule_Master'); + $this->db->where('UniversityID',$universityID); + $this->db->where('CourseID', $c); + // $this->db->where('BranchCode',$branchId); + $result = $this->db->get(); + $res = $result->result(); + + if($res[0]->count > 0 ) + { + $i++; + } + } + + if( $i > 0 ) + { + return 1; + } + else + { + foreach($courseIDS as $c) { $this->db->distinct(); diff --git a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php index 09189869..118c4a71 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -18,25 +18,26 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { public function getUnivCourseFromFileDetails(){ $selectQuery = "SELECT UniversityCode, UniversityName FROM T_Enrolment_Received_From_University GROUP BY UniversityCode"; $queryDetails = $this->db->query($selectQuery); - if($queryDetails->result()){ foreach ($queryDetails->result() as $formIdDetails){ - $result['univCode'] = $formIdDetails->UniversityCode; - $result['univName'] = $formIdDetails->UniversityName; + $univResult['univCode'] = $formIdDetails->UniversityCode; + $univResult['univName'] = $formIdDetails->UniversityName; $selectCourseQuery = "SELECT CourseCode, CourseName FROM T_Enrolment_Received_From_University WHERE UniversityCode = '$formIdDetails->UniversityCode' GROUP BY CourseCode"; $queryCourseDetails = $this->db->query($selectCourseQuery); - $result['univCourseDetails'] = $queryCourseDetails->result(); + $univResult['univCourseDetails'] = $queryCourseDetails->result(); $selectSessionQuery = "SELECT SessionName FROM T_Enrolment_Received_From_University WHERE UniversityCode = '$formIdDetails->UniversityCode' GROUP BY CourseCode"; $querySessionDetails = $this->db->query($selectSessionQuery); - $result['univSessionDetails'] = $querySessionDetails->result(); + $univResult['univSessionDetails'] = $querySessionDetails->result(); + $merge[]=$univResult; } + $finalArray['status'] = true; $finalArray['message'] = "Success."; - $finalArray['details'] = $result; + $finalArray['details'] = $merge; } else { $finalArray['status'] = false; $finalArray['message'] = "No record found."; @@ -476,7 +477,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $results['stuFeeList_details'] = "details updated successfully."; return $results; } - public function getStudentUnivFeeCompareDetails($univCode=null,$session=null){ + public function getStudentUnivFeeCompareDetails($search=null){ $mergeFormDetails=array(); $this->db->distinct('ENU.FormID'); $this->db->select('ENU.FormID, ENU.FormType, ENU.SemesterYear, ENU.EnrolmentNo,ENU.RollNo, ST.*,UN.UniversityID, UN.UniversityName,CM.CourseID,CM.CourseCode,CM.CourseName'); @@ -485,16 +486,22 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $this->db->join(COURSE.' as CM', 'CM.CourseID = STC.CourseID'); $this->db->join(STUDENTS.' as ST', 'ST.StudentID = STC.StudentID'); $this->db->join(UNIVERSITY.' as UN', 'UN.UniversityID = STC.UniversityID'); - // $this->db->join(FORMFEESRECEIVEDFROMUNIV.' as t2', 't2.FormID = t1.FormID','left'); - //$this->db->where('t1.CourseCode', $courseCode); - $this->db->where('ENU.UniversityCode', $univCode); + if($search['University']!=''){ + $this->db->where('ENU.UniversityCode',$search['University']); + } + if($search['Course']!=''){ + $this->db->where('ENU.CourseName',$search['Course']); + } + if($search['Sem']!=''){ + $this->db->where('ENU.SemesterYear',$search['Sem']); + } $details = $this->db->get(); $detailsList = $details->result(); if($detailsList){ foreach ($detailsList as $fetchStudentRow){ // form id bases get student paid details - $getStudentsetFeesDetails=$this->getStudentsetFeesDetails($fetchStudentRow->StudentID,$fetchStudentRow->CourseID,$fetchStudentRow->SemesterYear,$session); + $getStudentsetFeesDetails=$this->getStudentsetFeesDetails($fetchStudentRow->StudentID,$fetchStudentRow->CourseID,$fetchStudentRow->SemesterYear); if(isset($getStudentsetFeesDetails['status']) AND $getStudentsetFeesDetails['status']==true ){ $formResult['SessionName']=$getStudentsetFeesDetails['SessionName']; $formResult['FormID']=$fetchStudentRow->FormID; @@ -545,7 +552,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { return $resultArr; } /*form id bases get student paid details for getStudentUnivFeeCompareDetails methods*/ - public function getStudentsetFeesDetails($studentID=null,$courseID=null,$sem=null,$session=null){ + public function getStudentsetFeesDetails($studentID=null,$courseID=null,$sem=null){ // create array for find sem value $keyArray = array(0 => 'SEM1', 1 => 'SEM2', 2 => 'SEM3', 3 => 'SEM4',4 => 'SEM5',5 => 'SEM6',6 => 'SEM7',7 => 'SEM8',8 => 'YEAR1',9 => 'YEAR2',10 => 'YEAR3',11 => 'YEAR4',12 => "DMC CHANGE SEM1",13 => "DMC CHANGE SEM2",14 => "DMC CHANGE SEM3",15 => "DMC CHANGE SEM4",16 => "DMC CHANGE SEM5",17 => "DMC CHANGE SEM6",18 => "DMC CHANGE SEM7",19 => "DMC CHANGE SEM8",20 => "DMC CHANGE YEAR1",21 => "DMC CHANGE YEAR2",22 => "DMC CHANGE YEAR3",23 => "DMC CHANGE YEAR4"); $valueArray = array("1","2","3","4","5","6","7","8","1","2","3","4","1","2","3","4","5","6","7","8","1","2","3","4"); @@ -564,7 +571,6 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $this->db->join(SESSIONMASTER . ' as SM' , 'SM.SessionID = SFS.SessionName'); $this->db->where('SFS.FeesType', $fetchRow->ID); $this->db->where('SFS.StudentID', $studentID); - $this->db->where('SFS.SessionName', $session); $feesDetails = $this->db->get()->last_row(); if ($feesDetails) { $feesArray['status'] = true; @@ -587,7 +593,6 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $this->db->join(SESSIONMASTER . ' as SM' , 'SM.SessionID = SFS.SessionName'); $this->db->where('SFS.FeesType',$fetchRow->ID); $this->db->where('SFS.StudentID',$studentID); - $this->db->where('SFS.SessionName', $session); $feesDetails = $this->db->get()->last_row(); if ($feesDetails) { $feesArray['status'] = true; @@ -612,47 +617,132 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { */ public function getUnmatchedFormDetails($reqType){ - // $this->db->select('t1.*'); - // $this->db->from('T_Enrolment_Received_From_University as t1'); - // $this->db->join('T_Student_CourseDetails as t2', 't2.EnrollmentID = t1.EnrolmentNo'); - - if($reqType == 'EnrolmentIDFile'){ - $query = "select * - from T_Enrolment_Received_From_University as t1 - where t1.EnrolmentNo NOT IN (select EnrollmentID from T_Student_CourseDetails)"; - $details = $this->db->query($query); - $detailsList = $details->result(); - if($detailsList){ - $resultArr['unMatchedRecordDetails'] = $detailsList; - $resultArr['unMatchedRecordStatus'] = true; - $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile'; - $resultArr['message'] = "Successfully data generated"; - } else { + $keyArray = array(0 => 'SEM1', 1 => 'SEM2', 2 => 'SEM3', 3 => 'SEM4',4 => 'SEM5',5 => 'SEM6',6 => 'SEM7',7 => 'SEM8',8 => 'YEAR1',9 => 'YEAR2',10 => 'YEAR3',11 => 'YEAR4',12 => "DMC CHANGE SEM1",13 => "DMC CHANGE SEM2",14 => "DMC CHANGE SEM3",15 => "DMC CHANGE SEM4",16 => "DMC CHANGE SEM5",17 => "DMC CHANGE SEM6",18 => "DMC CHANGE SEM7",19 => "DMC CHANGE SEM8",20 => "DMC CHANGE YEAR1",21 => "DMC CHANGE YEAR2",22 => "DMC CHANGE YEAR3",23 => "DMC CHANGE YEAR4"); + $valueArray = array("1","2","3","4","5","6","7","8","1","2","3","4","1","2","3","4","5","6","7","8","1","2","3","4"); + $this->db->distinct('ENU.FormID'); + $this->db->select('ENU.*'); + $this->db->from(ENROLMENTRECEIVEDFROMUNIV.' as ENU'); + if($reqType['University']!=''){ + $this->db->where('ENU.UniversityCode',$reqType['University']); + } + if($reqType['Course']!=''){ + $this->db->where('ENU.CourseName',$reqType['Course']); + } + if($reqType['Sem']!=''){ + $this->db->where('ENU.SemesterYear',$reqType['Sem']); + } + $details = $this->db->get(); + $resultArr=array(); + $mergeFormDetails=array(); + if($details->result()){ + foreach ($details->result() as $fRow){ + $this->db->distinct('ENU1.FormID'); + $this->db->select('SC.StudentID,SC.CourseID,SC.EnrollmentID,CF.ID,CF.ProgramType,CF.Sem_Year,ENU1.SemesterYear,ENU1.EnrolmentNo'); + $this->db->from(STUDENTCOURSE.' as SC'); + $this->db->join(ENROLMENTRECEIVEDFROMUNIV .' as ENU1', 'ENU1.EnrolmentNo = SC.EnrollmentID'); + $this->db->join(COURSE_FEES .' as CF', 'CF.CourseID = SC.CourseID'); + $this->db->where('ENU1.EnrolmentNo',$fRow->EnrolmentNo); + $this->db->where('ENU1.FormID',$fRow->FormID); + $getEnrolmentMatchDetails=$this->db->get(); + if($getEnrolmentMatchDetails->result()){ + foreach ($getEnrolmentMatchDetails->result() as $sRow){ + $serachKey = array_search(strtoupper($sRow->Sem_Year), $keyArray); + if ($valueArray[$serachKey] == $sRow->SemesterYear) { + $this->db->select('SFS.FeesID'); + $this->db->from(STUDENTS_FEES_STATUS.' as SFS'); + $this->db->join(COURSE_FEES .' as CF', 'SFS.FeesType = CF.ID'); + $this->db->where('SFS.FeesType',$sRow->ID); + $this->db->where('SFS.CourseID',$sRow->CourseID); + $this->db->where('SFS.StudentID',$sRow->StudentID); + $getEnrolmentMatchDetails=$this->db->get(); + if($getEnrolmentMatchDetails->num_rows()==0){ + $formResult['SessionName']=$fRow->SessionName; + $formResult['FormID']=$fRow->FormID; + $formResult['FormType']=$fRow->FormType; + $formResult['SemesterYear']=$fRow->SemesterYear; + $formResult['CentreCode']=$fRow->CentreCode; + $formResult['CentreState']=$fRow->CentreState; + $formResult['EnrolmentNo']=$fRow->EnrolmentNo; + $formResult['EnromentStatus']=true; + $formResult['SemStatus']=false; + $formResult['CourseCode']=$fRow->CourseCode; + $formResult['CourseName']=$fRow->CourseName; + $formResult['RollNo']=$fRow->RollNo; + $formResult['MobileNumber']=$fRow->MobileNumber; + $formResult['StudentName']=$fRow->StudentName; + $formResult['FatherName']=$fRow->FatherName; + $formResult['MotherName']=$fRow->MotherName; + $formResult['EmailID']=$fRow->EmailID; + $formResult['AlternateNumber']=$fRow->AlternateNumber; + $formResult['Gender']=$fRow->Gender; + $formResult['DOB']=$fRow->DOB; + $formResult['PresentAddress']=$fRow->PresentAddress; + $formResult['PermanentAddress']=$fRow->PermanentAddress; + $formResult['AadharNumber']=$fRow->AadharNumber; + $formResult['OtherID']=$fRow->IDProof; + $formResult['UniversityCode']=$fRow->UniversityCode; + $formResult['UniversityName']=$fRow->UniversityName; + $mergeFormDetails[]=$formResult; + } + } + } + + } + else{ + $formResult['SessionName']=$fRow->SessionName; + $formResult['FormID']=$fRow->FormID; + $formResult['FormType']=$fRow->FormType; + $formResult['SemesterYear']=$fRow->SemesterYear; + $formResult['CentreCode']=$fRow->CentreCode; + $formResult['CentreState']=$fRow->CentreState; + $formResult['EnrolmentNo']=$fRow->EnrolmentNo; + $formResult['EnromentStatus']=false; + $formResult['SemStatus']=true; + $formResult['CourseCode']=$fRow->CourseCode; + $formResult['CourseName']=$fRow->CourseName; + $formResult['RollNo']=$fRow->RollNo; + $formResult['MobileNumber']=$fRow->MobileNumber; + $formResult['StudentName']=$fRow->StudentName; + $formResult['FatherName']=$fRow->FatherName; + $formResult['MotherName']=$fRow->MotherName; + $formResult['EmailID']=$fRow->EmailID; + $formResult['AlternateNumber']=$fRow->AlternateNumber; + $formResult['Gender']=$fRow->Gender; + $formResult['DOB']=$fRow->DOB; + $formResult['PresentAddress']=$fRow->PresentAddress; + $formResult['PermanentAddress']=$fRow->PermanentAddress; + $formResult['AadharNumber']=$fRow->AadharNumber; + $formResult['OtherID']=$fRow->IDProof; + $formResult['UniversityCode']=$fRow->UniversityCode; + $formResult['UniversityName']=$fRow->UniversityName; + $mergeFormDetails[]=$formResult; + + } + + } + // echo sizeof($mergeFormDetails);die(); + if(sizeof($mergeFormDetails)>0){ + $resultArr['unMatchedRecordDetails'] = $mergeFormDetails; + $resultArr['unMatchedRecordStatus'] = true; + $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile'; + $resultArr['message'] = "Successfully data generated"; + } + else{ + $resultArr['unMatchedRecordDetails'] = $mergeFormDetails; + $resultArr['unMatchedRecordStatus'] = false; + $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile'; + $resultArr['message'] = "Successfully data generated"; + } + + + } + else{ $resultArr['unMatchedRecordDetails'] = []; $resultArr['unMatchedRecordStatus'] = false; $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile'; - $resultArr['message'] = "No record found"; - } - }else if($reqType == 'FormIDFile'){ - $query = "select * - from T_FormId_FeeDetails_Received_From_University as t1 - where t1.FormID NOT IN (select FormID from T_Enrolment_Received_From_University)"; - $details = $this->db->query($query); - $detailsList = $details->result(); - - if($detailsList){ - $resultArr['unMatchedRecordDetails'] = $detailsList; - $resultArr['unMatchedRecordStatus'] = true; - $resultArr['unMatchedRecordFor'] = 'FormIDFile'; $resultArr['message'] = "Successfully data generated"; - } else { - $resultArr['unMatchedRecordDetails'] = []; - $resultArr['unMatchedRecordStatus'] = false; - $resultArr['unMatchedRecordFor'] = 'FormIDFile'; - $resultArr['message'] = "No record found"; } - } return $resultArr; @@ -665,12 +755,13 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $this->db->select('UniversityID,UniversityName'); $this->db->order_by('UniversityID','DESC'); $this->db->where('IsActive','1'); + $this->db->group_by('UniversityName'); // $this->db->where('BranchCode',$branchID); $universityDetails = $this->db->get(UNIVERSITY); $universityResult=array(); if($universityDetails->result()){ $universityResult['status']=true; - foreach ($universityDetails->result() as $row){ + /* foreach ($universityDetails->result() as $row){ $this->db->select('SM.SessionID,SM.SessionName'); $this->db->order_by('SM.SessionID','DESC'); $this->db->where('SM.IsActive','1'); @@ -688,8 +779,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $fetchArray['SessionDetails']=""; } $getResult[]=$fetchArray; - } - $universityResult['details']=$getResult; + }*/ + $universityResult['details']=$universityDetails->result(); } else{ $universityResult['status']=false; diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 18ddf828..1d1a7aab 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -106,8 +106,9 @@ "ENROLLMENT": "Enrollment", "STUDENTDETAILS": "Manage", "STUDENTDETAILSADDEDIT": "Manage Details", - "STUDENTFEEDETAILCOMPARE": "Student University Fee", + "STUDENTFEEDETAILCOMPARE": "University Form Enrolment", "STUDENTFROMIDFEEDETAILS": "Student FormId Fee Details", + "UNIVERSITYFORMPAYMENT": "University Form Payment", "status" : { "MAIN": "Update Status", "STUDYMATERIAL": "Study Material", @@ -137,7 +138,7 @@ "MAIN": "CALL TRACKING", "details":"Add/View Leads", "close":"Closed Leads", - "pending":"Pending Leads", + "pending":"Open Leads", "lead":"Daywise Leads" }, "daybook": { @@ -156,7 +157,8 @@ }, "entry": { "MAIN": "My Details", - "coursecorrection": "Course Details" + "coursecorrection": "Course Details", + "stud_merge": "Student Merge" }, "announcement": { "MAIN": "ANNOUNCEMENT", diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 82beca4b..ee716a2d 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -236,13 +236,19 @@ app.constant('JS_REQUIRES', { 'report_examfeeCtrl':'assets/js/controllers/report_examfeeCtrl.js', 'report_balfeeCtrl':'assets/js/controllers/report_balfeeCtrl.js', 'report_leadCtrl':'assets/js/controllers/report_leadCtrl.js', - + + //Data Correction + 'studentMergeCtrl':'assets/js/controllers/studentMergeCtrl.js', + /** * univesity sutdent fee compare details */ 'student_university_fee_compareCtrl':'assets/js/controllers/student_university_fee_compare.js', 'studentUnivFormIdFeeDetailsCtrl': 'assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js', + // university form payment details + 'univFormPaymentCtrl': 'assets/js/controllers/univFormPaymentCtrl.js', + }, //*** angularJS Modules diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 76cbf9e4..c878eaf4 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -307,13 +307,13 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com ncyBreadcrumb: { label: 'Manage Details' } - }).state('app.student.studentUnivFeeCompareDetails', { - url: '/studentUnivFeeCompare', + }).state('app.student.UnivFormEnroment', { + url: '/univformenrolment', templateUrl: "assets/views/student/studentUnivFeeCompareDetails.html", resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'student_university_fee_compareCtrl', 'ngTable'), - title: 'Student University Fee Compare', + title: 'University Form Enrolment', ncyBreadcrumb: { - label: 'Student University Fee Compare' + label: 'University Form Enrolment' } }).state('app.student.studentUnivFormIdFeeDetails', { url: '/studentUnivFormIdFeeDetails', @@ -323,6 +323,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com ncyBreadcrumb: { label: 'Student FormId Fees Details' } + }).state('app.student.universityformpayment', { + url: '/univformpayment', + templateUrl: "assets/views/student/UnivFormPaymentDetails.html", + resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'univFormPaymentCtrl', 'ngTable'), + title: 'University Form Payment Details', + ncyBreadcrumb: { + label: 'University Form Payment Details' + } }).state('app.student.status', { url: '/status', template: '
STUDENT STATUS UPDATE
', @@ -452,10 +460,10 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com }).state('app.call.pending', { url: '/pending', templateUrl: "assets/views/callTrackingPendingDetails.html", - title: 'Pending leads', + title: 'Open leads', resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'callTrackingCtrl','ngTable'), ncyBreadcrumb: { - label: 'Pending leads' + label: 'Open leads' } }).state('app.daybook', { url: '/daybook', @@ -799,6 +807,15 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com label: 'coursecorrection' }, + }).state('app.entry.stud_merge', { + url: '/studentMergeCtrl', + templateUrl: "assets/views/StudentMerge.html", + resolve: loadSequence('studentMergeCtrl','ngTable', 'ladda', 'angular-ladda'), + title: 'Student Merge', + ncyBreadcrumb: { + label: 'Student Merge' + }, + }); // $locationProvider.html5Mode(true); diff --git a/Apollo/assets/js/controllers/schCtrl.js b/Apollo/assets/js/controllers/schCtrl.js index 4488829f..c0fd1d9b 100755 --- a/Apollo/assets/js/controllers/schCtrl.js +++ b/Apollo/assets/js/controllers/schCtrl.js @@ -382,9 +382,15 @@ $scope.UploadFileData = function (FileDetails,myModel,courseDetails) { swal("", "Saved Successfully", "success"); $state.go($state.current, {}, {reload: true}); } else { - swal("", "Failed", "error"); + swal("", "Please Mapping the course supject", "error"); + $state.go($state.current, {}, {reload: true}); } - }); + },function(error){ + $scope.semDropDownShowLoading = false; + swal(error.data.message,'','error'); + $state.go($state.current, {}, {reload: true}); + + } ); } // end diff --git a/Apollo/assets/js/controllers/studentMergeCtrl.js b/Apollo/assets/js/controllers/studentMergeCtrl.js new file mode 100644 index 00000000..5467a6e0 --- /dev/null +++ b/Apollo/assets/js/controllers/studentMergeCtrl.js @@ -0,0 +1,225 @@ +'use strict'; +/*** controller***/ +app.controller('studentMergeCtrl', ["$scope", "$filter","$rootScope", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService","$modal", + function ($scope, $filter,$rootScope, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService,$modal,$log) { + + $scope.name = { + "studentName": "", + + }; + + $scope.onSubmit = function (form) { + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + $scope.show = true; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$studentName; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[batch=' + firstError + ']').focus(); + }else { + //alert($scope.batch.name); + $scope.stud_merge = ''; + $scope.message = ''; + console.log($scope.stud_merge); + var response_data = { + method: 'POST', + url: apiPoint.url + 'Stud_Merge/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + name: $scope.name.studentName + + } + + }; + + $http(response_data).then(function (response) { + if (response.data.MergeStatus == true) { + $scope.stud_merge = response.data.Stud_Merge; + } else { + $scope.message = response.data.message; + } + + }); + + } + } + + + //merge student + $scope.selectedStudentsID = []; + $scope.number1 = ''; + $scope.number2 = ''; + $scope.getMobile = ''; + $scope.toDelete = ''; + $scope.toMerge = ''; + // $rootScope.num1 = ''; + // $rootScope.num2 = ''; + $scope.isCheckAll = function(e){ + var val = (e.target.checked ? true : false); + if(val) + { + // $scope.disable = false; + var len = $scope.Stud_Merge.length; + var i = 0; + for(i=0;i +
+
+ +
+
+ + Select Mobile number to merge + + + +
+ + +   {{num1}} to merge with {{num2}} + +
+
+ +   {{num2}} to merge with {{num1}} +
+ + + + +
+
+ + + +
+
+
+
+
+
+ \ No newline at end of file diff --git a/Apollo/assets/views/StudentMerge.html b/Apollo/assets/views/StudentMerge.html new file mode 100644 index 00000000..4dc3ea98 --- /dev/null +++ b/Apollo/assets/views/StudentMerge.html @@ -0,0 +1,109 @@ +
+
+
+

Student Merge

+
+ +
+
+ + + + +
+
+
+
+
+
+ +
+ +
+ + + +
+ + +
+
+ + + +
+
+
+
+
+
+ +
+ +
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Student NameMobile NumberCourse NameUniversityAction
{{p.Student_name}}{{p.Phone_number}}{{p.Course_name}}{{p.University}}
+

{{message}}

+ +
+ + + +
+
\ No newline at end of file diff --git a/Apollo/assets/views/callTrackingPendingDetails.html b/Apollo/assets/views/callTrackingPendingDetails.html index 6ab5bf24..fdae82ef 100755 --- a/Apollo/assets/views/callTrackingPendingDetails.html +++ b/Apollo/assets/views/callTrackingPendingDetails.html @@ -33,9 +33,9 @@
-

{{ mainTitle }}

+

{{ mainTitle }}

- View all pending leads. + View all open Leads.
diff --git a/Apollo/assets/views/hallticket/batchshedule.html b/Apollo/assets/views/hallticket/batchshedule.html index 95385d8f..1e7dc39b 100755 --- a/Apollo/assets/views/hallticket/batchshedule.html +++ b/Apollo/assets/views/hallticket/batchshedule.html @@ -167,8 +167,9 @@

+ Sample Format - +
diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index c5988d12..64edd939 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -217,14 +217,15 @@
  • - - STUDENT UNIV FEE COMPARE DETAILS + + University Form Enrolment
  • STUDENT FORMID FEE DETAILS +
    • @@ -550,6 +551,11 @@ COURSECORRECTION +
  • + + Student Merge + +
    • diff --git a/Apollo/assets/views/student/UnivFormPaymentDetails.html b/Apollo/assets/views/student/UnivFormPaymentDetails.html new file mode 100644 index 00000000..566549bd --- /dev/null +++ b/Apollo/assets/views/student/UnivFormPaymentDetails.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html index 71cc90fd..3e923b72 100644 --- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html +++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html @@ -2,8 +2,8 @@
    -

    {{ mainTitle }}

    - Student University Fee Compare Details. +

    {{ mainTitle }}

    + Student Form Enrolment Details.
    @@ -82,10 +82,11 @@
    - +
    +
    -
    +
    @@ -111,12 +112,31 @@ Form id is required
    -
    -
    - - @@ -135,36 +155,46 @@
    -
    +
    - - +
    - + +
    +
    + + + +
    - @@ -174,13 +204,14 @@
    +
    -
    -
    -

    Loading...

    -

    {{statusMessage}}

    -
    +
    +
    +

    Loading...

    +

    {{statusMessage}}

    +
    @@ -262,30 +293,118 @@ - + + +
    + + + +
    + + +
    + + + +
    +
    + + + +
    + +
    + +
    +
    +
    +
    Loading...
    +
    +
    +
    No Record Found ...
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    FormIDEnrolmentNoSemesterYearMobileNumberStudentNameUniversityCodeUniversityNameCourseCodeCourseNameFatherNameMotherNameEmailID
    {{p.FormID}}{{p.EnrolmentNo}}{{p.EnrolmentNo}}{{p.SemesterYear}}{{p.SemesterYear}}{{p.MobileNumber}}{{p.StudentName}}{{p.UniversityCode}}{{p.UniversityName}}{{p.CourseCode}}{{p.CourseName}}{{p.FatherName}}{{p.MotherName}}{{p.EmailID}}
    + + +
    + +
    + + +
    - - + -
    -
    - - - -
    @@ -294,116 +413,12 @@
    -
    -
    - - - -
    -
    +
    - - -
    -
    -
    - - -
    -
    -
    -
    - -
    -
    -
    -
    Loading...
    -
    -
    -
    No Record Found ...
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    FormIDEnrolmentNoRollNoCentreCodeCentreStateMobileNumberStudentNameFatherNameMotherNameEmailIDUniversityCodeUniversityNameCourseCodeCourseNameSemesterYear
    {{p.FormID}}{{p.EnrolmentNo}}{{p.RollNo}}{{p.CentreCode}}{{p.CentreState}}{{p.MobileNumber}}{{p.StudentName}}{{p.FatherName}}{{p.MotherName}}{{p.EmailID}}{{p.UniversityCode}}{{p.UniversityName}}{{p.CourseCode}}{{p.CourseName}}{{p.SemesterYear}}
    - - -
    -
    - - - - - - - - - - - - - - - - - - - - - -
    FormIDFormTypeCentreCodeCourseCodeActualCourseFeeCourseFeeAmount
    {{p.FormID}}{{p.FormType}}{{p.CentreCode}}{{p.CourseCode}}{{p.ActualCourseFee}}{{p.CourseFee}}{{p.Amount}}
    - - -
    -
    -     +