diff --git a/Apollo/assets/js/controllers/batchCtrl.js b/Apollo/assets/js/controllers/batchCtrl.js index b47492be..2abc1d7b 100755 --- a/Apollo/assets/js/controllers/batchCtrl.js +++ b/Apollo/assets/js/controllers/batchCtrl.js @@ -11,14 +11,21 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl "universityName":"", "switchsetting": true }; - + /* * edit batch details * created by subaram * */ $scope.editId = -1; + $scope.editModel = { + "editDate": "", + "editBatchName": "", + + }; $scope.setEditId = function (pid,p) { + $scope.editModel.editBatchName = p.BatchName; + $scope.editModel.editDate = p.BatchDate; $scope.localUniversityDetails=""; $scope.localUniversityDetails = JSON.parse(localStorage.getItem('localUniversityDetails')); @@ -61,8 +68,8 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl * created by subaram * */ $scope.batchForm = { - - submit: function (form, myModel,loading) { + + submit: function (form, myModel,loading) { var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -93,7 +100,8 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl }, data: { batchcode: myModel.batchCode, - batcheName: myModel.batchName, + batcheName: myModel.batchName, + batcheDate: $filter('date')(new Date(myModel.date), 'dd-MM-yyyy'), universityName: myModel.universityName, status: myModel.switchsetting, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID @@ -128,8 +136,8 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl * update the batch details * created by subaram * */ - $scope.updateBatch = function (myModel, form, loading) { - + $scope.updateBatch = function (myModel, form, loading,editModel) { + var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -138,7 +146,7 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl if (firstError === null && !form[field].$valid) { firstError = form[field].$stop_name; } - + if (form[field].$pristine) { form[field].$dirty = true; } @@ -147,10 +155,10 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl angular.element('.ng-invalid[name=' + firstError + ']').focus(); } else { $scope.ldloading = {}; - + $scope.ldloading[loading.replace('-', '_')] = true; - - + + var update = { method: 'POST', url: apiPoint.url + 'updateBatchDetails/', @@ -159,7 +167,8 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl }, data: { batchCode: myModel.BatchCode, - batchName: myModel.BatchName, + batchName: editModel.editBatchName, + batchDate: editModel.editDate, status: myModel.IsActive, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID } @@ -170,8 +179,8 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl $scope.editId = -1; $scope.init(); swal("", "Updated Successfully.", "success"); - - + + } else { $scope.ldloading[loading.replace('-', '_')] = false; swal("", response.data.message, "error"); @@ -201,15 +210,15 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID } }; - + $http(getBranch).then(function (response) { if (response.data.status==200 && response.data.batchStatus) { - + $scope.emptyData=true; $scope.loader=true; $scope.data = response.data.details; - + $scope.university=response.data.universityDetails; @@ -226,6 +235,26 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl }; + /* + * get date format + * created by kms + * */ + $scope.getDateFormat = function (modelDate,type) { + if(type=='1'){ + $scope.myModel.batchName=$filter('date')(new Date(modelDate), 'MMM-yyyy'); + + } + + else{ + + $scope.editModel.editBatchName=$filter('date')(new Date(modelDate), 'MMM-yyyy'); + $scope.editModel.editDate=$filter('date')(new Date(modelDate), 'dd-MM-yyyy'); + + } + + } + + }]);