From eaee780c7f924e520dfd7699f0d335f87037acc3 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Fri, 19 Jun 2026 07:14:06 +0300
Subject: [PATCH 1/2] AMP-31133 : Remove RISK and LOGFRAME from Preview

---
 src/activity/preview/sections/APME.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/activity/preview/sections/APME.jsx b/src/activity/preview/sections/APME.jsx
index 6c31024..aeb146c 100644
--- a/src/activity/preview/sections/APME.jsx
+++ b/src/activity/preview/sections/APME.jsx
@@ -30,10 +30,10 @@ class APME extends Component {
     return (<div key={Math.random()}>
       {buildSimpleField(`${ActivityConstants.INDICATORS}~${ActivityConstants.INDICATOR}`, true, null, false, indicator,
         null, { noTitle: true, fieldValueClass: styles.sector_title })}
-      {buildSimpleField(`${ActivityConstants.INDICATORS}~${ActivityConstants.LOG_FRAME}`, true, null, false, indicator,
-        null, { fieldClass: styles.noborder })}
-      {buildSimpleField(`${ActivityConstants.INDICATORS}~${ActivityConstants.RISK}`, true, null, false, indicator,
-        null, { fieldClass: styles.noborder })}
+      {/*{buildSimpleField(`${ActivityConstants.INDICATORS}~${ActivityConstants.LOG_FRAME}`, true, null, false, indicator,*/}
+      {/*  null, { fieldClass: styles.noborder })}*/}
+      {/*{buildSimpleField(`${ActivityConstants.INDICATORS}~${ActivityConstants.RISK}`, true, null, false, indicator,*/}
+      {/*  null, { fieldClass: styles.noborder })}*/}
       <div className={styles.box_field_name} style={{ marginTop: 8, marginBottom: 4 }}>
         {this.props.translate('Value Tracking')}
       </div>

From b033cf93099abd3fd308a1d3080f95ac9ddbb5fd Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Fri, 19 Jun 2026 07:33:55 +0300
Subject: [PATCH 2/2] AMP-31133 : Improve actual values table

---
 src/activity/preview/sections/APME.jsx | 38 ++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/activity/preview/sections/APME.jsx b/src/activity/preview/sections/APME.jsx
index aeb146c..3c130fb 100644
--- a/src/activity/preview/sections/APME.jsx
+++ b/src/activity/preview/sections/APME.jsx
@@ -46,6 +46,10 @@ class APME extends Component {
   }
 
   _generateValueOrValuesTable(sectionName, value) {
+    // For the 'actual' section we may have multiple entries — render as a single structured table.
+    if (sectionName === ActivityConstants.CURRENT && Array.isArray(value) && value.length > 0) {
+      return this._generateActualsTable(value);
+    }
     return (<div>
       {Array.isArray(value)
         ? value.map(v => this._generateValueTable(sectionName, v))
@@ -53,6 +57,40 @@ class APME extends Component {
     </div>);
   }
 
+  _generateActualsTable(values) {
+    const { translate } = this.props;
+    const hasComment = values.some(v => v[ActivityConstants.INDICATOR_COMMENT]);
+    return (
+      <table key={Math.random()} className={[styles.box_table, styles.section_group_class].join(' ')}
+        style={{ marginTop: 6, width: '100%' }}>
+        <thead>
+          <tr>
+            <th style={{ textAlign: 'left', padding: '4px 6px' }}>{translate('Actual Date')}</th>
+            <th style={{ textAlign: 'left', padding: '4px 6px' }}>{translate('Actual Value')}</th>
+            {hasComment && <th style={{ textAlign: 'left', padding: '4px 6px' }}>{translate('Comment')}</th>}
+          </tr>
+        </thead>
+        <tbody>
+          {values.map((v, idx) => (
+            <tr key={idx}>
+              <td style={{ padding: '3px 6px' }}>
+                {v[ActivityConstants.INDICATOR_DATE] || '\u2014'}
+              </td>
+              <td style={{ padding: '3px 6px' }}>
+                {v[ActivityConstants.INDICATOR_VALUE] != null ? v[ActivityConstants.INDICATOR_VALUE] : '\u2014'}
+              </td>
+              {hasComment && (
+                <td style={{ padding: '3px 6px' }}>
+                  {v[ActivityConstants.INDICATOR_COMMENT] || '\u2014'}
+                </td>
+              )}
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    );
+  }
+
   _generateValueTable(sectionName, value) {
     if (!value) {
       return null;