From 2f1d7e86088d5b278bbdce52ed938700b9b188f5 Mon Sep 17 00:00:00 2001
From: Watiah11 <watiiahwati111@gmail.com>
Date: Mon, 6 May 2024 14:07:52 +0700
Subject: [PATCH] feat: add description plan date in report, material,
 overhead, assign hr and tools

---
 edit-mode/function/expenseResource.js  | 2 +-
 edit-mode/function/humanResource.js    | 4 +++-
 edit-mode/function/materialResource.js | 1 +
 edit-mode/function/reportActivity.js   | 1 +
 edit-mode/function/toolsResource.js    | 1 +
 view-mode/function/humanResource.js    | 1 +
 view-mode/function/materialResource.js | 1 +
 view-mode/function/reportActivity.js   | 1 +
 view-mode/function/restActivityLink.js | 1 -
 view-mode/function/toolsResource.js    | 1 +
 10 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/edit-mode/function/expenseResource.js b/edit-mode/function/expenseResource.js
index 55dd594..ca2ddf1 100644
--- a/edit-mode/function/expenseResource.js
+++ b/edit-mode/function/expenseResource.js
@@ -89,11 +89,11 @@ $(document).ready(function () {
 
     $('#modal-expense').on('show.bs.modal', function (event) {
         $('#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();
     });
 
     $('#modal-expense').on('hide.bs.modal', function (event) {
-        // $("#hide-form-expense").hide();
         $("#show-form-expense").show();
         console.log("there's before action change ", actionHappen);
         if (actionHappen) {
diff --git a/edit-mode/function/humanResource.js b/edit-mode/function/humanResource.js
index c9b2ac5..bf1837c 100644
--- a/edit-mode/function/humanResource.js
+++ b/edit-mode/function/humanResource.js
@@ -77,6 +77,9 @@ $(document).ready(function () {
 
     $('#modal-hr').on('show.bs.modal', function (event) {
         $('#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();
     });
 
@@ -84,7 +87,6 @@ $(document).ready(function () {
         $("#hide-form-hr").hide();
         $("#show-form-hr").show();
         if (actionHappen) {
-            console.log("there's action change");
             updateActivity(activityId);
         }
         resetFormAssign();
diff --git a/edit-mode/function/materialResource.js b/edit-mode/function/materialResource.js
index c865919..4c5d0fd 100644
--- a/edit-mode/function/materialResource.js
+++ b/edit-mode/function/materialResource.js
@@ -90,6 +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(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
         tableMaterial.draw();
     });
 
diff --git a/edit-mode/function/reportActivity.js b/edit-mode/function/reportActivity.js
index 54168fd..e9a837e 100644
--- a/edit-mode/function/reportActivity.js
+++ b/edit-mode/function/reportActivity.js
@@ -298,6 +298,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(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
         tableRa.draw();
     });
 
diff --git a/edit-mode/function/toolsResource.js b/edit-mode/function/toolsResource.js
index 0c1a57e..e1dc62a 100644
--- a/edit-mode/function/toolsResource.js
+++ b/edit-mode/function/toolsResource.js
@@ -63,6 +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(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
         tableTools.draw();
     });
 
diff --git a/view-mode/function/humanResource.js b/view-mode/function/humanResource.js
index 2a3aaf6..ead8a8d 100644
--- a/view-mode/function/humanResource.js
+++ b/view-mode/function/humanResource.js
@@ -44,6 +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(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
 		tableHr.draw();
 	});
 
diff --git a/view-mode/function/materialResource.js b/view-mode/function/materialResource.js
index c43d7a1..5ad3d4e 100644
--- a/view-mode/function/materialResource.js
+++ b/view-mode/function/materialResource.js
@@ -55,6 +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(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
 		tableMaterial.draw();
 	});
 
diff --git a/view-mode/function/reportActivity.js b/view-mode/function/reportActivity.js
index 91ed799..684e83a 100644
--- a/view-mode/function/reportActivity.js
+++ b/view-mode/function/reportActivity.js
@@ -136,6 +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(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
         tableRa.draw();
     });
 
diff --git a/view-mode/function/restActivityLink.js b/view-mode/function/restActivityLink.js
index 21bc736..06a6b18 100644
--- a/view-mode/function/restActivityLink.js
+++ b/view-mode/function/restActivityLink.js
@@ -22,7 +22,6 @@ gantt.ajax.get({
     let obj = JSON.parse(response);
     data['data'] = obj.data.data;
     data['links'] = obj.data.links;
-    // console.log("data parse wrong", data);
     // check if baseline has been set
     if (data.data && data.data.length > 0) {
         console.log('baseline', data.data[0].planned_start);
diff --git a/view-mode/function/toolsResource.js b/view-mode/function/toolsResource.js
index bfb2934..fcc4ee9 100644
--- a/view-mode/function/toolsResource.js
+++ b/view-mode/function/toolsResource.js
@@ -57,6 +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(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
         tableTools.draw();
     });