Browse Source

feat: add description plan date in report, material, overhead, assign hr and tools

pull/1/head
Watiah11 5 months ago
parent
commit
2f1d7e8608
  1. 2
      edit-mode/function/expenseResource.js
  2. 4
      edit-mode/function/humanResource.js
  3. 1
      edit-mode/function/materialResource.js
  4. 1
      edit-mode/function/reportActivity.js
  5. 1
      edit-mode/function/toolsResource.js
  6. 1
      view-mode/function/humanResource.js
  7. 1
      view-mode/function/materialResource.js
  8. 1
      view-mode/function/reportActivity.js
  9. 1
      view-mode/function/restActivityLink.js
  10. 1
      view-mode/function/toolsResource.js

2
edit-mode/function/expenseResource.js

@ -89,11 +89,11 @@ $(document).ready(function () {
$('#modal-expense').on('show.bs.modal', function (event) { $('#modal-expense').on('show.bs.modal', function (event) {
$('#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>`);
tableexpense.draw(); tableexpense.draw();
}); });
$('#modal-expense').on('hide.bs.modal', function (event) { $('#modal-expense').on('hide.bs.modal', function (event) {
// $("#hide-form-expense").hide();
$("#show-form-expense").show(); $("#show-form-expense").show();
console.log("there's before action change ", actionHappen); console.log("there's before action change ", actionHappen);
if (actionHappen) { if (actionHappen) {

4
edit-mode/function/humanResource.js

@ -77,6 +77,9 @@ $(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-time-startDate').html("Minimum from " + moment(activityEarlyStart).format('MM-DD-YYYY'));
$('#modal-hr-time-endDate').html("Maximum from " + moment(activityEarlyFinish).format('MM-DD-YYYY'));
tableHr.draw(); tableHr.draw();
}); });
@ -84,7 +87,6 @@ $(document).ready(function () {
$("#hide-form-hr").hide(); $("#hide-form-hr").hide();
$("#show-form-hr").show(); $("#show-form-hr").show();
if (actionHappen) { if (actionHappen) {
console.log("there's action change");
updateActivity(activityId); updateActivity(activityId);
} }
resetFormAssign(); resetFormAssign();

1
edit-mode/function/materialResource.js

@ -90,6 +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>`);
tableMaterial.draw(); tableMaterial.draw();
}); });

1
edit-mode/function/reportActivity.js

@ -298,6 +298,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>`);
tableRa.draw(); tableRa.draw();
}); });

1
edit-mode/function/toolsResource.js

@ -63,6 +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>`);
tableTools.draw(); tableTools.draw();
}); });

1
view-mode/function/humanResource.js

@ -44,6 +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>`);
tableHr.draw(); tableHr.draw();
}); });

1
view-mode/function/materialResource.js

@ -55,6 +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>`);
tableMaterial.draw(); tableMaterial.draw();
}); });

1
view-mode/function/reportActivity.js

@ -136,6 +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>`);
tableRa.draw(); tableRa.draw();
}); });

1
view-mode/function/restActivityLink.js

@ -22,7 +22,6 @@ gantt.ajax.get({
let obj = JSON.parse(response); let obj = JSON.parse(response);
data['data'] = obj.data.data; data['data'] = obj.data.data;
data['links'] = obj.data.links; data['links'] = obj.data.links;
// console.log("data parse wrong", data);
// check if baseline has been set // check if baseline has been set
if (data.data && data.data.length > 0) { if (data.data && data.data.length > 0) {
console.log('baseline', data.data[0].planned_start); console.log('baseline', data.data[0].planned_start);

1
view-mode/function/toolsResource.js

@ -57,6 +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>`);
tableTools.draw(); tableTools.draw();
}); });

Loading…
Cancel
Save