Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX_CI4validationUserControllerPart1

Browse Source
This commit is contained in:
sanjeev.p 2026-01-31 11:40:49 +05:30
parent 3e575a9f3c
commit f325fac331
2 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Controllers/UserController.php
View File

@ -114,13 +114,11 @@ class UserController extends AdminController
// Employee Code // Employee Code
// ====================== // ======================
'emp_code' => [ 'emp_code' => [
'rules' => 'required|alpha_numeric|min_length[3]|max_length[20]|is_unique[user_profiles.emp_code,id,{PrimaryKey}]', 'rules' => 'required|min_length[3]|max_length[15]',
'errors' => [ 'errors' => [
'required' => 'Employee Code is required', 'required' => 'Employee Code is required',
'alpha_numeric' => 'Employee Code must be alphanumeric',
'min_length' => 'Employee Code must be at least 3 characters', 'min_length' => 'Employee Code must be at least 3 characters',
'max_length' => 'Employee Code cannot exceed 20 characters', 'max_length' => 'Employee Code cannot exceed 15 characters',
'is_unique' => 'Employee Code already exists'
] ]
], ],
@ -141,11 +139,10 @@ class UserController extends AdminController
// Email // Email
// ====================== // ======================
'email' => [ 'email' => [
'rules' => 'required|valid_email|is_unique[user_profiles.email,id,{PrimaryKey}]', 'rules' => 'required|valid_email',
'errors' => [ 'errors' => [
'required' => 'Email is required', 'required' => 'Email is required',
'valid_email' => 'Please enter a valid email address', 'valid_email' => 'Please enter a valid email address',
'is_unique' => 'Email already exists'
] ]
], ],
@ -153,11 +150,10 @@ class UserController extends AdminController
// Mobile // Mobile
// ====================== // ======================
'mobile' => [ 'mobile' => [
'rules' => 'required|regex_match[/^[6-9][0-9]{9}$/]|is_unique[user_profiles.mobile,id,{PrimaryKey}]', 'rules' => 'required|regex_match[/^[6-9][0-9]{9}$/]',
'errors' => [ 'errors' => [
'required' => 'Mobile number is required', 'required' => 'Mobile number is required',
'regex_match' => 'Enter a valid 10-digit mobile number starting with 6, 7, 8, or 9', 'regex_match' => 'Enter a valid 10-digit mobile number starting with 6, 7, 8, or 9',
'is_unique' => 'Mobile number already exists'
] ]
], ],
@ -302,13 +298,11 @@ class UserController extends AdminController
// Employee Code // Employee Code
// ====================== // ======================
'emp_code' => [ 'emp_code' => [
'rules' => 'required|alpha_numeric|min_length[3]|max_length[20]|is_unique[user_profiles.emp_code,id,{PrimaryKey}]', 'rules' => 'required|min_length[3]|max_length[15]',
'errors' => [ 'errors' => [
'required' => 'Employee Code is required', 'required' => 'Employee Code is required',
'alpha_numeric' => 'Employee Code must be alphanumeric',
'min_length' => 'Employee Code must be at least 3 characters', 'min_length' => 'Employee Code must be at least 3 characters',
'max_length' => 'Employee Code cannot exceed 20 characters', 'max_length' => 'Employee Code cannot exceed 15 characters',
'is_unique' => 'Employee Code already exists'
] ]
], ],
@ -329,11 +323,10 @@ class UserController extends AdminController
// Email // Email
// ====================== // ======================
'email' => [ 'email' => [
'rules' => 'required|valid_email|is_unique[user_profiles.email,id,{PrimaryKey}]', 'rules' => 'required|valid_email',
'errors' => [ 'errors' => [
'required' => 'Email is required', 'required' => 'Email is required',
'valid_email' => 'Please enter a valid email address', 'valid_email' => 'Please enter a valid email address',
'is_unique' => 'Email already exists'
] ]
], ],
@ -341,11 +334,10 @@ class UserController extends AdminController
// Mobile // Mobile
// ====================== // ======================
'mobile' => [ 'mobile' => [
'rules' => 'required|regex_match[/^[6-9][0-9]{9}$/]|is_unique[user_profiles.mobile,id,{PrimaryKey}]', 'rules' => 'required|regex_match[/^[6-9][0-9]{9}$/]',
'errors' => [ 'errors' => [
'required' => 'Mobile number is required', 'required' => 'Mobile number is required',
'regex_match' => 'Enter a valid 10-digit mobile number starting with 6, 7, 8, or 9', 'regex_match' => 'Enter a valid 10-digit mobile number starting with 6, 7, 8, or 9',
'is_unique' => 'Mobile number already exists'
] ]
], ],

54
app/Views/UserList.php
View File

@ -581,7 +581,7 @@ table.dataTable tbody td {
<div class="form-group text-right m-b-0"> <div class="form-group text-right m-b-0">
<button class="btn app-btn-outline-secondary mr-2 " type="button" data-dismiss="modal" aria-hidden="true">Cancel</button> <button class="btn app-btn-outline-secondary mr-2 " type="button" data-dismiss="modal" aria-hidden="true">Cancel</button>
<button class="btn app-btn-secondary waves-effect waves-light" id="btnSubmit">Submit</button> <button type="submit" class="btn app-btn-secondary waves-effect waves-light" id="btnSubmit">Submit</button>
<!-- <button type="button" class="btn btn-secondry waves-effect waves-light mr-1" data-dismiss="modal" aria-hidden="true">Close</button> --> <!-- <button type="button" class="btn btn-secondry waves-effect waves-light mr-1" data-dismiss="modal" aria-hidden="true">Close</button> -->
</div> </div>
</form> </form>
@ -884,7 +884,20 @@ table.dataTable tbody td {
</table> </table>
</div> </div>
</div> </div>
<?php if (session()->getFlashdata('error')) : ?>
<?php foreach (session()->getFlashdata('error') as $error) : ?>
<script>
toastr.error("<?= esc($error) ?>", "Validation Error");
</script>
<?php endforeach; ?>
<script>
var errorModal = new bootstrap.Modal(
document.getElementById('con-close-modal')
);
errorModal.show();
</script>
<?php endif; ?>
<script> <script>
var table; var table;
$(document).ready(function () { $(document).ready(function () {
@ -1899,19 +1912,36 @@ table.dataTable tbody td {
</script> </script>
<script> <script>
$(document).on('click', '#btnAdd', function(){ $(document).on('click', '#btnAdd', function() {
$('#first_name').val(''); // Reset the form
$('#last_name').val(''); $('#UserForm')[0].reset();
$('#email').val(''); $('#UserId').val('');
$('#mobile').val('');
$('#emp_code').val(''); // Specifically reset Select2 if you are using it
$('#nhance_branch_id').val('0'); $('#nhance_branch_id').val('').trigger('change');
$('#rm_id').val('0'); $('#rm_id').val('').trigger('change');
// Update Modal Title and Action
$('.modal-title').text('Add User');
$('#btnSubmit').text('Submit');
$('#UserForm').attr('action', '<?php echo base_url('/user/create');?>'); $('#UserForm').attr('action', '<?php echo base_url('/user/create');?>');
let myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));
myModal.show(); // open modal var myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));
myModal.show();
}); });
// $(document).on('click', '#btnAdd', function(){
// $('#first_name').val('');
// $('#last_name').val('');
// $('#email').val('');
// $('#mobile').val('');
// $('#emp_code').val('');
// $('#nhance_branch_id').val('0');
// $('#rm_id').val('0');
// $('#UserForm').attr('action', '<?php echo base_url('/user/create');?>');
// let myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));
// myModal.show(); // open modal
// });
$(document).on('click', '#btnNhancePartnerAdd', function(){ $(document).on('click', '#btnNhancePartnerAdd', function(){
$('#partner_name').val(''); $('#partner_name').val('');
$('#email_addr').val(''); $('#email_addr').val('');