Bigbamboo/bbone
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TEST_AND_FIXING_ALL_MODULES : RV

Browse Source
This commit is contained in:
VENKATESHWARAN 2023-12-18 10:37:59 +05:30
parent 8159b60810
commit d0af316efd
33 changed files with 4822 additions and 2705 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ams_vendor.zip Normal file
View File

Binary file not shown.

4
application/config/testing/database.php
View File

@ -79,6 +79,10 @@
'username' => 'root', 'username' => 'root',
'password' => '', 'password' => '',
'database' => 'test', 'database' => 'test',
// 'hostname' => '119.18.54.85',
// 'username' => 'venbaehn_ams',
// 'password' => 'L;nD7Z@f)1ZT',
// 'database' => 'venbaehn_ams',
'dbdriver' => 'mysqli', 'dbdriver' => 'mysqli',
'dbprefix' => '', 'dbprefix' => '',
'pconnect' => FALSE, 'pconnect' => FALSE,

2
application/modules/Auth/controllers/Auth.php
View File

@ -191,9 +191,11 @@ public function verify_otp(){
public function change_password() public function change_password()
{ {
print_r($this->input->post('id')); die;
$id = $this->input->post('id'); $id = $this->input->post('id');
$data['password'] = hash_password($this->input->post('password')); $data['password'] = hash_password($this->input->post('password'));
$table="users"; $table="users";
$userData = $this->MY_Model->edit_option($data, $id, $table); $userData = $this->MY_Model->edit_option($data, $id, $table);
redirect('login'); redirect('login');
} }

48
application/modules/Auth/views/change_password_form.php
View File

@ -1,5 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.1/jquery.min.js"></script>
@ -9,7 +10,9 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>AMS </title> <link rel="icon" href="<?php echo base_url(); ?>/assets/appimg/default.ico" />
<title>BigBamboo Enterprise</title>
<!-- Bootstrap --> <!-- Bootstrap -->
<link href="<?php echo base_url(); ?>/assets/default/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> <link href="<?php echo base_url(); ?>/assets/default/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
@ -33,20 +36,26 @@
z-index: 3; z-index: 3;
} }
</style> </style>
<body class="login"> <body class="login">
<div class="login_wrapper"> <div class="login_wrapper">
<div class="animate form login_form"> <div class="animate form login_form">
<section class="login_content"> <section class="login_content">
<form id="otp-form" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>auth/change_password" enctype="multipart/form-data"> <form id="otp-form" data-parsley-validate class="form-horizontal form-label-left" method="post"
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"> action="<?php echo base_url();?>auth/change_password" enctype="multipart/form-data">
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>"
value="<?php echo $this->security->get_csrf_hash();?>">
<input type="hidden" id="id" name="id" value="<?php echo $id ?>"> <input type="hidden" id="id" name="id" value="<?php echo $id ?>">
<h1>Change Password</h1> <h1>Change Password</h1>
<div> <div>
<input type="password" id="password" name="password" class="form-control" placeholder="Password" required="required" /> <input type="password" id="password" name="password" class="form-control" placeholder="Password"
<span toggle="#password" id="toggle-password" class="fa fa-fw fa-eye field-icon toggle-password"></span> required="required" />
<span toggle="#password" id="toggle-password"
class="fa fa-fw fa-eye field-icon toggle-password"></span>
</div> </div>
<div> <div>
<input type="password" id="confirm_password" name="confirm_password" class="form-control" placeholder="Confrim Password" required="required" /> <input type="password" id="confirm_password" name="confirm_password" class="form-control"
placeholder="Confrim Password" required="required" />
<p id='message'></p> <p id='message'></p>
</div> </div>
<div> <div>
@ -54,20 +63,6 @@
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<!-- <div class="separator">
<p class="change_link">Already a member ?
<a href="<?php echo base_url().'auth/verify_user'?>" class="to_register"> Log in </a>
</p>
<div class="clearfix"></div>
<br />
<div>
<h1><i class="fa fa-paw"></i> Gentelella Alela!</h1>
<p>©2016 All Rights Reserved. Gentelella Alela! is a Bootstrap 4 template. Privacy and Terms</p>
</div>
</div> -->
</form> </form>
</section> </section>
@ -77,26 +72,25 @@
var input = $($(this).attr("toggle")); var input = $($(this).attr("toggle"));
if (input.attr("type") == "password") { if (input.attr("type") == "password") {
input.attr("type", "text"); input.attr("type", "text");
} } else {
else {
input.attr("type", "password"); input.attr("type", "password");
} }
}); });
$('#password, #confirm_password').on('keyup', function() { $('#password, #confirm_password').on('keyup', function() {
$(':input[type="submit"]').prop('disabled', true); $(':input[type="submit"]').prop('disabled', true);
if ($('#password').val() == $('#confirm_password').val() && $('#confirm_password').val().length > 0 ) { if ($('#password').val() == $('#confirm_password').val() && $('#confirm_password').val()
.length > 0) {
$('#message').html('Matching').css('color', 'green'); $('#message').html('Matching').css('color', 'green');
$('button[type="submit"]').attr("disabled", false); $('button[type="submit"]').attr("disabled", false);
} } else if ($('#password').val().length == 0 || $('#confirm_password').val().length == 0) {
else if($('#password').val().length == 0 || $('#confirm_password').val().length == 0){
$('#message').html(''); $('#message').html('');
} } else
else
$('#message').html('Not Matching').css('color', 'red'); $('#message').html('Not Matching').css('color', 'red');
}); });
</script> </script>
</div> </div>
</div> </div>
</body> </body>
</html> </html>

59
application/modules/Auth/views/login.php
View File

@ -1,13 +1,15 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<!-- Meta, title, CSS, favicons, etc. --> <!-- Meta, title, CSS, favicons, etc. -->
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" href="<?php echo base_url(); ?>/assets/appimg/default.ico" />
<title>AMS </title> <title>BigBamboo Enterprise</title>
<!-- Bootstrap --> <!-- Bootstrap -->
<link href="<?php echo base_url(); ?>/assets/default/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> <link href="<?php echo base_url(); ?>/assets/default/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
@ -32,76 +34,41 @@
<div class="animate form login_form"> <div class="animate form login_form">
<section class="login_content"> <section class="login_content">
<form method="post" action="<?php echo base_url().'Auth/authendicate'?>"> <form method="post" action="<?php echo base_url().'Auth/authendicate'?>">
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"> <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>"
value="<?php echo $this->security->get_csrf_hash();?>">
<h1>Sign In</h1> <h1>Sign In</h1>
<div> <div>
<input type="text" class="form-control" value="" name="user_name" placeholder="Username" required="" /> <input type="text" class="form-control" value="" name="user_name" placeholder="Username"
required="" />
</div> </div>
<div> <div>
<input type="password" class="form-control" value="" name="password" placeholder="Password" required="" /> <input type="password" class="form-control" value="" name="password" placeholder="Password"
required="" />
<p id='message' style="color:red"><?php echo $this->session->flashdata('msg'); ?></p> <p id='message' style="color:red"><?php echo $this->session->flashdata('msg'); ?></p>
</div> </div>
<div> <div>
<button type="submit" class="btn btn-primary">Log in</button> <button type="submit" class="btn btn-primary">Log in</button>
<a class="reset_pass" href="<?php echo base_url();?>Auth/lost_your_password">Lost your password?</a> <a class="reset_pass" href="<?php echo base_url();?>Auth/lost_your_password">Lost your
password?</a>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="separator"> <div class="separator">
<!-- <p class="change_link">New to site? --> <!-- <p class="change_link">New to site? -->
<!-- <a href="<?php echo base_url().'Auth/lost_your_password'?>" class="to_register"> Create Account </a> <!-- <a href="<?php echo base_url().'Auth/lost_your_password'?>" class="to_register"> Create Account </a> </p> -->
</p> -->
<div class="clearfix"></div> <div class="clearfix"></div>
<br /> <br />
<div> <div>
<!-- <h1>Venba Infotech!</h1> --> <p><?php echo date('Y'). ' ' . "&copy; ". " ".'BigBamboo Enterprise' ;?></p>
<p>All Rights Reserved.Privacy and Terms</p>
</div> </div>
</div> </div>
</form> </form>
</section> </section>
</div> </div>
<div id="register" class="animate form registration_form">
<section class="login_content">
<form>
<h1>Create Account</h1>
<div>
<input type="text" class="form-control" placeholder="Username" required="" />
</div>
<div>
<input type="email" class="form-control" placeholder="Email" required="" />
</div>
<div>
<input type="password" class="form-control" placeholder="Password" required="" />
</div>
<div>
<a class="btn btn-default submit" href="index.html">Submit</a>
</div>
<div class="clearfix"></div>
<div class="separator">
<p class="change_link">Already a member ?
<a href="#signin" class="to_register"> Log in </a>
</p>
<div class="clearfix"></div>
<br />
<div>
<h1><i class="fa fa-paw"></i> Gentelella Alela!</h1>
<p>©2016 All Rights Reserved. Gentelella Alela! is a Bootstrap 4 template. Privacy and Terms</p>
</div>
</div>
</form>
</section>
</div>
</div> </div>
</div> </div>

41
application/modules/Auth/views/otp_verification.php
View File

@ -1,5 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.1/jquery.min.js"></script>
@ -8,8 +9,9 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" href="<?php echo base_url(); ?>/assets/appimg/default.ico" />
<title>AMS </title> <title>BigBamboo Enterprise</title>
<!-- Bootstrap --> <!-- Bootstrap -->
<link href="<?php echo base_url(); ?>/assets/default/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> <link href="<?php echo base_url(); ?>/assets/default/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
@ -35,8 +37,10 @@
<div class="login_wrapper"> <div class="login_wrapper">
<div class="animate form login_form"> <div class="animate form login_form">
<section class="login_content"> <section class="login_content">
<form id="otp-form" data-parsley-validate class="form-horizontal form-label-left" method="post" action="" enctype="multipart/form-data"> <form id="otp-form" data-parsley-validate class="form-horizontal form-label-left" method="post"
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"> action="" enctype="multipart/form-data">
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>"
value="<?php echo $this->security->get_csrf_hash();?>">
<input type="hidden" id="hidden_otp" name="hidden_otp" class="form-control" value="" /> <input type="hidden" id="hidden_otp" name="hidden_otp" class="form-control" value="" />
<input type="hidden" id="id" name="id" value=""> <input type="hidden" id="id" name="id" value="">
<h1>Forgot Password</h1> <h1>Forgot Password</h1>
@ -46,12 +50,14 @@
<div> <div>
<a href="#" onclick="send_otp()" class="otp"> Send OTP </a> <a href="#" onclick="send_otp()" class="otp"> Send OTP </a>
<div> <div>
<input type="email" id="email" name="user_name" class="form-control" placeholder="Email" required="required" /> <input type="email" id="email" name="user_name" class="form-control" placeholder="Email"
required="required" />
<p id="span_msg"></p> <p id="span_msg"></p>
</div> </div>
</div> </div>
<div> <div>
<input type="text" id="otp" name="otp" class="form-control" placeholder="OTP" required="required" /> <input type="text" id="otp" name="otp" class="form-control" placeholder="OTP"
required="required" />
<p id="otp_span_msg"></p> <p id="otp_span_msg"></p>
</div> </div>
<div> <div>
@ -87,8 +93,7 @@
<script> <script>
function send_otp() { function send_otp() {
if ($('#email').val()) if ($('#email').val()) {
{
$('#span_msg').html(''); $('#span_msg').html('');
var data = $("#otp-form").serialize(); var data = $("#otp-form").serialize();
$.ajax({ $.ajax({
@ -103,8 +108,7 @@ function send_otp(){
//update the csrf to the form //update the csrf to the form
$('input[name=csrf_test_name]').val(response.csrf_hash); $('input[name=csrf_test_name]').val(response.csrf_hash);
$('#span_msg').html('invalid username').css('color', 'red'); $('#span_msg').html('invalid username').css('color', 'red');
} } else {
else{
//update the csrf to the form //update the csrf to the form
$('input[name=csrf_test_name]').val(response.csrf_hash); $('input[name=csrf_test_name]').val(response.csrf_hash);
$('#hidden_otp').val(response.otp); $('#hidden_otp').val(response.otp);
@ -113,11 +117,11 @@ function send_otp(){
console.log(response.id); console.log(response.id);
} }
}, },
error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) } error: function(jqXHR, textStatus, err) {
}); alert('text status ' + textStatus + ', err ' + err)
} }
else });
{ } else {
$('#span_msg').html('Enter Email').css('color', 'red'); $('#span_msg').html('Enter Email').css('color', 'red');
} }
} }
@ -153,8 +157,7 @@ function send_otp(){
//update the csrf to the form //update the csrf to the form
$('input[name=csrf_test_name]').val(response.csrf_hash); $('input[name=csrf_test_name]').val(response.csrf_hash);
$('#otp_span_msg').html('invalid otp').css('color', 'red'); $('#otp_span_msg').html('invalid otp').css('color', 'red');
} } else {
else {
//update the csrf to the form //update the csrf to the form
$('input[name=csrf_test_name]').val(response.csrf_hash); $('input[name=csrf_test_name]').val(response.csrf_hash);
console.log(response.id); console.log(response.id);
@ -162,13 +165,15 @@ function send_otp(){
// location.href = `<?php echo base_url();?>auth/change_password_view/${response.id}`; // location.href = `<?php echo base_url();?>auth/change_password_view/${response.id}`;
} }
}, },
error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) } error: function(jqXHR, textStatus, err) {
}); alert('text status ' + textStatus + ', err ' + err)
} }
else{ });
} else {
$('#otp_span_msg').html('Pls enter OTP').css('color', 'red'); $('#otp_span_msg').html('Pls enter OTP').css('color', 'red');
} }
}); });
</script> </script>
</body> </body>
</html> </html>

24
application/modules/Business/controllers/Business.php
View File

@ -87,7 +87,12 @@ public function create_business()
$add_admin = $this->input->post('add_admin'); $add_admin = $this->input->post('add_admin');
unset($data['add_admin']); unset($data['add_admin']);
} }
$count = count($this->input->post('module_id'));
$modules = $this->input->post('module_id');
if($modules !== NULL && $modules !== ''){
$count = count($modules);
for($i=0;$i<$count;$i++) for($i=0;$i<$count;$i++)
{ {
$mdata['module_id'] = $this->input->post('module_id')[$i]; $mdata['module_id'] = $this->input->post('module_id')[$i];
@ -95,6 +100,7 @@ public function create_business()
$mdata['is_active'] = 1; $mdata['is_active'] = 1;
$add_module = $this->MY_Model->insert($mdata, "permit_modules"); $add_module = $this->MY_Model->insert($mdata, "permit_modules");
} }
}
unset($data['module_id']); unset($data['module_id']);
$create_business = $this->MY_Model->insert($data,$table); $create_business = $this->MY_Model->insert($data,$table);
@ -187,11 +193,6 @@ public function edit_business()
$differentValues1 = array_diff($module_id_array , $DbData); $differentValues1 = array_diff($module_id_array , $DbData);
$differentValues2 = array_diff($DbData , $module_id_array); $differentValues2 = array_diff($DbData , $module_id_array);
$final_array = array_merge($differentValues1, $differentValues2); $final_array = array_merge($differentValues1, $differentValues2);
// echo "<pre>";
// print_r($DbData); print_r($this->input->post('module_id')); print_r($final_array);
// echo "<pre>";
// die;
if(count($final_array) != 0) if(count($final_array) != 0)
{ {
@ -306,14 +307,3 @@ public function getDeleteConfirmationPopup()
} }

47
application/modules/Business/views/add_business.php
View File

@ -1,4 +1,3 @@
<!-- Body page content --> <!-- Body page content -->
<script src="<?php echo base_url(); ?>/assets/default/jquery/dist/jquery.min.js"></script> <script src="<?php echo base_url(); ?>/assets/default/jquery/dist/jquery.min.js"></script>
@ -120,7 +119,6 @@
/* Allow labels to line wrap when menu is artificially narrowed */ /* Allow labels to line wrap when menu is artificially narrowed */
white-space: normal; white-space: normal;
} }
</style> </style>
@ -149,34 +147,41 @@
</div> </div>
<div class="x_content"> <div class="x_content">
<br /> <br />
<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Business/create_business" enctype="multipart/form-data"> <form id="" data-parsley-validate class="form-horizontal form-label-left" method="post"
action="<?php echo base_url();?>Business/create_business" enctype="multipart/form-data">
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"> <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>"
value="<?php echo $this->security->get_csrf_hash();?>">
<input type="hidden" name="uid" value="<?php echo rand(100000,999999); ?>"> <input type="hidden" name="uid" value="<?php echo rand(100000,999999); ?>">
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name">Business Name<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Business Name<a
style="color:red;">*</a> </label>
<div class="col-md-3 col-sm-3 "> <div class="col-md-3 col-sm-3 ">
<input type="text" id="business_name" name="business_name" required="required" class="form-control "> <input type="text" id="business_name" name="business_name"
class="form-control" required>
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="last-name">Email<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="last-name">Email<a
style="color:red;">*</a> </label>
<div class="col-md-3 col-sm-3 "> <div class="col-md-3 col-sm-3 ">
<input type="email" id="email" name="email" required="required" class="form-control "> <input type="email" id="email" name="email" class="form-control" required>
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Phone<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Phone<a
style="color:red;">*</a> </label>
<div class="col-md-3 col-sm-3 "> <div class="col-md-3 col-sm-3 ">
<input id="phone" type="text" pattern="[6-9]{1}[0-9]{9}" <input id="phone" type="text" pattern="[6-9]{1}[0-9]{9}"
title="Phone number with 6-9 and remaing 9 digit with 0-9" name="phone" required="required" class="form-control" > title="Phone number with 6-9 and remaing 9 digit with 0-9" name="phone"
class="form-control">
</div> </div>
</div> </div>
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="last-name">Select Modules<a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 " for="last-name">Select Modules</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="people" name="module_id[]" class="form-control select2_multiple" multiple> <select id="people" name="module_id[]" class="form-control select2_multiple" multiple>
<?php foreach ($ModuleData as $key => $value) { ?> <?php foreach ($ModuleData as $key => $value) { ?>
@ -196,22 +201,22 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name">Address<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Address</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="address" name="address" required="required" class="form-control" type="text" > <input id="address" name="address" class="form-control" type="text">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="first-name">City<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name">City</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="city" name="city" required="required" class="form-control" type="text" > <input id="city" name="city" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="last-name">State<a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 " for="last-name">State</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="state" name="state" required="required" class="form-control" > <select id="state" name="state" class="form-control">
<option value=""> Select state </option> <option value=""> Select state </option>
<?php foreach ($stateData as $key => $value) { ?> <?php foreach ($stateData as $key => $value) { ?>
<option value="<?php echo $value->id; ?>"><?php echo $value->name; ?></option> <option value="<?php echo $value->id; ?>"><?php echo $value->name; ?></option>
@ -219,9 +224,9 @@
</select> </select>
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="first-name">country<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name">country</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="country" name="country" required="required" class="form-control" type="text" > <input id="country" name="country" class="form-control" type="text">
</div> </div>
</div> </div>
@ -229,9 +234,9 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name">Pin code<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Pin code</label>
<div class="col-md-5 col-sm-5"> <div class="col-md-5 col-sm-5">
<input id="pincode" name="pincode" required="required" class="form-control" type="text" > <input id="pincode" name="pincode" class="form-control" type="text">
</div> </div>
</div> </div>

13
application/modules/Business/views/add_module_form.php
View File

@ -1,4 +1,3 @@
<!-- Body page content --> <!-- Body page content -->
<div class=""> <div class="">
@ -16,13 +15,16 @@
</div> </div>
<div class="x_content"> <div class="x_content">
<br /> <br />
<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Business/create_add_module" enctype="multipart/form-data"> <form id="" data-parsley-validate class="form-horizontal form-label-left" method="post"
action="<?php echo base_url();?>Business/create_add_module" enctype="multipart/form-data">
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"> <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>"
value="<?php echo $this->security->get_csrf_hash();?>">
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name">Create Module<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Create Module<a
style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="modules" name="modules" class="form-control" required> <input type="text" id="modules" name="modules" class="form-control" required>
</div> </div>
@ -44,6 +46,3 @@
</div> </div>
</div> </div>
<!-- /Body page content --> <!-- /Body page content -->

89
application/modules/Business/views/edit_business.php
View File

@ -1,4 +1,3 @@
<!-- Body page content --> <!-- Body page content -->
<script src="<?php echo base_url(); ?>/assets/default/jquery/dist/jquery.min.js"></script> <script src="<?php echo base_url(); ?>/assets/default/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>/assets/jquery.multi-select.js"></script> <script type="text/javascript" src="<?php echo base_url(); ?>/assets/jquery.multi-select.js"></script>
@ -116,7 +115,6 @@
/* Allow labels to line wrap when menu is artificially narrowed */ /* Allow labels to line wrap when menu is artificially narrowed */
white-space: normal; white-space: normal;
} }
</style> </style>
@ -127,7 +125,8 @@
<h3>Edit Business</h3> <h3>Edit Business</h3>
</div> </div>
<a class="btn btn-sm btn-primary" style="float: right;" href="<?php echo base_url();?>Business/business_list">Business List</a> <a class="btn btn-sm btn-primary" style="float: right;"
href="<?php echo base_url();?>Business/business_list">Business List</a>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="row"> <div class="row">
@ -144,41 +143,45 @@
</div> </div>
<div class="x_content"> <div class="x_content">
<br /> <br />
<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Business/edit_business" enctype="multipart/form-data"> <form id="" data-parsley-validate class="form-horizontal form-label-left" method="post"
action="<?php echo base_url();?>Business/edit_business" enctype="multipart/form-data">
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"> <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>"
value="<?php echo $this->security->get_csrf_hash();?>">
<input type="hidden" name="id" value="<?php echo $businessData->id; ?>"> <input type="hidden" name="id" value="<?php echo $businessData->id; ?>">
<input type="hidden" name="uid" value="<?php echo $businessData->uid; ?>"> <input type="hidden" name="uid" value="<?php echo $businessData->uid; ?>">
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name">Business Name<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Business Name<a
style="color:red;">*</a> </label>
<div class="col-md-3 col-sm-3"> <div class="col-md-3 col-sm-3">
<input type="text" id="business_name" name="business_name" value="<?php echo $businessData->business_name; ?>" required="required" class="form-control"> <input type="text" id="business_name" name="business_name"
value="<?php echo $businessData->business_name; ?>" required="required"
class="form-control">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="last-name">Email<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="last-name">Email<a
style="color:red;">*</a> </label>
<div class="col-md-3 col-sm-3"> <div class="col-md-3 col-sm-3">
<input type="email" id="email" name="email" value="<?php echo $businessData->email; ?>" required="required" class="form-control "> <input type="email" id="email" name="email" value="<?php echo $businessData->email; ?>"
required="required" class="form-control ">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Phone<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Phone<a
style="color:red;">*</a> </label>
<div class="col-md-3 col-sm-3"> <div class="col-md-3 col-sm-3">
<input id="phone" type="text" pattern="[6-9]{1}[0-9]{9}" <input id="phone" type="text" pattern="[6-9]{1}[0-9]{9}"
title="Phone number with 6-9 and remaing 9 digit with 0-9" name="phone" value="<?php echo $businessData->phone; ?>" required="required" class="form-control"> title="Phone number with 6-9 and remaing 9 digit with 0-9" name="phone"
value="<?php echo $businessData->phone; ?>" required="required"
class="form-control">
</div> </div>
</div> </div>
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="last-name">Select Modules</label>
<label class="control-label col-md-1 col-sm-1 " for="last-name">Select Modules<a style="color:red;">*</a></label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="people" name="module_id[]" class="form-control select2_multiple" multiple> <select id="people" name="module_id[]" class="form-control select2_multiple" multiple>
<?php ?>
<?php <?php
$modulesArray = []; $modulesArray = [];
@ -201,49 +204,56 @@
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="last-name">Select Logo<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="last-name">Select Logo</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="logo" name="logo" class="typeFile" type="file" value="<?php echo $businessData->logo; ?>"> <input id="logo" name="logo" class="typeFile" type="file"
value="<?php echo $businessData->logo; ?>">
</div> </div>
</div> </div>
<br /> <div class="x_title"> </div> <br /> <br />
<div class="x_title"> </div> <br />
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name">Address<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Address</label>
<div class="col-md-5 col-sm-5"> <div class="col-md-5 col-sm-5">
<input id="address" name="address" value="<?php echo $businessData->address; ?>" required="required" class="form-control" type="text"> <input id="address" name="address" value="<?php echo $businessData->address; ?>"
class="form-control" type="text">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="first-name">City<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name">City</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="city" name="city" value="<?php echo $businessData->city; ?>" required="required" class="form-control" type="text" > <input id="city" name="city" value="<?php echo $businessData->city; ?>"
required="required" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="last-name">State<a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 " for="last-name">State</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="state" name="state" required="required" class="form-control" > <select id="state" name="state" class="form-control">
<option value="<?php echo $businessData->state; ?>"> <?php echo $businessData->state_name; ?> </option> <option value="<?php echo $businessData->state; ?>">
<?php echo $businessData->state_name; ?> </option>
<?php foreach ($stateData as $key => $value) { ?> <?php foreach ($stateData as $key => $value) { ?>
<option value="<?php echo $value->id; ?>"><?php echo $value->name;?></option> <option value="<?php echo $value->id; ?>"><?php echo $value->name;?></option>
<?php } ?> <?php } ?>
</select> </select>
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="first-name">country<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name">country</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="country" name="country" value="<?php echo $businessData->country; ?>" required="required" class="form-control" type="text" > <input id="country" name="country" value="<?php echo $businessData->country; ?>"
class="form-control" type="text">
</div> </div>
</div> </div>
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name">Pin code<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Pin code</label>
<div class="col-md-5 col-sm-5"> <div class="col-md-5 col-sm-5">
<input id="pincode" name="pincode" value="<?php echo $businessData->pincode; ?>" required="required" class="form-control" type="text" > <input id="pincode" name="pincode" value="<?php echo $businessData->pincode; ?>"
class="form-control" type="text">
</div> </div>
</div> </div>
@ -280,8 +290,7 @@
// }); // });
var selected = []; var selected = [];
for (var option of document.getElementById('people').options) for (var option of document.getElementById('people').options) {
{
if (option.selected) { if (option.selected) {
selected.push(option.value); selected.push(option.value);
} }
@ -290,15 +299,3 @@
</div> </div>
</div> </div>
<!-- /Body page content --> <!-- /Body page content -->

16
application/modules/Business/views/edit_modules.php
View File

@ -1,4 +1,3 @@
<!-- Body page content --> <!-- Body page content -->
<div class=""> <div class="">
@ -18,17 +17,21 @@
</div> </div>
<div class="x_content"> <div class="x_content">
<br /> <br />
<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Business/edit_module_data" enctype="multipart/form-data"> <form id="" data-parsley-validate class="form-horizontal form-label-left" method="post"
action="<?php echo base_url();?>Business/edit_module_data" enctype="multipart/form-data">
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"> <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>"
value="<?php echo $this->security->get_csrf_hash();?>">
<input type="hidden" name="id" value="<?php echo $module_data->id;?>"> <input type="hidden" name="id" value="<?php echo $module_data->id;?>">
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name">Module Name<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Module Name<a
style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="modules" name="modules" class="form-control"required value="<?php echo $module_data->modules ?>"> <input type="text" id="modules" name="modules" class="form-control" required
value="<?php echo $module_data->modules ?>">
</div> </div>
</div> </div>
@ -48,6 +51,3 @@
</div> </div>
</div> </div>
<!-- /Body page content --> <!-- /Body page content -->

92
application/modules/Employee/controllers/Employee.php
View File

@ -70,51 +70,6 @@ public function addEmployee($businessId = 0)
} }
public function add_employee_education()
{
$id = $this->input->post('id');
if ($id) {
$data = $this->input->post();
// $id = $this->input->post('id');
$data['business_id'] = user()->business_id;
$table="employee_qualification";
$create_user = $this->MY_Model->update_md5($data,md5($id),$table);
redirect('Employee/editEmployee/'.md5($this->input->post('emp_id')));
}
else{
$data = $this->input->post();
// $id = $this->input->post('id');
$data['business_id'] = user()->business_id;
$table="employee_qualification";
$create_user = $this->MY_Model->insert($data,$table);
redirect('Employee/editEmployee/'.md5($this->input->post('emp_id')));
}
}
public function add_employee_history()
{
$id = $this->input->post('id');
if ($id) {
$data = $this->input->post();
// $id = $this->input->post('id');
$data['business_id'] = user()->business_id;
$table="employee_history";
$create_user = $this->MY_Model->update_md5($data,md5($id),$table);
redirect('Employee/editEmployee/'.md5($this->input->post('emp_id')));
}
else{
$data = $this->input->post();
// $id = $this->input->post('id');
$data['business_id'] = user()->business_id;
$table="employee_history";
$create_user = $this->MY_Model->insert($data,$table);
redirect('Employee/editEmployee/'.md5($this->input->post('emp_id')));
}
}
public function createEmp() public function createEmp()
{ {
@ -532,5 +487,52 @@ public function editEmp_history($id)
} }
public function add_employee_education()
{
$id = $this->input->post('id');
if ($id) {
$data = $this->input->post();
// $id = $this->input->post('id');
$data['business_id'] = user()->business_id;
$table="employee_qualification";
$create_user = $this->MY_Model->update_md5($data,md5($id),$table);
redirect('Employee/editEmployee/'.md5($this->input->post('emp_id')));
}
else{
$data = $this->input->post();
// $id = $this->input->post('id');
$data['business_id'] = user()->business_id;
$table="employee_qualification";
$create_user = $this->MY_Model->insert($data,$table);
redirect('Employee/editEmployee/'.md5($this->input->post('emp_id')));
}
}
public function add_employee_history()
{
$id = $this->input->post('id');
if ($id) {
$data = $this->input->post();
// $id = $this->input->post('id');
$data['business_id'] = user()->business_id;
$table="employee_history";
$create_user = $this->MY_Model->update_md5($data,md5($id),$table);
redirect('Employee/editEmployee/'.md5($this->input->post('emp_id')));
}
else{
$data = $this->input->post();
// $id = $this->input->post('id');
$data['business_id'] = user()->business_id;
$table="employee_history";
$create_user = $this->MY_Model->insert($data,$table);
redirect('Employee/editEmployee/'.md5($this->input->post('emp_id')));
}
}
} }

137
application/modules/Employee/views/add_emp.php
View File

@ -1,4 +1,3 @@
<!-- Body page content --> <!-- Body page content -->
<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"> <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
@ -128,13 +127,14 @@
/* Allow labels to line wrap when menu is artificially narrowed */ /* Allow labels to line wrap when menu is artificially narrowed */
white-space: normal; white-space: normal;
} }
</style> </style>
<div class=""> <div class="">
<div class="page-title"> <div class="page-title">
<div class="title_left"><h3>Add Employee</h3></div> <div class="title_left">
<h3>Add Employee</h3>
</div>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="row"> <div class="row">
@ -151,9 +151,11 @@
</div> --> </div> -->
<!-- <div class="x_content"> --> <!-- <div class="x_content"> -->
<br /> <br />
<form id="form" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Employee/createEmp" enctype="multipart/form-data"> <form id="form" data-parsley-validate class="form-horizontal form-label-left" method="post"
action="<?php echo base_url();?>Employee/createEmp" enctype="multipart/form-data">
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"> <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>"
value="<?php echo $this->security->get_csrf_hash();?>">
<div class="x_panel"> <div class="x_panel">
<div class="x_title"> <div class="x_title">
@ -162,31 +164,46 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Name<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Name<a
style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="name" name="name" value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required" onkeypress="validateKeyPress(event)" class="form-control "> <input type="text" id="name" name="name"
value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required"
onkeypress="validateKeyPress(event)" class="form-control ">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="email"> Email<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="email"> Email<a style="color:red;">*</a>
</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="email" name="email" value="<?php if(isset($editData)){ echo $editData->email; } ?>" required="required" class="form-control"type="email" <input id="email" name="email"
pattern="[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}" oninvalid="setCustomValidity('Enter a Valid E-mail Address.')" oninput="setCustomValidity('')"> value="<?php if(isset($editData)){ echo $editData->email; } ?>" required="required"
class="form-control" type="email"
pattern="[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}"
oninvalid="setCustomValidity('Enter a Valid E-mail Address.')"
oninput="setCustomValidity('')">
</div> </div>
</div> </div>
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="email"> Mobile<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="email"> Mobile<a style="color:red;">*</a>
</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="mobile" name="mobile" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" onkeypress = "return matchnum(event)"required="required" class="form-control" type="text" pattern="[6-9][0-9]{9}" minlength="10" maxlength="10" oninvalid="setCustomValidity('cant start with number other than 6,7,8,9 or length must be 10.')" oninput="setCustomValidity('')"> <input id="mobile" name="mobile"
value="<?php if(isset($editData)) { echo $editData->mobile; } ?>"
onkeypress="return matchnum(event)" required="required" class="form-control" type="text"
pattern="[6-9][0-9]{9}" minlength="10" maxlength="10"
oninvalid="setCustomValidity('cant start with number other than 6,7,8,9 or length must be 10.')"
oninput="setCustomValidity('')">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="first-name">Department<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Department</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="department" name="department" required="required" class="form-control"> <select id="department" name="department" required="required" class="form-control">
<option value="">--Select--</option> <option value="">--Select--</option>
<option value="<?php if(isset($editData)) { echo $editData->department; } ?>"><?php if(isset($assetData)) { echo $editData->department; } ?></option> <!-- <option value="<?php if(isset($editData)) { echo $editData->department; } ?>"> -->
<?php if(isset($assetData)) { echo $editData->department; } ?></option>
<?php foreach ($departmentData as $key => $value) { ?> <?php foreach ($departmentData as $key => $value) { ?>
<option value="<?php echo $value->name; ?>"><?php echo $value->name; ?></option> <option value="<?php echo $value->name; ?>"><?php echo $value->name; ?></option>
<?php } ?> <?php } ?>
@ -198,10 +215,12 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="email">Join date</label>
<label class="control-label col-md-1 col-sm-1 " for="email">Join date<a style="color:red;">*</a></label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="j_date" name="j_date" value="<?php if(isset($editData)) { echo $editData->email; } ?>" class="form-control" type="text" required placeholder="DD-MM-YYYY" onkeypress="validateKeyPress(event)" autocomplete="off"> <input id="j_date" name="j_date"
value="<?php if(isset($editData)) { echo $editData->email; } ?>" class="form-control"
type="text" placeholder="DD-MM-YYYY" onkeypress="validateKeyPress(event)"
autocomplete="off">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Manager</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Manager</label>
@ -220,9 +239,9 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name">Marital Status<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Marital Status</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="marital_status" name="marital_status" required="required" class="form-control" > <select id="marital_status" name="marital_status" class="form-control">
<option value="">--Select--</option> <option value="">--Select--</option>
<option value="single">Single</option> <option value="single">Single</option>
<option value="married">Married</option> <option value="married">Married</option>
@ -233,20 +252,28 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Username<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Username<a
style="color:red;">*</a> </label>
<div class="col-md-3 col-sm-3 "> <div class="col-md-3 col-sm-3 ">
<input type="text" id="user_name" name="user_name" value="" required="required" class="form-control "> <input type="text" id="user_name" name="user_name" value="" required="required"
class="form-control ">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="last-name"> Password<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="last-name"> Password<a
style="color:red;">*</a> </label>
<div class="col-md-3 col-sm-3 "> <div class="col-md-3 col-sm-3 ">
<input type="password" id="password" minlength="8" name="password" value="" required="required" class="form-control " title="password must have alphabets &#013;password requires 6 characters minimum"> <input type="password" id="password" minlength="8" name="password" value=""
<span toggle="#password" id="toggle-password" class="fa fa-fw fa-eye field-icon toggle-password"></span> required="required" class="form-control "
title="password must have alphabets &#013;password requires 6 characters minimum">
<span toggle="#password" id="toggle-password"
class="fa fa-fw fa-eye field-icon toggle-password"></span>
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="last-name"> Confirm Password<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="last-name"> Confirm Password<a
style="color:red;">*</a> </label>
<div class="col-md-3 col-sm-3 "> <div class="col-md-3 col-sm-3 ">
<input type="password" id="confirm_password" name="confirm_password" value="" required="required" class="form-control "> <input type="password" id="confirm_password" name="confirm_password" value=""
required="required" class="form-control ">
<span id='message'></span> <span id='message'></span>
</div> </div>
@ -261,12 +288,16 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Name</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Name</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="relation_name" name="relation_name" value="<?php if(isset($editData)) { echo $editData->name; } ?>" onkeypress="validateKeyPress(event)" class="form-control "> <input type="text" id="relation_name" name="relation_name"
value="<?php if(isset($editData)) { echo $editData->name; } ?>"
onkeypress="validateKeyPress(event)" class="form-control ">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="email"> Relationship</label> <label class="control-label col-md-1 col-sm-1 " for="email"> Relationship</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="relationship" name="relationship" value="<?php if(isset($editData)) { echo $editData->email; } ?>" class="form-control" onkeypress="validateKeyPress(event)" type="text" > <input id="relationship" name="relationship"
value="<?php if(isset($editData)) { echo $editData->email; } ?>"
class="form-control" onkeypress="validateKeyPress(event)" type="text">
</div> </div>
</div> </div>
@ -275,12 +306,19 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Mobile</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Mobile</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="relation_mobile" name="relation_mobile" onkeypress = "return matchnum(event)" value="<?php if(isset($editData)) { echo $editData->name; } ?>" class="form-control " pattern="[6-9][0-9]{9}" minlength="10" maxlength="10" oninvalid="setCustomValidity('cant start with number other than 6,7,8,9 or length must be 10.')" oninput="setCustomValidity('')"> <input type="text" id="relation_mobile" name="relation_mobile"
onkeypress="return matchnum(event)"
value="<?php if(isset($editData)) { echo $editData->name; } ?>"
class="form-control " pattern="[6-9][0-9]{9}" minlength="10" maxlength="10"
oninvalid="setCustomValidity('cant start with number other than 6,7,8,9 or length must be 10.')"
oninput="setCustomValidity('')">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="email"> Home Tel</label> <label class="control-label col-md-1 col-sm-1 " for="email"> Home Tel</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="relation_tel" name="relation_tel" onkeypress = "return matchnum(event)" value="<?php if(isset($editData)) { echo $editData->relation_tel; } ?>" class="form-control" type="text"> <input id="relation_tel" name="relation_tel" onkeypress="return matchnum(event)"
value="<?php if(isset($editData)) { echo $editData->relation_tel; } ?>"
class="form-control" type="text">
</div> </div>
</div> </div>
@ -296,12 +334,15 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Address</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Address</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="address" name="address" value="<?php if(isset($editData)) { echo $editData->address; } ?>" class="form-control "> <input type="text" id="address" name="address"
value="<?php if(isset($editData)) { echo $editData->address; } ?>"
class="form-control ">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="email"> City</label> <label class="control-label col-md-1 col-sm-1 " for="email"> City</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="city" name="city" value="<?php if(isset($editData)) { echo $editData->city; } ?>" class="form-control" type="text" > <input id="city" name="city" value="<?php if(isset($editData)) { echo $editData->city; } ?>"
class="form-control" type="text">
</div> </div>
</div> </div>
@ -310,12 +351,15 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name"> State</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> State</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="state" name="state" value="<?php if(isset($editData)) { echo $editData->state; } ?>" class="form-control "> <input type="text" id="state" name="state"
value="<?php if(isset($editData)) { echo $editData->state; } ?>" class="form-control ">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="email"> Pincode</label> <label class="control-label col-md-1 col-sm-1 " for="email"> Pincode</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="pincode" name="pincode" onkeypress = "return matchnum(event)" value="<?php if(isset($editData)) { echo $editData->pincode; } ?>" class="form-control" type="text" > <input id="pincode" name="pincode" onkeypress="return matchnum(event)"
value="<?php if(isset($editData)) { echo $editData->pincode; } ?>" class="form-control"
type="text">
</div> </div>
</div> </div>
@ -331,12 +375,15 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Employee Id</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Employee Id</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="employee_id" name="emp_id" value="<?php if(isset($editData)) { echo $editData->name; } ?>" class="form-control"> <input type="text" id="employee_id" name="emp_id"
value="<?php if(isset($editData)) { echo $editData->name; } ?>" class="form-control">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="email"> Salary</label> <label class="control-label col-md-1 col-sm-1 " for="email"> Salary</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="salary" name="salary" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" class="form-control" type="text"> <input id="salary" name="salary"
value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" class="form-control"
type="text">
</div> </div>
@ -346,7 +393,9 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Comment</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Comment</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="comment" name="comment" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" class="form-control" type="text"> <input id="comment" name="comment"
value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" class="form-control"
type="text">
</div> </div>
@ -362,7 +411,10 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Photo Upload</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Photo Upload</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="file" id="image" name="image" value="<?php if(isset($editData)) { echo $editData->profile_pic; } ?>" class="form-control typeFile" onchange="validateFile(this)" accept="image/png, image/jpeg, image/jpg, application/pdf"> <input type="file" id="image" name="image"
value="<?php if(isset($editData)) { echo $editData->profile_pic; } ?>"
class="form-control typeFile" onchange="validateFile(this)"
accept="image/png, image/jpeg, image/jpg, application/pdf">
<img class="profilepic__image" style="width: 50%; display: block;padding:10px;" src=""> <img class="profilepic__image" style="width: 50%; display: block;padding:10px;" src="">
</div> </div>
@ -377,7 +429,7 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="last-name">Modules List<a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 " for="last-name">Modules List</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="people" name="group_id[]" class="form-control select2_multiple" multiple> <select id="people" name="group_id[]" class="form-control select2_multiple" multiple>
<?php foreach ($get_group_list as $key => $value) { ?> <?php foreach ($get_group_list as $key => $value) { ?>
@ -404,9 +456,7 @@
</div> </div>
<!-- /Body page content --> <!-- /Body page content -->
<script> <script>
function matchnum(event) {
function matchnum(event)
{
var charcode; var charcode;
charcode = event.which || event.keyCode; charcode = event.which || event.keyCode;
@ -448,7 +498,6 @@ function validateKeyPress(event) {
</script> </script>
<script> <script>
var dateFormat = "dd-mm-yy"; var dateFormat = "dd-mm-yy";
var fromDateInput = $("#j_date"); var fromDateInput = $("#j_date");
console.log(fromDateInput); console.log(fromDateInput);
@ -472,7 +521,6 @@ function validateKeyPress(event) {
event.preventDefault(); event.preventDefault();
} }
} }
</script> </script>
<script> <script>
@ -522,4 +570,3 @@ function validateFile(input) {
console.log(selectedOptions); // You can perform further operations with the selected values console.log(selectedOptions); // You can perform further operations with the selected values
}); });
</script> </script>

170
application/modules/Employee/views/edit_emp.php
View File

@ -1,5 +1,3 @@
<!-- Body page content --> <!-- Body page content -->
<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"> <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script> <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
@ -125,7 +123,6 @@
/* Allow labels to line wrap when menu is artificially narrowed */ /* Allow labels to line wrap when menu is artificially narrowed */
white-space: normal; white-space: normal;
} }
</style> </style>
@ -154,9 +151,11 @@
</div> </div>
<div class="x_content"> --> <div class="x_content"> -->
<br /> <br />
<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Employee/editEmployees" enctype="multipart/form-data"> <form id="" data-parsley-validate class="form-horizontal form-label-left" method="post"
action="<?php echo base_url();?>Employee/editEmployees" enctype="multipart/form-data">
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"> <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>"
value="<?php echo $this->security->get_csrf_hash();?>">
<input type="hidden" name="id" value="<?php echo $editData->id; ?>"> <input type="hidden" name="id" value="<?php echo $editData->id; ?>">
<input type="hidden" name="user_id" value="<?php echo $editData->user_id; ?>"> <input type="hidden" name="user_id" value="<?php echo $editData->user_id; ?>">
@ -166,29 +165,46 @@
</div><br /> </div><br />
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Name<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Name<a
style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="name" name="name" value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required" class="form-control " onkeypress="validateKeyPress(event)"> <input type="text" id="name" name="name"
value="<?php if(isset($editData)) { echo $editData->name; } ?>" required="required"
class="form-control " onkeypress="validateKeyPress(event)">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="email"> Email<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="email"> Email<a style="color:red;">*</a>
</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="email" name="email" value="<?php if(isset($editData)) { echo $editData->email; } ?>" required="required" class="form-control" type="email" pattern="[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}" oninvalid="setCustomValidity('Enter a Valid E-mail Address.')" oninput="setCustomValidity('')"> <input id="email" name="email"
value="<?php if(isset($editData)) { echo $editData->email; } ?>" required="required"
class="form-control" type="email"
pattern="[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}"
oninvalid="setCustomValidity('Enter a Valid E-mail Address.')"
oninput="setCustomValidity('')">
</div> </div>
</div> </div>
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="email"> Mobile<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="email"> Mobile<a style="color:red;">*</a>
</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="mobile" name="mobile" value="<?php if(isset($editData)) { echo $editData->mobile; } ?>" onkeypress = "return matchnum(event)" required="required" class="form-control" type="tel" pattern="[6-9][0-9]{9}" minlength="10" maxlength="10" oninvalid="setCustomValidity('cant start with number other than 6,7,8,9 or length must be 10.')" oninput="setCustomValidity('')" > <input id="mobile" name="mobile"
value="<?php if(isset($editData)) { echo $editData->mobile; } ?>"
onkeypress="return matchnum(event)" required="required" class="form-control" type="tel"
pattern="[6-9][0-9]{9}" minlength="10" maxlength="10"
oninvalid="setCustomValidity('cant start with number other than 6,7,8,9 or length must be 10.')"
oninput="setCustomValidity('')">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="last-name">Department<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="last-name">Department</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="department" name="department" required="required" class="form-control" placeholder="choose" <?php if(isset($viewData)) { echo "readonly"; } ?>> <select id="department" name="department" class="form-control"
<option value="<?php echo $editData->department; ?>"><?php echo $editData->department; ?></option> placeholder="choose" <?php if(isset($viewData)) { echo "readonly"; } ?>>
<option value="<?php echo $editData->department; ?>">
<?php echo $editData->department; ?></option>
<?php foreach ($departmentData as $key => $value) { ?> <?php foreach ($departmentData as $key => $value) { ?>
<option value="<?php echo $value->name; ?>"><?php echo $value->name; ?></option> <option value="<?php echo $value->name; ?>"><?php echo $value->name; ?></option>
<?php } ?> <?php } ?>
@ -199,10 +215,13 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="email"> Joining Date<a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 " for="email"> Join Date</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="j_date" name="j_date" value="<?php if(isset($editData)) { echo $editData->j_date; } ?>" class="form-control" type="text" placeholder="DD-MM-YYYY" required onkeypress="validateKeyPress(event)" autocomplete="off"> <input id="j_date" name="j_date"
value="<?php if(isset($editData)) { echo $editData->j_date; } ?>" class="form-control"
type="text" placeholder="DD-MM-YYYY" onkeypress="validateKeyPress(event)"
autocomplete="off">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Manager</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Manager</label>
@ -213,7 +232,7 @@
if(isset($manager_name[0]->id)) if(isset($manager_name[0]->id))
{ foreach ($manager_name as $key => $val) { ?> { foreach ($manager_name as $key => $val) { ?>
<option value="<?php echo $val->id; ?>"><?php echo $val->name; ?></option> <option value="<?php if($val->id !== ''){echo $val->id;}else{echo '';} ?>"><?php if($val->name !== ''){echo $val->name;}else{echo '--select--';} ?></option>
<?php foreach ($manager as $key => $value) { ?> <?php foreach ($manager as $key => $value) { ?>
<?php if ($val->name !== $value->name) { ?> <?php if ($val->name !== $value->name) { ?>
<option value="<?php echo $value->user_id; ?>"><?php echo $value->name; ?></option> <option value="<?php echo $value->user_id; ?>"><?php echo $value->name; ?></option>
@ -231,27 +250,12 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="email"> Gender</label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Marital Status</label>
<div class="col-md-5 col-sm-5 " style="padding:10px;">
<?php
if ($editData->gender == 'male')
{
echo '<input type="radio" name="gender" value="male" checked/>Male';
echo '&nbsp&nbsp';
echo '<input type="radio" name="gender" value="female" />Female';
}
else
{
echo '<input type="radio" name="gender" value="male"/>Male';
echo '&nbsp&nbsp';
echo '<input type="radio" name="gender" value="female" checked/>Female';
} ?>
</div>
<label class="control-label col-md-1 col-sm-1 " for="first-name">Marital Status<a style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="marital_status" name="marital_status" required="required" class="form-control" placeholder="choose" <?php if(isset($viewData)) { echo "readonly"; } ?>> <select id="marital_status" name="marital_status" class="form-control"
<option value="<?php echo $editData->marital_status; ?>"><?php echo ucfirst($editData->marital_status); ?></option> placeholder="choose" <?php if(isset($viewData)) { echo "readonly"; } ?>>
<option value="<?php echo $editData->marital_status; ?>">
<?php echo ucfirst($editData->marital_status); ?></option>
<?php <?php
if ($editData->marital_status != 'single') if ($editData->marital_status != 'single')
{ {
@ -282,12 +286,16 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Name</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Name</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="relation_name" name="relation_name" value="<?php if(isset($editData)) { echo $editData->relation_name; } ?>" onkeypress="validateKeyPress(event)" class="form-control "> <input type="text" id="relation_name" name="relation_name"
value="<?php if(isset($editData)) { echo $editData->relation_name; } ?>"
onkeypress="validateKeyPress(event)" class="form-control ">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="email"> Relationship</label> <label class="control-label col-md-1 col-sm-1 " for="email"> Relationship</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="relationship" name="relationship" value="<?php if(isset($editData)) { echo $editData->relationship; } ?>" class="form-control" type="text" > <input id="relationship" name="relationship"
value="<?php if(isset($editData)) { echo $editData->relationship; } ?>" class="form-control"
type="text">
</div> </div>
</div> </div>
@ -296,12 +304,19 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Mobile</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Mobile</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="relation_mobile" name="relation_mobile" value="<?php if(isset($editData)) { echo $editData->relation_mobile; } ?>" class="form-control " onkeypress = "return matchnum(event)" class="form-control" type="tel" pattern="[6-9][0-9]{9}" minlength="10" maxlength="10" oninvalid="setCustomValidity('cant start with number other than 6,7,8,9 or length must be 10.')" oninput="setCustomValidity('')"> <input type="text" id="relation_mobile" name="relation_mobile"
value="<?php if(isset($editData)) { echo $editData->relation_mobile; } ?>"
class="form-control " onkeypress="return matchnum(event)" class="form-control" type="tel"
pattern="[6-9][0-9]{9}" minlength="10" maxlength="10"
oninvalid="setCustomValidity('cant start with number other than 6,7,8,9 or length must be 10.')"
oninput="setCustomValidity('')">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="email"> Home Tel</label> <label class="control-label col-md-1 col-sm-1 " for="email"> Home Tel</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="relation_tel" name="relation_tel" value="<?php if(isset($editData)) { echo $editData->relation_tel; } ?>" onkeypress = "return matchnum(event)" class="form-control" type="text" > <input id="relation_tel" name="relation_tel"
value="<?php if(isset($editData)) { echo $editData->relation_tel; } ?>"
onkeypress="return matchnum(event)" class="form-control" type="text">
</div> </div>
</div> </div>
@ -316,12 +331,14 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Address</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Address</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="address" name="address" value="<?php if(isset($editData)) { echo $editData->address; } ?>" class="form-control "> <input type="text" id="address" name="address"
value="<?php if(isset($editData)) { echo $editData->address; } ?>" class="form-control ">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="email"> City</label> <label class="control-label col-md-1 col-sm-1 " for="email"> City</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="city" name="city" value="<?php if(isset($editData)) { echo $editData->city; } ?>" class="form-control" type="text" > <input id="city" name="city" value="<?php if(isset($editData)) { echo $editData->city; } ?>"
class="form-control" type="text">
</div> </div>
</div> </div>
@ -330,12 +347,15 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name"> State</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> State</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="state" name="state" value="<?php if(isset($editData)) { echo $editData->state; } ?>" class="form-control "> <input type="text" id="state" name="state"
value="<?php if(isset($editData)) { echo $editData->state; } ?>" class="form-control ">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="email"> Pincode</label> <label class="control-label col-md-1 col-sm-1 " for="email"> Pincode</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="pincode" name="pincode" value="<?php if(isset($editData)) { echo $editData->pincode; } ?>" onkeypress = "return matchnum(event)" class="form-control" type="text" > <input id="pincode" name="pincode"
value="<?php if(isset($editData)) { echo $editData->pincode; } ?>"
onkeypress="return matchnum(event)" class="form-control" type="text">
</div> </div>
</div> </div>
@ -350,21 +370,42 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Employee Id</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Employee Id</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="emp_id" name="emp_id" value="<?php if(isset($editData)) { echo $editData->emp_id; } ?>"class="form-control "> <input type="text" id="emp_id" name="emp_id"
value="<?php if(isset($editData)) { echo $editData->emp_id; } ?>" class="form-control ">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="email"> Salary</label>
<div class="col-md-5 col-sm-5 ">
<input id="salary" name="salary"
value="<?php if(isset($editData)) { echo $editData->salary; } ?>" class="form-control"
type="text">
</div>
</div> </div>
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="email"> Salary</label>
<div class="col-md-5 col-sm-5 ">
<input id="salary" name="salary" value="<?php if(isset($editData)) { echo $editData->salary; } ?>" class="form-control" type="text">
</div>
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Comment</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Comment</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="comment" name="comment" value="<?php if(isset($editData)) { echo $editData->comment; } ?>" class="form-control" type="text"> <input id="comment" name="comment"
value="<?php if(isset($editData)) { echo $editData->comment; } ?>" class="form-control"
type="text">
</div>
<label class="control-label col-md-1 col-sm-1 " for="email"> Gender</label>
<div class="col-md-5 col-sm-5 " style="padding:10px;">
<?php
if ($editData->gender == 'male')
{
echo '<input type="radio" name="gender" value="male" checked/>Male';
echo '&nbsp&nbsp';
echo '<input type="radio" name="gender" value="female" />Female';
}
else
{
echo '<input type="radio" name="gender" value="male"/>Male';
echo '&nbsp&nbsp';
echo '<input type="radio" name="gender" value="female" checked/>Female';
} ?>
</div> </div>
</div> </div>
@ -373,8 +414,12 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Photo Upload</label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Photo Upload</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="file" id="image" name="image" value="<?php if(isset($editData->profile_pic)) { echo $editData->profile_pic; } ?>" class="form-control " onchange="validateFile(this)"> <input type="file" id="image" name="image"
<img class="profilepic__image" style="width: 50%; display: block;padding:10px;" src="<?php echo base_url();?>/assets/uploads/<?php echo $editData->profile_pic ?>" alt="Avatar" title="Change the avatar"> value="<?php if(isset($editData->profile_pic)) { echo $editData->profile_pic; } ?>"
class="form-control " onchange="validateFile(this)">
<img class="profilepic__image" style="width: 50%; display: block;padding:10px;"
src="<?php echo base_url();?>/assets/uploads/<?php echo $editData->profile_pic ?>"
alt="Avatar" title="Change the avatar">
</div> </div>
</div> </div>
@ -387,24 +432,23 @@
</div><br /> </div><br />
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="last-name">Modules List<a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 " for="last-name">Modules List</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="people" name="group_id[]" class="form-control select2_multiple" multiple> <select id="people" name="group_id[]" class="form-control select2_multiple" multiple>
<?php <?php
$modulesArray = []; $modulesArray = [];
foreach ($get_members_list as $object) { foreach ($get_members_list as $object) {
if (isset($object->group_name)) { if (isset($object->group_name)) {
$modulesArray[] = $object->group_name; $modulesArray[] = $object->group_name;
} }
} }
foreach ($get_group_list as $key => $data) { ?> foreach ($get_group_list as $key => $data) { ?>
<?php if(in_array($data->group_name, $modulesArray)) { ?> <?php if(in_array($data->group_name, $modulesArray)) { ?>
<option value="<?php echo $data->id; ?>" selected> <?php echo $data->group_name; ?> </option> <option value="<?php echo $data->id; ?>" selected> <?php echo $data->group_name; ?>
</option>
<?php } else { ?> <?php } else { ?>
<option value="<?php echo $data->id; ?>"><?php echo $data->group_name;?> </option> <option value="<?php echo $data->id; ?>"><?php echo $data->group_name;?> </option>
<?php } ?> <?php } ?>
@ -434,9 +478,9 @@
<br /> <br />
<div id="sub-value" class="col-md-12 col-sm-12"> <!-- <div id="sub-value" class="col-md-12 col-sm-12">
<?php echo $emp_sub_list_htmlPage; ?> <?php echo $emp_sub_list_htmlPage; ?>
</div> </div> -->
</div> </div>
@ -448,9 +492,7 @@
</script> </script>
<script> <script>
function matchnum(event) {
function matchnum(event)
{
var charcode; var charcode;
charcode = event.which || event.keyCode; charcode = event.which || event.keyCode;
@ -485,7 +527,6 @@ function validateKeyPress(event) {
</script> </script>
<script> <script>
var dateFormat = "dd-mm-yy"; var dateFormat = "dd-mm-yy";
var fromDateInput = $("#j_date"); var fromDateInput = $("#j_date");
console.log(fromDateInput); console.log(fromDateInput);
@ -499,7 +540,6 @@ function validateKeyPress(event) {
} }
}); });
</script> </script>
<script> <script>
function validateFile(input) { function validateFile(input) {

6
application/modules/Expence/views/edit_expence.php
View File

@ -121,10 +121,10 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name">Expense Name<a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Expense Name</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<div class="form-group"> <div class="form-group">
<input type='text' class="form-control" name="expense_name" value="<?php if(isset($expense_data[0]->id)){echo $expense_data[0]->expense_name; } ?>" autocomplete='off' required /> <input type='text' class="form-control" name="expense_name" value="<?php if(isset($expense_data[0]->id)){echo $expense_data[0]->expense_name; } ?>" autocomplete='off' />
</div> </div>
@ -181,7 +181,7 @@
</div> </div>
<label class="control-label col-md-1 col-sm-1" required for="first-name">Recipt<a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1" required for="first-name">Recipt</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="formFile" name="bill[]" onchange="validateFile(this)" class="typeFile" type="file" value="<?php echo $value->bill ?>" multiple><br> <input id="formFile" name="bill[]" onchange="validateFile(this)" class="typeFile" type="file" value="<?php echo $value->bill ?>" multiple><br>

144
application/modules/Expence/views/expence_form.php
View File

@ -59,7 +59,6 @@
width: 290px; width: 290px;
height: 280px; height: 280px;
} }
</style> </style>
<div class="clearfix"></div> <div class="clearfix"></div>
@ -68,7 +67,8 @@
<div class="x_title"> <div class="x_title">
<ul class="nav navbar-right panel_toolbox"> <ul class="nav navbar-right panel_toolbox">
<a href="<?php echo base_url();?>Expence/emp_expence_list" class="btn btn-primary" style="margin-top: 20px; font-size: small;">Back</a> <a href="<?php echo base_url();?>Expence/emp_expence_list" class="btn btn-primary"
style="margin-top: 20px; font-size: small;">Back</a>
</ul> </ul>
<h3>Expense Claim</h3> <h3>Expense Claim</h3>
@ -76,24 +76,32 @@
</div> </div>
<div class="x_content"> <div class="x_content">
<br /> <br />
<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>Expence/rise_expence_request" enctype="multipart/form-data"> <form id="" data-parsley-validate class="form-horizontal form-label-left" method="post"
action="<?php echo base_url();?>Expence/rise_expence_request" enctype="multipart/form-data">
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"> <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>"
value="<?php echo $this->security->get_csrf_hash();?>">
<div class="x_panel"> <div class="x_panel">
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-2 col-sm-2 label-align" for="last-name">Expense Requisted For</label> <label class="control-label col-md-2 col-sm-2 label-align" for="last-name">Expense Requisted
For</label>
<div class="col-md-4 col-sm-4"> <div class="col-md-4 col-sm-4">
<input type="radio" name="created_by" value="self (<?php echo user()->id;?>)"style="margin:10px;"checked /><b>Self</b> <input type="radio" name="created_by" value="self (<?php echo user()->id;?>)"
style="margin:10px;" checked /><b>Self</b>
<input type="radio" name="created_by" value="<?php echo user()->name;?> (<?php echo user()->id;?>)" style="margin: 10px;" /><b>Others</b> <input type="radio" name="created_by"
value="<?php echo user()->name;?> (<?php echo user()->id;?>)"
style="margin: 10px;" /><b>Others</b>
</div> </div>
<label class="control-label col-md-1 col-sm-1 label-align" for="last-name"> Employee Name <a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 label-align" for="last-name"> Employee Name <a
style="color:red;">*</a></label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="user_dropdown" name="emp_id" style="margin-top: 10px;padding-bottom: 10px;" class="form-control manager" > </select> <select id="user_dropdown" name="emp_id" style="margin-top: 10px;padding-bottom: 10px;"
class="form-control manager"> </select>
</div> </div>
</div> </div>
@ -101,19 +109,24 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 label-align" for="first-name">Expense Name<a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 label-align" for="first-name">Expense Name</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<div class="form-group"> <div class="form-group">
<input type='text' class="form-control" name="expense_name" value="<?php if(isset($expense_data[0]->id)){echo $expense_data[0]->expense_name; } ?>" autocomplete='off' required /> <input type='text' class="form-control" name="expense_name"
value="<?php if(isset($expense_data[0]->id)){echo $expense_data[0]->expense_name; } ?>"
autocomplete='off' />
</div> </div>
</div> </div>
<label class="control-label col-md-1 col-sm-1 label-align" for="first-name">Business Reason</label> <label class="control-label col-md-1 col-sm-1 label-align" for="first-name">Business
Reason</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<div class="form-group"> <div class="form-group">
<input type='text' class="form-control" name="business_reason" value="<?php if(isset($expense_data[0]->id)){echo $expense_data[0]->business_reason; } ?>" autocomplete='off'/> <input type='text' class="form-control" name="business_reason"
value="<?php if(isset($expense_data[0]->id)){echo $expense_data[0]->business_reason; } ?>"
autocomplete='off' />
</div> </div>
</div> </div>
@ -133,18 +146,24 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 label-align" for="first-name"> Date of Expense<a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 label-align" for="first-name"> Date of Expense<a
style="color:red;">*</a></label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<div class="form-group"> <div class="form-group">
<input type='date' id='ExpenseDate' class="form-control" placeholder="DD-MM-YYYY" required name="date_of_expence[]" value="<?php echo $value->date_of_expense ?>" autocomplete='off' /> <input type='date' id='ExpenseDate' class="form-control" placeholder="DD-MM-YYYY"
required name="date_of_expence[]" value="<?php echo $value->date_of_expense ?>"
autocomplete='off' />
</div> </div>
<input type="hidden" name="expense_pid" value="<?php echo $expense_data[0]->id; ?>"> <input type="hidden" name="expense_pid" value="<?php echo $expense_data[0]->id; ?>">
</div> </div>
<label class="control-label col-md-1 col-sm-1 label-align" for="first-name"> Expense Cost <a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 label-align" for="first-name"> Expense Cost <a
style="color:red;">*</a></label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="cost" name="amount[]" required value="<?php echo $value->amount ?>" class="form-control" onkeypress = "return matchnum(event)" type="number" name="middle-name" autocomplete='off'> <input id="cost" name="amount[]" required value="<?php echo $value->amount ?>"
class="form-control" onkeypress="return matchnum(event)" type="number"
name="middle-name" autocomplete='off'>
</div> </div>
</div> </div>
@ -152,17 +171,23 @@
<div class="item form-group flex-wrap"> <div class="item form-group flex-wrap">
<label class="control-label col-md-1 col-sm-1 label-align" for="last-name">Description</label> <label class="control-label col-md-1 col-sm-1 label-align" for="last-name">Description</label>
<div class="col-md-5 col-sm-3"> <div class="col-md-5 col-sm-3">
<textarea id="comments" name="description[]" value="" class="form-control" style="height:50px !important;" type="text" ><?php echo $value->description ?></textarea> <textarea id="comments" name="description[]" value="" class="form-control"
style="height:50px !important;" type="text"><?php echo $value->description ?></textarea>
<!-- <input type="hidden" id="manager_id" name="manager" value=""> --> <!-- <input type="hidden" id="manager_id" name="manager" value=""> -->
</div> </div>
<label class="control-label col-md-1 col-sm-1 label-align" required for="first-name">Recipt<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 label-align"
for="first-name">Recipt</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="formFile" name="bill[]" onchange="validateFile(this)" class="typeFile" type="file" value="<?php echo $value->bill ?>" required multiple> <input id="formFile" name="bill[]" onchange="validateFile(this)" class="typeFile"
type="file" value="<?php echo $value->bill ?>" multiple>
</div>
<div class="col-12"><button type="button" class="float-right btn btn-danger"
onclick="remove_row(<?php echo $value->id ?>)" id="remove-button2"><i
class="fa fa-trash"></i></button></div>
</div> </div>
<div class="col-12"><button type="button" class="float-right btn btn-danger" onclick="remove_row(<?php echo $value->id ?>)" id="remove-button2"><i class="fa fa-trash"></i></button></div></div>
@ -173,16 +198,20 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 label-align" for="first-name"> Date of Expense<a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 label-align" for="first-name"> Date of Expense<a
style="color:red;">*</a></label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<div class="form-group"> <div class="form-group">
<input type='text' id='ExpenseDate' class="form-control" placeholder="DD-MM-YYYY" required name="date_of_expence[]" value="" autocomplete='off' /> <input type='text' id='ExpenseDate' class="form-control" placeholder="DD-MM-YYYY"
required name="date_of_expence[]" value="" autocomplete='off' />
</div> </div>
</div> </div>
<label class="control-label col-md-1 col-sm-1 label-align" for="first-name"> Amount <a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 label-align" for="first-name"> Amount <a
style="color:red;">*</a></label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="cost" name="amount[]" required value="" class="form-control" onkeypress = "return matchnum(event)" type="number" name="middle-name" autocomplete='off'> <input id="cost" name="amount[]" required value="" class="form-control"
onkeypress="return matchnum(event)" type="number" name="middle-name" autocomplete='off'>
</div> </div>
</div> </div>
@ -190,14 +219,19 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 label-align" for="last-name">Description</label> <label class="control-label col-md-1 col-sm-1 label-align" for="last-name">Description</label>
<div class="col-md-5 col-sm-3"> <div class="col-md-5 col-sm-3">
<textarea id="comments" name="description[]" value="" class="form-control" style="height:50px !important;" type="text" ></textarea> <textarea id="comments" name="description[]" value="" class="form-control"
style="height:50px !important;" type="text"></textarea>
</div> </div>
<label class="control-label col-md-1 col-sm-1 label-align" required for="first-name">Recipt<a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 label-align" required for="first-name">Recipt</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="formFile" name="bill[]" onchange="validateFile(this)" class="typeFile" type="file" value="" required multiple></div> <input id="formFile" name="bill[]" onchange="validateFile(this)" class="typeFile"
</div><div class="col-12"><button type="button" id="add-button" onclick="createAndAppendFormGroup()" class="btn btn-primary float-right">Add</button></div> type="file" value="" multiple>
</div>
</div>
<div class="col-12"><button type="button" id="add-button" onclick="createAndAppendFormGroup()"
class="btn btn-primary float-right">Add</button></div>
@ -230,7 +264,6 @@
<!-- /Body page content --> <!-- /Body page content -->
<script> <script>
// hide the dropdown arrow // hide the dropdown arrow
$(document).ready(function() { $(document).ready(function() {
@ -246,7 +279,6 @@
}); });
}) })
</script> </script>
@ -277,15 +309,12 @@ function validateFile(input) {
return; return;
} }
} }
</script> </script>
<script> <script>
function matchnum(event) {
function matchnum(event)
{
var charcode; var charcode;
charcode = event.which || event.keyCode; charcode = event.which || event.keyCode;
@ -319,7 +348,8 @@ function matchnum(event)
var currentUserName = '<?php echo user()->name; ?>'; var currentUserName = '<?php echo user()->name; ?>';
var currentUserId = '<?php echo user()->id; ?>'; var currentUserId = '<?php echo user()->id; ?>';
$userDropdown.append('<option value="' + currentUserId + '">' + currentUserName + '</option>'); $userDropdown.append('<option value="' + currentUserId + '">' + currentUserName +
'</option>');
$userDropdown.prop('disabled', true); $userDropdown.prop('disabled', true);
} else if (selectedValue === '<?php echo user()->name; ?> (<?php echo user()->id;?>)') { } else if (selectedValue === '<?php echo user()->name; ?> (<?php echo user()->id;?>)') {
@ -340,11 +370,9 @@ function matchnum(event)
}); });
}); });
</script> </script>
<script> <script>
//get manager id from the dropdown employee assign the value to $("#manager_id") input field //get manager id from the dropdown employee assign the value to $("#manager_id") input field
$("#user_dropdown").on("change", function() { $("#user_dropdown").on("change", function() {
@ -360,27 +388,37 @@ function matchnum(event)
<script> <script>
var i = 1; var i = 1;
function createAndAppendFormGroup() { function createAndAppendFormGroup() {
var html1 = ''; var html1 = '';
i++ i++
html1 += '<div id="removeChild' + i + '">' html1 += '<div id="removeChild' + i + '">'
html1 += '<br><div class="x_title">' + i + '</div><br>' html1 += '<br><div class="x_title">' + i + '</div><br>'
html1 += '<div class="item form-group">'; html1 += '<div class="item form-group">';
html1 += '<label class="control-label col-md-1 col-sm-1 label-align" for="first-name"> Date of Expense<a style="color:red;">*</a></label>'; html1 +=
html1 += '<div class="col-md-5 col-sm-5 "><div class="form-group"><input type="text" id="datepicker'+i+'" class="form-control date-picker" placeholder="DD-MM-YYYY" required name="date_of_expence[]" value="" autocomplete="off"/></div></div>'; '<label class="control-label col-md-1 col-sm-1 label-align" for="first-name"> Date of Expense<a style="color:red;">*</a></label>';
html1 += '<label class="control-label col-md-1 col-sm-1 label-align" for="first-name"> Expense Cost <a style="color:red;">*</a></label>'; html1 += '<div class="col-md-5 col-sm-5 "><div class="form-group"><input type="text" id="datepicker' + i +
html1 += '<div class="col-md-5 col-sm-5 "><input id="cost" name="amount[]" required class="form-control" onkeypress="return matchnum(event)" type="number" name="middle-name" autocomplete="off"></div>'; '" class="form-control date-picker" placeholder="DD-MM-YYYY" required name="date_of_expence[]" value="" autocomplete="off"/></div></div>';
html1 +=
'<label class="control-label col-md-1 col-sm-1 label-align" for="first-name"> Expense Cost <a style="color:red;">*</a></label>';
html1 +=
'<div class="col-md-5 col-sm-5 "><input id="cost" name="amount[]" required class="form-control" onkeypress="return matchnum(event)" type="number" name="middle-name" autocomplete="off"></div>';
html1 += '</div>'; html1 += '</div>';
html1 += '<div class="item form-group flex-wrap">' html1 += '<div class="item form-group flex-wrap">'
html1 += '<label class="control-label col-md-1 col-sm-1 label-align" for="last-name">Description</label>' html1 += '<label class="control-label col-md-1 col-sm-1 label-align" for="last-name">Description</label>'
html1 += '<div class="col-md-5 col-sm-3"><textarea id="comments" name="description[]" value="" class="form-control" style="height:50px !important;" type="text" ></textarea></div>' html1 +=
'<div class="col-md-5 col-sm-3"><textarea id="comments" name="description[]" value="" class="form-control" style="height:50px !important;" type="text" ></textarea></div>'
html1 += '<label class="control-label col-md-1 col-sm-1 label-align" required for="first-name">Upload Bill </label>' html1 += '<label class="control-label col-md-1 col-sm-1 label-align" for="first-name">Recipt </label>'
html1 += '<div class="col-md-5 col-sm-5 "><input id="formFile" name="bill[]" multiple onchange="validateFile(this)" class="typeFile" type="file" value="" required></div>' html1 +=
'<div class="col-md-5 col-sm-5 "><input id="formFile" name="bill[]" multiple onchange="validateFile(this)" class="typeFile" type="file" value="" ></div>'
html1 += '</div>' html1 += '</div>'
html1 += '<div class="col-12"><button type="button" class="float-right btn btn-danger"" id="remove-button" onclick="removebutton('+i+')"><i class="fa fa-trash"></i></button></div><button type="button" id="add-button" onclick="createAndAppendFormGroup()" class="btn btn-primary float-right">Add</button></div>' html1 +=
'<div class="col-12"><button type="button" class="float-right btn btn-danger"" id="remove-button" onclick="removebutton(' +
i +
')"><i class="fa fa-trash"></i></button></div><button type="button" id="add-button" onclick="createAndAppendFormGroup()" class="btn btn-primary float-right">Add</button></div>'
var formContainer = document.getElementById('formContainer'); var formContainer = document.getElementById('formContainer');
@ -424,8 +462,6 @@ function removebutton(index) {
// todayHighlight: true, // todayHighlight: true,
// }); // });
// } // }
</script> </script>
<!-- <script> <!-- <script>
@ -440,18 +476,17 @@ function PreviewImage() {
</script> --> </script> -->
<script> <script>
function remove_row(id) {
function remove_row(id)
{
$.ajax({ $.ajax({
data:{id : id}, data: {
id: id
},
url: "<?php echo base_url('Expence/remove_row');?>", url: "<?php echo base_url('Expence/remove_row');?>",
type: "get", type: "get",
success: function(response) { success: function(response) {
if(response==true); if (response == true); {
{
location.reload(true) location.reload(true)
} }
@ -461,5 +496,4 @@ function remove_row(id)
}); });
} }
</script> </script>

4
application/modules/Layout/views/includes/default_header.php
View File

@ -6,7 +6,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" href="images/favicon.ico" type="image/ico" /> <link rel="icon" href="<?php echo base_url(); ?>/assets/appimg/default.ico" />
<!---ajax call---> <!---ajax call--->
@ -112,7 +112,7 @@
<?php if (is_admin() || is_user() || Employee_group()) { ?> <?php if (is_admin() || is_user() || Employee_group()) { ?>
<a class="dropdown-item" href="<?php echo base_url()?>Asset/masterDataList/">Masters</a> <a class="dropdown-item" href="<?php echo base_url()?>Asset/masterDataList/">Masters</a>
<?php } ?> <?php } ?>
<a class="dropdown-item" href="#">Settings</a> <!-- <a class="dropdown-item" href="#">Settings</a> -->
<!-- <a class="dropdown-item" href="javascript:;">Help</a> --> <!-- <a class="dropdown-item" href="javascript:;">Help</a> -->
<a class="dropdown-item" href="<?php echo base_url();?>Auth/logout"><i class="fa fa-sign-out pull-right"></i> Log Out</a> <a class="dropdown-item" href="<?php echo base_url();?>Auth/logout"><i class="fa fa-sign-out pull-right"></i> Log Out</a>
</div> </div>

36
application/modules/Layout/views/includes/default_menu.php
View File

@ -3,10 +3,12 @@
<div class="navbar nav_title" style="border: 0;"> <div class="navbar nav_title" style="border: 0;">
<a class="site_title"> <a class="site_title">
<?php if(check_auth() && is_superadmin()) { ?> <?php if(check_auth() && is_superadmin()) { ?>
<img src="<?php echo base_url(); ?>/assets/uploads/logo/<?php echo $settings->logo;?>" class="img-circle logo"> <img src="<?php echo base_url(); ?>/assets/uploads/logo/<?php echo $settings->logo;?>"
class="img-circle logo">
<?php } else if(check_auth() && is_admin() || !is_null(is_user())) { ?> <?php } else if(check_auth() && is_admin() || !is_null(is_user())) { ?>
<img src="<?php echo base_url(); ?>/assets/uploads/logo/<?php echo $business->logo;?>" class="img-circle logo"> <img src="<?php echo base_url(); ?>/assets/uploads/logo/<?php echo $business->logo;?>"
class="img-circle logo">
<?php } ?> <?php } ?>
<span> <span>
<?php if(check_auth() && is_admin() || !is_null(is_user())) <?php if(check_auth() && is_admin() || !is_null(is_user()))
@ -22,7 +24,8 @@
<div class="profile clearfix"> <div class="profile clearfix">
<div class="profile_pic"> <div class="profile_pic">
<?php if(user()->profile_image == '' || user()->profile_image == null) { ?> <?php if(user()->profile_image == '' || user()->profile_image == null) { ?>
<img src="<?php echo base_url(); ?>/assets/uploads/profile_picture/profile.jpg" alt="..." class="img-circle profile_img"> <img src="<?php echo base_url(); ?>/assets/uploads/profile_picture/profile.jpg" alt="..."
class="img-circle profile_img">
<?php } else { ?> <?php } else { ?>
<img src="<?php echo base_url(); ?>/assets/uploads/profile_picture/<?php echo user()->profile_image; ?>" <img src="<?php echo base_url(); ?>/assets/uploads/profile_picture/<?php echo user()->profile_image; ?>"
alt="..." class="img-circle profile_img"> alt="..." class="img-circle profile_img">
@ -32,7 +35,8 @@
</div> </div>
<div class="profile_info"> <div class="profile_info">
<span>Welcome,</span> <span>Welcome,</span>
<h2> <?php if(check_auth() && is_admin() || is_user()){echo user()->name;}else{echo user()->name; }?></h2> <h2> <?php if(check_auth() && is_admin() || is_user()){echo user()->name;}else{echo user()->name; }?>
</h2>
</div> </div>
</div> </div>
<!-- /menu profile quick info --> <!-- /menu profile quick info -->
@ -71,7 +75,7 @@
</li> </li>
<?php } ?> <?php } ?>
<?php if(check_auth() && is_admin() ) { ?> <!-- <?php if(check_auth() && is_admin() ) { ?>
<li><a><i class="fa fa-user"></i>Group <span class="fa fa-chevron-down"></span></a> <li><a><i class="fa fa-user"></i>Group <span class="fa fa-chevron-down"></span></a>
<ul class="nav child_menu"> <ul class="nav child_menu">
@ -79,7 +83,7 @@
<li><a href="<?php echo base_url();?>Group/Create_Group_Form">Add Group</a></li> <li><a href="<?php echo base_url();?>Group/Create_Group_Form">Add Group</a></li>
</ul> </ul>
</li> </li>
<?php } ?> <?php } ?> -->
@ -111,9 +115,11 @@
<?php if(check_auth() && is_admin() && Asset_module()) { ?> <?php if(check_auth() && is_admin() && Asset_module()) { ?>
<li><a><i class="fa fa-clipboard"></i> Reports <span class="fa fa-chevron-down"></span></a> <li><a><i class="fa fa-clipboard"></i> Reports <span class="fa fa-chevron-down"></span></a>
<ul class="nav child_menu"> <ul class="nav child_menu">
<li><a href="<?php echo base_url();?>Asset/depreciation_report">Depreciation Reports</a></li> <li><a href="<?php echo base_url();?>Asset/depreciation_report">Depreciation
Reports</a></li>
<li><a href="<?php echo base_url();?>Asset/amc_report">AMC Reports</a></li> <li><a href="<?php echo base_url();?>Asset/amc_report">AMC Reports</a></li>
<li><a href="<?php echo base_url();?>Asset/insurance_report">Insurance Reports</a></li> <li><a href="<?php echo base_url();?>Asset/insurance_report">Insurance Reports</a>
</li>
</ul> </ul>
</li> </li>
<?php } ?> <?php } ?>
@ -128,24 +134,28 @@
<li><a href="<?php echo base_url();?>Employee/empList"><i class="fa fa-group"></i> Employee</a></li> <li><a href="<?php echo base_url();?>Employee/empList"><i class="fa fa-group"></i>
Employee</a></li>
<?php } ?> <?php } ?>
<?php if(check_auth() && is_user() || user()->role == null ) { ?> <?php if(check_auth() && is_user() || user()->role == null ) { ?>
<li><a href="<?php echo base_url();?>Leave/leavehistory"><i class="fa fa-calendar-times-o"></i>Leaves</a></li> <li><a href="<?php echo base_url();?>Leave/leavehistory"><i
class="fa fa-calendar-times-o"></i>Leaves</a></li>
<?php } ?> <?php } ?>
<?php if(check_auth() && is_user() || user()->role == null ) { ?> <?php if(check_auth() && is_user() || user()->role == null ) { ?>
<li><a href="<?php echo base_url();?>Expence/emp_expence_list"><i class="fa fa-money"></i> Expense </a></li> <li><a href="<?php echo base_url();?>Expence/emp_expence_list"><i class="fa fa-money"></i>
Expense </a></li>
<?php } ?> <?php } ?>
<?php if(check_auth() && is_user() || user()->role == null ) { ?> <?php if(check_auth() && is_user() || user()->role == null ) { ?>
<li><a href="<?php echo base_url();?>Delegation/Delegation_list"><i class="fa fa-tasks" aria-hidden="true"></i> Delegation</a></li> <li><a href="<?php echo base_url();?>Delegation/Delegation_list"><i class="fa fa-tasks"
aria-hidden="true"></i> Delegation</a></li>
<?php } ?> <?php } ?>
@ -174,5 +184,3 @@
</div> </div>
<!-- /menu footer buttons --> <!-- /menu footer buttons -->
</div> </div>

7
application/modules/Leave/controllers/Leave.php
View File

@ -55,6 +55,8 @@ public function leaveList()
$business_id = user()->business_id; $business_id = user()->business_id;
$leave_list = $this->Leave_model->get_leave_with_emp_name(user()->business_id); $leave_list = $this->Leave_model->get_leave_with_emp_name(user()->business_id);
// echo '<pre>';
// print_r($leave_list); die;
$leave_type = $this->Leave_model->get_leave_type($business_id); $leave_type = $this->Leave_model->get_leave_type($business_id);
$decline_dropdown = $this->Leave_model->decline_dropdown($business_id); $decline_dropdown = $this->Leave_model->decline_dropdown($business_id);
$this->layout->set('tableData', $leave_list); $this->layout->set('tableData', $leave_list);
@ -448,7 +450,7 @@ public function ApproveLeave()
if($remaining_days[0]->remaining_days <= 0){ if($remaining_days[0]->remaining_days <= 0){
$data['status'] = 'Declined'; $data['status'] = 'Declined';
$data['declined_by']= user()->name; $data['declined_by']= user()->id;
$data['declined_at'] = date('d-m-Y H:i:s'); $data['declined_at'] = date('d-m-Y H:i:s');
$data['DReason'] = 'No sufficient leave balance'; $data['DReason'] = 'No sufficient leave balance';
$this->Leave_model->LeaveDecline($id, $data); $this->Leave_model->LeaveDecline($id, $data);
@ -462,8 +464,9 @@ public function ApproveLeave()
$this->Leave_model->emp_leave_days_update($emp_id, $days, $leave_year, $business_id, $no_of_days->type); $this->Leave_model->emp_leave_days_update($emp_id, $days, $leave_year, $business_id, $no_of_days->type);
$data['status'] = 'Approved'; $data['status'] = 'Approved';
$data['approved_by']= user()->name; $data['approved_by']= user()->id;
$data['approved_at'] = date('d-m-Y H:i:s'); $data['approved_at'] = date('d-m-Y H:i:s');
// print_r($data); die;
$this->Leave_model->LeaveApprove($id, $data); $this->Leave_model->LeaveApprove($id, $data);
redirect('Leave/leaveList'); redirect('Leave/leaveList');
} }

24
application/modules/Leave/models/Leave_model.php
View File

@ -3,9 +3,12 @@ class Leave_model extends MY_Model {
public function get_leave_with_emp_name($business_id) public function get_leave_with_emp_name($business_id)
{ {
$this->db->select('A.* , name', 'users.name'); $this->db->select('A.* ,U1.name as emp_name, U2.name as ApproveBy, U3.name as DeclineBy, U4.name as Risedby');
$this->db->from('leave_list A'); $this->db->from('leave_list A');
$this->db->join('users', 'users.id = A.emp_id', 'left'); $this->db->join('users U1', 'U1.id = A.emp_id', 'left');
$this->db->join('users U2', 'U2.id = A.approved_by', 'left');
$this->db->join('users U3', 'U3.id = A.declined_by', 'left');
$this->db->join('users U4', 'U4.id = A.risedby', 'left');
$this->db->where('A.business_id', $business_id); $this->db->where('A.business_id', $business_id);
$this->db->order_by('A.id','DESC'); $this->db->order_by('A.id','DESC');
$this->db->where('A.is_active', 1); $this->db->where('A.is_active', 1);
@ -13,6 +16,23 @@ public function get_leave_with_emp_name($business_id)
$query = $query->result(); $query = $query->result();
return $query; return $query;
}
public function get_user_name($user_id){
$this->db->select('name');
$this->db->from('users');
$this->db->where('id', $user_id);
$query = $this->db->get();
// $query = $query->result();
if ($query->num_rows() > 0) {
$row = $query->row();
return $row->name;
} else {
return false;
}
// return $query;
} }
public function get_with_emp_name($business_id, ) public function get_with_emp_name($business_id, )

115
application/modules/Leave/views/apply_leave.php
View File

@ -147,15 +147,14 @@
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="radio" id="self" name="risedby" value="self(<?php echo user()->id;?>)"style="margin:10px;"checked /><b>Self</b> <input type="radio" id="self" name="risedby" value="self(<?php echo user()->id;?>)"style="margin:10px;"checked /><b>Self</b>
<input type="radio" id="others" name="risedby" value="<?php echo user()->name;?>" style="margin: 10px;" /><b>Others</b>
<input type="radio" id="others" name="risedby" value="<?php echo user()->name;?>(<?php echo user()->id;?>)" style="margin: 10px;" /><b>Others</b>
</div> </div>
</div> </div>
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-2 col-sm-2 " for="last-name"> Employee Name </label> <label class="control-label col-md-2 col-sm-2 " for="last-name"> Employee Name </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="user_dropdown" name="emp_id" style="margin-top: 10px;padding-bottom: 10px;" class="form-control manager"> </select> <select id="user_dropdown" name="emp_id" style="margin-top: 10px;padding-bottom: 10px;" class="form-control manager" required></select>
</div> </div>
</div> </div>
@ -271,7 +270,7 @@
$("#user_dropdown").addClass("hide-arrow"); $("#user_dropdown").addClass("hide-arrow");
$("input[name='risedby']").on("change", function() { $("input[name='risedby']").on("change", function() {
var inputValue = $(this).val(); var inputValue = $(this).val();
if (inputValue === "<?php echo user()->name;?>(<?php echo user()->id;?>)") { if (inputValue === "<?php echo user()->name;?>") {
$("#user_dropdown").removeClass("hide-arrow"); $("#user_dropdown").removeClass("hide-arrow");
} else { } else {
$("#user_dropdown").addClass("hide-arrow"); $("#user_dropdown").addClass("hide-arrow");
@ -360,7 +359,7 @@
var currentUserId = '<?php echo user()->id; ?>'; var currentUserId = '<?php echo user()->id; ?>';
$userDropdown.append('<option value="' + currentUserId + '">' + currentUserName + '</option>'); $userDropdown.append('<option value="' + currentUserId + '">' + currentUserName + '</option>');
$userDropdown.prop('disabled', true); $userDropdown.prop('disabled', true);
} else if (selectedValue === '<?php echo user()->name; ?>(<?php echo user()->id;?>)') { } else if (selectedValue === '<?php echo user()->name; ?>') {
$.ajax({ $.ajax({
@ -555,112 +554,15 @@ function calculateDateDifference() {
} }
// $(document).ready(function() {
// $('#type').change(function() {
// var leave_type_id = $('#type').val();
// console.log(leave_type_id);
// let employee_id = $('#user_dropdown').val();
// DateDifferenceOthers(leave_type_id, employee_id);
// });
// });
// function DateDifferenceOthers( leave_type_id, employee_id ) {
// let type_id = leave_type_id;
// let emp_id = employee_id;
// // var type_id = $('option:selected', this).attr('id');
// // let emp_id = $('#user_dropdown').val();
// var fromDate = fromDateInput.datepicker("getDate");
// var toDate = toDateInput.datepicker("getDate");
// $.ajax({
// data: {emp_id : emp_id, type_id : type_id},
// url : "<?php echo base_url()?>Leave/get_emp_leave_count/",
// type: "get",
// success: function(response) {
// response = JSON.parse(response);
// if (fromDate && toDate) {
// var difference = Math.ceil((toDate - fromDate) / (1000 * 60 * 60 * 24) + 1);
// if(response.length == 0)
// {
// $.ajax({
// type: "get",
// url: "<?php echo base_url()?>Leave/get_leave_master_count/",
// data: {type_id: type_id},
// success: function(response) {
// response = JSON.parse(response);
// if (difference > response[0].days)
// {
// Swal.fire('No sufficient leave balance please check the Date');
// $("#todate").val('');
// $("#dateDifference").val("");
// }
// },
// });
// }
// else{
// if (difference > response[0].remaining_days)
// {
// Swal.fire('No sufficient leave balance please check the Date' );
// $("#todate").val('');
// $("#dateDifference").val("");
// }
// }
// }
// }
// });
// }
// $('#user_dropdown').on('change', function(){
// let emp_id = $('#user_dropdown').val();
// DateValidate(emp_id);
// });
// function DateValidate(emp_id) {
// var fromDate = fromDateInput.datepicker("getDate");
// var toDate = toDateInput.datepicker("getDate");
// $.ajax({
// data: {emp_id : emp_id, fromDate : fromDate, toDate : toDate},
// url : "<?php echo base_url()?>Leave/get_from_to_date_count/",
// type: "get",
// success: function(response) {
// alert(response);
// response = JSON.parse(response);
// }
// });
$('#subimt').click(function() {
let val = $('#user_dropdown').val()
console.log(val);
});
// }
</script> </script>
@ -673,4 +575,3 @@ function calculateDateDifference() {

4
application/modules/Leave/views/edit_leave.php
View File

@ -42,7 +42,7 @@
color: black; color: black;
} }
input[type=date]::-webkit-datetime-edit, input::-webkit-inner-spin-button, input::-webkit-clear-button { /* input[type=date]::-webkit-datetime-edit, input::-webkit-inner-spin-button, input::-webkit-clear-button {
display: none;s display: none;s
} }
@ -52,7 +52,7 @@
right: 0; right: 0;
color: black; color: black;
opacity: 1; opacity: 1;
} } */
</style> </style>

62
application/modules/Leave/views/leave_list.php
View File

@ -1,4 +1,3 @@
<head> <head>
<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css'> <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css'>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
@ -33,10 +32,8 @@
} }
div.dataTables_wrapper div.dataTables_filter { div.dataTables_wrapper div.dataTables_filter {
margin-top: -30px !important; //search move to up margin-top: -30px !important;
} }
</style> </style>
</head> </head>
@ -45,7 +42,8 @@
<div class="x_title"> <div class="x_title">
<ul class="nav navbar-right panel_toolbox"> <ul class="nav navbar-right panel_toolbox">
<a href="<?php echo base_url();?>Leave/LeaveHistory" class="btn btn-sm btn-primary" style="margin-top: 20px;" >Back</a> <a href="<?php echo base_url();?>Leave/LeaveHistory" class="btn btn-sm btn-primary"
style="margin-top: 20px;">Back</a>
</ul> </ul>
<h1>My Approvals</h1> <h1>My Approvals</h1>
@ -76,8 +74,9 @@
<?php if($type->id === $value->type ) { ?> <?php if($type->id === $value->type ) { ?>
<tr class="even pointer"> <tr class="even pointer">
<td hidden><?php echo $value->id; ?></td> <td hidden><?php echo $value->id; ?></td>
<td class=" "><?php echo $value->created_date; ?><br><?php echo $value->created_time; ?></td> <td class=" "><?php echo $value->created_date; ?><br><?php echo $value->created_time; ?>
<td class=" "><?php echo $value->name; ?> (<?php echo $value->emp_id; ?>) </td> </td>
<td class=" "><?php echo $value->emp_name; ?></td>
<td class=" "><?php echo $value->comments; ?></td> <td class=" "><?php echo $value->comments; ?></td>
<?php if($value->from_date == "" && $value->to_date == "") { ?> <?php if($value->from_date == "" && $value->to_date == "") { ?>
<td class=""> <td class="">
@ -87,12 +86,13 @@
</td> </td>
<?php } else { ?> <?php } else { ?>
<td class=" "> <?php echo dateFormat('d-m-Y',$value->from_date); echo ' to ';?> <?php echo dateFormat('d-m-Y',$value->to_date);?> </td> <td class=" "> <?php echo dateFormat('d-m-Y',$value->from_date); echo ' to ';?>
<?php echo dateFormat('d-m-Y',$value->to_date);?> </td>
<?php } ?> <?php } ?>
<td class=" "><?php echo $type->type; ?></td> <td class=" "><?php echo $type->type; ?></td>
<td class=" "><?php echo $value->risedby; ?></td> <td class=" "><?php echo $value->Risedby; ?></td>
<?php if($value->no_of_days == 0){ ?> <?php if($value->no_of_days == 0){ ?>
<td class=" ">---</td> <td class=" ">---</td>
<?php } else { ?> <?php } else { ?>
@ -102,27 +102,30 @@
<td style="color:#e68a00"><?php echo $value->status; ?></td> <td style="color:#e68a00"><?php echo $value->status; ?></td>
<?php } <?php }
else if($value->status == 'Approved'){ ?> else if($value->status == 'Approved'){ ?>
<td style="color:green"><?php echo $value->status; ?> By <?php echo $value->approved_by; ?><br><?php echo $value->approved_at; ?></td> <td style="color:green"><?php echo $value->status; ?> By
<?php echo $value->ApproveBy; ?><br><?php echo $value->approved_at; ?></td>
<?php } <?php }
else if($value->status == 'Declined'){ ?> else if($value->status == 'Declined'){ ?>
<td style="color:red"><?php echo $value->status; ?> By <?php echo $value->declined_by; ?> <br>" <?php echo $value->DReason; ?> "</td> <td style="color:red"><?php echo $value->status; ?> By
<?php echo $value->DeclineBy; ?> <br>" <?php echo $value->DReason; ?> "</td>
<?php } <?php }
else if($value->status == 'canceled'){ ?> else if($value->status == 'canceled'){ ?>
<td style="color:darkcyan;"><?php echo $value->status; ?></td> <td style="color:darkcyan;"><?php echo $value->status; ?></td>
<?php } <?php }
else{ else{
}?> }?>
<td style=" text-align: center; font-size: 16px;"> <td style=" text-align: center; font-size: 16px;">
<?php if($value->status == 'pending') { ?> <?php if($value->status == 'pending') { ?>
<a><i class="fa fa-check approveleave" data-toggle="modal" data-target=".bs-example-modal-sm" title="Approve Leave" id="<?php echo $value->id;?>"></i></a>&nbsp; <a><i class="fa fa-check approveleave" data-toggle="modal"
data-target=".bs-example-modal-sm" title="Approve Leave"
<a href="#"><i class="fa fa-times test" aria-hidden="true" title="Decline" onclick="showCustomPrompt()"
id="<?php echo $value->id;?>"></i></a>&nbsp; id="<?php echo $value->id;?>"></i></a>&nbsp;
<a href="#"><i class="fa fa-times test" aria-hidden="true" title="Decline"
onclick="showCustomPrompt()" id="<?php echo $value->id; ?>"></i></a>&nbsp;
<?php } ?> <?php } ?>
</td> </td>
</tr> </tr>
@ -137,9 +140,11 @@
<div id="customPrompt" class="modal modal_default"> <div id="customPrompt" class="modal modal_default">
<div class="modal-content modal-content_default"> <div class="modal-content modal-content_default">
<span style="text-align: right;" onclick="$('#customPrompt').hide()"><i class="fa fa-times" aria-hidden="true"></i></span> <span style="text-align: right;" onclick="$('#customPrompt').hide()"><i class="fa fa-times"
aria-hidden="true"></i></span>
<h3>Decline Reason</h3> <h3>Decline Reason</h3>
<input list="browsers" onfocus id="decline_reason" required name="myBrowser" style="margin-top: 10%;padding: 10px;"/> <input list="browsers" onfocus id="decline_reason" required name="myBrowser"
style="margin-top: 10%;padding: 10px;" />
<datalist id="browsers"> <datalist id="browsers">
<?php foreach ($dropdown as $key => $value) { ?> <?php foreach ($dropdown as $key => $value) { ?>
<option value="<?php echo $value->enum_value; ?>"><?php echo $value->enum_value; ?></option> <option value="<?php echo $value->enum_value; ?>"><?php echo $value->enum_value; ?></option>
@ -188,13 +193,14 @@
$('.bs-example-modal-lg').html(response); $('.bs-example-modal-lg').html(response);
$('.bs-example-modal-lg').modal("show"); $('.bs-example-modal-lg').modal("show");
}, },
error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) } error: function(jqXHR, textStatus, err) {
alert('text status ' + textStatus + ', err ' + err)
}
}); });
}); });
</script> </script>
<script> <script>
function showCustomPrompt() { function showCustomPrompt() {
var customPrompt = document.getElementById("customPrompt"); var customPrompt = document.getElementById("customPrompt");
customPrompt.style.display = "block"; customPrompt.style.display = "block";
@ -207,9 +213,11 @@ function submitCustomPrompt() {
if (reason != "") if (reason != "")
$.ajax( $.ajax({
{ data: {
data:{id : id , reason : reason }, id: id,
reason: reason
},
url: "<?php echo base_url('Leave/Decline');?>", url: "<?php echo base_url('Leave/Decline');?>",
type: "get", type: "get",
success: function(response) { success: function(response) {
@ -224,12 +232,13 @@ function submitCustomPrompt() {
alert('Decline Reason is required'); alert('Decline Reason is required');
} }
</script> </script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('#datatables').DataTable({ $('#datatables').DataTable({
"order": [[0, 'desc']], // Set initial sorting to descending on the first column "order": [
[0, 'desc']
], // Set initial sorting to descending on the first column
"dom": 'Bfrtip', // Show export buttons "dom": 'Bfrtip', // Show export buttons
"buttons": ['excel', 'pdf'], // Enable export options "buttons": ['excel', 'pdf'], // Enable export options
"language": { "language": {
@ -255,7 +264,6 @@ function confirmAction() {
hideConfirmationPopup(); hideConfirmationPopup();
// ... // ...
} }
</script> </script>
@ -271,5 +279,3 @@ function confirmAction() {
</div> </div>

13
application/modules/User/controllers/User.php
View File

@ -204,14 +204,15 @@ public function check_password()
$table="users"; $table="users";
$userData = $this->MY_Model->edit_option($data, user()->id, $table); $userData = $this->MY_Model->edit_option($data, user()->id, $table);
// $this->session->sess_destroy(); // $this->session->sess_destroy();
$data1['status'] = 'success'; // $data1['status'] = 'success';
$data1['csrf_hash'] = $this->security->get_csrf_hash(); // $data1['csrf_hash'] = $this->security->get_csrf_hash();
echo json_encode($data1); // echo json_encode($data1);
redirect('logout');
} }
else{ else{
$data['status'] = 'failed'; // $data['status'] = 'failed';
$data['csrf_hash'] = $this->security->get_csrf_hash(); // $data['csrf_hash'] = $this->security->get_csrf_hash();
echo json_encode($data); // echo json_encode($data);
} }
} }

72
application/modules/User/views/add_user.php
View File

@ -1,4 +1,3 @@
<!-- Body page content --> <!-- Body page content -->
@ -26,10 +25,13 @@
<!-- </div> --> <!-- </div> -->
<div class="x_content"> <div class="x_content">
<br /> <br />
<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>User/createUser" enctype="multipart/form-data"> <form id="" data-parsley-validate class="form-horizontal form-label-left" method="post"
action="<?php echo base_url();?>User/createUser" enctype="multipart/form-data">
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"> <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>"
<input type="text" id="created_by" name="created_by" value="<?php echo $data->created_by ?>" class="form-control " hidden> value="<?php echo $this->security->get_csrf_hash();?>">
<input type="text" id="created_by" name="created_by" value="<?php echo $data->created_by ?>"
class="form-control " hidden>
<!-- <?php if (is_superadmin()) { ?> <!-- <?php if (is_superadmin()) { ?>
@ -65,20 +67,23 @@
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Business<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Business<a
style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="business_id" name="business_id" required="required" class="form-control"> <select id="business_id" name="business_id" required="required" class="form-control">
<option value="<?php if(isset($businessData)) { echo $businessData->uid; } ?>"> <option value="<?php if(isset($businessData)) { echo $businessData->uid; } ?>">
<?php if(isset($businessData)) { echo $businessData->business_name; }else{ echo "Select business"; } ?> <?php if(isset($businessData)) { echo $businessData->business_name; }else{ echo "Select business"; } ?>
</option> </option>
<?php foreach ($business_dropdown as $key => $value) { ?> <?php foreach ($business_dropdown as $key => $value) { ?>
<option value="<?php echo $value->uid; ?>"><?php echo $value->business_name; echo $value->uid; ?></option> <option value="<?php echo $value->uid; ?>">
<?php echo $value->business_name; echo $value->uid; ?></option>
<?php } ?> <?php } ?>
</select> </select>
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="last-name"> Role<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="last-name"> Role<a
style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="role" name="role" required="required" class="form-control"> <select id="role" name="role" required="required" class="form-control">
<option value="">Select role</option> <option value="">Select role</option>
@ -93,7 +98,8 @@
else if (is_admin() || user()->action_permit != 'view') { ?> else if (is_admin() || user()->action_permit != 'view') { ?>
<div class="item form-group" hidden> <div class="item form-group" hidden>
<input type="text" id="business_id" name="business_id" value="<?php echo $data->business_id ?>" class="form-control " hidden> <input type="text" id="business_id" name="business_id"
value="<?php echo $data->business_id ?>" class="form-control " hidden>
<input type="text" id="role" name="role" value="user" class="form-control " hidden> <input type="text" id="role" name="role" value="user" class="form-control " hidden>
</div> </div>
<?php } ?> <?php } ?>
@ -105,29 +111,37 @@
<!-- --------------------------- --> <!-- --------------------------- -->
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Name<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Name<a
style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="name" name="name" value="" required="required" class="form-control "> <input type="text" id="name" name="name" value="" required="required"
class="form-control ">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="last-name"> Email<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="last-name"> Email<a
style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="email" id="email" name="email" value="" required="required" class="form-control "> <input type="email" id="email" name="email" value="" required="required"
class="form-control ">
</div> </div>
</div> </div>
<!-- --------------------------- --> <!-- --------------------------- -->
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Mobile<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Mobile<a
style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" pattern="[6-9]{1}[0-9]{9}" <input type="text" pattern="[6-9]{1}[0-9]{9}"
title="Phone number with 6-9 and remaing 9 digit with 0-9" id="mobile" name="mobile" value="" required="required" class="form-control "> title="Phone number with 6-9 and remaing 9 digit with 0-9" id="mobile" name="mobile"
value="" required="required" class="form-control ">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="last-name"> Permission<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="last-name"> Permission<a
style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="action_permit" name="action_permit" required="required" class="form-control" > <select id="action_permit" name="action_permit" required="required"
class="form-control">
<option value="">Select Permission</option> <option value="">Select Permission</option>
<option value="all">All</option> <option value="all">All</option>
<option value="view">View</option> <option value="view">View</option>
@ -136,24 +150,34 @@
</div> </div>
<!-- --------------------------- --> <!-- --------------------------- -->
<br /> <h6></h6> <div class="x_title"> </div> <br /> <br />
<h6></h6>
<div class="x_title"> </div> <br />
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Username<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Username<a
style="color:red;">*</a> </label>
<div class="col-md-3 col-sm-3 "> <div class="col-md-3 col-sm-3 ">
<input type="text" id="user_name" name="user_name" value="" required="required" class="form-control "> <input type="text" id="user_name" name="user_name" value="" required="required"
class="form-control ">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="last-name"> Password<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="last-name"> Password<a
style="color:red;">*</a> </label>
<div class="col-md-3 col-sm-3 "> <div class="col-md-3 col-sm-3 ">
<input type="password" id="password" minlength="8" name="password" value="" required="required" class="form-control " title="password must have alphabets &#013;password requires 6 characters minimum"> <input type="password" id="password" minlength="8" name="password" value=""
<span toggle="#password" id="toggle-password" class="fa fa-fw fa-eye field-icon toggle-password"></span> required="required" class="form-control "
title="password must have alphabets &#013;password requires 6 characters minimum">
<span toggle="#password" id="toggle-password"
class="fa fa-fw fa-eye field-icon toggle-password"></span>
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="last-name"> Confirm Password<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="last-name"> Confirm Password<a
style="color:red;">*</a> </label>
<div class="col-md-3 col-sm-3 "> <div class="col-md-3 col-sm-3 ">
<input type="password" id="confirm_password" name="confirm_password" value="" required="required" class="form-control "> <input type="password" id="confirm_password" name="confirm_password" value=""
required="required" class="form-control ">
<span id='message'></span> <span id='message'></span>
</div> </div>

56
application/modules/User/views/change_password.php
View File

@ -1,4 +1,3 @@
<!-- Body page content --> <!-- Body page content -->
@ -15,27 +14,22 @@
<div class="row"> <div class="row">
<div class="col-md-12 col-sm-12 "> <div class="col-md-12 col-sm-12 ">
<div class="x_panel"> <div class="x_panel">
<!-- <div class="x_title"> -->
<!-- <ul class="nav navbar-right panel_toolbox">
<li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a></li>
</li>
</ul> -->
<!-- <h6>General Information</h6> -->
<!-- <div class="clearfix"></div> -->
<!-- </div> -->
<div class="x_content"> <div class="x_content">
<br /> <br />
<form id="change-pass" data-parsley-validate class="form-horizontal form-label-left" method="post" action="" enctype="multipart/form-data"> <form id="change-pass" data-parsley-validate class="form-horizontal form-label-left" method="post"
action="<?php echo base_url();?>User/check_password" enctype="multipart/form-data">
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"> <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>"
value="<?php echo $this->security->get_csrf_hash();?>">
<!-- --------------------------- --> <!-- --------------------------- -->
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Old Password </label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Old Password <a
style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="password" id="old_password" name="old_password" value="" required="required" class="form-control "> <input type="password" id="old_password" name="old_password" value=""
required="required" class="form-control ">
<span id='message1'></span> <span id='message1'></span>
</div> </div>
@ -43,39 +37,42 @@
<!-- --------------------------- --> <!-- --------------------------- -->
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="last-name"> New Password </label> <label class="control-label col-md-1 col-sm-1 " for="last-name"> New Password <a
style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="password" id="password" minlength="8" name="password" value="" required="required" class="form-control " title="password must have alphabets &#013;password requires 6 characters minimum"> <input type="password" id="password" minlength="8" name="password" value=""
<span toggle="#password" id="toggle-password" class="fa fa-fw fa-eye field-icon toggle-password"></span> required="required" class="form-control "
title="password must have alphabets &#013;password requires 6 characters minimum">
<span toggle="#password" id="toggle-password"
class="fa fa-fw fa-eye field-icon toggle-password"></span>
</div> </div>
</div> </div>
<!-- --------------------------- --> <!-- --------------------------- -->
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="last-name"> Confirm Password </label> <label class="control-label col-md-1 col-sm-1 " for="last-name"> Confirm Password <a
style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="password" id="confirm_password" name="confirm_password" value="" required="required" class="form-control "> <input type="password" id="confirm_password" name="confirm_password" value=""
required="required" class="form-control ">
<span id='message'></span> <span id='message'></span>
</div> </div>
</div> </div>
<!-- --------------------------- -->
</form>
<div class="ln_solid"></div> <div class="ln_solid"></div>
<div class="item form-group"> <div class="item form-group">
<div class="offset-md-8"> <div class="offset-md-8">
<button class="btn btn-secondary" onclick="history.back()">Cancel</button> <button class="btn btn-secondary" onclick="history.back()">Cancel</button>
<button class="btn btn-primary" type="reset">Reset</button> <button type="reset" class="btn btn-primary" >Reset</button>
<button type="" id="submit" class="btn btn-success">Submit</button> <button type="submit" id="submit" class="btn btn-success">Submit</button>
</div> </div>
</div> </div>
<!-- --------------------------- -->
</form>
</div> </div>
</div> </div>
</div> </div>
@ -106,8 +103,7 @@
console.log("ssssssssss"); console.log("ssssssssss");
$('input[name=csrf_test_name]').val(response.csrf_hash); $('input[name=csrf_test_name]').val(response.csrf_hash);
location.href = "<?php echo base_url();?>Auth/logout"; location.href = "<?php echo base_url();?>Auth/logout";
} } else {
else {
$('input[name=csrf_test_name]').val(response.csrf_hash); $('input[name=csrf_test_name]').val(response.csrf_hash);
$('#message1').html('Worng password').css('color', 'red'); $('#message1').html('Worng password').css('color', 'red');
$('#password').val(''); $('#password').val('');
@ -115,7 +111,9 @@
$('#message').html(''); $('#message').html('');
} }
}, },
error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) } error: function(jqXHR, textStatus, err) {
alert('text status ' + textStatus + ', err ' + err)
}
}); });
}); });
</script> </script>

16
application/modules/User/views/edit_profile.php
View File

@ -1,4 +1,3 @@
<!-- Body page content --> <!-- Body page content -->
@ -27,16 +26,19 @@
<!-- </div> --> <!-- </div> -->
<div class="x_content"> <div class="x_content">
<br /> <br />
<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>User/editprofiles" enctype="multipart/form-data"> <form id="" data-parsley-validate class="form-horizontal form-label-left" method="post"
action="<?php echo base_url();?>User/editprofiles" enctype="multipart/form-data">
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"> <input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>"
value="<?php echo $this->security->get_csrf_hash();?>">
<input type="hidden" name="id" value="<?php echo $editData->id; ?>"> <input type="hidden" name="id" value="<?php echo $editData->id; ?>">
<!-- --------------------------- --> <!-- --------------------------- -->
<div class="item form-group"> <div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Name </label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Name </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="name" name="name" value="<?php echo $editData->name; ?>" required="required" class="form-control "> <input type="text" id="name" name="name" value="<?php echo $editData->name; ?>"
required="required" class="form-control ">
</div> </div>
</div> </div>
@ -45,7 +47,8 @@
<label class="control-label col-md-1 col-sm-1 " for="last-name"> Email </label> <label class="control-label col-md-1 col-sm-1 " for="last-name"> Email </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="email" name="email" value="<?php echo $editData->email; ?>" required="required" class="form-control "> <input type="text" id="email" name="email" value="<?php echo $editData->email; ?>"
required="required" class="form-control ">
</div> </div>
</div> </div>
@ -54,7 +57,8 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Mobile </label> <label class="control-label col-md-1 col-sm-1 " for="first-name"> Mobile </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="text" id="mobile" name="mobile" value="<?php echo $editData->mobile; ?>" required="required" class="form-control "> <input type="text" id="mobile" name="mobile" value="<?php echo $editData->mobile; ?>"
required="required" class="form-control ">
</div> </div>
</div> </div>

50
application/modules/User/views/profile.php
View File

@ -1,4 +1,3 @@
<!-- page content --> <!-- page content -->
<div class="" role="main"> <div class="" role="main">
<div class=""> <div class="">
@ -25,27 +24,15 @@
<div class="col-md-12 col-sm-12 "> <div class="col-md-12 col-sm-12 ">
<div class="x_panel"> <div class="x_panel">
<div class="x_title"> <div class="x_title">
<h2>User Details <h2>User Details</h2>
<!-- <small>Activity report</small> -->
</h2>
<!-- <ul class="nav navbar-right panel_toolbox">
<li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" href="#">Settings 1</a>
<a class="dropdown-item" href="#">Settings 2</a>
</div>
</li>
<li><a class="close-link"><i class="fa fa-close"></i></a>
</li>
</ul> -->
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="x_content"> <div class="x_content">
<form id="" data-parsley-validate class="form-horizontal form-label-left" method="post" action="<?php echo base_url();?>User/editprofiles" enctype="multipart/form-data"> <form id="" data-parsley-validate class="form-horizontal form-label-left" method="post"
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>" value="<?php echo $this->security->get_csrf_hash();?>"> action="<?php echo base_url();?>User/editprofiles" enctype="multipart/form-data">
<input type="hidden" name="<?php echo $this->security->get_csrf_token_name();?>"
value="<?php echo $this->security->get_csrf_hash();?>">
<input type="hidden" name="id" value="<?php echo user()->id; ?>"> <input type="hidden" name="id" value="<?php echo user()->id; ?>">
<button type="submit" class="btn btn-success" hidden>Update</button> <button type="submit" class="btn btn-success" hidden>Update</button>
@ -57,10 +44,14 @@
if ($userData->profile_image == NULL) { if ($userData->profile_image == NULL) {
?> ?>
<div class="profilepic"> <div class="profilepic">
<img style="width: 100%;height: 100%; display: block;" src="<?php echo base_url(); ?>/assets/uploads/profile_picture/profile.jpg" alt="Avatar" title="Change the avatar"> <img style="width: 100%;height: 100%; display: block;"
<input id="file_profile" name="profile_image" class="typeFile1" type="file" hidden/> src="<?php echo base_url(); ?>/assets/uploads/profile_picture/profile.jpg"
alt="Avatar" title="Change the avatar">
<input id="file_profile" name="profile_image" class="typeFile1" type="file"
hidden />
<div class="profilepic__content"> <div class="profilepic__content">
<span class="profilepic__icon"><i class="fa fa-camera" style="font-size:25px;color:black"></i></span> <span class="profilepic__icon"><i class="fa fa-camera"
style="font-size:25px;color:black"></i></span>
<span class="profilepic__text"><b>Edit Profile</b></span> <span class="profilepic__text"><b>Edit Profile</b></span>
</div> </div>
</div> </div>
@ -68,10 +59,15 @@
} else { } else {
?> ?>
<div class="profilepic"> <div class="profilepic">
<img class="profilepic__image" style="width: 100%; display: block;border-radius:50%" src="<?php echo base_url();?>/assets/uploads/profile_picture/<?php echo $userData->profile_image ?>" alt="Avatar" title="Change the avatar"> <img class="profilepic__image"
<input id="file_profile" name="profile_image" class="typeFile1" type="file" hidden/> style="width: 100%; display: block;border-radius:50%"
src="<?php echo base_url();?>/assets/uploads/profile_picture/<?php echo $userData->profile_image ?>"
alt="Avatar" title="Change the avatar">
<input id="file_profile" name="profile_image" class="typeFile1" type="file"
hidden />
<div class="profilepic__content"> <div class="profilepic__content">
<span class="profilepic__icon"><i class="fa fa-camera" style="font-size:25px;color:black"></i></span> <span class="profilepic__icon"><i class="fa fa-camera"
style="font-size:25px;color:black"></i></span>
<span class="profilepic__text"><b>Edit Profile</b></span> <span class="profilepic__text"><b>Edit Profile</b></span>
</div> </div>
</div> </div>
@ -95,7 +91,9 @@
<?php <?php
if (is_superadmin()) { if (is_superadmin()) {
?> ?>
<a class="btn btn-success" href="<?php echo base_url()?>User/editprofile/<?php echo md5(user()->id);?>"><i class="fa fa-edit m-right-xs"></i>Edit Profile</a> <a class="btn btn-success"
href="<?php echo base_url()?>User/editprofile/<?php echo md5(user()->id);?>"><i
class="fa fa-edit m-right-xs"></i>Edit Profile</a>
<br /> <br />
<?php <?php
} }

BIN
assets/appimg/default.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 383 KiB

100
composer.lock generated
View File

@ -62,31 +62,34 @@
}, },
{ {
"name": "chillerlan/php-qrcode", "name": "chillerlan/php-qrcode",
"version": "4.3.4", "version": "4.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/chillerlan/php-qrcode.git", "url": "https://github.com/chillerlan/php-qrcode.git",
"reference": "2ca4bf5ae048af1981d1023ee42a0a2a9d51e51d" "reference": "52889cd7ab1b78e6a345edafe24aa74bc5becc08"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/2ca4bf5ae048af1981d1023ee42a0a2a9d51e51d", "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/52889cd7ab1b78e6a345edafe24aa74bc5becc08",
"reference": "2ca4bf5ae048af1981d1023ee42a0a2a9d51e51d", "reference": "52889cd7ab1b78e6a345edafe24aa74bc5becc08",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"chillerlan/php-settings-container": "^2.1.4", "chillerlan/php-settings-container": "^2.1.4 || ^3.1",
"ext-mbstring": "*", "ext-mbstring": "*",
"php": "^7.4 || ^8.0" "php": "^7.4 || ^8.0"
}, },
"require-dev": { "require-dev": {
"phan/phan": "^5.3", "phan/phan": "^5.4",
"phpunit/phpunit": "^9.5", "phpmd/phpmd": "^2.13",
"setasign/fpdf": "^1.8.2" "phpunit/phpunit": "^9.6",
"setasign/fpdf": "^1.8.2",
"squizlabs/php_codesniffer": "^3.7"
}, },
"suggest": { "suggest": {
"chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps.", "chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps.",
"setasign/fpdf": "Required to use the QR FPDF output." "setasign/fpdf": "Required to use the QR FPDF output.",
"simple-icons/simple-icons": "SVG icons that you can use to embed as logos in the QR Code"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -113,7 +116,7 @@
"homepage": "https://github.com/chillerlan/php-qrcode/graphs/contributors" "homepage": "https://github.com/chillerlan/php-qrcode/graphs/contributors"
} }
], ],
"description": "A QR code generator. PHP 7.4+", "description": "A QR code generator with a user friendly API. PHP 7.4+",
"homepage": "https://github.com/chillerlan/php-qrcode", "homepage": "https://github.com/chillerlan/php-qrcode",
"keywords": [ "keywords": [
"phpqrcode", "phpqrcode",
@ -124,7 +127,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/chillerlan/php-qrcode/issues", "issues": "https://github.com/chillerlan/php-qrcode/issues",
"source": "https://github.com/chillerlan/php-qrcode/tree/4.3.4" "source": "https://github.com/chillerlan/php-qrcode/tree/4.4.0"
}, },
"funding": [ "funding": [
{ {
@ -136,29 +139,31 @@
"type": "ko_fi" "type": "ko_fi"
} }
], ],
"time": "2022-07-25T09:12:45+00:00" "time": "2023-11-23T23:53:20+00:00"
}, },
{ {
"name": "chillerlan/php-settings-container", "name": "chillerlan/php-settings-container",
"version": "2.1.4", "version": "3.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/chillerlan/php-settings-container.git", "url": "https://github.com/chillerlan/php-settings-container.git",
"reference": "1beb7df3c14346d4344b0b2e12f6f9a74feabd4a" "reference": "4d02944424fa1f48abca96353257c93cbac856c1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/1beb7df3c14346d4344b0b2e12f6f9a74feabd4a", "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/4d02944424fa1f48abca96353257c93cbac856c1",
"reference": "1beb7df3c14346d4344b0b2e12f6f9a74feabd4a", "reference": "4d02944424fa1f48abca96353257c93cbac856c1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"php": "^7.4 || ^8.0" "php": "^8.1"
}, },
"require-dev": { "require-dev": {
"phan/phan": "^5.3", "phan/phan": "^5.4",
"phpunit/phpunit": "^9.5" "phpmd/phpmd": "^2.13",
"phpunit/phpunit": "^10.2",
"squizlabs/php_codesniffer": "^3.7"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -177,10 +182,9 @@
"homepage": "https://github.com/codemasher" "homepage": "https://github.com/codemasher"
} }
], ],
"description": "A container class for immutable settings objects. Not a DI container. PHP 7.4+", "description": "A container class for immutable settings objects. Not a DI container.",
"homepage": "https://github.com/chillerlan/php-settings-container", "homepage": "https://github.com/chillerlan/php-settings-container",
"keywords": [ "keywords": [
"PHP7",
"Settings", "Settings",
"configuration", "configuration",
"container", "container",
@ -200,20 +204,20 @@
"type": "ko_fi" "type": "ko_fi"
} }
], ],
"time": "2022-07-05T22:32:14+00:00" "time": "2023-07-17T20:46:37+00:00"
}, },
{ {
"name": "dasprid/enum", "name": "dasprid/enum",
"version": "1.0.4", "version": "1.0.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/DASPRiD/Enum.git", "url": "https://github.com/DASPRiD/Enum.git",
"reference": "8e6b6ea76eabbf19ea2bf5b67b98e1860474012f" "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8e6b6ea76eabbf19ea2bf5b67b98e1860474012f", "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/6faf451159fb8ba4126b925ed2d78acfce0dc016",
"reference": "8e6b6ea76eabbf19ea2bf5b67b98e1860474012f", "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -248,27 +252,27 @@
], ],
"support": { "support": {
"issues": "https://github.com/DASPRiD/Enum/issues", "issues": "https://github.com/DASPRiD/Enum/issues",
"source": "https://github.com/DASPRiD/Enum/tree/1.0.4" "source": "https://github.com/DASPRiD/Enum/tree/1.0.5"
}, },
"time": "2023-03-01T18:44:03+00:00" "time": "2023-08-25T16:18:39+00:00"
}, },
{ {
"name": "endroid/qr-code", "name": "endroid/qr-code",
"version": "4.8.2", "version": "4.8.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/endroid/qr-code.git", "url": "https://github.com/endroid/qr-code.git",
"reference": "2436c2333a3931c95e2b96eb82f16f53143d6bba" "reference": "0db25b506a8411a5e1644ebaa67123a6eb7b6a77"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/endroid/qr-code/zipball/2436c2333a3931c95e2b96eb82f16f53143d6bba", "url": "https://api.github.com/repos/endroid/qr-code/zipball/0db25b506a8411a5e1644ebaa67123a6eb7b6a77",
"reference": "2436c2333a3931c95e2b96eb82f16f53143d6bba", "reference": "0db25b506a8411a5e1644ebaa67123a6eb7b6a77",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"bacon/bacon-qr-code": "^2.0.5", "bacon/bacon-qr-code": "^2.0.5",
"php": "^8.0" "php": "^8.1"
}, },
"conflict": { "conflict": {
"khanamiryan/qrcode-detector-decoder": "^1.0.6" "khanamiryan/qrcode-detector-decoder": "^1.0.6"
@ -317,7 +321,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/endroid/qr-code/issues", "issues": "https://github.com/endroid/qr-code/issues",
"source": "https://github.com/endroid/qr-code/tree/4.8.2" "source": "https://github.com/endroid/qr-code/tree/4.8.5"
}, },
"funding": [ "funding": [
{ {
@ -325,20 +329,20 @@
"type": "github" "type": "github"
} }
], ],
"time": "2023-03-30T18:46:02+00:00" "time": "2023-09-29T14:03:20+00:00"
}, },
{ {
"name": "filp/whoops", "name": "filp/whoops",
"version": "2.15.2", "version": "2.15.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/filp/whoops.git", "url": "https://github.com/filp/whoops.git",
"reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73" "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/aac9304c5ed61bf7b1b7a6064bf9806ab842ce73", "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546",
"reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73", "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -388,7 +392,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/filp/whoops/issues", "issues": "https://github.com/filp/whoops/issues",
"source": "https://github.com/filp/whoops/tree/2.15.2" "source": "https://github.com/filp/whoops/tree/2.15.4"
}, },
"funding": [ "funding": [
{ {
@ -396,7 +400,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2023-04-12T12:00:00+00:00" "time": "2023-11-03T12:00:00+00:00"
}, },
{ {
"name": "psr/log", "name": "psr/log",
@ -1626,16 +1630,16 @@
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
"version": "v1.27.0", "version": "v1.28.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git", "url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "5bbc823adecdae860bb64756d639ecfec17b050a" "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
"reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1650,7 +1654,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-main": "1.27-dev" "dev-main": "1.28-dev"
}, },
"thanks": { "thanks": {
"name": "symfony/polyfill", "name": "symfony/polyfill",
@ -1688,7 +1692,7 @@
"portable" "portable"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
}, },
"funding": [ "funding": [
{ {
@ -1704,7 +1708,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-11-03T14:55:06+00:00" "time": "2023-01-26T09:26:14+00:00"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",

0
sql/ams(24.06.2023).sql → sql/old_ams_db/ams(24.06.2023).sql
View File

0
sql/ams.sql → sql/old_ams_db/ams.sql
View File

2064
sql/venbaehn_ams_2023-12-18_10-33-43.sql Normal file
View File

File diff suppressed because it is too large Load Diff