diff --git a/application/controllers/user.php b/application/controllers/user.php index 53cbabd7..b4e4d8bb 100755 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -1091,7 +1091,7 @@ function attendanceyear($empID ='') // { $this->form_validation->set_rules('EmpList','EmpList','trim|callback_Employee_validateS'); - $this->form_validation->set_rules('role','role','trim|callback_Role_validate'); + // $this->form_validation->set_rules('role','role','trim|callback_Role_validate'); $this->form_validation->set_rules('password','Password','required|max_length[20]'); $this->form_validation->set_rules('cpassword','Confirm Password','trim|required|matches[password]|max_length[20]'); @@ -1103,7 +1103,7 @@ function attendanceyear($empID ='') else { $EmpID = $this->input->post('EmpList'); - $roleId = $this->input->post('role'); + $roleId = '2'; $password = $this->input->post('password'); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $Createddt = $dt->format('Y-m-d H:i:s'); @@ -1117,9 +1117,15 @@ function attendanceyear($empID ='') $userInfo = array('email'=>$email,'EmpID'=>$EmpID,'password'=>getHashedPassword($password),'roleId'=>$roleId,'createdBy'=>$this->vendorId,'createdDtm'=>$Createddt); + + + + //die(); $result = $this->user_model->addNewUser($userInfo); + + for ($j = 0; $j < count($comma_separated); $j++) { $DeptCode = $comma_separated[$j]; @@ -1134,8 +1140,9 @@ function attendanceyear($empID ='') if($result > 0) { - redirect('userListing','refresh'); + echo ""; + redirect('userListing','refresh'); } diff --git a/application/models/user_model.php b/application/models/user_model.php index c5044284..11b42096 100755 --- a/application/models/user_model.php +++ b/application/models/user_model.php @@ -81,6 +81,7 @@ class User_model extends CI_Model */ function addNewUser($userInfo) { + $this->db->trans_start(); $this->db->insert('tbl_users', $userInfo); diff --git a/application/views/addNew.php b/application/views/addNew.php index 770af29b..3de18369 100755 --- a/application/views/addNew.php +++ b/application/views/addNew.php @@ -109,8 +109,24 @@ -
-
+ +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
-
-
- - -
-
- -
-
- - -
-
@@ -198,7 +201,7 @@
- +
@@ -220,6 +223,8 @@ load->helper('form'); $error = $this->session->flashdata('error'); + + echo $error; if($error) { ?> diff --git a/application/views/includes/header.php b/application/views/includes/header.php index 7bcc29dd..bbdd4b0f 100755 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -189,7 +189,7 @@ $(function() { - + AssDep; @@ -203,7 +203,7 @@ $(function() { Purchase Order From Requisition - + @@ -357,7 +357,7 @@ $(function() { - + AssDep; @@ -374,7 +374,7 @@ $(function() { $assd= $dep->AssDep;?> - +
  • @@ -388,7 +388,7 @@ $(function() { View Inward Gate Register
  • - + @@ -429,7 +429,7 @@ $(function() { - + @@ -437,7 +437,7 @@ $(function() { - + AssDep;?> diff --git a/assets/js/addUser.js b/assets/js/addUser.js index dbbe08b3..e342826d 100755 --- a/assets/js/addUser.js +++ b/assets/js/addUser.js @@ -20,15 +20,15 @@ $(document).ready(function(){ password : { required : true }, cpassword : {required : true, equalTo: "#password"}, mobile : { required : true, digits : true }, - role : { required : true, selected : true} + }, messages:{ fname :{ required : "This field is required" }, email : { required : "This field is required", email : "Please enter valid email address", remote : "Email already taken" }, password : { required : "This field is required" }, cpassword : {required : "This field is required", equalTo: "Please enter same password" }, - mobile : { required : "This field is required", digits : "Please enter numbers only" }, - role : { required : "This field is required", selected : "Please select atleast one option" } + mobile : { required : "This field is required", digits : "Please enter numbers only" } + } }); });