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:
gayathri1990 2018-09-11 12:55:22 +05:30
commit 657c5734c7
15 changed files with 588 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -379,4 +379,6 @@ $route['getUniversityCodeForFormDetailsGet'] = 'Receive_Enrolment_Fees_Univ_Cont
$route['getUnmatchedFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnmatchedFormIdFeesDetails';
$route['addToAccountStateList'] = 'Receive_Enrolment_Fees_Univ_Controller/addToAccountStateList';
$route['addUniversityPaymentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addUniversityPaymentDetails';
$route['updateUniversityPaymentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/updateUniversityPaymentDetails';

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

@ -38,6 +38,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
$this->methods['addManualEnrolmentDetails_post']['limit'] = 1000;
$this->methods['addUniversityPaymentDetails_post']['limit'] = 1000;
$this->methods['updateUniversityPaymentDetails_post']['limit'] = 1000;
// load the model
$this->load->model('Receive_Enrolment_Fees_Univ_model', 'receive_model');
@ -277,7 +278,9 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
// kdk
public function getForFormIdDraftDetails_post(){
$reqBranch = $this->post('localDetails');
$getForFormIdDraftDetails = $this->receive_model->getForFormIdDraftDetails(); // Check if the employee exist
$getDetailsFor = $this->post('getDetailsFor');
$getForFormIdDraftDetails = $this->receive_model->getForFormIdDraftDetails($getDetailsFor); // Check if the employee exist
if ($getForFormIdDraftDetails) {
$getForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
@ -517,6 +520,42 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
}
}
/*
* update university payment details*/
public function updateUniversityPaymentDetails_post(){
$now = new DateTime();
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
$details=$this->post('details');
$localData=$this->post('localDetails');
$update['ID']=$details['ID'];
$update['PaymentID']=$details['paymentID'];
$payment['BillNo']=$details['billNo'];
$payment['ReceiptNo']=$details['receiptNo'];
$payment['Amount']=$details['billAmount'];
$payment['ApprovedDate']=$details['date'];
$payment['Remarks']=$details['comments'];
$payment['BranchCode']=$localData['localBranchID'];
$payment['updatedBy']=$localData['localUserID'];
$payment['updatedOn']=$now->format('Y-m-d H:i:s');
// debit array
$debit['DebitAmount']=$details['billAmount'];
$debit['ApprovedDate']=$details['date'];
$debit['BranchCode']=$localData['localBranchID'];
$debit['updatedBy']=$localData['localUserID'];
$debit['updatedOn']=$now->format('Y-m-d H:i:s');
$updatePaymentDetails=$this->receive_model->updatePaymentDetails($update,$payment,$debit);
if($updatePaymentDetails['status']==true){
$this->response($updatePaymentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
else if($updatePaymentDetails['status']==false){
$this->response($updatePaymentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
else{
$this->response(['message' => 'Try again', 'status' => false], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
}

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

@ -893,8 +893,10 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
// get formid draft mode list details
// kdk
public function getForFormIdDraftDetails(){
$selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE DraftStatus = 1";
public function getForFormIdDraftDetails($getUnivDetails){
$selectUniv = $getUnivDetails['univCode'];
$selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE UniversityID = '$selectUniv' AND DraftStatus = 1";
$details = $this->db->query($selectQuery);
$detailsList = $details->result();
if($detailsList) {
@ -1100,7 +1102,8 @@ $result['updatedraftStatus'] = false;
$this->db->select('FUD.*, concat(ST.FirstName," ", ST.Lastname) as app_StudentName, IF(concat(ST.FirstName," " , ST.Lastname) = FUD.Student_Name, "YES", "NO") as StudentNameStatus ,
ST.Fathername as app_FatherName, IF(ST.Fathername = FUD.Father_Name, "YES", "NO") as FathernameStatus,
CM.CourseCode as app_CourseCode, IF(CM.CourseCode = FUD.CourseCode, "YES", "NO" ) as CourseCodeStatus');
CM.CourseCode as app_CourseCode, IF(CM.CourseCode = FUD.CourseCode, "YES", "NO" ) as CourseCodeStatus,
IF(ENU.SemesterYear = FUD.Semester, "YES", "NO" ) as SemesterStatus');
$this->db->from('T_FormId_FeeDetails_Received_From_University as FUD');
$this->db->join(ENROLMENTRECEIVEDFROMUNIV.' as ENU', 'FUD.FormID = ENU.FormID' );
$this->db->join(STUDENTCOURSE.' as STC', 'STC.EnrollmentID = ENU.EnrolmentNo');
@ -1352,7 +1355,7 @@ $result['updatedraftStatus'] = false;
* created by kms
* */
public function getPaymentVerificationDetails($search){
$this->db->select('UNCD.ID,UNCD.FormMapID,UNCD.PaymentMapID,UNCD.FormID,UNCD.CreditAmount,UNCD.DebitAmount,UNCD.ApprovedDate,UNCD.UniversityCode,UNCD.UniversityName,UNCD.TypeID,ENU.EnrolmentNo,UNP.BillNo,UNP.PID as PaymentID');
$this->db->select('UNCD.ID,UNCD.FormMapID,UNCD.PaymentMapID,UNCD.FormID,UNCD.CreditAmount,UNCD.DebitAmount,DATE_FORMAT(UNCD.ApprovedDate, "%d-%m-%Y") as FormatDate,UNCD.ApprovedDate,UNCD.UniversityCode,UNCD.UniversityName,UNCD.TypeID,ENU.EnrolmentNo,UNP.BillNo,UNP.PID as PaymentID,UNP.Amount,UNP.ReceiptNo,UNP.Remarks');
$this->db->from(UNIVERSITYCREDITDEBIY.' as UNCD');
$this->db->join(FORMFEESRECEIVEDFROMUNIV.' as UNFR', 'UNFR.ID = UNCD.FormMapID','left');
$this->db->join(UNIVERSITYPAYMENT.' as UNP', 'UNP.PID = UNCD.PaymentMapID','left');
@ -1467,4 +1470,77 @@ $result['updatedraftStatus'] = false;
return $resultArray;
}
/*
* update payment details
* created by kms
* */
public function updatePaymentDetails($update=null,$payment=null,$debit=null){
$resultArray=array();
$this->db->where('UNP.BillNo', $payment['BillNo']);
$this->db->where('UNP.PID != ', $update['PaymentID']);
$this->db->select('UNP.BillNo');
$this->db->from(UNIVERSITYPAYMENT.' as UNP');
$billExist = $this->db->get();
if($billExist->num_rows()<=0){
if($payment['ReceiptNo']!='' AND $payment['ReceiptNo']!=null){
$this->db->where('UNP1.ReceiptNo', $payment['ReceiptNo']);
$this->db->where('UNP1.PID != ', $update['PaymentID']);
$this->db->select('UNP1.ReceiptNo');
$this->db->from(UNIVERSITYPAYMENT.' as UNP1');
$receiptExist = $this->db->get();
if($receiptExist->num_rows()<=0){
$this->db->where('PID', $update['PaymentID']);
$this->db->update(UNIVERSITYPAYMENT, $payment);
if ($this->db->affected_rows() > 0) {
$this->db->where('ID', $update['ID']);
$this->db->update(UNIVERSITYCREDITDEBIY, $debit);
if ($this->db->affected_rows() > 0) {
$resultArray['status']=true;
$resultArray['message']="Payment update successfully";
}
else{
$resultArray['status']=false;
$resultArray['message']="Payment update failed.try again";
}
} else {
$resultArray['status']=false;
$resultArray['message']="Payment failed.Try again";
}
}
else{
$resultArray['status']=false;
$resultArray['message']="Receipt no is already exist..";
}
}
else{
$this->db->where('PID', $update['PaymentID']);
$this->db->update(UNIVERSITYPAYMENT, $payment);
if ($this->db->affected_rows() > 0) {
$this->db->where('ID', $update['ID']);
$this->db->update(UNIVERSITYCREDITDEBIY, $debit);
if ($this->db->affected_rows() > 0) {
$resultArray['status']=true;
$resultArray['message']="Payment update successfully";
}
else{
$resultArray['status']=false;
$resultArray['message']="Payment update failed.try again";
}
} else {
$resultArray['status']=false;
$resultArray['message']="Payment failed.Try again";
}
}
}
else {
$resultArray['status']=false;
$resultArray['message']="Bill no is already exist..";
}
return $resultArray;
}
}

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

@ -146,6 +146,10 @@ $scope.universitySearchData = '';
$scope.OpenWindowStatus = false;
$scope.editId = -1;
$scope.courselist ='';
$scope.loadfee='';
$scope.feecheck=false;
$scope.setEditId = function (P)
{ //alert(JSON.stringify(P));
@ -173,11 +177,16 @@ $scope.universitySearchData = '';
$scope.feeInfo=response.data.details;
console.log($scope.feeInfo);
$scope.editId = P.ID;
$scope.courselist =true;
$scope.feecheck=false;
} else {
$scope.feeInfo="";
$scope.loadfee = "No Records Found";
$scope.courselist =false;
$scope.feecheck=true;
$scope.editId = P.ID;
}
});

13
Apollo/assets/js/controllers/studentCtrl.js
View File

@ -721,12 +721,15 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
$scope.editId = -1;
$scope.editCourseId = -1;
$scope.setEditId = function (unique_id, id) {
// alert()
$scope.editId = unique_id;
$scope.editCourseId = -1;
$scope.studentViewPage = -1;
}
$scope.setEditCourseId = function (unique_id,id) {
$scope.list = false;
$scope.getStudentCourseList(id);
$scope.currentStudentId = id;
@ -837,6 +840,8 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
// get Student Course List
$scope.getStudentCourseList = function (studentId) {
console.log('in')
$scope.courseEditLoading = true;
$scope.list = true;
$scope.courseEdit = false;
@ -1740,11 +1745,15 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.editId = -1;
$scope.editCourseId = -1;
$scope.setEditId = function (uniqe_id ,id) {
// alert()
$scope.editId = uniqe_id;
$scope.editCourseId = -1;
}
$scope.setEditCourseId = function (uniqe_id ,id) {
//alert('1');
$scope.list = false;
$scope.getStudentCourseList(id);
$scope.currentStudentId = id;
@ -1752,6 +1761,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.editCourseId = uniqe_id;
$scope.editId = -1;
$scope.courseEditLoading = true;
$scope.courselist = true;
}
@ -1879,6 +1889,9 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.studentCourseList = response.data.course_details;
// $scope.stucour = $scope.studentCourse[0];
} else {
$scope.courselist = false;
$scope.courseEditLoading='';
}
});
}

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

@ -10,7 +10,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
*/
// get local client details
var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk');
// load when html page load
@ -129,9 +129,10 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
$scope.Searchloader = false;
$scope.studentData = false;
$scope.formIdListNoRecordFound = false;
$scope.onSubmit = function () {
$scope.Searchloader = true;
$scope.formIdListNoRecordFound = false;
if ($scope.searchData.University !== '' && $scope.searchData.Course !== '') {
$scope.Searchloader = true;
var empListreq = {
@ -151,27 +152,49 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
$scope.studentData = true;
$scope.data = response.data.studentFeeCompareDetails;
$scope.studentListLength = $scope.data.length;
$scope.formIdListNoRecordFound = false;
// $scope.statusMessage = $scope.data.message;
} else {
$scope.formIdListNoRecordFound = true;
$scope.Searchloader = false;
$scope.studentData = false;
$scope.statusMessage = $scope.data.message;
$scope.statusMessage = response.data.message;
}
});
} else {
}
}
//Export excel
var mystyle1 = {
sheetid: 'Student University FormId Fees Details',
headers: true,
caption: {
title:'Student University FormId Fees Details',
width: '300px',
style:'font-size:50px;'
},
// style:'background:#00FF00',
column: {
style:'font-size:16px'
},
};
$scope.exportData = function () {
alasql('SELECT CAST(FormID as NUMBER) as FormID,FormType as FormType,CentreCode as CentreCode,Session as Session,CAST(Year as NUMBER) as Year,Semester as Semester,Student_Name as Student_Name,Father_Name as Father_Name,CourseCode as CourseCode,CAST(ActualCourseFee as NUMBER) as ActualCourseFee,CAST(CourseFee as NUMBER) as CourseFee,CAST(ExamFee as NUMBER) as ExamFee,CAST(EnrollmentFee as NUMBER) as EnrollmentFee,CAST(ProspectusFee as NUMBER) as ProspectusFee,CAST(ReRegFee as NUMBER) as ReRegFee,CAST(CreditTransferFee as NUMBER) as CreditTransferFee,CAST(LateralEntryFee as NUMBER) as LateralEntryFee,CAST(DualSpclFee as NUMBER) as DualSpclFee,CAST(OtherFee as NUMBER) as OtherFee,CAST(NRIFEE as NUMBER) as NRIFEE,CAST(ProvisionalFee as NUMBER) as ProvisionalFee,CAST(MigrationFee as NUMBER) as MigrationFee,CAST(UrgentResultDMCFee as NUMBER) as UrgentResultDMCFee,CAST(AdditionalFee as NUMBER) as AdditionalFee,CAST(Amount as NUMBER) as Amount INTO XLS("FormIdFeesDetails.xls",?) FROM ?',[mystyle1,$scope.data]);
};
//End of export excel
$scope.myObj = {
// "color" : "green",
"font-size": "inherit"
}
$scope.myObjErr = {
"text-decoration": "underline",
"text-decoration-color": "red",
"font-size": "inherit"
"color": "red",
"font-size": "inherit",
}
$scope.editId = -1;
@ -330,10 +353,32 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
}
});
}
//Export Excel
var mystyle = {
sheetid: 'Student University FormId Unmatched Records',
headers: true,
caption: {
title:'Student University FormId Unmatched Records',
width: '300px',
style:'font-size:50px;'
},
// style:'background:#00FF00',
column: {
style:'font-size:16px'
},
};
$scope.exportDataTab3 = function () {
alasql('SELECT CAST(FormID as NUMBER) as FormID,FormType as FormType,CentreCode as CentreCode,CourseCode as CourseCode,CAST(ActualCourseFee as NUMBER) as ActualCourseFee,CAST(CourseFee as NUMBER) as CourseFee,CAST(Amount as NUMBER) as Amount INTO XLS("FormIdUnmatchedRecords.xls",?) FROM ?',[mystyle,$scope.unMatchedRecordDetails]);
};
//End of export excel
// get subtab details for the formid fee details get form the university
$scope.subTabActive = function (tab) {
$scope.subTabactive = tab;
if (tab == 'subTabactive2') {
getDraftFormIdDetails();
}
@ -369,6 +414,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
}
$scope.draftListDetails = '';
$scope.draftListDetailsNoRecordFound = false;
$scope.draftListDetailsLoading = false;
@ -384,7 +430,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
'Content-Type': 'application/json'
},
data: {
localDetails: localDetail
localDetails: localDetail,
getDetailsFor: $scope.formUploadUnivSelectID
}
};
$http(getFormIdDraftDetailsList).then(function (response) {

47
Apollo/assets/js/controllers/student_university_fee_compare.js
View File

@ -6,7 +6,7 @@
app.controller('student_university_fee_compareCtrl', ["$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) {
/**
* student university fee details compare
* student university fee details compare
*/
// get local client details
@ -179,7 +179,28 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
}
}
//export excel
var mystyle = {
sheetid: 'Enrolment Details',
headers: true,
caption: {
title:'Student Form Enrolment Details',
width: '300px',
style:'font-size:50px;'
},
// style:'background:#00FF00',
column: {
style:'font-size:16px'
},
};
$scope.exportData = function () {
alasql('SELECT CAST(FormID as NUMBER) as FormID,EnrolmentNo as EnrolmentNo,FormType as FormType,concat(Firstname,Lastname) as StudentName,Fathername as FatherName,UniversityName as University,CourseName as Course,SemesterYear as SemYear INTO XLS("EnrolmentDetails.xls",?) FROM ?',[mystyle,$scope.data]);
};
//end of export excel
$scope.editId = -1;
$scope.setEditId=function(id){
$scope.editId = id;
@ -339,6 +360,28 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
}
});
}
//export excel
var mystyle1 = {
sheetid: 'Unmatched Records',
headers: true,
caption: {
title:'Unmatched Records',
width: '300px',
style:'font-size:50px;'
},
// style:'background:#00FF00',
column: {
style:'font-size:16px'
},
};
$scope.exportDataTab2 = function () {
alasql('SELECT CAST(FormID as NUMBER) as FormID,EnrolmentNo as EnrolmentNo,SemesterYear as SemesterYear,CAST(MobileNumber AS NUMBER) as MobileNumber,StudentName as StudentName,UniversityCode as UniversityCode,UniversityName as UniversityName,CourseCode as CourseCode,CourseName as CourseName,FatherName as FatherName,MotherName as MotherName,EmailID as EmailID INTO XLS("UnmatchedRecords.xls",?) FROM ?',[mystyle1,$scope.unMatchedRecordDetails]);
};
//End of export excel
$scope.manualEnModel={
"enrolmentNo": '',
"formID":"",

166
Apollo/assets/js/controllers/univFormPaymentCtrl.js
View File

@ -176,6 +176,152 @@ app.controller('univFormPaymentCtrl', ["$scope","$rootScope","$filter", "ngTable
};
$rootScope.addError="";
};
/*
* update university payment details
* created by kms
* */
$rootScope.updatePaymentModel = {
'ID':"",
'billNo':"",
'date':"",
'billAmount':"",
'receiptNo':"",
'comments':"",
'universityCode':"",
'universityName':"",
'paymentID':""
};
$rootScope.viewPayment = function (values) {
var updateDate=new Date(values.ApprovedDate).toDateString();
$rootScope.updateError="";
$rootScope.updatePaymentModel = {
'ID': values.ID,
'billNo':values.BillNo,
'date':$filter('date')(new Date(updateDate), 'yyyy-MM-dd'),
'billAmount':values.DebitAmount,
'receiptNo':values.ReceiptNo,
'comments':values.Remarks,
'universityCode':values.UniversityCode,
'universityName':values.UniversityName,
'paymentID':values.PaymentID
};
$rootScope.updatePaymentModal = $modal.open({
templateUrl: 'assets/views/student/updateUniversityPaymentModal.html',
// controller: 'univFormPaymentCtrl',
// size: size,
resolve: {
items: function () {
return $rootScope.updatePaymentModel;
}
}
});
$rootScope.updatePaymentModal.result.then(function (selectedItem) {
}, function () {
$rootScope.updatePaymentModal.close();
$rootScope.updatePaymentModel = {
'ID':"",
'billNo':"",
'date':"",
'billAmount':"",
'receiptNo':"",
'comments':"",
'universityCode':"",
'universityName':"",
'paymentID':""
};
});
}
$rootScope.updateError="";
$rootScope.updateUnivPayment = function (form,updateDetails) {
$rootScope.updateError="";
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$name;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
}
else{
var changeDate;
if(angular.isObject(updateDetails.date)){
var saveDate=new Date(updateDetails.date).toDateString();
changeDate=$filter('date')(new Date(saveDate), 'yyyy-MM-dd');
}
else{
changeDate=updateDetails.date;
}
$scope.univUpdateData = {
"universityCode":updateDetails.universityCode,
"universityName":updateDetails.universityName,
"billNo":updateDetails.billNo,
"billAmount":updateDetails.billAmount,
"date":changeDate,
"receiptNo":updateDetails.receiptNo,
"comments":updateDetails.comments,
"ID":updateDetails.ID,
"paymentID":updateDetails.paymentID,
}
var updatePayment = {
method: 'POST',
url: apiPoint.url + 'updateUniversityPaymentDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
localDetails: localDetail,
details: $scope.univUpdateData,
}
};
$http(updatePayment).then(function (response) {
if (response.data.status==true) {
swal(" ", response.data.message, "success");
$rootScope.updatePaymentModal.close();
$rootScope.updatePaymentModel = {
'ID':"",
'billNo':"",
'date':"",
'billAmount':"",
'receiptNo':"",
'comments':"",
'universityCode':"",
'universityName':"",
'paymentID':""
};
$rootScope.getPaymentVerificationDetails($scope.paymentVerficationModel);
} else {
$rootScope.updateError=response.data.message;
$timeout(function () {
$rootScope.updateError="";
}, 4000);
}
});
}
}
/*
@ -233,4 +379,24 @@ app.controller('univFormPaymentCtrl', ["$scope","$rootScope","$filter", "ngTable
});
};
/*
* cancel update modal
* */
$rootScope.cancelUpdatePaymentModal=function () {
$rootScope.updatePaymentModal.close();
/* $rootScope.updatePaymentModel = {
'ID':"",
'billNo':"",
'date':"",
'billAmount':"",
'receiptNo':"",
'comments':"",
'universityCode':"",
'universityName':"",
'paymentID':""
};*/
$rootScope.updateError="";
};
}]);

12
Apollo/assets/views/edit_course.html
View File

@ -1,6 +1,8 @@
<form name="Form" id="form" novalidate>
<div class="row">
<div class="col-md-12">
<div class="col-md-12">
<fieldset>
@ -26,7 +28,15 @@
<!-- {{feeInfo}} -->
<div class="col-md-12">
<!-- <div ng-if="feecheck==true">
<div align="center" style="font-weight: bold; font-size:20 ">
{{loadfee}}
</div>
</div> -->
<div ng-if="courselist == false" class="text-center">
<h3>No Records Found</h3>
</div>
<div class="col-md-12" ng-if="courselist == true">
<!-- {{feeInfo}} -->
<div class="table-responsive">
<table id="datatable" class="table table-hover">

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

@ -167,6 +167,8 @@
<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>

9
Apollo/assets/views/student/UnivFormPaymentDetails.html
View File

@ -2,6 +2,10 @@
.universityPaid {
background: #f4f4f7 !important;
}
.spanCursor{
cursor: pointer;
}
</style>
<section id="page-title">
<div class="row">
@ -65,6 +69,7 @@
<th> Form ID</th>
<th> Enrolment No</th>
<th> Bill No</th>
<th> Date</th>
<th> Payable</th>
<th> Paid </th>
<th> Balance</th>
@ -75,7 +80,9 @@
<tr ng-class="{universityPaid:p.TypeID==0}">
<td>{{p.FormID}}</td>
<td>{{p.EnrolmentNo}}</td>
<td>{{p.BillNo}}</td>
<td><span class="spanCursor" tooltip="Click to edit/view bill" ng-click="viewPayment(p)">{{p.BillNo}}</span></td>
<td>{{p.FormatDate}}</td>
<td ng-if="p.CreditAmount==0"></td>
<td ng-if="p.CreditAmount>0"><span style="float:right;">{{p.CreditAmount}}</span></td>
<td ng-if="p.DebitAmount==0"></td>

7
Apollo/assets/views/student/editStudentCourseDetails.html
View File

@ -6,12 +6,15 @@
})
</script>
<div ng-if="courseEditLoading == true" class="text-center">
<!--<img src="assets/images/ajax_loader_blue.gif" style="width: 5%; height: 30%">-->
<!-- <img src="assets/images/ajax_loader_blue.gif" style="width: 5%; height: 30%"> -->
<h3>Fetching ...</h3>
</div>
<div ng-if="courselist == false" class="text-center">
<h3>No Records Found</h3>
</div>
<div class="col-md-12">
<fieldset ng-if="courseEditLoading == false">
<fieldset ng-if="courseEditLoading == false && courselist == true">
<legend>
Course Details
</legend>

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

@ -104,7 +104,7 @@
<div class="col-md-5 form-group" ng-class="{'has-error':manualEnForm.manualFormID.$dirty && manualEnForm.manualFormID.$invalid, 'has-success':manualEnForm.manualFormID.$valid}">
<label> Form ID <span class="symbol required"></span>
</label>
</label>
<input type="text" tabindex="6" placeholder="Enter Form ID"
class="form-control" name="manualFormID"
@ -207,6 +207,11 @@
<div>
<!--{{data | json}}-->
<div class="row" style="text-align: right;">
<button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
</div>
<div ng-if="Searchloader">
<div align="center" >
<h3 style="color: blue;">Loading...</h3></div>
@ -331,6 +336,9 @@
<div class="col-md-2" style="margin-top: 20px;">
<button class="btn btn-success" ng-disabled="!misMatchUnivSearch" ng-click="getUnmatchedRecord(misMatchsSearchData)">Get Record</button>
</div>
<div class="container">
<div ng-if="unMatchedLoadingStatus">
<div style="color: blue; align: center;" align="center"> Loading...</div>
@ -339,6 +347,13 @@
<div style="color: red; align: center;" align="center"> No Record Found ...</div>
</div>
</div>
<div class="row" style="text-align: right;">
<button class="btn btn-success btn-o" ng-click="exportDataTab2()">Export to Excel</button>
</div>
<div class="container table-responsive" ng-if="!unMatchedNoRecordFound && unMatchedRecordDetails">
<div ng-if="unMatchedRecordDetailsType == 'EnrolmentIDFile'">
<table class="table table-border table-hover" >

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

@ -101,6 +101,14 @@
</div>
<h2> {{statusMessage}} </h2>
</div>
<div ng-if="formIdListNoRecordFound" align="center">
<div style="color: red; align: center;" align="center"> No Record Found ...</div>
</div>
<div class="row" style="text-align: right;">
<button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
</div>
<div class="table-responsive" ng-if="studentData">
<table class="table table-hover">
<thead>
@ -158,8 +166,8 @@
<th> Amount
</th>
</tr>
</thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
</thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results" pagination-id="startSearchList">
<tr>
<td>
<i class="glyphicon glyphicon-list-alt" tooltip="Status Details" ng-click="statusUpdate(p.ID);"></i>
@ -181,16 +189,16 @@
{{p.Year}}
</td>
<td>
{{p.Semester}}
<div ng-style="p.SemesterStatus == 'YES' ? myObj: myObjErr"> {{p.Semester}} </div>
</td>
<td ng-style="p.StudentNameStatus == 'YES' ? myObj: myObjErr">
{{p.Student_Name}}
<td>
<div ng-style="p.StudentNameStatus == 'YES' ? myObj: myObjErr">{{p.Student_Name}}<div>
</td>
<td ng-style="p.FathernameStatus == 'YES' ? myObj: myObjErr">
{{p.Father_Name}}
<td>
<div ng-style="p.FathernameStatus == 'YES' ? myObj: myObjErr"> {{p.Father_Name}}</div>
</td>
<td ng-style="p.CourseCodeStatus == 'YES' ? myObj: myObjErr">
{{p.CourseCode}}
<td>
<div ng-style="p.CourseCodeStatus == 'YES' ? myObj: myObjErr"> {{p.CourseCode}} </div>
</td>
<td>{{p.ActualCourseFee}}</td>
<td>{{p.CourseFee}}</td>
@ -299,7 +307,7 @@
</tr>
</tbody>
</table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
<dir-pagination-controls pagination-id="startSearchList" max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
@ -312,7 +320,7 @@
<label>
University <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="1" name="formUniversity" ng-model="formUploadUnivSelectID.univCode" required>
<select class="form-control" tabindex="1" name="formUniversity" ng-model="formUploadUnivSelectID.univCode" ng-change="subTabActive('subTabactive1');" required>
<option value="" selected>Select University</option>
<option ng-repeat="univ in universityData" value="{{univ.UniversityID}}">{{univ.UniversityName}}</option>
</select>
@ -321,7 +329,7 @@
</div>
<tabset ng-if="formUploadUnivSelectID.univCode" id="uploadDetails" class="tabbable">
<tab tabindex="1" active="subTabactive1" ng-click="subTabActive('subTabactive1')" heading="Upload File" id="uploadFiles">
<tab tabindex="1" active="subTabactive == 'subTabactive1'" ng-click="subTabActive('subTabactive1')" heading="Upload File" id="uploadFiles">
<div class="container-fluid">
<div class="row">
@ -336,7 +344,7 @@
</div>
</div>
</tab>
<tab tabindex="2" active="subTabactive2" ng-click="subTabActive('subTabactive2')" heading="Upload Data Manualy" id="uploadDataManualy">
<tab tabindex="2" active="subTabactive == 'subTabactive2'" ng-click="subTabActive('subTabactive2')" heading="Upload Data Manualy" id="uploadDataManualy">
<div class="container-fluid">
<div class="container">
<div class="table-responsive">
@ -417,6 +425,9 @@
Loading...
</div>
</div>
<div class="container">
<div ng-if="draftListDetailsNoRecordFound" style="color: red; align: center;" align="center"> No Record Found ...</div>
</div>
<div class="container">
<div ng-if="draftListDetails && !draftListDetailsLoading" class="table-responsive">
<table class="table table-border table-hover">
@ -449,7 +460,7 @@
<th>Amount</th>
</thead>
<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" pagination-id="draftListDetails">
<tr>
<td>
<i class="ti-receipt" tooltip="Add To List" ng-click="addToList(p.ID);"></i>
@ -662,7 +673,7 @@
</tr>
</tbody>
</table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
<dir-pagination-controls pagination-id="draftListDetails" max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
</div>
@ -752,6 +763,11 @@
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
<div class="row" style="text-align: right;">
<button class="btn btn-success btn-o" ng-click="exportDataTab3()">Export to Excel</button>
</div>
<div ng-if="unMatchedRecordDetailsType == 'FormIDFile'">
<table class="table table-border table-hover">
<thead>
@ -763,7 +779,7 @@
<th>CourseFee</th>
<th>Amount</th>
</thead>
<tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
<tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results" pagination-id="missMatchListDetails" >
<tr>
<td>{{p.FormID}}</td>
<td>{{p.FormType}}</td>
@ -775,7 +791,7 @@
</tr>
</tbody>
</table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
<dir-pagination-controls pagination-id="missMatchListDetails" max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
</div>

103
Apollo/assets/views/student/updateUniversityPaymentModal.html Normal file
View File

@ -0,0 +1,103 @@
<div class="container-fluid container-fullw bg-white">
<fieldset>
<legend>Payment for : {{updatePaymentModel.universityName}}</legend>
<form name="UpdateFormPayment" id="form" novalidate>
<div class="row">
<div class="col-md-4 form-group"
ng-class="{'has-error':UpdateFormPayment.billno.$dirty && UpdateFormPayment.billno.$invalid, 'has-success':UpdateFormPayment.billno.$valid}">
<label>
Bill No <span
class="symbol required"></span>
</label>
<input type="text" placeholder="Enter Bill No"
tabindex="1" class="form-control" name="billno"
ng-model="updatePaymentModel.billNo" capitalize disallow-spaces required/>
<span class="error text-small block"
ng-if="UpdateFormPayment.billno.$dirty && UpdateFormPayment.billno.$error.required">Bill no is required</span>
</div>
<div class="col-md-4 form-group"
ng-class="{'has-error':UpdateFormPayment.billAmount.$dirty && UpdateFormPayment.billAmount.$invalid,'has-success':UpdateFormPayment.billAmount.$valid}">
<label>
Bill Amount <span class="symbol required"></span>
</label>
<input type="text" placeholder="Enter Bill Amount"
autofocus tabindex="2" class="form-control" name="billAmount" id="billAmount" ng-maxlength="9"
ng-model="updatePaymentModel.billAmount" ng-pattern="/^[0-9]*$/" required/>
<span class="error text-small block"
ng-if="UpdateFormPayment.billAmount.$dirty && UpdateFormPayment.billAmount.$invalid"
ng-hide="UpdateFormPayment.billAmount.$error.maxlength || UpdateFormPayment.billAmount.$error.pattern">Bill amount is required</span>
<span class="error text-small block"
ng-if="UpdateFormPayment.billAmount.$error.maxlength || UpdateFormPayment.billAmount.$error.pattern">Enter a valid amount</span>
</div>
<div data-ng-controller="DatepickerDemoCtrl">
<div class="col-md-4 form-group"
ng-class="{'has-error':UpdateFormPayment.date.$dirty && UpdateFormPayment.date.$invalid, 'has-success':UpdateFormPayment.date.$valid}">
<label>
Bill Date <span
class="symbol required"></span>
</label>
<input type="text"
class="form-control "
ng-click="startOpen = !startOpen"
datepicker-popup="dd-MM-yyyy"
ng-model="updatePaymentModel.date"
is-open="startOpen"
ng-init="startOpen = false"
name="date"
datepicker-options="dateOptions"
placeholder="Select Date"
min-date="currentDate"
max-date="futureDate"
close-text="Close" required="required" ng-readonly="true"/>
<span class="error text-small block"
ng-if="UpdateFormPayment.date.$dirty && UpdateFormPayment.date.$error.required">Date is required.</span>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4 form-group"
ng-class="{'has-error':UpdateFormPayment.receiptNo.$dirty && UpdateFormPayment.receiptNo.$invalid}">
<label>
Receipt No
</label>
<input type="text" placeholder="Enter Receipt No"
tabindex="3" class="form-control" name="receiptNo"
ng-model="updatePaymentModel.receiptNo" disallow-spaces/>
</div>
<div class="col-md-8 form-group"
ng-class="{'has-error':UpdateFormPayment.comments.$dirty && UpdateFormPayment.comments.$invalid}">
<label>
Comments
</label>
<textarea placeholder="Enter Comments" tabindex="4"
class="form-control textdsc" name="comments"
ng-model="updatePaymentModel.comments"></textarea>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<span style="color:red;">{{updateError}}</span>
<button type="submit" tabindex="5" class="btn btn-wide btn-success" ng-click="updateUnivPayment(UpdateFormPayment,updatePaymentModel)">
Update
</button>
<input type="button" class="btn btn-warning btn-wide" tabindex="6" value="Cancel"
ng-click="cancelUpdatePaymentModal();">
</input>
</div>
</div>
</div>
</form>
</fieldset>
</div>