Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
commit
22d549f53f
@ -98,22 +98,11 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
|
||||
|
||||
$scope.show = false;
|
||||
$scope.onSubmit = function (form) {
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
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();
|
||||
if($scope.univModel.university !== null && $scope.univModel.university !== '' ){
|
||||
$scope.filterUniv = angular.fromJson($scope.univModel.university);
|
||||
}else {
|
||||
$scope.filterUniv = '';
|
||||
}
|
||||
//alert($scope.batch.name);
|
||||
$scope.examfee_data = '';
|
||||
$scope.message = '';
|
||||
@ -125,7 +114,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
|
||||
},
|
||||
data: {
|
||||
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
|
||||
university: $scope.univModel.university.universityID,
|
||||
university: $scope.filterUniv.universityID,
|
||||
batch: $scope.univModel.batch
|
||||
|
||||
}
|
||||
@ -150,7 +139,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
|
||||
totalf += parseFloat(item.Amount);
|
||||
}
|
||||
return totalf; }
|
||||
}
|
||||
|
||||
}
|
||||
var mystyle = {
|
||||
sheetid: 'EXAM WRITING FEE REPORT',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user