Merge remote-tracking branch 'origin/master'
# Conflicts: # Apollo/api/application/config/routes.php # Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php # Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
This commit is contained in:
gandhimathi
commit
a562819967
@ -76,9 +76,10 @@ $query_builder = TRUE;
|
||||
$db['default'] = array(
|
||||
'dsn' => '',
|
||||
'hostname' => 'apollodec.com',
|
||||
'username' => 'apollod4_DEV',
|
||||
'password' => 'apollo1234',
|
||||
'username' => 'apollod4_DEV',
|
||||
'password' => 'apollo1234',
|
||||
'database' => 'apollod4_ApolloDECDev',
|
||||
|
||||
'dbdriver' => 'mysqli',
|
||||
'dbprefix' => '',
|
||||
'pconnect' => FALSE,
|
||||
|
||||
@ -371,6 +371,10 @@ $route['getForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/get
|
||||
$route['addForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addForFormIdDraftDetails';
|
||||
$route['draftMovetoList'] = 'Receive_Enrolment_Fees_Univ_Controller/draftMovetoList';
|
||||
$route['editDraftFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/editDraftFormIdFeesDetails';
|
||||
$route['getStudentUnivFormIdFeeDatailsList'] = 'Receive_Enrolment_Fees_Univ_Controller/getStudentUnivFormIdFeeDatailsList';
|
||||
$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['addUniversityPaymentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addUniversityPaymentDetails';
|
||||
|
||||
$route['getUniversityCodeForFormDetailsGet'] = 'Receive_Enrolment_Fees_Univ_Controller/getUniversityCodeForFormDetailsGet';
|
||||
$route['getUnmatchedFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnmatchedFormIdFeesDetails';
|
||||
$route['addToAccountStateList'] = 'Receive_Enrolment_Fees_Univ_Controller/addToAccountStateList';
|
||||
|
||||
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,7 +37,6 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
$this->methods['getExistStudentEnrolmentDetails_post']['limit'] = 1000;
|
||||
|
||||
$this->methods['addManualEnrolmentDetails_post']['limit'] = 1000;
|
||||
$this->methods['paymentVerficationDetails_post']['limit'] = 1000;
|
||||
|
||||
// load the model
|
||||
$this->load->model('Receive_Enrolment_Fees_Univ_model', 'receive_model');
|
||||
@ -86,7 +85,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
public function insertFormIdUnivFeeDetails_post(){
|
||||
$formIdDetails = $this->post('details');
|
||||
$localDetails = $this->post('localDetails');
|
||||
$updatedDetails = $this->receive_model->formIdFeeDetails($formIdDetails,$localDetails);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
$univDetails = $this->post('univ');
|
||||
$updatedDetails = $this->receive_model->formIdFeeDetails($formIdDetails,$localDetails, $univDetails);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
if ($updatedDetails)
|
||||
{
|
||||
$updatedDetails['status'] = REST_Controller::HTTP_OK;
|
||||
@ -290,7 +290,9 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
public function addForFormIdDraftDetails_post(){
|
||||
$reqBranch = $this->post('localDetails');
|
||||
$details = $this->post('details');
|
||||
$addForFormIdDraftDetails = $this->receive_model->addForFormIdDraftDetails($details, $reqBranch); // Check if the employee exist
|
||||
$univDetails = $this->post('univ');
|
||||
|
||||
$addForFormIdDraftDetails = $this->receive_model->addForFormIdDraftDetails($details, $reqBranch, $univDetails); // Check if the employee exist
|
||||
if ($addForFormIdDraftDetails) {
|
||||
$addForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
@ -333,63 +335,114 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
|
||||
} else {
|
||||
// Set the response and exit
|
||||
$this->response(['message' => 'No list were found', 'status' => false], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
$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
|
||||
// get formid fee details list with status
|
||||
public function getStudentUnivFormIdFeeDatailsList_post(){
|
||||
$reqBranchData = $this->post('data');
|
||||
$searchDetails = $this->post('search');
|
||||
|
||||
$getStudentUnivFormIdFeeDatailsList = $this->receive_model->getStudentUnivFormIdFeeDatailsList($reqBranchData, $searchDetails); // Check if the employee exist
|
||||
if ($getStudentUnivFormIdFeeDatailsList) {
|
||||
$getStudentUnivFormIdFeeDatailsList['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($getStudentUnivFormIdFeeDatailsList, 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 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
|
||||
|
||||
public function getFormIdDetailsStatusUpdateList_post(){
|
||||
$reqBranchData = $this->post('localDetails');
|
||||
$statusDetailsId = $this->post('detailsID');
|
||||
|
||||
$getFormIdDetailsStatusUpdateList = $this->receive_model->getFormIdDetailsStatusUpdateList($reqBranchData, $statusDetailsId); // Check if the employee exist
|
||||
if ($getFormIdDetailsStatusUpdateList) {
|
||||
$getFormIdDetailsStatusUpdateList['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($getFormIdDetailsStatusUpdateList, 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
|
||||
|
||||
}
|
||||
else if($addPaymentDetails['status']==false){
|
||||
$this->response($addPaymentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
}
|
||||
|
||||
public function insertStatusUpdateDetails_post(){
|
||||
$reqBranchData = $this->post('localDetails');
|
||||
$statusDetails = $this->post('details');
|
||||
$id = $this->post('id');
|
||||
$formId = $this->post('formId');
|
||||
|
||||
$insertStatusUpdateDetails = $this->receive_model->insertStatusUpdateDetails($reqBranchData, $statusDetails, $id, $formId ); // Check if the employee exist
|
||||
if ($insertStatusUpdateDetails) {
|
||||
$insertStatusUpdateDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($insertStatusUpdateDetails, 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
|
||||
|
||||
}
|
||||
else{
|
||||
$this->response(['message' => 'Try again', 'status' => false], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
}
|
||||
|
||||
public function getUniversityCodeForFormDetailsGet_post(){
|
||||
$reqData = $this->post('data');
|
||||
$loginUserId = $reqData['localUserID'];
|
||||
$loginUserBranchId = $reqData['localBranchID'];
|
||||
$loginUserType = $reqData['localType'];
|
||||
$getUniversityListDetails = $this->receive_model->get_university_list($loginUserBranchId); // Check if the employee exist
|
||||
if ($getUniversityListDetails) {
|
||||
$getUniversityListDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($getUniversityListDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
|
||||
} else {
|
||||
// Set the response and exit
|
||||
$this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public function getUnmatchedFormIdFeesDetails_post(){
|
||||
$localDetails = $this->post('localDetails');
|
||||
$getDetailsFor = $this->post('getDetailsFor');
|
||||
|
||||
$getUnmatchedFormIdFeesDetails = $this->receive_model->getUnmatchedFormIdFeesDetails($localDetails, $getDetailsFor); // Check if the employee exist
|
||||
if ($getUnmatchedFormIdFeesDetails) {
|
||||
$getUnmatchedFormIdFeesDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($getUnmatchedFormIdFeesDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
|
||||
} else {
|
||||
// Set the response and exit
|
||||
$this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public function addToAccountStateList_post(){
|
||||
$localDetails = $this->post('localDetails');
|
||||
$getDetailsFor = $this->post('details');
|
||||
|
||||
$addFormIdListToAccountState = $this->receive_model->addFormIdListToAccountState($localDetails, $getDetailsFor); // Check if the employee exist
|
||||
if ($addFormIdListToAccountState) {
|
||||
$addFormIdListToAccountState['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($addFormIdListToAccountState, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
|
||||
} else {
|
||||
// Set the response and exit
|
||||
$this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -136,7 +136,12 @@ group by Student_id,cid";
|
||||
|
||||
$coursearr['IsActive'] = $search['IsActive'];
|
||||
$coursearr['DeactiveComments'] =$search['Reason'];
|
||||
|
||||
if( $search['IsActive'] ==0)
|
||||
{
|
||||
$coursearr['Deactive'] = '0';
|
||||
}
|
||||
|
||||
$this->db->where('StudentID', $search['studentId']);
|
||||
$this->db->where('UniversityID', $search['University']);
|
||||
$this->db->where('CourseID', $search['courseId']);
|
||||
|
||||
@ -74,7 +74,7 @@ class DayBook_model extends CI_Model
|
||||
LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID
|
||||
LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode
|
||||
LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode
|
||||
WHERE STR_TO_DATE(t1.Date, '%d-%m-%Y') BETWEEN '$fromDate'
|
||||
WHERE date_format(t1.CreatedOn,'%Y-%m-%d') BETWEEN '$fromDate'
|
||||
AND '$toDate' AND t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC";
|
||||
// echo $querys;exit();
|
||||
// $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $fromDate);
|
||||
@ -760,7 +760,7 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can
|
||||
{
|
||||
//if($search['MobileNumber']!='' && $search['Firstname']!='' && $search['receipt']!='')
|
||||
//{
|
||||
$this->db->select('T_Students_Fees_PaidDetails.ID,T_Students_Fees_PaidDetails.StudentID,T_StudentDetails.Firstname,T_Students_Fees_PaidDetails.FeesID,T_Students_Fees_PaidDetails.BillNO,T_Students_Fees_PaidDetails.BillDate,T_Students_Fees_PaidDetails.BillAmount,T_Students_Fees_PaidDetails.InternalComments,T_Students_Fees_PaidDetails.IsActive,T_Students_Fees_PaidDetails.ReceiptNo');
|
||||
$this->db->select('T_Students_Fees_PaidDetails.ID,T_Students_Fees_PaidDetails.StudentID,T_StudentDetails.Firstname,T_Students_Fees_PaidDetails.FeesID,T_Students_Fees_PaidDetails.BillNO,T_Students_Fees_PaidDetails.BillDate,T_Students_Fees_PaidDetails.BillAmount,T_Students_Fees_PaidDetails.InternalComments as Reason,T_Students_Fees_PaidDetails.IsActive,T_Students_Fees_PaidDetails.ReceiptNo');
|
||||
$this->db->from('T_Students_Fees_PaidDetails');
|
||||
$this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_Students_Fees_PaidDetails.StudentID','left');
|
||||
|
||||
@ -814,30 +814,33 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can
|
||||
$time = date('Y-m-d H:i:s');
|
||||
$dateTime = $time;
|
||||
|
||||
// echo $dateTime;
|
||||
// die();
|
||||
// echo $dateTime;
|
||||
//die();
|
||||
|
||||
//$daybookarr['ID'] = $up_details['ID'];
|
||||
// $daybookarr['IsActive'] = $up_details['IsActive'];
|
||||
// $daybookarr['Reason'] = $up_details['Reason'];
|
||||
// $daybookarr['UpdatedOn'] = $dateTime;
|
||||
// $daybookarr['UpdatedBy'] =$up_details['requestedtBy'];
|
||||
$daybookarr['IsActive'] = $up_details['IsActive'];
|
||||
$daybookarr['Reason'] = $up_details['Reason'];
|
||||
$daybookarr['UpdatedOn'] = $dateTime;
|
||||
$daybookarr['UpdatedBy'] =$up_details['requestedtBy'];
|
||||
|
||||
|
||||
// if($up_details['IsActive'] == 0)
|
||||
// {
|
||||
// $daybookarr['Status'] = 'Cancel';
|
||||
// }
|
||||
if($up_details['IsActive'] == 0)
|
||||
{
|
||||
$daybookarr['Status'] = 'Cancel';
|
||||
}
|
||||
|
||||
// else
|
||||
// {
|
||||
// $daybookarr['Status'] = 'Approved';
|
||||
// }
|
||||
else
|
||||
{
|
||||
$daybookarr['Status'] = 'Approved';
|
||||
}
|
||||
|
||||
|
||||
//print_r($daybookarr);
|
||||
//die();
|
||||
|
||||
|
||||
// $this->db->where('ID', $daybookarr['ID']);
|
||||
// $this->db->update('T_DayBookMaster', $daybookarr);
|
||||
$this->db->where('FeesPaymentID', $up_details['ID']);
|
||||
$this->db->update('T_DayBookMaster', $daybookarr);
|
||||
|
||||
|
||||
//$feearr['ID'] = $up_details['FeesPaymentID'];
|
||||
|
||||
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
@ -368,9 +368,10 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
}
|
||||
|
||||
|
||||
public function formIdFeeDetails($formFeeDetails=null,$local=null){
|
||||
public function formIdFeeDetails($formFeeDetails=null,$local=null, $univ =null){
|
||||
$localBranchID = $local['localBranchID'];
|
||||
$localUserID = $local['localUserID'];
|
||||
$univId = $univ['univCode'];
|
||||
$time = date('Y-m-d H:i:s');
|
||||
$CreatedOn = $time;
|
||||
|
||||
@ -443,9 +444,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
|
||||
if(count($queryDetails->result()) == 0){
|
||||
$query = "INSERT INTO T_FormId_FeeDetails_Received_From_University
|
||||
(FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode, DraftStatus, EditStatus)
|
||||
(FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount,UniversityID, CreatedBy, CreatedOn, BranchCode, DraftStatus, EditStatus, 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';
|
||||
@ -905,10 +906,11 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function addForFormIdDraftDetails($details, $local){
|
||||
public function addForFormIdDraftDetails($details, $local, $univ =null){
|
||||
|
||||
$localBranchID = $local['localBranchID'];
|
||||
$localUserID = $local['localUserID'];
|
||||
$univId = $univ['univCode'];
|
||||
$time = date('Y-m-d H:i:s');
|
||||
$CreatedOn = $time;
|
||||
|
||||
@ -967,9 +969,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
|
||||
if(count($queryDetails->result()) == 0){
|
||||
$query = "INSERT INTO T_FormId_FeeDetails_Received_From_University
|
||||
(FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode, DraftStatus, EditStatus)
|
||||
(FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, UniversityID, CreatedBy, CreatedOn, BranchCode, DraftStatus, EditStatus, 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){
|
||||
@ -1083,124 +1085,247 @@ $result['updatedraftStatus'] = false;
|
||||
return $result;
|
||||
}
|
||||
|
||||
/*
|
||||
* 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');
|
||||
$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']);
|
||||
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 ,
|
||||
ST.Fathername as app_FatherName, IF(ST.Fathername = FUD.Father_Name, "YES", "NO") as FathernameStatus,
|
||||
CM.CourseCode as app_CourseCode, IF(CM.CourseCode = FUD.CourseCode, "YES", "NO" ) as CourseCodeStatus');
|
||||
$this->db->from('T_FormId_FeeDetails_Received_From_University as FUD');
|
||||
$this->db->join(ENROLMENTRECEIVEDFROMUNIV.' as ENU', 'FUD.FormID = ENU.FormID' );
|
||||
$this->db->join(STUDENTCOURSE.' as STC', 'STC.EnrollmentID = ENU.EnrolmentNo');
|
||||
$this->db->join(COURSE.' as CM', 'CM.CourseID = STC.CourseID');
|
||||
$this->db->join(STUDENTS.' as ST', 'ST.StudentID = STC.StudentID');
|
||||
// $this->db->join(UNIVERSITY.' as UN', 'UN.UniversityID = STC.UniversityID');
|
||||
if($searchDetails['University']!=''){
|
||||
$this->db->where('ENU.UniversityCode',$searchDetails['University']);
|
||||
}
|
||||
if($searchDetails['Course']!=''){
|
||||
$this->db->where('ENU.CourseCode',$searchDetails['Course']);
|
||||
}
|
||||
if($searchDetails['Sem']!=''){
|
||||
$this->db->where('ENU.SemesterYear',$searchDetails['Sem']);
|
||||
}
|
||||
$this->db->where('FUD.DraftStatus',0);
|
||||
$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;
|
||||
$detailsList = $details->result();
|
||||
if($detailsList){
|
||||
// foreach ($detailsList as $fetchStudentRow){
|
||||
// // form id bases get student paid details
|
||||
// $getStudentsetFeesDetails=$this->getStudentsetFeesDetails($fetchStudentRow->StudentID,$fetchStudentRow->CourseID,$fetchStudentRow->SemesterYear);
|
||||
// if(isset($getStudentsetFeesDetails['status']) AND $getStudentsetFeesDetails['status']==true ){
|
||||
// $formResult['SessionName']=$getStudentsetFeesDetails['SessionName'];
|
||||
// $formResult['FormID']=$fetchStudentRow->FormID;
|
||||
// $formResult['FormType']=$fetchStudentRow->FormType;
|
||||
// $formResult['SemesterYear']=$fetchStudentRow->SemesterYear;
|
||||
// $formResult['EnrolmentNo']=$fetchStudentRow->EnrolmentNo;
|
||||
// $formResult['CourseCode']=$fetchStudentRow->CourseCode;
|
||||
// $formResult['CourseName']=$fetchStudentRow->CourseName;
|
||||
// $formResult['RollNo']=$fetchStudentRow->RollNo;
|
||||
// $formResult['StudentID']=$fetchStudentRow->StudentID;
|
||||
// $formResult['MobileNumber']=$fetchStudentRow->MobileNumber;
|
||||
// $formResult['Firstname']=$fetchStudentRow->Firstname;
|
||||
// $formResult['Lastname']=$fetchStudentRow->Lastname;
|
||||
// $formResult['Fathername']=$fetchStudentRow->Fathername;
|
||||
// $formResult['MotherName']=$fetchStudentRow->MotherName;
|
||||
// $formResult['EmailID']=$fetchStudentRow->EmailID;
|
||||
// $formResult['AlternateNumber']=$fetchStudentRow->AlternateNumber;
|
||||
// $formResult['Gender']=$fetchStudentRow->Gender;
|
||||
// $formResult['DOB']=$fetchStudentRow->DOB;
|
||||
// $formResult['PresentAddress']=$fetchStudentRow->PresentAddress;
|
||||
// $formResult['PermanentAddress']=$fetchStudentRow->PermanentAddress;
|
||||
// $formResult['AadharNumber']=$fetchStudentRow->AadharNumber;
|
||||
// $formResult['OtherID']=$fetchStudentRow->OtherID;
|
||||
// $formResult['OtherIDDetails']=$fetchStudentRow->OtherIDDetails;
|
||||
// $formResult['Qualification']=$fetchStudentRow->Qualification;
|
||||
// $formResult['UniversityID']=$fetchStudentRow->UniversityID;
|
||||
// $formResult['UniversityName']=$fetchStudentRow->UniversityName;
|
||||
// $mergeFormDetails[]=$formResult;
|
||||
// }
|
||||
// }
|
||||
$resultArr['studentFeeCompareDetails'] = $detailsList;
|
||||
$resultArr['formTypeStatus'] = true;
|
||||
$resultArr['message'] = "Successfully data generated";
|
||||
} else {
|
||||
$resultArr['studentFeeCompareDetails'] = [];
|
||||
$resultArr['formTypeStatus'] = false;
|
||||
$resultArr['message'] = "No record found";
|
||||
}
|
||||
return $resultArr;
|
||||
|
||||
}
|
||||
/*
|
||||
* 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";
|
||||
}
|
||||
public function getFormIdDetailsStatusUpdateList($reqBranchData, $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) {
|
||||
$result['formIdstatusListStatus'] = true;
|
||||
$result['formIdstatusListDetails'] = $detailsList;
|
||||
$result['formIdstatusListMessagae'] = "details generate successfully.";
|
||||
} else {
|
||||
$result['formIdstatusListStatus'] = false;
|
||||
$result['formIdstatusListDetails'] = '';
|
||||
$result['formIdstatusListMessagae'] = "No Record Found.";
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function insertStatusUpdateDetails($reqBranchData, $statusDetails, $id, $formId ){
|
||||
|
||||
$newLeadDetails['FormIdDetailsID'] = $id;
|
||||
$newLeadDetails['FormID'] = $formId;
|
||||
$newLeadDetails['Status'] = $statusDetails['Status'];
|
||||
$time = date('Y-m-d H:i:s');
|
||||
$newLeadDetails['CreatedOn'] = $time;
|
||||
$newLeadDetails['CreatedBy'] = $reqBranchData['localUserID'];
|
||||
$this->db->insert('T_FormId_FeeDetails_Received_From_University_StatusUpdate', $newLeadDetails);
|
||||
// this if for insert lead details
|
||||
if ($this->db->affected_rows() == '1') {
|
||||
$result['insertStatusUpdateDetailsStatus'] = true;
|
||||
$result['insertStatusUpdateDetailsMessagae'] = "Status Updated successfully.";
|
||||
}else {
|
||||
$result['insertStatusUpdateDetailsStatus'] = false;
|
||||
$result['insertStatusUpdateDetailsMessagae'] = "Something went Wrong.";
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
// get university list
|
||||
public function get_university_list($branch) {
|
||||
$this->db->select('UniversityID, UniversityName');
|
||||
$this->db->order_by('CreatedOn', 'DESC');
|
||||
$this->db->from(UNIVERSITY);
|
||||
$this->db->where('IsActive', 1);
|
||||
$this->db->where('BranchCode', $branch);
|
||||
$univDetails = $this->db->get();
|
||||
$universityDetails = $univDetails->result();
|
||||
if (count($universityDetails) > 0) {
|
||||
$results['univList'] = true;
|
||||
$results['university_details'] = $universityDetails;
|
||||
} else {
|
||||
$results['univList'] = false;
|
||||
$results['message'] = 'No record found';
|
||||
}
|
||||
return $results;
|
||||
}
|
||||
|
||||
public function getUnmatchedFormIdFeesDetails($localDetails, $getDetailsFor) {
|
||||
|
||||
$searchUniv = $getDetailsFor['univCode'];
|
||||
// echo $searchUniv;exit();
|
||||
$query = "select *
|
||||
from T_FormId_FeeDetails_Received_From_University as t1
|
||||
where t1.FormID NOT IN (select FormID from T_Enrolment_Received_From_University)
|
||||
and t1.UniversityID ='$searchUniv'";
|
||||
$details = $this->db->query($query);
|
||||
$detailsList = $details->result();
|
||||
if($detailsList){
|
||||
$resultArr['unMatchedRecordDetails'] = $detailsList;
|
||||
$resultArr['unMatchedRecordStatus'] = true;
|
||||
$resultArr['unMatchedRecordFor'] = 'FormIDFile';
|
||||
$resultArr['message'] = "Successfully data generated";
|
||||
} else {
|
||||
$resultArr['unMatchedRecordDetails'] = [];
|
||||
$resultArr['unMatchedRecordStatus'] = false;
|
||||
$resultArr['unMatchedRecordFor'] = 'FormIDFile';
|
||||
$resultArr['message'] = "No record found";
|
||||
}
|
||||
return $resultArr;
|
||||
}
|
||||
|
||||
public function addFormIdListToAccountState($localDetails, $getDetailsFor){
|
||||
$localCreatedBy = $localDetails['localUserID'];
|
||||
$time = date('Y-m-d H:i:s');
|
||||
$localCreatedOn = $time;
|
||||
foreach($getDetailsFor as $row) {
|
||||
$ids = $row['ID'];
|
||||
$query = "SELECT t1.ID, t1.FormID, t1.Amount, t2.ApprovedDate , t2.CreatedOn ,t2.UniversityCode, t2.UniversityName
|
||||
from T_FormId_FeeDetails_Received_From_University as t1
|
||||
LEFT JOIN T_Enrolment_Received_From_University as t2 ON t1.FormID = t2.FormID
|
||||
WHERE t1.ID = '$ids'";
|
||||
$details = $this->db->query($query);
|
||||
$detailsList = $details->result();
|
||||
if($detailsList){
|
||||
$arr['FormMapID'] = $detailsList[0]->ID;
|
||||
$arr['FormID'] = $detailsList[0]->FormID;
|
||||
$arr['CreditAmount'] = $detailsList[0]->Amount;
|
||||
$ApprovedDate = date('y-m-d',strtotime($detailsList[0]->ApprovedDate));
|
||||
$CreatedOn = date('y-m-d',strtotime($detailsList[0]->CreatedOn));
|
||||
$arr['ApprovedDate'] = $ApprovedDate ? $ApprovedDate : $CreatedOn;
|
||||
$arr['TypeID'] = 1;
|
||||
$arr['TypeName'] = 'Credit';
|
||||
$arr['UniversityCode'] = $detailsList[0]->UniversityCode;
|
||||
$arr['UniversityName'] = $detailsList[0]->UniversityName;
|
||||
$arr['CreatedOn'] = $localCreatedOn;
|
||||
$arr['CreatedBy'] = $localCreatedBy;
|
||||
$this->db->insert('T_University_Credit_Debit', $arr);
|
||||
if ($this->db->affected_rows() >= 1) {
|
||||
$updateQuery = 'UPDATE `T_FormId_FeeDetails_Received_From_University` SET `AddToAccountStatus` = 1 WHERE `ID` = '.$ids;
|
||||
$queryDetails = $this->db->query($updateQuery);
|
||||
if ($this->db->affected_rows() == '1') {
|
||||
$result['accountStateMoveStatus'] = true;
|
||||
$result['accountStateMoveMessagae'] = "Updated Successfully.";
|
||||
} else {
|
||||
$resultArray['status']=false;
|
||||
$resultArray['message']="Payment failed.Try again";
|
||||
$result['accountStateMoveStatus'] = false;
|
||||
$result['accountStateMoveMessagae'] = "Something went wrong.";
|
||||
}
|
||||
}
|
||||
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";
|
||||
$result['accountStateMoveStatus'] = false;
|
||||
$result['accountStateMoveMessagae'] = "Something went wrong.";
|
||||
}
|
||||
|
||||
} else {
|
||||
$result['accountStateMoveStatus'] = false;
|
||||
$result['accountStateMoveMessagae'] = "Something went wrong.";
|
||||
}
|
||||
}
|
||||
else {
|
||||
$resultArray['status']=false;
|
||||
$resultArray['message']="Bill no is already exist..";
|
||||
}
|
||||
return $resultArray;
|
||||
|
||||
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;
|
||||
// }
|
||||
|
||||
}
|
||||
@ -413,7 +413,12 @@ class Student_model extends CI_Model {
|
||||
$this->db->where('IsActive', 1);
|
||||
$this->db->where('BranchCode', $branch);
|
||||
$courseDetails = $this->db->get();
|
||||
// print_r($courseDetails->result());
|
||||
// die();
|
||||
|
||||
if ($courseDetails->result()) {
|
||||
|
||||
|
||||
$this->db->select('B.SessionID, B.SessionName');
|
||||
$this->db->from(SESSIONMASTER . ' as B');
|
||||
$this->db->join(SESSIONDETAILS . ' SD', 'SD.SessionID = B.SessionID');
|
||||
@ -421,6 +426,10 @@ class Student_model extends CI_Model {
|
||||
$this->db->where('B.IsActive', 1);
|
||||
$this->db->where('SD.IsActive', 1);
|
||||
$batchDetails = $this->db->get();
|
||||
|
||||
//print_r($batchDetails->result());
|
||||
//die();
|
||||
|
||||
if ($batchDetails->result()) {
|
||||
$result['courseStatus'] = true;
|
||||
$result['course_details'] = $courseDetails->result();
|
||||
|
||||
@ -158,7 +158,8 @@
|
||||
"entry": {
|
||||
"MAIN": "My Details",
|
||||
"coursecorrection": "Course Details",
|
||||
"stud_merge": "Student Merge"
|
||||
"stud_merge": "Student Merge",
|
||||
"DATACORRECTION" : "Bills Correction"
|
||||
},
|
||||
"announcement": {
|
||||
"MAIN": "ANNOUNCEMENT",
|
||||
|
||||
@ -178,7 +178,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
|
||||
ncyBreadcrumb: {
|
||||
label: 'income_expense'
|
||||
},
|
||||
}).state('app.daybooksuperadmin.datacorrection', {
|
||||
}).state('app.entry.datacorrection', {
|
||||
url: '/datacorrection',
|
||||
templateUrl: "assets/views/data_correction.html",
|
||||
resolve: loadSequence('datacorrectionCtrl','ngTable', 'ladda', 'angular-ladda'),
|
||||
@ -337,7 +337,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
|
||||
title: 'status',
|
||||
ncyBreadcrumb: {
|
||||
label: 'status'
|
||||
}
|
||||
}
|
||||
}).state('app.student.status.studymaterial', {
|
||||
url: '/studymaterial',
|
||||
templateUrl: "assets/views/status-update/study_material_status.html",
|
||||
|
||||
@ -76,6 +76,8 @@ $scope.universitySearchData = '';
|
||||
|
||||
|
||||
$scope.studentInfo="";
|
||||
$scope.mobileNo='';
|
||||
$scope.student_Name='';
|
||||
$scope.getStudentDetails = function (form,myModel)
|
||||
{
|
||||
|
||||
@ -85,6 +87,8 @@ $scope.universitySearchData = '';
|
||||
var studentName = myModel.studentName;
|
||||
var receipt = myModel.receipt;
|
||||
$scope.universityId = myModel.myUnivSearch;
|
||||
$scope.mobileNo=myModel.mobileNumber;
|
||||
$scope.student_Name=myModel.studentName;
|
||||
// console.log($scope.universityId);
|
||||
// return false;
|
||||
|
||||
@ -249,7 +253,44 @@ $scope.universitySearchData = '';
|
||||
$http(updatecourse).then(function (response) {
|
||||
swal('Change Saved Successfully', response.data.message, "success");
|
||||
$scope.close();
|
||||
$scope.getStudentDetails(form,myModel);
|
||||
// $scope.getStudentDetails(form,myModel);
|
||||
|
||||
$scope.isLoaderShow= false
|
||||
|
||||
var getdetail = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getAllstudentcoursedetail/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data :{
|
||||
studentName: $scope.student_Name,
|
||||
mobileNumber: $scope.mobileNo,
|
||||
receipt: myModel.receipt,
|
||||
University:$scope.universityId,
|
||||
requestedtBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
|
||||
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
|
||||
requestedDept: JSON.parse(localStorage.getItem('localObj')).localType,
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
$http(getdetail).then(function (response) {
|
||||
|
||||
//console.log(response)
|
||||
if (response.data.status==200 && response.data.studentStatus) {
|
||||
$scope.studentInfo=response.data.details;
|
||||
console.log($scope.studentInfo);
|
||||
|
||||
} else {
|
||||
$scope.studentInfo="";
|
||||
|
||||
$scope.isLoaderShow = true;
|
||||
$scope.load = "No Records Found";
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
||||
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
@ -2,6 +2,7 @@
|
||||
/**
|
||||
* controllers for ng-table
|
||||
* Simple table with sorting and filtering on AngularJS
|
||||
* kdk
|
||||
*/
|
||||
|
||||
app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$http", "API_POINTS", "$state", '$rootScope', '$cookies', 'md5', 'ipCookie', '$timeout', '$window', "flowFactory", "$interval", 'SweetAlert', function ($scope, toaster, $filter, ngTableParams, $http, apiPoint, $state, $rootScope, $cookies, md5, ipCookie, $timeout, $window, flowFactory, $interval, SweetAlert) {
|
||||
@ -36,6 +37,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
if (localDetails.localType === 'R004') {
|
||||
// $scope.getUniversityList();
|
||||
$scope.getUniversitySearchList();
|
||||
$scope.getUniveesityListFromApp();
|
||||
} else {
|
||||
ipCookie.remove('cookiechk');
|
||||
$window.localStorage.clear();
|
||||
@ -46,11 +48,11 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
}
|
||||
|
||||
|
||||
/*$scope.universityData = '';
|
||||
$scope.getUniversityList = function () {
|
||||
$scope.universityData = '';
|
||||
$scope.getUniveesityListFromApp = function () {
|
||||
var empListreq = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getStudentUniversity/',
|
||||
url: apiPoint.url + 'getUniversityCodeForFormDetailsGet/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
@ -64,7 +66,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
} else {
|
||||
}
|
||||
});
|
||||
}*/
|
||||
}
|
||||
// get University List
|
||||
$scope.universitySearchData = '';
|
||||
$scope.getUniversitySearchList = function () {
|
||||
@ -87,11 +89,12 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
});
|
||||
};
|
||||
|
||||
$scope.semDetails=["1","2","3","4","5","6","7","8"];
|
||||
|
||||
$scope.searchData = {
|
||||
"University": "",
|
||||
"Course": "",
|
||||
"Status": ""
|
||||
"Sem": ""
|
||||
}
|
||||
$scope.myUnivSearch = "";
|
||||
$scope.courseData = "";
|
||||
@ -134,7 +137,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
$scope.Searchloader = true;
|
||||
var empListreq = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getStudentUnivFeeCompareDetails/',
|
||||
url: apiPoint.url + 'getStudentUnivFormIdFeeDatailsList/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
@ -161,6 +164,17 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
}
|
||||
}
|
||||
|
||||
$scope.myObj = {
|
||||
// "color" : "green",
|
||||
"font-size" : "inherit"
|
||||
}
|
||||
|
||||
$scope.myObjErr = {
|
||||
"text-decoration": "underline",
|
||||
"text-decoration-color": "red",
|
||||
"font-size" : "inherit"
|
||||
}
|
||||
|
||||
$scope.editId = -1;
|
||||
$scope.setEditId = function (id) {
|
||||
$scope.editId = id;
|
||||
@ -216,9 +230,12 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
|
||||
}
|
||||
|
||||
$scope.formUploadUnivSelectID = {
|
||||
'univCode': ''
|
||||
};
|
||||
|
||||
$scope.receiveFormIdFeeDetails = function (details) {
|
||||
console.log(details);
|
||||
|
||||
var updateUniversityEnrolment = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'insertFormIdUnivFeeDetails/',
|
||||
@ -227,7 +244,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
details: details
|
||||
details: details,
|
||||
univ: $scope.formUploadUnivSelectID
|
||||
}
|
||||
};
|
||||
|
||||
@ -278,22 +296,26 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
$scope.formIdMissMatchUnivSelectID = {
|
||||
'univCode': ''
|
||||
};
|
||||
|
||||
$scope.unMatchedLoadingStatus = false;
|
||||
// Get unmached details
|
||||
$scope.getUnmatchedRecord = function (ss) {
|
||||
$scope.unMatchedRecordDetails = '';
|
||||
$scope.unMatchedNoRecordFound = false;
|
||||
$scope.unMatchedLoadingStatus = true;
|
||||
var getDetailsFor = ss == 1 ? 'EnrolmentIDFile' : 'FormIDFile';
|
||||
var getFeeCompareDetailsList = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getUnmatchedRecordDetails/',
|
||||
url: apiPoint.url + 'getUnmatchedFormIdFeesDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
getDetailsFor: getDetailsFor
|
||||
getDetailsFor: $scope.formIdMissMatchUnivSelectID
|
||||
}
|
||||
};
|
||||
$http(getFeeCompareDetailsList).then(function (response) {
|
||||
@ -391,7 +413,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
details : $scope.draftManualEntryDetails
|
||||
details : $scope.draftManualEntryDetails,
|
||||
univ: $scope.formUploadUnivSelectID
|
||||
}
|
||||
};
|
||||
$http(addDraftDetailsList).then(function (response) {
|
||||
@ -519,4 +542,129 @@ $scope.draftManualEntryDetails = {
|
||||
}});
|
||||
}
|
||||
|
||||
$scope.statusUpdateEditId = -1;
|
||||
$scope.statusUpdate = function(id){
|
||||
$scope.statusUpdateEditId = id;
|
||||
$scope.statusUpdateFormIdDetails = {
|
||||
"Status": "",
|
||||
"Comments": ""
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$scope.StatusListDetails = '';
|
||||
$scope.getFormIdDetailsStatusListLoading = false;
|
||||
$scope.getFormIdDetailsStatusList = function(id){
|
||||
|
||||
$scope.getFormIdDetailsStatusListLoading = true;
|
||||
var getFormIdDetailsStatusList = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getFormIdDetailsStatusUpdateList/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
detailsID : id
|
||||
}
|
||||
};
|
||||
$http(getFormIdDetailsStatusList).then(function (response) {
|
||||
if (response.data.formIdstatusListStatus == true) {
|
||||
$scope.getFormIdDetailsStatusListLoading = false;
|
||||
$scope.StatusListDetails = response.data.formIdstatusListDetails;
|
||||
} else {
|
||||
$scope.getFormIdDetailsStatusListLoading = false;
|
||||
$scope.StatusListDetails = response.data.formIdstatusListDetails;
|
||||
$scope.StatusListDetailsApiMessage = response.data.formIdstatusListMessagae;
|
||||
}});
|
||||
}
|
||||
|
||||
$scope.statusUpdateFormIdDetails = {
|
||||
"Status": "",
|
||||
"Comments": ""
|
||||
}
|
||||
|
||||
$scope.resetStatusUpdateForm = function(){
|
||||
$scope.statusUpdateFormIdDetails = {
|
||||
"Status": "",
|
||||
"Comments": ""
|
||||
}
|
||||
}
|
||||
|
||||
$scope.addStatusUpdateDetails = function(id, formId){
|
||||
var addStatusUpdateDetailsStatusList = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'insertStatusUpdateDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail,
|
||||
details : $scope.statusUpdateFormIdDetails,
|
||||
id: id,
|
||||
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.getFormIdDetailsStatusListLoading = false;
|
||||
// $scope.StatusListDetails = response.data.formIdstatusListDetails;
|
||||
// $scope.StatusListDetailsApiMessage = response.data.formIdstatusListMessagae;
|
||||
}});
|
||||
}
|
||||
|
||||
$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");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}]);
|
||||
|
||||
@ -76,9 +76,9 @@ td,th {
|
||||
|
||||
<th>Student Name</th>
|
||||
<th>Mobile Number</th>
|
||||
<th>Course Name</th>
|
||||
<th>University</th>
|
||||
<th>Action</th>
|
||||
<th>Course Name</th>
|
||||
<th>Action</th>
|
||||
|
||||
|
||||
|
||||
@ -89,9 +89,9 @@ td,th {
|
||||
|
||||
<td>{{p.Student_name}}</td>
|
||||
<td>{{p.Phone_number}}</td>
|
||||
<td>{{p.Course_name}}</td>
|
||||
<td>{{p.University}}</td>
|
||||
<td style="text-align:center;"><input type="checkbox" ng-checked="myModel.all" id="{{p.Phone_number}}" name="{{p.Phone_number}}" class="form-control" ng-click="isClick($event);" style="width:17px" /></td>
|
||||
<td>{{p.Course_name}}</td>
|
||||
<td style="text-align:center;"><input type="checkbox" ng-checked="myModel.all" id="{{p.Phone_number}}" name="{{p.Phone_number}}" class="form-control" ng-click="isClick($event);" style="width:17px" /></td>
|
||||
|
||||
|
||||
</tr>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<span class="mainDescription">Add / Edit Activity list used for call tracking. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<div class="container-fluid container-fullw bg-white">
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
<span class="mainDescription">Add New Income Expense Types. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<div class="container-fluid container-fullw bg-white">
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<h1 class="mainTitle" translate="Announcement ">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription">Add/View Announcement Details. </span>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<span class="mainDescription">Add/View Batch Details. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
<span class="mainDescription">Add/View Branch Details. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
<span class="mainDescription">View all closed leads. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
<span class="mainDescription">Manage new leads. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
<span class="mainDescription">Leads created on a given date. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
<span class="mainDescription">View all open Leads.</span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span>
|
||||
-->
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
<h1 class="mainTitle" translate="Certificate Type"></h1>
|
||||
<span class="mainDescription">Add/Edit certificate type. </span>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<div class="container-fluid container-fullw bg-white">
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<div class="col-sm-8">
|
||||
<h1 class="mainTitle">Change Password</h1>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<h1 class="mainTitle" translate="sidebar.nav.charts.MAIN">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription">Tc-angular-chartjs provides you with directives for all chartjs chart types.</span>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<span class="mainDescription">Add/View Course Details. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="col-sm-8">
|
||||
<h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<span class="mainDescription">Add/Edit Income/Expense heads. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<div class="container-fluid container-fullw bg-white">
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="col-sm-8">
|
||||
<h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="col-sm-8">
|
||||
<h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="col-sm-8">
|
||||
<h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="col-sm-8">
|
||||
<h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="col-sm-8">
|
||||
<h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<h1 class="mainTitle" translate="sidebar.heading.DOCUMENTATION">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription">Getting started with {{app.name}} is easy. Whether you are a master of Sass, building a new app, or making your existing site responsive, we've got you covered.</span>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<div class="container-fluid container-fullw bg-white">
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<span class="mainDescription">View/Add Employee Details. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: EMPLOYEE TITLE -->
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span>
|
||||
-->
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
<span class="mainDescription">Generate halltickets. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
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" -->
|
||||
|
||||
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
<span class="mainDescription">Examination Attendance </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
<span class="mainDescription">Generate Halltickets For Student </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
<span class="mainDescription">Allocate Courses to Corresponding Subjects </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<h1 class="mainTitle" translate="sidebar.nav.maps.MAIN">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription">The Simplest Way of Showing A Map</span>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="col-sm-8">
|
||||
<h1 class="mainTitle" translate="sidebar.nav.profile.MAIN">{{ mainTitle }}</h1>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!-- start: MAIN NAVIGATION MENU -->
|
||||
<!--start: MAIN NAVIGATION MENU -->
|
||||
|
||||
<!-- start: Super Admin -->
|
||||
|
||||
@ -328,11 +328,11 @@
|
||||
</li>
|
||||
|
||||
|
||||
<li ui-sref-active="active">
|
||||
<!-- <li ui-sref-active="active">
|
||||
<a ui-sref="app.daybooksuperadmin.datacorrection" ng-click="checkSuperAdmin()">
|
||||
<span class="title" translate="sidebar.nav.daybook.DATACORRECTION"> DATA CORRECTION</span>
|
||||
</a>
|
||||
</li>
|
||||
</li> -->
|
||||
|
||||
|
||||
|
||||
@ -560,6 +560,12 @@
|
||||
<span class="title" translate="sidebar.nav.entry.stud_merge">Student Merge</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.entry.datacorrection" ng-click="checkSuperAdmin()">
|
||||
<span class="title" translate="sidebar.nav.entry.DATACORRECTION"> DATA CORRECTION</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</li>
|
||||
@ -849,11 +855,11 @@
|
||||
</li>
|
||||
|
||||
|
||||
<li ui-sref-active="active">
|
||||
<!-- <li ui-sref-active="active">
|
||||
<a ui-sref="app.daybooksuperadmin.datacorrection" ng-click="checkAdmin()">
|
||||
<span class="title" translate="sidebar.nav.daybook.DATACORRECTION"> DATA CORRECTION</span>
|
||||
</a>
|
||||
</li>
|
||||
</li> -->
|
||||
|
||||
|
||||
|
||||
@ -1038,7 +1044,7 @@
|
||||
|
||||
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.reports.feeCollect" ng-click="checkSuperAdmin()">
|
||||
<a ui-sref="app.reports.feeCollect" ng-click="checkAdmin()">
|
||||
<span class="title" translate="sidebar.nav.report.feeCollect">Report For Fees Collection</span>
|
||||
</a>
|
||||
</li>
|
||||
@ -1059,6 +1065,45 @@
|
||||
</a>
|
||||
|
||||
</li>-->
|
||||
|
||||
|
||||
|
||||
<li ng-class="{'active open':$state.includes('app.entry')}">
|
||||
<a href="javascript:void(0)">
|
||||
<div class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="ti-pencil"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<span class="title" translate="sidebar.nav.master.ENTRY"> ENTRY </span><i class="icon-arrow"></i>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
|
||||
<ul class="sub-menu">
|
||||
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.entry.coursecorrection" ng-click="checkAdmin()">
|
||||
<span class="title" translate="sidebar.nav.entry.coursecorrection">COURSECORRECTION</span>
|
||||
</a>
|
||||
</li>
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.entry.stud_merge" ng-click="checkAdmin()">
|
||||
<span class="title" translate="sidebar.nav.entry.stud_merge">Student Merge</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.entry.datacorrection" ng-click="checkAdmin()">
|
||||
<span class="title" translate="sidebar.nav.entry.DATACORRECTION"> DATA CORRECTION</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
</ul>
|
||||
|
||||
<!-- end: Admin -->
|
||||
@ -1613,4 +1658,4 @@
|
||||
<span translate="sidebar.heading.DOCUMENTATION">Documentation</span>
|
||||
</a>
|
||||
</div>-->
|
||||
<!-- end: DOCUMENTATION BUTTON -->
|
||||
<!-- end: DOCUMENTATION BUTTON
|
||||
@ -30,7 +30,7 @@
|
||||
<span class="mainDescription">Promote Students From One Batch To Next Batch</span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
<span class="mainDescription">Re Registration Per Semesters </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="col-sm-8">
|
||||
<h1 class="mainTitle" translate="sidebar.nav.sendSMSPage.MAIN">{{ mainTitle }}</h1>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="col-sm-8">
|
||||
<h1 class="mainTitle" translate="sidebar.nav.sendSMSPage.MAIN">{{ mainTitle }}</h1>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<span class="mainDescription">Add/View Session Details. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<span class="mainDescription">Add/View Session Schedule. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<h1 class="mainTitle" translate="sidebar.nav.student.status.ANSWERBOOKLET">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription">Update answer booklet status.</span>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<h1 class="mainTitle" translate="sidebar.nav.student.status.APPLICATION">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription">Update application status.</span>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<h1 class="mainTitle" translate="sidebar.nav.student.status.CERTIFICATE">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription">Update certificate status.</span>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
<span class="mainDescription">Update fees status. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<h1 class="mainTitle" translate="sidebar.nav.student.status.MARKCARD">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription">Update markcard status.</span>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<h1 class="mainTitle" translate="sidebar.nav.student.status.STUDYMATERIAL">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription">Update study material status.</span>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
<span class="mainDescription">Manage various status for the entire application. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<div class="container-fluid container-fullw bg-white">
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<h1 class="mainTitle" translate="Enrolment Details">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription">Student Form Enrolment Details. </span>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: STUDENT TITLE -->
|
||||
|
||||
@ -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 -->
|
||||
@ -65,13 +65,24 @@
|
||||
<label for="form-field-select-2">
|
||||
Course
|
||||
</label>
|
||||
<select ui-select2 class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="session" ng-model="searchData.Course">
|
||||
<select ui-select2 class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="course" ng-model="searchData.Course">
|
||||
<option value="" selected>Select Course</option>
|
||||
<option ng-repeat="itemCourse in courseData" value="{{itemCourse.CourseCode}}">{{itemCourse.CourseName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-2" style="padding-top: 2.3%;">
|
||||
<div class="pull-right">
|
||||
<div class="col-md-3 form-group">
|
||||
<label for="form-field-select-2">
|
||||
Sem
|
||||
</label>
|
||||
<select class="form-control" tabindex="11" class="cs-select cs-skin-elastic" name="sem" id="sem" ng-model="searchData.Sem">
|
||||
<option value="" selected>Select Sem</option>
|
||||
<option ng-repeat="sem in semDetails" value="{{sem}}">{{sem}}</option>
|
||||
</select>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-3" style="padding-top: 2.3%;">
|
||||
<div class="pull-left">
|
||||
|
||||
<button ng-disabled="searchData.Course == '' || searchData.University == ''" type="submit" class="btn btn-success btn-o"
|
||||
tabindex="8">
|
||||
@ -94,30 +105,66 @@
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th> Action
|
||||
</th>
|
||||
<th> FormID
|
||||
</th>
|
||||
<th> Form Type
|
||||
</th>
|
||||
<th> Student Name
|
||||
<th> CentreCode
|
||||
</th>
|
||||
<th> Father Name
|
||||
<th> Session
|
||||
</th>
|
||||
<th> University
|
||||
<th> Year
|
||||
</th>
|
||||
<th> Course
|
||||
<th> Semester
|
||||
</th>
|
||||
<th> Sem/Year
|
||||
<th> Student_Name
|
||||
</th>
|
||||
<th> Enrolment ID
|
||||
<th> Father_Name
|
||||
</th>
|
||||
<th> University Paid
|
||||
<th> CourseCode
|
||||
</th>
|
||||
<th> Student Paid
|
||||
<th> ActualCourseFee
|
||||
</th>
|
||||
<th> CourseFee
|
||||
</th>
|
||||
<th> ExamFee
|
||||
</th>
|
||||
<th> EnrollmentFee
|
||||
</th>
|
||||
<th> ProspectusFee
|
||||
</th>
|
||||
<th> ReRegFee
|
||||
</th>
|
||||
<th> CreditTransferFee
|
||||
</th>
|
||||
<th> LateralEntryFee
|
||||
</th>
|
||||
<th> DualSpclFee
|
||||
</th>
|
||||
<th> OtherFee
|
||||
</th>
|
||||
<th> NRIFEE
|
||||
</th>
|
||||
<th> ProvisionalFee
|
||||
</th>
|
||||
<th> MigrationFee
|
||||
</th>
|
||||
<th> UrgentResultDMCFee
|
||||
</th>
|
||||
<th> AdditionalFee
|
||||
</th>
|
||||
<th> Amount
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
|
||||
<tr>
|
||||
<td>
|
||||
<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}}
|
||||
</td>
|
||||
@ -125,48 +172,127 @@
|
||||
{{p.FormType}}
|
||||
</td>
|
||||
<td>
|
||||
<a class="text-dark">
|
||||
{{p.Firstname}} {{p.Lastname}}
|
||||
</a>
|
||||
<!--tooltip="View Student" ng-click="open(p);"-->
|
||||
{{p.CentreCode}}
|
||||
</td>
|
||||
<td>{{p.Fathername}}</td>
|
||||
<td>{{p.UniversityName}}</td>
|
||||
<td>{{p.CourseName}}</td>
|
||||
<td>{{p.SemesterYear}}</td>
|
||||
<td>{{p.EnrolmentNo}}</td>
|
||||
<td>{{p.UniversityPaidAmount}}</td>
|
||||
<td>{{p.StudentPaidAmount}}</td>
|
||||
<td>
|
||||
{{p.Session}}
|
||||
</td>
|
||||
<td>
|
||||
{{p.Year}}
|
||||
</td>
|
||||
<td>
|
||||
{{p.Semester}}
|
||||
</td>
|
||||
<td ng-style="p.StudentNameStatus == 'YES' ? myObj: myObjErr">
|
||||
{{p.Student_Name}}
|
||||
</td>
|
||||
<td ng-style="p.FathernameStatus == 'YES' ? myObj: myObjErr">
|
||||
{{p.Father_Name}}
|
||||
</td>
|
||||
<td ng-style="p.CourseCodeStatus == 'YES' ? myObj: myObjErr">
|
||||
{{p.CourseCode}}
|
||||
</td>
|
||||
<td>{{p.ActualCourseFee}}</td>
|
||||
<td>{{p.CourseFee}}</td>
|
||||
<td>{{p.ExamFee}}</td>
|
||||
<td>{{p.EnrollmentFee}}</td>
|
||||
<td>{{p.ProspectusFee}}</td>
|
||||
<td>{{p.ReRegFee}}</td>
|
||||
<td>{{p.CreditTransferFee}}</td>
|
||||
<td>{{p.LateralEntryFee}}</td>
|
||||
<td>{{p.DualSpclFee}}</td>
|
||||
<td>{{p.OtherFee}}</td>
|
||||
<td>{{p.NRIFEE}}</td>
|
||||
<td>{{p.ProvisionalFee}}</td>
|
||||
<td>{{p.MigrationFee}}</td>
|
||||
<td>{{p.UrgentResultDMCFee}}</td>
|
||||
<td>{{p.AdditionalFee}}</td>
|
||||
<td>{{p.Amount}}</td>
|
||||
<!-- <td>
|
||||
<i class="ti-write" tooltip="View Fee Details" id="personalDetailButton" ng-click="setEditId(p.FormID);getFeeCompareDetails(p.FormID, p.EnrolmentNo)"></i>
|
||||
</td>-->
|
||||
</tr>
|
||||
<!--<tr ng-show="editId === p.FormID" ng-if="editId === p.FormID">
|
||||
<td colspan="9">
|
||||
<div ng-if="popupLoad">
|
||||
<div align="center" >
|
||||
<h3 style="color: blue;">Loading...</h3></div>
|
||||
<h2> {{statusMessage}} </h2>
|
||||
</div>
|
||||
<div class="container" ng-if="formPaymentDetails!=''">
|
||||
<div class="container" align="center">
|
||||
<table class="table table-border">
|
||||
<thead>
|
||||
<th>University Fee Paid Details</th>
|
||||
<th>Student Fee Paid Details</th>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>{{formPaymentDetails.UniversityPaidAmount}}</td>
|
||||
<td>{{formPaymentDetails.StudentPaidAmount}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<button class="btn btn-warning pull-right" ng-click="setEditId(-1);">Cancel</button>
|
||||
</div>
|
||||
<tr ng-show="statusUpdateEditId === p.ID" ng-if="statusUpdateEditId === p.ID">
|
||||
<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="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">
|
||||
<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>
|
||||
Comments
|
||||
</label>
|
||||
<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="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 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>-->
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||
@ -176,19 +302,25 @@
|
||||
</div>
|
||||
</tab>
|
||||
<tab tabindex="2" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Upload Details" id="uploadFiles">
|
||||
<tabset id="uploadDetails" class="tabbable">
|
||||
|
||||
<div class="container">
|
||||
<div class="col-md-4 form-group">
|
||||
<label>
|
||||
University <span class="symbol required"></span>
|
||||
</label>
|
||||
<select class="form-control" tabindex="1" name="formUniversity" ng-model="formUploadUnivSelectID.univCode" required>
|
||||
<option value="" selected>Select University</option>
|
||||
<option ng-repeat="univ in universityData" value="{{univ.UniversityID}}">{{univ.UniversityName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<!--{{formUploadUnivSelectID}}-->
|
||||
</div>
|
||||
|
||||
<tabset ng-if="formUploadUnivSelectID.univCode" id="uploadDetails" class="tabbable">
|
||||
<tab tabindex="1" active="subTabactive1" ng-click="subTabActive('subTabactive1')" heading="Upload File" id="uploadFiles">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<!--<div class="col-md-4 form-group">
|
||||
<label>
|
||||
University <span class="symbol required"></span>
|
||||
</label>
|
||||
<select class="form-control" tabindex="1" name="formUniversity" ng-model="uploadModel.university" required>
|
||||
<option value="" selected>Select University</option>
|
||||
<option ng-repeat="univ in universitySearchData" value="{{univ}}">{{univ.UniversityName}}</option>
|
||||
</select>
|
||||
</div>-->
|
||||
|
||||
<div class="col-md-6 form-group" ng-if="showFile=='1'">
|
||||
<fieldset>
|
||||
<js-xls onread="readXlsxFormDetails" onerror="error"></js-xls>
|
||||
@ -316,8 +448,8 @@
|
||||
<tbody dir-paginate="p in draftListDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
|
||||
<tr>
|
||||
<td>
|
||||
<i class="ti-user" tooltip="Add To List" ng-click="addToList(p.ID);"></i>
|
||||
<i class="ti-user" tooltip="Add To List" ng-click="editList(p.ID, p);"></i>
|
||||
<i class="ti-receipt" tooltip="Add To List" ng-click="addToList(p.ID);"></i>
|
||||
<i class="ti-pencil" tooltip="Edit Record" ng-click="editList(p.ID, p);"></i>
|
||||
</td>
|
||||
<td>{{p.FormID}}</td>
|
||||
<td>{{p.FormType}}</td>
|
||||
@ -516,7 +648,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>
|
||||
@ -548,21 +680,22 @@
|
||||
</tab>
|
||||
<tab tabindex="3" active="tabactive3" ng-click="tabActive('tabactive3')" heading="Unmatched Records" id="unmatchedRecord">
|
||||
|
||||
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group">
|
||||
<label>
|
||||
Upload For <span class="symbol required"></span>
|
||||
</label>
|
||||
<select class="form-control" name="uploadFor" tabindex="2" id="uploadFor" ng-model="getUnmatchedDetailsFor" ng-options="upload.id as upload.name for upload in uploadOptions"
|
||||
required>
|
||||
<option value=""> Select</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4 form-group">
|
||||
<label>
|
||||
University <span class="symbol required"></span>
|
||||
</label>
|
||||
<select class="form-control" tabindex="1" name="formUniversity" ng-model="formIdMissMatchUnivSelectID.univCode" required>
|
||||
<option value="" selected>Select University</option>
|
||||
<option ng-repeat="univ in universityData" value="{{univ.UniversityID}}">{{univ.UniversityName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<!--{{formIdMissMatchUnivSelectID}}-->
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<button class="btn btn-success" ng-disabled="!getUnmatchedDetailsFor" ng-click="getUnmatchedRecord(getUnmatchedDetailsFor)">Get Record</button>
|
||||
<button class="btn btn-success" ng-disabled="!formIdMissMatchUnivSelectID.univCode" ng-click="getUnmatchedRecord(getUnmatchedDetailsFor)">Get Record</button>
|
||||
</div>
|
||||
<div class="container">
|
||||
<div ng-if="unMatchedLoadingStatus">
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<h1 class="mainTitle" translate="Manage Student Details">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription">Add/Edit student details. </span>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: STUDENT TITLE -->
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<h1 class="mainTitle" translate="Manage Student Details">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription">Add/Edit Student Details. </span>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: STUDENT TITLE -->
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<span class="mainDescription">Manage statuses for each activity. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<div class="container-fluid container-fullw bg-white">
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span>
|
||||
-->
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<span class="mainDescription">View/Add University Details. </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: UNIVERSITY TITLE -->
|
||||
|
||||
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