diff --git a/Apollo/assets/js/controllers/sessionMasterCtrl.js b/Apollo/assets/js/controllers/sessionMasterCtrl.js index a1167e08..2871be8e 100644 --- a/Apollo/assets/js/controllers/sessionMasterCtrl.js +++ b/Apollo/assets/js/controllers/sessionMasterCtrl.js @@ -16,9 +16,16 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", * created by kms * */ $scope.editId = -1; + $scope.editModel = { + "editDate": "", + "editSessionName": "", + + }; $scope.setEditId = function (p) { $scope.editId = p.SessionID; + $scope.editModel.editSessionName = p.SessionName; + $scope.editModel.editDate = p.SessionDate; $scope.viewId = -1; $scope.splitUnivertyToArray = p.UniversityID.split(','); @@ -88,6 +95,7 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", }, data: { sessionName: myModel.sessionName, + sessionDate: $filter('date')(new Date(myModel.date), 'dd-MM-yyyy'), universityName: myModel.universityName, status: myModel.switchsetting, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID @@ -120,7 +128,7 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", * update the session details * created by kms * */ - $scope.updateSession = function (myModel,university, form, loading) { + $scope.updateSession = function (myModel,university, form, loading,editModel) { var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -150,7 +158,8 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", }, data: { sessionID: myModel.SessionID, - sessionName: myModel.SessionName, + sessionDate: editModel.editDate, + sessionName: editModel.editSessionName, status: myModel.IsActive, university: university.list, updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID @@ -222,6 +231,25 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", }); }; + /* + * get date format + * created by kms + * */ + $scope.getDateFormat = function (modelDate,type) { + if(type=='1'){ + $scope.myModel.sessionName=$filter('date')(new Date(modelDate), 'MMM-yyyy'); + + } + + else{ + + $scope.editModel.editSessionName=$filter('date')(new Date(modelDate), 'MMM-yyyy'); + $scope.editModel.editDate=$filter('date')(new Date(modelDate), 'dd-MM-yyyy'); + + } + + } +