From 0bcc399c932576e63bfbc459da6eb29a6f595206 Mon Sep 17 00:00:00 2001 From: SitiAfridaFitriyani Date: Fri, 12 Jul 2024 11:03:23 +0700 Subject: [PATCH] fix: update format date information --- edit-mode/function/expenseResource.js | 2 +- edit-mode/function/humanResource.js | 6 +++--- edit-mode/function/materialResource.js | 2 +- edit-mode/function/reportActivity.js | 6 +++--- edit-mode/function/toolsResource.js | 2 +- view-mode/function/humanResource.js | 2 +- view-mode/function/materialResource.js | 2 +- view-mode/function/reportActivity.js | 6 +++--- view-mode/function/toolsResource.js | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/edit-mode/function/expenseResource.js b/edit-mode/function/expenseResource.js index 510f59d..1ede914 100644 --- a/edit-mode/function/expenseResource.js +++ b/edit-mode/function/expenseResource.js @@ -90,7 +90,7 @@ $(document).ready(function () { $('#modal-expense').on('show.bs.modal', function (event) { $("#desc-expense").val(activityName); $('#modal-expense-title').html("Overhead " + activityName); - $('#modal-expense-sub-title').html(`

Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}

`); + $('#modal-expense-sub-title').html(`

Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}

`); tableexpense.draw(); }); diff --git a/edit-mode/function/humanResource.js b/edit-mode/function/humanResource.js index 794409e..e145c04 100644 --- a/edit-mode/function/humanResource.js +++ b/edit-mode/function/humanResource.js @@ -79,11 +79,11 @@ $(document).ready(function () { $('#modal-hr').on('show.bs.modal', function (event) { $('#modal-hr-title').html("Human Resource " + activityName); - $('#modal-hr-sub-title').html(`

Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}

`); + $('#modal-hr-sub-title').html(`

Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}

`); $("#hr-start-date").val(moment(activityEarlyStart).format('YYYY-MM-DD')); $("#hr-end-date").val(moment(activityEarlyFinish).format('YYYY-MM-DD')); - $('#modal-hr-time-startDate').html("Minimum from " + moment(activityEarlyStart).format('MM-DD-YYYY')); - $('#modal-hr-time-endDate').html("Maximum from " + moment(activityEarlyFinish).format('MM-DD-YYYY')); + $('#modal-hr-time-startDate').html("Minimum from " + moment(activityEarlyStart).format('DD MMMM YYYY')); + $('#modal-hr-time-endDate').html("Maximum from " + moment(activityEarlyFinish).format('DD MMMM YYYY')); tableHr.draw(); }); diff --git a/edit-mode/function/materialResource.js b/edit-mode/function/materialResource.js index 4c5d0fd..4671f3e 100644 --- a/edit-mode/function/materialResource.js +++ b/edit-mode/function/materialResource.js @@ -90,7 +90,7 @@ $(document).ready(function () { $('#modal-material').on('show.bs.modal', function (event) { $('#modal-material-title').html("Material Resource " + activityName); - $('#modal-material-sub-title').html(`

Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}

`); + $('#modal-material-sub-title').html(`

Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}

`); tableMaterial.draw(); }); diff --git a/edit-mode/function/reportActivity.js b/edit-mode/function/reportActivity.js index 24f027a..793e00a 100644 --- a/edit-mode/function/reportActivity.js +++ b/edit-mode/function/reportActivity.js @@ -288,7 +288,7 @@ $(document).ready(function () { $('#modal_report_activity').on('show.bs.modal', function (event) { $("#report_activity_title").html(`Report Activity ${activityName}`) - $('#report_activity_sub_title').html(`

Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}

`); + $('#report_activity_sub_title').html(`

Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}

`); tableRa.draw(); }); @@ -582,7 +582,7 @@ $(document).ready(function () { materialName = materialName + '"'; } $("#report_activity_material_title").html(`Report Activity Actual ${materialName}`); - $('#report_activity_material_sub_title').html(`

Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}

`); + $('#report_activity_material_sub_title').html(`

Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}

`); $("#modal_report_activity").hide(); $("#form_report_activity_material").show(); @@ -618,7 +618,7 @@ $(document).ready(function () { materialName = materialName + '"'; } $("#report_activity_material_title").html(`Report Activity Plan ${materialName}`); - $('#report_activity_material_sub_title').html(`

Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}

`); + $('#report_activity_material_sub_title').html(`

Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}

`); $("#modal_report_activity").hide(); // $("#show_form_ra_material").hide(); $("#form_report_activity_material").hide(); diff --git a/edit-mode/function/toolsResource.js b/edit-mode/function/toolsResource.js index e1dc62a..e0faa96 100644 --- a/edit-mode/function/toolsResource.js +++ b/edit-mode/function/toolsResource.js @@ -63,7 +63,7 @@ $(document).ready(function () { $('#modal-tools').on('show.bs.modal', function (event) { $('#modal-tools-title').html("Tools Resource " + activityName); - $('#modal-tools-sub-title').html(`

Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}

`); + $('#modal-tools-sub-title').html(`

Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}

`); tableTools.draw(); }); diff --git a/view-mode/function/humanResource.js b/view-mode/function/humanResource.js index ead8a8d..d43de36 100644 --- a/view-mode/function/humanResource.js +++ b/view-mode/function/humanResource.js @@ -44,7 +44,7 @@ $(document).ready(function () { $('#modal-hr').on('show.bs.modal', function (event) { $('#modal-hr-title').html("Human Resource " + activityName); - $('#modal-hr-sub-title').html(`

Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}

`); + $('#modal-hr-sub-title').html(`

Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}

`); tableHr.draw(); }); diff --git a/view-mode/function/materialResource.js b/view-mode/function/materialResource.js index 5ad3d4e..b64d56f 100644 --- a/view-mode/function/materialResource.js +++ b/view-mode/function/materialResource.js @@ -55,7 +55,7 @@ $(document).ready(function () { $('#modal-material').on('show.bs.modal', function (event) { $('#modal-material-title').html("Material Resource " + activityName); - $('#modal-material-sub-title').html(`

Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}

`); + $('#modal-material-sub-title').html(`

Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}

`); tableMaterial.draw(); }); diff --git a/view-mode/function/reportActivity.js b/view-mode/function/reportActivity.js index a99a426..3fdfd76 100644 --- a/view-mode/function/reportActivity.js +++ b/view-mode/function/reportActivity.js @@ -136,7 +136,7 @@ $(document).ready(function () { $('#modal_report_activity').on('show.bs.modal', function (event) { $("#report_activity_title").html(`Report Activity ${activityName}`) - $('#report_activity_sub_title').html(`

Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}

`); + $('#report_activity_sub_title').html(`

Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}

`); tableRa.draw(); }); @@ -188,7 +188,7 @@ $(document).ready(function () { materialName = $(this).data('material-name'); $("#report_activity_material_title").html(`Report Activity Actual Material ${materialName}`); - $('#report_activity_material_sub_title').html(`

Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}

`); + $('#report_activity_material_sub_title').html(`

Plan Date ${moment(activityEarlyStart).format('DD, MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD, MMMM YYYY')}

`); $("#modal_report_activity").hide(); $("#form_report_activity_material").show(); @@ -209,7 +209,7 @@ $(document).ready(function () { assignMaterialId = $(this).data('id'); materialName = $(this).data('material-name'); $("#report_activity_material_title").html(`Report Activity Plan Material ${materialName}`); - $('#report_activity_material_sub_title').html(`

Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}

`); + $('#report_activity_material_sub_title').html(`

Plan Date ${moment(activityEarlyStart).format('DD, MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD, MMMM YYYY')}

`); $("#modal_report_activity").hide(); $("#activity_material_plan").show(); $("#activity_material_actual").hide(); diff --git a/view-mode/function/toolsResource.js b/view-mode/function/toolsResource.js index fcc4ee9..c734e16 100644 --- a/view-mode/function/toolsResource.js +++ b/view-mode/function/toolsResource.js @@ -57,7 +57,7 @@ $(document).ready(function () { $('#modal-tools').on('show.bs.modal', function (event) { $('#modal-tools-title').html("Tools Resource " + activityName); - $('#modal-tools-sub-title').html(`

Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}

`); + $('#modal-tools-sub-title').html(`

Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}

`); tableTools.draw(); });