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:
dineshkumarkannan 2018-09-05 09:38:03 +05:30
commit 22d549f53f
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,22 +98,11 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
$scope.show = false; $scope.show = false;
$scope.onSubmit = function (form) { $scope.onSubmit = function (form) {
var firstError = null; if($scope.univModel.university !== null && $scope.univModel.university !== '' ){
if (form.$invalid) { $scope.filterUniv = angular.fromJson($scope.univModel.university);
var field = null, firstError = null;
$scope.show = true;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$batch;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[batch=' + firstError + ']').focus();
}else { }else {
$scope.filterUniv = '';
}
//alert($scope.batch.name); //alert($scope.batch.name);
$scope.examfee_data = ''; $scope.examfee_data = '';
$scope.message = ''; $scope.message = '';
@ -125,7 +114,7 @@ app.controller('report_examfeeCtrl', ["$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
} }
@ -150,7 +139,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
totalf += parseFloat(item.Amount); totalf += parseFloat(item.Amount);
} }
return totalf; } return totalf; }
}
} }
var mystyle = { var mystyle = {
sheetid: 'EXAM WRITING FEE REPORT', sheetid: 'EXAM WRITING FEE REPORT',