form id details check update : kdk
This commit is contained in:
dineshkumarkannan
parent
52f7be5af1
commit
e20ef04a18
@ -375,3 +375,6 @@ $route['getStudentUnivFormIdFeeDatailsList'] = 'Receive_Enrolment_Fees_Univ_Cont
|
||||
$route['getFormIdDetailsStatusUpdateList'] = 'Receive_Enrolment_Fees_Univ_Controller/getFormIdDetailsStatusUpdateList';
|
||||
$route['insertStatusUpdateDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/insertStatusUpdateDetails';
|
||||
$route['paymentVerficationDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/paymentVerficationDetails';
|
||||
$route['getUniversityCodeForFormDetailsGet'] = 'Receive_Enrolment_Fees_Univ_Controller/getUniversityCodeForFormDetailsGet';
|
||||
$route['getUnmatchedFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnmatchedFormIdFeesDetails';
|
||||
$route['addToAccountStateList'] = 'Receive_Enrolment_Fees_Univ_Controller/addToAccountStateList';
|
||||
|
||||
@ -85,7 +85,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
public function insertFormIdUnivFeeDetails_post(){
|
||||
$formIdDetails = $this->post('details');
|
||||
$localDetails = $this->post('localDetails');
|
||||
$updatedDetails = $this->receive_model->formIdFeeDetails($formIdDetails,$localDetails);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
$univDetails = $this->post('univ');
|
||||
$updatedDetails = $this->receive_model->formIdFeeDetails($formIdDetails,$localDetails, $univDetails);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
if ($updatedDetails)
|
||||
{
|
||||
$updatedDetails['status'] = REST_Controller::HTTP_OK;
|
||||
@ -289,7 +290,9 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
public function addForFormIdDraftDetails_post(){
|
||||
$reqBranch = $this->post('localDetails');
|
||||
$details = $this->post('details');
|
||||
$addForFormIdDraftDetails = $this->receive_model->addForFormIdDraftDetails($details, $reqBranch); // Check if the employee exist
|
||||
$univDetails = $this->post('univ');
|
||||
|
||||
$addForFormIdDraftDetails = $this->receive_model->addForFormIdDraftDetails($details, $reqBranch, $univDetails); // Check if the employee exist
|
||||
if ($addForFormIdDraftDetails) {
|
||||
$addForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
@ -391,5 +394,57 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
public function getUniversityCodeForFormDetailsGet_post(){
|
||||
$reqData = $this->post('data');
|
||||
$loginUserId = $reqData['localUserID'];
|
||||
$loginUserBranchId = $reqData['localBranchID'];
|
||||
$loginUserType = $reqData['localType'];
|
||||
$getUniversityListDetails = $this->receive_model->get_university_list($loginUserBranchId); // Check if the employee exist
|
||||
if ($getUniversityListDetails) {
|
||||
$getUniversityListDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($getUniversityListDetails, 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 getUnmatchedFormIdFeesDetails_post(){
|
||||
$localDetails = $this->post('localDetails');
|
||||
$getDetailsFor = $this->post('getDetailsFor');
|
||||
|
||||
$getUnmatchedFormIdFeesDetails = $this->receive_model->getUnmatchedFormIdFeesDetails($localDetails, $getDetailsFor); // Check if the employee exist
|
||||
if ($getUnmatchedFormIdFeesDetails) {
|
||||
$getUnmatchedFormIdFeesDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($getUnmatchedFormIdFeesDetails, 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 addToAccountStateList_post(){
|
||||
$localDetails = $this->post('localDetails');
|
||||
$getDetailsFor = $this->post('details');
|
||||
|
||||
$addFormIdListToAccountState = $this->receive_model->addFormIdListToAccountState($localDetails, $getDetailsFor); // Check if the employee exist
|
||||
if ($addFormIdListToAccountState) {
|
||||
$addFormIdListToAccountState['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($addFormIdListToAccountState, 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
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -368,9 +368,10 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
}
|
||||
|
||||
|
||||
public function formIdFeeDetails($formFeeDetails=null,$local=null){
|
||||
public function formIdFeeDetails($formFeeDetails=null,$local=null, $univ =null){
|
||||
$localBranchID = $local['localBranchID'];
|
||||
$localUserID = $local['localUserID'];
|
||||
$univId = $univ['univCode'];
|
||||
$time = date('Y-m-d H:i:s');
|
||||
$CreatedOn = $time;
|
||||
|
||||
@ -443,9 +444,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, DraftStatus, EditStatus)
|
||||
(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,UniversityID, CreatedBy, CreatedOn, BranchCode, DraftStatus, EditStatus)
|
||||
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' , 0, 0)";
|
||||
( '$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', '$univId', '$localUserID', '$CreatedOn', '$localBranchID' , 0, 0)";
|
||||
$queryDetails = $this->db->query($query);
|
||||
} else {
|
||||
echo 'else con';
|
||||
@ -905,10 +906,11 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function addForFormIdDraftDetails($details, $local){
|
||||
public function addForFormIdDraftDetails($details, $local, $univ =null){
|
||||
|
||||
$localBranchID = $local['localBranchID'];
|
||||
$localUserID = $local['localUserID'];
|
||||
$univId = $univ['univCode'];
|
||||
$time = date('Y-m-d H:i:s');
|
||||
$CreatedOn = $time;
|
||||
|
||||
@ -967,9 +969,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, DraftStatus, EditStatus)
|
||||
(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, UniversityID, CreatedBy, CreatedOn, BranchCode, DraftStatus, EditStatus)
|
||||
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, 1)";
|
||||
( '$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', '$univId' , '$localUserID', '$CreatedOn', '$localBranchID' , 1, 1)";
|
||||
$queryDetails = $this->db->query($query);
|
||||
|
||||
if($queryDetails){
|
||||
@ -1153,7 +1155,11 @@ $result['updatedraftStatus'] = false;
|
||||
}
|
||||
|
||||
public function getFormIdDetailsStatusUpdateList($reqBranchData, $searchDetails){
|
||||
$selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University_StatusUpdate WHERE FormIdDetailsID = '$searchDetails'";
|
||||
$selectQuery = "SELECT * , concat(t3.Firstname, '', t3.Lastname) as CreatedByName
|
||||
FROM T_FormId_FeeDetails_Received_From_University_StatusUpdate as t1
|
||||
LEFT JOIN T_Login as t2 ON t1.CreatedBy = t2.ID
|
||||
LEFT JOIN T_StaffDetails as t3 ON t2.StaffID = t3.StaffID
|
||||
WHERE FormIdDetailsID = '$searchDetails' ORDER BY t1.CreatedOn DESC ";
|
||||
$details = $this->db->query($selectQuery);
|
||||
$detailsList = $details->result();
|
||||
if($detailsList) {
|
||||
@ -1188,4 +1194,138 @@ $result['updatedraftStatus'] = false;
|
||||
return $result;
|
||||
}
|
||||
|
||||
// get university list
|
||||
public function get_university_list($branch) {
|
||||
$this->db->select('UniversityID, UniversityName');
|
||||
$this->db->order_by('CreatedOn', 'DESC');
|
||||
$this->db->from(UNIVERSITY);
|
||||
$this->db->where('IsActive', 1);
|
||||
$this->db->where('BranchCode', $branch);
|
||||
$univDetails = $this->db->get();
|
||||
$universityDetails = $univDetails->result();
|
||||
if (count($universityDetails) > 0) {
|
||||
$results['univList'] = true;
|
||||
$results['university_details'] = $universityDetails;
|
||||
} else {
|
||||
$results['univList'] = false;
|
||||
$results['message'] = 'No record found';
|
||||
}
|
||||
return $results;
|
||||
}
|
||||
|
||||
public function getUnmatchedFormIdFeesDetails($localDetails, $getDetailsFor) {
|
||||
|
||||
$searchUniv = $getDetailsFor['univCode'];
|
||||
// echo $searchUniv;exit();
|
||||
$query = "select *
|
||||
from T_FormId_FeeDetails_Received_From_University as t1
|
||||
where t1.FormID NOT IN (select FormID from T_Enrolment_Received_From_University)
|
||||
and t1.UniversityID ='$searchUniv'";
|
||||
$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;
|
||||
}
|
||||
|
||||
public function addFormIdListToAccountState($localDetails, $getDetailsFor){
|
||||
$localCreatedBy = $localDetails['localUserID'];
|
||||
$time = date('Y-m-d H:i:s');
|
||||
$localCreatedOn = $time;
|
||||
foreach($getDetailsFor as $row) {
|
||||
$ids = $row['ID'];
|
||||
$query = "SELECT t1.ID, t1.FormID, t1.Amount, t2.ApprovedDate , t2.CreatedOn ,t2.UniversityCode, t2.UniversityName
|
||||
from T_FormId_FeeDetails_Received_From_University as t1
|
||||
LEFT JOIN T_Enrolment_Received_From_University as t2 ON t1.FormID = t2.FormID
|
||||
WHERE t1.ID = '$ids'";
|
||||
$details = $this->db->query($query);
|
||||
$detailsList = $details->result();
|
||||
if($detailsList){
|
||||
$arr['FormMapID'] = $detailsList[0]->ID;
|
||||
$arr['FormID'] = $detailsList[0]->FormID;
|
||||
$arr['CreditAmount'] = $detailsList[0]->Amount;
|
||||
$ApprovedDate = date('y-m-d',strtotime($detailsList[0]->ApprovedDate));
|
||||
$CreatedOn = date('y-m-d',strtotime($detailsList[0]->CreatedOn));
|
||||
$arr['ApprovedDate'] = $ApprovedDate ? $ApprovedDate : $CreatedOn;
|
||||
$arr['TypeID'] = 1;
|
||||
$arr['TypeName'] = 'Credit';
|
||||
$arr['UniversityCode'] = $detailsList[0]->UniversityCode;
|
||||
$arr['UniversityName'] = $detailsList[0]->UniversityName;
|
||||
$arr['CreatedOn'] = $localCreatedOn;
|
||||
$arr['CreatedBy'] = $localCreatedBy;
|
||||
$this->db->insert('T_University_Credit_Debit', $arr);
|
||||
if ($this->db->affected_rows() >= 1) {
|
||||
$updateQuery = 'UPDATE `T_FormId_FeeDetails_Received_From_University` SET `AddToAccountStatus` = 1 WHERE `ID` = '.$ids;
|
||||
$queryDetails = $this->db->query($updateQuery);
|
||||
if ($this->db->affected_rows() == '1') {
|
||||
$result['accountStateMoveStatus'] = true;
|
||||
$result['accountStateMoveMessagae'] = "Updated Successfully.";
|
||||
} else {
|
||||
$result['accountStateMoveStatus'] = false;
|
||||
$result['accountStateMoveMessagae'] = "Something went wrong.";
|
||||
}
|
||||
} else {
|
||||
$result['accountStateMoveStatus'] = false;
|
||||
$result['accountStateMoveMessagae'] = "Something went wrong.";
|
||||
}
|
||||
} else {
|
||||
$result['accountStateMoveStatus'] = false;
|
||||
$result['accountStateMoveMessagae'] = "Something went wrong.";
|
||||
}
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
// 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 {
|
||||
// $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;
|
||||
// }
|
||||
|
||||
}
|
||||
@ -37,6 +37,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
if (localDetails.localType === 'R004') {
|
||||
// $scope.getUniversityList();
|
||||
$scope.getUniversitySearchList();
|
||||
$scope.getUniveesityListFromApp();
|
||||
} else {
|
||||
ipCookie.remove('cookiechk');
|
||||
$window.localStorage.clear();
|
||||
@ -47,11 +48,11 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
}
|
||||
|
||||
|
||||
/*$scope.universityData = '';
|
||||
$scope.getUniversityList = function () {
|
||||
$scope.universityData = '';
|
||||
$scope.getUniveesityListFromApp = function () {
|
||||
var empListreq = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getStudentUniversity/',
|
||||
url: apiPoint.url + 'getUniversityCodeForFormDetailsGet/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
@ -65,7 +66,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
} else {
|
||||
}
|
||||
});
|
||||
}*/
|
||||
}
|
||||
// get University List
|
||||
$scope.universitySearchData = '';
|
||||
$scope.getUniversitySearchList = function () {
|
||||
@ -229,9 +230,12 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
|
||||
}
|
||||
|
||||
$scope.formUploadUnivSelectID = {
|
||||
'univCode': ''
|
||||
};
|
||||
|
||||
$scope.receiveFormIdFeeDetails = function (details) {
|
||||
console.log(details);
|
||||
|
||||
var updateUniversityEnrolment = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'insertFormIdUnivFeeDetails/',
|
||||
@ -240,7 +244,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
details: details
|
||||
details: details,
|
||||
univ: $scope.formUploadUnivSelectID
|
||||
}
|
||||
};
|
||||
|
||||
@ -291,22 +296,26 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
$scope.formIdMissMatchUnivSelectID = {
|
||||
'univCode': ''
|
||||
};
|
||||
|
||||
$scope.unMatchedLoadingStatus = false;
|
||||
// Get unmached details
|
||||
$scope.getUnmatchedRecord = function (ss) {
|
||||
$scope.unMatchedRecordDetails = '';
|
||||
$scope.unMatchedNoRecordFound = false;
|
||||
$scope.unMatchedLoadingStatus = true;
|
||||
var getDetailsFor = ss == 1 ? 'EnrolmentIDFile' : 'FormIDFile';
|
||||
var getFeeCompareDetailsList = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getUnmatchedRecordDetails/',
|
||||
url: apiPoint.url + 'getUnmatchedFormIdFeesDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
getDetailsFor: getDetailsFor
|
||||
getDetailsFor: $scope.formIdMissMatchUnivSelectID
|
||||
}
|
||||
};
|
||||
$http(getFeeCompareDetailsList).then(function (response) {
|
||||
@ -404,7 +413,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
details : $scope.draftManualEntryDetails
|
||||
details : $scope.draftManualEntryDetails,
|
||||
univ: $scope.formUploadUnivSelectID
|
||||
}
|
||||
};
|
||||
$http(addDraftDetailsList).then(function (response) {
|
||||
@ -535,11 +545,17 @@ $scope.draftManualEntryDetails = {
|
||||
$scope.statusUpdateEditId = -1;
|
||||
$scope.statusUpdate = function(id){
|
||||
$scope.statusUpdateEditId = id;
|
||||
$scope.statusUpdateFormIdDetails = {
|
||||
"Status": "",
|
||||
"Comments": ""
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$scope.StatusListDetails = '';
|
||||
$scope.getFormIdDetailsStatusListLoading = false;
|
||||
$scope.getFormIdDetailsStatusList = function(id){
|
||||
|
||||
$scope.getFormIdDetailsStatusListLoading = true;
|
||||
var getFormIdDetailsStatusList = {
|
||||
method: 'POST',
|
||||
@ -568,6 +584,13 @@ $scope.draftManualEntryDetails = {
|
||||
"Comments": ""
|
||||
}
|
||||
|
||||
$scope.resetStatusUpdateForm = function(){
|
||||
$scope.statusUpdateFormIdDetails = {
|
||||
"Status": "",
|
||||
"Comments": ""
|
||||
}
|
||||
}
|
||||
|
||||
$scope.addStatusUpdateDetails = function(id, formId){
|
||||
var addStatusUpdateDetailsStatusList = {
|
||||
method: 'POST',
|
||||
@ -598,4 +621,50 @@ $scope.draftManualEntryDetails = {
|
||||
}});
|
||||
}
|
||||
|
||||
$scope.addToAccountState = function(id){
|
||||
|
||||
swal({
|
||||
title: "Are you sure?",
|
||||
text: "You Want to Add this Record to Account State 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;
|
||||
}
|
||||
let itemGetID = new getUpdateDetails(id);
|
||||
selectedItems.push(itemGetID);
|
||||
var addToAccountStateList = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'addToAccountStateList/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
details : selectedItems
|
||||
}
|
||||
};
|
||||
$http(addToAccountStateList).then(function (response) {
|
||||
if (response.data.accountStateMoveStatus == true) {
|
||||
swal("", response.data.accountStateMoveMessagae, "success");
|
||||
$scope.onSubmit();
|
||||
} else {
|
||||
swal("", response.data.accountStateMoveMessagae, "warning");
|
||||
|
||||
}});
|
||||
} else {
|
||||
swal("Cancelled", "Your record not added to list :)", "error");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}]);
|
||||
|
||||
@ -162,7 +162,8 @@
|
||||
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
|
||||
<tr>
|
||||
<td>
|
||||
<i class="ti-user" tooltip="Add To List" ng-click="statusUpdate(p.ID);"></i>
|
||||
<i class="glyphicon glyphicon-list-alt" tooltip="Status Details" ng-click="statusUpdate(p.ID);"></i>
|
||||
<i class="ti-plus" ng-if="p.AddToAccountStatus != 1" tooltip="Add to Account State" ng-click="addToAccountState(p.ID);"></i>
|
||||
</td>
|
||||
<td>
|
||||
{{p.FormID}}
|
||||
@ -214,51 +215,81 @@
|
||||
<tr ng-show="statusUpdateEditId === p.ID" ng-if="statusUpdateEditId === p.ID">
|
||||
<td colspan="12">
|
||||
<!--<h2> {{p.ID}} </h2>-->
|
||||
<div style="border: 1px solid gray; padding: 12px; margin: 4px;" ng-init="getFormIdDetailsStatusList(p.ID)">
|
||||
<div class="container" style="border: 1px solid gray; padding: 12px; margin: 4px;" ng-init="getFormIdDetailsStatusList(p.ID)">
|
||||
<div ng-if="getFormIdDetailsStatusListLoading">
|
||||
<div style="align: center; color: blue" align="center">
|
||||
<h3>Loading...</h3></div>
|
||||
</div>
|
||||
|
||||
<div ng-if="!getFormIdDetailsStatusListLoading">
|
||||
<div class="container">
|
||||
<div class="container" ng-if="!getFormIdDetailsStatusListLoading">
|
||||
<div class="container" ng-init="addStatusDetails = false">
|
||||
<div class="row">
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
<div class="pull-right">
|
||||
<button class="btn btn-primary" ng-click="addStatusDetails = !addStatusDetails"> Add Status</button>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-if="addStatusDetails" class="container">
|
||||
<fieldset>
|
||||
<legend>Add Status
|
||||
</legend>
|
||||
<div class="row">
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
Select Status
|
||||
</label>
|
||||
<select class="form-control" ng-model="statusUpdateFormIdDetails.Status">
|
||||
<select class="form-control" ng-model="statusUpdateFormIdDetails.Status">
|
||||
<option value="" disabled> Select </option>
|
||||
<option value="Ok"> Ok </option>
|
||||
<option value="Not Ok"> Not Ok </option>
|
||||
<option value="Not Our Student"> Not Our Student </option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
</div>
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
Comments
|
||||
</label>
|
||||
<textarea placeholder="Enter Comments" class="form-control" ng-model="statusUpdateFormIdDetails.Comments"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="pull-left">
|
||||
<button type="button" ladda="ldloading1.zoom_in" tabindex="2028" class="btn btn-wide btn-success"
|
||||
data-style="zoom-in" ng-click="addStatusUpdateDetails(p.ID, p.FormID)">
|
||||
<i class='fa fa-spinner fa-spin' ng-if="editSaveButtonDisable"> </i> Save
|
||||
<textarea placeholder="Enter Comments" class="form-control" ng-model="statusUpdateFormIdDetails.Comments" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="pull-right">
|
||||
<button type="button" ladda="ldloading1.zoom_in" tabindex="2028" ng-disabled="statusUpdateFormIdDetails.Status == ''" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="addStatusUpdateDetails(p.ID, p.FormID)">
|
||||
<i class='fa fa-spinner fa-spin' ng-if="editSaveButtonDisable" > </i> Save
|
||||
</button>
|
||||
<button type="reset" class="btn btn-warning btn-wide" tabindex="2029" ng-click="cancel()">
|
||||
<button type="reset" class="btn btn-warning btn-wide" tabindex="2029" ng-click="resetStatusUpdateForm()" ng-disabled="statusUpdateFormIdDetails.Status == ''">
|
||||
Reset
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
<div ng-if="StatusListDetails != ''">
|
||||
<table class="table">
|
||||
<thead style="background-color: cadetblue">
|
||||
<th>FormID</th>
|
||||
<th>Status</th>
|
||||
<th>Comments</th>
|
||||
<th>Updated On</th>
|
||||
</thead>
|
||||
<tbody ng-repeat="s in StatusListDetails">
|
||||
<td>{{s.FormID}}</td>
|
||||
<td>{{s.Status}}</td>
|
||||
<td><span style="white-space:pre-wrap;">{{s.Comments}}</span></td>
|
||||
<td>{{s.CreatedOn}}</td>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-if="StatusListDetails != ''">
|
||||
|
||||
</div>
|
||||
<div ng-if="StatusListDetails == ''">
|
||||
<div>{{StatusListDetailsApiMessage}}</div>
|
||||
<div style="color: blue;" align="center"><h3>{{StatusListDetailsApiMessage}}</h3></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="pull-right">
|
||||
<button type="cancel" class="btn btn-warning btn-wide" tabindex="2029" ng-click="statusUpdate(-1)">
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@ -271,19 +302,25 @@
|
||||
</div>
|
||||
</tab>
|
||||
<tab tabindex="2" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Upload Details" id="uploadFiles">
|
||||
<tabset id="uploadDetails" class="tabbable">
|
||||
|
||||
<div class="container">
|
||||
<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="formUploadUnivSelectID.univCode" required>
|
||||
<option value="" selected>Select University</option>
|
||||
<option ng-repeat="univ in universityData" value="{{univ.UniversityID}}">{{univ.UniversityName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<!--{{formUploadUnivSelectID}}-->
|
||||
</div>
|
||||
|
||||
<tabset ng-if="formUploadUnivSelectID.univCode" id="uploadDetails" class="tabbable">
|
||||
<tab tabindex="1" active="subTabactive1" ng-click="subTabActive('subTabactive1')" heading="Upload File" 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>
|
||||
<option value="" selected>Select University</option>
|
||||
<option ng-repeat="univ in universitySearchData" value="{{univ}}">{{univ.UniversityName}}</option>
|
||||
</select>
|
||||
</div>-->
|
||||
|
||||
<div class="col-md-6 form-group" ng-if="showFile=='1'">
|
||||
<fieldset>
|
||||
<js-xls onread="readXlsxFormDetails" onerror="error"></js-xls>
|
||||
@ -411,8 +448,8 @@
|
||||
<tbody dir-paginate="p in draftListDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
|
||||
<tr>
|
||||
<td>
|
||||
<i class="ti-user" tooltip="Add To List" ng-click="addToList(p.ID);"></i>
|
||||
<i class="ti-user" tooltip="Add To List" ng-click="editList(p.ID, p);"></i>
|
||||
<i class="ti-receipt" tooltip="Add To List" ng-click="addToList(p.ID);"></i>
|
||||
<i class="ti-pencil" tooltip="Edit Record" ng-click="editList(p.ID, p);"></i>
|
||||
</td>
|
||||
<td>{{p.FormID}}</td>
|
||||
<td>{{p.FormType}}</td>
|
||||
@ -643,21 +680,22 @@
|
||||
</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 class="col-md-4 form-group">
|
||||
<label>
|
||||
University <span class="symbol required"></span>
|
||||
</label>
|
||||
<select class="form-control" tabindex="1" name="formUniversity" ng-model="formIdMissMatchUnivSelectID.univCode" required>
|
||||
<option value="" selected>Select University</option>
|
||||
<option ng-repeat="univ in universityData" value="{{univ.UniversityID}}">{{univ.UniversityName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<!--{{formIdMissMatchUnivSelectID}}-->
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<button class="btn btn-success" ng-disabled="!getUnmatchedDetailsFor" ng-click="getUnmatchedRecord(getUnmatchedDetailsFor)">Get Record</button>
|
||||
<button class="btn btn-success" ng-disabled="!formIdMissMatchUnivSelectID.univCode" ng-click="getUnmatchedRecord(getUnmatchedDetailsFor)">Get Record</button>
|
||||
</div>
|
||||
<div class="container">
|
||||
<div ng-if="unMatchedLoadingStatus">
|
||||
|
||||
BIN
Apollo/images/student/Dri_Be563jFw2aQu.jpeg
Normal file
BIN
Apollo/images/student/Dri_Be563jFw2aQu.jpeg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.4 KiB |
BIN
Apollo/images/student/Dri_hRifsSNIu7HX.jpeg
Normal file
BIN
Apollo/images/student/Dri_hRifsSNIu7HX.jpeg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.4 KiB |
Loading…
Reference in New Issue
Block a user