diff --git a/application/modules/Leave/controllers/Leave.php b/application/modules/Leave/controllers/Leave.php index 52db4bf..c27486c 100644 --- a/application/modules/Leave/controllers/Leave.php +++ b/application/modules/Leave/controllers/Leave.php @@ -467,7 +467,6 @@ public function editleave() else { - echo "else stss"; $all_leave_count = $this->Leave_model->get_by_type( $this->input->post('type') , user()->business_id , "leave_master"); $data['leave_bal'] = $all_leave_count[0]->days; $days['remaining_days'] = $all_leave_count[0]->days; @@ -483,12 +482,10 @@ public function editleave() } $get_from_date = $this->Leave_model->get_from_date($emp_id, $this->input->post('from_date_new'), $this->input->post('to_date_new')); - // echo "
";
if($get_from_date == 0)
{
- echo"update fun:";
$table="leave_list";
$update_leave = $this->MY_Model->edit_option($action,$id,$table);
diff --git a/application/modules/Leave/models/Leave_model.php b/application/modules/Leave/models/Leave_model.php
index 58b34e6..9362076 100644
--- a/application/modules/Leave/models/Leave_model.php
+++ b/application/modules/Leave/models/Leave_model.php
@@ -30,7 +30,7 @@ public function get_all_leave_data($business_id) {
YEAR(IF(A.from_date_new is not null, A.from_date_new ,A.perm_date_new)) as final_date_year,
GROUP_CONCAT(
CASE
- WHEN A.from_date_new IS NOT NULL THEN CONCAT(' (',A.from_date_new, ' to ', A.to_date_new,') ')
+ WHEN A.from_date_new IS NOT NULL THEN CONCAT(' (',DATE_FORMAT(A.from_date_new, '%d-%m-%Y'), ' to ', DATE_FORMAT(A.to_date_new, '%d-%m-%Y'),') ')
ELSE ''
END
) AS date_range,
diff --git a/application/modules/Leave/views/apply_leave.php b/application/modules/Leave/views/apply_leave.php
index ed80aba..ecb42ee 100644
--- a/application/modules/Leave/views/apply_leave.php
+++ b/application/modules/Leave/views/apply_leave.php
@@ -171,9 +171,9 @@
-
+
-
+
@@ -394,12 +394,11 @@ function get_all_count(id) {
$('#type').change(function() {
- var selectedOptionId = $(this).find(":selected").attr("id");
+var selectedOptionId = $(this).find(":selected").attr("id");
if( selectedOptionId === 'permission'){
$('#hidedate').hide();
- $('#balance').hide();
- $('#leave_bal').hide();
+ $('.balance').hide();
$('#fromdate').removeAttr('required');
$('#todate').removeAttr('required');
$('#perm_id').prop('required', true);
@@ -416,8 +415,7 @@ function get_all_count(id) {
$('#hidedate').show();
$('#showtime').hide();
$('#showdate').hide();
- $('#balance').show();
- $('#leave_bal').show();
+ $('.balance').show();
$('#fromdate').prop('required', true);
$('#todate').prop('required', true);
}