diff --git a/application/config/testing/database.php b/application/config/testing/database.php index 59c5e42..74aa34f 100644 --- a/application/config/testing/database.php +++ b/application/config/testing/database.php @@ -75,14 +75,14 @@ $db['default'] = array( 'dsn' => '', - 'hostname' => 'localhost', - 'username' => 'root', - 'password' => '', - 'database' => 'test', - // 'hostname' => '119.18.54.85', - // 'username' => 'venbaehn_ams', - // 'password' => 'L;nD7Z@f)1ZT', - // 'database' => 'venbaehn_ams', + // 'hostname' => 'localhost', + // 'username' => 'root', + // 'password' => '', + // 'database' => 'test', + 'hostname' => '119.18.54.85', + 'username' => 'venbaehn_ams', + 'password' => 'L;nD7Z@f)1ZT', + 'database' => 'venbaehn_ams', 'dbdriver' => 'mysqli', 'dbprefix' => '', 'pconnect' => FALSE, diff --git a/application/modules/Delegation/views/delegation_form.php b/application/modules/Delegation/views/delegation_form.php index d88bcab..28883d3 100644 --- a/application/modules/Delegation/views/delegation_form.php +++ b/application/modules/Delegation/views/delegation_form.php @@ -36,7 +36,7 @@

-
+ @@ -110,7 +110,7 @@ dateFormat: 'd-m-Y', minDate: 'today', maxDate: new Date().fp_incr(365 * 10), - allowInput: false, + allowInput: true, autoclose: true, onChange: function (selectedDates, dateStr) { toDateInput._flatpickr.set('minDate', dateStr); @@ -122,7 +122,7 @@ dateFormat: 'd-m-Y', minDate: 'today', maxDate: new Date().fp_incr(365 * 10), - allowInput: false, + allowInput: true, autoclose: true, onChange: function (selectedDates, dateStr) { console.log('Selected to date: ', dateStr); @@ -177,4 +177,22 @@ function get_emp_id(emp_id, id){ + diff --git a/application/modules/Delegation/views/edit_delegation_form.php b/application/modules/Delegation/views/edit_delegation_form.php index 3743f5f..2f094bf 100644 --- a/application/modules/Delegation/views/edit_delegation_form.php +++ b/application/modules/Delegation/views/edit_delegation_form.php @@ -97,7 +97,7 @@
- +Cancel
diff --git a/application/modules/Employee/views/add_emp.php b/application/modules/Employee/views/add_emp.php index 85578c9..8516904 100644 --- a/application/modules/Employee/views/add_emp.php +++ b/application/modules/Employee/views/add_emp.php @@ -352,13 +352,20 @@ class="form-control" type="text">
-
+ +
+ +
+ + +
+
@@ -620,4 +627,16 @@ function check_if_exists(id, value, name) { - \ No newline at end of file + + diff --git a/application/modules/Employee/views/confirmation_popup.php b/application/modules/Employee/views/confirmation_popup.php index cf002c5..235b964 100644 --- a/application/modules/Employee/views/confirmation_popup.php +++ b/application/modules/Employee/views/confirmation_popup.php @@ -1,5 +1,5 @@