From a2594cb106909999ad4971c9af51dd390ca40989 Mon Sep 17 00:00:00 2001
From: Watiah11 <watiiahwati111@gmail.com>
Date: Wed, 8 May 2024 12:49:50 +0700
Subject: [PATCH] feat: add information plan in report

---
 edit-mode/function/reportActivity.js | 6 ++++--
 edit-mode/index.html                 | 3 ++-
 view-mode/function/reportActivity.js | 6 ++++--
 view-mode/index.html                 | 1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/edit-mode/function/reportActivity.js b/edit-mode/function/reportActivity.js
index e7f2fda..8ea5c9e 100644
--- a/edit-mode/function/reportActivity.js
+++ b/edit-mode/function/reportActivity.js
@@ -589,7 +589,8 @@ $(document).ready(function () {
         if (attributeString.includes('"=""')) {
           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>`);
         $("#modal_report_activity").hide();
 
         $("#form_report_activity_material").show();
@@ -624,7 +625,8 @@ $(document).ready(function () {
         if (attributeString.includes('"=""')) {
           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>`);
         $("#modal_report_activity").hide();
         // $("#show_form_ra_material").hide();
         $("#form_report_activity_material").hide();
diff --git a/edit-mode/index.html b/edit-mode/index.html
index 265d784..873da78 100644
--- a/edit-mode/index.html
+++ b/edit-mode/index.html
@@ -736,8 +736,9 @@
 		<div class="modal-dialog modal-lg" role="document" style="padding-top:5%;">
 			<!-- <div class="modal-dialog modal-lg" role="document"> -->
 			<div class="modal-content">
-				<div class="modal-header d-flex flex-row justify-content-between" style="width: 100%;">
+				<div class="modal-header d-flex flex-column" style="width: 100%;">
 					<h5 class="modal-title" id="report_activity_material_title">Report Activity</h5>
+					<h6 id="report_activity_material_sub_title"></h6>
 				</div>
 				<div class="modal-body">
 					<form class="mb-1 elm-hide" id="form_report_activity_material">
diff --git a/view-mode/function/reportActivity.js b/view-mode/function/reportActivity.js
index 684e83a..a99a426 100644
--- a/view-mode/function/reportActivity.js
+++ b/view-mode/function/reportActivity.js
@@ -187,7 +187,8 @@ $(document).ready(function () {
         assignMaterialId = $(this).data('id');
         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>`);
         $("#modal_report_activity").hide();
 
         $("#form_report_activity_material").show();
@@ -207,7 +208,8 @@ $(document).ready(function () {
     $("#table_report").on("click", ".btn-lihat-plan", function () {
         assignMaterialId = $(this).data('id');
         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>`);
         $("#modal_report_activity").hide();
         $("#activity_material_plan").show();
         $("#activity_material_actual").hide();
diff --git a/view-mode/index.html b/view-mode/index.html
index bf3960b..efc3c59 100644
--- a/view-mode/index.html
+++ b/view-mode/index.html
@@ -364,6 +364,7 @@
 			<div class="modal-content">
 				<div class="modal-header d-flex flex-row justify-content-between" style="width: 100%;">
 					<h5 class="modal-title" id="report_activity_material_title">Report Activity Material</h5>
+					<h6 id="report_activity_material_sub_title"></h6>
 				</div>
 				<div class="modal-body">
 					<div class="table-responsive" id="activity_material_plan">