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

drop down issues fixes in reports

Browse Source
This commit is contained in:
gandhimathi 2018-08-22 10:11:15 +05:30
parent acce228d61
commit 51dbcec9af
9 changed files with 118 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
View File

@ -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);

18
Apollo/assets/views/report_answer_booklets.html
View File

@ -41,20 +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" 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>
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
<!--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-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>
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
<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 class="col-md-2" style="padding-top: 2.3%;">
<div >

20
Apollo/assets/views/report_application_pending.html
View File

@ -38,25 +38,31 @@
<div class="row">
<div class="col-md-3">
<div class="col-md-3">
<label for="form-field-select-2">
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>
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
<!--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-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>
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
<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 class="col-md-2" style="padding-top: 2.3%;">
<div >

22
Apollo/assets/views/report_balance_fee.html
View File

@ -30,27 +30,31 @@
<div class="row">
<div class="col-md-3">
<div class="col-md-3">
<label for="form-field-select-2">
University
</label>
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.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>
<option ng-repeat="details in university" value="{{details.universityID}}">{{details.universityName}}</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
<!--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-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" 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>
<option ng-repeat="batch in univModel.university.batchDetails" value="{{batch.BatchCode}}">{{batch.BatchName}}</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
<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 class="col-md-2" style="padding-top: 2.3%;">
<div >

22
Apollo/assets/views/report_document_pending.html
View File

@ -36,25 +36,31 @@ td,th {
<div class="row">
<div class="col-md-3">
<div class="col-md-3">
<label for="form-field-select-2">
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>
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
<!--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-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>
<option value="" selected >Select Batch</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
<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>
<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 class="col-md-2" style="padding-top: 2.3%;">
<div >

20
Apollo/assets/views/report_exam_writing_fee.html
View File

@ -36,25 +36,31 @@
<div class="row">
<div class="col-md-3">
<div class="col-md-3">
<label for="form-field-select-2">
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>
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
<!--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-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>
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
<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 class="col-md-2" style="padding-top: 2.3%;">
<div >

1
Apollo/assets/views/report_expense.html
View File

@ -86,6 +86,7 @@
</div>
<div pdf-save-content="getpdf" class="table-responsive">
<h4 style="text-align:center;">Expense Report {{filters.from_date | date : "dd-MM-yyyy"}} To {{filters.to_date | date : "dd-MM-yyyy"}}</h4>
<table id="datatable" class="table table-hover">

18
Apollo/assets/views/report_mark_certificate_status.html
View File

@ -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">
@ -96,7 +104,7 @@ td,th {
<div class="col-md-3" style="padding-top: 2.3%;">
<div >
<button type="submit" class="btn btn-success btn-o" tabindex="8">
<button type="submit" class="btn btn-success btn-o" tabindex="8" ng-disabled="disableSubmit==true">
Submit
</button>

20
Apollo/assets/views/report_waiver_referal.html
View File

@ -34,25 +34,31 @@
<div class="row">
<div class="col-md-3">
<div class="col-md-3">
<label for="form-field-select-2">
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>
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
<!--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-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>
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
<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 class="col-md-2" style="padding-top: 2.3%;">
<div >