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

Apollo/assets/js/controllers/report_certificateCtrl.js

@@ -2,7 +2,6 @@
 /*** controller***/
 app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$modal", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService",
     function ($scope, $filter,$rootScope,$modal, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService) {
-
         /*
          * auto call tracking
          */
@@ -83,6 +82,32 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
                 }
             });
         }
+        /* 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);

Apollo/assets/js/controllers/report_markcard_statusCtrl.js

@@ -2,7 +2,6 @@
 /*** controller***/
 app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService","$modal",
     function ($scope, $filter,$rootScope, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService,$modal,$log) {
-
         /**
          * auto call tracking
          */
@@ -82,6 +81,19 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
                 }
             });
         }
+        /* watch university model for bind batch objects*/
+
+        $scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
+
+        });
 
         $scope.show = false;
         $scope.onSubmit = function (form) {

Apollo/assets/js/controllers/report_study_material_statusCtrl.js

@@ -72,6 +72,19 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
                 }
             });
         }
+        /* watch university model for bind batch objects*/
+
+        $scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
+
+        });
 		
           
   $scope.show = false;

Apollo/assets/views/report_certificate_status.html

@@ -41,18 +41,26 @@ td,th {
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
-                                  </select>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
+                                </select>
+                                <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-4">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
-                                 </select>
+                                    <option ng-repeat="batchDetails in filterBatchDetails.batchDetails"  value="{{batchDetails.BatchCode}}">{{batchDetails.BatchName}}</option>
+
+                                </select>
+                                <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
                             </div>
                         </div>
                         <div class="row">
@@ -94,13 +102,10 @@ td,th {
                                     </div> -->
 
                             <div class="col-md-3" style="padding-top: 2.3%;">
-                                <div >
+                                    <button type="submit" class="btn btn-success btn-o" tabindex="8" ng-disabled="disableSubmit==true">
-
-                                    <button type="submit" class="btn btn-success btn-o" tabindex="8">
                                         Submit
                                     </button>
 
-                                </div>
                             </div>
                         </div>
                         

Apollo/assets/views/report_markcardstatus.html

@@ -15,9 +15,6 @@
 	  }
 	   .table>tbody>tr>td { padding: 2px; }
 </style>
-
-
-</script>
 <div class="container-fluid container-fullw bg-white">
     <div ng-controller="report_markcard_statusCtrl" ng-init="filters()">
         <form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
@@ -32,20 +29,26 @@
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
-                                  </select>
+                                    <!--details.universityName for details in university-->
-								  <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
+                                </select>
+                                <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
-                                 </select>
+                                    <option ng-repeat="batchDetails in filterBatchDetails.batchDetails"  value="{{batchDetails.BatchCode}}">{{batchDetails.BatchName}}</option>
-								 <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
+
+                                </select>
+                                <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
                             </div>
                             <!-- <div class="col-md-3">
                                         <label for="form-field-select-2">

Apollo/assets/views/report_studymaterialstatus.html

@@ -29,31 +29,27 @@
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
-                                  </select>
+                                    <!--details.universityName for details in university-->
-								  <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
+                                </select>
+                                <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
-                                 </select>
+                                    <option ng-repeat="batchDetails in filterBatchDetails.batchDetails"  value="{{batchDetails.BatchCode}}">{{batchDetails.BatchName}}</option>
-								 <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
-                            </div>
-                            <!-- <div class="col-md-3">
-                                        <label for="form-field-select-2">
-                                                           Batch
-                                    </label>
 
-                                        <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
+                                </select>
-                                    <option value="" selected>Select Batch</option>
+                                <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
-                                    <option ng-repeat="itemBatch in batchData"  value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
+                            </div>
-                                    </select>
-                                    </div> -->
 
                             <div class="col-md-2" style="padding-top: 2.3%;">
                                 <div class="pull-right">