diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index af4fe036..cd1bc23e 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -83,6 +83,32 @@ 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 () { //alert($scope.batch.name); 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.