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:
velz 2018-08-22 12:00:41 +05:30
commit f6e057a078
23 changed files with 219 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Apollo/api/application/models/Fees_status_model.php
View File

@ -507,6 +507,7 @@ class Fees_status_model extends CI_Model
$this->db->select('ReceiptNo'); $this->db->select('ReceiptNo');
$this->db->where('ReceiptNo', $feesPaidDetails['ReceiptNo']); $this->db->where('ReceiptNo', $feesPaidDetails['ReceiptNo']);
$this->db->where('IsActive', '1');
if($this->db->get(STUDENTS_FEES_PAID)->first_row() AND $feesPaidDetails['ReceiptNo']!=''){ if($this->db->get(STUDENTS_FEES_PAID)->first_row() AND $feesPaidDetails['ReceiptNo']!=''){
$result['paidStatus'] = false; $result['paidStatus'] = false;
$result['message'] = "This receipt number is already exist!"; $result['message'] = "This receipt number is already exist!";

1
Apollo/assets/js/controllers/applicationStatusCtrl.js
View File

@ -364,7 +364,6 @@ $scope.editStatusID = id;
$scope.statusUpdate = { $scope.statusUpdate = {
submit: function (form, localBranchDetails, id) { submit: function (form, localBranchDetails, id) {
// alert(localBranchDetails);
var firstError = null; var firstError = null;
if (form.$invalid) { if (form.$invalid) {
var field = null, firstError = null; var field = null, firstError = null;

16
Apollo/assets/js/controllers/report_ans_bookletCtrl.js
View File

@ -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.show = false;
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
var firstError = null; var firstError = null;
if (form.$invalid) { if (form.$invalid) {
var field = null, firstError = null; var field = null, firstError = null;
@ -111,7 +125,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
}, },
data: { data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.univModel.university.universityID, university: $scope.filterUniv.universityID,
batch: $scope.univModel.batch batch: $scope.univModel.batch
} }

14
Apollo/assets/js/controllers/report_app_pendingCtrl.js
View File

@ -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.show = false;
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
var firstError = null; var firstError = null;

16
Apollo/assets/js/controllers/report_balfeeCtrl.js
View File

@ -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 // response data
$scope.show = false; $scope.show = false;
$scope.returnResultData = []; $scope.returnResultData = [];
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
$scope.returnResultData.length=0; $scope.returnResultData.length=0;
var firstError = null; var firstError = null;
if (form.$invalid) { if (form.$invalid) {
@ -121,7 +135,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
}, },
data: { data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.univModel.university.universityID, university: $scope.filterUniv.universityID,
batch: $scope.univModel.batch batch: $scope.univModel.batch
} }

3
Apollo/assets/js/controllers/report_certificateCtrl.js
View File

@ -110,6 +110,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
}); });
$scope.onSubmit = function () { $scope.onSubmit = function () {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
//alert($scope.batch.name); //alert($scope.batch.name);
$scope.cert_data = ''; $scope.cert_data = '';
$scope.message = ''; $scope.message = '';
@ -121,7 +122,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
}, },
data: { data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.univModel.university.universityID, university: $scope.filterUniv.universityID,
batch: $scope.univModel.batch, batch: $scope.univModel.batch,
from : $scope.univModel.from_date, from : $scope.univModel.from_date,
to : $scope.univModel.to_date to : $scope.univModel.to_date

18
Apollo/assets/js/controllers/report_doc_pendingCtrl.js
View File

@ -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.show = false;
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
var firstError = null; var firstError = null;
if (form.$invalid) { if (form.$invalid) {
var field = null, firstError = null; var field = null, firstError = null;
@ -112,7 +126,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
}, },
data: { data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.univModel.university.universityID, university: $scope.filterUniv.universityID,
batch: $scope.univModel.batch batch: $scope.univModel.batch
} }

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

@ -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.show = false;
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {

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

@ -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.onSubmit = function () {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
//alert($scope.batch.name); //alert($scope.batch.name);
$scope.mark_cert_data = ''; $scope.mark_cert_data = '';
$scope.message = ''; $scope.message = '';
@ -96,7 +122,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
}, },
data: { data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.univModel.university.universityID, university: $scope.filterUniv.universityID,
batch: $scope.univModel.batch, batch: $scope.univModel.batch,
from : $scope.univModel.from_date, from : $scope.univModel.from_date,
to : $scope.univModel.to_date to : $scope.univModel.to_date

4
Apollo/assets/js/controllers/report_markcard_statusCtrl.js
View File

@ -97,6 +97,8 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
$scope.show = false; $scope.show = false;
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
var firstError = null; var firstError = null;
if (form.$invalid) { if (form.$invalid) {
var field = null, firstError = null; var field = null, firstError = null;
@ -124,7 +126,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
}, },
data: { data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.univModel.university.universityID, university: $scope.filterUniv.universityID,
batch: $scope.univModel.batch batch: $scope.univModel.batch
} }

3
Apollo/assets/js/controllers/report_study_material_statusCtrl.js
View File

@ -89,6 +89,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
$scope.show = false; $scope.show = false;
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
var firstError = null; var firstError = null;
if (form.$invalid) { if (form.$invalid) {
var field = null, firstError = null; var field = null, firstError = null;
@ -116,7 +117,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
}, },
data: { data: {
branch : JSON.parse(localStorage.getItem('localObj')).localBranchID, branch : JSON.parse(localStorage.getItem('localObj')).localBranchID,
university : $scope.univModel.university.universityID, university : $scope.filterUniv.universityID,
batch : $scope.univModel.batch batch : $scope.univModel.batch
} }

12
Apollo/assets/js/controllers/report_waiver_referalCtrl.js
View File

@ -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.show = false;
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
var firstError = null; var firstError = null;

4
Apollo/assets/js/main.js
View File

@ -14,8 +14,8 @@ function ($rootScope, $state, $stateParams) {
// set below basic information // set below basic information
$rootScope.app = { $rootScope.app = {
name: 'Apollo', // name of your project name: 'Apollo', // name of your project
author: 'Apollo Distance Education Center', // author's name or company name author: 'Apollo Distance Education College', // author's name or company name
description: 'Distance Education Center', // brief description description: 'Distance Education College', // brief description
version: '1.0', // current version version: '1.0', // current version
year: ((new Date()).getFullYear()), // automatic current year (for copyright information) year: ((new Date()).getFullYear()), // automatic current year (for copyright information)
isMobile: (function () {// true if the browser is a mobile device isMobile: (function () {// true if the browser is a mobile device

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

@ -614,7 +614,7 @@ ng-minlength="6" required/>
<div class="copyright"> <div class="copyright">
© 2018 Apollo Distance Education Center. All rights reserved © 2018 Apollo Distance Education College. All rights reserved
</div> </div>

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

@ -41,20 +41,26 @@ td,th {
University University
</label> </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> <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>
<div class="col-md-3"> <div class="col-md-3">
<label for="form-field-select-2"> <label for="form-field-select-2">
Batch Batch
</label> </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> <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>
<div class="col-md-2" style="padding-top: 2.3%;"> <div class="col-md-2" style="padding-top: 2.3%;">
<div > <div >

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

@ -38,25 +38,31 @@
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<label for="form-field-select-2"> <label for="form-field-select-2">
University University
</label> </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> <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>
<div class="col-md-3"> <div class="col-md-3">
<label for="form-field-select-2"> <label for="form-field-select-2">
Batch Batch
</label> </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> <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>
<div class="col-md-2" style="padding-top: 2.3%;"> <div class="col-md-2" style="padding-top: 2.3%;">
<div > <div >

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

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

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

@ -36,25 +36,31 @@ td,th {
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<label for="form-field-select-2"> <label for="form-field-select-2">
University University
</label> </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> <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>
<div class="col-md-3"> <div class="col-md-3">
<label for="form-field-select-2"> <label for="form-field-select-2">
Batch Batch
</label> </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> <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>
<div class="col-md-2" style="padding-top: 2.3%;"> <div class="col-md-2" style="padding-top: 2.3%;">
<div > <div >

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

@ -36,25 +36,31 @@
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<label for="form-field-select-2"> <label for="form-field-select-2">
University University
</label> </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> <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>
<div class="col-md-3"> <div class="col-md-3">
<label for="form-field-select-2"> <label for="form-field-select-2">
Batch Batch
</label> </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> <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>
<div class="col-md-2" style="padding-top: 2.3%;"> <div class="col-md-2" style="padding-top: 2.3%;">
<div > <div >

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

@ -86,6 +86,7 @@
</div> </div>
<div pdf-save-content="getpdf" class="table-responsive"> <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"> <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 University
</label> </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> <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>
<div class="col-md-4"> <div class="col-md-4">
<label for="form-field-select-2"> <label for="form-field-select-2">
Batch Batch
</label> </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> <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> </div>
<div class="row"> <div class="row">
@ -96,7 +104,7 @@ td,th {
<div class="col-md-3" style="padding-top: 2.3%;"> <div class="col-md-3" style="padding-top: 2.3%;">
<div > <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 Submit
</button> </button>

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

@ -34,25 +34,31 @@
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<label for="form-field-select-2"> <label for="form-field-select-2">
University University
</label> </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> <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>
<div class="col-md-3"> <div class="col-md-3">
<label for="form-field-select-2"> <label for="form-field-select-2">
Batch Batch
</label> </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> <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>
<div class="col-md-2" style="padding-top: 2.3%;"> <div class="col-md-2" style="padding-top: 2.3%;">
<div > <div >

8
Apollo/assets/views/status-update/application_status.html
View File

@ -217,7 +217,7 @@
<tr ng-show="statusUpdationId ===p.UNI_ID" ng-if="statusUpdationId === p.UNI_ID"> <tr ng-show="statusUpdationId ===p.UNI_ID" ng-if="statusUpdationId === p.UNI_ID">
<td colspan="7"> <td colspan="7">
<div ng-if="OpenWindowStatus"> <div ng-if="OpenWindowStatus">
<div ng-if="!localTypeSuperAdmin"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel , localBranchDetails)" method="post"> <div ng-if="!localTypeSuperAdmin">
<style> <style>
#cancel_button { #cancel_button {
margin-top: 1px; margin-top: 1px;
@ -261,9 +261,9 @@
<td><i ng-click="statusUpdateView(stufmtype.ID)" tooltip="STATUS UPDATE" class="ti-slice"></i></td> <td><i ng-click="statusUpdateView(stufmtype.ID)" tooltip="STATUS UPDATE" class="ti-slice"></i></td>
</tr> </tr>
<tr ng-if="editStatusID == stufmtype.ID"> <tr ng-if="editStatusID == stufmtype.ID">
<td colspan="6"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit1(Form, localBranchDetails, stufmtype.ID)" method="post"> <td colspan="6"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, localBranchDetails, stufmtype.ID)" method="post">
<div class="container"> <div class="container">
<div class="row"> <div class="row"> {{stufmtype.ID}}
<div class="col-md-6 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}"> <div class="col-md-6 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
<label for="form-field-select-2"> <label for="form-field-select-2">
Status <span class="symbol required"></span> Status <span class="symbol required"></span>
@ -411,7 +411,7 @@
</div> </div>
</div> </div>
</div> </div>
</form></div> </div>
<div ng-if="localTypeSuperAdmin"> <div ng-if="localTypeSuperAdmin">
<style> <style>
#cancel_button { #cancel_button {