diff --git a/application/modules/Expence/controllers/Expence.php b/application/modules/Expence/controllers/Expence.php index 3c76984..70e54c4 100644 --- a/application/modules/Expence/controllers/Expence.php +++ b/application/modules/Expence/controllers/Expence.php @@ -113,7 +113,7 @@ public function rise_expence_request() $create_leave = $this->MY_Model->insert($data,$table); $this->session->set_flashdata('Create', 'Claim Request Rised Successfully'); - redirect('Expence/expence_form'); + redirect('Expence/Emp_Expence_List'); } diff --git a/application/modules/Expence/views/emp_expence_list.php b/application/modules/Expence/views/emp_expence_list.php index 11cd107..81eedee 100644 --- a/application/modules/Expence/views/emp_expence_list.php +++ b/application/modules/Expence/views/emp_expence_list.php @@ -110,9 +110,7 @@ $value) { ?> id == $value->emp_id) { ?> - created_at);?> - created_at);?> - + created_date; ?>
created_time;?> comments; ?> date_of_expence);?> ₹ amount; ?> diff --git a/application/modules/Expence/views/expence_form.php b/application/modules/Expence/views/expence_form.php index 67b1fee..a714d01 100644 --- a/application/modules/Expence/views/expence_form.php +++ b/application/modules/Expence/views/expence_form.php @@ -30,14 +30,6 @@
-session->userdata('Create')): ?> -
-

session->userdata('Create'); ?>

- -
- -session->unset_userdata('Create');?> - @@ -95,7 +87,7 @@
- +
diff --git a/application/modules/Expence/views/expence_list.php b/application/modules/Expence/views/expence_list.php index 1546526..ca47716 100644 --- a/application/modules/Expence/views/expence_list.php +++ b/application/modules/Expence/views/expence_list.php @@ -140,7 +140,7 @@ bill)) { ?> -
+
diff --git a/application/modules/Expence/views/expence_manager_approvel.php b/application/modules/Expence/views/expence_manager_approvel.php index 3012368..e49602a 100644 --- a/application/modules/Expence/views/expence_manager_approvel.php +++ b/application/modules/Expence/views/expence_manager_approvel.php @@ -98,7 +98,7 @@ - + diff --git a/application/modules/Layout/views/includes/employee_menu.php b/application/modules/Layout/views/includes/employee_menu.php index de6407b..75190c4 100644 --- a/application/modules/Layout/views/includes/employee_menu.php +++ b/application/modules/Layout/views/includes/employee_menu.php @@ -76,7 +76,7 @@
  • Apply Leave
    • -
  • My Approvals
    • +
  • My Approvals
    • diff --git a/application/modules/Leave/controllers/Leave.php b/application/modules/Leave/controllers/Leave.php index c74aca1..d922940 100644 --- a/application/modules/Leave/controllers/Leave.php +++ b/application/modules/Leave/controllers/Leave.php @@ -63,11 +63,13 @@ public function leaveList() } public function applyLeave() - { - $emp_leave_count = $this->Leave_model->get("emp_leave_days"); - $emp = $this->Emp_model->get_employee(user()->business_id); + { $business_id = user()->business_id; + $user_id = user()->id; + $emp_leave_count = $this->Leave_model->get_count($user_id, $business_id, "emp_leave_days"); + $emp = $this->Emp_model->get_employee(user()->business_id); $leavetype = $this->Leave_model->getLeaveType($business_id); + //print_r($emp_leave_count); die(); $this->layout->set('emp', $emp); $this->layout->set('count', $emp_leave_count); $this->layout->set('leavetype', $leavetype); @@ -124,7 +126,7 @@ public function createLeave() $emp_id = user()->id; } $data['emp_id'] = $emp_id; - if($data['manager']){ + if(!is_null($data['manager'])){ $manager = $this->input->post('manager'); }else{ $manager = employee()->manager; @@ -137,7 +139,7 @@ public function createLeave() $emp_leave_count = $this->Leave_model->get_leave( $emp_id , user()->business_id , "emp_leave_days"); // count number of days between two dates - $days_between = ceil(abs(dateFormat('d-m-Y',$this->input->post('to_date')) - dateFormat('d-m-Y',$this->input->post('from_date'))) / 86400); + $days_between = ceil(abs($this->input->post('to_date') - $this->input->post('from_date')) / 86400); $data['no_of_days'] = $days_between + 1; $noofdays = $days_between + 1; if (count($emp_leave_count) != 0) @@ -379,6 +381,14 @@ public function manager_approvel() $this->layout->render('Employee_Layout'); } + public function hide_leave_type() + { + $type_id = $this->input->get('type_id'); + $emp_id = $this->input->get('emp_id'); + $emp_leave_count = $this->Leave_model->get_emp_leave_count($type_id, $emp_id); + echo json_encode($emp_leave_count); + } + diff --git a/application/modules/Leave/models/Leave_model.php b/application/modules/Leave/models/Leave_model.php index bbe1352..097e603 100644 --- a/application/modules/Leave/models/Leave_model.php +++ b/application/modules/Leave/models/Leave_model.php @@ -27,11 +27,12 @@ public function get_with_emp_name($business_id, ) return $query; } - public function get($table) + public function get_count($user_id, $business_id, $table) { $this->db->select('*'); $this->db->from($table); - $this->db->order_by('id','DESC'); + $this->db->where('business_id', $business_id); + $this->db->where('emp_id', $user_id); $this->db->where('is_active', 1); $query = $this->db->get(); $query = $query->result(); @@ -260,5 +261,15 @@ public function Get_delegation_id($business_id) return $query->result(); } - + public function get_emp_leave_count($type_id, $emp_id) + { + $this->db->select('remaining_days'); + $this->db->from('emp_leave_days'); + $this->db->where('emp_id', $emp_id); + $this->db->where('type', $type_id); + $this->db->where('is_active', 1); + $query = $this->db->get(); + return $query->result(); + + } } \ No newline at end of file diff --git a/application/modules/Leave/views/apply_leave.php b/application/modules/Leave/views/apply_leave.php index db033f8..d0ec04a 100644 --- a/application/modules/Leave/views/apply_leave.php +++ b/application/modules/Leave/views/apply_leave.php @@ -147,7 +147,7 @@
    - +
    @@ -308,7 +308,6 @@ response = JSON.parse(response); if(response.length == 0) { - get_all_count(type_id); } else @@ -395,9 +394,9 @@ function permission() { if( type === 'Permission' ){ - $('#hidedate').hide() - $('#balance').hide() - $('#leave_bal').hide() + $('#hidedate').hide(); + $('#balance').hide(); + $('#leave_bal').hide(); $('#fromdate').removeAttr('required'); $('#todate').removeAttr('required'); $('#showtime').show(); @@ -411,8 +410,8 @@ function permission() { $('#hidedate').show(); $('#showtime').hide(); $('#showdate').hide(); - $('#balance').show() - $('#leave_bal').show() + $('#balance').show(); + $('#leave_bal').show(); } } @@ -538,7 +537,7 @@ function calculateDateDifference() { if (fromDate && toDate) { var difference = Math.ceil((toDate - fromDate) / (1000 * 60 * 60 * 24) + 1); - if(difference === 1)s + if(difference === 1) { $("#dateDifference").val(difference + ' day'); } @@ -555,7 +554,42 @@ function calculateDateDifference() { + diff --git a/application/modules/Leave/views/leave_list.php b/application/modules/Leave/views/leave_list.php index 62bdfcc..00b9e70 100644 --- a/application/modules/Leave/views/leave_list.php +++ b/application/modules/Leave/views/leave_list.php @@ -34,7 +34,7 @@ div.dataTables_wrapper div.dataTables_filter{ margin-top: -44px !important; //search move to up - +} @@ -68,6 +68,7 @@ $value) { ?> + @@ -76,7 +77,7 @@ @@ -93,10 +94,10 @@ status == 'Approved'){ ?> - + status == 'Declined'){ ?> - + status == 'canceled'){ ?> diff --git a/assets/uploads/Expence_Bill/1687609751.jpg b/assets/uploads/Expence_Bill/1687609751.jpg new file mode 100644 index 0000000..91359f3 Binary files /dev/null and b/assets/uploads/Expence_Bill/1687609751.jpg differ diff --git a/assets/uploads/Expence_Bill/16876097511.jpg b/assets/uploads/Expence_Bill/16876097511.jpg new file mode 100644 index 0000000..91359f3 Binary files /dev/null and b/assets/uploads/Expence_Bill/16876097511.jpg differ
    Claim DateClaim Date Employee Name Description Expense Date
    created_date; ?>
    created_time; ?>    		 perm_date);?>
    from_time); ?> to - to_time);; ?> + to_time);?>     		status; ?> status; ?>status; ?> By approved_by; ?>
    approved_at; ?>    		 status; ?>by declined_by; ?>
    " DReason; ?> "    		status; ?> By declined_by; ?>
    " DReason; ?> "    		 status; ?>