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

merge changes : kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-09-06 17:55:49 +05:30
commit f5f2cd08f0
21 changed files with 989 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Apollo/api/application/config/routes.php
View File

@ -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';

29
Apollo/api/application/controllers/DataCorrection_Controller.php
View File

@ -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)
{

30
Apollo/api/application/controllers/HallTickets_Controller.php
View File

@ -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);
// }
/////////////////////
}

5
Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
View File

@ -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;

30
Apollo/api/application/models/Data_correction.php
View File

@ -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;
}

71
Apollo/api/application/models/Hallticket_model.php
View File

@ -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();

195
Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
View File

@ -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;

8
Apollo/assets/i18n/en.json
View File

@ -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",

8
Apollo/assets/js/config.constant.js
View File

@ -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

29
Apollo/assets/js/config.router.js
View File

@ -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: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>',
@ -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);

10
Apollo/assets/js/controllers/schCtrl.js
View File

@ -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

225
Apollo/assets/js/controllers/studentMergeCtrl.js Normal file
View File

@ -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<len;i++)
{
if($scope.selectedStudentsID.indexOf($scope.Stud_Merge[i]) === -1)
{
$scope.selectedStudentsID.push($scope.Stud_Merge[i]);
}
}
}
else
{
// $scope.disable = true;
$scope.selectedStudentsID = [];
}
if($scope.selectedStudentsID !=''){
$scope.disable = false;
}else{
$scope.disable = true;
}
console.log($scope.selectedStudentsID);
}
$scope.isClick = function(e){
var ide = e.target;
var val = (ide.checked ? true : false);
var sid = e.target.id;
angular.forEach($scope.Stud_Merge,function(value,key){
//console.log(value);
if(sid == value.Student_id)
{
console.log()
sid = value;
}
});
var pos = $scope.selectedStudentsID.indexOf(sid);
//alert(val);
if(val)
{
if( pos == -1)
{
console.log("PUSH");
$scope.selectedStudentsID.push(sid);
}
}
else
{
//console.log("POP");
$scope.selectedStudentsID.splice(pos,1);
}
//
if(val){
$scope.disable = false;
}else{
$scope.disable = true;
}
console.log($scope.selectedStudentsID);
console.log($scope.selectedStudentsID[0]);
console.log($scope.selectedStudentsID[1]);
$scope.number1 = $scope.selectedStudentsID[0];
$scope.number2 = $scope.selectedStudentsID[1];
}
$scope.merge = function(){
//$rootScope.student = $scope.selectedStudentsID;
if($scope.selectedStudentsID ==''){
swal('Select Check box','','warning');
return false;
}else{
$scope.controller = 'ng-controller="studentMergeCtrl"';
$rootScope.num1 = $scope.number1;
$rootScope.num2 = $scope.number2;
$rootScope.modalInstance = $modal.open({
templateUrl: 'assets/views/MergeStudentModal.html',
controller: 'studentMergeCtrl',
// size: size,
});
$rootScope.modalInstance.result.then(function (selectedItem) {
$scope.selected = selectedItem;
}, function () {
$log.info('Modal dismissed at: ' + new Date());
});
}
}
$scope.merge_student = {
submit: function (form, getMobile) {
//alert(getMobile);
if(getMobile=="option1"){
console.log("if");
$scope.toDelete = $rootScope.num1;
$scope.toMerge = $rootScope.num2;
console.log($scope.toDelete);
console.log($scope.toMerge);
}else{
console.log("else");
$scope.toDelete = $rootScope.num2;
$scope.toMerge = $rootScope.num1;
console.log($scope.toDelete);
console.log($scope.toMerge);
}
var toMerge = {
method: 'POST',
url: apiPoint.url + 'get_Mob/',
headers: {
'Content-Type': 'application/json'
},
data: {
deleteNo:$scope.toDelete,
mergeNo: $scope.toMerge,
}
};
$http(toMerge).then(function (response) {
if (response.data.status==200 && response.data.MergeStatus == true) {
$rootScope.modalInstance.close();
swal(" ", response.data.message, "success");
$state.go($state.current, {}, { reload: true });
} else {
swal(" ", response.data.message, "error");
}
});
},
};
//End of merge student
}]);

250
Apollo/assets/js/controllers/student_university_fee_compare.js
View File

@ -20,7 +20,6 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {
console.log("else if");
@ -36,6 +35,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
if (localDetails.localType === 'R004') {
// $scope.getUniversityList();
$scope.getUniversitySearchList();
$scope.getFileUploadUniversity();
} else {
ipCookie.remove('cookiechk');
$window.localStorage.clear();
@ -44,13 +44,14 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
} else {
}
}
/*$scope.universityData = '';
$scope.getUniversityList = function () {
var empListreq = {
/*get university details for file upload
* */
// get University List
$scope.fileUploadUniversityData = '';
$scope.getFileUploadUniversity = function () {
var univreq = {
method: 'POST',
url: apiPoint.url + 'getStudentUniversity/',
url: apiPoint.url + 'getUniversitySessionDetails/',
headers: {
'Content-Type': 'application/json'
},
@ -58,19 +59,26 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
data: localDetails
}
};
$http(empListreq).then(function (response) {
if (response.data.univList) {
$scope.universityData = response.data.university_details;
$http(univreq).then(function (response) {
if (response.data.status) {
$scope.fileUploadUniversityData = response.data.details;
} else {
$scope.fileUploadUniversityData="";
}
});
}*/
};
/* get json sem details for serach
* */
$scope.semDetails=["1","2","3","4","5","6","7","8"];
// get University List
$scope.universitySearchData = '';
$scope.getUniversitySearchList = function () {
var empListreq = {
method: 'POST',
url: apiPoint.url + 'getUniversitySessionDetails/',
url: apiPoint.url + 'getUnivCourseFromFileDetails/',
headers: {
'Content-Type': 'application/json'
},
@ -90,49 +98,50 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
$scope.searchData = {
"University": "",
"Session": "",
"Status": ""
"Course": "",
"Sem": ""
}
$scope.myUnivSearch = "";
$scope.sessionData="";
$scope.getUniveId = function (univ) {
$scope.sessionData="";
if (univ === '') {
$scope.myUnivSearch = "";
$scope.searchData.University = '';
// $scope.searchData.Course = '';
// $scope.searchData.Batch = '';
// $scope.courseData = name.Course;
// $scope.batchData = name.Batch;
$scope.searchData.Session = '';
$scope.searchData.Course = '';
$scope.OpenWindowStatus = false;
} else {
let name = JSON.parse(univ);
$scope.searchData.University = name.UniversityID;
// $scope.searchData.Course = '';
// $scope.searchData.Batch = '';
// $scope.courseData = name.Course;
// $scope.batchData = name.Batch;
$scope.searchData.Session = '';
$scope.sessionData = name.SessionDetails;
$scope.searchData.University = name.univCode;
$scope.searchData.Course = '';
$scope.serachCourseData = name.univCourseDetails;
$scope.OpenWindowStatus = false;
}
};
//For session dropdown
$scope.filterSessionDetails="";
$scope.$watch('searchData.University', function (newValue,oldValue) {
if(newValue==undefined || newValue==''){
$scope.filterSessionDetails="";
}
else{
if(angular.isString(newValue)){
$scope.filterSessionDetails=angular.fromJson(newValue);
}
/* mis match serach data*/
$scope.misMatchsSearchData = {
"University": "",
"Course": "",
"Sem": ""
}
$scope.misMatchCourseData=[];
$scope.getMisMatchUnivId = function (univ) {
if (univ === '') {
$scope.myUnivSearch = "";
$scope.misMatchsSearchData.University = '';
$scope.misMatchsSearchData.Course = '';
$scope.misMatchCourseData=[];
} else {
let uniName = JSON.parse(univ);
$scope.misMatchsSearchData.University = uniName.univCode;
$scope.misMatchsSearchData.Course = '';
$scope.misMatchCourseData=uniName.univCourseDetails;
}
});
};
$scope.Searchloader = false;
@ -199,13 +208,10 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
$scope.showFile="0";
$scope.$watchCollection('uploadModel', function (newValue,oldValue) {
if(newValue.university!='' && newValue.university!=null && newValue.uploadFor!='' && newValue.uploadFor=='1'){
if(newValue.university!='' && newValue.university!=null){
$scope.showFile="1";
}
else if(newValue.university!='' && newValue.university!=null && newValue.uploadFor!='' && newValue.uploadFor=='2'){
$scope.showFile="2";
}
else{
$scope.showFile="0";
}
@ -233,72 +239,38 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
}
$scope.receiveEnrolmentDetails = function (details,uploadForDetails) {
var updateUniversityEnrolment = {
method: 'POST',
url: apiPoint.url + 'receiveEnrolmentFromUniv/',
headers: {
'Content-Type': 'application/json'
},
data: {
localDetails: localDetail,
details: details,
universityID: angular.fromJson(uploadForDetails.university).UniversityID,
universityName: angular.fromJson(uploadForDetails.university).UniversityName,
if(details.length==0){
swal("Warning", "No data found for insert ", "warning");
}
else{
var updateUniversityEnrolment = {
method: 'POST',
url: apiPoint.url + 'receiveEnrolmentFromUniv/',
headers: {
'Content-Type': 'application/json'
},
data: {
localDetails: localDetail,
details: details,
universityID: angular.fromJson(uploadForDetails.university).UniversityID,
universityName: angular.fromJson(uploadForDetails.university).UniversityName,
}
};
}
};
$http(updateUniversityEnrolment).then(function (response) {
if (response.data.status == true) {
swal("", "Updated Successfully", "success");
$state.go($state.current, {}, {reload: true});
} else {
swal("", "Failed", "error");
}
});
}
$http(updateUniversityEnrolment).then(function (response) {
if (response.data.status == true) {
swal("", "Updated Successfully", "success");
$state.go($state.current, {}, {reload: true});
} else {
swal("", "Failed", "error");
}
});
}
// end
$scope.extractFormIDDetails="";
$scope.readXlsxFormDetails = function (workbook) {
$scope.extractFormIDDetails="";
/* DO SOMETHING WITH workbook HERE */
for (var sheetName in workbook.Sheets) {
var jsonData = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]);
if(jsonData.length!=0){
$scope.extractFormIDDetails=jsonData;
}
}
$scope.error = function (e) {
/* DO SOMETHING WHEN ERROR IS THROWN */
//console.log(e);
}
}
$scope.receiveFormIdFeeDetails = function(details) {
var updateUniversityEnrolment = {
method: 'POST',
url: apiPoint.url + 'insertFormIdUnivFeeDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
localDetails: localDetail,
details: details
}
};
$http(updateUniversityEnrolment).then(function (response) {
if (response.data.stuFeeList == true) {
swal("", "Updated Successfully", "success");
$state.go($state.current, {}, {reload: true});
} else {
swal("", "Failed", "error");
}
});
}
$scope.popupLoad = false;
$scope.popupLoadData = false;
@ -339,11 +311,10 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
$scope.unMatchedLoadingStatus = false;
// Get unmached details
$scope.getUnmatchedRecord = function(ss){
$scope.getUnmatchedRecord = function(searchDetails){
$scope.unMatchedRecordDetails = '';
$scope.unMatchedNoRecordFound = false;
$scope.unMatchedLoadingStatus = true;
var getDetailsFor = ss == 1 ? 'EnrolmentIDFile' : 'FormIDFile';
var getFeeCompareDetailsList = {
method: 'POST',
url: apiPoint.url + 'getUnmatchedRecordDetails/',
@ -352,7 +323,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
},
data: {
localDetails: localDetail,
getDetailsFor: getDetailsFor
getDetailsFor: searchDetails
}
};
$http(getFeeCompareDetailsList).then(function (response) {
@ -394,34 +365,40 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
$scope.checkEnrolmentExistDetails=function (form,entryModel) {
$scope.semList=[];
$scope.studentInfo=[];
var getExistEnrol = {
method: 'POST',
url: apiPoint.url + 'getExistStudentEnrolmentDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
localDetails: localDetail,
enrolmentID: entryModel
}
};
$http(getExistEnrol).then(function (response) {
if (response.data.status == true) {
if(response.data.semDetails.length==0){
swal("Warning","Already form enrolment is created for all semester", "warning");
if(entryModel=='' || entryModel==null || entryModel==undefined){
swal("Warning","Please enter enrolment id", "error");
}
else{
var getExistEnrol = {
method: 'POST',
url: apiPoint.url + 'getExistStudentEnrolmentDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
localDetails: localDetail,
enrolmentID: entryModel
}
else{
$scope.studentInfo=response.data.StudentInfo;
$scope.semList=response.data.semDetails;
};
$http(getExistEnrol).then(function (response) {
if (response.data.status == true) {
if(response.data.semDetails.length==0){
swal("Warning","Already form enrolment is created for all semester", "warning");
}
else{
$scope.studentInfo=response.data.StudentInfo;
$scope.semList=response.data.semDetails;
}
} else {
$scope.semList=[];
$scope.studentInfo=[];
swal("Failed",response.data.message, "error");
}
});
}
} else {
$scope.semList=[];
$scope.studentInfo=[];
swal("Failed",response.data.message, "error");
}
});
}
/*
@ -430,6 +407,8 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
$scope.cancelManualEntry=function (form) {
$scope.semList=[];
$scope.enableEnrolment=!$scope.enableEnrolment;
$scope.manualEnModel.sem="";
$scope.manualEnModel.formID="";
}
/*
* submit manual entry form details
@ -466,8 +445,8 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
if (response.data.status == true) {
$scope.studentInfo="";
$scope.semList=[];
form.manualFormID.$setPristine(true);
form.manualSem.$setPristine(true);
$scope.manualEnModel.sem="";
$scope.manualEnModel.formID="";
swal("Success",response.data.message, "success");
} else {
swal("Failed",response.data.message, "error");
@ -476,11 +455,6 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
});
}
}
}]);

0
Apollo/assets/js/controllers/univFormPaymentCtrl.js Normal file
View File

45
Apollo/assets/views/MergeStudentModal.html Normal file
View File

@ -0,0 +1,45 @@
<div class="container-fluid container-fullw bg-white" controller>
<form name="Form" id="form" novalidate ng-submit="merge_student.submit(Form, getMobile)" method="post">
<div class="row">
<!--<div class="col-md-6">
<div class="padding-30">
<h2 class="StepTitle"><i
class="ti-face-smile fa-2x text-primary block margin-bottom-10"></i>
Enter Bus Stop Details</h2>
</div>
</div>-->
<div class="col-md-12">
<fieldset>
<legend>
Select Mobile number to merge
</legend>
<div class="row">
<input type="radio" class="with-gap" ng-model='getMobile' ng-value='"option1"'>&nbsp;&nbsp;{{num1}} to merge with {{num2}}
</div>
<div class="row">
<input type="radio" class="with-gap" ng-model='getMobile' ng-value='"option2"'>&nbsp;&nbsp;{{num2}} to merge with {{num1}}
</div>
<div class="col-md-12">
<div class="pull-right">
<button tabindex="13" type="submit" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
Submit
</button>
</div>
</div>
</fieldset>
</div>
</div>
</form>
</div>

109
Apollo/assets/views/StudentMerge.html Normal file
View File

@ -0,0 +1,109 @@
<section id="page-title">
<div class="row">
<div class="col-sm-8">
<h1 class="mainTitle">Student Merge</h1>
</div>
<!-- <div ncy-breadcrumb></div> -->
</div>
</section>
<style>
td,th {
white-space: nowrap;
}
th{
text-align:center;
}
.table>tbody>tr>td { padding: 2px; }
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
}
th {
cursor: pointer;
} */
</style>
</script>
<div class="container-fluid container-fullw bg-white">
<div ng-controller="studentMergeCtrl" ng-init="filters()">
<form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
<fieldset>
<div class="row">
<div class="col-md-12">
<div class="row">
<div class="col-md-3">
<label for="form-field-select-2">
Student Name
</label>
<input type="text" tabindex="1" class="form-control " placeholder="Student Name" ng-model="name.studentName" name="studentName" required="required" />
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >
<button type="submit" class="btn btn-success btn-o" tabindex="8">
Submit
</button>
</div>
</div>
</div>
</div>
</div>
</fieldset>
</form>
<!-- <pre>{{statusr | json}}</pre> -->
<div class="row" style="text-align: right;">
<button class="btn btn-success btn-o" ng-click="merge()">Merge</button>
</div>
<div class="table-responsive">
<table id="datatable" class="table table-hover" style="font-size:0.9em;">
<thead>
<tr>
<th>Student Name</th>
<th>Mobile Number</th>
<th>Course Name</th>
<th>University</th>
<th>Action</th>
</tr>
</thead>
<tbody dir-paginate="p in stud_merge|filter:search:strict|itemsPerPage:10">
<tr>
<td>{{p.Student_name}}</td>
<td>{{p.Phone_number}}</td>
<td>{{p.Course_name}}</td>
<td>{{p.University}}</td>
<td style="text-align:center;"><input type="checkbox" ng-checked="myModel.all" id="{{p.Phone_number}}" name="{{p.Phone_number}}" class="form-control" ng-click="isClick($event);" style="width:17px" /></td>
</tr>
</tbody>
</table>
<h3 style="text-align:center;">{{message}}</h3>
</div>
<dir-pagination-controls direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
</div>

4
Apollo/assets/views/callTrackingPendingDetails.html
View File

@ -33,9 +33,9 @@
<div class="row">
<div class="col-sm-8">
<h1 class="mainTitle" translate="Pending leads">{{ mainTitle }}</h1>
<h1 class="mainTitle" translate="Open leads">{{ mainTitle }}</h1>
<span class="mainDescription">View all pending leads.</span>
<span class="mainDescription">View all open Leads.</span>
</div>
<div ncy-breadcrumb></div>

3
Apollo/assets/views/hallticket/batchshedule.html
View File

@ -167,8 +167,9 @@
<fieldset>
<js-xls onread="readUploadBatchDetails" onerror="error"></js-xls>
<br>
<a href="https://www.w3schools.com/html/" target="_top">Sample Format</a>
<button type="button" class="btn btn-success btn-o" style="float: right" ng-click="UploadFileData(extractFileDetails,myModel,selectedCourseNameC)"> Submit</button>
</fieldset>
</div>

10
Apollo/assets/views/partials/nav.html
View File

@ -217,14 +217,15 @@
</ul>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.studentUnivFeeCompareDetails" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.student.STUDENTFEEDETAILCOMPARE"> STUDENT UNIV FEE COMPARE DETAILS </span>
<a ui-sref="app.student.UnivFormEnroment" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.student.STUDENTFEEDETAILCOMPARE"> University Form Enrolment </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.studentUnivFormIdFeeDetails" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.student.STUDENTFROMIDFEEDETAILS"> STUDENT FORMID FEE DETAILS </span>
</a>
</li>
</ul>
</li>
@ -550,6 +551,11 @@
<span class="title" translate="sidebar.nav.entry.coursecorrection">COURSECORRECTION</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.entry.stud_merge" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.entry.stud_merge">Student Merge</span>
</a>
</li>
</ul>
</li>

10
Apollo/assets/views/student/UnivFormPaymentDetails.html Normal file
View File

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>

303
Apollo/assets/views/student/studentUnivFeeCompareDetails.html
View File

@ -2,8 +2,8 @@
<section id="page-title">
<div class="row">
<div class="col-sm-8">
<h1 class="mainTitle" translate="Student University Fee">{{ mainTitle }}</h1>
<span class="mainDescription">Student University Fee Compare Details. </span>
<h1 class="mainTitle" translate="Enrolment Details">{{ mainTitle }}</h1>
<span class="mainDescription">Student Form Enrolment Details. </span>
</div>
<div ncy-breadcrumb></div>
</div>
@ -82,10 +82,11 @@
</div>
<div class="col-md-6 form-group">
<button class="btn btn-sm btn-info" tabindex="4" style="float: left" ng-click="checkEnrolmentExistDetails(Form,manualEnModel.enrolmentNo);">Search</button>
<button class="btn btn-sm btn-info" ng-disabled="!manualEnModel.enrolmentNo" tabindex="4" style="float: left" ng-click="checkEnrolmentExistDetails(Form,manualEnModel.enrolmentNo);">Search</button>
</div>
</div>
<div class="col-md-8" ng-if="semList.length!=0">
<div class="col-md-3 form-group"
ng-class="{'has-error':manualEnForm.manualSem.$dirty && manualEnForm.manualSem.$invalid, 'has-success':manualEnForm.manualSem.$valid}">
<label>
@ -101,7 +102,7 @@
ng-if="manualEnForm.manualSem.$dirty && manualEnForm.manualSem.$invalid">Sem is required</span>
</div>
<div class="col-md-8 form-group" ng-class="{'has-error':manualEnForm.manualFormID.$dirty && manualEnForm.manualFormID.$invalid, 'has-success':manualEnForm.manualFormID.$valid}">
<div class="col-md-5 form-group" ng-class="{'has-error':manualEnForm.manualFormID.$dirty && manualEnForm.manualFormID.$invalid, 'has-success':manualEnForm.manualFormID.$valid}">
<label> Form ID <span class="symbol required"></span>
</label>
@ -111,12 +112,31 @@
<span class="error text-small block"
ng-if="manualEnForm.manualFormID.$dirty && manualEnForm.manualFormID.$invalid">Form id is required</span>
</div>
<div class="col-md-12">
<div class="pull-right">
<button tabindex="14" type="button" ng-click="manualEnrolmentSubmit(manualEnForm)" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
<div class="col-md-4">
<div class="row">
<div class="col-md-12">
<i class="ti-user"> <span class="text-green">{{studentInfo.StudentName}}</span></i>
</div>
<div class="col-md-12">
<i class="ti-book"> <span class="text-green">{{studentInfo.CourseName}}</span></i>
</div>
<div class="col-md-12">
<i class="ti-book"> <span class="text-green">{{studentInfo.UniversityName}}</span></i>
</div>
</div>
</div>
<div class="col-md-8">
<div class="pull-left">
<button tabindex="7" type="button" ng-click="manualEnrolmentSubmit(manualEnForm)" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
Save
</button>
<button type="button" class="btn btn-warning btn-wide" tabindex="15"
<button type="button" class="btn btn-warning btn-wide" tabindex="8"
ng-click="cancelManualEntry(manualEnForm)">
Cancel
</button>
@ -135,36 +155,46 @@
</div>
<div class="container-fluid container-fullw">
<div class="container">
<form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
<div class="row">
<div class="col-md-3">
<label for="form-field-select-2">
University
University <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="university" ng-model="myUnivSearch" ng-change="getUniveId(myUnivSearch)">
<select class="form-control" tabindex="9" class="cs-select cs-skin-elastic" name="university" ng-model="myUnivSearch" ng-change="getUniveId(myUnivSearch)">
<option value="" disabled selected>Select University</option>
<option ng-repeat="item in universitySearchData" value="{{item}}">{{item.UniversityName}}</option>
<option ng-repeat="item in universitySearchData" value="{{item}}">{{item.univName}}</option>
</select>
</div>
<div class="col-md-3">
<label for="form-field-select-2">
Session
Course
</label>
<select ui-select2 class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="session" ng-model="searchData.Session">
<option value="" selected>Select Session</option>
<option ng-repeat="itemSession in sessionData" value="{{itemSession.SessionID}}">{{itemSession.SessionName}}</option>
<select ui-select2 class="form-control" tabindex="10" class="cs-select cs-skin-elastic" name="serachCourse" id="serachCourse" ng-model="searchData.Course">
<option value="" selected>Select Course</option>
<option ng-repeat="itemcourse in serachCourseData" value="{{itemcourse.CourseName}}">{{itemcourse.CourseName}}</option>
</select>
</div>
<div class="col-md-2 form-group">
<label for="form-field-select-2">
Sem
</label>
<select class="form-control" tabindex="11" class="cs-select cs-skin-elastic" name="matchmatchSemSearch" id="matchmatchSemSearch" ng-model="searchData.Sem">
<option value="" selected>Select Sem</option>
<option ng-repeat="semD in semDetails" value="{{semD}}">{{semD}}</option>
</select>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div class="pull-right">
<button ng-disabled="searchData.Session == '' || searchData.University == ''" type="submit" class="btn btn-success btn-o" tabindex="8">
<button ng-disabled="searchData.University == ''" type="submit" class="btn btn-success btn-o" tabindex="12">
Submit
</button>
@ -174,13 +204,14 @@
</form>
</div>
<div>
<!--{{data | json}}-->
<div ng-if="Searchloader">
<div align="center" >
<h3 style="color: blue;">Loading...</h3></div>
<h2> {{statusMessage}} </h2>
</div>
<div ng-if="Searchloader">
<div align="center" >
<h3 style="color: blue;">Loading...</h3></div>
<h2> {{statusMessage}} </h2>
</div>
<div class="table-responsive" ng-if="studentData">
<table class="table table-hover" >
<thead>
@ -262,30 +293,118 @@
</div>
</div>
</tab>
<tab tabindex="2" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Upload Files" id="uploadFiles">
<tab tabindex="13" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Unmatched Records" id="unmatchedRecord">
<div class="col-md-3 form-group">
<label for="form-field-select-2">
University <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="14" class="cs-select cs-skin-elastic" name="mismatchUniv" ng-model="misMatchUnivSearch" ng-change="getMisMatchUnivId(misMatchUnivSearch)">
<option value="" disabled selected>Select University</option>
<option ng-repeat="item in universitySearchData" value="{{item}}">{{item.univName}}</option>
</select>
</div>
<div class="col-md-3 form-group">
<label for="form-field-select-2">
Course
</label>
<select class="form-control" tabindex="15" class="cs-select cs-skin-elastic" name="mismatchCourseSearch" id="mismatchCourseSearch" ng-model="misMatchsSearchData.Course">
<option value="" selected>Select Course</option>
<option ng-repeat="mcourse in misMatchCourseData" value="{{mcourse.CourseName}}">{{mcourse.CourseName}}</option>
</select>
</div>
<div class="col-md-2 form-group">
<label for="form-field-select-2">
Sem
</label>
<select class="form-control" tabindex="16" class="cs-select cs-skin-elastic" name="mismatchSemSearch" id="mismatchSemSearch" ng-model="misMatchsSearchData.Sem">
<option value="" selected>Select Sem</option>
<option ng-repeat="semD in semDetails" value="{{semD}}">{{semD}}</option>
</select>
</div>
<div class="col-md-2" style="margin-top: 20px;">
<button class="btn btn-success" ng-disabled="!misMatchUnivSearch" ng-click="getUnmatchedRecord(misMatchsSearchData)">Get Record</button>
</div>
<div class="container">
<div ng-if="unMatchedLoadingStatus">
<div style="color: blue; align: center;" align="center"> Loading...</div>
</div>
<div ng-if="unMatchedNoRecordFound">
<div style="color: red; align: center;" align="center"> No Record Found ...</div>
</div>
</div>
<div class="container table-responsive" ng-if="!unMatchedNoRecordFound && unMatchedRecordDetails">
<div ng-if="unMatchedRecordDetailsType == 'EnrolmentIDFile'">
<table class="table table-border table-hover" >
<thead>
<th>FormID</th>
<th>EnrolmentNo</th>
<th>SemesterYear</th>
<th>MobileNumber</th>
<th>StudentName</th>
<th>UniversityCode</th>
<th>UniversityName</th>
<th>CourseCode</th>
<th>CourseName</th>
<!--<th>RollNo</th>
<th>CentreCode</th>
<th>CentreState</th>-->
<th>FatherName</th>
<th>MotherName</th>
<th>EmailID</th>
</thead>
<tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
<tr>
<td>{{p.FormID}}</td>
<td ng-if="p.EnromentStatus==true">{{p.EnrolmentNo}}</td>
<td ng-if="p.EnromentStatus==false"><span class="text-red"><b>{{p.EnrolmentNo}}</b></span></td>
<td ng-if="p.SemStatus==true">{{p.SemesterYear}}</td>
<td ng-if="p.SemStatus==false"><span class="text-red"><b>{{p.SemesterYear}}</b></span></td>
<td>{{p.MobileNumber}}</td>
<td>{{p.StudentName}}</td>
<td>{{p.UniversityCode}}</td>
<td>{{p.UniversityName}}</td>
<td>{{p.CourseCode}}</td>
<td>{{p.CourseName}}</td>
<!-- <td>{{p.RollNo}}</td>
<td>{{p.CentreCode}}</td>
<td>{{p.CentreState}}</td>-->
<td>{{p.FatherName}}</td>
<td>{{p.MotherName}}</td>
<td>{{p.EmailID}}</td>
</tr>
</tbody>
</table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
</div>
</tab>
<tab tabindex="17" active="tabactive3" ng-click="tabActive('tabactive3')" heading="Upload Files" id="uploadFiles">
<div class="container-fluid">
<div class="row">
<div class="col-md-4 form-group">
<label>
University <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="1" name="formUniversity" ng-model="uploadModel.university" required>
<select class="form-control" tabindex="18" name="formUniversity" ng-model="uploadModel.university" required>
<option value="" selected>Select University</option>
<option ng-repeat="univ in universitySearchData" value="{{univ}}">{{univ.UniversityName}}</option>
<option ng-repeat="funiv in fileUploadUniversityData" value="{{funiv}}">{{funiv.UniversityName}}</option>
</select>
</div>
<div class="col-md-4 form-group">
<label>
Upload For <span class="symbol required"></span>
</label>
<select class="form-control" name="uploadFor" tabindex="2" id="uploadFor"
ng-model="uploadModel.uploadFor"
ng-options="upload.id as upload.name for upload in uploadOptions"
required>
<option value=""> Select</option>
</select>
</div>
<div class="col-md-3 form-group" ng-if="showFile=='1'">
<fieldset>
@ -294,116 +413,12 @@
</fieldset>
</div>
<div class="col-md-3 form-group" ng-if="showFile=='2'">
<fieldset>
<js-xls onread="readXlsxFormDetails" onerror="error"></js-xls>
<button type="button" class="btn btn-success btn-o" style="float: right" ng-click="receiveFormIdFeeDetails(extractFormIDDetails)"> Submit</button>
</fieldset>
</div>
</div>
</div>
</tab>
<tab tabindex="3" active="tabactive3" ng-click="tabActive('tabactive3')" heading="Unmatched Records" id="unmatchedRecord">
<div class="container">
<div class="row">
<div class="col-md-4 form-group">
<label>
Upload For <span class="symbol required"></span>
</label>
<select class="form-control" name="uploadFor" tabindex="2" id="uploadFor"
ng-model="getUnmatchedDetailsFor"
ng-options="upload.id as upload.name for upload in uploadOptions"
required>
<option value=""> Select</option>
</select>
</div>
</div>
</div>
<div class="container">
<button class="btn btn-success" ng-disabled="!getUnmatchedDetailsFor" ng-click="getUnmatchedRecord(getUnmatchedDetailsFor)">Get Record</button>
</div>
<div class="container">
<div ng-if="unMatchedLoadingStatus">
<div style="color: blue; align: center;" align="center"> Loading...</div>
</div>
<div ng-if="unMatchedNoRecordFound">
<div style="color: red; align: center;" align="center"> No Record Found ...</div>
</div>
</div>
<div class="container table-responsive" ng-if="!unMatchedNoRecordFound && unMatchedRecordDetails">
<div ng-if="unMatchedRecordDetailsType == 'EnrolmentIDFile'">
<table class="table table-border table-hover" >
<thead>
<th>FormID</th>
<th>EnrolmentNo</th>
<th>RollNo</th>
<th>CentreCode</th>
<th>CentreState</th>
<th>MobileNumber</th>
<th>StudentName</th>
<th>FatherName</th>
<th>MotherName</th>
<th>EmailID</th>
<th>UniversityCode</th>
<th>UniversityName</th>
<th>CourseCode</th>
<th>CourseName</th>
<th>SemesterYear</th>
</thead>
<tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
<tr>
<td>{{p.FormID}}</td>
<td>{{p.EnrolmentNo}}</td>
<td>{{p.RollNo}}</td>
<td>{{p.CentreCode}}</td>
<td>{{p.CentreState}}</td>
<td>{{p.MobileNumber}}</td>
<td>{{p.StudentName}}</td>
<td>{{p.FatherName}}</td>
<td>{{p.MotherName}}</td>
<td>{{p.EmailID}}</td>
<td>{{p.UniversityCode}}</td>
<td>{{p.UniversityName}}</td>
<td>{{p.CourseCode}}</td>
<td>{{p.CourseName}}</td>
<td>{{p.SemesterYear}}</td>
</tr>
</tbody>
</table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
<div ng-if="unMatchedRecordDetailsType == 'FormIDFile'">
<table class="table table-border table-hover" >
<thead>
<th>FormID</th>
<th>FormType</th>
<th>CentreCode</th>
<th>CourseCode</th>
<th>ActualCourseFee</th>
<th>CourseFee</th>
<th>Amount</th>
</thead>
<tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
<tr>
<td>{{p.FormID}}</td>
<td>{{p.FormType}}</td>
<td>{{p.CentreCode}}</td>
<td>{{p.CourseCode}}</td>
<td>{{p.ActualCourseFee}}</td>
<td>{{p.CourseFee}}</td>
<td>{{p.Amount}}</td>
</tr>
</tbody>
</table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
</div>
</tab>
</tabset>
</div>