diff --git a/Apollo/api/application/controllers/Employee_Controller.php b/Apollo/api/application/controllers/Employee_Controller.php index f8b77302..adc7fc3d 100755 --- a/Apollo/api/application/controllers/Employee_Controller.php +++ b/Apollo/api/application/controllers/Employee_Controller.php @@ -331,8 +331,8 @@ class Employee_Controller extends REST_Controller { $req['OtherID'] = $data['OtherID']; $req['OtherIDDetails'] = $data['OtherIDDetails']; $req['Qualification'] = $data['Qualification']; - $req['JobResponsibility'] = $data['JobResponsibility']; - // $req['ProfilePicPath'] = $data['ProfilePicPath']; + // $req['JobResponsibility'] = $data['JobResponsibility']; + $req['ProfilePicPath'] = $data['ProfilePicPath']; // $req['BranchCode'] = $data['BranchCode']; $req['IsActive'] = $data['IsActive']; // $req['DOJ'] = date('d-m-Y', strtotime($data['DOJ']) ); @@ -385,8 +385,8 @@ class Employee_Controller extends REST_Controller { $req['OtherID'] = $data['OtherID']; $req['OtherIDDetails'] = $data['OtherIDDetails']; $req['Qualification'] = $data['Qualification']; - $req['ProfilePicPath'] = $data['ProfilePicPath']; - $req['JobResponsibility'] = $data['JobResponsibility']; + // $req['ProfilePicPath'] = $data['ProfilePicPath']; + // $req['JobResponsibility'] = $data['JobResponsibility']; // $req['BranchCode'] = $data['BranchCode']; $req['IsActive'] = $data['IsActive']; // $req['DOJ'] = date('d-m-Y', strtotime($data['DOJ']) ); diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 4ad53981..2dd379fa 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -3,8 +3,8 @@ /** * Config for the router */ -app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$compileProvider', '$filterProvider', '$provide', '$ocLazyLoadProvider', 'JS_REQUIRES', - function ($stateProvider, $urlRouterProvider, $controllerProvider, $compileProvider, $filterProvider, $provide, $ocLazyLoadProvider, jsRequires) { +app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$compileProvider', '$filterProvider', '$provide', '$ocLazyLoadProvider', 'JS_REQUIRES', '$locationProvider', + function ($stateProvider, $urlRouterProvider, $controllerProvider, $compileProvider, $filterProvider, $provide, $ocLazyLoadProvider, jsRequires, $locationProvider) { app.controller = $controllerProvider.register; app.directive = $compileProvider.directive; @@ -13,6 +13,8 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com app.service = $provide.service; app.constant = $provide.constant; app.value = $provide.value; + + // LAZY MODULES @@ -462,7 +464,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com templateUrl: "assets/views/utility_500.html", }); - +// $locationProvider.html5Mode(true); // Generates a resolve object previously configured in constant.JS_REQUIRES (config.constant.js) function loadSequence() { diff --git a/Apollo/assets/js/controllers/activityCtrl.js b/Apollo/assets/js/controllers/activityCtrl.js index a9f8fd08..8ef015f9 100755 --- a/Apollo/assets/js/controllers/activityCtrl.js +++ b/Apollo/assets/js/controllers/activityCtrl.js @@ -74,7 +74,8 @@ app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$ // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); } else { - $scope.ldloading = {}; +if(myModel.status.length > 0) { + $scope.ldloading = {}; $scope.ldloading[loading.replace('-', '_')] = true; @@ -106,6 +107,11 @@ app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$ } }); +} else { +swal("Warning!", "Status are required", "warning"); + $scope.companies.status = ""; +} + } } diff --git a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js index e87bde88..919da6f5 100755 --- a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js +++ b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js @@ -296,8 +296,8 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa 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 { - localDetails.localBranchID = localBranchDetails; - localDetail.localBranchID = localBranchDetails; + localDetails.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetails.localBranchID ; + localDetail.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetail.localBranchID ; $scope.disableButton = true; var studentForUpdate = []; let formate = "dd-MM-yyyy"; diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js index d30b91d7..b21b8268 100755 --- a/Apollo/assets/js/controllers/applicationStatusCtrl.js +++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js @@ -28,6 +28,8 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl var localDetails = ipCookie('cookiechk'); const localUpdateStatus = 'APPICATION_STATUS'; + $scope.localTypeSuperAdmin = false; + $scope.localBranchDetails = ''; $scope.init = function () { @@ -324,8 +326,11 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl 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 { - localDetails.localBranchID = localBranchDetails; - localDetail.localBranchID = localBranchDetails; + // alert(localDetail.localBranchID); + // alert(localBranchDetails); + localDetails.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetails.localBranchID ; + localDetail.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetail.localBranchID ; + // alert(localDetail.localBranchID); $scope.disableButton = true; var studentForUpdate = []; let formate = "dd-MM-yyyy"; diff --git a/Apollo/assets/js/controllers/certificationStatusCtrl.js b/Apollo/assets/js/controllers/certificationStatusCtrl.js index 1cf38c8e..71a2edf3 100755 --- a/Apollo/assets/js/controllers/certificationStatusCtrl.js +++ b/Apollo/assets/js/controllers/certificationStatusCtrl.js @@ -331,9 +331,9 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa 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 { - localDetails.localBranchID = localBranchDetails; - localDetail.localBranchID = localBranchDetails; - $scope.disableButton = true; + localDetails.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetails.localBranchID ; + localDetail.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetail.localBranchID ; + $scope.disableButton = true; var studentForUpdate = []; let formate = "dd-MM-yyyy"; $scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate); diff --git a/Apollo/assets/js/controllers/employeeCtrl.js b/Apollo/assets/js/controllers/employeeCtrl.js index 0986dd99..0da07f2d 100755 --- a/Apollo/assets/js/controllers/employeeCtrl.js +++ b/Apollo/assets/js/controllers/employeeCtrl.js @@ -132,6 +132,29 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ $scope.editId = id; $scope.editBranchId = -1; } + $scope.getEditDetails = function(p) { + $scope.myModelEdit = { + "StaffID": p.StaffID, + "Firstname": p.Firstname, + "Lastname": p.Lastname, + "Fathername": p.Fathername, + "MotherName": p.MotherName, + "EmailID": p.EmailID, + "MobileNumber": p.MobileNumber, + "AlternateNumber": p.AlternateNumber, + "DOB": p.DOB, + "Gender": p.Gender, + "Qualification":p.Qualification, + "AadharNumber": p.AadharNumber, + "OtherID": p.OtherID, + "OtherIDDetails": p.OtherIDDetails, + "PermanentAddress": p.PermanentAddress, + "PresentAddress": p.PresentAddress, + "DOJ": p.DOJ, + "IsActive": p.IsActive, + "ProfilePicPath": p.ProfilePicPath + } + } $scope.setEditBranchId = function (id) { $scope.getEmpBranchDetails(id); diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js index 4ca9dc8b..cddae935 100755 --- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js +++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js @@ -306,8 +306,8 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); } else { // alert(localBranchDetails); - localDetails.localBranchID = localBranchDetails; - localDetail.localBranchID = localBranchDetails; + localDetails.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetails.localBranchID ; + localDetail.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetail.localBranchID ; // alert(localDetails.localBranchID); $scope.disableButton = true; var studentForUpdate = []; diff --git a/Apollo/assets/js/main.js b/Apollo/assets/js/main.js index 0a1bad8f..9e1d7505 100755 --- a/Apollo/assets/js/main.js +++ b/Apollo/assets/js/main.js @@ -67,6 +67,11 @@ function (cfpLoadingBarProvider) { cfpLoadingBarProvider.includeSpinner = false; }]); +// app.config(['$locationProvider', +// function ($locationProvider) { +// $locationProvider.html5Mode(true); +// }]); + // app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", function ($scope, $localStorage, $state) { // /** // * checking the session settings and logout for the function diff --git a/Apollo/assets/views/editEmployeeDetails.html b/Apollo/assets/views/editEmployeeDetails.html index 66f092da..3f1d4156 100755 --- a/Apollo/assets/views/editEmployeeDetails.html +++ b/Apollo/assets/views/editEmployeeDetails.html @@ -158,7 +158,7 @@ Employee ID - Employee Id required Invalid Employee Id @@ -170,7 +170,7 @@ First Name - First Name required Invalid First Name @@ -181,7 +181,7 @@ Last Name - Last Name required Invalid Last Name @@ -193,7 +193,7 @@ Father Name - Invalid Father Name @@ -203,7 +203,7 @@ Mother Name - Invalid Last Name @@ -212,7 +212,7 @@ Email ID + ng-model="myModelEdit.EmailID" ng-blur='updateCheckEmailExist(p)' required> Email is required. Please, enter a valid email address. @@ -224,7 +224,7 @@ Mobile Number - Mobile Number is required. @@ -234,7 +234,7 @@ - Enter a Valid Phone Number @@ -248,7 +248,7 @@ class="symbol required"> - @@ -266,11 +266,11 @@ Gender