diff --git a/Apollo/assets/js/controllers/semcoursemapCtrl.js b/Apollo/assets/js/controllers/semcoursemapCtrl.js index d51be1d3..55471837 100755 --- a/Apollo/assets/js/controllers/semcoursemapCtrl.js +++ b/Apollo/assets/js/controllers/semcoursemapCtrl.js @@ -721,21 +721,40 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.AddnewSubject=function(form, myModel) { + +var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$name; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[name=' + firstError + ']').focus(); + // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); + } +else{ + + if($scope.courseMode==1) { //alert('year'); $scope.Yearval =myModel.Year; $scope.Semval=''; - //console.log($scope.Yearval); - // return false; + } else { - //alert('sem'); + $scope.Semval = myModel.Sem; $scope.Yearval=''; @@ -774,8 +793,8 @@ var subname = myModel.SubjectName; // $scope.getSemSubDetails($scope.UniID,$scope.Courses); $scope.Issub=0; - // myModel.SubjectCode =''; - // myModel.SubjectName =''; + myModel.SubjectCode =''; + myModel.SubjectName =''; // $state.go($state.current, {}, {reload: true}); @@ -811,7 +830,7 @@ var subname = myModel.SubjectName; } - console.log('append fn'); + //console.log('append fn'); // console.log($scope.subjectsFromDB); // console.log($scope.subjects); angular.forEach($scope.subjectsFromDB,function(value,key) @@ -925,6 +944,8 @@ var subname = myModel.SubjectName; } }); + } + } }]);