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

Merge remote-tracking branch 'origin/master'

Browse Source 
# 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 2018-09-08 19:58:15 +05:30
commit a562819967
70 changed files with 4217 additions and 3628 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Apollo/api/application/config/database.php
View File

@ -79,6 +79,7 @@ $db['default'] = array(
'username' => 'apollod4_DEV', 'username' => 'apollod4_DEV',
'password' => 'apollo1234', 'password' => 'apollo1234',
'database' => 'apollod4_ApolloDECDev', 'database' => 'apollod4_ApolloDECDev',
'dbdriver' => 'mysqli', 'dbdriver' => 'mysqli',
'dbprefix' => '', 'dbprefix' => '',
'pconnect' => FALSE, 'pconnect' => FALSE,

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

@ -371,6 +371,10 @@ $route['getForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/get
$route['addForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addForFormIdDraftDetails'; $route['addForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addForFormIdDraftDetails';
$route['draftMovetoList'] = 'Receive_Enrolment_Fees_Univ_Controller/draftMovetoList'; $route['draftMovetoList'] = 'Receive_Enrolment_Fees_Univ_Controller/draftMovetoList';
$route['editDraftFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/editDraftFormIdFeesDetails'; $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['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';

7
Apollo/api/application/controllers/HallTickets_Controller.php Executable file → Normal file
View File

@ -67,11 +67,16 @@ class HallTickets_Controller extends REST_Controller {
public function getSheduleDetails_post() public function getSheduleDetails_post()
{ {
$courseDetails =$this->post('courseDetails');
//print_r($courseDetails);
$CourseID = $courseDetails['CourseID'];
$universityID= $courseDetails['UniversityID'];
//print_r($courseDetails);
$mapid = $this->post('mapid'); $mapid = $this->post('mapid');
$subid = $this->post('subid'); $subid = $this->post('subid');
$branchcode = $this->post('branchcode'); $branchcode = $this->post('branchcode');
//$getSheduleData = $this->Hallticket_model->getShedules($mapid); //$getSheduleData = $this->Hallticket_model->getShedules($mapid);
$get_unShedules = $this->Hallticket_model->get_unShedules($mapid,$subid,$branchcode); $get_unShedules = $this->Hallticket_model->get_unShedules($mapid,$subid,$branchcode,$CourseID,$universityID);
//print_r($get_unShedules); //print_r($get_unShedules);
if ($get_unShedules) if ($get_unShedules)
{ {

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

@ -37,7 +37,6 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
$this->methods['getExistStudentEnrolmentDetails_post']['limit'] = 1000; $this->methods['getExistStudentEnrolmentDetails_post']['limit'] = 1000;
$this->methods['addManualEnrolmentDetails_post']['limit'] = 1000; $this->methods['addManualEnrolmentDetails_post']['limit'] = 1000;
$this->methods['paymentVerficationDetails_post']['limit'] = 1000;
// load the model // load the model
$this->load->model('Receive_Enrolment_Fees_Univ_model', 'receive_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(){ public function insertFormIdUnivFeeDetails_post(){
$formIdDetails = $this->post('details'); $formIdDetails = $this->post('details');
$localDetails = $this->post('localDetails'); $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) if ($updatedDetails)
{ {
$updatedDetails['status'] = REST_Controller::HTTP_OK; $updatedDetails['status'] = REST_Controller::HTTP_OK;
@ -290,7 +290,9 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
public function addForFormIdDraftDetails_post(){ public function addForFormIdDraftDetails_post(){
$reqBranch = $this->post('localDetails'); $reqBranch = $this->post('localDetails');
$details = $this->post('details'); $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) { if ($addForFormIdDraftDetails) {
$addForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK; $addForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit
@ -333,62 +335,113 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
} else { } else {
// Set the response and exit // 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 formid fee details list with status
* get payment verfication details public function getStudentUnivFormIdFeeDatailsList_post(){
* created by kms $reqBranchData = $this->post('data');
* */ $searchDetails = $this->post('search');
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
} $getStudentUnivFormIdFeeDatailsList = $this->receive_model->getStudentUnivFormIdFeeDatailsList($reqBranchData, $searchDetails); // Check if the employee exist
else if($getVerificationDetails['status']==false){ if ($getStudentUnivFormIdFeeDatailsList) {
$this->response($getVerificationDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code $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 {
else{ // Set the response and exit
$this->response(['details' => '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
} }
} }
/*
* add university payment details public function getFormIdDetailsStatusUpdateList_post(){
* created by kms $reqBranchData = $this->post('localDetails');
* */ $statusDetailsId = $this->post('detailsID');
public function addUniversityPaymentDetails_post(){
$now = new DateTime(); $getFormIdDetailsStatusUpdateList = $this->receive_model->getFormIdDetailsStatusUpdateList($reqBranchData, $statusDetailsId); // Check if the employee exist
$now->setTimezone(new DateTimezone('Asia/Kolkata')); if ($getFormIdDetailsStatusUpdateList) {
$details=$this->post('details'); $getFormIdDetailsStatusUpdateList['status'] = REST_Controller::HTTP_OK;
$localData=$this->post('localDetails'); // Set the response and exit
$fromDetails['BillNo']=$details['billNo']; $this->response($getFormIdDetailsStatusUpdateList, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
$fromDetails['ReceiptNo']=$details['receiptNo'];
$fromDetails['Amount']=$details['billAmount']; } else {
$fromDetails['ApprovedDate']=$details['date']; // Set the response and exit
$fromDetails['UniversityCode']=$details['universityCode']; $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
$fromDetails['UniversityName']=$details['universityName'];
$fromDetails['Remarks']=$details['comments'];
$fromDetails['BranchCode']=$localData['localBranchID'];
$fromDetails['CreatedBy']=$localData['localUserID'];
$fromDetails['CreatedOn']=$now->format('Y-m-d H:i:s');
$addPaymentDetails=$this->receive_model->addPaymentDetails($fromDetails);
if($addPaymentDetails['status']==true){
$this->response($addPaymentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
} }
else if($addPaymentDetails['status']==false){ }
$this->response($addPaymentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
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
} }
} }

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

@ -136,7 +136,12 @@ group by Student_id,cid";
$coursearr['IsActive'] = $search['IsActive']; $coursearr['IsActive'] = $search['IsActive'];
$coursearr['DeactiveComments'] =$search['Reason']; $coursearr['DeactiveComments'] =$search['Reason'];
if( $search['IsActive'] ==0)
{
$coursearr['Deactive'] = '0'; $coursearr['Deactive'] = '0';
}
$this->db->where('StudentID', $search['studentId']); $this->db->where('StudentID', $search['studentId']);
$this->db->where('UniversityID', $search['University']); $this->db->where('UniversityID', $search['University']);
$this->db->where('CourseID', $search['courseId']); $this->db->where('CourseID', $search['courseId']);

35
Apollo/api/application/models/DayBook_model.php
View File

@ -74,7 +74,7 @@ class DayBook_model extends CI_Model
LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID 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 ".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 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"; AND '$toDate' AND t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC";
// echo $querys;exit(); // echo $querys;exit();
// $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $fromDate); // $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']!='') //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->from('T_Students_Fees_PaidDetails');
$this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_Students_Fees_PaidDetails.StudentID','left'); $this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_Students_Fees_PaidDetails.StudentID','left');
@ -818,26 +818,29 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can
//die(); //die();
//$daybookarr['ID'] = $up_details['ID']; //$daybookarr['ID'] = $up_details['ID'];
// $daybookarr['IsActive'] = $up_details['IsActive']; $daybookarr['IsActive'] = $up_details['IsActive'];
// $daybookarr['Reason'] = $up_details['Reason']; $daybookarr['Reason'] = $up_details['Reason'];
// $daybookarr['UpdatedOn'] = $dateTime; $daybookarr['UpdatedOn'] = $dateTime;
// $daybookarr['UpdatedBy'] =$up_details['requestedtBy']; $daybookarr['UpdatedBy'] =$up_details['requestedtBy'];
// if($up_details['IsActive'] == 0) if($up_details['IsActive'] == 0)
// { {
// $daybookarr['Status'] = 'Cancel'; $daybookarr['Status'] = 'Cancel';
// } }
// else else
// { {
// $daybookarr['Status'] = 'Approved'; $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']; //$feearr['ID'] = $up_details['FeesPaymentID'];

36
Apollo/api/application/models/Hallticket_model.php Executable file → Normal file
View File

@ -103,19 +103,33 @@ class Hallticket_model extends CI_Model
* for edit/view shedule * for edit/view shedule
* created by TamilBala * created by TamilBala
* */ * */
public function get_unShedules($mapid,$subid,$branchcode) ////////////
{ // $this->db->join('T_Batch_Schedule_Child','T_Batch_Schedule_Child.SchId = SCM.SchId');
// $this->db->join('T_SemSubMap_Master','T_SemSubMap_Master.UniversityID=SCM.UniversityID and T_SemSubMap_Master.CourseID=SCM.CourseID');
// $this->db->join('T_SemSubMap_Child','T_SemSubMap_Child.MapID=T_SemSubMap_Master.MapID');
// $this->db->join('T_SubjectMaster','T_SubjectMaster.SubjectID=T_SemSubMap_Child.SubjectID');
$this->db->select('SM.SubjectName,SM.SubjectID'); // $this->db->where('T_SemSubMap_Master.UniversityID',$universityID);
$this->db->from('T_SubjectMaster SM'); // $this->db->where('T_SemSubMap_Master.CourseID',$CourseID);
$this->db->join('T_Batch_Schedule_Child','T_Batch_Schedule_Child.SubjectID=SM.SubjectID'); ////////////
$this->db->where('SM.BranchCode',$branchcode); public function get_unShedules($mapid,$subid,$branchcode,$CourseID,$universityID)
$this->db->where('T_Batch_Schedule_Child.SchId',$mapid); {
$result = $this->db->get(); //echo $mapid;
if($result->result()){ $sql="SELECT semchild.SubjectID,semchild.MapID,bsc.ScheduleDate,bsc.FromTime,bsc.ToTime,sm.SubjectName
FROM T_SemSubMap_Child semchild
LEFT JOIN T_SemSubMap_Master semmaster ON semmaster.MapID = semchild.MapID
LEFT JOIN T_Batch_Schedule_Master bsm ON bsm.UniversityID = semmaster.UniversityID
and bsm.CourseID=semmaster.CourseID
LEFT JOIN T_Batch_Schedule_Child bsc ON bsc.SchId = bsm.SchId and bsc.SubjectID=semchild.SubjectID
LEFT JOIN T_SubjectMaster sm ON sm.SubjectID=semchild.SubjectID
WHERE semchild.isActive = '1' and bsm.SchId='".$mapid."'
group by semchild.SubjectID,semchild.MapID";
$b=$this->db->query($sql);
//print_r($b);
if($b->result()){
$resultShedule['status']=true; $resultShedule['status']=true;
$mastScheduleID=""; $mastScheduleID="";
foreach($result->result() as $row) foreach($b->result() as $row)
{ {
$this->db->select('T_Batch_Schedule_Child.SchId,T_Batch_Schedule_Child.SubjectID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime,T_Batch_Schedule_Child.SchChildId,T_Batch_Schedule_Child.SchId'); $this->db->select('T_Batch_Schedule_Child.SchId,T_Batch_Schedule_Child.SubjectID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime,T_Batch_Schedule_Child.SchChildId,T_Batch_Schedule_Child.SchId');
@ -125,7 +139,7 @@ class Hallticket_model extends CI_Model
// $this->db->where('T_Batch_Schedule_Child.SchId',$mapid); // $this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
$this->db->where('T_Batch_Schedule_Child.SubjectID',$row->SubjectID); $this->db->where('T_Batch_Schedule_Child.SubjectID',$row->SubjectID);
$existsheduledetails = $this->db->get(); $existsheduledetails = $this->db->get();
//print_r($existsheduledetails);
if($existData=$existsheduledetails->result()) if($existData=$existsheduledetails->result())
{ {

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

@ -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']; $localBranchID = $local['localBranchID'];
$localUserID = $local['localUserID']; $localUserID = $local['localUserID'];
$univId = $univ['univCode'];
$time = date('Y-m-d H:i:s'); $time = date('Y-m-d H:i:s');
$CreatedOn = $time; $CreatedOn = $time;
@ -443,9 +444,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
if(count($queryDetails->result()) == 0){ if(count($queryDetails->result()) == 0){
$query = "INSERT INTO T_FormId_FeeDetails_Received_From_University $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 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); $queryDetails = $this->db->query($query);
} else { } else {
echo 'else con'; echo 'else con';
@ -905,10 +906,11 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
return $result; return $result;
} }
public function addForFormIdDraftDetails($details, $local){ public function addForFormIdDraftDetails($details, $local, $univ =null){
$localBranchID = $local['localBranchID']; $localBranchID = $local['localBranchID'];
$localUserID = $local['localUserID']; $localUserID = $local['localUserID'];
$univId = $univ['univCode'];
$time = date('Y-m-d H:i:s'); $time = date('Y-m-d H:i:s');
$CreatedOn = $time; $CreatedOn = $time;
@ -967,9 +969,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
if(count($queryDetails->result()) == 0){ if(count($queryDetails->result()) == 0){
$query = "INSERT INTO T_FormId_FeeDetails_Received_From_University $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 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); $queryDetails = $this->db->query($query);
if($queryDetails){ if($queryDetails){
@ -1083,124 +1085,247 @@ $result['updatedraftStatus'] = false;
return $result; return $result;
} }
/* public function getStudentUnivFormIdFeeDatailsList($reqBranchData, $searchDetails){
* get payment verification details
* created by kms $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,
public function getPaymentVerificationDetails($search){ CM.CourseCode as app_CourseCode, IF(CM.CourseCode = FUD.CourseCode, "YES", "NO" ) as CourseCodeStatus');
$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('T_FormId_FeeDetails_Received_From_University as FUD');
$this->db->from(UNIVERSITYCREDITDEBIY.' as UNCD'); $this->db->join(ENROLMENTRECEIVEDFROMUNIV.' as ENU', 'FUD.FormID = ENU.FormID' );
$this->db->join(FORMFEESRECEIVEDFROMUNIV.' as UNFR', 'UNFR.ID = UNCD.FormMapID','left'); $this->db->join(STUDENTCOURSE.' as STC', 'STC.EnrollmentID = ENU.EnrolmentNo');
$this->db->join(UNIVERSITYPAYMENT.' as UNP', 'UNP.PID = UNCD.PaymentMapID','left'); $this->db->join(COURSE.' as CM', 'CM.CourseID = STC.CourseID');
$this->db->join(ENROLMENTRECEIVEDFROMUNIV.' as ENU', 'ENU.FormID = UNFR.FormID','left'); $this->db->join(STUDENTS.' as ST', 'ST.StudentID = STC.StudentID');
$this->db->order_by('UNCD.ApprovedDate','DESC'); // $this->db->join(UNIVERSITY.' as UN', 'UN.UniversityID = STC.UniversityID');
$this->db->where('UNCD.UniversityCode',$search['UniversityCode']); if($searchDetails['University']!=''){
$this->db->order_by('UNCD.UniversityName',$search['UniversityName']); $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(); $details = $this->db->get();
$resultArray=array(); $detailsList = $details->result();
if($details->result()){ if($detailsList){
$resultArray['status']=true; // foreach ($detailsList as $fetchStudentRow){
$resultArray['details']=$details->result(); // // 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'];
else{ // $formResult['FormID']=$fetchStudentRow->FormID;
$resultArray['status']=false; // $formResult['FormType']=$fetchStudentRow->FormType;
$resultArray['details']="No list were found"; // $formResult['SemesterYear']=$fetchStudentRow->SemesterYear;
} // $formResult['EnrolmentNo']=$fetchStudentRow->EnrolmentNo;
return $resultArray; // $formResult['CourseCode']=$fetchStudentRow->CourseCode;
// $formResult['CourseName']=$fetchStudentRow->CourseName;
} // $formResult['RollNo']=$fetchStudentRow->RollNo;
/* // $formResult['StudentID']=$fetchStudentRow->StudentID;
* add payment details // $formResult['MobileNumber']=$fetchStudentRow->MobileNumber;
* created by kms // $formResult['Firstname']=$fetchStudentRow->Firstname;
* */ // $formResult['Lastname']=$fetchStudentRow->Lastname;
public function addPaymentDetails($fromDetails=null){ // $formResult['Fathername']=$fetchStudentRow->Fathername;
$resultArray=array(); // $formResult['MotherName']=$fetchStudentRow->MotherName;
$this->db->select('UNP.BillNo'); // $formResult['EmailID']=$fetchStudentRow->EmailID;
$this->db->from(UNIVERSITYPAYMENT.' as UNP'); // $formResult['AlternateNumber']=$fetchStudentRow->AlternateNumber;
$this->db->where('UNP.BillNo', $fromDetails['BillNo']); // $formResult['Gender']=$fetchStudentRow->Gender;
$billExist = $this->db->get(); // $formResult['DOB']=$fetchStudentRow->DOB;
if($billExist->num_rows()<=0){ // $formResult['PresentAddress']=$fetchStudentRow->PresentAddress;
// $formResult['PermanentAddress']=$fetchStudentRow->PermanentAddress;
if($fromDetails['ReceiptNo']!='' AND $fromDetails['ReceiptNo']!=null){ // $formResult['AadharNumber']=$fetchStudentRow->AadharNumber;
$this->db->select('UNP1.ReceiptNo'); // $formResult['OtherID']=$fetchStudentRow->OtherID;
$this->db->from(UNIVERSITYPAYMENT.' as UNP1'); // $formResult['OtherIDDetails']=$fetchStudentRow->OtherIDDetails;
$this->db->where('UNP1.ReceiptNo', $fromDetails['ReceiptNo']); // $formResult['Qualification']=$fetchStudentRow->Qualification;
$receiptExist = $this->db->get(); // $formResult['UniversityID']=$fetchStudentRow->UniversityID;
if($receiptExist->num_rows()<=0){ // $formResult['UniversityName']=$fetchStudentRow->UniversityName;
$this->db->insert(UNIVERSITYPAYMENT, $fromDetails); // $mergeFormDetails[]=$formResult;
if ($this->db->affected_rows() > 0) { // }
$updateDebitTable['PaymentMapID']=$this->db->insert_id(); // }
$updateDebitTable['DebitAmount']=$fromDetails['Amount']; $resultArr['studentFeeCompareDetails'] = $detailsList;
$updateDebitTable['ApprovedDate']=$fromDetails['ApprovedDate']; $resultArr['formTypeStatus'] = true;
$updateDebitTable['TypeID']=0; $resultArr['message'] = "Successfully data generated";
$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 { } else {
$resultArray['status']=false; $resultArr['studentFeeCompareDetails'] = [];
$resultArray['message']="Payment failed.Try again"; $resultArr['formTypeStatus'] = false;
$resultArr['message'] = "No record found";
} }
} return $resultArr;
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";
} }
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 { } else {
$resultArray['status']=false; $result['formIdstatusListStatus'] = false;
$resultArray['message']="Payment failed.Try again"; $result['formIdstatusListDetails'] = '';
$result['formIdstatusListMessagae'] = "No Record Found.";
}
return $result;
} }
} public function insertStatusUpdateDetails($reqBranchData, $statusDetails, $id, $formId ){
}
else {
$resultArray['status']=false;
$resultArray['message']="Bill no is already exist..";
}
return $resultArray;
$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 {
$result['accountStateMoveStatus'] = false;
$result['accountStateMoveMessagae'] = "Something went wrong.";
}
} else {
$result['accountStateMoveStatus'] = false;
$result['accountStateMoveMessagae'] = "Something went wrong.";
}
} else {
$result['accountStateMoveStatus'] = false;
$result['accountStateMoveMessagae'] = "Something went wrong.";
}
}
return $result;
}
// public function getUnmatchedFormDetails($reqType){
// // $this->db->select('t1.*');
// // $this->db->from('T_Enrolment_Received_From_University as t1');
// // $this->db->join('T_Student_CourseDetails as t2', 't2.EnrollmentID = t1.EnrolmentNo');
// if($reqType == 'EnrolmentIDFile'){
// $query = "select *
// from T_Enrolment_Received_From_University as t1
// where t1.EnrolmentNo NOT IN (select EnrollmentID from T_Student_CourseDetails)";
// $details = $this->db->query($query);
// $detailsList = $details->result();
// if($detailsList){
// $resultArr['unMatchedRecordDetails'] = $detailsList;
// $resultArr['unMatchedRecordStatus'] = true;
// $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile';
// $resultArr['message'] = "Successfully data generated";
// } else {
// $resultArr['unMatchedRecordDetails'] = [];
// $resultArr['unMatchedRecordStatus'] = false;
// $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile';
// $resultArr['message'] = "No record found";
// }
// }else if($reqType == 'FormIDFile'){
// $query = "select *
// from T_FormId_FeeDetails_Received_From_University as t1
// where t1.FormID NOT IN (select FormID from T_Enrolment_Received_From_University)";
// $details = $this->db->query($query);
// $detailsList = $details->result();
// if($detailsList){
// $resultArr['unMatchedRecordDetails'] = $detailsList;
// $resultArr['unMatchedRecordStatus'] = true;
// $resultArr['unMatchedRecordFor'] = 'FormIDFile';
// $resultArr['message'] = "Successfully data generated";
// } else {
// $resultArr['unMatchedRecordDetails'] = [];
// $resultArr['unMatchedRecordStatus'] = false;
// $resultArr['unMatchedRecordFor'] = 'FormIDFile';
// $resultArr['message'] = "No record found";
// }
// }
// return $resultArr;
// }
} }

9
Apollo/api/application/models/Student_model.php
View File

@ -413,7 +413,12 @@ class Student_model extends CI_Model {
$this->db->where('IsActive', 1); $this->db->where('IsActive', 1);
$this->db->where('BranchCode', $branch); $this->db->where('BranchCode', $branch);
$courseDetails = $this->db->get(); $courseDetails = $this->db->get();
// print_r($courseDetails->result());
// die();
if ($courseDetails->result()) { if ($courseDetails->result()) {
$this->db->select('B.SessionID, B.SessionName'); $this->db->select('B.SessionID, B.SessionName');
$this->db->from(SESSIONMASTER . ' as B'); $this->db->from(SESSIONMASTER . ' as B');
$this->db->join(SESSIONDETAILS . ' SD', 'SD.SessionID = B.SessionID'); $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('B.IsActive', 1);
$this->db->where('SD.IsActive', 1); $this->db->where('SD.IsActive', 1);
$batchDetails = $this->db->get(); $batchDetails = $this->db->get();
//print_r($batchDetails->result());
//die();
if ($batchDetails->result()) { if ($batchDetails->result()) {
$result['courseStatus'] = true; $result['courseStatus'] = true;
$result['course_details'] = $courseDetails->result(); $result['course_details'] = $courseDetails->result();

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

@ -158,7 +158,8 @@
"entry": { "entry": {
"MAIN": "My Details", "MAIN": "My Details",
"coursecorrection": "Course Details", "coursecorrection": "Course Details",
"stud_merge": "Student Merge" "stud_merge": "Student Merge",
"DATACORRECTION" : "Bills Correction"
}, },
"announcement": { "announcement": {
"MAIN": "ANNOUNCEMENT", "MAIN": "ANNOUNCEMENT",

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

@ -178,7 +178,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'income_expense' label: 'income_expense'
}, },
}).state('app.daybooksuperadmin.datacorrection', { }).state('app.entry.datacorrection', {
url: '/datacorrection', url: '/datacorrection',
templateUrl: "assets/views/data_correction.html", templateUrl: "assets/views/data_correction.html",
resolve: loadSequence('datacorrectionCtrl','ngTable', 'ladda', 'angular-ladda'), resolve: loadSequence('datacorrectionCtrl','ngTable', 'ladda', 'angular-ladda'),

43
Apollo/assets/js/controllers/entrycorrectionCtrl.js
View File

@ -76,6 +76,8 @@ $scope.universitySearchData = '';
$scope.studentInfo=""; $scope.studentInfo="";
$scope.mobileNo='';
$scope.student_Name='';
$scope.getStudentDetails = function (form,myModel) $scope.getStudentDetails = function (form,myModel)
{ {
@ -85,6 +87,8 @@ $scope.universitySearchData = '';
var studentName = myModel.studentName; var studentName = myModel.studentName;
var receipt = myModel.receipt; var receipt = myModel.receipt;
$scope.universityId = myModel.myUnivSearch; $scope.universityId = myModel.myUnivSearch;
$scope.mobileNo=myModel.mobileNumber;
$scope.student_Name=myModel.studentName;
// console.log($scope.universityId); // console.log($scope.universityId);
// return false; // return false;
@ -249,7 +253,44 @@ $scope.universitySearchData = '';
$http(updatecourse).then(function (response) { $http(updatecourse).then(function (response) {
swal('Change Saved Successfully', response.data.message, "success"); swal('Change Saved Successfully', response.data.message, "success");
$scope.close(); $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";
}
});
}); });

4
Apollo/assets/js/controllers/schCtrl.js Executable file → Normal file
View File

@ -51,6 +51,8 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
$scope.editId = pid; $scope.editId = pid;
$scope.courseCode = cid; $scope.courseCode = cid;
$scope.mappingid = schid; $scope.mappingid = schid;
//$scope.sample=subid;
$scope.sample1=c;
//alert(mappingid+'n'); //alert(mappingid+'n');
var getsheduledetails = { var getsheduledetails = {
method: 'POST', method: 'POST',
@ -63,7 +65,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
mapid:$scope.mappingid, mapid:$scope.mappingid,
subid:subid, subid:subid,
branchcode:branchid, branchcode:branchid,
courseDetails:$scope.sample1
} }
}; };

172
Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js
View File

@ -2,6 +2,7 @@
/** /**
* controllers for ng-table * controllers for ng-table
* Simple table with sorting and filtering on AngularJS * 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) { 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') { if (localDetails.localType === 'R004') {
// $scope.getUniversityList(); // $scope.getUniversityList();
$scope.getUniversitySearchList(); $scope.getUniversitySearchList();
$scope.getUniveesityListFromApp();
} else { } else {
ipCookie.remove('cookiechk'); ipCookie.remove('cookiechk');
$window.localStorage.clear(); $window.localStorage.clear();
@ -46,11 +48,11 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
} }
/*$scope.universityData = ''; $scope.universityData = '';
$scope.getUniversityList = function () { $scope.getUniveesityListFromApp = function () {
var empListreq = { var empListreq = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'getStudentUniversity/', url: apiPoint.url + 'getUniversityCodeForFormDetailsGet/',
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
@ -64,7 +66,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
} else { } else {
} }
}); });
}*/ }
// get University List // get University List
$scope.universitySearchData = ''; $scope.universitySearchData = '';
$scope.getUniversitySearchList = function () { $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 = { $scope.searchData = {
"University": "", "University": "",
"Course": "", "Course": "",
"Status": "" "Sem": ""
} }
$scope.myUnivSearch = ""; $scope.myUnivSearch = "";
$scope.courseData = ""; $scope.courseData = "";
@ -134,7 +137,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
$scope.Searchloader = true; $scope.Searchloader = true;
var empListreq = { var empListreq = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'getStudentUnivFeeCompareDetails/', url: apiPoint.url + 'getStudentUnivFormIdFeeDatailsList/',
headers: { headers: {
'Content-Type': 'application/json' '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.editId = -1;
$scope.setEditId = function (id) { $scope.setEditId = function (id) {
$scope.editId = id; $scope.editId = id;
@ -216,9 +230,12 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
} }
$scope.formUploadUnivSelectID = {
'univCode': ''
};
$scope.receiveFormIdFeeDetails = function (details) { $scope.receiveFormIdFeeDetails = function (details) {
console.log(details); console.log(details);
var updateUniversityEnrolment = { var updateUniversityEnrolment = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'insertFormIdUnivFeeDetails/', url: apiPoint.url + 'insertFormIdUnivFeeDetails/',
@ -227,7 +244,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
}, },
data: { data: {
localDetails: localDetail, 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; $scope.unMatchedLoadingStatus = false;
// Get unmached details // Get unmached details
$scope.getUnmatchedRecord = function (ss) { $scope.getUnmatchedRecord = function (ss) {
$scope.unMatchedRecordDetails = ''; $scope.unMatchedRecordDetails = '';
$scope.unMatchedNoRecordFound = false; $scope.unMatchedNoRecordFound = false;
$scope.unMatchedLoadingStatus = true; $scope.unMatchedLoadingStatus = true;
var getDetailsFor = ss == 1 ? 'EnrolmentIDFile' : 'FormIDFile';
var getFeeCompareDetailsList = { var getFeeCompareDetailsList = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'getUnmatchedRecordDetails/', url: apiPoint.url + 'getUnmatchedFormIdFeesDetails/',
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
data: { data: {
localDetails: localDetail, localDetails: localDetail,
getDetailsFor: getDetailsFor getDetailsFor: $scope.formIdMissMatchUnivSelectID
} }
}; };
$http(getFeeCompareDetailsList).then(function (response) { $http(getFeeCompareDetailsList).then(function (response) {
@ -391,7 +413,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
}, },
data: { data: {
localDetails: localDetail, localDetails: localDetail,
details : $scope.draftManualEntryDetails details : $scope.draftManualEntryDetails,
univ: $scope.formUploadUnivSelectID
} }
}; };
$http(addDraftDetailsList).then(function (response) { $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");
}
});
}
}]); }]);

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

@ -76,8 +76,8 @@ td,th {
<th>Student Name</th> <th>Student Name</th>
<th>Mobile Number</th> <th>Mobile Number</th>
<th>Course Name</th>
<th>University</th> <th>University</th>
<th>Course Name</th>
<th>Action</th> <th>Action</th>
@ -89,8 +89,8 @@ td,th {
<td>{{p.Student_name}}</td> <td>{{p.Student_name}}</td>
<td>{{p.Phone_number}}</td> <td>{{p.Phone_number}}</td>
<td>{{p.Course_name}}</td>
<td>{{p.University}}</td> <td>{{p.University}}</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> <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>

2
Apollo/assets/views/activity.html
View File

@ -16,7 +16,7 @@
<span class="mainDescription">Add / Edit Activity list used for call tracking. </span> <span class="mainDescription">Add / Edit Activity list used for call tracking. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<div class="container-fluid container-fullw bg-white"> <div class="container-fluid container-fullw bg-white">

2
Apollo/assets/views/add_income_expense.html
View File

@ -14,7 +14,7 @@
<span class="mainDescription">Add New Income Expense Types. </span> <span class="mainDescription">Add New Income Expense Types. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<div class="container-fluid container-fullw bg-white"> <div class="container-fluid container-fullw bg-white">

2
Apollo/assets/views/announcement/Announcement.html
View File

@ -15,7 +15,7 @@
<h1 class="mainTitle" translate="Announcement ">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Announcement ">{{ mainTitle }}</h1>
<span class="mainDescription">Add/View Announcement Details. </span> <span class="mainDescription">Add/View Announcement Details. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/batch.html
View File

@ -21,7 +21,7 @@
<span class="mainDescription">Add/View Batch Details. </span> <span class="mainDescription">Add/View Batch Details. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/branchDetails.html
View File

@ -25,7 +25,7 @@
<span class="mainDescription">Add/View Branch Details. </span> <span class="mainDescription">Add/View Branch Details. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/callTrackingCloseDetails.html
View File

@ -37,7 +37,7 @@
<span class="mainDescription">View all closed leads. </span> <span class="mainDescription">View all closed leads. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/callTrackingDetails.html
View File

@ -38,7 +38,7 @@
<span class="mainDescription">Manage new leads. </span> <span class="mainDescription">Manage new leads. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/callTrackingLeadDetails.html
View File

@ -38,7 +38,7 @@
<span class="mainDescription">Leads created on a given date. </span> <span class="mainDescription">Leads created on a given date. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

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

@ -38,7 +38,7 @@
<span class="mainDescription">View all open Leads.</span> <span class="mainDescription">View all open Leads.</span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/centerMaster.html
View File

@ -17,7 +17,7 @@
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span>
--> -->
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/certificate/certificate.html
View File

@ -14,7 +14,7 @@
<h1 class="mainTitle" translate="Certificate Type"></h1> <h1 class="mainTitle" translate="Certificate Type"></h1>
<span class="mainDescription">Add/Edit certificate type. </span> <span class="mainDescription">Add/Edit certificate type. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<div class="container-fluid container-fullw bg-white"> <div class="container-fluid container-fullw bg-white">

2
Apollo/assets/views/changePassword.html
View File

@ -5,7 +5,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle">Change Password</h1> <h1 class="mainTitle">Change Password</h1>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/charts.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="sidebar.nav.charts.MAIN">{{ mainTitle }}</h1> <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> <span class="mainDescription">Tc-angular-chartjs provides you with directives for all chartjs chart types.</span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/courseDetails.html
View File

@ -17,7 +17,7 @@
<span class="mainDescription">Add/View Course Details. </span> <span class="mainDescription">Add/View Course Details. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/daybook/dayBookApproval.html
View File

@ -4,7 +4,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/daybook/dayBookMaster.html
View File

@ -16,7 +16,7 @@
<span class="mainDescription">Add/Edit Income/Expense heads. </span> <span class="mainDescription">Add/Edit Income/Expense heads. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<div class="container-fluid container-fullw bg-white"> <div class="container-fluid container-fullw bg-white">

2
Apollo/assets/views/daybook/dayBookadminApproval.html
View File

@ -4,7 +4,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/daybook/daybook.html
View File

@ -4,7 +4,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/daybook/daybookadmin.html
View File

@ -4,7 +4,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/daybook/daybooksuperAdminApproval.html
View File

@ -4,7 +4,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/daybook/daybooksuperadmin.html
View File

@ -4,7 +4,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/documentation.html
View File

@ -4,7 +4,7 @@
<h1 class="mainTitle" translate="sidebar.heading.DOCUMENTATION">{{ mainTitle }}</h1> <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> <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>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<div class="container-fluid container-fullw bg-white"> <div class="container-fluid container-fullw bg-white">

2
Apollo/assets/views/employeeDetails.html
View File

@ -7,7 +7,7 @@
<span class="mainDescription">View/Add Employee Details. </span> <span class="mainDescription">View/Add Employee Details. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: EMPLOYEE TITLE --> <!-- end: EMPLOYEE TITLE -->

2
Apollo/assets/views/feesNotification.html
View File

@ -7,7 +7,7 @@
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span>
--> -->
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/generateHallTicket.html
View File

@ -30,7 +30,7 @@
<span class="mainDescription">Generate halltickets. </span> <span class="mainDescription">Generate halltickets. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/hallticket/batchshedule.html Executable file → Normal file
View File

@ -30,7 +30,7 @@
<span class="mainDescription">Allocate Batch schedule </span> <span class="mainDescription">Allocate Batch schedule </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

0
Apollo/assets/views/hallticket/editShedule.html Executable file → Normal file
View File

2
Apollo/assets/views/hallticket/examAttendance.html
View File

@ -30,7 +30,7 @@
<span class="mainDescription">Examination Attendance </span> <span class="mainDescription">Examination Attendance </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/hallticket/generatehallticket.html
View File

@ -30,7 +30,7 @@
<span class="mainDescription">Generate Halltickets For Student </span> <span class="mainDescription">Generate Halltickets For Student </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/hallticket/semcoursemap.html
View File

@ -30,7 +30,7 @@
<span class="mainDescription">Allocate Courses to Corresponding Subjects </span> <span class="mainDescription">Allocate Courses to Corresponding Subjects </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/maps.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="sidebar.nav.maps.MAIN">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.maps.MAIN">{{ mainTitle }}</h1>
<span class="mainDescription">The Simplest Way of Showing A Map</span> <span class="mainDescription">The Simplest Way of Showing A Map</span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/myProfile/myProfile.html
View File

@ -4,7 +4,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.profile.MAIN">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.profile.MAIN">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

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

@ -328,11 +328,11 @@
</li> </li>
<li ui-sref-active="active"> <!-- <li ui-sref-active="active">
<a ui-sref="app.daybooksuperadmin.datacorrection" ng-click="checkSuperAdmin()"> <a ui-sref="app.daybooksuperadmin.datacorrection" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.daybook.DATACORRECTION"> DATA CORRECTION</span> <span class="title" translate="sidebar.nav.daybook.DATACORRECTION"> DATA CORRECTION</span>
</a> </a>
</li> </li> -->
@ -561,6 +561,12 @@
</a> </a>
</li> </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> </ul>
</li> </li>
</ul> </ul>
@ -849,11 +855,11 @@
</li> </li>
<li ui-sref-active="active"> <!-- <li ui-sref-active="active">
<a ui-sref="app.daybooksuperadmin.datacorrection" ng-click="checkAdmin()"> <a ui-sref="app.daybooksuperadmin.datacorrection" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.daybook.DATACORRECTION"> DATA CORRECTION</span> <span class="title" translate="sidebar.nav.daybook.DATACORRECTION"> DATA CORRECTION</span>
</a> </a>
</li> </li> -->
@ -1038,7 +1044,7 @@
<li ui-sref-active="active"> <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> <span class="title" translate="sidebar.nav.report.feeCollect">Report For Fees Collection</span>
</a> </a>
</li> </li>
@ -1059,6 +1065,45 @@
</a> </a>
</li>--> </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> </ul>
<!-- end: Admin --> <!-- end: Admin -->
@ -1613,4 +1658,4 @@
<span translate="sidebar.heading.DOCUMENTATION">Documentation</span> <span translate="sidebar.heading.DOCUMENTATION">Documentation</span>
</a> </a>
</div>--> </div>-->
<!-- end: DOCUMENTATION BUTTON --> <!-- end: DOCUMENTATION BUTTON

2
Apollo/assets/views/reregistration/promotebatch.html
View File

@ -30,7 +30,7 @@
<span class="mainDescription">Promote Students From One Batch To Next Batch</span> <span class="mainDescription">Promote Students From One Batch To Next Batch</span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/reregistration/reregistrationform.html
View File

@ -30,7 +30,7 @@
<span class="mainDescription">Re Registration Per Semesters </span> <span class="mainDescription">Re Registration Per Semesters </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/sendSMS/sendSMSDetailssuperadmin.html
View File

@ -4,7 +4,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.sendSMSPage.MAIN">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.sendSMSPage.MAIN">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/sendSMS/sendSMSsuperadmin.html
View File

@ -4,7 +4,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.sendSMSPage.MAIN">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.sendSMSPage.MAIN">{{ mainTitle }}</h1>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/sessionMaster.html
View File

@ -17,7 +17,7 @@
<span class="mainDescription">Add/View Session Details. </span> <span class="mainDescription">Add/View Session Details. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/sessionSchedule.html
View File

@ -17,7 +17,7 @@
<span class="mainDescription">Add/View Session Schedule. </span> <span class="mainDescription">Add/View Session Schedule. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/status-update/answer_booklet_status.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="sidebar.nav.student.status.ANSWERBOOKLET">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.student.status.ANSWERBOOKLET">{{ mainTitle }}</h1>
<span class="mainDescription">Update answer booklet status.</span> <span class="mainDescription">Update answer booklet status.</span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/status-update/application_status.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="sidebar.nav.student.status.APPLICATION">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.student.status.APPLICATION">{{ mainTitle }}</h1>
<span class="mainDescription">Update application status.</span> <span class="mainDescription">Update application status.</span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/status-update/certificate_status.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="sidebar.nav.student.status.CERTIFICATE">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.student.status.CERTIFICATE">{{ mainTitle }}</h1>
<span class="mainDescription">Update certificate status.</span> <span class="mainDescription">Update certificate status.</span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/status-update/fees_status.html
View File

@ -30,7 +30,7 @@
<span class="mainDescription">Update fees status. </span> <span class="mainDescription">Update fees status. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/status-update/markcard_status.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="sidebar.nav.student.status.MARKCARD">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.student.status.MARKCARD">{{ mainTitle }}</h1>
<span class="mainDescription">Update markcard status.</span> <span class="mainDescription">Update markcard status.</span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/status-update/study_material_status.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="sidebar.nav.student.status.STUDYMATERIAL">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="sidebar.nav.student.status.STUDYMATERIAL">{{ mainTitle }}</h1>
<span class="mainDescription">Update study material status.</span> <span class="mainDescription">Update study material status.</span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/status.html
View File

@ -14,7 +14,7 @@
<span class="mainDescription">Manage various status for the entire application. </span> <span class="mainDescription">Manage various status for the entire application. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<div class="container-fluid container-fullw bg-white"> <div class="container-fluid container-fullw bg-white">

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

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="Enrolment Details">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Enrolment Details">{{ mainTitle }}</h1>
<span class="mainDescription">Student Form Enrolment Details. </span> <span class="mainDescription">Student Form Enrolment Details. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: STUDENT TITLE --> <!-- end: STUDENT TITLE -->

253
Apollo/assets/views/student/studentUnivFormIdFeeDetails.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="Student FormId Fees Details">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Student FormId Fees Details">{{ mainTitle }}</h1>
<span class="mainDescription">Student University FormId Fees Details. </span> <span class="mainDescription">Student University FormId Fees Details. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: STUDENT TITLE --> <!-- end: STUDENT TITLE -->
@ -65,13 +65,24 @@
<label for="form-field-select-2"> <label for="form-field-select-2">
Course Course
</label> </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 value="" selected>Select Course</option>
<option ng-repeat="itemCourse in courseData" value="{{itemCourse.CourseCode}}">{{itemCourse.CourseName}}</option> <option ng-repeat="itemCourse in courseData" value="{{itemCourse.CourseCode}}">{{itemCourse.CourseName}}</option>
</select> </select>
</div> </div>
<div class="col-md-2" style="padding-top: 2.3%;"> <div class="col-md-3 form-group">
<div class="pull-right"> <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" <button ng-disabled="searchData.Course == '' || searchData.University == ''" type="submit" class="btn btn-success btn-o"
tabindex="8"> tabindex="8">
@ -94,30 +105,66 @@
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th> Action
</th>
<th> FormID <th> FormID
</th> </th>
<th> Form Type <th> Form Type
</th> </th>
<th> Student Name <th> CentreCode
</th> </th>
<th> Father Name <th> Session
</th> </th>
<th> University <th> Year
</th> </th>
<th> Course <th> Semester
</th> </th>
<th> Sem/Year <th> Student_Name
</th> </th>
<th> Enrolment ID <th> Father_Name
</th> </th>
<th> University Paid <th> CourseCode
</th> </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> </th>
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results"> <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
<tr> <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> <td>
{{p.FormID}} {{p.FormID}}
</td> </td>
@ -125,48 +172,127 @@
{{p.FormType}} {{p.FormType}}
</td> </td>
<td> <td>
<a class="text-dark"> {{p.CentreCode}}
{{p.Firstname}} {{p.Lastname}}
</a>
<!--tooltip="View Student" ng-click="open(p);"-->
</td> </td>
<td>{{p.Fathername}}</td> <td>
<td>{{p.UniversityName}}</td> {{p.Session}}
<td>{{p.CourseName}}</td> </td>
<td>{{p.SemesterYear}}</td> <td>
<td>{{p.EnrolmentNo}}</td> {{p.Year}}
<td>{{p.UniversityPaidAmount}}</td> </td>
<td>{{p.StudentPaidAmount}}</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> <!-- <td>
<i class="ti-write" tooltip="View Fee Details" id="personalDetailButton" ng-click="setEditId(p.FormID);getFeeCompareDetails(p.FormID, p.EnrolmentNo)"></i> <i class="ti-write" tooltip="View Fee Details" id="personalDetailButton" ng-click="setEditId(p.FormID);getFeeCompareDetails(p.FormID, p.EnrolmentNo)"></i>
</td>--> </td>-->
</tr> </tr>
<!--<tr ng-show="editId === p.FormID" ng-if="editId === p.FormID"> <tr ng-show="statusUpdateEditId === p.ID" ng-if="statusUpdateEditId === p.ID">
<td colspan="9"> <td colspan="12">
<div ng-if="popupLoad"> <!--<h2> {{p.ID}} </h2>-->
<div align="center" > <div class="container" style="border: 1px solid gray; padding: 12px; margin: 4px;" ng-init="getFormIdDetailsStatusList(p.ID)">
<h3 style="color: blue;">Loading...</h3></div> <div ng-if="getFormIdDetailsStatusListLoading">
<h2> {{statusMessage}} </h2> <div style="align: center; color: blue" align="center">
<h3>Loading...</h3></div>
</div> </div>
<div class="container" ng-if="formPaymentDetails!=''">
<div class="container" align="center"> <div class="container" ng-if="!getFormIdDetailsStatusListLoading">
<table class="table table-border"> <div class="container" ng-init="addStatusDetails = false">
<thead> <div class="row">
<th>University Fee Paid Details</th> <div class="pull-right">
<th>Student Fee Paid Details</th> <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> </thead>
<tbody> <tbody ng-repeat="s in StatusListDetails">
<tr> <td>{{s.FormID}}</td>
<td>{{formPaymentDetails.UniversityPaidAmount}}</td> <td>{{s.Status}}</td>
<td>{{formPaymentDetails.StudentPaidAmount}}</td> <td><span style="white-space:pre-wrap;">{{s.Comments}}</span></td>
</tr> <td>{{s.CreatedOn}}</td>
</tbody> </tbody>
</table> </table>
</div> </div>
<button class="btn btn-warning pull-right" ng-click="setEditId(-1);">Cancel</button> <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> </div>
</td> </td>
</tr>--> </tr>
</tbody> </tbody>
</table> </table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true"> <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
@ -176,19 +302,25 @@
</div> </div>
</tab> </tab>
<tab tabindex="2" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Upload Details" id="uploadFiles"> <tab tabindex="2" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Upload Details" id="uploadFiles">
<tabset id="uploadDetails" class="tabbable">
<tab tabindex="1" active="subTabactive1" ng-click="subTabActive('subTabactive1')" heading="Upload File" id="uploadFiles"> <div class="container">
<div class="container-fluid"> <div class="col-md-4 form-group">
<div class="row">
<!--<div class="col-md-4 form-group">
<label> <label>
University <span class="symbol required"></span> University <span class="symbol required"></span>
</label> </label>
<select class="form-control" tabindex="1" name="formUniversity" ng-model="uploadModel.university" required> <select class="form-control" tabindex="1" name="formUniversity" ng-model="formUploadUnivSelectID.univCode" required>
<option value="" selected>Select University</option> <option value="" selected>Select University</option>
<option ng-repeat="univ in universitySearchData" value="{{univ}}">{{univ.UniversityName}}</option> <option ng-repeat="univ in universityData" value="{{univ.UniversityID}}">{{univ.UniversityName}}</option>
</select> </select>
</div>--> </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-6 form-group" ng-if="showFile=='1'"> <div class="col-md-6 form-group" ng-if="showFile=='1'">
<fieldset> <fieldset>
<js-xls onread="readXlsxFormDetails" onerror="error"></js-xls> <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"> <tbody dir-paginate="p in draftListDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
<tr> <tr>
<td> <td>
<i class="ti-user" tooltip="Add To List" ng-click="addToList(p.ID);"></i> <i class="ti-receipt" 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-pencil" tooltip="Edit Record" ng-click="editList(p.ID, p);"></i>
</td> </td>
<td>{{p.FormID}}</td> <td>{{p.FormID}}</td>
<td>{{p.FormType}}</td> <td>{{p.FormType}}</td>
@ -516,7 +648,7 @@
data-style="zoom-in" ng-click="updateFeeIDDetails(p.ID, leader)"> data-style="zoom-in" ng-click="updateFeeIDDetails(p.ID, leader)">
<i class='fa fa-spinner fa-spin' ng-if="editSaveButtonDisable"> </i> Save <i class='fa fa-spinner fa-spin' ng-if="editSaveButtonDisable"> </i> Save
</button> </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 Cancel
</button> </button>
</div> </div>
@ -548,21 +680,22 @@
</tab> </tab>
<tab tabindex="3" active="tabactive3" ng-click="tabActive('tabactive3')" heading="Unmatched Records" id="unmatchedRecord"> <tab tabindex="3" active="tabactive3" ng-click="tabActive('tabactive3')" heading="Unmatched Records" id="unmatchedRecord">
<div class="container"> <div class="container">
<div class="row">
<div class="col-md-4 form-group"> <div class="col-md-4 form-group">
<label> <label>
Upload For <span class="symbol required"></span> University <span class="symbol required"></span>
</label> </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" <select class="form-control" tabindex="1" name="formUniversity" ng-model="formIdMissMatchUnivSelectID.univCode" required>
required> <option value="" selected>Select University</option>
<option value=""> Select</option> <option ng-repeat="univ in universityData" value="{{univ.UniversityID}}">{{univ.UniversityName}}</option>
</select> </select>
</div> </div>
<!--{{formIdMissMatchUnivSelectID}}-->
</div> </div>
</div>
<div class="container"> <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>
<div class="container"> <div class="container">
<div ng-if="unMatchedLoadingStatus"> <div ng-if="unMatchedLoadingStatus">

2
Apollo/assets/views/student/student_details.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="Manage Student Details">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Manage Student Details">{{ mainTitle }}</h1>
<span class="mainDescription">Add/Edit student details. </span> <span class="mainDescription">Add/Edit student details. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: STUDENT TITLE --> <!-- end: STUDENT TITLE -->

2
Apollo/assets/views/student/student_details_SuperAdmin.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="Manage Student Details">{{ mainTitle }}</h1> <h1 class="mainTitle" translate="Manage Student Details">{{ mainTitle }}</h1>
<span class="mainDescription">Add/Edit Student Details. </span> <span class="mainDescription">Add/Edit Student Details. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: STUDENT TITLE --> <!-- end: STUDENT TITLE -->

2
Apollo/assets/views/studentStatusUpdate.html
View File

@ -16,7 +16,7 @@
<span class="mainDescription">Manage statuses for each activity. </span> <span class="mainDescription">Manage statuses for each activity. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<div class="container-fluid container-fullw bg-white"> <div class="container-fluid container-fullw bg-white">

2
Apollo/assets/views/subjectMaster.html
View File

@ -17,7 +17,7 @@
<span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span> <span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span>
--> -->
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->

2
Apollo/assets/views/university.html
View File

@ -7,7 +7,7 @@
<span class="mainDescription">View/Add University Details. </span> <span class="mainDescription">View/Add University Details. </span>
</div> </div>
<div ncy-breadcrumb></div> <!-- <div ncy-breadcrumb></div>-->
</div> </div>
</section> </section>
<!-- end: UNIVERSITY TITLE --> <!-- end: UNIVERSITY TITLE -->

BIN
Apollo/images/student/Dri_Be563jFw2aQu.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
Apollo/images/student/Dri_hRifsSNIu7HX.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB