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

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
gandhimathi 2018-09-06 09:36:21 +05:30
commit 23e2dd6f11
21 changed files with 1739 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/config/constants.php
View File

@ -137,7 +137,7 @@ defined('STUDENTS') OR define('STUDENTS','T_StudentDetails');
defined('ANNOUNCEMENT') OR define('ANNOUNCEMENT','T_AnnouncementDetails');
defined('ACTIVITY') OR define('ACTIVITY','T_ActivityMaster');
defined('ACTIVITY_STATUS') OR define('ACTIVITY_STATUS','T_Activity_Status');
defined('ANSWER_BOOKLET') OR define('ANSWER_BOOKLET','T_AnswerBookletStatus');
defined('ANSWER_BOOKLET') OR define('ANSWER_BOOKLET','T_AnswerBookletStatus');
defined('APPLICATION_STATUS') OR define('APPLICATION_STATUS','T_ApplicationStatus');
defined('CERTIFICATION_STATUS') OR define('CERTIFICATION_STATUS','T_CertificationStatus');
defined('STUDENTS_FEES_STATUS') OR define('STUDENTS_FEES_STATUS','T_Students_Fees_Status');

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

@ -142,7 +142,7 @@ $route['deleteDocPendingDetails'] = 'Student_Controller/deleteDocPendingDetails'
$route['getEmployeeDetailsBranch'] = 'Student_Controller/getEmployeeDetailsBranch';
//batch
$route['addBatchDetails'] = 'Batch_Controller/addBatchDetails';
$route['addBatchDetails'] = 'Batch_Controller/addBatchDetails';
$route['updateBatchDetails'] = 'Batch_Controller/updateBatchDetails';
$route['getBatchDetails'] = 'Batch_Controller/getBatchDetails';
$route['updateBatchDefault'] = 'Batch_Controller/updateBatchDefault';
@ -200,6 +200,7 @@ $route['feepaidDetails'] = 'Report/feepaidDetails';
$route['getSubjectDetaillist'] = 'HallTickets_Controller/getSubjectDetaillist';
/* Add New Contact Group */
$route['addNewGroup'] = 'Broadcast_Controller/addNewGroup';
$route['getGroups'] = 'Broadcast_Controller/getGroups';
@ -210,6 +211,15 @@ $route['getallnumer'] = 'Broadcast_Controller/getallnumer';
$route['setValue'] = 'Broadcast_Controller/setValue';
$route['setgrpstatus'] = 'Broadcast_Controller/setgrpstatus';
/* Data Correction */
$route['getAllstudentcoursedetail'] = 'DataCorrection_Controller/getAllstudentcoursedetail';
$route['getAllfeedetail'] = 'DataCorrection_Controller/getAllfeedetail';
$route['updateCourseDetails'] = 'DataCorrection_Controller/updateCourseDetails';
/*
@ -311,6 +321,7 @@ $route['updateSheduleDetails'] = 'HallTickets_Controller/updateSheduleDetails';
$route['getSheduleDetails'] = 'HallTickets_Controller/getSheduleDetails';
$route['getUniversityCourseId'] = 'HallTickets_Controller/getUniversityCourseId';
$route['saveBatchSchedule'] = 'HallTickets_Controller/SaveAllBatchSchedule';
$route['batchUploadDataDetails'] = 'HallTickets_Controller/BatchUploadDataDetails';
// Re Registration Form
$route['getStudentListForRegistrer'] = 'Reregister_Controller/getStudentListForReregister';
$route['getSubject'] = 'Reregister_Controller/getSubject';
@ -353,3 +364,6 @@ $route['getUniversitySessionDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/
$route['getUnivCourseFromFileDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnivCourseFromFileDetails';
$route['getExistStudentEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getExistStudentEnrolmentDetails';
$route['addManualEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addManualEnrolmentDetails';
$route['getForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getForFormIdDraftDetails';
$route['addForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addForFormIdDraftDetails';
$route['draftMovetoList'] = 'Receive_Enrolment_Fees_Univ_Controller/draftMovetoList';

4
Apollo/api/application/controllers/Batch_Controller.php
View File

@ -36,13 +36,15 @@ class Batch_Controller extends REST_Controller {
$now = new DateTime();
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
$details['BatchCode'] = $this->post('batchcode');
$details['BatchName'] = $this->post('batcheName');
$details['BatchDate'] = $this->post('batcheDate');
$details['UniversityID'] = $this->post('universityName');
$details['CreatedBy'] = $this->post('createdBy');
$details['CreatedBy'] = $this->post('createdBy');
$details['IsActive'] = $this->post('status');
$details['BranchCode'] = $this->post('branchCode');
$details['CreatedOn'] = $now->format('Y-m-d H:i:s');
print_r( $details +'samplearray');
$batchDetails = $this->batch_model->addBatch($details);// Check if the users data store contains users (in case the database result returns NULL)
if ($batchDetails)

171
Apollo/api/application/controllers/DataCorrection_Controller.php Normal file
View File

@ -0,0 +1,171 @@
<?php
/**
* Date: 04/09/18
* Time: 11:24 AM
*/
defined('BASEPATH') OR exit('No direct script access allowed');
// This can be removed if you use __autoload() in config.php OR use Modular Extensions
/** @noinspection PhpIncludeInspection */
require_once APPPATH . '/libraries/REST_Controller.php';
/**
* This is an example of a few basic user interaction methods you could use
* all done with a hardcoded array
*
* @package CodeIgniter
* @subpackage Rest Server
* @category Controller
* @author
* @license MIT
* @link
*/
class DataCorrection_Controller extends REST_Controller {
function __construct()
{
// Construct the parent class
parent::__construct();
// load the model
$this->load->model('Data_correction', 'Data_correction');
}
public function StudMerge_post()
{
$toDelete = $this->post('toDelete');
$toMerge = $this->post('toMerge');
$getStatus = $this->Data_correction->Student_Merge($toDelete,$toMerge);
//print_r($getStatus);
if ($getStatus)
{
$getStatus['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($getStatus, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
else
{
// Set the response and exit
$this->response([
'message' => 'No records found!',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
public function getAllstudentcoursedetail_post()
{
$search['Firstname'] = $this->post('studentName');
$search['MobileNumber'] = $this->post('mobileNumber');
$search['receipt'] = $this->post('receipt');
$search['requestedtBy'] =$this->post('requestedtBy');
$search['branchId']=$this->post('branchId');
$search['requestedDept'] = $this->post('requestedDept');
$search['University'] = $this->post('University');
$stucourse = $this->Data_correction->GetAllCourseDetails($search);
if($stucourse)
{
$stucourse['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($stucourse, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
else
{
$this->response([
'message' => 'No records found!',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND);
}
}
public function getAllfeedetail_post()
{
$search['University'] = $this->post('University');
$search['courseId'] = $this->post('courseId');
$search['studentId'] =$this->post('studentId');
$search['requestedtBy'] =$this->post('requestedtBy');
$search['branchId']=$this->post('branchId');
$search['requestedDept'] = $this->post('requestedDept');
$feedetails = $this->Data_correction->GetFeeDetails($search);
if($feedetails)
{
$feedetails['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($feedetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
else
{
$this->response([
'message' => 'No records found!',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND);
}
}
public function updateCourseDetails_post()
{
$search['University'] = $this->post('universityid');
$search['courseId'] = $this->post('courseId');
$search['studentId'] =$this->post('studentid');
$search['requestedtBy'] =$this->post('requestedtBy');
$search['branchId']=$this->post('branchId');
$search['requestedDept'] = $this->post('requestedDept');
$search['Reason'] = $this->post('Reason');
$search['IsActive'] = $this->post('IsActive');
$updatedetails = $this->Data_correction->UpdateCouseandfee($search);
$allfeeid = $this->Data_correction->GetAllfeeid($search);
if(!empty($allfeeid))
{
foreach($allfeeid as $fi)
{
$feeid = $fi->FeesID;
$feedeact = $this->Data_correction->feedetailupdate($search,$feeid);
}
}
// if($updatedetails)
// {
// $updatedetails['status'] = REST_Controller::HTTP_OK;
// // Set the response and exit
// $this->response($updatedetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
// }
// else
// {
// $this->response([
// 'message' => 'No records found!',
// 'status' => REST_Controller::HTTP_NOT_FOUND
// ], REST_Controller::HTTP_NOT_FOUND);
// }
}
}

54
Apollo/api/application/controllers/HallTickets_Controller.php
View File

@ -24,7 +24,7 @@ class HallTickets_Controller extends REST_Controller {
$this->methods['getCourseSubjectDetails_post']['limit'] = 500; // 500 requests per hour per user/key
$this->methods['getUniversityCourseDetails_post']['limit'] = 500; // 500 requests per hour per user/key
$this->methods['updateSheduleDetails_post']['limit'] = 500; // 500 requests per hour per user/key
$this->methods['BatchUploadDataDetails_post']['limit'] = 500;
// load the model
$this->load->model('Hallticket_model', 'Hallticket_model');
@ -305,22 +305,58 @@ class HallTickets_Controller extends REST_Controller {
}
}
public function BatchUploadDataDetails_post()
{
// echo 'hai';
$university= $this->post('universityDetails');
$courseArray = $this->post('courseDetails');
$filedetails = $this->post('details');
$requestedBy = $this->post('requestedBy');
$branchId = $this->post('branchId');
$Cdate = new DateTime('now',new DateTimeZone('Asia/Kolkata'));
$CreatedOn = $Cdate->format('Y-m-d H:i:s');
foreach($courseArray as $CourseDatialArray)
{
$course=$CourseDatialArray;
$schedulemaster = array('UniversityID'=>$university,'CourseID'=>$course,'BranchCode'=>$branchId,'CreatedBy'=>$requestedBy,'CreatedOn'=>$CreatedOn);
$schedulemasteradd = $this->Hallticket_model->AddBatchScheduleMasterFile($schedulemaster,$filedetails);
}
$SchId = '';
if(count($schedulemasteradd)>0)
{
$SchId = $schedulemasteradd[0]['SchId'];
}
if((count($schedulemasteradd)>0))
{
$data['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($data, REST_Controller::HTTP_OK);
}
else
{
$this->response([
'message' => 'No records found!',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND);
}
}
public function SaveAllBatchSchedule_post()
{
$detailArray = $this->post('scheduleDetails');
$university =$this->post('getuniversityid');
$courseid= $this->post('getcourseid');
$detailArray = $this->post('scheduleDetails');
$university =$this->post('getuniversityid');
//$courseid= $this->post('getcourseid');
$requestedBy = $this->post('requestedBy');
$branchId = $this->post('branchId');
$Cdate = new DateTime('now',new DateTimeZone('Asia/Kolkata'));
$CreatedOn = $Cdate->format('Y-m-d H:i:s');
//echo $courseid;
$CourseDatialArray = $this->post('courseDetails');
foreach($CourseDatialArray as $coursedetails)
{

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

@ -271,5 +271,52 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
}
}
public function getForFormIdDraftDetails_post(){
$reqBranch = $this->post('localDetails');
$getForFormIdDraftDetails = $this->receive_model->getForFormIdDraftDetails(); // Check if the employee exist
if ($getForFormIdDraftDetails) {
$getForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($getForFormIdDraftDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
} else {
// Set the response and exit
$this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
public function addForFormIdDraftDetails_post(){
$reqBranch = $this->post('localDetails');
$details = $this->post('details');
$addForFormIdDraftDetails = $this->receive_model->addForFormIdDraftDetails($details, $reqBranch); // Check if the employee exist
if ($addForFormIdDraftDetails) {
$addForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($addForFormIdDraftDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
} else {
// Set the response and exit
$this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
public function draftMovetoList_post(){
$reqBranch = $this->post('localDetails');
$details = $this->post('details');
$draftMovetoList = $this->receive_model->draftMovetoList($details, $reqBranch); // Check if the employee exist
if ($draftMovetoList) {
$draftMovetoList['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($draftMovetoList, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
} else {
// Set the response and exit
$this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
}

177
Apollo/api/application/models/Data_correction.php Normal file
View File

@ -0,0 +1,177 @@
<?php
/**
* Date: 04/09/18
* Time: 11:24 AM
*/
defined('BASEPATH') OR exit('No direct script access allowed');
class Data_Correction extends CI_Model
{
Public function Student_Merge($toDelete=null,$toMerge=null)
{
$sql = "";
$b=$this->db->query($sql);
$batch = $b->result();
if (count($batch) > 0) {
$results['MergeStatus'] = true;
$results['Stud_Merge'] = $batch;
} else {
$results['MergeStatus'] = false;
$results['message'] = 'No record found';
}
return $results;
}
Public function GetAllCourseDetails($search)
{
$this->db->select('sd.MobileNumber,sd.Firstname,sd.Lastname,CourseName,UniversityName,scd.CourseID,scd.ID,sd.StudentID,scd.IsActive as IsActive,scd.DeactiveComments as Reason,scd.UniversityID,sfs.FeesID,scd.Deactive');
$this->db->from('T_StudentDetails sd');
$this->db->join('T_Student_CourseDetails scd','scd.StudentID = sd.StudentID');
$this->db->join('T_CourseMaster cm','cm.CourseID = scd.CourseID');
$this->db->join('T_UniversityMaster um','um.UniversityID = scd.UniversityID');
$this->db->join('T_Students_Fees_Status sfs','sfs.StudentID = scd.StudentID and sfs.CourseID=scd.CourseID');
if($search['MobileNumber']!='')
{
$this->db->where('sd.MobileNumber',$search['MobileNumber']);
}
if($search['Firstname']!='')
{
// $this->db->like('ST.Firstname','%'.$search['Firstname'].'%');
$this->db->like('sd.Firstname',$search['Firstname'],'both');
}
if($search['University']!='')
{
// $this->db->like('ST.Firstname','%'.$search['Firstname'].'%');
$this->db->where('scd.UniversityID',$search['University']);
}
$this->db->group_by('scd.ID');
$searchDetails = $this->db->get();
if($searchDetails->result())
{
//print_r($searchDetails->result());
$result_array['studentStatus'] = true;
$result_array['details'] = $searchDetails->result();
}
else
{
$result_array['studentStatus'] = false;
$result_array['details'] = "No records found!";
}
// print_r($result_array);
// die();
return $result_array;
}
Public function GetFeeDetails($search)
{
$this->db->select('BillNO,BillDate,BillAmount,ModeOfPayment ,ReceiptNo,sfd.ID as FID');
$this->db->from('T_Students_Fees_PaidDetails sfd');
$this->db->join('T_Students_Fees_Status sfs','sfs.StudentID = sfd.StudentID and sfs.FeesID=sfd.FeesId');
$this->db->where('sfs.StudentID',$search['studentId']);
$this->db->where('sfs.CourseID',$search['courseId']);
$feeDetails = $this->db->get();
if($feeDetails->result())
{
//print_r($searchDetails->result());
$result_array['feeStatus'] = true;
$result_array['details'] = $feeDetails->result();
}
else
{
$result_array['feeStatus'] = false;
$result_array['details'] = "No records found!";
}
//print_r($result_array);die();
return $result_array;
}
Public function UpdateCouseandfee($search)
{
$time = date('Y-m-d H:i:s');
$dateTime = $time;
$coursearr['IsActive'] = $search['IsActive'];
$coursearr['DeactiveComments'] =$search['Reason'];
$coursearr['Deactive'] = '0';
$this->db->where('StudentID', $search['studentId']);
$this->db->where('UniversityID', $search['University']);
$this->db->where('CourseID', $search['courseId']);
$this->db->update('T_Student_CourseDetails', $coursearr);
$dayarr['IsActive'] = $search['IsActive'];
$dayarr['Reason'] = $search['Reason'];
if( $search['IsActive'] ==0)
{
$dayarr['Status'] = 'Cancel';
}
$this->db->where('StudentID', $search['studentId']);
$this->db->where('CourseID', $search['courseId']);
$this->db->update('T_DayBookMaster', $dayarr);
// $feearr['IsActive'] = $search['IsActive'];
// $feearr['InternalComments'] = $search['Reason'];
// $feearr['UpdatedOn'] = $dateTime;
// $feearr['UpdatedBy'] = $search['branchId'];
// $this->db->where('FeesId', $search['ID']);
// $this->db->update('T_Students_Fees_PaidDetails', $feearr);
return TRUE;
}
Public function GetAllfeeid($search)
{
$this->db->select('FeesID');
$this->db->from('T_Students_Fees_Status');
$this->db->where('StudentID',$search['studentId']);
$this->db->where('CourseID',$search['courseId']);
$feeidDetails = $this->db->get();
//print_r($feeidDetails->result());
//die();
return $feeidDetails->result();
}
public function feedetailupdate($search,$feeid)
{
$time = date('Y-m-d H:i:s');
$dateTime = $time;
$feearr['IsActive'] = $search['IsActive'];
$feearr['InternalComments'] = $search['Reason'];
$feearr['UpdatedOn'] = $dateTime;
$feearr['UpdatedBy'] = $search['branchId'];
$this->db->where('FeesId', $feeid);
$this->db->where('StudentID',$search['studentId']);
$this->db->update('T_Students_Fees_PaidDetails', $feearr);
return true;
}
}

75
Apollo/api/application/models/Hallticket_model.php
View File

@ -108,18 +108,21 @@ class Hallticket_model extends CI_Model
$this->db->select('SM.SubjectName,SM.SubjectID');
$this->db->from('T_SubjectMaster SM');
$this->db->join('T_Batch_Schedule_Child','T_Batch_Schedule_Child.SubjectID=SM.SubjectID');
$this->db->where('SM.BranchCode',$branchcode);
$this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
$result = $this->db->get();
if($result->result()){
$resultShedule['status']=true;
$mastScheduleID="";
foreach($result->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->from('T_Batch_Schedule_Master SCM');
$this->db->join('T_Batch_Schedule_Child','T_Batch_Schedule_Child.SchId = SCM.SchId');
$this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
//$this->db->where('SCM.BranchCode',$branchcode);
// $this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
$this->db->where('T_Batch_Schedule_Child.SubjectID',$row->SubjectID);
$existsheduledetails = $this->db->get();
@ -1245,11 +1248,75 @@ class Hallticket_model extends CI_Model
//echo "MODEL";print_r($result);die();
return $result;
}
}
public function AddBatchScheduleMasterFile($schedulemaster,$filedetails)
{
$this->db->trans_start();
$this->db->insert('T_Batch_Schedule_Master', $schedulemaster);
$insert_id = $this->db->affected_rows();
$this->db->trans_complete();
// print_r($this->db->last_query());
if($insert_id>0)
{
$subQuery = 'select max(SchId) as SchId from T_Batch_Schedule_Master';
$query = $this->db->query($subQuery);
$result = $query->result_array();
$schid= $result[0]['SchId'];
// if(($schid != '')||($schid !=0))
if(count($result)>0)
{
foreach($filedetails as $det)
{
$sudate = $det['schduleDate'];
$SubDate = date("Y-m-d", strtotime($sudate));
// $SubDate=$sudate->format('Y-m-d H:i:s');
$stime = $det['FromTime'];
$etime = $det['ToTime'];
$isactive=1;
$subcode = $det['SubjectID'];
$Cdate = new DateTime('now',new DateTimeZone('Asia/Kolkata'));
$CreatedOn = $Cdate->format('Y-m-d H:i:s');
$this->db->select('SubjectCode,SubjectID,SubjectName');
$this->db->from('T_SubjectMaster');
$this->db->where('T_SubjectMaster.BranchCode', $schedulemaster['BranchCode']);
$this->db->where('T_SubjectMaster.SubjectCode', $det['SubjectID']);
$subDetails = $this->db->get()->result();
$SubjectID=$subDetails[0]->SubjectID;
$schedulchild = array('SchId'=>$schid,'SubjectID'=>$SubjectID,'SchChildId'=>'','ScheduleDate'=>$SubDate,'FromTime'=>$stime,'ToTime'=>$etime,'IsActive'=>$isactive);
$this->db->trans_start();
$this->db->insert('T_Batch_Schedule_Child',$schedulchild);
$this->db->trans_complete();
}
}
//echo $schid;
// $schid=$query[0]['SchId'];
// echo $schid;
}
return true;
// return $query->result_array();
}
public function AddBatchScheduleMaster($schedulemaster,$detailArray)
{
$this->db->trans_start();
$this->db->insert('T_Batch_Schedule_Master', $schedulemaster);
$insert_id = $this->db->affected_rows();

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

@ -443,9 +443,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
if(count($queryDetails->result()) == 0){
$query = "INSERT INTO T_FormId_FeeDetails_Received_From_University
(FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode)
(FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode, DraftStatus)
VALUES
( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' )";
( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' , 0)";
$queryDetails = $this->db->query($query);
} else {
echo 'else con';
@ -888,4 +888,135 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
return $resultArray;
}
public function getForFormIdDraftDetails(){
$selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE DraftStatus = 1";
$details = $this->db->query($selectQuery);
$detailsList = $details->result();
if($detailsList) {
$result['draftStatus'] = true;
$result['draftDetails'] = $detailsList;
$result['draftDetailsMessagae'] = "details generate successfully.";
} else {
$result['draftStatus'] = false;
$result['draftDetails'] = '';
$result['draftDetailsMessagae'] = "No Record Found.";
}
return $result;
}
public function addForFormIdDraftDetails($details, $local){
$localBranchID = $local['localBranchID'];
$localUserID = $local['localUserID'];
$time = date('Y-m-d H:i:s');
$CreatedOn = $time;
$formIds = $details['FormID'];
$formType = $details['FormType'];
$CentreCode = $details['CentreCode'];
$Session = $details['Session'];
$Year = $details['Year'];
$Semester = $details['Semester'];
$Student_Name = $details['Student_Name'];
$Father_Name = $details['Father_Name'];
$CourseCode = $details['CourseCode'];
$ActualCourseFee = $details['ActualCourseFee'];
$CourseFee = $details['CourseFee'];
$ExamFee = $details['ExamFee'];
$EnrollmentFee = $details['EnrollmentFee'];
$ProspectusFee = $details['ProspectusFee'];
$ReRegFee = $details['ReRegFee'];
$CreditTransferFee = $details['CreditTransferFee'];
$LateralEntryFee = $details['LateralEntryFee'];
$DualSpclFee = $details['DualSpclFee'];
$OtherFee = $details['OtherFee'];
$NRIFEE = $details['NRIFEE'];
$ProvisionalFee = $details['ProvisionalFee'];
$MigrationFee = $details['MigrationFee'];
$UrgentResultDMCFee = $details['UrgentResultDMCFee'];
$AdditionalFee = $details['AdditionalFee'];
$Amount = $details['Amount'];
$selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE
FormID = '$formIds' AND
FormType = '$formType' AND
CentreCode = '$CentreCode' AND
Session = '$Session' AND
Year = '$Year' AND
Semester = '$Semester' AND
Student_Name = '$Student_Name' AND
Father_Name = '$Father_Name' AND
CourseCode = '$CourseCode' AND
ActualCourseFee = '$ActualCourseFee' AND
CourseFee = '$CourseFee' AND
ExamFee = '$ExamFee' AND
EnrollmentFee = '$EnrollmentFee' AND
ProspectusFee = '$ProspectusFee' AND
ReRegFee = '$ReRegFee' AND
CreditTransferFee = '$CreditTransferFee' AND
LateralEntryFee = '$LateralEntryFee' AND
DualSpclFee = '$DualSpclFee' AND
OtherFee = '$OtherFee' AND
NRIFEE = '$NRIFEE' AND
ProvisionalFee = '$ProvisionalFee' AND
MigrationFee = '$MigrationFee' AND
UrgentResultDMCFee = '$UrgentResultDMCFee' AND
AdditionalFee = '$AdditionalFee' AND
Amount = '$Amount'";
$queryDetails = $this->db->query($selectQuery);
if(count($queryDetails->result()) == 0){
$query = "INSERT INTO T_FormId_FeeDetails_Received_From_University
(FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode, DraftStatus)
VALUES
( '$formIds', '$formType', '$CentreCode','$Session','$Year','$Semester','$Student_Name','$Father_Name', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount', '$localUserID', '$CreatedOn', '$localBranchID' , 1)";
$queryDetails = $this->db->query($query);
if($queryDetails){
$result['draftStatus'] = true;
$result['draftDetailsMessagae'] = "Updated Successfully.";
}else{
$result['draftStatus'] = false;
$result['draftDetailsMessagae'] = "Something went wrong.";
}
} else {
$result['draftStatus'] = false;
$result['draftDetailsMessagae'] = "This record already exist.";
}
return $result;
}
public function draftMovetoList($detail, $local){
// print_r($details);exit();
foreach($detail as $row) {
// echo $row['ID'];exit();
$data[] = array(
'ID' => $row['ID'],
'FormType'=> 'Hello'
);
}
// $data = array(
// array(
// 'ID' => 1,
// 'FormType' => 'Hello'
// ),
// array(
// 'ID' => 2,
// 'FormType' => 'World'
// )
// );
// print_r($data);exit();
$this->db->update_batch('T_FormId_FeeDetails_Received_From_University', $data, 'ID');
$detailsList = $details->result();
if($detailsList){
$result['draftStatus'] = true;
$result['draftDetailsMessagae'] = "Updated Successfully.";
} else {
$result['draftStatus'] = false;
$result['draftDetailsMessagae'] = "Something went wrong.";
}
}
}

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

@ -77,7 +77,8 @@
"SESSIONSCHEDULE": "Session Schedule",
"HALLTICKET": "HALL TICKET",
"REREGISTRATION":"RE-REGISTRATION",
"ACCOUNTTYPE":"Account Types"
"ACCOUNTTYPE":"Account Types",
"ENTRY":"ENTRY CORRECTION"
},
"report": {
"TITLE": "REPORTS",
@ -153,6 +154,10 @@
"mydetails": {
"MAIN": "My Details"
},
"entry": {
"MAIN": "My Details",
"coursecorrection": "Course Details"
},
"announcement": {
"MAIN": "ANNOUNCEMENT",
"ANNOUNCEMENTLISTING": "List",

4
Apollo/assets/js/config.constant.js
View File

@ -146,6 +146,10 @@ app.constant('JS_REQUIRES', {
'FeeCollected_reportCtrl': 'assets/js/controllers/FeeCollected_reportCtrl.js',
/*
**/
'entrycorrectionCtrl': 'assets/js/controllers/entrycorrectionCtrl.js',
/*
* student status updation
* */

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

@ -782,7 +782,24 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
ncyBreadcrumb: {
label: 'Promote Batch'
}
});
}).state('app.entry', {
url: '/entry',
template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> ENTRY</div> </div>',
title: 'entry',
ncyBreadcrumb: {
label: 'entry'
},
}).state('app.entry.coursecorrection', {
url: '/coursecorrection',
templateUrl: "assets/views/entry_correction.html",
resolve: loadSequence('entrycorrectionCtrl','ngTable', 'ladda', 'angular-ladda'),
title: 'coursecorrection',
ncyBreadcrumb: {
label: 'coursecorrection'
},
});
// $locationProvider.html5Mode(true);

56
Apollo/assets/js/controllers/batchCtrl.js
View File

@ -24,7 +24,7 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl
};
$scope.setEditId = function (pid,p) {
$scope.editModel.editBatchName = p.BatchName;
$scope.editModel.editBatchName = p.BatchName;
$scope.editModel.editDate = p.BatchDate;
$scope.localUniversityDetails="";
$scope.localUniversityDetails = JSON.parse(localStorage.getItem('localUniversityDetails'));
@ -61,11 +61,63 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl
$scope.sortKey = keyname; //set the sortKey to the param passed
$scope.reverse = !$scope.reverse; //if true make it false and vice versa
}
/*
* Submit,upload file and extract details
* @params myModel
* created by Bala
* */
$scope.extractFileDetails="";
$scope.readUploadXlsxDetails = function (workbook) {
/* DO SOMETHING WITH workbook HERE */
for (var sheetName in workbook.Sheets) {
var jsonData = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]);
if(jsonData.length!=0){
$scope.extractFileDetails=jsonData;
}
}
$scope.error = function (e) {
/* DO SOMETHING WHEN ERROR IS THROWN */
//console.log(e);
}
}
$scope.UploadFileData = function (details,uploadForDetails) {
var updateUniversityEnrolment = {
method: 'POST',
url: apiPoint.url + 'fileUploadDataDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
localDetails: localDetail,
details: details,
batchcode: myModel.batchCode,
batcheName: myModel.batchName,
universityName: myModel.universityName,
universityID: angular.fromJson(uploadForDetails.university).UniversityID,
// universityName: angular.fromJson(uploadForDetails.university).UniversityName,
}
};
$http(updateUniversityEnrolment).then(function (response) {
if (response.data.status == true) {
swal("", "Updated Successfully", "success");
$state.go($state.current, {}, {reload: true});
} else {
swal("", "Failed", "error");
}
});
}
// end
/*
* Submit,update and reset batch details
* @params myModel
* created by subaram
* created by Bala
* */
$scope.batchForm = {

270
Apollo/assets/js/controllers/entrycorrectionCtrl.js Normal file
View File

@ -0,0 +1,270 @@
'use strict';
/*** controller***/
app.controller('entrycorrectionCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state","$modal","$log",
function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,$modal,$log){
//function ($scope, apiPoint, $http, SweetAlert, $state,$modal, md5, ipCookie, $window, dateListDescService) {
// DataTables configurable options
$scope.filters = {
"Date": "",
//"to_date": "",
};
// $scope.initHead = function() {
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {
console.log("else if");
$state.go('app.dashboard');
} else {
console.log("else else");
//ipCookie.remove('cookiechk');
window.localStorage.clear();
$state.go('login.signin');
}
}
$scope.universitySearchData = '';
$scope.init = function()
{
// alert()
var getuniv = {
method: 'POST',
url: apiPoint.url + 'AllgetUniversity/',
headers: {
'Content-Type': 'application/json'
},
data: {
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
}
};
$http(getuniv).then(function (response) {
if(response.status == 200)
{
$scope.universitySearchData=response.data.details;
//console.log($scope.universitySearchData);
}
});
};
$scope.studentInfo="";
$scope.getStudentDetails = function (form,myModel)
{
if(myModel !=undefined)
{
var mobileNumber = myModel.mobileNumber;
var studentName = myModel.studentName;
var receipt = myModel.receipt;
$scope.universityId = myModel.myUnivSearch;
// console.log($scope.universityId);
// return false;
$scope.isLoaderShow= false
var getdetail = {
method: 'POST',
url: apiPoint.url + 'getAllstudentcoursedetail/',
headers: {
'Content-Type': 'application/json'
},
data :{
studentName: myModel.studentName,
mobileNumber: myModel.mobileNumber,
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";
}
});
}
else
{
swal('Please Enter Any Field to Continue',"",'error');
return false;
}
}
$scope.OpenWindowStatus = false;
$scope.editId = -1;
$scope.setEditId = function (P)
{ //alert(JSON.stringify(P));
var feedetails = {
method: 'POST',
url: apiPoint.url + 'getAllfeedetail/',
headers: {
'Content-Type': 'application/json'
},
data :{
studentId: P.StudentID,
courseId:P.CourseID,
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(feedetails).then(function (response) {
//console.log(response)
if (response.data.status==200 && response.data.feeStatus) {
$scope.feeInfo=response.data.details;
console.log($scope.feeInfo);
$scope.editId = P.ID;
} else {
$scope.feeInfo="";
$scope.loadfee = "No Records Found";
}
});
}
$scope.close = function ()
{
$scope.editId = -1;
}
$scope.updatestatus = function(myModel, form, loading)
{
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$name;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[name=' + firstError + ']').focus();
swal("Please Enter Reason!", "", "error");
}
else
{
//alert('else')
// return false;
var IsActive = '';
if(myModel.IsActive == true)
{
IsActive =1;
}
else if(myModel.IsActive == false)
{
IsActive =0;
}
var studentid= myModel.StudentID;
var universityid = myModel.UniversityID;
var courseId = myModel.CourseID;
var updatecourse = {
method: 'POST',
url: apiPoint.url + 'updateCourseDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
studentid:studentid,
universityid:universityid,
courseId:courseId,
Reason:myModel.Reason,
IsActive:IsActive,
requestedtBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
requestedDept: JSON.parse(localStorage.getItem('localObj')).localType,
}
};
$http(updatecourse).then(function (response) {
swal('Change Saved Successfully', response.data.message, "success");
$scope.close();
});
}
}
}]);

80
Apollo/assets/js/controllers/schCtrl.js
View File

@ -86,7 +86,6 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
};
// $scope.details = [];
$scope.cancel = function () {
$scope.init();
$scope.editId = -1;
@ -136,7 +135,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
* get course semester,subjects details
* created by TamilBala
* */
var course='';
$scope.getSemSubDetails = function(UID,COURSES){
course=COURSES;
@ -172,7 +171,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
swal("Select Course");
return false;
}
$scope.editId=1;
$scope.semDropDownShowLoading = false;
$scope.semDropDownShow = false;
$scope.semDropDownShowLoading = true;
@ -226,11 +225,16 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
} );
}
}
$scope.remove = function () {
$scope.init();
$scope.semDropDownShow = false;
};
/*
* Remove Subjects from Master Subjects Arry
* after selecting subjects for each semester
@ -326,7 +330,63 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
}
/* upload file for batch schedule
* created by bala
* */
$scope.extractFileDetails="";
$scope.readUploadBatchDetails = function (workbook) {
/* DO SOMETHING WITH workbook HERE */
for (var sheetName in workbook.Sheets) {
var jsonData = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]);
if(jsonData.length!=0){
$scope.extractFileDetails=jsonData;
}
}
$scope.error = function (e) {
/* DO SOMETHING WHEN ERROR IS THROWN */
//console.log(e);
}
}
/*upload file and extract data Created By bala */
$scope.UploadFileData = function (FileDetails,myModel,courseDetails) {
$scope.courseDetailsArray=courseDetails.list;
$scope.universityDetails=myModel.universityName.universityID;
// //console.log($scope.universityDetails);
// $scope.scheduledDetails=[];
// $scope.scheduledDetails.push({
// "universityID":myModel.universityName.universityID,
// });
var updateUniversityEnrolment = {
method: 'POST',
url: apiPoint.url + 'batchUploadDataDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
details: FileDetails,
universityDetails : $scope.universityDetails,
courseDetails : $scope.courseDetailsArray,
requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
branchId:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(updateUniversityEnrolment).then(function (response) {
console.log(response);
if (response.data.status == 200) {
swal("", "Saved Successfully", "success");
$state.go($state.current, {}, {reload: true});
} else {
swal("", "Failed", "error");
}
});
}
// end
$scope.saveAll= function(myModel,courseDetails,subjectsDetails)
{
@ -369,7 +429,11 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
// var finalEndTime = new Date(newEndTime).toLocaleString('en-GB').slice(12 ,20);
// finalEndTime = tempDate+'T'+finalEndTime+':000Z';
// console.log(finalEndTime);
$scope.scheduledDetails.push({
$scope.scheduledDetails.push({
"universityID":myModel.universityName.universityID,
//"courseID":courseDetails.list[0],
"subjectID":value.Subject.SubjectID,
@ -382,7 +446,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
}
});
//return false;
var saveAllInfo = {
method: 'POST',
url: apiPoint.url + 'saveBatchSchedule/',
@ -418,7 +482,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
});
}
$scope.updateShedule = function (unsheduledetails) {
$scope.UpdatescheduledDetails=[];

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

@ -327,36 +327,174 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
getDraftFormIdDetails();
}
}
$scope.draftManualEntryDetails = {
'FormID': '',
'FormType': 'NEW',
'CentreCode': '',
'Session':'',
'Year':'',
'Semester':'',
'Student_Name':'',
'Father_Name':'',
'CourseCode':'',
'ActualCourseFee':'0',
'CourseFee':'0',
'ExamFee': '0',
'EnrollmentFee': '0',
'ProspectusFee': '0',
'ReRegFee': '0',
'CreditTransferFee': '0',
'LateralEntryFee': '0',
'DualSpclFee': '0',
'OtherFee': '0',
'NRIFEE':'0',
'ProvisionalFee': '0',
'MigrationFee': '0',
'UrgentResultDMCFee': '0',
'AdditionalFee': '0',
'Amount': '0'
}
$scope.draftListDetails = '';
$scope.draftListDetailsNoRecordFound = false;
$scope.draftListDetailsLoading = false;
// get draft form id details
function getDraftFormIdDetails(){
// $scope.unMatchedRecordDetails = '';
// $scope.unMatchedNoRecordFound = false;
// $scope.unMatchedLoadingStatus = true;
// var getDetailsFor = ss == 1 ? 'EnrolmentIDFile' : 'FormIDFile';
// var getFeeCompareDetailsList = {
// method: 'POST',
// url: apiPoint.url + 'getUnmatchedRecordDetails/',
// headers: {
// 'Content-Type': 'application/json'
// },
// data: {
// localDetails: localDetail,
// getDetailsFor: getDetailsFor
// }
// };
// $http(getFeeCompareDetailsList).then(function (response) {
// if (response.data.unMatchedRecordStatus == true) {
// $scope.unMatchedLoadingStatus = false;
// $scope.unMatchedNoRecordFound = false;
// $scope.unMatchedRecordDetails = response.data.unMatchedRecordDetails;
// $scope.unMatchedRecordDetailsType = response.data.unMatchedRecordFor;
// } else {
// $scope.unMatchedLoadingStatus = false;
// $scope.unMatchedNoRecordFound = true;
// $scope.unMatchedRecordDetails = response.data.unMatchedRecordDetails;
// }
// });
$scope.draftListDetailsLoading = true;
$scope.draftListDetailsNoRecordFound = false;
$scope.draftListDetails = '';
var getFormIdDraftDetailsList = {
method: 'POST',
url: apiPoint.url + 'getForFormIdDraftDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
localDetails: localDetail
}
};
$http(getFormIdDraftDetailsList).then(function (response) {
if (response.data.draftStatus == true) {
$scope.draftListDetailsLoading = false;
$scope.draftListDetails = response.data.draftDetails;
$scope.draftListDetailsNoRecordFound = false;
} else {
$scope.draftListDetailsLoading = false;
$scope.draftListDetailsNoRecordFound = true;
}
});
}
// manual entry details add
$scope.addManualData = function() {
alert(JSON.stringify($scope.draftManualEntryDetails));
var addDraftDetailsList = {
method: 'POST',
url: apiPoint.url + 'addForFormIdDraftDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
localDetails: localDetail,
details : $scope.draftManualEntryDetails
}
};
$http(addDraftDetailsList).then(function (response) {
if (response.data.draftStatus == true) {
swal("", response.data.draftDetailsMessagae, "success");
getDraftFormIdDetails();
getEmptycall();
} else {
swal("", response.data.draftDetailsMessagae, "warning");
getDraftFormIdDetails();
getEmptycall();
}
});
}
function getEmptycall(){
$scope.draftManualEntryDetails = {
'FormID': '',
'FormType': 'NEW',
'CentreCode': '',
'Session':'',
'Year':'',
'Semester':'',
'Student_Name':'',
'Father_Name':'',
'CourseCode':'',
'ActualCourseFee':'0',
'CourseFee':'0',
'ExamFee': '0',
'EnrollmentFee': '0',
'ProspectusFee': '0',
'ReRegFee': '0',
'CreditTransferFee': '0',
'LateralEntryFee': '0',
'DualSpclFee': '0',
'OtherFee': '0',
'NRIFEE':'0',
'ProvisionalFee': '0',
'MigrationFee': '0',
'UrgentResultDMCFee': '0',
'AdditionalFee': '0',
'Amount': '0'
}
return 0;
}
$scope.addToList = function(id){
swal({
title: "Are you sure?",
text: "You Want to Add this Record to List!",
type: "warning",
showCancelButton: true,
confirmButtonColor: '#DD6B55',
confirmButtonText: 'Yes',
cancelButtonText: "No",
closeOnConfirm: false,
closeOnCancel: false
},
function(isConfirm){
if (isConfirm){
var selectedItems = [];
function getUpdateDetails(id) {
this.ID = id;
this.DraftStatus = 0;
}
let itemGetID = new getUpdateDetails(id);
selectedItems.push(itemGetID);
var draftMoveToList = {
method: 'POST',
url: apiPoint.url + 'draftMovetoList/',
headers: {
'Content-Type': 'application/json'
},
data: {
localDetails: localDetail,
details : selectedItems
}
};
$http(draftMoveToList).then(function (response) {
if (response.data.draftStatus == true) {
// swal("", response.data.draftDetailsMessagae, "success");
// getDraftFormIdDetails();
// getEmptycall();
} else {
// swal("", response.data.draftDetailsMessagae, "warning");
// getDraftFormIdDetails();
// getEmptycall();
}
});
} else {
swal("Cancelled", "Your record not added to list :)", "error");
}
});
}
}]);

108
Apollo/assets/views/edit_course.html Normal file
View File

@ -0,0 +1,108 @@
<form name="Form" id="form" novalidate>
<div class="row">
<div class="col-md-12">
<div class="col-md-12">
<fieldset>
<legend>
Fee Paid Details
</legend>
<div>
<input type="hidden" name="ID" id="ID" ng-model="p.ID">
</div>
<div>
<input type="hidden" name="stuid" ng-model="p.StudentID">
</div>
<div>
<input type="hidden" name="uniid" ng-model="p.UniversityID">
</div>
<div>
<input type="hidden" name="courseid" ng-model="p.CourseID">
</div>
<div>
<input type="hidden" name="FeesID" ng-model="p.FeesID">
</div>
<!-- {{feeInfo}} -->
<div class="col-md-12">
<!-- {{feeInfo}} -->
<div class="table-responsive">
<table id="datatable" class="table table-hover">
<thead>
<tr >
<th style="font-size: 12px;">BillNO</th>
<th style="font-size: 12px;">Receipt No</th>
<th style="font-size: 12px">Bill Date</th>
<th style="font-size: 12px;">Bill Amount</th>
<th style="font-size: 12px;">Mode of Payment</th>
</tr>
</thead>
<tbody ng-repeat="p in feeInfo">
<tr>
<td>{{p.BillNO}}</td>
<td>{{p.ReceiptNo}}</td>
<td>{{p.BillDate}}</td>
<td>{{p.BillAmount}}</td>
<td>{{p.ModeOfPayment}}</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row">
<div class="col-md-3 form-group" ng-class="{'has-error':p.Reason.$dirty && p.Reason.$invalid, 'has-success':p.Reason.$valid}">
<label>
Reason to Deactivate <span class="symbol required"></span>
</label>
<textarea type="text" placeholder="Enter Reason" tabindex="7" class="form-control" name="Messagebody" ng-model="p.Reason" required></textarea>
</div>
<div class="col-md-3" ng-if="p.Deactive !=0">
<label>
Active/De-Active
</label>
<div ng-if="p.IsActive==true">
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
</div>
<div ng-if="p.IsActive==false">
<switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" ladda="ldloading.zoom_in" tabindex="6" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updatestatus(p,Form,'zoom-in')">
Save
</button>
<input type="button" class="btn btn-warning btn-wide" tabindex="10" value="Cancel" ng-click="close()"></input>
</div>
<!--
<div class="pull-right" ng-if="p.IsActive==false">
<input type="button" class="btn btn-warning btn-wide" tabindex="10" value="Cancel" ng-click="close()"></input>
</div> -->
</div>
</div>
</fieldset>
</div>
</div>
</form>
<!-- class="editRowTd" -->

181
Apollo/assets/views/entry_correction.html Normal file
View File

@ -0,0 +1,181 @@
<style type="text/css">
.pad {
background-color: #eee;
padding: 4px;
}
.fif {
/* background-color: #ddd;*/
display: inline-block;
margin: 0 175px 0 0;
padding: 8px 8px;
text-align: left;
width: 200px;
}
.right {
/* background-color: #ddd;*/
display: inline-block;
/*margin: 0 25px 0 0;*/
padding: 1px 1px;
text-align: right;
}
.rightac {
/* background-color: #ddd;*/
display: inline-block;
margin: 0 175px 0 0;
padding: 8px 8px;
text-align: left;
width: 200px;
}
.a {
word-spacing: 9cm;
}
</style>
<section id="page-title">
<div class="row">
<div class="col-sm-8">
<h1 class="mainTitle">COURSE CORRECTION</h1>
</div>
<!-- <div ncy-breadcrumb></div> -->
</div>
</section>
<style>
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
}
th {
cursor: pointer;
} */
</style>
<script type="text/javascript" src="bower_components/ng-table-excel-export/ng-table-excel-export.min.js">
</script>
<div class="container-fluid container-fullw bg-white">
<div ng-controller="entrycorrectionCtrl" data-ng-init="init()">
<form name="Form" id="form" novalidate method="post">
<div class="row">
<fieldset>
<legend>Search</legend>
<div class="row">
<div class="col-md-3 form-group" ng-class="{'has-error':Form.mobilenumber.$dirty && Form.mobilenumber.$invalid}">
<label>
Mobile Number
</label>
<input type="text" placeholder="Search Mobile Number" ladda="ldloading1.zoom_in" data-style="zoom-in"
autofocus tabindex="1" class="form-control" name="mobilenumber" id="mobilenumber" ng-minlength="10" ng-maxlength="12"
ng-model="myModel.mobileNumber" ng-pattern="/^[0-9]*$/"/>
<span class="error text-small block"
ng-if="Form.mobilenumber.$error.maxlength || Form.mobilenumber.$error.minlength || Form.mobilenumber.$error.pattern">Enter a valid mobile number</span>
</div>
<div class="col-md-3 form-group">
<label>
Student First Name
</label>
<input type="text" placeholder="Search Student Name"
tabindex="2" class="form-control" name="studentname"
ng-model="myModel.studentName" ng-pattern="/^[a-zA-Z.\s]*$/" />
<span class="error text-small block"
ng-if="Form.studentname.$dirty && Form.studentname.$error.pattern">Invalid student name </span>
</div>
<!-- <div class="col-md-3 form-group">
<label>
RECEIPT NUMBER
</label>
<input type="text" placeholder="Search Receipt Number"
tabindex="2" class="form-control" name="receipt"
ng-model="myModel.receipt" />
</div> -->
<div class="col-md-3 form-group">
<label>University</label>
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="university" ng-model="myModel.myUnivSearch"
ng-click="getEmployeeList()">
<option value="" selected>Select University</option>
<option ng-repeat="item in universitySearchData" value="{{item.UniversityID}}">{{item.UniversityName}}</option>
</select>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div class="pull-right">
<button type="submit" ng-click="getStudentDetails(Form,myModel);" class="btn btn-success btn-o" tabindex="8">
Submit
</button>
</div>
</div>
</div>
</fieldset>
</div>
<div ng-if="isLoaderShow">
<center> <h1>{{load}}</h1> </center>
</div>
<!-- {{studentInfo}} -->
<div class="col-md-12">
<div class="table-responsive">
<table id="datatable" class="table table-hover">
<thead>
<tr >
<th style="font-size: 12px;">Mobile</th>
<th style="font-size: 12px;">Name</th>
<th style="font-size: 12px">Course</th>
<th style="font-size: 12px;">University</th>
<th style="font-size: 12px;">Action</th>
</tr>
</thead>
<tbody dir-paginate="p in studentInfo|filter:search:strict|itemsPerPage:10">
<tr>
<td>{{p.MobileNumber}}</td>
<td>{{p.Firstname}} {{p.Lastname}}</td>
<td>{{p.CourseName}}</td>
<td>{{p.UniversityName}}</td>
<td><span><a class="text-azure" id="editRowBtn{{p.ID}}" ng-click="setEditId(p);"><b class="glyphicon glyphicon-pencil" tooltip="Edit Details" aria-hidden="true"></b></a> </span></td>
<!-- <td></td> -->
</tr>
<tr ng-show="editId === p.ID" ng-if="editId === p.ID">
<td colspan="12" ng-include src="'assets/views/edit_course.html'"></td>
</tr>
</tbody>
</table>
</div>
<dir-pagination-controls direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
</form>

35
Apollo/assets/views/hallticket/batchshedule.html
View File

@ -24,7 +24,7 @@
<section id="page-title">
<div class="row">
<div class="col-sm-8">
<h1 class="mainTitle" translate="Batch Schedule">{{ mainTitle }}</h1>
<span class="mainDescription">Allocate Batch schedule </span>
@ -129,7 +129,7 @@
<!-- <pre>{{myModel.universityName | json}}</pre> -->
</div>
<div class="col-md-5 form-group">
<div class="col-md-3 form-group">
<label>
Course
</label>
@ -148,16 +148,29 @@
repeat="x.CourseID as x in selectedUniversityCourseName | filter:$select.search">
{{x.CourseName}}
</ui-select-choices>
</ui-select>
</ui-select>
<!-- <pre>{{selectedCourseNameC.list | json}}</pre> -->
</div>
<div class="col-md-3 form-group">
<div class="col-md-2 form-group">
<br>
<button type="button" ladda="ldloading1.zoom_in" tabindex="3" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="getSemSubDetails(myModel.universityName.universityID,selectedCourseNameC);">GET SUBJECTS</button>
<button type="button" ladda="ldloading1.zoom_in" tabindex="3" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="getSemSubDetails(myModel.universityName.universityID,selectedCourseNameC);">MANUAL SCHDULE</button>
</div>
</div>
<div class="col-md-1 form group">
<br>
<br>
<lable style="color:green ;font-size:14px"> (OR) </lable>
</div>
<div class="col-md-3 form-group">
<fieldset>
<js-xls onread="readUploadBatchDetails" onerror="error"></js-xls>
<br>
<button type="button" class="btn btn-success btn-o" style="float: right" ng-click="UploadFileData(extractFileDetails,myModel,selectedCourseNameC)"> Submit</button>
</fieldset>
</div>
</div>
<div class="row" ng-if="semDropDownShowLoading">
@ -260,9 +273,11 @@
</div>
<div class="col-md-12 form-group" ng-if="semDropDownShow">
<div class="pull-right">
<br>
<button type="button" ladda="ldloading1.zoom_in" tabindex="" class="btn btn-wide btn-primary" data-style="zoom-in" ng-disabled="saveButtonDisabled" ng-click="saveAll(myModel,selectedCourseNameC,subjects);">{{saveButtonTxt}}</button>
<br>
<button type="button" ladda="ldloading1.zoom_in" tabindex="" class="btn btn-wide btn-success" data-style="zoom-in" ng-disabled="saveButtonDisabled" ng-click="saveAll(myModel,selectedCourseNameC,subjects);">{{saveButtonTxt}}</button>
<input type="button" class="btn btn-warning btn-wide" tabindex="3" value="Cancel"
ng-click="remove();">
</div>
</div>

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

@ -221,11 +221,11 @@
<span class="title" translate="sidebar.nav.student.STUDENTFEEDETAILCOMPARE"> STUDENT UNIV FEE COMPARE DETAILS </span>
</a>
</li>
<li ui-sref-active="active">
<!--<li ui-sref-active="active">
<a ui-sref="app.student.studentUnivFormIdFeeDetails" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.student.STUDENTFROMIDFEEDETAILS"> STUDENT FORMID FEE DETAILS </span>
</a>
</li>
</li>-->
</ul>
</li>
<!--<li ng-class="{'active open':$state.includes('app.call')}">
@ -530,6 +530,29 @@
</a>
</li>-->
<li ng-class="{'active open':$state.includes('app.entry')}">
<a href="javascript:void(0)">
<div class="item-content">
<div class="item-media">
<i class="ti-pencil"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.master.ENTRY"> ENTRY </span><i class="icon-arrow"></i>
</div>
</div>
</a>
<ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.entry.coursecorrection" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.entry.coursecorrection">COURSECORRECTION</span>
</a>
</li>
</ul>
</li>
</ul>
<!-- end: Super Admin -->

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

@ -202,6 +202,154 @@
</tab>
<tab tabindex="2" active="subTabactive2" ng-click="subTabActive('subTabactive2')" heading="Upload Data Manualy" id="uploadDataManualy">
<div class="container-fluid">
<div class="container">
<div class="table-responsive">
<table class="table">
<thead>
<th>FormID</th>
<th>FormType</th>
<th>CentreCode</th>
<th>Session</th>
<th>Year</th>
<th>Semester</th>
<th>Student_Name</th>
<th>Father_Name</th>
<th>CourseCode</th>
<th>ActualCourseFee</th>
<th>CourseFee</th>
<th>ExamFee</th>
<th>EnrollmentFee</th>
<th>ProspectusFee</th>
<th>ReRegFee</th>
<th>CreditTransferFee</th>
<th>LateralEntryFee</th>
<th>DualSpclFee</th>
<th>OtherFee</th>
<th>NRIFEE</th>
<th>ProvisionalFee</th>
<th>MigrationFee</th>
<th>UrgentResultDMCFee</th>
<th>AdditionalFee</th>
<th>Amount</th>
</thead>
<tbody>
<tr>
<td>
<input type="text" required ng-model="draftManualEntryDetails.FormID">
</td>
<td><select ng-model="draftManualEntryDetails.FormType" ng-disabled="!draftManualEntryDetails.FormID">
<option value="NEW"> NEW </option>
<option value="RE"> RE </option>
</select>
</td>
<td><input type="text" ng-model="draftManualEntryDetails.CentreCode" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.Session" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.Year" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.Semester" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.Student_Name" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.Father_Name" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.CourseCode" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.ActualCourseFee"
ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.CourseFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.ExamFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.EnrollmentFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.ProspectusFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.ReRegFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.CreditTransferFee"
ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.LateralEntryFee"
ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.DualSpclFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.OtherFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.NRIFEE" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.ProvisionalFee"
ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.MigrationFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.UrgentResultDMCFee"
ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.AdditionalFee" ng-disabled="!draftManualEntryDetails.FormID"></td>
<td><input type="text" ng-model="draftManualEntryDetails.Amount" ng-disabled="!draftManualEntryDetails.FormID"></td>
</tr>
</tbody>
</table>
</div>
<button class="btn btn-success pull-right" ng-disabled="!draftManualEntryDetails.FormID" ng-click="addManualData()">Add</button>
</div>
<div class="container">
<div ng-if="draftListDetailsLoading">
Loading...
</div>
</div>
<div class="container">
<div ng-if="draftListDetails && !draftListDetailsLoading" class="table-responsive">
<table class="table table-border table-hover">
<thead>
<th>FormID</th>
<th>FormType</th>
<th>CentreCode</th>
<th>Session</th>
<th>Year</th>
<th>Semester</th>
<th>Student Name</th>
<th>Father Name</th>
<th>CourseCode</th>
<th>ActualCourseFee</th>
<th>CourseFee</th>
<th>ExamFee</th>
<th>EnrollmentFee</th>
<th>ProspectusFee</th>
<th>ReRegFee</th>
<th>CreditTransferFee</th>
<th>LateralEntryFee</th>
<th>DualSpclFee</th>
<th>OtherFee</th>
<th>NRIFEE</th>
<th>ProvisionalFee</th>
<th>MigrationFee</th>
<th>UrgentResultDMCFee</th>
<th>AdditionalFee</th>
<th>Amount</th>
<th>Action</th>
</thead>
<tbody dir-paginate="p in draftListDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
<tr>
<td>{{p.FormID}}</td>
<td>{{p.FormType}}</td>
<td>{{p.CentreCode}}</td>
<td>{{p.Session}}</td>
<td>{{p.Year}}</td>
<td>{{p.Semester}}</td>
<td>{{p.Student_Name}}</td>
<td>{{p.Father_Name}}</td>
<td>{{p.CourseCode}}</td>
<td>{{p.ActualCourseFee}}</td>
<td>{{p.CourseFee}}</td>
<td>{{p.ExamFee}}</td>
<td>{{p.EnrollmentFee}}</td>
<td>{{p.ProspectusFee}}</td>
<td>{{p.ReRegFee}}</td>
<td>{{p.CreditTransferFee}}</td>
<td>{{p.LateralEntryFee}}</td>
<td>{{p.DualSpclFee}}</td>
<td>{{p.OtherFee}}</td>
<td>{{p.NRIFEE}}</td>
<td>{{p.ProvisionalFee}}</td>
<td>{{p.MigrationFee}}</td>
<td>{{p.UrgentResultDMCFee}}</td>
<td>{{p.AdditionalFee}}</td>
<td>{{p.Amount}}</td>
<td>
<i class="ti-user" tooltip="Add To List" ng-click="addToList(p.ID);"></i>
</td>
</tr>
</tbody>
</table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
</div>
<!--<div class="row">
<div class="col-md-4 form-group">
<label>