; ?>/assets/uploads/logo/<?php echo $business->logo;?>){kind=logo}
-
-
+ Welcome,
+
+ ";
-
- // die;
-
+
if(count($final_array) != 0)
{
foreach($final_array as $key => $value){
@@ -250,7 +251,7 @@ public function delete_business($id)
{
$Data = $this->Business_model->delete_by_md5_id($id,user()->business_id,'asset');
redirect('Business/business_list');
- }
+ }
//===================== MODULES =================================================
@@ -305,15 +306,4 @@ public function getDeleteConfirmationPopup()
}
-}
-
-
-
-
-
-
-
-
-
-
-
+}
\ No newline at end of file
diff --git a/application/modules/Business/views/add_business.php b/application/modules/Business/views/add_business.php
index 46c9c78..0283e9a 100644
--- a/application/modules/Business/views/add_business.php
+++ b/application/modules/Business/views/add_business.php
@@ -1,18 +1,17 @@
-
-
+
-
-Add Business
+
+ Add Business
+
+
+
+
+
+
+
+
+
+
+
+ Business Information
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-Business Information
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/application/modules/Business/views/add_module_form.php b/application/modules/Business/views/add_module_form.php
index 3996bef..1249b76 100644
--- a/application/modules/Business/views/add_module_form.php
+++ b/application/modules/Business/views/add_module_form.php
@@ -1,49 +1,48 @@
-
-
+
-
-Add Module
-
+
+ Add Module
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/application/modules/Business/views/edit_business.php b/application/modules/Business/views/edit_business.php
index bac02b0..deb5fde 100644
--- a/application/modules/Business/views/edit_business.php
+++ b/application/modules/Business/views/edit_business.php
@@ -1,4 +1,3 @@
-
@@ -8,7 +7,7 @@
.multi-select-container {
display: inline-block;
position: relative;
- width:100%;
+ width: 100%;
}
.multi-select-menu {
@@ -53,7 +52,7 @@
width: 1px;
}
-.multi-select-menuitem + .multi-select-menuitem {
+.multi-select-menuitem+.multi-select-menuitem {
padding-top: 0;
}
@@ -69,9 +68,9 @@
.multi-select-button {
display: block;
- margin-top:2px;
- width:100%;
- max-width: 100%!important;
+ margin-top: 2px;
+ width: 100%;
+ max-width: 100% !important;
font-size: 0.875em;
padding: 0.85em 0.6em;
white-space: nowrap;
@@ -94,8 +93,8 @@
border-color: #999 transparent transparent transparent;
margin-left: 0.4em;
vertical-align: 0.1em;
- right:5px;
- top:17px;
+ right: 5px;
+ top: 17px;
}
.multi-select-container--open .multi-select-menu {
@@ -116,189 +115,187 @@
/* Allow labels to line wrap when menu is artificially narrowed */
white-space: normal;
}
-
-
+
-
-
-
-
-
+ Business List
+
+
+
+
+
+
-
-Business Information
-
-
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/application/modules/Business/views/edit_modules.php b/application/modules/Business/views/edit_modules.php
index a77dcd9..5916a8b 100644
--- a/application/modules/Business/views/edit_modules.php
+++ b/application/modules/Business/views/edit_modules.php
@@ -1,53 +1,53 @@
-
-
+
+
+
+ Edit Module
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Edit Module
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/application/modules/Employee/controllers/Employee.php b/application/modules/Employee/controllers/Employee.php
index 9c8e752..e05b52e 100644
--- a/application/modules/Employee/controllers/Employee.php
+++ b/application/modules/Employee/controllers/Employee.php
@@ -70,52 +70,7 @@ 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()
{
//insert in users table
@@ -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')));
+ }
+
+ }
+
+
}
diff --git a/application/modules/Employee/views/add_emp.php b/application/modules/Employee/views/add_emp.php
index 26de719..dc15692 100644
--- a/application/modules/Employee/views/add_emp.php
+++ b/application/modules/Employee/views/add_emp.php
@@ -1,26 +1,25 @@
-
-
-
-
+
+
+
-
-
-
+
+
+
-
- Add Employee
-
-
-
-
+
+
+ Add Employee
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+});
+
\ No newline at end of file
diff --git a/application/modules/Employee/views/edit_emp.php b/application/modules/Employee/views/edit_emp.php
index 90a950e..301c9c9 100644
--- a/application/modules/Employee/views/edit_emp.php
+++ b/application/modules/Employee/views/edit_emp.php
@@ -1,23 +1,21 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-Edit Employee
-
+
+ Edit Employee
+
-
-
-
-
-
-
+
+
+
+
+
+ Emergency Contact
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Address Detail
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Additional Information
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ gender == 'male')
+ {
+ echo 'Male';
+ echo ' ';
+ echo 'Female';
+ }
+ else
+ {
+ echo 'Male';
+ echo ' ';
+ echo 'Female';
+ } ?>
+
+
+
+
+
+
+
+
+
+ ;?>/assets/uploads/<?php echo $editData->profile_pic ?> "Change the avatar")
+
+
+
+
+
+
+
+ Permissions
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Cancel
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-Emergency Contact
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Address Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Additional Information
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Permissions
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Cancel
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
\ No newline at end of file
diff --git a/application/modules/Expence/views/edit_expence.php b/application/modules/Expence/views/edit_expence.php
index 1a4eb09..e91388a 100644
--- a/application/modules/Expence/views/edit_expence.php
+++ b/application/modules/Expence/views/edit_expence.php
@@ -121,10 +121,10 @@
-
+
-
+
@@ -181,7 +181,7 @@
-
+
diff --git a/application/modules/Expence/views/expence_form.php b/application/modules/Expence/views/expence_form.php
index 423a8b3..baeb9b4 100644
--- a/application/modules/Expence/views/expence_form.php
+++ b/application/modules/Expence/views/expence_form.php
@@ -8,10 +8,10 @@
-
-
+
+
-
-Expense Claim
+
+ Expense Claim
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-id)) { ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+ }
+
+
+ });
+}
+
\ No newline at end of file
diff --git a/application/modules/Layout/views/includes/default_header.php b/application/modules/Layout/views/includes/default_header.php
index 0b371ce..ae42f4a 100644
--- a/application/modules/Layout/views/includes/default_header.php
+++ b/application/modules/Layout/views/includes/default_header.php
@@ -6,13 +6,13 @@
-
+
- Ams
+ Ams
@@ -112,7 +112,7 @@
Masters
- Settings
+
Log Out
diff --git a/application/modules/Layout/views/includes/default_menu.php b/application/modules/Layout/views/includes/default_menu.php
index a223d7f..de5aa1c 100644
--- a/application/modules/Layout/views/includes/default_menu.php
+++ b/application/modules/Layout/views/includes/default_menu.php
@@ -1,178 +1,186 @@
-
-
-
-
-
- ; ?>/assets/uploads/logo/<?php echo $settings->logo;?>)
+
+
-
+
-
-
-
- profile_image == '' || user()->profile_image == null) { ?>
- ; ?>/assets/uploads/profile_picture/profile.jpg)
-
- ; ?>/assets/uploads/profile_picture/<?php echo user()->profile_image; ?>)
-
-
-
-
-
- Welcome,
- name;}else{echo user()->name; }?>
-
-
-
+
+
+
+ profile_image == '' || user()->profile_image == null) { ?>
+
+
+
-
+
-
-
+
-
- Business
-
-
-
+
+
+
+
+
+
+ Employee
+
+
+ role == null ) { ?>
+
+ Leaves
+
+
+
+ role == null ) { ?>
+
+
+ Expense
+
+
+
+ role == null ) { ?>
+
+ Delegation
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/application/modules/Leave/controllers/Leave.php b/application/modules/Leave/controllers/Leave.php
index 7de3272..279027f 100644
--- a/application/modules/Leave/controllers/Leave.php
+++ b/application/modules/Leave/controllers/Leave.php
@@ -55,6 +55,8 @@ public function leaveList()
$business_id = user()->business_id;
$leave_list = $this->Leave_model->get_leave_with_emp_name(user()->business_id);
+ // echo '';
+ // print_r($leave_list); die;
$leave_type = $this->Leave_model->get_leave_type($business_id);
$decline_dropdown = $this->Leave_model->decline_dropdown($business_id);
$this->layout->set('tableData', $leave_list);
@@ -448,7 +450,7 @@ public function ApproveLeave()
if($remaining_days[0]->remaining_days <= 0){
$data['status'] = 'Declined';
- $data['declined_by']= user()->name;
+ $data['declined_by']= user()->id;
$data['declined_at'] = date('d-m-Y H:i:s');
$data['DReason'] = 'No sufficient leave balance';
$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);
$data['status'] = 'Approved';
- $data['approved_by']= user()->name;
+ $data['approved_by']= user()->id;
$data['approved_at'] = date('d-m-Y H:i:s');
+ // print_r($data); die;
$this->Leave_model->LeaveApprove($id, $data);
redirect('Leave/leaveList');
}
@@ -550,4 +553,4 @@ public function manager_approvel()
$this->layout->render('Employee_Layout');
}
-}
+}
\ No newline at end of file
diff --git a/application/modules/Leave/models/Leave_model.php b/application/modules/Leave/models/Leave_model.php
index ee189e6..af7fc91 100644
--- a/application/modules/Leave/models/Leave_model.php
+++ b/application/modules/Leave/models/Leave_model.php
@@ -3,9 +3,12 @@ class Leave_model extends MY_Model {
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->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->order_by('A.id','DESC');
$this->db->where('A.is_active', 1);
@@ -13,6 +16,23 @@ public function get_leave_with_emp_name($business_id)
$query = $query->result();
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, )
diff --git a/application/modules/Leave/views/apply_leave.php b/application/modules/Leave/views/apply_leave.php
index da6905a..c60dee9 100644
--- a/application/modules/Leave/views/apply_leave.php
+++ b/application/modules/Leave/views/apply_leave.php
@@ -145,17 +145,16 @@
-
- Self
- Others
+ Self
+ Others
-
+
@@ -271,7 +270,7 @@
$("#user_dropdown").addClass("hide-arrow");
$("input[name='risedby']").on("change", function() {
var inputValue = $(this).val();
- if (inputValue === "name;?>(id;?>)") {
+ if (inputValue === "name;?>") {
$("#user_dropdown").removeClass("hide-arrow");
} else {
$("#user_dropdown").addClass("hide-arrow");
@@ -360,7 +359,7 @@
var currentUserId = 'id; ?>';
$userDropdown.append('');
$userDropdown.prop('disabled', true);
- } else if (selectedValue === 'name; ?>(id;?>)') {
+ } else if (selectedValue === 'name; ?>') {
$.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);
- // });
- // });
+$('#subimt').click(function() {
+ let val = $('#user_dropdown').val()
+ console.log(val);
+});
- // 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 : "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: "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 : "Leave/get_from_to_date_count/",
- // type: "get",
- // success: function(response) {
-
- // alert(response);
-
- // response = JSON.parse(response);
-
-
- // }
-
- // });
-
-
-
-
-
- // }
@@ -673,4 +575,3 @@ function calculateDateDifference() {
-
diff --git a/application/modules/Leave/views/edit_leave.php b/application/modules/Leave/views/edit_leave.php
index a7ea90b..aad5d23 100644
--- a/application/modules/Leave/views/edit_leave.php
+++ b/application/modules/Leave/views/edit_leave.php
@@ -42,7 +42,7 @@
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
}
@@ -52,7 +52,7 @@
right: 0;
color: black;
opacity: 1;
- }
+ } */
diff --git a/application/modules/Leave/views/leave_list.php b/application/modules/Leave/views/leave_list.php
index d78cec9..035a60b 100644
--- a/application/modules/Leave/views/leave_list.php
+++ b/application/modules/Leave/views/leave_list.php
@@ -1,157 +1,162 @@
-
-
-
-
-
+
+
+
+
-
+ div.dataTables_wrapper div.dataTables_filter {
+ margin-top: -30px !important;
+ }
+
-
-
-
-
+
+
- My Approvals
-
-
-
-
-
-
+
+
-
-
-
-
-
+
@@ -160,103 +165,106 @@
-
-
+
\ No newline at end of file
diff --git a/application/modules/User/controllers/User.php b/application/modules/User/controllers/User.php
index 988cf8d..434c2f1 100644
--- a/application/modules/User/controllers/User.php
+++ b/application/modules/User/controllers/User.php
@@ -204,14 +204,15 @@ public function check_password()
$table="users";
$userData = $this->MY_Model->edit_option($data, user()->id, $table);
// $this->session->sess_destroy();
- $data1['status'] = 'success';
- $data1['csrf_hash'] = $this->security->get_csrf_hash();
- echo json_encode($data1);
+ // $data1['status'] = 'success';
+ // $data1['csrf_hash'] = $this->security->get_csrf_hash();
+ // echo json_encode($data1);
+ redirect('logout');
}
else{
- $data['status'] = 'failed';
- $data['csrf_hash'] = $this->security->get_csrf_hash();
- echo json_encode($data);
+ // $data['status'] = 'failed';
+ // $data['csrf_hash'] = $this->security->get_csrf_hash();
+ // echo json_encode($data);
}
}
@@ -244,4 +245,4 @@ public function view_business_history($id)
echo json_encode($htmlPage);
}
-}
+}
\ No newline at end of file
diff --git a/application/modules/User/views/add_user.php b/application/modules/User/views/add_user.php
index 8f918a0..b689793 100644
--- a/application/modules/User/views/add_user.php
+++ b/application/modules/User/views/add_user.php
@@ -1,38 +1,40 @@
-
-
+
-
-Add User
-
+
+ Add User
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/application/modules/User/views/change_password.php b/application/modules/User/views/change_password.php
index cf5c044..86e79ca 100644
--- a/application/modules/User/views/change_password.php
+++ b/application/modules/User/views/change_password.php
@@ -1,121 +1,119 @@
-
-
+
-
-Change Password
+
+ Change Password
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/application/modules/User/views/edit_profile.php b/application/modules/User/views/edit_profile.php
index 5770872..e62f67a 100644
--- a/application/modules/User/views/edit_profile.php
+++ b/application/modules/User/views/edit_profile.php
@@ -1,65 +1,69 @@
-
-
+
-
-Edit Profile
-
+
+ Edit Profile
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
@@ -90,5 +94,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/application/modules/User/views/profile.php b/application/modules/User/views/profile.php
index a8e6eae..17b4a2a 100644
--- a/application/modules/User/views/profile.php
+++ b/application/modules/User/views/profile.php
@@ -1,13 +1,12 @@
-
-
-
-
-
-
+
+
+
+
+
User Profile
-
+
-
+
-
-
-
+
-
-
+
+
+
+
-
- User Details
-
-
-
-
-
-
-
+
-
-
+
-
-
+
+
+