diff --git a/Apollo/api/application/controllers/Employee_Controller.php b/Apollo/api/application/controllers/Employee_Controller.php index 73e0053b..c5689121 100644 --- a/Apollo/api/application/controllers/Employee_Controller.php +++ b/Apollo/api/application/controllers/Employee_Controller.php @@ -235,8 +235,8 @@ class Employee_Controller extends REST_Controller { $req['MobileNumber'] = $data['MobileNumber']; $req['AlternateNumber'] = $data['AlternateNumber']; $req['Gender'] = $data['Gender']; - $req['DOB'] = date('d-m-Y', strtotime($data['DOB']) ); - // $req['DOB'] = $data['dateofbirth']; + // $req['DOB'] = date('d-m-Y', strtotime($data['DOB']) ); + $req['DOB'] = $data['DOB']; $req['PresentAddress'] = $data['PresentAddress']; $req['PermanentAddress'] = $data['PermanentAddress']; $req['AadharNumber'] = $data['AadharNumber']; @@ -292,13 +292,15 @@ class Employee_Controller extends REST_Controller { // update employee branch public function updateEmpBranchDetail_post() { + $empFor = $this->post('empFor'); $reqBanch['BranchCode'] = $this->post('updateBranch'); $req['ListCode'] = $this->post('updateRole'); $req['UpdatedBy'] = $this->post('updateBy'); $date = date('Y-m-d H:i:s'); $req['UpdatedOn'] = $date; - $updateBranch = $this->employee_model->upate_employee_branch( $empFor, $reqBanch, $req );// Check if the employee exist + + $updateBranch = $this->employee_model->upate_employee_branch( $empFor, $reqBanch, $req, $req['UpdatedBy'], $req['UpdatedOn'] );// Check if the employee exist if ($updateBranch) { $updateBranch['status'] = REST_Controller::HTTP_OK; diff --git a/Apollo/api/application/models/Employee_model.php b/Apollo/api/application/models/Employee_model.php index 552c6ca0..b64de812 100644 --- a/Apollo/api/application/models/Employee_model.php +++ b/Apollo/api/application/models/Employee_model.php @@ -337,33 +337,19 @@ class Employee_model extends CI_Model $this->db->where('StaffID', $updateFor); $this->db->update(STAFF, $empArr); if ($this->db->affected_rows() == '1') { - $result['updateEmpStatus'] = true; - $result['message'] = "Successfully employee details Udated"; - // $branchArr['BranchCode'] = $empArr['BranchCode']; - // $branchArr['IsActive'] = $empArr['IsActive']; - // $branchArr['CreatedBy'] = $createdBy; - // $this->db->where('StaffID',$updateFor); - // $this->db->insert(STAFF_BRANCH, $branchArr); - // if($this->db->affected_rows() == '1'){ - // $loginArr['StaffID'] = $empArr['StaffID']; - // $loginArr['ListCode'] = $empArr['ListCode']; - // $loginArr['MobileNumber'] = $empArr['MobileNumber']; - // $loginArr['EmailId'] = $empArr['EmailID']; - // $loginArr['IsActive'] = $empArr['IsActive']; - // $loginArr['CreatedBy'] = $createdBy; - // $loginArr['Password'] = ENCR_PASSWORD; - // $this->db->insert(LOGIN, $loginArr); - // if($this->db->affected_rows() == '1'){ - // $result['addEmpStatus'] = true; - // $result['message'] = "Successfully employee details added"; - // } else { - // $result['addEmpStatus'] = false; - // $result['message'] = "Something went wrong.please try again"; - // } - // } else { - // $result['addEmpStatus'] = false; - // $result['message'] = "Something went wrong.please try again"; - // } + $mobile = $empArr['MobileNumber']; + $email = $empArr['EmailID']; + $active = $empArr['IsActive']; + $updatedBy = $empArr['UpdatedBy']; + $updatedOn = $empArr['UpdatedOn']; + $sql = "UPDATE ".LOGIN." SET MobileNumber='$mobile', EmailId='$email', IsActive='$active', UpdatedBy='$updatedBy', UpdatedOn='$updatedOn' WHERE StaffID='$updateFor'"; + if($this->db->query($sql) == '1'){ + $result['addEmpStatus'] = true; + $result['message'] = "Successfully employee details Updated"; + } else { + $result['addEmpStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } } else { $result['updateEmpStatus'] = false; $result['message'] = "Something went wrong.please try again"; @@ -396,10 +382,20 @@ class Employee_model extends CI_Model } return $result; } + + public function get_branch_code($name) { + $this->db->select('BranchCode'); + $this->db->from(BRANCH); + $this->db->where('BranchName', $name); + $roleDetails = $this->db->get()->first_row(); + return $roleDetails->BranchCode; + } // update employee branch details - public function upate_employee_branch($empFor, $reqBanch, $req) - { + public function upate_employee_branch($empFor, $reqBanch, $req, $createby, $createon) + { + // print_r( count($reqBanch['BranchCode']));exit(); + if( count($reqBanch['BranchCode']) > 1) { $this->db->where('StaffID', $empFor); $this->db->update(STAFF, $req); // update role to staff table @@ -409,15 +405,57 @@ class Employee_model extends CI_Model // echo $this->db->affected_rows();exit(); // update role to login table if ($this->db->affected_rows() == '1') { - // $this->db->where('StaffID', "'$empFor'"); - // $this->db->update(STAFF, $reqBanch); - $branchCode = $reqBanch['BranchCode']; + $branchCode = $this->get_branch_code($reqBanch['BranchCode'][0]); $sql = "UPDATE ".STAFF." SET BranchCode='$branchCode' WHERE StaffID='$empFor'"; // update branch to staff table - if ($this->db->query($sql) == '1') { - // $this->db->where('StaffID', $empFor); - // $this->db->update(STAFF_BRANCH, $reqBanch); - $sql1 = "UPDATE ".STAFF_BRANCH." SET BranchCode='$branchCode' WHERE StaffID='$empFor'"; + if ($this->db->query($sql) == '1') { + $this->db->where('StaffID', $empFor); + $this->db->delete(STAFF_BRANCH); + foreach($reqBanch['BranchCode'] as $something) { + $branchCode = $this->get_branch_code($something); + $sql1 = "INSERT INTO ".STAFF_BRANCH." (StaffID, BranchCode, IsActive, CreatedBy, CreatedOn) + VALUES ('$empFor', '$branchCode', '1','$createby', '$createon')"; + // update branch to staff_branch table + if ($this->db->query($sql1) == '1') { + $result['updateEmpbranchStatus'] = true; + $result['message'] = "Successfully employee branch details Updated"; + } else { + $result['updateEmpbranchStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + } + } else { + $result['updateEmpbranchStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + } else { + $result['updateEmpbranchStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + } else { + $result['updateEmpbranchStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + return $result; + + } else { + $this->db->where('StaffID', $empFor); + $this->db->update(STAFF, $req); + // update role to staff table + if ($this->db->affected_rows() == '1') { + $this->db->where('StaffID', $empFor); + $this->db->update(LOGIN, $req); + // echo $this->db->affected_rows();exit(); + // update role to login table + if ($this->db->affected_rows() == '1') { + $branchCode = $this->get_branch_code($reqBanch['BranchCode'][0]); + $sql = "UPDATE ".STAFF." SET BranchCode='$branchCode' WHERE StaffID='$empFor'"; + // update branch to staff table + if ($this->db->query($sql) == '1') { + $this->db->where('StaffID', $empFor); + $this->db->delete(STAFF_BRANCH); + $sql1 = "INSERT INTO ".STAFF_BRANCH." (StaffID, BranchCode, IsActive, CreatedBy, CreatedOn) + VALUES ('$empFor', '$branchCode', '1','$createby', '$createon')"; // update branch to staff_branch table if ($this->db->query($sql1) == '1') { $result['updateEmpbranchStatus'] = true; @@ -439,6 +477,8 @@ class Employee_model extends CI_Model $result['message'] = "Something went wrong.please try again"; } return $result; + } + } public function selfGetEmpId($sID) diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 9f445562..2631fbb8 100644 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -84,7 +84,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com url: '/employee', templateUrl: "assets/views/employeeDetails.html", title: 'Employee', - resolve: loadSequence('spin', 'ui.mask', 'ladda', 'angular-ladda', 'employeeCtrl', 'ngTable'), + resolve: loadSequence('ui.select','spin', 'ui.mask', 'ladda', 'angular-ladda', 'employeeCtrl', 'ngTable'), ncyBreadcrumb: { label: 'Employee' } diff --git a/Apollo/assets/js/controllers/employeeCtrl.js b/Apollo/assets/js/controllers/employeeCtrl.js index aefd96ef..d31fa947 100644 --- a/Apollo/assets/js/controllers/employeeCtrl.js +++ b/Apollo/assets/js/controllers/employeeCtrl.js @@ -38,7 +38,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ $scope.employeeDetails = ''; $scope.loader = false; $scope.emptyData; - + // 2017-11-23T00:00:00+0530 // sorting function for table params $scope.sort = function (keyname) { $scope.sortKey = keyname; //set the sortKey to the param passed @@ -150,7 +150,15 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ if (response.data.empBranchDetails) { // $scope.editBranchId = id; $scope.branchEditLoading = false; - $scope.empBranchDetails = response.data.branch_details[0]; + $scope.empBranchs = response.data.branch_details; + $scope.branchArr = []; + angular.forEach($scope.empBranchs, function (item, index) { + // alert(item.BranchName); + $scope.branchArr.push(item.BranchName); + }); + $scope.empBranchDetails = { + arr: $scope.branchArr, + } $scope.empRoleDetail = response.data.role_details[0]; } else { } @@ -193,6 +201,11 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ if (response.data.MeasterBranchDetailStatus == true) { $scope.branchDetails = response.data.branch_details; + $scope.branchDetailsName = []; + angular.forEach($scope.branchDetails, function (item, index) { + // alert(item.BranchName); + $scope.branchDetailsName.push(item.BranchName); + }); } else { } @@ -268,6 +281,9 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ // add empolyee $scope.employeeForm = { submit: function (form, myModel) { + // var formate = "yyyy-MM-dd'T'HH:mm:ssZ"; + // var date = $filter('date')(new Date($scope.myModel.dateofbirth), formate); + // alert(date); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -284,9 +300,12 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ 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 { + // alert($scope.myModel.dateofbirth); + var formate = "yyyy-MM-dd"; + // var date = $filter('date')(new Date($scope.myModel.dateofbirth), formate); $scope.myModel.switchsetting = $scope.myModel.switchsetting === true ? 1 : 0; - $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), 'dd-MM-yyyy'); - $scope.myModel.dateofjoining = $filter('date')(new Date($scope.myModel.dateofjoining), 'dd-MM-yyyy'); + $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate); + $scope.myModel.dateofjoining = $filter('date')(new Date($scope.myModel.dateofjoining), formate); // alert($scope.myModel.dateofbirth) var req = { method: 'POST', @@ -403,13 +422,15 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ 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 { - - $scope.dob= new Date(p.DOB).toDateString(); - $scope.doj=new Date(p.DOJ).toDateString(); - + // alert(p.DOB); + var formate = "dd-MM-yyyy"; + // var dob= new Date(p.DOB).toDateString(); + // $scope.doj=new Date(p.DOJ).toDateString(); + // alert(p.DOB); + // alert(dob.toLocaleDateString()); p.IsActive = p.IsActive === true ? 1 : 0; - p.DOB = $filter('date')(new Date($scope.dob), 'dd-MM-yyyy'); - p.DOJ = $filter('date')(new Date($scope.doj), 'dd-MM-yyyy'); + p.DOB = $filter('date')(new Date(p.DOB), formate); + p.DOJ = $filter('date')(new Date(p.DOJ), formate); var req = { method: 'POST', url: apiPoint.url + 'updateEmpExistDetail/', @@ -435,53 +456,56 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ } $scope.updateEmpBranchDetails = function (form, empRole, empBranchs, p) { - - 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; + // alert(empBranchs.arr.length); + if (empBranchs.arr.length >= 1) { + 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 { + // alert(JSON.stringify(p)); + // alert(JSON.stringify(empRole)); + // alert(JSON.stringify(empBranchs)); + $scope.sendBranchData = { + 'empFor': p.StaffID, + 'updateRole': empRole.ListCode, + 'updateBranch': empBranchs.arr, + 'updateBy': localDetails.localUserID + } + // p.IsActive = p.IsActive === true ? 1 : 0; + var req = { + method: 'POST', + url: apiPoint.url + 'updateEmpBranchDetail/', + headers: { + 'Content-Type': 'application/json' + }, + data: $scope.sendBranchData + }; + $http(req).then(function (response) { + if (response.data.updateEmpbranchStatus = true) { + swal("Success!", response.data.message, "success"); + $scope.getEmployeeList(); + $scope.editBranchId = -1; + } else { + // $scope.ldloading1[loading.replace('-', '_')] = false; + swal("Failed!", response.data.message, "error"); + } + }); } - 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 { - // alert(JSON.stringify(p)); - // alert(JSON.stringify(empRole)); - // alert(JSON.stringify(empBranchs)); - $scope.sendBranchData = { - 'empFor': p.StaffID, - 'updateRole': empRole.ListCode, - 'updateBranch': empBranchs.BranchCode, - 'updateBy': localDetails.localUserID - } - // p.IsActive = p.IsActive === true ? 1 : 0; - var req = { - method: 'POST', - url: apiPoint.url + 'updateEmpBranchDetail/', - headers: { - 'Content-Type': 'application/json' - }, - data: $scope.sendBranchData - }; - $http(req).then(function (response) { - if (response.data.updateEmpbranchStatus = true) { - swal("Success!", response.data.message, "success"); - $scope.getEmployeeList(); - $scope.editBranchId = -1; - } else { - // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("Failed!", response.data.message, "error"); - } - }); + swal("Warning!", "should select atleast branch!!", "warning"); } - } }]); diff --git a/Apollo/assets/views/editEmployeeBranchDetails.html b/Apollo/assets/views/editEmployeeBranchDetails.html index 61e47d54..4b293936 100644 --- a/Apollo/assets/views/editEmployeeBranchDetails.html +++ b/Apollo/assets/views/editEmployeeBranchDetails.html @@ -356,7 +356,7 @@ Branch Details
-
+ +
+
+ + + + {{$item}} + + + {{name}} + + +
diff --git a/Apollo/assets/views/editEmployeeDetails.html b/Apollo/assets/views/editEmployeeDetails.html index f8f80255..c386ba75 100644 --- 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
@@ -211,7 +211,7 @@ - Email is required. Please, enter a valid email address. @@ -224,7 +224,7 @@ Mobile Number - Mobile Number is required. Enter a Valid Phone Number @@ -233,7 +233,7 @@ - Enter a Valid Phone Number
@@ -246,7 +246,7 @@ Date Of Birth - @@ -281,7 +281,7 @@ Qualification - Enter a Valid Qualification
@@ -292,7 +292,7 @@ - Aadhar Number is required. @@ -307,7 +307,7 @@ - Aadhar Number is required. Enter a Valid Details @@ -316,7 +316,7 @@ - Aadhar Number is required. Enter a Valid Details @@ -327,14 +327,14 @@ - + Permenent Address is required
- + Current Address is required
@@ -345,7 +345,7 @@ Date Of Joining - @@ -390,10 +390,10 @@
- -
diff --git a/Apollo/assets/views/employeeDetails.html b/Apollo/assets/views/employeeDetails.html index 8739eca7..988b77a9 100644 --- a/Apollo/assets/views/employeeDetails.html +++ b/Apollo/assets/views/employeeDetails.html @@ -160,7 +160,7 @@ Employee ID - Employee Id required Invalid Employee Id @@ -172,7 +172,7 @@ First Name - First Name required Invalid First Name @@ -183,7 +183,7 @@ Last Name - Last Name required Invalid Last Name @@ -207,7 +207,7 @@ Father Name - Invalid Father Name
@@ -225,7 +225,7 @@ - Email is required. Please, enter a valid email address. @@ -238,7 +238,7 @@ Mobile Number - Mobile Number is required. @@ -248,19 +248,22 @@ - Enter a Valid Phone Number
+ + 
Selected date is: {{myModel.dateofbirth}}
+
- @@ -276,7 +279,7 @@ Gender
- + @@ -293,7 +296,7 @@ Qualification - Enter a Valid Qualification
@@ -304,7 +307,7 @@ - Aadhar Number is required. @@ -319,7 +322,7 @@ - Aadhar Number is required. Enter a Valid Details @@ -328,7 +331,7 @@ - Aadhar Number is required. Enter a Valid Details @@ -339,14 +342,14 @@ - + Permenent Address is required
- + Current Address is required
@@ -361,7 +364,7 @@ Home Branch - @@ -379,7 +382,7 @@ placeholder="Select Date of Birth" close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)" />--> - @@ -391,7 +394,7 @@ - @@ -421,10 +424,10 @@
- -
diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index de21a805..a981a6ae 100644 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -85,11 +85,11 @@