diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 4b6896d3..9b330645 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -507,6 +507,7 @@ class Fees_status_model extends CI_Model $this->db->select('ReceiptNo'); $this->db->where('ReceiptNo', $feesPaidDetails['ReceiptNo']); + $this->db->where('IsActive', '1'); if($this->db->get(STUDENTS_FEES_PAID)->first_row() AND $feesPaidDetails['ReceiptNo']!=''){ $result['paidStatus'] = false; $result['message'] = "This receipt number is already exist!"; diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js index fe89f7a6..0ad95cc8 100644 --- a/Apollo/assets/js/controllers/applicationStatusCtrl.js +++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js @@ -364,7 +364,6 @@ $scope.editStatusID = id; $scope.statusUpdate = { submit: function (form, localBranchDetails, id) { - // alert(localBranchDetails); var firstError = null; if (form.$invalid) { var field = null, firstError = null; diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index 1f0e9b59..2ab1a193 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -82,8 +82,22 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); $scope.show = false; $scope.onSubmit = function (form) { + $scope.filterUniv = angular.fromJson($scope.univModel.university); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -111,7 +125,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch } diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index 4a860046..8d68f3e1 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -82,6 +82,20 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); + //Response data $scope.show = false; $scope.onSubmit = function (form) { var firstError = null; diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index 01ed7ef8..1d018b55 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -90,10 +90,24 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); // response data $scope.show = false; $scope.returnResultData = []; $scope.onSubmit = function (form) { + $scope.filterUniv = angular.fromJson($scope.univModel.university); $scope.returnResultData.length=0; var firstError = null; if (form.$invalid) { @@ -121,7 +135,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch } diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index ab4cd9c0..93fe25ad 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -110,6 +110,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod }); $scope.onSubmit = function () { + $scope.filterUniv = angular.fromJson($scope.univModel.university); //alert($scope.batch.name); $scope.cert_data = ''; $scope.message = ''; @@ -121,7 +122,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch, from : $scope.univModel.from_date, to : $scope.univModel.to_date diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index 13e268ad..c0b254c7 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -82,9 +82,23 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); + //Response data $scope.show = false; $scope.onSubmit = function (form) { - + $scope.filterUniv = angular.fromJson($scope.univModel.university); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -112,7 +126,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch } diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index 66bca916..a66e6e88 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -82,6 +82,19 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); $scope.show = false; $scope.onSubmit = function (form) { diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index af4fe036..62636564 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -83,8 +83,34 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco } }); } + /* watch university model for bind batch objects*/ + $scope.$watchCollection('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + $scope.disableSubmit=true; + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + $scope.disableSubmit=false; + } + } + + }); + // disable submit + $scope.$watchCollection('filters.from_date', function (newValue,oldValue) { + if(newValue==undefined || newValue=='' || newValue==null){ + $scope.disableSubmit=true; + } + else{ + $scope.disableSubmit=false; + + } + + }); $scope.onSubmit = function () { + $scope.filterUniv = angular.fromJson($scope.univModel.university); //alert($scope.batch.name); $scope.mark_cert_data = ''; $scope.message = ''; @@ -96,7 +122,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch, from : $scope.univModel.from_date, to : $scope.univModel.to_date diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index 93bf760d..477c6bee 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -97,6 +97,8 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", $scope.show = false; $scope.onSubmit = function (form) { + + $scope.filterUniv = angular.fromJson($scope.univModel.university); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -124,7 +126,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch } diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index ff76c9af..0794ccee 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -89,6 +89,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc $scope.show = false; $scope.onSubmit = function (form) { + $scope.filterUniv = angular.fromJson($scope.univModel.university); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -116,7 +117,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc }, data: { branch : JSON.parse(localStorage.getItem('localObj')).localBranchID, - university : $scope.univModel.university.universityID, + university : $scope.filterUniv.universityID, batch : $scope.univModel.batch } diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index d668ee2e..8d1ff908 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -49,7 +49,19 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + }); $scope.show = false; $scope.onSubmit = function (form) { var firstError = null; diff --git a/Apollo/assets/js/main.js b/Apollo/assets/js/main.js index b47b5a04..a56751ff 100755 --- a/Apollo/assets/js/main.js +++ b/Apollo/assets/js/main.js @@ -14,8 +14,8 @@ function ($rootScope, $state, $stateParams) { // set below basic information $rootScope.app = { name: 'Apollo', // name of your project - author: 'Apollo Distance Education Center', // author's name or company name - description: 'Distance Education Center', // brief description + author: 'Apollo Distance Education College', // author's name or company name + description: 'Distance Education College', // brief description version: '1.0', // current version year: ((new Date()).getFullYear()), // automatic current year (for copyright information) isMobile: (function () {// true if the browser is a mobile device diff --git a/Apollo/assets/views/login_login.html b/Apollo/assets/views/login_login.html index 3e6aca69..91eb58c1 100755 --- a/Apollo/assets/views/login_login.html +++ b/Apollo/assets/views/login_login.html @@ -614,7 +614,7 @@ ng-minlength="6" required/> diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html index efed3b3f..9cf967c8 100755 --- a/Apollo/assets/views/report_answer_booklets.html +++ b/Apollo/assets/views/report_answer_booklets.html @@ -41,20 +41,26 @@ td,th { University - - - Please select University. + + + + + Please select University. +
- - - Please select Batch. + + + + Please select Batch.
diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index 02d43f09..efefaf4f 100755 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -38,25 +38,31 @@
-
+
- - - Please select University. + + + + + Please select University.
+
- - - Please select Batch. + + + + Please select Batch.
diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html index ce388210..61ca29e3 100755 --- a/Apollo/assets/views/report_balance_fee.html +++ b/Apollo/assets/views/report_balance_fee.html @@ -30,27 +30,31 @@
-
+
- - - - Please select University. + + + + + Please select University.
+
- - - - Please select Batch. + + + + Please select Batch.
diff --git a/Apollo/assets/views/report_document_pending.html b/Apollo/assets/views/report_document_pending.html index 614a6270..196735c2 100755 --- a/Apollo/assets/views/report_document_pending.html +++ b/Apollo/assets/views/report_document_pending.html @@ -36,25 +36,31 @@ td,th {
-
+
- - - Please select University. + + + + + Please select University.
+
- - Please select Batch. + + Please select Batch.
diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html index 0f3e1135..d5b73131 100755 --- a/Apollo/assets/views/report_exam_writing_fee.html +++ b/Apollo/assets/views/report_exam_writing_fee.html @@ -36,25 +36,31 @@
-
+
- - - Please select University. + + + + + Please select University.
+
- - - Please select Batch. + + + + Please select Batch.
diff --git a/Apollo/assets/views/report_expense.html b/Apollo/assets/views/report_expense.html index 263e52b8..9306517b 100755 --- a/Apollo/assets/views/report_expense.html +++ b/Apollo/assets/views/report_expense.html @@ -86,6 +86,7 @@
+

Expense Report {{filters.from_date | date : "dd-MM-yyyy"}} To {{filters.to_date | date : "dd-MM-yyyy"}}

diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html index 9b03961b..6444ce49 100755 --- a/Apollo/assets/views/report_mark_certificate_status.html +++ b/Apollo/assets/views/report_mark_certificate_status.html @@ -41,18 +41,26 @@ td,th { University - - + + + + + Please select University. +
- - + + + + Please select Batch.
@@ -96,7 +104,7 @@ td,th {
- diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html index 7307d27c..0937e42b 100755 --- a/Apollo/assets/views/report_waiver_referal.html +++ b/Apollo/assets/views/report_waiver_referal.html @@ -34,25 +34,31 @@
-
+
- - - Please select University. + + + + + Please select University.
+
- - - Please select Batch. + + + + Please select Batch.
diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html index f10b322c..0beb8894 100644 --- a/Apollo/assets/views/status-update/application_status.html +++ b/Apollo/assets/views/status-update/application_status.html @@ -217,7 +217,7 @@
-
+