diff --git a/src/activity/preview/sections/APME.jsx b/src/activity/preview/sections/APME.jsx index 6c31024..3c130fb 100644 --- a/src/activity/preview/sections/APME.jsx +++ b/src/activity/preview/sections/APME.jsx @@ -30,10 +30,10 @@ class APME extends Component { return (
{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 })}*/}
{this.props.translate('Value Tracking')}
@@ -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 (
{Array.isArray(value) ? value.map(v => this._generateValueTable(sectionName, v)) @@ -53,6 +57,40 @@ class APME extends Component {
); } + _generateActualsTable(values) { + const { translate } = this.props; + const hasComment = values.some(v => v[ActivityConstants.INDICATOR_COMMENT]); + return ( + + + + + + {hasComment && } + + + + {values.map((v, idx) => ( + + + + {hasComment && ( + + )} + + ))} + +
{translate('Actual Date')}{translate('Actual Value')}{translate('Comment')}
+ {v[ActivityConstants.INDICATOR_DATE] || '\u2014'} + + {v[ActivityConstants.INDICATOR_VALUE] != null ? v[ActivityConstants.INDICATOR_VALUE] : '\u2014'} + + {v[ActivityConstants.INDICATOR_COMMENT] || '\u2014'} +
+ ); + } + _generateValueTable(sectionName, value) { if (!value) { return null;