| + ${this.hasUnfundedCash ? html` | ` : ''} | @@ -175,7 +179,7 @@ export class EditorTable extends CommentsMixin( > | ${translate('ADD_PD_OUTPUT')} | -+ |
| ${translate('ID')} |
${translate('COUNTRY_PROGRAME_OUTPUT')} |
-
+ |
| ${translate('TOTAL')} |
${result.cp_output_name || translate('UNASSOCIATED_TO_CP_OUTPUT')}
|
-
+ |
|
${this.intervention.planned_budget.currency}
${displayCurrencyAmount(result.total, '0.00')}
@@ -242,7 +246,7 @@ export class EditorTable extends CommentsMixin(
|
|
- |
+ |
|
|
| ${translate('PD_OUTPUT')} |
-
+ |
| ${translate('TOTAL')} |
+ |
| >(baseClass: T)
|
| ${translate('ACTIVITY')} |
${translate('TIME_PERIODS')} |
- ${translate('PARTNER_CASH')} |
- ${translate('UNICEF_CASH')} |
+
+ |
+ ${this.hasUnfundedCash ? html` | ` : ``}
| ${translate('GENERAL.TOTAL')} |
>(baseClass: T)
?readonly="${this.isReadonlyCash(activity.inEditMode, activity.items)}"
@keydown="${(e: any) => this.handleEsc(e)}"
@value-changed="${({detail}: CustomEvent) => this.numberChanged(detail, 'unicef_cash', activity)}"
+ required
+ .invalid="${activity.invalid?.unicef_cash}"
+ error-message="${translate('THIS_FIELD_IS_REQUIRED')}"
>
|
+ ${this.hasUnfundedCash
+ ? html`
+ | `
+ : ``}
>(baseClass: T)
>
|
${this.intervention.planned_budget.currency}
- ${getTotalCashFormatted(activity.cso_cash, activity.unicef_cash)}
+
+ ${getTotalCashFormatted(activity.cso_cash, activity.unicef_cash, activity.unfunded_cash)}
+
${translate('PRICE_UNIT')} |
${translate('PARTNER_CASH')} |
${translate('UNICEF_CASH')} |
+ ${this.hasUnfundedCash ? html`${translate('UNFUNDED_CASH')} | ` : ``}
${translate('TOTAL')} (${this.intervention.planned_budget.currency}) |
|
+ ${this.hasUnfundedCash
+ ? html`
+ | `
+ : ``}
+
|
+ ${this.hasUnfundedCash
+ ? html`
+ | `
+ : ``}
+
|
|
|
+ ${this.hasUnfundedCash ? html` | ` : ``}
|
| >(base
`
: html`
- | ${translate('EFFECTIVE_EFFICIENT_PROG_MGM')} |
+ ${translate('EFFECTIVE_EFFICIENT_PROG_MGM')} |
${translate('ACTIVITY')} |
${translate('PARTNER_CASH')} |
${translate('UNICEF_CASH')} |
+ ${this.hasUnfundedCash ? html`${translate('UNFUNDED_CASH')} | ` : ''}
${translate('GENERAL.TOTAL')} |
+ |
+ `
+ : ``}
>(base
>
|
${this.intervention.planned_budget.currency}
- ${getTotalCashFormatted(item.cso_cash, item.unicef_cash)}
+ ${getTotalCashFormatted(item.cso_cash, item.unicef_cash, item.unfunded_cash)}
${translate('PRICE_UNIT')} |
${translate('PARTNER_CASH')} |
${translate('UNICEF_CASH')} |
+ ${this.hasUnfundedCash ? html`${translate('UNFUNDED_CASH')} | ` : ``}
${translate('TOTAL')} (${this.intervention.planned_budget.currency}) |
${item.unicef_cash}
+ ${this.hasUnfundedCash
+ ? html`
+ ${item.unfunded_cash}
+ `
+ : ''}
${item.total}
@@ -179,6 +192,9 @@ export class EffectiveAndEfficientProgrammeManagement extends CommentsMixin(Comp
@property({type: Number})
interventionId!: number;
+ @property({type: Boolean})
+ hasUnfundedCash?: boolean;
+
connectedCallback() {
super.connectedCallback();
}
@@ -191,6 +207,7 @@ export class EffectiveAndEfficientProgrammeManagement extends CommentsMixin(Comp
return;
}
this.interventionId = state.interventions.current.id!;
+ this.hasUnfundedCash = state.interventions.current.planned_budget.has_unfunded_cash;
this.data = selectProgrammeManagement(state);
this.originalData = cloneDeep(this.data);
@@ -211,6 +228,7 @@ export class EffectiveAndEfficientProgrammeManagement extends CommentsMixin(Comp
description: translate('DESCRIPTION_1'),
partner_contribution: addCurrencyAmountDelimiter(data.act1_partner),
unicef_cash: addCurrencyAmountDelimiter(data.act1_unicef),
+ unfunded_cash: addCurrencyAmountDelimiter(data.act1_unfunded),
total: addCurrencyAmountDelimiter(data.act1_total),
index: 1,
kind: KindChoices.inCountry
@@ -220,6 +238,7 @@ export class EffectiveAndEfficientProgrammeManagement extends CommentsMixin(Comp
description: translate('DESCRIPTION_2'),
partner_contribution: addCurrencyAmountDelimiter(data.act2_partner),
unicef_cash: addCurrencyAmountDelimiter(data.act2_unicef),
+ unfunded_cash: addCurrencyAmountDelimiter(data.act2_unfunded),
total: addCurrencyAmountDelimiter(data.act2_total),
index: 2,
kind: KindChoices.operational
@@ -229,6 +248,7 @@ export class EffectiveAndEfficientProgrammeManagement extends CommentsMixin(Comp
description: translate('DESCRIPTION_3'),
partner_contribution: addCurrencyAmountDelimiter(data.act3_partner),
unicef_cash: addCurrencyAmountDelimiter(data.act3_unicef),
+ unfunded_cash: addCurrencyAmountDelimiter(data.act3_unfunded),
total: addCurrencyAmountDelimiter(data.act3_total),
index: 3,
kind: KindChoices.planning
@@ -243,6 +263,7 @@ export class EffectiveAndEfficientProgrammeManagement extends CommentsMixin(Comp
activity: {...activity, items: cloneDeep(this.data.items)},
interventionId: this.interventionId,
currency: this.data.currency,
+ hasUnfundedCash: this.hasUnfundedCash,
readonly: !this.canEdit
}
});
diff --git a/intervention-workplan/effective-efficient-programme-mgmt/effectiveEfficientProgrammeMgmt.models.ts b/intervention-workplan/effective-efficient-programme-mgmt/effectiveEfficientProgrammeMgmt.models.ts
index db7e527c9..b0e28cce0 100644
--- a/intervention-workplan/effective-efficient-programme-mgmt/effectiveEfficientProgrammeMgmt.models.ts
+++ b/intervention-workplan/effective-efficient-programme-mgmt/effectiveEfficientProgrammeMgmt.models.ts
@@ -15,12 +15,15 @@ export class ProgrammeManagement extends ModelsBase {
}
act1_unicef = '0';
act1_partner = '0';
+ act1_unfunded = '0';
act1_total = '0';
act2_unicef = '0';
act2_partner = '0';
+ act2_unfunded = '0';
act2_total = '0';
act3_unicef = '0';
act3_partner = '0';
+ act3_unfunded = '0';
act3_total = '0';
total = '0';
currency = '';
diff --git a/intervention-workplan/hq-contribution/hq-contribution.ts b/intervention-workplan/hq-contribution/hq-contribution.ts
index f52c4a139..ce2532c99 100644
--- a/intervention-workplan/hq-contribution/hq-contribution.ts
+++ b/intervention-workplan/hq-contribution/hq-contribution.ts
@@ -65,6 +65,9 @@ export class HqContributionElement extends CommentsMixin(ComponentBaseMixin(LitE
color: darkred;
padding-bottom: 5px;
}
+ etools-currency-amount-input[required] {
+ --paper-input-container-label-floating_-_max-width: 133%;
+ }
+
@@ -166,6 +187,15 @@ export class HqContributionElement extends CommentsMixin(ComponentBaseMixin(LitE
this.requestUpdate();
}
+ unfundedCashChanged(detail: any) {
+ if (areEqual(this.data.planned_budget.unfunded_hq_cash, detail.value)) {
+ return;
+ }
+
+ this.data.planned_budget.unfunded_hq_cash = detail.value;
+ this.requestUpdate();
+ }
+
updateSlider(e: CustomEvent) {
if (!e.detail) {
return;
@@ -235,7 +265,8 @@ export class HqContributionElement extends CommentsMixin(ComponentBaseMixin(LitE
}
data.planned_budget = {
id: data.planned_budget.id,
- total_hq_cash_local: data.planned_budget.total_hq_cash_local
+ total_hq_cash_local: data.planned_budget.total_hq_cash_local,
+ unfunded_hq_cash: data.planned_budget.unfunded_hq_cash
};
return data;
}
diff --git a/intervention-workplan/hq-contribution/hqContribution.models.ts b/intervention-workplan/hq-contribution/hqContribution.models.ts
index c9881dd3f..2611805be 100644
--- a/intervention-workplan/hq-contribution/hqContribution.models.ts
+++ b/intervention-workplan/hq-contribution/hqContribution.models.ts
@@ -17,4 +17,5 @@ export class HqContributionPermissions extends ModelsBase {
}
hq_support_cost = true;
planned_budget = true;
+ has_unfunded_cash = true;
}
diff --git a/intervention-workplan/results-structure/modals/activity-dialog/activity-data-dialog.ts b/intervention-workplan/results-structure/modals/activity-dialog/activity-data-dialog.ts
index df09a5e90..b344e553b 100644
--- a/intervention-workplan/results-structure/modals/activity-dialog/activity-data-dialog.ts
+++ b/intervention-workplan/results-structure/modals/activity-dialog/activity-data-dialog.ts
@@ -43,11 +43,13 @@ export class ActivityDataDialog extends DataMixin()
@@ -242,6 +269,7 @@ export class ActivityDataDialog extends DataMixin()
@@ -135,11 +141,22 @@ export class PdActivities extends CommentsMixin(TruncateMixin(LitElement)) {
${displayCurrencyAmount(String(activity.unicef_cash || 0), '0', 2)}
+
+ ${this.hasUnfundedCash
+ ? html`${translate('TIME_PERIODS')}
${translate('PARTNER_CASH')}
${translate('UNICEF_CASH')}
+ ${this.hasUnfundedCash
+ ? html` ${translate('UNFUNDED_CASH')} `
+ : ``}
${translate('GENERAL.TOTAL')} (${this.currency})
+ ${displayCurrencyAmount(String(activity.unfunded_cash || 0), '0', 2)}
+ `
+ : ``}
+
- ${displayCurrencyAmount(String(this.getTotal(activity.cso_cash, activity.unicef_cash)), '0', 2)}
+ ${displayCurrencyAmount(
+ String(this.getTotal(activity.cso_cash, activity.unicef_cash, activity.unfunded_cash)),
+ '0',
+ 2
+ )}
@@ -241,8 +258,8 @@ export class PdActivities extends CommentsMixin(TruncateMixin(LitElement)) {
return [{element, relatedTo, relatedToDescription}];
}
- getTotal(partner: string, unicef: string): number {
- return (Number(partner) || 0) + (Number(unicef) || 0);
+ getTotal(partner: string, unicef: string, unfunded: string): number {
+ return (Number(partner) || 0) + (Number(unicef) || 0) + (this.hasUnfundedCash ? Number(unfunded) || 0 : 0);
}
openAllRows(): void {
@@ -259,7 +276,8 @@ export class PdActivities extends CommentsMixin(TruncateMixin(LitElement)) {
pdOutputId: this.pdOutputId,
quarters: this.quarters,
readonly: readonly,
- currency: this.currency
+ currency: this.currency,
+ hasUnfundedCash: this.hasUnfundedCash
}
});
}
diff --git a/intervention-workplan/results-structure/results-structure.ts b/intervention-workplan/results-structure/results-structure.ts
index 3b6e41b27..226ec7430 100644
--- a/intervention-workplan/results-structure/results-structure.ts
+++ b/intervention-workplan/results-structure/results-structure.ts
@@ -266,6 +266,7 @@ export class ResultsStructure extends CommentsMixin(ContentPanelMixin(LitElement
.readonly="${!this.permissions.edit.result_links || this.commentMode}"
.currency="${this.intervention.planned_budget.currency}"
.inAmendment="${this.intervention.in_amendment}"
+ .hasUnfundedCash="${this.intervention.planned_budget.has_unfunded_cash}"
>
|