diff --git a/edit-mode/function/expenseResource.js b/edit-mode/function/expenseResource.js index bd7f101..2ab9f3f 100644 --- a/edit-mode/function/expenseResource.js +++ b/edit-mode/function/expenseResource.js @@ -131,7 +131,15 @@ $(document).ready(function () { cache: false } }); - + // $('#required-date-req-expense').datepicker({ + // format: 'dd-mm-yyyy', // Set the desired format + // autoclose: true // Close the datepicker when a date is selected + // }); + // + // $('#required-date-plan-expense').datepicker({ + // format: 'dd-mm-yyyy', // Set the desired format + // autoclose: true // Close the datepicker when a date is selected + // }); $("#form-assign-expense").on('submit', function (e) { e.preventDefault(); diff --git a/edit-mode/function/materialResource.js b/edit-mode/function/materialResource.js index 1a01df7..f540f4d 100644 --- a/edit-mode/function/materialResource.js +++ b/edit-mode/function/materialResource.js @@ -164,13 +164,23 @@ $(document).ready(function () { results: dataIntegrasiMaterial }; }, error: function (jqXHR, textStatus, errorThrown) { - gantt.alert(`Status: ${textStatus}`); - gantt.alert(`Error thrown: ${errorThrown}`); - gantt.alert(`Error accessing URL: ${adwIntegrationUrl}/request-material/get-material-integration`); + if (textStatus != "abort") { + gantt.alert(`Status: ${textStatus}`); + gantt.alert(`Error thrown: ${errorThrown}`); + gantt.alert(`Error accessing URL: ${adwIntegrationUrl}/request-material/get-material-integration`); + } } } }); - + // $('#required-date-req-material').datepicker({ + // format: 'dd-mm-yyyy', // Set the desired format + // autoclose: true // Close the datepicker when a date is selected + // }); + // + // $('#required-date-plan-material').datepicker({ + // format: 'dd-mm-yyyy', // Set the desired format + // autoclose: true // Close the datepicker when a date is selected + // }); $("#form-assign-material").on('submit', function (e) { e.preventDefault(); diff --git a/edit-mode/function/reportActivity.js b/edit-mode/function/reportActivity.js index 0800729..89d9b98 100644 --- a/edit-mode/function/reportActivity.js +++ b/edit-mode/function/reportActivity.js @@ -62,7 +62,15 @@ $(document).ready(function () { $('#ra_date_end_activity').prop('disabled', true); } }); - + // $('#ra_date_start_activity').datepicker({ + // format: 'dd-mm-yyyy', // Set the desired format + // autoclose: true // Close the datepicker when a date is selected + // }); + // + // $('#ra_date_end_activity').datepicker({ + // format: 'dd-mm-yyyy', // Set the desired format + // autoclose: true // Close the datepicker when a date is selected + // }); $("#ra_date_end_activity").on("change", function () { let valEnd = $(this).val() let valStart = $('#ra_date_start_activity').val()