Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
gayathri1990
commit
2d5d409c3a
@ -364,3 +364,6 @@ $route['getUniversitySessionDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/
|
||||
$route['getUnivCourseFromFileDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnivCourseFromFileDetails';
|
||||
$route['getExistStudentEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getExistStudentEnrolmentDetails';
|
||||
$route['addManualEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addManualEnrolmentDetails';
|
||||
$route['getForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getForFormIdDraftDetails';
|
||||
$route['addForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addForFormIdDraftDetails';
|
||||
$route['draftMovetoList'] = 'Receive_Enrolment_Fees_Univ_Controller/draftMovetoList';
|
||||
@ -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;
|
||||
@ -274,5 +271,52 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
public function getForFormIdDraftDetails_post(){
|
||||
$reqBranch = $this->post('localDetails');
|
||||
$getForFormIdDraftDetails = $this->receive_model->getForFormIdDraftDetails(); // Check if the employee exist
|
||||
if ($getForFormIdDraftDetails) {
|
||||
$getForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($getForFormIdDraftDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
|
||||
} else {
|
||||
// Set the response and exit
|
||||
$this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public function addForFormIdDraftDetails_post(){
|
||||
$reqBranch = $this->post('localDetails');
|
||||
$details = $this->post('details');
|
||||
$addForFormIdDraftDetails = $this->receive_model->addForFormIdDraftDetails($details, $reqBranch); // Check if the employee exist
|
||||
if ($addForFormIdDraftDetails) {
|
||||
$addForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($addForFormIdDraftDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
|
||||
} else {
|
||||
// Set the response and exit
|
||||
$this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public function draftMovetoList_post(){
|
||||
$reqBranch = $this->post('localDetails');
|
||||
$details = $this->post('details');
|
||||
$draftMovetoList = $this->receive_model->draftMovetoList($details, $reqBranch); // Check if the employee exist
|
||||
if ($draftMovetoList) {
|
||||
$draftMovetoList['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($draftMovetoList, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
|
||||
} else {
|
||||
// Set the response and exit
|
||||
$this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -26,7 +26,7 @@ class Data_Correction extends CI_Model
|
||||
|
||||
Public function GetAllCourseDetails($search)
|
||||
{
|
||||
$this->db->select('sd.MobileNumber,sd.Firstname,sd.Lastname,CourseName,UniversityName,scd.CourseID,scd.ID,sd.StudentID,scd.IsActive as IsActive,scd.DeactiveComments as Reason,scd.UniversityID,sfs.FeesID');
|
||||
$this->db->select('sd.MobileNumber,sd.Firstname,sd.Lastname,CourseName,UniversityName,scd.CourseID,scd.ID,sd.StudentID,scd.IsActive as IsActive,scd.DeactiveComments as Reason,scd.UniversityID,sfs.FeesID,scd.Deactive');
|
||||
$this->db->from('T_StudentDetails sd');
|
||||
$this->db->join('T_Student_CourseDetails scd','scd.StudentID = sd.StudentID');
|
||||
$this->db->join('T_CourseMaster cm','cm.CourseID = scd.CourseID');
|
||||
@ -110,6 +110,7 @@ class Data_Correction extends CI_Model
|
||||
|
||||
$coursearr['IsActive'] = $search['IsActive'];
|
||||
$coursearr['DeactiveComments'] =$search['Reason'];
|
||||
$coursearr['Deactive'] = '0';
|
||||
$this->db->where('StudentID', $search['studentId']);
|
||||
$this->db->where('UniversityID', $search['University']);
|
||||
$this->db->where('CourseID', $search['courseId']);
|
||||
|
||||
@ -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.";
|
||||
@ -442,9 +443,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
|
||||
if(count($queryDetails->result()) == 0){
|
||||
$query = "INSERT INTO T_FormId_FeeDetails_Received_From_University
|
||||
(FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode)
|
||||
(FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode, DraftStatus)
|
||||
VALUES
|
||||
( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' )";
|
||||
( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' , 0)";
|
||||
$queryDetails = $this->db->query($query);
|
||||
} else {
|
||||
echo 'else con';
|
||||
@ -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;
|
||||
@ -798,4 +888,135 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
return $resultArray;
|
||||
}
|
||||
|
||||
public function getForFormIdDraftDetails(){
|
||||
$selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE DraftStatus = 1";
|
||||
$details = $this->db->query($selectQuery);
|
||||
$detailsList = $details->result();
|
||||
if($detailsList) {
|
||||
$result['draftStatus'] = true;
|
||||
$result['draftDetails'] = $detailsList;
|
||||
$result['draftDetailsMessagae'] = "details generate successfully.";
|
||||
} else {
|
||||
$result['draftStatus'] = false;
|
||||
$result['draftDetails'] = '';
|
||||
$result['draftDetailsMessagae'] = "No Record Found.";
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function addForFormIdDraftDetails($details, $local){
|
||||
|
||||
$localBranchID = $local['localBranchID'];
|
||||
$localUserID = $local['localUserID'];
|
||||
$time = date('Y-m-d H:i:s');
|
||||
$CreatedOn = $time;
|
||||
|
||||
$formIds = $details['FormID'];
|
||||
$formType = $details['FormType'];
|
||||
$CentreCode = $details['CentreCode'];
|
||||
$Session = $details['Session'];
|
||||
$Year = $details['Year'];
|
||||
$Semester = $details['Semester'];
|
||||
$Student_Name = $details['Student_Name'];
|
||||
$Father_Name = $details['Father_Name'];
|
||||
$CourseCode = $details['CourseCode'];
|
||||
$ActualCourseFee = $details['ActualCourseFee'];
|
||||
$CourseFee = $details['CourseFee'];
|
||||
$ExamFee = $details['ExamFee'];
|
||||
$EnrollmentFee = $details['EnrollmentFee'];
|
||||
$ProspectusFee = $details['ProspectusFee'];
|
||||
$ReRegFee = $details['ReRegFee'];
|
||||
$CreditTransferFee = $details['CreditTransferFee'];
|
||||
$LateralEntryFee = $details['LateralEntryFee'];
|
||||
$DualSpclFee = $details['DualSpclFee'];
|
||||
$OtherFee = $details['OtherFee'];
|
||||
$NRIFEE = $details['NRIFEE'];
|
||||
$ProvisionalFee = $details['ProvisionalFee'];
|
||||
$MigrationFee = $details['MigrationFee'];
|
||||
$UrgentResultDMCFee = $details['UrgentResultDMCFee'];
|
||||
$AdditionalFee = $details['AdditionalFee'];
|
||||
$Amount = $details['Amount'];
|
||||
$selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE
|
||||
FormID = '$formIds' AND
|
||||
FormType = '$formType' AND
|
||||
CentreCode = '$CentreCode' AND
|
||||
Session = '$Session' AND
|
||||
Year = '$Year' AND
|
||||
Semester = '$Semester' AND
|
||||
Student_Name = '$Student_Name' AND
|
||||
Father_Name = '$Father_Name' AND
|
||||
CourseCode = '$CourseCode' AND
|
||||
ActualCourseFee = '$ActualCourseFee' AND
|
||||
CourseFee = '$CourseFee' AND
|
||||
ExamFee = '$ExamFee' AND
|
||||
EnrollmentFee = '$EnrollmentFee' AND
|
||||
ProspectusFee = '$ProspectusFee' AND
|
||||
ReRegFee = '$ReRegFee' AND
|
||||
CreditTransferFee = '$CreditTransferFee' AND
|
||||
LateralEntryFee = '$LateralEntryFee' AND
|
||||
DualSpclFee = '$DualSpclFee' AND
|
||||
OtherFee = '$OtherFee' AND
|
||||
NRIFEE = '$NRIFEE' AND
|
||||
ProvisionalFee = '$ProvisionalFee' AND
|
||||
MigrationFee = '$MigrationFee' AND
|
||||
UrgentResultDMCFee = '$UrgentResultDMCFee' AND
|
||||
AdditionalFee = '$AdditionalFee' AND
|
||||
Amount = '$Amount'";
|
||||
$queryDetails = $this->db->query($selectQuery);
|
||||
|
||||
if(count($queryDetails->result()) == 0){
|
||||
$query = "INSERT INTO T_FormId_FeeDetails_Received_From_University
|
||||
(FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode, DraftStatus)
|
||||
VALUES
|
||||
( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' , 1)";
|
||||
$queryDetails = $this->db->query($query);
|
||||
|
||||
if($queryDetails){
|
||||
$result['draftStatus'] = true;
|
||||
$result['draftDetailsMessagae'] = "Updated Successfully.";
|
||||
}else{
|
||||
$result['draftStatus'] = false;
|
||||
$result['draftDetailsMessagae'] = "Something went wrong.";
|
||||
}
|
||||
} else {
|
||||
$result['draftStatus'] = false;
|
||||
$result['draftDetailsMessagae'] = "This record already exist.";
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function draftMovetoList($detail, $local){
|
||||
// print_r($details);exit();
|
||||
|
||||
foreach($detail as $row) {
|
||||
// echo $row['ID'];exit();
|
||||
$data[] = array(
|
||||
'ID' => $row['ID'],
|
||||
'FormType'=> 'Hello'
|
||||
);
|
||||
}
|
||||
|
||||
// $data = array(
|
||||
// array(
|
||||
// 'ID' => 1,
|
||||
// 'FormType' => 'Hello'
|
||||
// ),
|
||||
// array(
|
||||
// 'ID' => 2,
|
||||
// 'FormType' => 'World'
|
||||
// )
|
||||
// );
|
||||
// print_r($data);exit();
|
||||
$this->db->update_batch('T_FormId_FeeDetails_Received_From_University', $data, 'ID');
|
||||
|
||||
$detailsList = $details->result();
|
||||
if($detailsList){
|
||||
$result['draftStatus'] = true;
|
||||
$result['draftDetailsMessagae'] = "Updated Successfully.";
|
||||
} else {
|
||||
$result['draftStatus'] = false;
|
||||
$result['draftDetailsMessagae'] = "Something went wrong.";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -106,7 +106,7 @@
|
||||
"ENROLLMENT": "Enrollment",
|
||||
"STUDENTDETAILS": "Manage",
|
||||
"STUDENTDETAILSADDEDIT": "Manage Details",
|
||||
"STUDENTFEEDETAILCOMPARE": "Student University Fee",
|
||||
"STUDENTFEEDETAILCOMPARE": "University Form Enrolment",
|
||||
"STUDENTFROMIDFEEDETAILS": "Student FormId Fee Details",
|
||||
"status" : {
|
||||
"MAIN": "Update Status",
|
||||
|
||||
@ -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',
|
||||
|
||||
@ -327,36 +327,174 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
getDraftFormIdDetails();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$scope.draftManualEntryDetails = {
|
||||
'FormID': '',
|
||||
'FormType': 'NEW',
|
||||
'CentreCode': '',
|
||||
'Session':'',
|
||||
'Year':'',
|
||||
'Semester':'',
|
||||
'Student_Name':'',
|
||||
'Father_Name':'',
|
||||
'CourseCode':'',
|
||||
'ActualCourseFee':'0',
|
||||
'CourseFee':'0',
|
||||
'ExamFee': '0',
|
||||
'EnrollmentFee': '0',
|
||||
'ProspectusFee': '0',
|
||||
'ReRegFee': '0',
|
||||
'CreditTransferFee': '0',
|
||||
'LateralEntryFee': '0',
|
||||
'DualSpclFee': '0',
|
||||
'OtherFee': '0',
|
||||
'NRIFEE':'0',
|
||||
'ProvisionalFee': '0',
|
||||
'MigrationFee': '0',
|
||||
'UrgentResultDMCFee': '0',
|
||||
'AdditionalFee': '0',
|
||||
'Amount': '0'
|
||||
}
|
||||
|
||||
|
||||
$scope.draftListDetails = '';
|
||||
$scope.draftListDetailsNoRecordFound = false;
|
||||
$scope.draftListDetailsLoading = false;
|
||||
// get draft form id details
|
||||
function getDraftFormIdDetails(){
|
||||
// $scope.unMatchedRecordDetails = '';
|
||||
// $scope.unMatchedNoRecordFound = false;
|
||||
// $scope.unMatchedLoadingStatus = true;
|
||||
// var getDetailsFor = ss == 1 ? 'EnrolmentIDFile' : 'FormIDFile';
|
||||
// var getFeeCompareDetailsList = {
|
||||
// method: 'POST',
|
||||
// url: apiPoint.url + 'getUnmatchedRecordDetails/',
|
||||
// headers: {
|
||||
// 'Content-Type': 'application/json'
|
||||
// },
|
||||
// data: {
|
||||
// localDetails: localDetail,
|
||||
// getDetailsFor: getDetailsFor
|
||||
// }
|
||||
// };
|
||||
// $http(getFeeCompareDetailsList).then(function (response) {
|
||||
// if (response.data.unMatchedRecordStatus == true) {
|
||||
// $scope.unMatchedLoadingStatus = false;
|
||||
// $scope.unMatchedNoRecordFound = false;
|
||||
// $scope.unMatchedRecordDetails = response.data.unMatchedRecordDetails;
|
||||
// $scope.unMatchedRecordDetailsType = response.data.unMatchedRecordFor;
|
||||
// } else {
|
||||
// $scope.unMatchedLoadingStatus = false;
|
||||
// $scope.unMatchedNoRecordFound = true;
|
||||
// $scope.unMatchedRecordDetails = response.data.unMatchedRecordDetails;
|
||||
// }
|
||||
// });
|
||||
$scope.draftListDetailsLoading = true;
|
||||
$scope.draftListDetailsNoRecordFound = false;
|
||||
$scope.draftListDetails = '';
|
||||
var getFormIdDraftDetailsList = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getForFormIdDraftDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail
|
||||
}
|
||||
};
|
||||
$http(getFormIdDraftDetailsList).then(function (response) {
|
||||
if (response.data.draftStatus == true) {
|
||||
$scope.draftListDetailsLoading = false;
|
||||
$scope.draftListDetails = response.data.draftDetails;
|
||||
$scope.draftListDetailsNoRecordFound = false;
|
||||
} else {
|
||||
$scope.draftListDetailsLoading = false;
|
||||
$scope.draftListDetailsNoRecordFound = true;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// manual entry details add
|
||||
|
||||
$scope.addManualData = function() {
|
||||
alert(JSON.stringify($scope.draftManualEntryDetails));
|
||||
|
||||
var addDraftDetailsList = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'addForFormIdDraftDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
details : $scope.draftManualEntryDetails
|
||||
}
|
||||
};
|
||||
$http(addDraftDetailsList).then(function (response) {
|
||||
if (response.data.draftStatus == true) {
|
||||
swal("", response.data.draftDetailsMessagae, "success");
|
||||
getDraftFormIdDetails();
|
||||
getEmptycall();
|
||||
} else {
|
||||
swal("", response.data.draftDetailsMessagae, "warning");
|
||||
getDraftFormIdDetails();
|
||||
getEmptycall();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function getEmptycall(){
|
||||
$scope.draftManualEntryDetails = {
|
||||
'FormID': '',
|
||||
'FormType': 'NEW',
|
||||
'CentreCode': '',
|
||||
'Session':'',
|
||||
'Year':'',
|
||||
'Semester':'',
|
||||
'Student_Name':'',
|
||||
'Father_Name':'',
|
||||
'CourseCode':'',
|
||||
'ActualCourseFee':'0',
|
||||
'CourseFee':'0',
|
||||
'ExamFee': '0',
|
||||
'EnrollmentFee': '0',
|
||||
'ProspectusFee': '0',
|
||||
'ReRegFee': '0',
|
||||
'CreditTransferFee': '0',
|
||||
'LateralEntryFee': '0',
|
||||
'DualSpclFee': '0',
|
||||
'OtherFee': '0',
|
||||
'NRIFEE':'0',
|
||||
'ProvisionalFee': '0',
|
||||
'MigrationFee': '0',
|
||||
'UrgentResultDMCFee': '0',
|
||||
'AdditionalFee': '0',
|
||||
'Amount': '0'
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
$scope.addToList = function(id){
|
||||
swal({
|
||||
title: "Are you sure?",
|
||||
text: "You Want to Add this Record to List!",
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: '#DD6B55',
|
||||
confirmButtonText: 'Yes',
|
||||
cancelButtonText: "No",
|
||||
closeOnConfirm: false,
|
||||
closeOnCancel: false
|
||||
},
|
||||
function(isConfirm){
|
||||
if (isConfirm){
|
||||
var selectedItems = [];
|
||||
function getUpdateDetails(id) {
|
||||
this.ID = id;
|
||||
this.DraftStatus = 0;
|
||||
}
|
||||
let itemGetID = new getUpdateDetails(id);
|
||||
selectedItems.push(itemGetID);
|
||||
var draftMoveToList = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'draftMovetoList/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
details : selectedItems
|
||||
}
|
||||
};
|
||||
$http(draftMoveToList).then(function (response) {
|
||||
if (response.data.draftStatus == true) {
|
||||
// swal("", response.data.draftDetailsMessagae, "success");
|
||||
// getDraftFormIdDetails();
|
||||
// getEmptycall();
|
||||
} else {
|
||||
// swal("", response.data.draftDetailsMessagae, "warning");
|
||||
// getDraftFormIdDetails();
|
||||
// getEmptycall();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
swal("Cancelled", "Your record not added to list :)", "error");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}]);
|
||||
|
||||
@ -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");
|
||||
@ -45,32 +44,16 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
|
||||
}
|
||||
}
|
||||
|
||||
/* get json sem details for serach
|
||||
* */
|
||||
$scope.semDetails=["1","2","3","4","5","6","7","8"];
|
||||
|
||||
/*$scope.universityData = '';
|
||||
$scope.getUniversityList = function () {
|
||||
var empListreq = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getStudentUniversity/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
data: localDetails
|
||||
}
|
||||
};
|
||||
$http(empListreq).then(function (response) {
|
||||
if (response.data.univList) {
|
||||
$scope.universityData = response.data.university_details;
|
||||
} else {
|
||||
}
|
||||
});
|
||||
}*/
|
||||
// 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 +73,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 +183,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 +214,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).univCode,
|
||||
universityName: angular.fromJson(uploadForDetails.university).univName,
|
||||
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
$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 +286,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 +298,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
getDetailsFor: getDetailsFor
|
||||
getDetailsFor: searchDetails
|
||||
}
|
||||
};
|
||||
$http(getFeeCompareDetailsList).then(function (response) {
|
||||
@ -394,34 +340,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 +382,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 +420,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 +430,6 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
}]);
|
||||
|
||||
@ -27,6 +27,7 @@
|
||||
|
||||
<!-- {{feeInfo}} -->
|
||||
<div class="col-md-12">
|
||||
<!-- {{feeInfo}} -->
|
||||
<div class="table-responsive">
|
||||
<table id="datatable" class="table table-hover">
|
||||
<thead>
|
||||
@ -64,7 +65,7 @@
|
||||
<textarea type="text" placeholder="Enter Reason" tabindex="7" class="form-control" name="Messagebody" ng-model="p.Reason" required></textarea>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3" ng-if="p.IsActive==true">
|
||||
<div class="col-md-3" ng-if="p.Deactive !=0">
|
||||
<label>
|
||||
Active/De-Active
|
||||
</label>
|
||||
|
||||
@ -217,15 +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">
|
||||
<!--<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>
|
||||
</li>-->
|
||||
</ul>
|
||||
</li>
|
||||
<!--<li ng-class="{'active open':$state.includes('app.call')}">
|
||||
|
||||
@ -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="univ in universitySearchData" value="{{univ}}">{{univ.univName}}</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>
|
||||
|
||||
@ -202,6 +202,154 @@
|
||||
</tab>
|
||||
<tab tabindex="2" active="subTabactive2" ng-click="subTabActive('subTabactive2')" heading="Upload Data Manualy" id="uploadDataManualy">
|
||||
<div class="container-fluid">
|
||||
<div class="container">
|
||||
<div class="table-responsive">
|
||||
<table class="table">
|
||||
<thead>
|
||||
<th>FormID</th>
|
||||
<th>FormType</th>
|
||||
<th>CentreCode</th>
|
||||
<th>Session</th>
|
||||
<th>Year</th>
|
||||
<th>Semester</th>
|
||||
<th>Student_Name</th>
|
||||
<th>Father_Name</th>
|
||||
<th>CourseCode</th>
|
||||
<th>ActualCourseFee</th>
|
||||
<th>CourseFee</th>
|
||||
<th>ExamFee</th>
|
||||
<th>EnrollmentFee</th>
|
||||
<th>ProspectusFee</th>
|
||||
<th>ReRegFee</th>
|
||||
<th>CreditTransferFee</th>
|
||||
<th>LateralEntryFee</th>
|
||||
<th>DualSpclFee</th>
|
||||
<th>OtherFee</th>
|
||||
<th>NRIFEE</th>
|
||||
<th>ProvisionalFee</th>
|
||||
<th>MigrationFee</th>
|
||||
<th>UrgentResultDMCFee</th>
|
||||
<th>AdditionalFee</th>
|
||||
<th>Amount</th>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
<input type="text" required ng-model="draftManualEntryDetails.FormID">
|
||||
</td>
|
||||
<td><select ng-model="draftManualEntryDetails.FormType" ng-disabled="!draftManualEntryDetails.FormID">
|
||||
<option value="NEW"> NEW </option>
|
||||
<option value="RE"> RE </option>
|
||||
</select>
|
||||
</td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.CentreCode" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.Session" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.Year" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.Semester" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.Student_Name" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.Father_Name" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.CourseCode" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.ActualCourseFee"
|
||||
ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.CourseFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.ExamFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.EnrollmentFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.ProspectusFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.ReRegFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.CreditTransferFee"
|
||||
ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.LateralEntryFee"
|
||||
ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.DualSpclFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.OtherFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.NRIFEE" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.ProvisionalFee"
|
||||
ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.MigrationFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.UrgentResultDMCFee"
|
||||
ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.AdditionalFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
<td><input type="text" ng-model="draftManualEntryDetails.Amount" ng-disabled="!draftManualEntryDetails.FormID"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<button class="btn btn-success pull-right" ng-disabled="!draftManualEntryDetails.FormID" ng-click="addManualData()">Add</button>
|
||||
</div>
|
||||
<div class="container">
|
||||
<div ng-if="draftListDetailsLoading">
|
||||
Loading...
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
<div ng-if="draftListDetails && !draftListDetailsLoading" class="table-responsive">
|
||||
<table class="table table-border table-hover">
|
||||
<thead>
|
||||
<th>FormID</th>
|
||||
<th>FormType</th>
|
||||
<th>CentreCode</th>
|
||||
<th>Session</th>
|
||||
<th>Year</th>
|
||||
<th>Semester</th>
|
||||
<th>Student Name</th>
|
||||
<th>Father Name</th>
|
||||
<th>CourseCode</th>
|
||||
<th>ActualCourseFee</th>
|
||||
<th>CourseFee</th>
|
||||
<th>ExamFee</th>
|
||||
<th>EnrollmentFee</th>
|
||||
<th>ProspectusFee</th>
|
||||
<th>ReRegFee</th>
|
||||
<th>CreditTransferFee</th>
|
||||
<th>LateralEntryFee</th>
|
||||
<th>DualSpclFee</th>
|
||||
<th>OtherFee</th>
|
||||
<th>NRIFEE</th>
|
||||
<th>ProvisionalFee</th>
|
||||
<th>MigrationFee</th>
|
||||
<th>UrgentResultDMCFee</th>
|
||||
<th>AdditionalFee</th>
|
||||
<th>Amount</th>
|
||||
<th>Action</th>
|
||||
</thead>
|
||||
<tbody dir-paginate="p in draftListDetails|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.Session}}</td>
|
||||
<td>{{p.Year}}</td>
|
||||
<td>{{p.Semester}}</td>
|
||||
<td>{{p.Student_Name}}</td>
|
||||
<td>{{p.Father_Name}}</td>
|
||||
<td>{{p.CourseCode}}</td>
|
||||
<td>{{p.ActualCourseFee}}</td>
|
||||
<td>{{p.CourseFee}}</td>
|
||||
<td>{{p.ExamFee}}</td>
|
||||
<td>{{p.EnrollmentFee}}</td>
|
||||
<td>{{p.ProspectusFee}}</td>
|
||||
<td>{{p.ReRegFee}}</td>
|
||||
<td>{{p.CreditTransferFee}}</td>
|
||||
<td>{{p.LateralEntryFee}}</td>
|
||||
<td>{{p.DualSpclFee}}</td>
|
||||
<td>{{p.OtherFee}}</td>
|
||||
<td>{{p.NRIFEE}}</td>
|
||||
<td>{{p.ProvisionalFee}}</td>
|
||||
<td>{{p.MigrationFee}}</td>
|
||||
<td>{{p.UrgentResultDMCFee}}</td>
|
||||
<td>{{p.AdditionalFee}}</td>
|
||||
<td>{{p.Amount}}</td>
|
||||
<td>
|
||||
<i class="ti-user" tooltip="Add To List" ng-click="addToList(p.ID);"></i>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||
</dir-pagination-controls>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--<div class="row">
|
||||
<div class="col-md-4 form-group">
|
||||
<label>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user