ordo
/
surveyor_indonesia_gantt
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: update format date information

pull/2/head
SitiAfridaFitriyani 2 months ago
parent
e4b90a626e
commit
0bcc399c93
9 changed files with 15 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      edit-mode/function/expenseResource.js
  2. 6
      edit-mode/function/humanResource.js
  3. 2
      edit-mode/function/materialResource.js
  4. 6
      edit-mode/function/reportActivity.js
  5. 2
      edit-mode/function/toolsResource.js
  6. 2
      view-mode/function/humanResource.js
  7. 2
      view-mode/function/materialResource.js
  8. 6
      view-mode/function/reportActivity.js
  9. 2
      view-mode/function/toolsResource.js

2
edit-mode/function/expenseResource.js
Unescape View File

@ -90,7 +90,7 @@ $(document).ready(function () {
$('#modal-expense').on('show.bs.modal', function (event) { $('#modal-expense').on('show.bs.modal', function (event) {
$("#desc-expense").val(activityName); $("#desc-expense").val(activityName);
$('#modal-expense-title').html("Overhead " + activityName); $('#modal-expense-title').html("Overhead " + activityName);
$('#modal-expense-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`); $('#modal-expense-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
tableexpense.draw(); tableexpense.draw();
}); });

6
edit-mode/function/humanResource.js
Unescape View File

@ -79,11 +79,11 @@ $(document).ready(function () {
$('#modal-hr').on('show.bs.modal', function (event) { $('#modal-hr').on('show.bs.modal', function (event) {
$('#modal-hr-title').html("Human Resource " + activityName); $('#modal-hr-title').html("Human Resource " + activityName);
$('#modal-hr-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`); $('#modal-hr-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
$("#hr-start-date").val(moment(activityEarlyStart).format('YYYY-MM-DD')); $("#hr-start-date").val(moment(activityEarlyStart).format('YYYY-MM-DD'));
$("#hr-end-date").val(moment(activityEarlyFinish).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-startDate').html("Minimum from " + moment(activityEarlyStart).format('DD MMMM YYYY'));
$('#modal-hr-time-endDate').html("Maximum from " + moment(activityEarlyFinish).format('MM-DD-YYYY')); $('#modal-hr-time-endDate').html("Maximum from " + moment(activityEarlyFinish).format('DD MMMM YYYY'));
tableHr.draw(); tableHr.draw();
}); });

2
edit-mode/function/materialResource.js
Unescape View File

@ -90,7 +90,7 @@ $(document).ready(function () {
$('#modal-material').on('show.bs.modal', function (event) { $('#modal-material').on('show.bs.modal', function (event) {
$('#modal-material-title').html("Material Resource " + activityName); $('#modal-material-title').html("Material Resource " + activityName);
$('#modal-material-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`); $('#modal-material-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
tableMaterial.draw(); tableMaterial.draw();
}); });

6
edit-mode/function/reportActivity.js
Unescape View File

@ -288,7 +288,7 @@ $(document).ready(function () {
$('#modal_report_activity').on('show.bs.modal', function (event) { $('#modal_report_activity').on('show.bs.modal', function (event) {
$("#report_activity_title").html(`Report Activity ${activityName}`) $("#report_activity_title").html(`Report Activity ${activityName}`)
$('#report_activity_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`); $('#report_activity_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
tableRa.draw(); tableRa.draw();
}); });
@ -582,7 +582,7 @@ $(document).ready(function () {
materialName = materialName + '"'; materialName = materialName + '"';
} }
$("#report_activity_material_title").html(`Report Activity Actual ${materialName}`); $("#report_activity_material_title").html(`Report Activity Actual ${materialName}`);
$('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`); $('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
$("#modal_report_activity").hide(); $("#modal_report_activity").hide();
$("#form_report_activity_material").show(); $("#form_report_activity_material").show();
@ -618,7 +618,7 @@ $(document).ready(function () {
materialName = materialName + '"'; materialName = materialName + '"';
} }
$("#report_activity_material_title").html(`Report Activity Plan ${materialName}`); $("#report_activity_material_title").html(`Report Activity Plan ${materialName}`);
$('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`); $('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
$("#modal_report_activity").hide(); $("#modal_report_activity").hide();
// $("#show_form_ra_material").hide(); // $("#show_form_ra_material").hide();
$("#form_report_activity_material").hide(); $("#form_report_activity_material").hide();

2
edit-mode/function/toolsResource.js
Unescape View File

@ -63,7 +63,7 @@ $(document).ready(function () {
$('#modal-tools').on('show.bs.modal', function (event) { $('#modal-tools').on('show.bs.modal', function (event) {
$('#modal-tools-title').html("Tools Resource " + activityName); $('#modal-tools-title').html("Tools Resource " + activityName);
$('#modal-tools-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`); $('#modal-tools-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
tableTools.draw(); tableTools.draw();
}); });

2
view-mode/function/humanResource.js
Unescape View File

@ -44,7 +44,7 @@ $(document).ready(function () {
$('#modal-hr').on('show.bs.modal', function (event) { $('#modal-hr').on('show.bs.modal', function (event) {
$('#modal-hr-title').html("Human Resource " + activityName); $('#modal-hr-title').html("Human Resource " + activityName);
$('#modal-hr-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`); $('#modal-hr-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
tableHr.draw(); tableHr.draw();
}); });

2
view-mode/function/materialResource.js
Unescape View File

@ -55,7 +55,7 @@ $(document).ready(function () {
$('#modal-material').on('show.bs.modal', function (event) { $('#modal-material').on('show.bs.modal', function (event) {
$('#modal-material-title').html("Material Resource " + activityName); $('#modal-material-title').html("Material Resource " + activityName);
$('#modal-material-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`); $('#modal-material-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
tableMaterial.draw(); tableMaterial.draw();
}); });

6
view-mode/function/reportActivity.js
Unescape View File

@ -136,7 +136,7 @@ $(document).ready(function () {
$('#modal_report_activity').on('show.bs.modal', function (event) { $('#modal_report_activity').on('show.bs.modal', function (event) {
$("#report_activity_title").html(`Report Activity ${activityName}`) $("#report_activity_title").html(`Report Activity ${activityName}`)
$('#report_activity_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`); $('#report_activity_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
tableRa.draw(); tableRa.draw();
}); });
@ -188,7 +188,7 @@ $(document).ready(function () {
materialName = $(this).data('material-name'); materialName = $(this).data('material-name');
$("#report_activity_material_title").html(`Report Activity Actual Material ${materialName}`); $("#report_activity_material_title").html(`Report Activity Actual Material ${materialName}`);
$('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`); $('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('DD, MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD, MMMM YYYY')}</p>`);
$("#modal_report_activity").hide(); $("#modal_report_activity").hide();
$("#form_report_activity_material").show(); $("#form_report_activity_material").show();
@ -209,7 +209,7 @@ $(document).ready(function () {
assignMaterialId = $(this).data('id'); assignMaterialId = $(this).data('id');
materialName = $(this).data('material-name'); materialName = $(this).data('material-name');
$("#report_activity_material_title").html(`Report Activity Plan Material ${materialName}`); $("#report_activity_material_title").html(`Report Activity Plan Material ${materialName}`);
$('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`); $('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('DD, MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD, MMMM YYYY')}</p>`);
$("#modal_report_activity").hide(); $("#modal_report_activity").hide();
$("#activity_material_plan").show(); $("#activity_material_plan").show();
$("#activity_material_actual").hide(); $("#activity_material_actual").hide();

2
view-mode/function/toolsResource.js
Unescape View File

@ -57,7 +57,7 @@ $(document).ready(function () {
$('#modal-tools').on('show.bs.modal', function (event) { $('#modal-tools').on('show.bs.modal', function (event) {
$('#modal-tools-title').html("Tools Resource " + activityName); $('#modal-tools-title').html("Tools Resource " + activityName);
$('#modal-tools-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`); $('#modal-tools-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
tableTools.draw(); tableTools.draw();
}); });

Write Preview
Loading…
Cancel
Save