@@ -99,7 +99,7 @@
-
+
@@ -121,7 +121,8 @@
-
+
+
@@ -129,6 +130,29 @@
+
+$(document).ready(function () {
+ $('#datatable-buttons').DataTable({
+
+ "order": [
+ [0, 'desc']
+ ],
+ "dom": 'Bfrtip',
+ buttons: [
+ {
+ extend: 'pdfHtml5',
+ title: 'Asset Details',
+ text: 'PDF',
+ customize: function(doc) {
+ doc.content[1].table.body.forEach(function(row) {
+ // Remove the first and last columns
+ row.splice(0, 1);
+ row.pop();
+ });
+ }
+ },
+ {
+ extend: 'excelHtml5',
+ text: 'Excel',
+ title: 'Asset Details',
+ exportOptions: {
+ columns: ':not(:last-child)'
+ }
+ }
+ ]
+ });
+});
+
+
\ No newline at end of file
diff --git a/application/modules/Asset/views/confirmation_popup.php b/application/modules/Asset/views/confirmation_popup.php
index d6f94c0..c62f31b 100644
--- a/application/modules/Asset/views/confirmation_popup.php
+++ b/application/modules/Asset/views/confirmation_popup.php
@@ -1,6 +1,3 @@
-
-
-
diff --git a/application/modules/Asset/views/includes/footer.php b/application/modules/Asset/views/includes/footer.php
index d6f0738..274b2c8 100644
--- a/application/modules/Asset/views/includes/footer.php
+++ b/application/modules/Asset/views/includes/footer.php
@@ -12,7 +12,7 @@
-
+
diff --git a/application/modules/Asset/views/includes/header.php b/application/modules/Asset/views/includes/header.php
index fa7d813..9684033 100644
--- a/application/modules/Asset/views/includes/header.php
+++ b/application/modules/Asset/views/includes/header.php
@@ -28,6 +28,8 @@
+
+
diff --git a/application/modules/Expence/controllers/Expence.php b/application/modules/Expence/controllers/Expence.php
index 0370b0f..86c7631 100644
--- a/application/modules/Expence/controllers/Expence.php
+++ b/application/modules/Expence/controllers/Expence.php
@@ -54,7 +54,7 @@ public function expence_form()
public function get_emp_name()
{
$emp = $this->Expence_model->get_employee_name(user()->business_id);
- $html = '
--select Employee-- ';
+ $html = '
--select Employee-- ';
foreach($emp as $val)
{
if($val->user_id != user()->id)
diff --git a/application/modules/Expence/views/emp_expence_list.php b/application/modules/Expence/views/emp_expence_list.php
index 91f1af4..a8a3dc3 100644
--- a/application/modules/Expence/views/emp_expence_list.php
+++ b/application/modules/Expence/views/emp_expence_list.php
@@ -59,7 +59,7 @@
Success
diff --git a/application/modules/Expence/views/expence_form.php b/application/modules/Expence/views/expence_form.php
index 9a56a14..3f0b5f2 100644
--- a/application/modules/Expence/views/expence_form.php
+++ b/application/modules/Expence/views/expence_form.php
@@ -328,14 +328,17 @@ function matchnum(event)
$userDropdown.append('' + currentUserName + ' ');
$userDropdown.prop('disabled', true);
} else if (selectedValue === 'name; ?> (id;?>)') {
-
+ console.log("REQUIRED CALL");
+ // $('#user_dropdown').prop('required', true);
+ $('#user_dropdown').attr('required', true);
+ console.log($('#user_dropdown').prop('required'));
$.ajax({
url: '"',
method: 'GET',
dataType: 'json',
success: function(response) {
$('#user_dropdown').append(response);
- $('#user_dropdown').prop('required', true);
+
$('#user_dropdown').prop('disabled', false);
diff --git a/application/modules/Layout/views/includes/default_footer.php b/application/modules/Layout/views/includes/default_footer.php
index 7490d0f..d4b93e9 100644
--- a/application/modules/Layout/views/includes/default_footer.php
+++ b/application/modules/Layout/views/includes/default_footer.php
@@ -14,7 +14,7 @@
-
+
diff --git a/application/modules/Layout/views/includes/default_header.php b/application/modules/Layout/views/includes/default_header.php
index 9494375..bc8dad1 100644
--- a/application/modules/Layout/views/includes/default_header.php
+++ b/application/modules/Layout/views/includes/default_header.php
@@ -10,7 +10,7 @@
-
+
BigBamboo Enterprise
diff --git a/application/modules/Leave/controllers/Leave.php b/application/modules/Leave/controllers/Leave.php
index d6119f8..76fd2e5 100644
--- a/application/modules/Leave/controllers/Leave.php
+++ b/application/modules/Leave/controllers/Leave.php
@@ -146,7 +146,10 @@ public function createLeave()
$perm_data['status'] = 'pending';
$perm_data['created_date'] = date('d-m-Y');
$perm_data['created_time'] = date('H:i A');
+ unset($perm_data['from_date']);
+ unset($perm_data['to_date']);
$table="leave_list";
+ // print_r($perm_data);die;
$create_permission = $this->MY_Model->insert($perm_data,$table);
//for notification
@@ -296,7 +299,13 @@ public function edit_leave_function()
$emp = $this->Emp_model->get_employee(user()->business_id);
$business_id = user()->business_id;
$leavetype = $this->Leave_model->getLeaveType($business_id);
+
$editleave = $this->Leave_model->editleave($id);
+ // print_r($leavetype);
+ // print_r($id);
+ // print_r($editleave);
+ // // // print_r($emp);
+ // die;
$this->layout->set('emp', $emp);
$this->layout->set('editleave', $editleave);
$this->layout->set('count', $emp_leave_count);
diff --git a/application/modules/Leave/views/apply_leave.php b/application/modules/Leave/views/apply_leave.php
index e08ad71..1b5d030 100644
--- a/application/modules/Leave/views/apply_leave.php
+++ b/application/modules/Leave/views/apply_leave.php
@@ -403,6 +403,7 @@ function get_all_count(id) {
$('#leave_bal').hide();
$('#fromdate').removeAttr('required');
$('#todate').removeAttr('required');
+ $('#perm_id').prop('required', true);
$('#showtime').show();
$('#showdate').show();
$('#from_time').prop('required', true);
diff --git a/application/modules/Leave/views/confirmation_popup.php b/application/modules/Leave/views/confirmation_popup.php
index 8a11622..0d68afb 100644
--- a/application/modules/Leave/views/confirmation_popup.php
+++ b/application/modules/Leave/views/confirmation_popup.php
@@ -16,11 +16,20 @@
-
Yes
+
Yes