diff --git a/.gitignore b/.gitignore index 6d3cd46..d0115c8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,12 @@ application/logs/* !application/logs/index.html !application/logs/.htaccess vendor -assets/uploads -assets/uploads/Expence_Bill +#assets/uploads/* +#assets/uploads/Expence_Bill +assets/uploads/Expence_Bill/* +assets/uploads/profile_picture/* +!assets/uploads/profile_picture/.gitkeep +!assets/uploads/Expence_Bill/.gitkeep +assets/uploads/logo/* +!assets/uploads/logo/.gitkeep diff --git a/application/modules/Employee/views/add_emp.php b/application/modules/Employee/views/add_emp.php index 8516904..ccea605 100644 --- a/application/modules/Employee/views/add_emp.php +++ b/application/modules/Employee/views/add_emp.php @@ -640,3 +640,15 @@ function check_if_exists(id, value, name) { }); + diff --git a/application/modules/Expence/controllers/Expence.php b/application/modules/Expence/controllers/Expence.php index a3b0a5d..0370b0f 100644 --- a/application/modules/Expence/controllers/Expence.php +++ b/application/modules/Expence/controllers/Expence.php @@ -132,7 +132,7 @@ public function rise_expence_request() else { $error = $this->upload->display_errors(); - } + } $table="expense_child"; $create_expence_list = $this->MY_Model->insert($data2,$table); diff --git a/application/modules/Expence/views/expence_form.php b/application/modules/Expence/views/expence_form.php index 0b62a6a..9a56a14 100644 --- a/application/modules/Expence/views/expence_form.php +++ b/application/modules/Expence/views/expence_form.php @@ -334,10 +334,11 @@ function matchnum(event) method: 'GET', dataType: 'json', success: function(response) { - - $('#user_dropdown').append(response); + $('#user_dropdown').append(response); + $('#user_dropdown').prop('required', true); + $('#user_dropdown').prop('disabled', false); - $('#user_dropdown').prop('required', true); + }, error: function(xhr, status, error) { console.error(error); diff --git a/application/modules/User/views/profile.php b/application/modules/User/views/profile.php index 17b4a2a..4660fae 100644 --- a/application/modules/User/views/profile.php +++ b/application/modules/User/views/profile.php @@ -47,8 +47,8 @@ Avatar - + +
@@ -64,7 +64,7 @@ src="/assets/uploads/profile_picture/profile_image ?>" alt="Avatar" title="Change the avatar"> + accept=".png, .jpg, .jpeg" hidden />
diff --git a/assets/uploads/Expence_Bill/.gitkeep b/assets/uploads/Expence_Bill/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/assets/uploads/logo/.gitkeep b/assets/uploads/logo/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/assets/uploads/profile_picture/.gitkeep b/assets/uploads/profile_picture/.gitkeep new file mode 100644 index 0000000..e69de29