Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
gandhimathi
commit
75709262e4
@ -375,3 +375,8 @@ $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';
|
||||
$route['addUniversityPaymentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addUniversityPaymentDetails';
|
||||
|
||||
|
||||
@ -44,7 +44,7 @@ class Batch_Controller extends REST_Controller {
|
||||
$details['IsActive'] = $this->post('status');
|
||||
$details['BranchCode'] = $this->post('branchCode');
|
||||
$details['CreatedOn'] = $now->format('Y-m-d H:i:s');
|
||||
print_r( $details +'samplearray');
|
||||
//print_r( $details +'samplearray');
|
||||
|
||||
$batchDetails = $this->batch_model->addBatch($details);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
if ($batchDetails)
|
||||
|
||||
1247
Apollo/api/application/controllers/HallTickets_Controller.php
Executable file → Normal file
1247
Apollo/api/application/controllers/HallTickets_Controller.php
Executable file → Normal file
File diff suppressed because it is too large
Load Diff
@ -37,6 +37,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
$this->methods['getExistStudentEnrolmentDetails_post']['limit'] = 1000;
|
||||
|
||||
$this->methods['addManualEnrolmentDetails_post']['limit'] = 1000;
|
||||
$this->methods['addUniversityPaymentDetails_post']['limit'] = 1000;
|
||||
|
||||
// load the model
|
||||
$this->load->model('Receive_Enrolment_Fees_Univ_model', 'receive_model');
|
||||
@ -85,7 +86,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;
|
||||
@ -271,6 +273,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// get formid draft mode list details
|
||||
// kdk
|
||||
public function getForFormIdDraftDetails_post(){
|
||||
$reqBranch = $this->post('localDetails');
|
||||
$getForFormIdDraftDetails = $this->receive_model->getForFormIdDraftDetails(); // Check if the employee exist
|
||||
@ -286,10 +290,14 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// add formid manual details form the university and draftmode
|
||||
// kdk
|
||||
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
|
||||
@ -302,6 +310,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// manual formid entry draft details move to the list details
|
||||
// kdk
|
||||
public function draftMovetoList_post(){
|
||||
$reqBranch = $this->post('localDetails');
|
||||
$details = $this->post('details');
|
||||
@ -318,6 +328,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// edit draft mode formid manul entry details
|
||||
// kdk
|
||||
public function editDraftFormIdFeesDetails_post(){
|
||||
$reqBranch = $this->post('localDetails');
|
||||
$details = $this->post('details');
|
||||
@ -337,7 +349,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// get formid fee details list with status
|
||||
// get formid , fee details form the file upload for the university , course, student
|
||||
// kdk
|
||||
public function getStudentUnivFormIdFeeDatailsList_post(){
|
||||
$reqBranchData = $this->post('data');
|
||||
$searchDetails = $this->post('search');
|
||||
@ -355,6 +368,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// get formid status list for that particular record
|
||||
// kdk
|
||||
public function getFormIdDetailsStatusUpdateList_post(){
|
||||
$reqBranchData = $this->post('localDetails');
|
||||
$statusDetailsId = $this->post('detailsID');
|
||||
@ -372,6 +387,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// add formid list file status list for that record
|
||||
// kdk
|
||||
public function insertStatusUpdateDetails_post(){
|
||||
$reqBranchData = $this->post('localDetails');
|
||||
$statusDetails = $this->post('details');
|
||||
@ -391,5 +408,115 @@ 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
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// get unmatched records of the formid file details , compare with file 1
|
||||
// kdk
|
||||
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
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// add fromid university amount details to account state
|
||||
// kdk
|
||||
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
|
||||
|
||||
}
|
||||
}
|
||||
/*
|
||||
* get payment verfication details
|
||||
* created by kms
|
||||
* */
|
||||
public function paymentVerficationDetails_post(){
|
||||
$fromDetails['UniversityCode']=$this->post('universityID');
|
||||
$fromDetails['UniversityName']=$this->post('universityName');
|
||||
$getVerificationDetails=$this->receive_model->getPaymentVerificationDetails($fromDetails);
|
||||
if($getVerificationDetails['status']==true){
|
||||
$this->response($getVerificationDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
|
||||
}
|
||||
else if($getVerificationDetails['status']==false){
|
||||
$this->response($getVerificationDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
|
||||
}
|
||||
else{
|
||||
$this->response(['details' => 'No list were found', 'status' => false], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
|
||||
}
|
||||
}
|
||||
/*
|
||||
* add university payment details
|
||||
* created by kms
|
||||
* */
|
||||
public function addUniversityPaymentDetails_post(){
|
||||
$now = new DateTime();
|
||||
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
|
||||
$details=$this->post('details');
|
||||
$localData=$this->post('localDetails');
|
||||
$fromDetails['BillNo']=$details['billNo'];
|
||||
$fromDetails['ReceiptNo']=$details['receiptNo'];
|
||||
$fromDetails['Amount']=$details['billAmount'];
|
||||
$fromDetails['ApprovedDate']=$details['date'];
|
||||
$fromDetails['UniversityCode']=$details['universityCode'];
|
||||
$fromDetails['UniversityName']=$details['universityName'];
|
||||
$fromDetails['Remarks']=$details['comments'];
|
||||
$fromDetails['BranchCode']=$localData['localBranchID'];
|
||||
$fromDetails['CreatedBy']=$localData['localUserID'];
|
||||
$fromDetails['CreatedOn']=$now->format('Y-m-d H:i:s');
|
||||
$addPaymentDetails=$this->receive_model->addPaymentDetails($fromDetails);
|
||||
if($addPaymentDetails['status']==true){
|
||||
$this->response($addPaymentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
|
||||
}
|
||||
else if($addPaymentDetails['status']==false){
|
||||
$this->response($addPaymentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
|
||||
}
|
||||
else{
|
||||
$this->response(['message' => 'Try again', 'status' => false], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
2992
Apollo/api/application/models/Hallticket_model.php
Executable file → Normal file
2992
Apollo/api/application/models/Hallticket_model.php
Executable file → Normal file
File diff suppressed because it is too large
Load Diff
@ -367,10 +367,12 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
return $finalArray;
|
||||
}
|
||||
|
||||
|
||||
public function formIdFeeDetails($formFeeDetails=null,$local=null){
|
||||
// add student formid feedetails from the university by file upload , with check the unique entry
|
||||
// kdk
|
||||
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 +445,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, AddToAccountStatus)
|
||||
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, 0)";
|
||||
$queryDetails = $this->db->query($query);
|
||||
} else {
|
||||
echo 'else con';
|
||||
@ -889,6 +891,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
return $resultArray;
|
||||
}
|
||||
|
||||
// get formid draft mode list details
|
||||
// kdk
|
||||
public function getForFormIdDraftDetails(){
|
||||
$selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE DraftStatus = 1";
|
||||
$details = $this->db->query($selectQuery);
|
||||
@ -905,10 +909,13 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function addForFormIdDraftDetails($details, $local){
|
||||
// add formid manual details form the university and draftmode
|
||||
// kdk
|
||||
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 +974,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, AddToAccountStatus)
|
||||
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, 0)";
|
||||
$queryDetails = $this->db->query($query);
|
||||
|
||||
if($queryDetails){
|
||||
@ -986,6 +993,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
return $result;
|
||||
}
|
||||
|
||||
// manual formid entry draft details move to the list details
|
||||
// kdk
|
||||
public function draftMovetoList($detail, $local){
|
||||
// print_r($details);exit();
|
||||
|
||||
@ -1014,6 +1023,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
return $result;
|
||||
}
|
||||
|
||||
// edit draft mode formid manul entry details
|
||||
// kdk
|
||||
public function editDraftFormIdFeesDetails($reqBranch, $details, $detailsID){
|
||||
$ids = $detailsID;
|
||||
$formIds = $details['FormID'];
|
||||
@ -1083,6 +1094,8 @@ $result['updatedraftStatus'] = false;
|
||||
return $result;
|
||||
}
|
||||
|
||||
// get formid , fee details form the file upload for the university , course, student
|
||||
// kdk
|
||||
public function getStudentUnivFormIdFeeDatailsList($reqBranchData, $searchDetails){
|
||||
|
||||
$this->db->select('FUD.*, concat(ST.FirstName," ", ST.Lastname) as app_StudentName, IF(concat(ST.FirstName," " , ST.Lastname) = FUD.Student_Name, "YES", "NO") as StudentNameStatus ,
|
||||
@ -1152,8 +1165,14 @@ $result['updatedraftStatus'] = false;
|
||||
|
||||
}
|
||||
|
||||
// get formid status list for that particular record
|
||||
// kdk
|
||||
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) {
|
||||
@ -1168,6 +1187,8 @@ $result['updatedraftStatus'] = false;
|
||||
return $result;
|
||||
}
|
||||
|
||||
// add formid list file status list for that record
|
||||
// kdk
|
||||
public function insertStatusUpdateDetails($reqBranchData, $statusDetails, $id, $formId ){
|
||||
|
||||
$newLeadDetails['FormIdDetailsID'] = $id;
|
||||
@ -1188,4 +1209,262 @@ $result['updatedraftStatus'] = false;
|
||||
return $result;
|
||||
}
|
||||
|
||||
// get university list for search
|
||||
// kdk
|
||||
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;
|
||||
}
|
||||
|
||||
// get unmatched records of the formid file details , compare with file 1
|
||||
// kdk
|
||||
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;
|
||||
}
|
||||
|
||||
// Add formid , university amount payment details to the account state
|
||||
// kdk
|
||||
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;
|
||||
// }
|
||||
/*
|
||||
* get payment verification details
|
||||
* created by kms
|
||||
* */
|
||||
public function getPaymentVerificationDetails($search){
|
||||
$this->db->select('UNCD.ID,UNCD.FormMapID,UNCD.PaymentMapID,UNCD.FormID,UNCD.CreditAmount,UNCD.DebitAmount,UNCD.ApprovedDate,UNCD.UniversityCode,UNCD.UniversityName,UNCD.TypeID,ENU.EnrolmentNo,UNP.BillNo,UNP.PID as PaymentID');
|
||||
$this->db->from(UNIVERSITYCREDITDEBIY.' as UNCD');
|
||||
$this->db->join(FORMFEESRECEIVEDFROMUNIV.' as UNFR', 'UNFR.ID = UNCD.FormMapID','left');
|
||||
$this->db->join(UNIVERSITYPAYMENT.' as UNP', 'UNP.PID = UNCD.PaymentMapID','left');
|
||||
$this->db->join(ENROLMENTRECEIVEDFROMUNIV.' as ENU', 'ENU.FormID = UNFR.FormID','left');
|
||||
$this->db->order_by('UNCD.ApprovedDate','DESC');
|
||||
$this->db->where('UNCD.UniversityCode',$search['UniversityCode']);
|
||||
$this->db->order_by('UNCD.UniversityName',$search['UniversityName']);
|
||||
$details = $this->db->get();
|
||||
$resultArray=array();
|
||||
if($details->result()){
|
||||
$resultArray['status']=true;
|
||||
$resultArray['details']=$details->result();
|
||||
|
||||
}
|
||||
|
||||
else{
|
||||
$resultArray['status']=false;
|
||||
$resultArray['details']="No list were found";
|
||||
}
|
||||
return $resultArray;
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* add payment details
|
||||
* created by kms
|
||||
* */
|
||||
public function addPaymentDetails($fromDetails=null){
|
||||
$resultArray=array();
|
||||
$this->db->select('UNP.BillNo');
|
||||
$this->db->from(UNIVERSITYPAYMENT.' as UNP');
|
||||
$this->db->where('UNP.BillNo', $fromDetails['BillNo']);
|
||||
$billExist = $this->db->get();
|
||||
if($billExist->num_rows()<=0){
|
||||
|
||||
if($fromDetails['ReceiptNo']!='' AND $fromDetails['ReceiptNo']!=null){
|
||||
$this->db->select('UNP1.ReceiptNo');
|
||||
$this->db->from(UNIVERSITYPAYMENT.' as UNP1');
|
||||
$this->db->where('UNP1.ReceiptNo', $fromDetails['ReceiptNo']);
|
||||
$receiptExist = $this->db->get();
|
||||
if($receiptExist->num_rows()<=0){
|
||||
$this->db->insert(UNIVERSITYPAYMENT, $fromDetails);
|
||||
if ($this->db->affected_rows() > 0) {
|
||||
$updateDebitTable['PaymentMapID']=$this->db->insert_id();
|
||||
$updateDebitTable['DebitAmount']=$fromDetails['Amount'];
|
||||
$updateDebitTable['ApprovedDate']=$fromDetails['ApprovedDate'];
|
||||
$updateDebitTable['TypeID']=0;
|
||||
$updateDebitTable['TypeName']="Debit";
|
||||
$updateDebitTable['UniversityCode']=$fromDetails['UniversityCode'];
|
||||
$updateDebitTable['UniversityName']=$fromDetails['UniversityName'];
|
||||
$updateDebitTable['BranchCode']=$fromDetails['BranchCode'];
|
||||
$updateDebitTable['CreatedBy']=$fromDetails['CreatedBy'];
|
||||
$updateDebitTable['CreatedOn']=$fromDetails['CreatedOn'];
|
||||
$this->db->insert(UNIVERSITYCREDITDEBIY, $updateDebitTable);
|
||||
if ($this->db->affected_rows() > 0) {
|
||||
$resultArray['status']=true;
|
||||
$resultArray['message']="Payment added successfully";
|
||||
}
|
||||
else{
|
||||
$this->db->delete(UNIVERSITYPAYMENT);
|
||||
$this->db->where('PID',$updateDebitTable['PaymentMapID']);
|
||||
$resultArray['status']=false;
|
||||
$resultArray['message']="Payment failed.try again";
|
||||
}
|
||||
|
||||
} else {
|
||||
$resultArray['status']=false;
|
||||
$resultArray['message']="Payment failed.Try again";
|
||||
}
|
||||
}
|
||||
else{
|
||||
$resultArray['status']=false;
|
||||
$resultArray['message']="Receipt no is already exist..";
|
||||
}
|
||||
}
|
||||
else{
|
||||
$this->db->insert(UNIVERSITYPAYMENT, $fromDetails);
|
||||
if ($this->db->affected_rows() > 0) {
|
||||
$updateDebitTable['PaymentMapID']=$this->db->insert_id();
|
||||
$updateDebitTable['DebitAmount']=$fromDetails['Amount'];
|
||||
$updateDebitTable['ApprovedDate']=$fromDetails['ApprovedDate'];
|
||||
$updateDebitTable['TypeID']=0;
|
||||
$updateDebitTable['TypeName']="Debit";
|
||||
$updateDebitTable['UniversityCode']=$fromDetails['UniversityCode'];
|
||||
$updateDebitTable['UniversityName']=$fromDetails['UniversityName'];
|
||||
$updateDebitTable['BranchCode']=$fromDetails['BranchCode'];
|
||||
$updateDebitTable['CreatedBy']=$fromDetails['CreatedBy'];
|
||||
$updateDebitTable['CreatedOn']=$fromDetails['CreatedOn'];
|
||||
$this->db->insert(UNIVERSITYCREDITDEBIY, $updateDebitTable);
|
||||
if ($this->db->affected_rows() > 0) {
|
||||
$resultArray['status']=true;
|
||||
$resultArray['message']="Payment added successfully";
|
||||
}
|
||||
else{
|
||||
$this->db->delete(UNIVERSITYPAYMENT);
|
||||
$this->db->where('PID',$updateDebitTable['PaymentMapID']);
|
||||
$resultArray['status']=false;
|
||||
$resultArray['message']="Payment failed.try again";
|
||||
}
|
||||
|
||||
} else {
|
||||
$resultArray['status']=false;
|
||||
$resultArray['message']="Payment failed.Try again";
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
else {
|
||||
$resultArray['status']=false;
|
||||
$resultArray['message']="Bill no is already exist..";
|
||||
}
|
||||
return $resultArray;
|
||||
|
||||
}
|
||||
}
|
||||
@ -865,9 +865,9 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
|
||||
};
|
||||
$http(setFees).then(function (response) {
|
||||
if (response.data.status==200 && response.data.feesStatus) {
|
||||
|
||||
|
||||
$scope.masterSessionDetails = response.data.sessionDetails;
|
||||
|
||||
|
||||
// service call for session master list in desc order based on date
|
||||
angular.forEach($scope.masterSessionDetails,function (fvalue,fkey) {
|
||||
var parts = fvalue.SessionDate.split("-");
|
||||
@ -1070,8 +1070,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
|
||||
else{
|
||||
$scope.convertGetDate=new Date($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].DueDate).toDateString();
|
||||
$scope.pushDueDate = $filter('date')(new Date($scope.convertGetDate), 'dd-MM-yyyy');
|
||||
|
||||
}
|
||||
}
|
||||
var MoreInsAmt= Math.round($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount * 50 / 100);
|
||||
var afterMoreInsAmt = parseInt($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount)-parseInt(MoreInsAmt);
|
||||
$rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].Amount = MoreInsAmt;
|
||||
@ -1374,8 +1373,9 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
|
||||
startPayableAmt = parseInt(totAmt);
|
||||
var percentage = Math.round(startPayableAmt * 70 / 100);
|
||||
percentage = Math.round(percentage / 10) * 10;
|
||||
|
||||
startPayableAmt = startPayableAmt - percentage;
|
||||
|
||||
// alert(startPayableAmt);
|
||||
$scope.insFirstDate = $filter('date')(new Date(cDate), 'dd-MM-yyyy');
|
||||
$scope.insSecondDate = $filter('date')(new Date(cDate), 'dd-MM-yyyy');
|
||||
|
||||
@ -1389,7 +1389,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
|
||||
|
||||
}
|
||||
else {
|
||||
startPayableAmt = Math.round(startPayableAmt / 10) * 10;
|
||||
startPayableAmt = Math.round(startPayableAmt);
|
||||
$scope.updateMoreItems.push({
|
||||
ID: "",
|
||||
Name: installmentService.installmentWords(i),
|
||||
|
||||
1456
Apollo/assets/js/controllers/schCtrl.js
Executable file → Normal file
1456
Apollo/assets/js/controllers/schCtrl.js
Executable file → Normal file
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,6 @@
|
||||
'use strict';
|
||||
/**
|
||||
* controllers for ng-table
|
||||
* Simple table with sorting and filtering on AngularJS
|
||||
* Student University Formid, Fee details compare
|
||||
* kdk
|
||||
*/
|
||||
|
||||
@ -37,6 +36,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 +47,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 +65,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
} else {
|
||||
}
|
||||
});
|
||||
}*/
|
||||
}
|
||||
// get University List
|
||||
$scope.universitySearchData = '';
|
||||
$scope.getUniversitySearchList = function () {
|
||||
@ -88,7 +88,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
});
|
||||
};
|
||||
|
||||
$scope.semDetails=["1","2","3","4","5","6","7","8"];
|
||||
$scope.semDetails = ["1", "2", "3", "4", "5", "6", "7", "8"];
|
||||
|
||||
$scope.searchData = {
|
||||
"University": "",
|
||||
@ -163,15 +163,15 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
}
|
||||
}
|
||||
|
||||
$scope.myObj = {
|
||||
$scope.myObj = {
|
||||
// "color" : "green",
|
||||
"font-size" : "inherit"
|
||||
"font-size": "inherit"
|
||||
}
|
||||
|
||||
$scope.myObjErr = {
|
||||
$scope.myObjErr = {
|
||||
"text-decoration": "underline",
|
||||
"text-decoration-color": "red",
|
||||
"font-size" : "inherit"
|
||||
"font-size": "inherit"
|
||||
}
|
||||
|
||||
$scope.editId = -1;
|
||||
@ -229,9 +229,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 +243,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
details: details
|
||||
details: details,
|
||||
univ: $scope.formUploadUnivSelectID
|
||||
}
|
||||
};
|
||||
|
||||
@ -291,22 +295,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) {
|
||||
@ -325,8 +333,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
|
||||
// get subtab details for the formid fee details get form the university
|
||||
|
||||
$scope.subTabActive= function(tab){
|
||||
if( tab == 'subTabactive2'){
|
||||
$scope.subTabActive = function (tab) {
|
||||
if (tab == 'subTabactive2') {
|
||||
getDraftFormIdDetails();
|
||||
}
|
||||
}
|
||||
@ -336,14 +344,14 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
'FormID': '',
|
||||
'FormType': 'NEW',
|
||||
'CentreCode': '',
|
||||
'Session':'',
|
||||
'Year':'',
|
||||
'Semester':'',
|
||||
'Student_Name':'',
|
||||
'Father_Name':'',
|
||||
'CourseCode':'',
|
||||
'ActualCourseFee':'0',
|
||||
'CourseFee':'0',
|
||||
'Session': '',
|
||||
'Year': '',
|
||||
'Semester': '',
|
||||
'Student_Name': '',
|
||||
'Father_Name': '',
|
||||
'CourseCode': '',
|
||||
'ActualCourseFee': '0',
|
||||
'CourseFee': '0',
|
||||
'ExamFee': '0',
|
||||
'EnrollmentFee': '0',
|
||||
'ProspectusFee': '0',
|
||||
@ -352,7 +360,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
'LateralEntryFee': '0',
|
||||
'DualSpclFee': '0',
|
||||
'OtherFee': '0',
|
||||
'NRIFEE':'0',
|
||||
'NRIFEE': '0',
|
||||
'ProvisionalFee': '0',
|
||||
'MigrationFee': '0',
|
||||
'UrgentResultDMCFee': '0',
|
||||
@ -360,12 +368,12 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
'Amount': '0'
|
||||
}
|
||||
|
||||
|
||||
|
||||
$scope.draftListDetails = '';
|
||||
$scope.draftListDetailsNoRecordFound = false;
|
||||
$scope.draftListDetailsLoading = false;
|
||||
// get draft form id details
|
||||
function getDraftFormIdDetails(){
|
||||
function getDraftFormIdDetails() {
|
||||
$scope.draftListDetailsLoading = true;
|
||||
$scope.draftListDetailsNoRecordFound = false;
|
||||
$scope.draftListDetails = '';
|
||||
@ -393,8 +401,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
|
||||
// manual entry details add
|
||||
|
||||
$scope.addManualData = function() {
|
||||
alert(JSON.stringify($scope.draftManualEntryDetails));
|
||||
$scope.addManualData = function () {
|
||||
// alert(JSON.stringify($scope.draftManualEntryDetails));
|
||||
|
||||
var addDraftDetailsList = {
|
||||
method: 'POST',
|
||||
@ -404,7 +412,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
details : $scope.draftManualEntryDetails
|
||||
details: $scope.draftManualEntryDetails,
|
||||
univ: $scope.formUploadUnivSelectID
|
||||
}
|
||||
};
|
||||
$http(addDraftDetailsList).then(function (response) {
|
||||
@ -420,93 +429,96 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
});
|
||||
}
|
||||
|
||||
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'
|
||||
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;
|
||||
}
|
||||
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
|
||||
// add draft details to list
|
||||
$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;
|
||||
}
|
||||
};
|
||||
$http(draftMoveToList).then(function (response) {
|
||||
if (response.data.draftStatus == true) {
|
||||
// alert();
|
||||
swal("", response.data.draftDetailsMessagae, "success");
|
||||
getDraftFormIdDetails();
|
||||
} else {
|
||||
swal("", response.data.draftDetailsMessagae, "warning");
|
||||
|
||||
}});
|
||||
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) {
|
||||
// alert();
|
||||
swal("", response.data.draftDetailsMessagae, "success");
|
||||
getDraftFormIdDetails();
|
||||
} else {
|
||||
swal("", response.data.draftDetailsMessagae, "warning");
|
||||
|
||||
}
|
||||
});
|
||||
} else {
|
||||
swal("Cancelled", "Your record not added to list :)", "error");
|
||||
swal("Cancelled", "Your record not added to list :)", "error");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$scope.editId = -1;
|
||||
$scope.leader = {};
|
||||
$scope.editList = function(details, d){
|
||||
$scope.editList = function (details, d) {
|
||||
$scope.leader = {};
|
||||
angular.copy(d, $scope.leader);
|
||||
$scope.editId = details;
|
||||
}
|
||||
|
||||
$scope.updateFeeIDDetails = function(id, p){
|
||||
// update feeid details in draft mode
|
||||
$scope.updateFeeIDDetails = function (id, p) {
|
||||
var editDraftMoveToList = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'editDraftFormIdFeesDetails/',
|
||||
@ -515,7 +527,7 @@ $scope.draftManualEntryDetails = {
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
details : p,
|
||||
details: p,
|
||||
detailsID: id
|
||||
}
|
||||
};
|
||||
@ -525,21 +537,29 @@ $scope.draftManualEntryDetails = {
|
||||
swal("", response.data.updatedraftDetailsMessagae, "success");
|
||||
getDraftFormIdDetails();
|
||||
$scope.editId = -1;
|
||||
$scope.leader = {};
|
||||
$scope.leader = {};
|
||||
} else {
|
||||
swal("", response.data.updatedraftDetailsMessagae, "warning");
|
||||
|
||||
}});
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$scope.statusUpdateEditId = -1;
|
||||
$scope.statusUpdate = function(id){
|
||||
$scope.statusUpdate = function (id) {
|
||||
$scope.statusUpdateEditId = id;
|
||||
$scope.statusUpdateFormIdDetails = {
|
||||
"Status": "",
|
||||
"Comments": ""
|
||||
}
|
||||
}
|
||||
|
||||
$scope.StatusListDetails = '';
|
||||
|
||||
$scope.StatusListDetails = '';
|
||||
$scope.getFormIdDetailsStatusListLoading = false;
|
||||
$scope.getFormIdDetailsStatusList = function(id){
|
||||
// formid records status details
|
||||
$scope.getFormIdDetailsStatusList = function (id) {
|
||||
|
||||
$scope.getFormIdDetailsStatusListLoading = true;
|
||||
var getFormIdDetailsStatusList = {
|
||||
method: 'POST',
|
||||
@ -549,18 +569,19 @@ $scope.draftManualEntryDetails = {
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
detailsID : id
|
||||
detailsID: id
|
||||
}
|
||||
};
|
||||
$http(getFormIdDetailsStatusList).then(function (response) {
|
||||
if (response.data.formIdstatusListStatus == true) {
|
||||
$scope.getFormIdDetailsStatusListLoading = false;
|
||||
$scope.getFormIdDetailsStatusListLoading = false;
|
||||
$scope.StatusListDetails = response.data.formIdstatusListDetails;
|
||||
} else {
|
||||
$scope.getFormIdDetailsStatusListLoading = false;
|
||||
$scope.getFormIdDetailsStatusListLoading = false;
|
||||
$scope.StatusListDetails = response.data.formIdstatusListDetails;
|
||||
$scope.StatusListDetailsApiMessage = response.data.formIdstatusListMessagae;
|
||||
}});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$scope.statusUpdateFormIdDetails = {
|
||||
@ -568,7 +589,16 @@ $scope.draftManualEntryDetails = {
|
||||
"Comments": ""
|
||||
}
|
||||
|
||||
$scope.addStatusUpdateDetails = function(id, formId){
|
||||
$scope.resetStatusUpdateForm = function () {
|
||||
$scope.statusUpdateFormIdDetails = {
|
||||
"Status": "",
|
||||
"Comments": ""
|
||||
}
|
||||
}
|
||||
|
||||
// add status for the formid record details
|
||||
// kdk
|
||||
$scope.addStatusUpdateDetails = function (id, formId) {
|
||||
var addStatusUpdateDetailsStatusList = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'insertStatusUpdateDetails/',
|
||||
@ -577,25 +607,75 @@ $scope.draftManualEntryDetails = {
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
details : $scope.statusUpdateFormIdDetails,
|
||||
details: $scope.statusUpdateFormIdDetails,
|
||||
id: id,
|
||||
formId : formId
|
||||
formId: formId
|
||||
}
|
||||
};
|
||||
$http(addStatusUpdateDetailsStatusList).then(function (response) {
|
||||
if (response.data.insertStatusUpdateDetailsStatus == true) {
|
||||
$scope.statusUpdateFormIdDetails = {
|
||||
"Status": "",
|
||||
"Comments": ""
|
||||
}
|
||||
$scope.statusUpdateEditId = -1;
|
||||
swal("", response.data.insertStatusUpdateDetailsMessagae, "success");
|
||||
} else {
|
||||
swal("", response.data.insertStatusUpdateDetailsMessagae, "success");
|
||||
$scope.statusUpdateFormIdDetails = {
|
||||
"Status": "",
|
||||
"Comments": ""
|
||||
}
|
||||
$scope.statusUpdateEditId = -1;
|
||||
swal("", response.data.insertStatusUpdateDetailsMessagae, "success");
|
||||
} else {
|
||||
swal("", response.data.insertStatusUpdateDetailsMessagae, "success");
|
||||
// $scope.getFormIdDetailsStatusListLoading = false;
|
||||
// $scope.StatusListDetails = response.data.formIdstatusListDetails;
|
||||
// $scope.StatusListDetailsApiMessage = response.data.formIdstatusListMessagae;
|
||||
}});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// add formid list details to account state
|
||||
// kdk
|
||||
$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");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}]);
|
||||
|
||||
@ -0,0 +1,236 @@
|
||||
'use strict';
|
||||
/**
|
||||
* controllers for ng-table
|
||||
* Simple table with sorting and filtering on AngularJS
|
||||
*/
|
||||
app.controller('univFormPaymentCtrl', ["$scope","$rootScope","$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", "$modal", "$log", "SweetAlert", "$timeout", function ($scope,$rootScope, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, $modal, SweetAlert, $log, $timeout) {
|
||||
// ng-model object for payment search
|
||||
$scope.paymentVerficationModel= {
|
||||
'universitySearch':"",
|
||||
};
|
||||
// load when html page load
|
||||
var localDetail = JSON.parse(localStorage.getItem('localObj'));
|
||||
|
||||
$scope.init = function () {
|
||||
|
||||
if (localDetail != null) {
|
||||
if (localDetail.localType === 'R004') {
|
||||
$scope.getPaymentUnivSearchData();
|
||||
} else {
|
||||
localStorage.removeItem('localObj');
|
||||
$state.go('login.signin');
|
||||
}
|
||||
} else {
|
||||
$state.go('login.signin');
|
||||
}
|
||||
}
|
||||
/*
|
||||
* get university details for search
|
||||
* cretaed by kms
|
||||
* */
|
||||
$scope.universityPaymentSearchData=[];
|
||||
$scope.getPaymentUnivSearchData = function () {
|
||||
var paymentSearch = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getUnivCourseFromFileDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
data: localDetail
|
||||
}
|
||||
};
|
||||
$http(paymentSearch).then(function (response) {
|
||||
if (response.data.status) {
|
||||
$scope.universityPaymentSearchData = response.data.details;
|
||||
} else {
|
||||
$scope.universityPaymentSearchData="";
|
||||
}
|
||||
});
|
||||
}
|
||||
/*
|
||||
* add payment details
|
||||
* created by kms
|
||||
* */
|
||||
$rootScope.addPaymentModel = {
|
||||
'billNo':"",
|
||||
'date':"",
|
||||
'billAmount':"",
|
||||
'receiptNo':"",
|
||||
'comments':"",
|
||||
'university':[]
|
||||
};
|
||||
$scope.addUniversityPaymentModal = function (values) {
|
||||
$rootScope.addError="";
|
||||
$rootScope.addPaymentModel.university=angular.fromJson(values.universitySearch);
|
||||
$rootScope.paymentModal = $modal.open({
|
||||
templateUrl: 'assets/views/student/addUniversityPaymentModal.html',
|
||||
// controller: 'univFormPaymentCtrl',
|
||||
// size: size,
|
||||
resolve: {
|
||||
items: function () {
|
||||
return $scope.univPayDetails;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
$rootScope.paymentModal.result.then(function (selectedItem) {
|
||||
}, function () {
|
||||
$rootScope.paymentModal.close();
|
||||
$rootScope.addPaymentModel = {
|
||||
'billNo':"",
|
||||
'date':"",
|
||||
'billAmount':"",
|
||||
'receiptNo':"",
|
||||
'comments':"",
|
||||
'university':[]
|
||||
};
|
||||
});
|
||||
};
|
||||
/*
|
||||
* add university payment details
|
||||
* created by kms
|
||||
* */
|
||||
$rootScope.addError="";
|
||||
$rootScope.addUnivPayment = function (form,addDetails) {
|
||||
$rootScope.addError="";
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
|
||||
var field = null, firstError = null;
|
||||
for (field in form) {
|
||||
if (field[0] != '$') {
|
||||
if (firstError === null && !form[field].$valid) {
|
||||
firstError = form[field].$name;
|
||||
}
|
||||
if (form[field].$pristine) {
|
||||
form[field].$dirty = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
||||
}
|
||||
else{
|
||||
var getdate=new Date(addDetails.date).toDateString();
|
||||
$scope.univPayData = {
|
||||
"universityCode":addDetails.university.univCode,
|
||||
"universityName":addDetails.university.univName,
|
||||
"billNo":addDetails.billNo,
|
||||
"billAmount":addDetails.billAmount,
|
||||
"date":$filter('date')(new Date(getdate), 'yyyy-MM-dd'),
|
||||
"receiptNo":addDetails.receiptNo,
|
||||
"comments":addDetails.comments,
|
||||
}
|
||||
|
||||
var submitPayment = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'addUniversityPaymentDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
details: $scope.univPayData,
|
||||
}
|
||||
};
|
||||
$http(submitPayment).then(function (response) {
|
||||
if (response.data.status==true) {
|
||||
swal(" ", response.data.message, "success");
|
||||
$rootScope.paymentModal.close();
|
||||
$rootScope.addPaymentModel = {
|
||||
'billNo':"",
|
||||
'date':"",
|
||||
'billAmount':"",
|
||||
'receiptNo':"",
|
||||
'comments':"",
|
||||
'university':[]
|
||||
};
|
||||
$rootScope.getPaymentVerificationDetails($scope.paymentVerficationModel);
|
||||
|
||||
|
||||
} else {
|
||||
$rootScope.addError=response.data.message;
|
||||
$timeout(function () {
|
||||
$rootScope.addError="";
|
||||
}, 4000);
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
/*
|
||||
* cancel add modal
|
||||
* */
|
||||
$rootScope.cancelAddPaymentModal=function () {
|
||||
$rootScope.paymentModal.close();
|
||||
$rootScope.addPaymentModel = {
|
||||
'billNo':"",
|
||||
'date':"",
|
||||
'billAmount':"",
|
||||
'receiptNo':"",
|
||||
'comments':"",
|
||||
'university':[]
|
||||
};
|
||||
$rootScope.addError="";
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* get payment details
|
||||
* cretaed by kms
|
||||
* */
|
||||
$scope.paymentVerificationData="";
|
||||
$scope.emptyList=true;
|
||||
$scope.searchLoader = false;
|
||||
$rootScope.getPaymentVerificationDetails = function (searchData) {
|
||||
$scope.paymentVerificationData="";
|
||||
$scope.emptyList=true;
|
||||
$scope.searchLoader = true;
|
||||
var paymentVerification = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'paymentVerficationDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
localData: localDetail,
|
||||
universityID: angular.fromJson(searchData.universitySearch).univCode,
|
||||
universityName: angular.fromJson(searchData.universitySearch).univName,
|
||||
}
|
||||
};
|
||||
$http(paymentVerification).then(function (response) {
|
||||
if (response.data.status) {
|
||||
$scope.searchLoader = false;
|
||||
$scope.emptyList=false;
|
||||
$scope.paymentVerificationData=response.data.details;
|
||||
var tagMap = $scope.paymentVerificationData.reduce(function(map, tag,key) {
|
||||
if(map.RunningBalance==undefined){
|
||||
map['RunningBalance'] = parseInt(tag.CreditAmount)-parseInt(tag.DebitAmount);
|
||||
tag['RunningBalance']=parseInt(tag.CreditAmount)-parseInt(tag.DebitAmount);;
|
||||
}
|
||||
else{
|
||||
if(parseInt(tag.DebitAmount)<=0){
|
||||
map['RunningBalance'] = parseInt(map.RunningBalance)+parseInt(tag.CreditAmount);
|
||||
tag['RunningBalance']=parseInt(map.RunningBalance);
|
||||
}
|
||||
else{
|
||||
map['RunningBalance'] = parseInt(map.RunningBalance)-parseInt(tag.DebitAmount);
|
||||
tag['RunningBalance']=parseInt(map.RunningBalance);
|
||||
}
|
||||
|
||||
}
|
||||
return map;
|
||||
}, {});
|
||||
|
||||
} else {
|
||||
$scope.searchLoader = false;
|
||||
$scope.emptyList=true;
|
||||
$scope.paymentVerificationData=response.data.details;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
}]);
|
||||
604
Apollo/assets/views/hallticket/batchshedule.html
Executable file → Normal file
604
Apollo/assets/views/hallticket/batchshedule.html
Executable file → Normal file
@ -1,302 +1,302 @@
|
||||
<style>
|
||||
b.fa {
|
||||
display: inline-block;
|
||||
border-radius: 60px;
|
||||
box-shadow: 0px 0px 2px #FF6600;
|
||||
padding: 0.5em 0.6em;
|
||||
|
||||
|
||||
}
|
||||
b.fa1 {
|
||||
display: inline-block;
|
||||
border-radius: 60px;
|
||||
box-shadow: 0px 0px 2px green;
|
||||
padding: 0.5em 0.6em;
|
||||
|
||||
|
||||
}
|
||||
a {
|
||||
color: #007AFF;
|
||||
}
|
||||
|
||||
</style>
|
||||
<!-- start: PAGE TITLE -->
|
||||
<section id="page-title">
|
||||
<div class="row">
|
||||
<div class="col-sm-8">
|
||||
|
||||
<h1 class="mainTitle" translate="Batch Schedule">{{ mainTitle }}</h1>
|
||||
|
||||
<span class="mainDescription">Allocate Batch schedule </span>
|
||||
|
||||
</div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
<!-- start: LIST GROUP -->
|
||||
|
||||
<div class="container-fluid container-fullw bg-white" ng-controller="schCtrl" data-ng-init="init()">
|
||||
|
||||
<tabset class="tabbable">
|
||||
<tab heading="View Schedule" id="semDetails">
|
||||
<fieldset>
|
||||
<div class="row" ng-if="semDetailsLoadingStatus">
|
||||
<!-- <div class="col-md-12">
|
||||
<center><h1>{{semDetailsLoadingTxt}}</h1></center>
|
||||
</div> -->
|
||||
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover" id="batchsch">
|
||||
<thead>
|
||||
<tr>
|
||||
<!-- <th></th> -->
|
||||
|
||||
<th>University Name</th>
|
||||
<th>Course Name</th>
|
||||
<th>Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<!--<pre>{{universitycourse |json}} </pre>-->
|
||||
<tbody dir-paginate="c in universitycourse | filter:search:strict | itemsPerPage:10">
|
||||
<tr>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<td>{{c.UniversityName}}</td>
|
||||
<td>{{c.CourseName}}</td>
|
||||
<td ng-if="p.IsDefault==true" id="{{c.SubjectID}}">
|
||||
<td ng-if="p.IsDefault==true" id="{{c.UniversityID}}">
|
||||
<td ng-if="p.IsDefault==true" id="{{c.CourseID}}">
|
||||
<td ng-if="p.IsDefault==true" id="{{c.SchId}}">
|
||||
|
||||
|
||||
<td>
|
||||
|
||||
<a class="text-azure" id="editRowBtn{{c.SchId}}" ng-click="setEditId(c.UniversityID,c.CourseID,c.SchId,c.SubjectID,c);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
|
||||
</a>
|
||||
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
<tr ng-show="editId === c.UniversityID && courseCode ===c.CourseID" ng-if="editId === c.UniversityID && courseCode ===c.CourseID">
|
||||
<td colspan="6" ng-include src="'assets/views/hallticket/editShedule.html'"></td>
|
||||
</tr>
|
||||
<div class="row" ng-if="semDropDownShowLoading1">
|
||||
<div class="col-md-12 form-group">
|
||||
<center><h1>Loading...</h1></center>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
</table>
|
||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||
</dir-pagination-controls>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</fieldset>
|
||||
</tab>
|
||||
<tab heading="Add Schedule" id="addSem">
|
||||
<div class="row">
|
||||
<!-- <form name="Form" id="form" novalidate method="post"> -->
|
||||
|
||||
<form name="Form" id="form" novalidate ng-submit="batchschedule.submit(Form, myModelAdd,'zoom-in')" method="post">
|
||||
<fieldset>
|
||||
<legend>Search</legend>
|
||||
<div class="row">
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
University
|
||||
</label>
|
||||
<select class="form-control" name="university" tabindex="1" id="university"
|
||||
ng-model="myModel.universityName"
|
||||
ng-options="i.universityName for i in university" ng-change="getuniversity();">
|
||||
<option value="-1"> Select University</option>
|
||||
</select>
|
||||
<!-- <pre>{{myModel.universityName | json}}</pre> -->
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
Course
|
||||
</label>
|
||||
<!-- <select class="form-control" name="course" tabindex="4" id="course" -->
|
||||
<!-- ng-model="myModel.courseName" -->
|
||||
<!-- ng-options="courseDetails.CourseID as courseDetails.CourseName for courseDetails in myModel.universityName.courseDetails" ng-change="getStudentDetails(Form,myModel);getSubjectDetails(myModel.universityName,myModel.courseName);"> -->
|
||||
<!-- <option value=""> Select Course</option> -->
|
||||
<!-- </select> -->
|
||||
|
||||
<ui-select multiple ng-model="selectedCourseNameC.list" tabindex="2" >
|
||||
|
||||
<ui-select-match placeholder="Select Courses" >
|
||||
{{$item.CourseName}}
|
||||
</ui-select-match>
|
||||
<ui-select-choices
|
||||
repeat="x.CourseID as x in selectedUniversityCourseName | filter:$select.search">
|
||||
{{x.CourseName}}
|
||||
</ui-select-choices>
|
||||
</ui-select>
|
||||
<!-- <pre>{{selectedCourseNameC.list | json}}</pre> -->
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-2 form-group">
|
||||
<br>
|
||||
<button type="button" ladda="ldloading1.zoom_in" tabindex="3" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="getSemSubDetails(myModel.universityName.universityID,selectedCourseNameC);">MANUAL SCHDULE</button>
|
||||
|
||||
</div>
|
||||
<div class="col-md-1 form group">
|
||||
<br>
|
||||
<br>
|
||||
<lable style="color:green ;font-size:14px"> (OR) </lable>
|
||||
</div>
|
||||
<div class="col-md-3 form-group">
|
||||
<fieldset>
|
||||
<js-xls onread="readUploadBatchDetails" onerror="error"></js-xls>
|
||||
<br>
|
||||
<a href="https://www.w3schools.com/html/" target="_top">Sample Format</a>
|
||||
<button type="button" class="btn btn-success btn-o" style="float: right" ng-click="UploadFileData(extractFileDetails,myModel,selectedCourseNameC)"> Submit</button>
|
||||
|
||||
</fieldset>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row" ng-if="semDropDownShowLoading">
|
||||
<div class="col-md-12 form-group">
|
||||
<center><h1>Loading...</h1></center>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row" ng-if="semDropDownShow">
|
||||
<div class="panel panel-white" id="sub">
|
||||
<div class="panel-heading border-light">
|
||||
<!--<h4 class="panel-title text-pink">Schedule Details</h4>
|
||||
<paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>-->
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Subject</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Date</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Start Time</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">End Time</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div collapse="panel2" ng-init="panel2=false" class="panel-wrapper">
|
||||
<div class="panel-body panel-scroll height-250" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
|
||||
|
||||
<div class="row" ng-repeat="p in subjects">
|
||||
|
||||
<div class="col-md-3 form-group">
|
||||
<label class="text-blue"> <b><!--Subject {{$index+1}}--></b>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Subject"
|
||||
class="form-control" name="scheduleSubject{{$index}}" id="scheduleSubject{{$index}}" tabindex="4"
|
||||
ng-model="p.Subject.SubjectName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" readonly/>
|
||||
</div>
|
||||
|
||||
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div class="col-md-3 form-group">
|
||||
<label class="text-blue"> <!--<b>Date</b>-->
|
||||
</label>
|
||||
<input type="text" tabindex="4" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.ScheduleDate"
|
||||
is-open="startOpen" ng-init="startOpen = false" name="scheduleDate{{$index+1}}" id="scheduleDate{{$index+1}}" datepicker-options="dateOptions"
|
||||
placeholder="Select Date" close-text="Close"
|
||||
show-button-bar="true"/>
|
||||
</div>
|
||||
<div class="col-md-3" style="margin-top: 17px;">
|
||||
<div class="form-group">
|
||||
<!-- <label class="text-blue"> <b>Start Time</b>
|
||||
</label>-->
|
||||
<!-- <timepicker class="control-label" -->
|
||||
<!-- ng-model="p.ScheduleStartTime" -->
|
||||
<!-- hour-step="hstep" -->
|
||||
<!-- minute-step="hstep" -->
|
||||
<!-- show-meridian="ismeridian"></timepicker> -->
|
||||
<input type="text" placeholder="09:00AM"
|
||||
class="form-control" name="scheduleFromTime{{$index}}" id="scheduleFromTime{{$index}}" tabindex="4"
|
||||
ng-model="p.ScheduleStartTime" ng-pattern="" size="10" ng-blur="validateTime(p.ScheduleStartTime,$event);">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" style="margin-top: 17px;">
|
||||
<div class="form-group">
|
||||
<!-- <label class="text-blue"> <b>End Time</b>
|
||||
</label>-->
|
||||
<!--<timepicker class="control-label"
|
||||
ng-model="p.ScheduleEndTime"
|
||||
hour-step="hstep"
|
||||
minute-step="hstep"
|
||||
show-meridian="ismeridian"></timepicker>-->
|
||||
|
||||
<!-- <timepicker class="control-label" -->
|
||||
<!-- ng-model="p.ScheduleEndTime" -->
|
||||
<!-- ng-change="changed()" -->
|
||||
<!-- hour-step="hstep" -->
|
||||
<!-- minute-step="hstep" -->
|
||||
<!-- show-meridian="ismeridian"></timepicker> -->
|
||||
|
||||
<input type="text" placeholder="10:00PM"
|
||||
class="form-control" name="scheduleEndTime{{$index}}" id="scheduleEndTime{{$index}}" tabindex="4"
|
||||
ng-model="p.ScheduleEndTime" ng-pattern="" size="10" ng-blur="validateTime(p.ScheduleEndTime,$event);">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12 form-group" ng-if="semDropDownShow">
|
||||
<div class="pull-right">
|
||||
<br>
|
||||
<button type="button" ladda="ldloading1.zoom_in" tabindex="" class="btn btn-wide btn-success" data-style="zoom-in" ng-disabled="saveButtonDisabled" ng-click="saveAll(myModel,selectedCourseNameC,subjects);">{{saveButtonTxt}}</button>
|
||||
<input type="button" class="btn btn-warning btn-wide" tabindex="3" value="Cancel"
|
||||
ng-click="remove();">
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
</tab>
|
||||
|
||||
</tabset>
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
|
||||
|
||||
|
||||
<!-- end: LIST GROUP -->
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<style>
|
||||
b.fa {
|
||||
display: inline-block;
|
||||
border-radius: 60px;
|
||||
box-shadow: 0px 0px 2px #FF6600;
|
||||
padding: 0.5em 0.6em;
|
||||
|
||||
|
||||
}
|
||||
b.fa1 {
|
||||
display: inline-block;
|
||||
border-radius: 60px;
|
||||
box-shadow: 0px 0px 2px green;
|
||||
padding: 0.5em 0.6em;
|
||||
|
||||
|
||||
}
|
||||
a {
|
||||
color: #007AFF;
|
||||
}
|
||||
|
||||
</style>
|
||||
<!-- start: PAGE TITLE -->
|
||||
<section id="page-title">
|
||||
<div class="row">
|
||||
<div class="col-sm-8">
|
||||
|
||||
<h1 class="mainTitle" translate="Batch Schedule">{{ mainTitle }}</h1>
|
||||
|
||||
<span class="mainDescription">Allocate Batch schedule </span>
|
||||
|
||||
</div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
<!-- start: LIST GROUP -->
|
||||
|
||||
<div class="container-fluid container-fullw bg-white" ng-controller="schCtrl" data-ng-init="init()">
|
||||
|
||||
<tabset class="tabbable">
|
||||
<tab heading="View Schedule" id="semDetails">
|
||||
<fieldset>
|
||||
<div class="row" ng-if="semDetailsLoadingStatus">
|
||||
<!-- <div class="col-md-12">
|
||||
<center><h1>{{semDetailsLoadingTxt}}</h1></center>
|
||||
</div> -->
|
||||
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover" id="batchsch">
|
||||
<thead>
|
||||
<tr>
|
||||
<!-- <th></th> -->
|
||||
|
||||
<th>University Name</th>
|
||||
<th>Course Name</th>
|
||||
<th>Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<!--<pre>{{universitycourse |json}} </pre>-->
|
||||
<tbody dir-paginate="c in universitycourse | filter:search:strict | itemsPerPage:10">
|
||||
<tr>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<td>{{c.UniversityName}}</td>
|
||||
<td>{{c.CourseName}}</td>
|
||||
<td ng-if="p.IsDefault==true" id="{{c.SubjectID}}">
|
||||
<td ng-if="p.IsDefault==true" id="{{c.UniversityID}}">
|
||||
<td ng-if="p.IsDefault==true" id="{{c.CourseID}}">
|
||||
<td ng-if="p.IsDefault==true" id="{{c.SchId}}">
|
||||
|
||||
|
||||
<td>
|
||||
|
||||
<a class="text-azure" id="editRowBtn{{c.SchId}}" ng-click="setEditId(c.UniversityID,c.CourseID,c.SchId,c.SubjectID,c);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
|
||||
</a>
|
||||
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
<tr ng-show="editId === c.UniversityID && courseCode ===c.CourseID" ng-if="editId === c.UniversityID && courseCode ===c.CourseID">
|
||||
<td colspan="6" ng-include src="'assets/views/hallticket/editShedule.html'"></td>
|
||||
</tr>
|
||||
<div class="row" ng-if="semDropDownShowLoading1">
|
||||
<div class="col-md-12 form-group">
|
||||
<center><h1>Loading...</h1></center>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
</table>
|
||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||
</dir-pagination-controls>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</fieldset>
|
||||
</tab>
|
||||
<tab heading="Add Schedule" id="addSem">
|
||||
<div class="row">
|
||||
<!-- <form name="Form" id="form" novalidate method="post"> -->
|
||||
|
||||
<form name="Form" id="form" novalidate ng-submit="batchschedule.submit(Form, myModelAdd,'zoom-in')" method="post">
|
||||
<fieldset>
|
||||
<legend>Search</legend>
|
||||
<div class="row">
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
University
|
||||
</label>
|
||||
<select class="form-control" name="university" tabindex="1" id="university"
|
||||
ng-model="myModel.universityName"
|
||||
ng-options="i.universityName for i in university" ng-change="getuniversity();">
|
||||
<option value="-1"> Select University</option>
|
||||
</select>
|
||||
<!-- <pre>{{myModel.universityName | json}}</pre> -->
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
Course
|
||||
</label>
|
||||
<!-- <select class="form-control" name="course" tabindex="4" id="course" -->
|
||||
<!-- ng-model="myModel.courseName" -->
|
||||
<!-- ng-options="courseDetails.CourseID as courseDetails.CourseName for courseDetails in myModel.universityName.courseDetails" ng-change="getStudentDetails(Form,myModel);getSubjectDetails(myModel.universityName,myModel.courseName);"> -->
|
||||
<!-- <option value=""> Select Course</option> -->
|
||||
<!-- </select> -->
|
||||
|
||||
<ui-select multiple ng-model="selectedCourseNameC.list" tabindex="2" >
|
||||
|
||||
<ui-select-match placeholder="Select Courses" >
|
||||
{{$item.CourseName}}
|
||||
</ui-select-match>
|
||||
<ui-select-choices
|
||||
repeat="x.CourseID as x in selectedUniversityCourseName | filter:$select.search">
|
||||
{{x.CourseName}}
|
||||
</ui-select-choices>
|
||||
</ui-select>
|
||||
<!-- <pre>{{selectedCourseNameC.list | json}}</pre> -->
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-2 form-group">
|
||||
<br>
|
||||
<button type="button" ladda="ldloading1.zoom_in" tabindex="3" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="getSemSubDetails(myModel.universityName.universityID,selectedCourseNameC);">MANUAL SCHDULE</button>
|
||||
|
||||
</div>
|
||||
<div class="col-md-1 form group">
|
||||
<br>
|
||||
<br>
|
||||
<lable style="color:green ;font-size:14px"> (OR) </lable>
|
||||
</div>
|
||||
<div class="col-md-3 form-group">
|
||||
<fieldset>
|
||||
<js-xls onread="readUploadBatchDetails" onerror="error"></js-xls>
|
||||
<br>
|
||||
<a href="https://www.w3schools.com/html/" target="_top">Sample Format</a>
|
||||
<button type="button" class="btn btn-success btn-o" style="float: right" ng-click="UploadFileData(extractFileDetails,myModel,selectedCourseNameC)"> Submit</button>
|
||||
|
||||
</fieldset>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row" ng-if="semDropDownShowLoading">
|
||||
<div class="col-md-12 form-group">
|
||||
<center><h1>Loading...</h1></center>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row" ng-if="semDropDownShow">
|
||||
<div class="panel panel-white" id="sub">
|
||||
<div class="panel-heading border-light">
|
||||
<!--<h4 class="panel-title text-pink">Schedule Details</h4>
|
||||
<paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>-->
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Subject</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Date</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Start Time</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">End Time</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div collapse="panel2" ng-init="panel2=false" class="panel-wrapper">
|
||||
<div class="panel-body panel-scroll height-250" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
|
||||
|
||||
<div class="row" ng-repeat="p in subjects">
|
||||
|
||||
<div class="col-md-3 form-group">
|
||||
<label class="text-blue"> <b><!--Subject {{$index+1}}--></b>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Subject"
|
||||
class="form-control" name="scheduleSubject{{$index}}" id="scheduleSubject{{$index}}" tabindex="4"
|
||||
ng-model="p.Subject.SubjectName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" readonly/>
|
||||
</div>
|
||||
|
||||
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div class="col-md-3 form-group">
|
||||
<label class="text-blue"> <!--<b>Date</b>-->
|
||||
</label>
|
||||
<input type="text" tabindex="4" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.ScheduleDate"
|
||||
is-open="startOpen" ng-init="startOpen = false" name="scheduleDate{{$index+1}}" id="scheduleDate{{$index+1}}" datepicker-options="dateOptions"
|
||||
placeholder="Select Date" close-text="Close"
|
||||
show-button-bar="true"/>
|
||||
</div>
|
||||
<div class="col-md-3" style="margin-top: 17px;">
|
||||
<div class="form-group">
|
||||
<!-- <label class="text-blue"> <b>Start Time</b>
|
||||
</label>-->
|
||||
<!-- <timepicker class="control-label" -->
|
||||
<!-- ng-model="p.ScheduleStartTime" -->
|
||||
<!-- hour-step="hstep" -->
|
||||
<!-- minute-step="hstep" -->
|
||||
<!-- show-meridian="ismeridian"></timepicker> -->
|
||||
<input type="text" placeholder="09:00AM"
|
||||
class="form-control" name="scheduleFromTime{{$index}}" id="scheduleFromTime{{$index}}" tabindex="4"
|
||||
ng-model="p.ScheduleStartTime" ng-pattern="" size="10" ng-blur="validateTime(p.ScheduleStartTime,$event);">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" style="margin-top: 17px;">
|
||||
<div class="form-group">
|
||||
<!-- <label class="text-blue"> <b>End Time</b>
|
||||
</label>-->
|
||||
<!--<timepicker class="control-label"
|
||||
ng-model="p.ScheduleEndTime"
|
||||
hour-step="hstep"
|
||||
minute-step="hstep"
|
||||
show-meridian="ismeridian"></timepicker>-->
|
||||
|
||||
<!-- <timepicker class="control-label" -->
|
||||
<!-- ng-model="p.ScheduleEndTime" -->
|
||||
<!-- ng-change="changed()" -->
|
||||
<!-- hour-step="hstep" -->
|
||||
<!-- minute-step="hstep" -->
|
||||
<!-- show-meridian="ismeridian"></timepicker> -->
|
||||
|
||||
<input type="text" placeholder="10:00PM"
|
||||
class="form-control" name="scheduleEndTime{{$index}}" id="scheduleEndTime{{$index}}" tabindex="4"
|
||||
ng-model="p.ScheduleEndTime" ng-pattern="" size="10" ng-blur="validateTime(p.ScheduleEndTime,$event);">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12 form-group" ng-if="semDropDownShow">
|
||||
<div class="pull-right">
|
||||
<br>
|
||||
<button type="button" ladda="ldloading1.zoom_in" tabindex="" class="btn btn-wide btn-success" data-style="zoom-in" ng-disabled="saveButtonDisabled" ng-click="saveAll(myModel,selectedCourseNameC,subjects);">{{saveButtonTxt}}</button>
|
||||
<input type="button" class="btn btn-warning btn-wide" tabindex="3" value="Cancel"
|
||||
ng-click="remove();">
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
</tab>
|
||||
|
||||
</tabset>
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
|
||||
|
||||
|
||||
<!-- end: LIST GROUP -->
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
314
Apollo/assets/views/hallticket/editShedule.html
Executable file → Normal file
314
Apollo/assets/views/hallticket/editShedule.html
Executable file → Normal file
@ -1,158 +1,158 @@
|
||||
<form name="Form" id="form" novalidate>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-12">
|
||||
<fieldset>
|
||||
<legend>
|
||||
Update Schedule Details
|
||||
</legend>
|
||||
<div class="row" >
|
||||
<div class="panel panel-white" id="sub">
|
||||
<div class="panel-heading border-light">
|
||||
<!--<h4 class="panel-title text-pink">Schedule Details</h4>
|
||||
<paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>-->
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Subject</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Date</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Start Time</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">End Time</h4>
|
||||
</div>
|
||||
</div>
|
||||
<div collapse="panel2" ng-init="panel2=false" class="panel-wrapper">
|
||||
<div class="panel-body panel-scroll height-250" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
|
||||
<!--<pre>{{unsheduledetails | json}}</pre>-->
|
||||
<div class="row" ng-repeat="s in unsheduledetails" style="margin-top:30px;">
|
||||
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.SubjectName.$dirty && Form.SubjectName.$invalid, 'has-success':Form.batchcode.$valid}">
|
||||
<!--<label>
|
||||
Subject Name <span class="symbol required"></span>
|
||||
</label>-->
|
||||
|
||||
<input type="text" placeholder="Enter Batch Name"
|
||||
tabindex="1" class="form-control" name="SubjectName"
|
||||
ng-model="s.SubjectName" readonly/>
|
||||
|
||||
</div>
|
||||
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}">
|
||||
<!--<label>
|
||||
Shedule Date <span
|
||||
class="symbol required"></span>
|
||||
</label>-->
|
||||
<input type="text"
|
||||
tabindex="1"
|
||||
class="form-control "
|
||||
ng-click="startOpen = !startOpen"
|
||||
datepicker-popup="dd-MM-yyyy"
|
||||
ng-model="s.ScheduleDate"
|
||||
is-open="startOpen"
|
||||
ng-init="startOpen = false"
|
||||
name="date"
|
||||
datepicker-options="dateOptions"
|
||||
placeholder="Select Date"
|
||||
close-text="Close" required="required" ng-readonly="true"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.date.$dirty && Form.date.$error.required">Shedule Date is required.</span>
|
||||
<!--<span class="success text-small block"-->
|
||||
<!--ng-if="Form.date.$valid ">Thank You</span>-->
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-3 form-group" style="margin-top: -34px;"
|
||||
ng-class="{'has-error':Form.FromTime.$dirty && Form.FromTime.$invalid, 'has-success':Form.batchcode.$valid}">
|
||||
<!--<label>
|
||||
Shedule Starting Time <span class="symbol required"></span>
|
||||
</label>-->
|
||||
|
||||
<div style="margin-top: 35px;">
|
||||
<div class="form-group">
|
||||
<!-- <label class="text-blue"> <b>Start Time</b>
|
||||
</label>-->
|
||||
<!-- <timepicker class="control-label" -->
|
||||
<!-- ng-model="s.FromTime" -->
|
||||
<!-- hour-step="hstep" -->
|
||||
<!-- minute-step="hstep" -->
|
||||
<!-- show-meridian="ismeridian"></timepicker> -->
|
||||
<input type="text" placeholder="09:00AM"
|
||||
class="form-control" name="scheduleFromTime{{$index}}" id="scheduleFromTime{{$index}}" tabindex="1"
|
||||
ng-model="s.FromTime" ng-pattern="" size="10" ng-blur="validateTime(s.FromTime,$event);">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<div style="margin-top: -34px;"
|
||||
ng-class="{'has-error':Form.ToTime.$dirty && Form.ToTime.$invalid, 'has-success':Form.batchcode.$valid}">
|
||||
<!--<label>
|
||||
Shedule Ending Time <span class="symbol required"></span>
|
||||
</label>-->
|
||||
|
||||
<div class="col-md-3" style="margin-top: 0px;">
|
||||
<div class="form-group">
|
||||
<!-- <label class="text-blue"> <b>Start Time</b>
|
||||
</label>-->
|
||||
<!-- <timepicker class="control-label" -->
|
||||
<!-- ng-model="s.ToTime" -->
|
||||
<!-- hour-step="hstep" -->
|
||||
<!-- minute-step="hstep" -->
|
||||
<!-- show-meridian="ismeridian"></timepicker> -->
|
||||
<input type="text" placeholder="09:00AM"
|
||||
class="form-control" name="scheduleEndTime{{$index}}" id="scheduleEndTime{{$index}}" tabindex="1"
|
||||
ng-model="s.ToTime" ng-pattern="" size="10" ng-blur="validateTime(s.ToTime,$event);">
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button type="submit" ladda="ldloading.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateShedule(unsheduledetails);">
|
||||
Save
|
||||
</button>
|
||||
|
||||
<input type="button" class="btn btn-warning btn-wide" tabindex="3" value="Cancel"
|
||||
ng-click="cancel();">
|
||||
|
||||
</input>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<!-- class="editRowTd" -->
|
||||
|
||||
|
||||
|
||||
<form name="Form" id="form" novalidate>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-12">
|
||||
<fieldset>
|
||||
<legend>
|
||||
Update Schedule Details
|
||||
</legend>
|
||||
<div class="row" >
|
||||
<div class="panel panel-white" id="sub">
|
||||
<div class="panel-heading border-light">
|
||||
<!--<h4 class="panel-title text-pink">Schedule Details</h4>
|
||||
<paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>-->
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Subject</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Date</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Start Time</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">End Time</h4>
|
||||
</div>
|
||||
</div>
|
||||
<div collapse="panel2" ng-init="panel2=false" class="panel-wrapper">
|
||||
<div class="panel-body panel-scroll height-250" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
|
||||
<!--<pre>{{unsheduledetails | json}}</pre>-->
|
||||
<div class="row" ng-repeat="s in unsheduledetails" style="margin-top:30px;">
|
||||
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.SubjectName.$dirty && Form.SubjectName.$invalid, 'has-success':Form.batchcode.$valid}">
|
||||
<!--<label>
|
||||
Subject Name <span class="symbol required"></span>
|
||||
</label>-->
|
||||
|
||||
<input type="text" placeholder="Enter Batch Name"
|
||||
tabindex="1" class="form-control" name="SubjectName"
|
||||
ng-model="s.SubjectName" readonly/>
|
||||
|
||||
</div>
|
||||
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}">
|
||||
<!--<label>
|
||||
Shedule Date <span
|
||||
class="symbol required"></span>
|
||||
</label>-->
|
||||
<input type="text"
|
||||
tabindex="1"
|
||||
class="form-control "
|
||||
ng-click="startOpen = !startOpen"
|
||||
datepicker-popup="dd-MM-yyyy"
|
||||
ng-model="s.ScheduleDate"
|
||||
is-open="startOpen"
|
||||
ng-init="startOpen = false"
|
||||
name="date"
|
||||
datepicker-options="dateOptions"
|
||||
placeholder="Select Date"
|
||||
close-text="Close" required="required" ng-readonly="true"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.date.$dirty && Form.date.$error.required">Shedule Date is required.</span>
|
||||
<!--<span class="success text-small block"-->
|
||||
<!--ng-if="Form.date.$valid ">Thank You</span>-->
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-3 form-group" style="margin-top: -34px;"
|
||||
ng-class="{'has-error':Form.FromTime.$dirty && Form.FromTime.$invalid, 'has-success':Form.batchcode.$valid}">
|
||||
<!--<label>
|
||||
Shedule Starting Time <span class="symbol required"></span>
|
||||
</label>-->
|
||||
|
||||
<div style="margin-top: 35px;">
|
||||
<div class="form-group">
|
||||
<!-- <label class="text-blue"> <b>Start Time</b>
|
||||
</label>-->
|
||||
<!-- <timepicker class="control-label" -->
|
||||
<!-- ng-model="s.FromTime" -->
|
||||
<!-- hour-step="hstep" -->
|
||||
<!-- minute-step="hstep" -->
|
||||
<!-- show-meridian="ismeridian"></timepicker> -->
|
||||
<input type="text" placeholder="09:00AM"
|
||||
class="form-control" name="scheduleFromTime{{$index}}" id="scheduleFromTime{{$index}}" tabindex="1"
|
||||
ng-model="s.FromTime" ng-pattern="" size="10" ng-blur="validateTime(s.FromTime,$event);">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<div style="margin-top: -34px;"
|
||||
ng-class="{'has-error':Form.ToTime.$dirty && Form.ToTime.$invalid, 'has-success':Form.batchcode.$valid}">
|
||||
<!--<label>
|
||||
Shedule Ending Time <span class="symbol required"></span>
|
||||
</label>-->
|
||||
|
||||
<div class="col-md-3" style="margin-top: 0px;">
|
||||
<div class="form-group">
|
||||
<!-- <label class="text-blue"> <b>Start Time</b>
|
||||
</label>-->
|
||||
<!-- <timepicker class="control-label" -->
|
||||
<!-- ng-model="s.ToTime" -->
|
||||
<!-- hour-step="hstep" -->
|
||||
<!-- minute-step="hstep" -->
|
||||
<!-- show-meridian="ismeridian"></timepicker> -->
|
||||
<input type="text" placeholder="09:00AM"
|
||||
class="form-control" name="scheduleEndTime{{$index}}" id="scheduleEndTime{{$index}}" tabindex="1"
|
||||
ng-model="s.ToTime" ng-pattern="" size="10" ng-blur="validateTime(s.ToTime,$event);">
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<button type="submit" ladda="ldloading.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateShedule(unsheduledetails);">
|
||||
Save
|
||||
</button>
|
||||
|
||||
<input type="button" class="btn btn-warning btn-wide" tabindex="3" value="Cancel"
|
||||
ng-click="cancel();">
|
||||
|
||||
</input>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<!-- class="editRowTd" -->
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,10 +1,96 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Title</title>
|
||||
</head>
|
||||
<body>
|
||||
<style>
|
||||
.universityPaid {
|
||||
background: #f4f4f7 !important;
|
||||
}
|
||||
</style>
|
||||
<section id="page-title">
|
||||
<div class="row">
|
||||
<div class="col-sm-8">
|
||||
|
||||
</body>
|
||||
</html>
|
||||
<h1 class="mainTitle" translate="University Payment Details">{{ mainTitle }}</h1>
|
||||
|
||||
<span class="mainDescription">Form List. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
</div>
|
||||
</section>
|
||||
<div class="container-fluid container-fullw bg-white" ng-controller="univFormPaymentCtrl" data-ng-init="init()">
|
||||
<div class="row">
|
||||
<div style="margin-top: -21px">
|
||||
<div class="col-md-3 col-sm-8">
|
||||
<label for="form-field-select-2">
|
||||
University <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="universitySearch" id="universitySearch" ng-model="paymentVerficationModel.universitySearch">
|
||||
<option value="" disabled selected>Select University</option>
|
||||
<option ng-repeat="item in universityPaymentSearchData" value="{{item}}">{{item.univName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-2 col-sm-4" style="padding-top: 23px;">
|
||||
|
||||
<button type="button" class="btn btn-success btn-o" tabindex="2" ng-disabled="paymentVerficationModel.universitySearch == ''" ng-click="getPaymentVerificationDetails(paymentVerficationModel)">
|
||||
Search
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" style="float: right;display: flex;">
|
||||
<div class="container">
|
||||
<button type="button" ng-if="emptyList==false" class="btn btn-info btn-o" tooltip="Click to add payment" tabindex="3" ng-click="addUniversityPaymentModal(paymentVerficationModel)">
|
||||
Add Payment
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" style="position: relative;margin-top:4%;">
|
||||
<div class="container">
|
||||
<div ng-if="searchLoader">
|
||||
<div align="center">
|
||||
<h3 style="color: blue;">Loading...</h3>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-if="emptyList">
|
||||
<div align="center">
|
||||
<h2> {{paymentVerificationData}} </h2>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="table-responsive" ng-if="emptyList==false">
|
||||
<table class="table table-hover table-condensed table-bordered" >
|
||||
<thead>
|
||||
<tr>
|
||||
<th> Form ID</th>
|
||||
<th> Enrolment No</th>
|
||||
<th> Bill No</th>
|
||||
<th> Payable</th>
|
||||
<th> Paid </th>
|
||||
<th> Balance</th>
|
||||
<!--<th> University Name </th>-->
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody dir-paginate="p in paymentVerificationData|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
|
||||
<tr ng-class="{universityPaid:p.TypeID==0}">
|
||||
<td>{{p.FormID}}</td>
|
||||
<td>{{p.EnrolmentNo}}</td>
|
||||
<td>{{p.BillNo}}</td>
|
||||
<td ng-if="p.CreditAmount==0"></td>
|
||||
<td ng-if="p.CreditAmount>0"><span style="float:right;">{{p.CreditAmount}}</span></td>
|
||||
<td ng-if="p.DebitAmount==0"></td>
|
||||
<td ng-if="p.DebitAmount>0"><span style="float:right;">{{p.DebitAmount}}</span></td>
|
||||
<td><span style="float:right;">{{p.RunningBalance}}</span></td>
|
||||
<!--<td>{{p.UniversityName}}</td>-->
|
||||
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||
</dir-pagination-controls>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
103
Apollo/assets/views/student/addUniversityPaymentModal.html
Normal file
103
Apollo/assets/views/student/addUniversityPaymentModal.html
Normal file
@ -0,0 +1,103 @@
|
||||
<div class="container-fluid container-fullw bg-white">
|
||||
<fieldset>
|
||||
|
||||
<legend>Payment for : {{addPaymentModel.university.univName}}</legend>
|
||||
<form name="FormPayment" id="form" novalidate>
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':FormPayment.billno.$dirty && FormPayment.billno.$invalid, 'has-success':FormPayment.billno.$valid}">
|
||||
<label>
|
||||
Bill No <span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Bill No"
|
||||
tabindex="1" class="form-control" name="billno"
|
||||
ng-model="addPaymentModel.billNo" capitalize disallow-spaces required/>
|
||||
<span class="error text-small block"
|
||||
ng-if="FormPayment.billno.$dirty && FormPayment.billno.$error.required">Bill no is required</span>
|
||||
</div>
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':FormPayment.billAmount.$dirty && FormPayment.billAmount.$invalid,'has-success':FormPayment.billAmount.$valid}">
|
||||
<label>
|
||||
Bill Amount <span class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Bill Amount"
|
||||
autofocus tabindex="2" class="form-control" name="billAmount" id="billAmount" ng-maxlength="9"
|
||||
ng-model="addPaymentModel.billAmount" ng-pattern="/^[0-9]*$/" required/>
|
||||
<span class="error text-small block"
|
||||
ng-if="FormPayment.billAmount.$dirty && FormPayment.billAmount.$invalid"
|
||||
ng-hide="FormPayment.billAmount.$error.maxlength || FormPayment.billAmount.$error.pattern">Bill amount is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="FormPayment.billAmount.$error.maxlength || FormPayment.billAmount.$error.pattern">Enter a valid amount</span>
|
||||
|
||||
</div>
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':FormPayment.date.$dirty && FormPayment.date.$invalid, 'has-success':FormPayment.date.$valid}">
|
||||
<label>
|
||||
Bill Date <span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
<input type="text"
|
||||
class="form-control "
|
||||
ng-click="startOpen = !startOpen"
|
||||
datepicker-popup="dd-MM-yyyy"
|
||||
ng-model="addPaymentModel.date"
|
||||
is-open="startOpen"
|
||||
ng-init="startOpen = false"
|
||||
name="date"
|
||||
datepicker-options="dateOptions"
|
||||
placeholder="Select Date"
|
||||
min-date="currentDate"
|
||||
max-date="futureDate"
|
||||
close-text="Close" required="required" ng-readonly="true"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="FormPayment.date.$dirty && FormPayment.date.$error.required">Date is required.</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':FormPayment.receiptNo.$dirty && FormPayment.receiptNo.$invalid}">
|
||||
<label>
|
||||
Receipt No
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Receipt No"
|
||||
tabindex="3" class="form-control" name="receiptNo"
|
||||
ng-model="addPaymentModel.receiptNo" disallow-spaces/>
|
||||
</div>
|
||||
<div class="col-md-8 form-group"
|
||||
ng-class="{'has-error':FormPayment.comments.$dirty && FormPayment.comments.$invalid}">
|
||||
<label>
|
||||
Comments
|
||||
</label>
|
||||
<textarea placeholder="Enter Comments" tabindex="4"
|
||||
class="form-control textdsc" name="comments"
|
||||
ng-model="addPaymentModel.comments"></textarea>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right">
|
||||
<span style="color:red;">{{addError}}</span>
|
||||
<button type="submit" tabindex="5" class="btn btn-wide btn-success" ng-click="addUnivPayment(FormPayment,addPaymentModel)">
|
||||
Save
|
||||
</button>
|
||||
|
||||
<input type="button" class="btn btn-warning btn-wide" tabindex="6" value="Cancel"
|
||||
ng-click="cancelAddPaymentModal();">
|
||||
|
||||
</input>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</fieldset>
|
||||
|
||||
</div>
|
||||
@ -5,7 +5,7 @@
|
||||
<h1 class="mainTitle" translate="Student FormId Fees Details">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription">Student University FormId Fees Details. </span>
|
||||
</div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: STUDENT TITLE -->
|
||||
@ -105,7 +105,7 @@
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th> Action
|
||||
<th> Action
|
||||
</th>
|
||||
<th> FormID
|
||||
</th>
|
||||
@ -147,22 +147,23 @@
|
||||
</th>
|
||||
<th> NRIFEE
|
||||
</th>
|
||||
<th> ProvisionalFee
|
||||
<th> ProvisionalFee
|
||||
</th>
|
||||
<th> MigrationFee
|
||||
<th> MigrationFee
|
||||
</th>
|
||||
<th> UrgentResultDMCFee
|
||||
<th> UrgentResultDMCFee
|
||||
</th>
|
||||
<th> AdditionalFee
|
||||
</th>
|
||||
<th> Amount
|
||||
<th> AdditionalFee
|
||||
</th>
|
||||
<th> Amount
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<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}}
|
||||
@ -183,10 +184,10 @@
|
||||
{{p.Semester}}
|
||||
</td>
|
||||
<td ng-style="p.StudentNameStatus == 'YES' ? myObj: myObjErr">
|
||||
{{p.Student_Name}}
|
||||
{{p.Student_Name}}
|
||||
</td>
|
||||
<td ng-style="p.FathernameStatus == 'YES' ? myObj: myObjErr">
|
||||
{{p.Father_Name}}
|
||||
{{p.Father_Name}}
|
||||
</td>
|
||||
<td ng-style="p.CourseCodeStatus == 'YES' ? myObj: myObjErr">
|
||||
{{p.CourseCode}}
|
||||
@ -212,78 +213,118 @@
|
||||
</td>-->
|
||||
</tr>
|
||||
<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 ng-if="getFormIdDetailsStatusListLoading">
|
||||
<div style="align: center; color: blue" align="center">
|
||||
<h3>Loading...</h3></div>
|
||||
</div>
|
||||
|
||||
<div ng-if="!getFormIdDetailsStatusListLoading">
|
||||
<div class="container">
|
||||
<td colspan="12">
|
||||
<!--<h2> {{p.ID}} </h2>-->
|
||||
<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 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 ng-if="StatusListDetails == ''">
|
||||
<div style="color: blue;" align="center">
|
||||
<h3>{{StatusListDetailsApiMessage}}</h3>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-if="StatusListDetails != ''">
|
||||
|
||||
</div>
|
||||
<div ng-if="StatusListDetails == ''">
|
||||
<div>{{StatusListDetailsApiMessage}}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<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>
|
||||
</tbody>
|
||||
</table>
|
||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||
</dir-pagination-controls>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</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>
|
||||
@ -406,13 +447,13 @@
|
||||
<th>UrgentResultDMCFee</th>
|
||||
<th>AdditionalFee</th>
|
||||
<th>Amount</th>
|
||||
|
||||
|
||||
</thead>
|
||||
<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>
|
||||
@ -434,7 +475,7 @@
|
||||
<td>{{p.DualSpclFee}}</td>
|
||||
<td>{{p.OtherFee}}</td>
|
||||
<td>{{p.NRIFEE}}</td>
|
||||
<td>{{p.ProvisionalFee}}</td>
|
||||
<td>{{p.ProvisionalFee}}</td>
|
||||
<td>{{p.MigrationFee}}</td>
|
||||
<td>{{p.UrgentResultDMCFee}}</td>
|
||||
<td>{{p.AdditionalFee}}</td>
|
||||
@ -448,76 +489,76 @@
|
||||
<label>
|
||||
FormID
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.FormID"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.FormID" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
FormType
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.FormType"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.FormType" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
CentreCode
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.CentreCode"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.CentreCode" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
Session
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Session"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Session" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
Year
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Year"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Year" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
Semester
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Semester"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Semester" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
Student_Name
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Student_Name"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Student_Name" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
Father_Name
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Father_Name"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Father_Name" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
CourseCode
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.CourseCode"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.CourseCode" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
ActualCourseFee
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ActualCourseFee"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ActualCourseFee" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
CourseFee
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.CourseFee"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.CourseFee" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
ExamFee
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ExamFee"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ExamFee" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
@ -525,76 +566,76 @@
|
||||
<label>
|
||||
EnrollmentFee
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.EnrollmentFee"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.EnrollmentFee" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
ProspectusFee
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ProspectusFee"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ProspectusFee" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
ReRegFee
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ReRegFee"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ReRegFee" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
CreditTransferFee
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.CreditTransferFee"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.CreditTransferFee" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
LateralEntryFee
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.LateralEntryFee"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.LateralEntryFee" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
DualSpclFee
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.DualSpclFee"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.DualSpclFee" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
OtherFee
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.OtherFee"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.OtherFee" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
NRIFEE
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.NRIFEE"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.NRIFEE" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
ProvisionalFee
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ProvisionalFee"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.ProvisionalFee" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
MigrationFee
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.MigrationFee"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.MigrationFee" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
UrgentResultDMCFee
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.UrgentResultDMCFee"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.UrgentResultDMCFee" />
|
||||
</div>
|
||||
<div class="col-md-2 form-group" ng-class="{'has-error':Form.primaryPhone.$dirty && Form.primaryPhone.$invalid, 'has-success':Form.primaryPhone.$valid}">
|
||||
<label>
|
||||
AdditionalFee
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.AdditionalFee"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.AdditionalFee" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
@ -602,7 +643,7 @@
|
||||
<label>
|
||||
Amount
|
||||
</label>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Amount"/>
|
||||
<input type="text" name="FromId" placeholder="Enter FromId" class="form-control" ng-model="leader.Amount" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
@ -611,7 +652,7 @@
|
||||
data-style="zoom-in" ng-click="updateFeeIDDetails(p.ID, leader)">
|
||||
<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="editList(-1, {})">
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
@ -625,7 +666,7 @@
|
||||
</dir-pagination-controls>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!--<div class="row">
|
||||
<div class="col-md-4 form-group">
|
||||
<label>
|
||||
@ -643,21 +684,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 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">
|
||||
@ -740,8 +782,8 @@
|
||||
</tab>
|
||||
|
||||
</tabset>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- end: LIST GROUP -->
|
||||
<!-- end: LIST GROUP -->
|
||||
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