From 1a262505747018a09b64e1718a8e80aeddee59b1 Mon Sep 17 00:00:00 2001
From: Arnau Sanchez <pyarnau@gmail.com>
Date: Wed, 12 Jun 2024 12:56:06 +0200
Subject: [PATCH 01/51] poc: Use approval app as plugin

---
 package.json                                  |   1 +
 src/components/utils/use-boolean.ts           |  27 +++++
 src/pages/data-approval/DataApprovalTable.tsx | 106 ++++++++++++------
 yarn.lock                                     |  42 +++++++
 4 files changed, 140 insertions(+), 36 deletions(-)
 create mode 100644 src/components/utils/use-boolean.ts

diff --git a/package.json b/package.json
index 8d70f811..4c9a163c 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
         "@eyeseetea/d2-api": "1.14.0",
         "@eyeseetea/d2-ui-components": "2.7.0",
         "@eyeseetea/feedback-component": "0.1.2",
+        "@krakenjs/post-robot": "^11.0.0",
         "@material-ui/core": "4.12.3",
         "@material-ui/icons": "4.11.3",
         "@material-ui/styles": "4.11.4",
diff --git a/src/components/utils/use-boolean.ts b/src/components/utils/use-boolean.ts
new file mode 100644
index 00000000..35b5cf1a
--- /dev/null
+++ b/src/components/utils/use-boolean.ts
@@ -0,0 +1,27 @@
+import React from "react";
+
+type Callback = () => void;
+
+type UseBooleanReturn = [boolean, UseBooleanActions];
+
+interface UseBooleanActions {
+    set: (newValue: boolean) => void;
+    toggle: Callback;
+    enable: Callback;
+    disable: Callback;
+}
+
+export function useBooleanState(initialValue: boolean): UseBooleanReturn {
+    const [value, setValue] = React.useState(initialValue);
+
+    const actions = React.useMemo(() => {
+        return {
+            set: (newValue: boolean) => setValue(newValue),
+            enable: () => setValue(true),
+            disable: () => setValue(false),
+            toggle: () => setValue(value_ => !value_),
+        };
+    }, [setValue]);
+
+    return [value, actions];
+}
diff --git a/src/pages/data-approval/DataApprovalTable.tsx b/src/pages/data-approval/DataApprovalTable.tsx
index 0e8273a3..312da3c8 100644
--- a/src/pages/data-approval/DataApprovalTable.tsx
+++ b/src/pages/data-approval/DataApprovalTable.tsx
@@ -1,17 +1,9 @@
 import React from "react";
 import { LinearProgress } from "@material-ui/core";
 // @ts-ignore
-import { CssVariables } from "@dhis2/ui";
-// @ts-ignore
-import { SelectionProvider } from "approval-app/es/selection-context";
-// @ts-ignore
-import { AppProvider } from "approval-app/es/app-context";
-// @ts-ignore
-import { Layout } from "approval-app/es/app/layout.js";
-// @ts-ignore
-import { Display } from "approval-app/es/data-workspace/display";
-// @ts-ignore
-import { useSelectionContext } from "approval-app/es/selection-context";
+import postRobot from "@krakenjs/post-robot";
+import { useBooleanState } from "../../components/utils/use-boolean";
+import { useAppContext } from "../../contexts/api-context";
 
 export interface DataApprovalTableProps {
     dataSetId: string;
@@ -20,41 +12,83 @@ export interface DataApprovalTableProps {
     attributeOptionComboId: string;
 }
 
-const DataApprovalTable: React.FC<DataApprovalTableProps> = props => {
+export function useDhis2Url(path: string) {
+    const { api, isDev } = useAppContext();
+    return (isDev ? "/dhis2" : api.baseUrl) + path;
+}
+
+export const DataApprovalTable: React.FunctionComponent<DataApprovalTableProps> = props => {
+    const pluginUrl = useDhis2Url("/dhis-web-approval/plugin.html");
+    const iframeRef = React.useRef<HTMLIFrameElement>(null);
+    const isPluginReady = useDataApprovalPlugin(iframeRef, props);
+
     return (
         <>
-            <CssVariables spacers colors theme />
+            {!isPluginReady && <LinearProgress />}
 
-            <AppProvider>
-                <SelectionProvider disableHistory={true}>
-                    <DataValuesTableContents {...props} />
-                </SelectionProvider>
-            </AppProvider>
+            <iframe
+                src={pluginUrl}
+                ref={iframeRef}
+                style={styles.iframe}
+                width={"100%"}
+                height={500}
+            />
         </>
     );
 };
 
-const DataValuesTableContents: React.FC<DataApprovalTableProps> = props => {
-    const { orgUnitId, dataSetId, period, attributeOptionComboId } = props;
-    const selection = useSelectionContext();
-    const isSelectionFilled = selection.orgUnit && selection.period;
+const styles = {
+    iframe: { border: "none", overflow: "hidden" },
+};
+
+type Size = {
+    width: number;
+    height: number;
+};
 
+function useDataApprovalPlugin(
+    iframeRef: React.RefObject<HTMLIFrameElement>,
+    dataApproval: object
+) {
     React.useEffect(() => {
-        if (isSelectionFilled) return;
-        selection.selectOrgUnit({ id: orgUnitId });
-        selection.selectPeriod(period);
-        selection.selectFilter(`ao:${attributeOptionComboId}`);
-    }, [selection, isSelectionFilled, orgUnitId, period, attributeOptionComboId]);
+        const iframe = iframeRef.current;
+        if (!iframe || !dataApproval) return;
 
-    if (!isSelectionFilled) return <LinearProgress />;
+        const pluginProps = {
+            dataApproval: dataApproval,
+        };
 
-    return (
-        <Layout.Container>
-            <Layout.Content>
-                <Display dataSetId={dataSetId} />
-            </Layout.Content>
-        </Layout.Container>
-    );
-};
+        postRobot.send(iframe.contentWindow, "newProps", pluginProps);
+
+        const listener = postRobot.on(
+            "getProps",
+            { window: iframeRef.current.contentWindow },
+            () => pluginProps
+        );
+
+        return () => listener.cancel();
+    }, [iframeRef, dataApproval]);
+
+    const [isPluginReady, { enable: setPluginAsReady }] = useBooleanState(false);
+
+    React.useEffect(() => {
+        if (!iframeRef?.current) return;
+
+        const listener = postRobot.on(
+            "installationStatus",
+            { window: iframeRef.current.contentWindow },
+            (ev: { data: { installationStatus: "READY" | "INSTALLING" | "UNKNOWN" } }) => {
+                // await navigator.serviceWorker.getRegistration() return undefined, no PWA for capture-app
+                //if (ev.data.installationStatus === "READY") {
+                setPluginAsReady();
+                //}
+            }
+        );
+
+        return () => listener.cancel();
+    }, [iframeRef, setPluginAsReady]);
+
+    return isPluginReady;
+}
 
 export default React.memo(DataApprovalTable);
diff --git a/yarn.lock b/yarn.lock
index 84db09d8..0ca63709 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3757,6 +3757,48 @@
   resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60"
   integrity sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==
 
+"@krakenjs/belter@^2.0.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@krakenjs/belter/-/belter-2.5.0.tgz#c2ead14df28b83b63d5a467e7d5960877f247210"
+  integrity sha512-c+vOJr5ojEPsH7s28XRLNkUamaXsnyM1Fs7PaYM9tUMnMUILnZ2a3jnOmXZwHYpT0eAciRHddX1333OlCR2e7Q==
+  dependencies:
+    "@krakenjs/cross-domain-safe-weakmap" "^2.0.2"
+    "@krakenjs/cross-domain-utils" "^3.0.2"
+    "@krakenjs/zalgo-promise" "^2.0.0"
+
+"@krakenjs/cross-domain-safe-weakmap@^2.0.0", "@krakenjs/cross-domain-safe-weakmap@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@krakenjs/cross-domain-safe-weakmap/-/cross-domain-safe-weakmap-2.0.3.tgz#eb607534c14bd8bc2f3456d993618361fb38489f"
+  integrity sha512-WsGi6347ddZ9Y0HoBuTYCX2QTAHxYVaUs2T/0n8XJKXZOEJPnLWlW6eYAOgyyuUsYusWMAkYv00fvfxAlTU8/w==
+  dependencies:
+    "@krakenjs/cross-domain-utils" "^3.0.2"
+
+"@krakenjs/cross-domain-utils@^3.0.0", "@krakenjs/cross-domain-utils@^3.0.2":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@krakenjs/cross-domain-utils/-/cross-domain-utils-3.1.0.tgz#c4863099acf36f05941345de1381ada1e207315c"
+  integrity sha512-if+mVTg56ZyLt8wn3ZbTw0IzNjbQvvj5X7lfcBlVfYdZ93TXgHa6Rt9nqdm1rZmvqb8Ct6L29Bp7SNC3xzLfUw==
+
+"@krakenjs/post-robot@^11.0.0":
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/@krakenjs/post-robot/-/post-robot-11.0.0.tgz#98a285b70db2bac2c58f297cd8403a4cc2518a6a"
+  integrity sha512-t+IlQCrwzLa1IWxEvdfr9r/xgOmQoykVQ1rtEukw1LYVHPU3p3eDDC5djODE7ErWYDbkYncrHcbDEh6Gc/G9wQ==
+  dependencies:
+    "@krakenjs/belter" "^2.0.0"
+    "@krakenjs/cross-domain-safe-weakmap" "^2.0.0"
+    "@krakenjs/cross-domain-utils" "^3.0.0"
+    "@krakenjs/universal-serialize" "^2.0.0"
+    "@krakenjs/zalgo-promise" "^2.0.0"
+
+"@krakenjs/universal-serialize@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@krakenjs/universal-serialize/-/universal-serialize-2.0.0.tgz#c4a508ec53f6b412b1032e78c570b87f4f2c7763"
+  integrity sha512-Qd9W2iaP5lMTzXPETomBDAaqbgHYkEjJKcQ+3eNC8EwWGCHFk3/+uQ41B+QYfSZqRoz8AEjdNHOps7nDEypAyw==
+
+"@krakenjs/zalgo-promise@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@krakenjs/zalgo-promise/-/zalgo-promise-2.0.1.tgz#36b4225a566f0a0903a8d771a11a9efc131c6987"
+  integrity sha512-n30eknZjD7z8/joFqjI8FIDZ0yJPZHcQBce1B3tAumwNZL0C42Ta/w37MfthxHV61JHEFGfy7b727h/kzagJDA==
+
 "@material-ui/core@4.12.3":
   version "4.12.3"
   resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.3.tgz#80d665caf0f1f034e52355c5450c0e38b099d3ca"

From 10ccd8a404f753a02bd9f3a0d0c4c999a52c11e1 Mon Sep 17 00:00:00 2001
From: Arnau Sanchez <pyarnau@gmail.com>
Date: Wed, 10 Jul 2024 11:33:43 +0200
Subject: [PATCH 02/51] Use plugin.html with query strings

---
 src/pages/data-approval/DataApprovalTable.tsx | 69 +++----------------
 1 file changed, 11 insertions(+), 58 deletions(-)

diff --git a/src/pages/data-approval/DataApprovalTable.tsx b/src/pages/data-approval/DataApprovalTable.tsx
index 312da3c8..1e233188 100644
--- a/src/pages/data-approval/DataApprovalTable.tsx
+++ b/src/pages/data-approval/DataApprovalTable.tsx
@@ -1,12 +1,10 @@
 import React from "react";
-import { LinearProgress } from "@material-ui/core";
-// @ts-ignore
-import postRobot from "@krakenjs/post-robot";
-import { useBooleanState } from "../../components/utils/use-boolean";
 import { useAppContext } from "../../contexts/api-context";
+import { NamedRef } from "../../domain/entities/Ref";
 
 export interface DataApprovalTableProps {
     dataSetId: string;
+    //orgUnit: NamedRef;
     orgUnitId: string;
     period: { startDate: string; endDate: string };
     attributeOptionComboId: string;
@@ -18,14 +16,19 @@ export function useDhis2Url(path: string) {
 }
 
 export const DataApprovalTable: React.FunctionComponent<DataApprovalTableProps> = props => {
-    const pluginUrl = useDhis2Url("/dhis-web-approval/plugin.html");
+    const pluginBaseUrl = useDhis2Url("/dhis-web-approval/plugin.html");
+    const params = {
+        dataSet: "uQ6xLjyXjI1",
+        ou: "/AGZEUf9meZ6/aqWKqMN5pUb/BYGtHgVKWLY",
+        ouDisplayName: "2023-2025 SHINE",
+        pe: "202406",
+        wf: "CCy0oNyvlV1",
+    };
+    const pluginUrl = pluginBaseUrl + "#/?" + new URLSearchParams(params).toString();
     const iframeRef = React.useRef<HTMLIFrameElement>(null);
-    const isPluginReady = useDataApprovalPlugin(iframeRef, props);
 
     return (
         <>
-            {!isPluginReady && <LinearProgress />}
-
             <iframe
                 src={pluginUrl}
                 ref={iframeRef}
@@ -41,54 +44,4 @@ const styles = {
     iframe: { border: "none", overflow: "hidden" },
 };
 
-type Size = {
-    width: number;
-    height: number;
-};
-
-function useDataApprovalPlugin(
-    iframeRef: React.RefObject<HTMLIFrameElement>,
-    dataApproval: object
-) {
-    React.useEffect(() => {
-        const iframe = iframeRef.current;
-        if (!iframe || !dataApproval) return;
-
-        const pluginProps = {
-            dataApproval: dataApproval,
-        };
-
-        postRobot.send(iframe.contentWindow, "newProps", pluginProps);
-
-        const listener = postRobot.on(
-            "getProps",
-            { window: iframeRef.current.contentWindow },
-            () => pluginProps
-        );
-
-        return () => listener.cancel();
-    }, [iframeRef, dataApproval]);
-
-    const [isPluginReady, { enable: setPluginAsReady }] = useBooleanState(false);
-
-    React.useEffect(() => {
-        if (!iframeRef?.current) return;
-
-        const listener = postRobot.on(
-            "installationStatus",
-            { window: iframeRef.current.contentWindow },
-            (ev: { data: { installationStatus: "READY" | "INSTALLING" | "UNKNOWN" } }) => {
-                // await navigator.serviceWorker.getRegistration() return undefined, no PWA for capture-app
-                //if (ev.data.installationStatus === "READY") {
-                setPluginAsReady();
-                //}
-            }
-        );
-
-        return () => listener.cancel();
-    }, [iframeRef, setPluginAsReady]);
-
-    return isPluginReady;
-}
-
 export default React.memo(DataApprovalTable);

From 757d1f3b809a7caa50aa384c651dcfc22a07d154 Mon Sep 17 00:00:00 2001
From: Arnau Sanchez <pyarnau@gmail.com>
Date: Wed, 10 Jul 2024 12:07:01 +0200
Subject: [PATCH 03/51] Use @dhis2/app-runtime plugin

---
 package.json                                  |   2 +-
 src/index.ts                                  |   8 +-
 src/pages/data-approval/DataApproval.tsx      |  11 --
 src/pages/data-approval/DataApprovalTable.tsx |  20 ++--
 yarn.lock                                     | 108 +++++++++++++-----
 5 files changed, 98 insertions(+), 51 deletions(-)

diff --git a/package.json b/package.json
index 4c9a163c..9a5442cc 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
         "url": "git+https://github.com/eyeseetea/project-monitoring-app.git"
     },
     "dependencies": {
-        "@dhis2/app-runtime": "3.2.1",
+        "@dhis2/app-runtime": "3.10.4",
         "@dhis2/d2-i18n": "1.1.1",
         "@dhis2/d2-i18n-extract": "1.0.8",
         "@dhis2/d2-i18n-generate": "1.2.0",
diff --git a/src/index.ts b/src/index.ts
index a958bcb9..3002abd8 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -59,7 +59,13 @@ async function main() {
             // eslint-disable-next-line react/no-children-prop
             React.createElement(
                 Provider,
-                { config, children: null },
+                {
+                    config,
+                    children: null,
+                    plugin: false,
+                    parentAlertsAdd: undefined,
+                    showAlertsInPlugin: true,
+                },
                 React.createElement(App, { d2, api, dhis2Url: baseUrl })
             ),
             document.getElementById("root")
diff --git a/src/pages/data-approval/DataApproval.tsx b/src/pages/data-approval/DataApproval.tsx
index 87414b8c..c2a8e3ae 100644
--- a/src/pages/data-approval/DataApproval.tsx
+++ b/src/pages/data-approval/DataApproval.tsx
@@ -169,17 +169,6 @@ const DataApproval: React.FC = () => {
 
             {projectDataSet && (
                 <Paper style={{ marginBottom: 20, padding: 20 }}>
-                    <link
-                        rel="stylesheet"
-                        type="text/css"
-                        href={api.baseUrl + "/dhis-web-approval/style/dhis-web-approval.css"}
-                    />
-                    <link
-                        rel="stylesheet"
-                        type="text/css"
-                        href={api.baseUrl + "/dhis-web-commons/css/light_blue/light_blue.css"}
-                    />
-
                     <DataApprovalTable
                         dataSetId={projectDataSet.getDataSet().id}
                         orgUnitId={projectDataSet.getOrgUnit().id}
diff --git a/src/pages/data-approval/DataApprovalTable.tsx b/src/pages/data-approval/DataApprovalTable.tsx
index 1e233188..8941b5a3 100644
--- a/src/pages/data-approval/DataApprovalTable.tsx
+++ b/src/pages/data-approval/DataApprovalTable.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { useAppContext } from "../../contexts/api-context";
-import { NamedRef } from "../../domain/entities/Ref";
+// @ts-ignore
+import { Plugin } from "@dhis2/app-runtime/build/cjs/experimental";
 
 export interface DataApprovalTableProps {
     dataSetId: string;
@@ -28,15 +29,14 @@ export const DataApprovalTable: React.FunctionComponent<DataApprovalTableProps>
     const iframeRef = React.useRef<HTMLIFrameElement>(null);
 
     return (
-        <>
-            <iframe
-                src={pluginUrl}
-                ref={iframeRef}
-                style={styles.iframe}
-                width={"100%"}
-                height={500}
-            />
-        </>
+        <Plugin
+            pluginSource={pluginBaseUrl}
+            onError={(err: any) => {
+                console.error("ERROR", err);
+            }}
+            showAlertsInPlugin={true}
+            propToPass={"42"}
+        />
     );
 };
 
diff --git a/yarn.lock b/yarn.lock
index 0ca63709..7a71c0b8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2820,40 +2820,48 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2/app-runtime@3.2.1":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.2.1.tgz#c8c8ec386b1e27502c42c9481eb8b97947bebe7f"
-  integrity sha512-sQ3PAla1wlp8kzy8hOkhzfDtIP1+0r7pbKB2l9QxfDAlQntOy1aUC3hx8JIPPx5hB9hX1lwf0EPbuYH9zp+LDA==
-  dependencies:
-    "@dhis2/app-service-alerts" "3.2.1"
-    "@dhis2/app-service-config" "3.2.1"
-    "@dhis2/app-service-data" "3.2.1"
-    "@dhis2/app-service-offline" "3.2.1"
-
-"@dhis2/app-service-alerts@3.2.1":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.2.1.tgz#7118e157b1b60b6d08df899ed3d2bef6efb056c7"
-  integrity sha512-XITsLOCVqxl3nFLp5oYbuwuyL9RVvQu1U5z5TXFD4B/9sZE2zdNw9FagzQkQbAWoeiNDVsoHbB4KP7rZhyDQ+Q==
-
-"@dhis2/app-service-config@3.2.1":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.2.1.tgz#9e915bad721bb4cf6c6f9242ca2d959b21f78a8a"
-  integrity sha512-AzPrUuQ4MOXEpYUm5iMbCaxkjnzQVej4n5exNirolVEqUaE2NyGYYDqXp0GhxHq/q5QIhbSKqLL8NES/kDOusw==
-
-"@dhis2/app-service-data@3.2.1":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.2.1.tgz#a0a3df618f99966a3511260c7ceed41cd236d4e7"
-  integrity sha512-UW3e/Gr/hBNkT/gSlJ/h49rUYJ1ws+6osNZ7Q9hI5JOGHlqPtmKcWhuHfLUMeljRs2Bvan7f5duAycssSddt0A==
+"@dhis2/app-runtime@3.10.4":
+  version "3.10.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.10.4.tgz#6064ac728770cc94c4d1975db32bd38533655cc6"
+  integrity sha512-W/d0WcYYcKAeE5/xCunZEMYUSD1fxG+JDQdRDEUsH5y5hB8i/4o2QQrZK8xa19Z3xQJhaW5ypWWqIQVjTJT2Ww==
+  dependencies:
+    "@dhis2/app-service-alerts" "3.10.4"
+    "@dhis2/app-service-config" "3.10.4"
+    "@dhis2/app-service-data" "3.10.4"
+    "@dhis2/app-service-offline" "3.10.4"
+    "@dhis2/app-service-plugin" "3.10.4"
+
+"@dhis2/app-service-alerts@3.10.4":
+  version "3.10.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.10.4.tgz#a7cce660015d79980679175e677cf6c6c3f4c7eb"
+  integrity sha512-DmSLx/kHOHpgGiL8zG0oa6D3MeCY3wPMDGqj+Gfegr654Lmyf4d2vLI7HSZUSOCdraP/fSYTypsdZmWYoXoLBQ==
+
+"@dhis2/app-service-config@3.10.4":
+  version "3.10.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.10.4.tgz#2bede4df9b036350200cbc085a2a68439fa4fa0a"
+  integrity sha512-SCFdNxJKpiBjYsU9s0R+u9GrXjzmUEpGpudmC5eQqNV6ajLiebe/pS2jcSPFzjUtHVQMADk0X8TkERoOBqWcxA==
+
+"@dhis2/app-service-data@3.10.4":
+  version "3.10.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.10.4.tgz#dcd993a24d2edd97e7ad8a042a682e60582740ff"
+  integrity sha512-RaoWniioCe33PcPZoDuO66qOrIt0JeeCN8RzmCDrRVGvGmlDTZ3hNuWm9CnsAvO1U6sYDiulKPqrEQu8YKMG0w==
   dependencies:
     react-query "^3.13.11"
 
-"@dhis2/app-service-offline@3.2.1":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.2.1.tgz#92b6f1c9c15505b6d333adb1623b05ba78879469"
-  integrity sha512-NmxwwP2udTUvEydxvG+COk0bSmlMU9oaX9ji3UblINUewR93oB+APKAks+pAD9CCK3t6P+npGSUyFpQWyzaQMg==
+"@dhis2/app-service-offline@3.10.4":
+  version "3.10.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.10.4.tgz#dcdaf3a76c6c7a71f28c89a403ec130bf10fcdf3"
+  integrity sha512-SUUS+sw3FjR0TMdKSSOVzL8IfPA185gSTHQ1WE4tLc2zE92elvxLL9FuSUuTbu+l1Kr4nRQNLh8muOMWKGnWDg==
   dependencies:
     lodash "^4.17.21"
 
+"@dhis2/app-service-plugin@3.10.4":
+  version "3.10.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/app-service-plugin/-/app-service-plugin-3.10.4.tgz#f5412a1320393042012dd75713e3215e51628554"
+  integrity sha512-GW6xa/5y2yFXvhtLConnaOxKqyu6VPZWRBaQR73/bRRmFcnd7hlMkZ2M0GWSjoW4QHLXlLhXHFsgHPETBftkPg==
+  dependencies:
+    post-robot "^10.0.46"
+
 "@dhis2/d2-i18n-extract@1.0.8":
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n-extract/-/d2-i18n-extract-1.0.8.tgz#9d98690d522a51895c8ef3fe7136f026b0f8dacd"
@@ -6074,6 +6082,15 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+belter@^1.0.41:
+  version "1.0.190"
+  resolved "https://registry.yarnpkg.com/belter/-/belter-1.0.190.tgz#491857550ef240d9c66b56fc637991f5c3089966"
+  integrity sha512-jz05FHrO+bwitdI6JxV5ESyRdVhTcwMWQ7L4o+q/R4LNJFQrG58sp9EiwsSjhbihhiyYFcmmCMRRagxte6igtw==
+  dependencies:
+    cross-domain-safe-weakmap "^1"
+    cross-domain-utils "^2"
+    zalgo-promise "^1"
+
 bfj@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/bfj/-/bfj-7.0.2.tgz#1988ce76f3add9ac2913fd8ba47aad9e651bfbb2"
@@ -7291,6 +7308,20 @@ cronstrue@^1.81.0:
   resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-1.110.0.tgz#cffbef09855141e518341ed5a4b575a5a4811638"
   integrity sha512-+ABuGZl/nqf/0TemAsPlMSGaB9xEobWhctfRGEqEvH3g6pB/2FGbsUHQPSL8Wt1W3nmOHe1w8GWjacN5k8d3hg==
 
+cross-domain-safe-weakmap@^1, cross-domain-safe-weakmap@^1.0.1:
+  version "1.0.29"
+  resolved "https://registry.yarnpkg.com/cross-domain-safe-weakmap/-/cross-domain-safe-weakmap-1.0.29.tgz#0847975c27d9e1cc840f24c1745311958df98022"
+  integrity sha512-VLoUgf2SXnf3+na8NfeUFV59TRZkIJqCIATaMdbhccgtnTlSnHXkyTRwokngEGYdQXx8JbHT9GDYitgR2sdjuA==
+  dependencies:
+    cross-domain-utils "^2.0.0"
+
+cross-domain-utils@^2, cross-domain-utils@^2.0.0:
+  version "2.0.38"
+  resolved "https://registry.yarnpkg.com/cross-domain-utils/-/cross-domain-utils-2.0.38.tgz#2eaf321c4dfdb61596805ca4233fde4400cb6377"
+  integrity sha512-zZfi3+2EIR9l4chrEiXI2xFleyacsJf8YMLR1eJ0Veb5FTMXeJ3DpxDjZkto2FhL/g717WSELqbptNSo85UJDw==
+  dependencies:
+    zalgo-promise "^1.0.11"
+
 cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -13903,6 +13934,17 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
+post-robot@^10.0.46:
+  version "10.0.46"
+  resolved "https://registry.yarnpkg.com/post-robot/-/post-robot-10.0.46.tgz#39cea5b51033729390fc7c90be3285cd285f0377"
+  integrity sha512-EgVJiuvI4iRWDZvzObWes0X/n8olWBEJWxlSw79zmhpgkigX8UsVL4VOBhVtoJKwf0Y9qP9g2zOONw1rv80QbA==
+  dependencies:
+    belter "^1.0.41"
+    cross-domain-safe-weakmap "^1.0.1"
+    cross-domain-utils "^2.0.0"
+    universal-serialize "^1.0.4"
+    zalgo-promise "^1.0.3"
+
 postcss-attribute-case-insensitive@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz#d93e46b504589e94ac7277b0463226c68041a880"
@@ -17459,6 +17501,11 @@ unique-string@^1.0.0:
   dependencies:
     crypto-random-string "^1.0.0"
 
+universal-serialize@^1.0.4:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/universal-serialize/-/universal-serialize-1.0.10.tgz#3279bb30f47290ea479f45135620f98fa9d3f3a6"
+  integrity sha512-FdouA4xSFa0fudk1+z5vLWtxZCoC0Q9lKYV3uUdFl7DttNfolmiw2ASr5ddY+/Yz6Isr68u3IqC9XMSwMP+Pow==
+
 universalify@^0.1.0, universalify@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -18419,6 +18466,11 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
+zalgo-promise@^1, zalgo-promise@^1.0.11, zalgo-promise@^1.0.3:
+  version "1.0.48"
+  resolved "https://registry.yarnpkg.com/zalgo-promise/-/zalgo-promise-1.0.48.tgz#9e33eef502d5ed9f5a09fc5728c833c3e87afa2e"
+  integrity sha512-LLHANmdm53+MucY9aOFIggzYtUdkSBFxUsy4glTTQYNyK6B3uCPWTbfiGvSrEvLojw0mSzyFJ1/RRLv+QMNdzQ==
+
 zip-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79"

From 9d6cf268cf6dcc6caae9df381bd829b0338436a3 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Mon, 19 Aug 2024 21:18:59 -0500
Subject: [PATCH 04/51] add ability to clone projects

---
 i18n/en.pot                                   | 16 +++++--
 src/components/steps/save/SaveStep.tsx        |  3 +-
 src/models/Project.ts                         | 25 ++++++++++
 src/models/ProjectNotification.ts             | 19 ++++++--
 src/models/user.ts                            |  2 +
 src/pages/project-wizard/ProjectWizard.tsx    | 47 ++++++++++++++-----
 .../projects-list/ProjectsListConfig.tsx      |  7 +++
 src/pages/root/Root.tsx                       |  8 ++++
 src/router.ts                                 |  1 +
 9 files changed, 106 insertions(+), 22 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index a0143cd8..8c8782a5 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2023-12-05T11:01:02.938Z\n"
-"PO-Revision-Date: 2023-12-05T11:01:02.938Z\n"
+"POT-Creation-Date: 2024-08-20T12:07:28.358Z\n"
+"PO-Revision-Date: 2024-08-20T12:07:28.358Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -320,9 +320,6 @@ msgstr ""
 msgid "Checking Existing Data"
 msgstr ""
 
-msgid "Project created"
-msgstr ""
-
 msgid ""
 "Note: only users with permissions in the selected country ({{country}}) can "
 "be added to this project"
@@ -720,6 +717,9 @@ msgid ""
 "{{message}}"
 msgstr ""
 
+msgid "Project created"
+msgstr ""
+
 msgid "Project '{{projectName}}' was {{action}} by {{user}} ({{username}})"
 msgstr ""
 
@@ -952,6 +952,9 @@ msgstr ""
 msgid "Edit project"
 msgstr ""
 
+msgid "Clone project"
+msgstr ""
+
 msgid "New project"
 msgstr ""
 
@@ -1039,6 +1042,9 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
+msgid "Clone"
+msgstr ""
+
 msgid "User groups"
 msgstr ""
 
diff --git a/src/components/steps/save/SaveStep.tsx b/src/components/steps/save/SaveStep.tsx
index 236d8531..2287fc0e 100644
--- a/src/components/steps/save/SaveStep.tsx
+++ b/src/components/steps/save/SaveStep.tsx
@@ -201,8 +201,7 @@ function useSave(project: Project, action: StepProps["action"]) {
             if (response && response.status === "OK") {
                 const notificator = new ProjectNotification(api, projectSaved, currentUser, isTest);
                 notificator.notifyOnProjectSave(action);
-                const baseMsg =
-                    action === "create" ? i18n.t("Project created") : i18n.t("Project updated");
+                const baseMsg = ProjectNotification.buildBaseMessage(action);
                 const msg = `${baseMsg}: ${projectSaved.name}`;
                 history.push(generateUrl("projects"));
                 if (isDev) saveDataValues(api, projectSaved);
diff --git a/src/models/Project.ts b/src/models/Project.ts
index 4f2e78a8..92f0acb0 100644
--- a/src/models/Project.ts
+++ b/src/models/Project.ts
@@ -28,6 +28,7 @@ import { getIds } from "../utils/dhis2";
 import { ProjectInfo } from "./ProjectInfo";
 import { isTest } from "../utils/testing";
 import { MAX_SIZE_PROJECT_IN_MB, ProjectDocument } from "./ProjectDocument";
+import { promiseMap } from "../migrations/utils";
 
 /*
 Project model.
@@ -666,6 +667,28 @@ class Project {
             .compact()
             .join("-");
     }
+
+    static async clone(api: D2Api, config: Config, id: Id): Promise<Project> {
+        const projectToClone = await Project.get(api, config, id);
+        const clonedDocuments = await promiseMap(projectToClone.documents, async document => {
+            if (!document.id) throw new Error("Document id is missing");
+            const fileResourceBlob = await api.files.get(document.id).getData();
+            return ProjectDocument.create({
+                ...document,
+                id: "",
+                url: undefined,
+                sharing: undefined,
+                blob: fileResourceBlob,
+            });
+        });
+
+        return projectToClone
+            .set("id", generateUid())
+            .set("orgUnit", undefined)
+            .set("dataSets", undefined)
+            .set("documents", clonedDocuments)
+            .set("created", undefined);
+    }
 }
 
 interface Project extends ProjectData {}
@@ -768,3 +791,5 @@ export type ProjectBasic = Pick<
 >;
 
 export default Project;
+
+export type ProjectAction = "create" | "edit" | "clone";
diff --git a/src/models/ProjectNotification.ts b/src/models/ProjectNotification.ts
index b8ccf6a4..b3916b9a 100644
--- a/src/models/ProjectNotification.ts
+++ b/src/models/ProjectNotification.ts
@@ -1,6 +1,6 @@
 import _ from "lodash";
 
-import Project, { DataSetType } from "./Project";
+import Project, { DataSetType, ProjectAction } from "./Project";
 import i18n from "../locales";
 import User from "./user";
 import { generateUrl } from "../router";
@@ -11,7 +11,7 @@ import moment from "moment";
 import { appConfig } from "../app-config";
 
 type Email = string;
-type Action = "create" | "update";
+type Action = ProjectAction;
 
 export class ProjectNotification {
     constructor(
@@ -195,9 +195,22 @@ The reason provided by the user was:
         return this.sendMessage({ recipients, subject, text: text.trim() });
     }
 
+    static buildBaseMessage(action: Action): string {
+        switch (action) {
+            case "create":
+                return i18n.t("Project created");
+            case "edit":
+                return i18n.t("Project updated");
+            case "clone":
+                return i18n.t("Project created");
+            default:
+                throw new Error(`Unknown action: ${action}`);
+        }
+    }
+
     private async notifySave(recipients: Email[], action: Action) {
         const { project, currentUser } = this;
-        const baseMsg = action === "create" ? i18n.t("Project created") : i18n.t("Project updated");
+        const baseMsg = ProjectNotification.buildBaseMessage(action);
         const subject = `${baseMsg}: ${this.project.name}`;
 
         const body = [
diff --git a/src/models/user.ts b/src/models/user.ts
index 05a3b222..4538e9a0 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -14,6 +14,7 @@ export type Action =
     | "countryDashboard"
     | "downloadData"
     | "edit"
+    | "clone"
     | "dataApproval"
     | "reopen"
     | "delete"
@@ -29,6 +30,7 @@ const actionsByRole: Record<Role, Action[]> = {
         "countryDashboard",
         "downloadData",
         "edit",
+        "clone",
         "delete",
         "dataApproval",
         "accessMER",
diff --git a/src/pages/project-wizard/ProjectWizard.tsx b/src/pages/project-wizard/ProjectWizard.tsx
index ed9b505c..84ba1db4 100644
--- a/src/pages/project-wizard/ProjectWizard.tsx
+++ b/src/pages/project-wizard/ProjectWizard.tsx
@@ -5,7 +5,7 @@ import { Wizard, useSnackbar } from "@eyeseetea/d2-ui-components";
 import { LinearProgress } from "@material-ui/core";
 import { Location } from "history";
 
-import Project, { ValidationKey } from "../../models/Project";
+import Project, { ProjectAction, ValidationKey } from "../../models/Project";
 import { D2Api } from "../../types/d2-api";
 import { generateUrl } from "../../router";
 import i18n from "../../locales";
@@ -28,7 +28,7 @@ import { useAppHistory } from "../../utils/use-app-history";
 import { Maybe } from "../../types/utils";
 import { AttachFilesStep } from "../../components/steps/attach-files/AttachFilesStep";
 
-type Action = { type: "create" } | { type: "edit"; id: string };
+type Action = { type: "create" } | { type: "edit"; id: string } | { type: "clone"; id: string };
 
 interface ProjectWizardProps {
     action: Action;
@@ -39,7 +39,7 @@ export interface StepProps {
     project: Project;
     onChange: (project: Project) => void;
     onCancel: () => void;
-    action: "create" | "update";
+    action: ProjectAction;
 }
 
 interface Props {
@@ -76,14 +76,9 @@ class ProjectWizardImpl extends React.Component<Props, State> {
     };
 
     async componentDidMount() {
-        const { api, config, action, isDev } = this.props;
-
         try {
-            const project =
-                action.type === "create"
-                    ? getDevProject(Project.create(api, config), isDev)
-                    : await Project.get(api, config, action.id);
-            this.setState({ project });
+            const project = await this.getInitialProjectData();
+            this.setState({ project: project });
         } catch (err: any) {
             console.error(err);
             this.props.snackbar.error(i18n.t("Cannot load project") + `: ${err.message || err}`);
@@ -91,10 +86,27 @@ class ProjectWizardImpl extends React.Component<Props, State> {
         }
     }
 
+    getInitialProjectData = async () => {
+        if (this.props.action.type === "create") {
+            return getDevProject(
+                Project.create(this.props.api, this.props.config),
+                this.props.isDev
+            );
+        } else if (this.props.action.type === "edit") {
+            return Project.get(this.props.api, this.props.config, this.props.action.id);
+        } else if (this.props.action.type === "clone") {
+            return Project.clone(this.props.api, this.props.config, this.props.action.id);
+        }
+    };
+
     isEdit() {
         return this.props.action.type === "edit";
     }
 
+    isClone() {
+        return this.props.action.type === "clone";
+    }
+
     getStepsBaseInfo(): Step[] {
         const { project } = this.state;
         if (!project) return [];
@@ -220,6 +232,17 @@ class ProjectWizardImpl extends React.Component<Props, State> {
         return await getValidationMessages(this.state.project, currentStep.validationKeys);
     };
 
+    getTitle = (): string => {
+        switch (this.props.action.type) {
+            case "edit":
+                return i18n.t("Edit project");
+            case "clone":
+                return i18n.t("Clone project");
+            default:
+                return i18n.t("New project");
+        }
+    };
+
     render() {
         const { project, dialogOpen } = this.state;
         const { api, location, action } = this.props;
@@ -240,8 +263,8 @@ class ProjectWizardImpl extends React.Component<Props, State> {
         const stepExists = steps.find(step => step.key === urlHash);
         const firstStepKey = steps.map(step => step.key)[0];
         const initialStepKey = stepExists ? urlHash : firstStepKey;
-        const lastClickableStepIndex = this.isEdit() ? steps.length - 1 : 0;
-        const title = this.isEdit() ? i18n.t("Edit project") : i18n.t("New project");
+        const lastClickableStepIndex = this.isEdit() || this.isClone() ? steps.length - 1 : 0;
+        const title = this.getTitle();
 
         return (
             <React.Fragment>
diff --git a/src/pages/projects-list/ProjectsListConfig.tsx b/src/pages/projects-list/ProjectsListConfig.tsx
index 77bb23e0..fba60407 100644
--- a/src/pages/projects-list/ProjectsListConfig.tsx
+++ b/src/pages/projects-list/ProjectsListConfig.tsx
@@ -167,6 +167,13 @@ export function getComponentConfig(
             multiple: false,
             onClick: (ids: Id[]) => onFirst(ids, id => goTo("projects.edit", { id })),
         },
+        clone: {
+            name: "clone",
+            icon: <Icon>content_copy</Icon>,
+            text: i18n.t("Clone"),
+            multiple: false,
+            onClick: (ids: Id[]) => onFirst(ids, id => goTo("projects.clone", { id })),
+        },
 
         delete: {
             name: "delete",
diff --git a/src/pages/root/Root.tsx b/src/pages/root/Root.tsx
index 6fdc6429..ad4cef69 100644
--- a/src/pages/root/Root.tsx
+++ b/src/pages/root/Root.tsx
@@ -32,6 +32,14 @@ const Root = () => {
                             />
                         )}
                     />
+                    <Route
+                        path={generateUrl("projects.clone", idParam)}
+                        render={props => (
+                            <ProjectWizard
+                                action={{ type: "clone", id: props.match.params.id || "" }}
+                            />
+                        )}
+                    />
                     <Route path={generateUrl("report")} render={() => <MerReport />} />
                     <Route
                         path={generateUrl("actualValues", idParam)}
diff --git a/src/router.ts b/src/router.ts
index 4f5cd473..c9a9897c 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -6,6 +6,7 @@ const routes = {
     projects: () => "/",
     "projects.new": () => `/projects/new`,
     "projects.edit": ({ id }: { id: string }) => `/projects/edit/${id}`,
+    "projects.clone": ({ id }: { id: string }) => `/projects/clone/${id}`,
     report: () => "/report",
     actualValues: ({ id }: { id: string }) => `/actual-values/${id}`,
     targetValues: ({ id }: { id: string }) => `/target-values/${id}`,

From 8dd9827ed3614a3de62823f765a65b150da87fae Mon Sep 17 00:00:00 2001
From: Arnau Sanchez <pyarnau@gmail.com>
Date: Wed, 28 Aug 2024 10:08:13 +0200
Subject: [PATCH 05/51] Use full-switch for branches over action type

---
 src/pages/project-wizard/ProjectWizard.tsx | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/project-wizard/ProjectWizard.tsx b/src/pages/project-wizard/ProjectWizard.tsx
index 84ba1db4..10c212a0 100644
--- a/src/pages/project-wizard/ProjectWizard.tsx
+++ b/src/pages/project-wizard/ProjectWizard.tsx
@@ -87,15 +87,15 @@ class ProjectWizardImpl extends React.Component<Props, State> {
     }
 
     getInitialProjectData = async () => {
-        if (this.props.action.type === "create") {
-            return getDevProject(
-                Project.create(this.props.api, this.props.config),
-                this.props.isDev
-            );
-        } else if (this.props.action.type === "edit") {
-            return Project.get(this.props.api, this.props.config, this.props.action.id);
-        } else if (this.props.action.type === "clone") {
-            return Project.clone(this.props.api, this.props.config, this.props.action.id);
+        switch (this.props.action.type) {
+            case "create": {
+                const project = Project.create(this.props.api, this.props.config);
+                return getDevProject(project, this.props.isDev);
+            }
+            case "edit":
+                return Project.get(this.props.api, this.props.config, this.props.action.id);
+            case "clone":
+                return Project.clone(this.props.api, this.props.config, this.props.action.id);
         }
     };
 
@@ -238,7 +238,7 @@ class ProjectWizardImpl extends React.Component<Props, State> {
                 return i18n.t("Edit project");
             case "clone":
                 return i18n.t("Clone project");
-            default:
+            case "create":
                 return i18n.t("New project");
         }
     };

From 223e607b87c4959d9941b8e29b5b2ee662ada7ae Mon Sep 17 00:00:00 2001
From: Arnau Sanchez <pyarnau@gmail.com>
Date: Thu, 29 Aug 2024 13:35:18 +0200
Subject: [PATCH 06/51] Update deploy

---
 deploy/deploy-test-from-pro.sh |  2 +-
 deploy/lib.sh                  |  4 ++--
 deploy/push-pro-docker.sh      | 21 ++++++++++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/deploy/deploy-test-from-pro.sh b/deploy/deploy-test-from-pro.sh
index 1de1e26d..de57fe64 100755
--- a/deploy/deploy-test-from-pro.sh
+++ b/deploy/deploy-test-from-pro.sh
@@ -29,7 +29,7 @@ start_from_pro() {
 post_clone() {
     local url=$1
 
-    #set_email_password "$url"
+    set_email_password "$url"
     change_server_name "$url" "SP Platform - Test"
     set_logos "$url" "$script_dir/test-icons"
 }
diff --git a/deploy/lib.sh b/deploy/lib.sh
index 298e1adc..2acfa135 100755
--- a/deploy/lib.sh
+++ b/deploy/lib.sh
@@ -2,7 +2,7 @@
 script_dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-$0}")")"
 source "$script_dir/auth.sh"
 
-export image_pro="docker.eyeseetea.com/eyeseetea/dhis2-data:2.36.11.1-sp-ip-pro"
+export image_pro="docker.eyeseetea.com/eyeseetea/dhis2-data:40.4.1-sp-ip-pro"
 export image_dev="docker.eyeseetea.com/samaritans/dhis2-data:2.36.11.1-sp-ip-dev"
 export image_training="docker.eyeseetea.com/samaritans/dhis2-data:2.36.11.1-sp-ip-training"
 
@@ -20,7 +20,7 @@ run() {
     local command=$2
     shift 2
 
-    debug "Copy deploy folder"
+    debug "Copy deploy folder: $(pwd)"
     rsync -a . "$host":deploy/
     debug "Run: $command $*"
     ssh "$host" "cd deploy &&" "$command" "$@"
diff --git a/deploy/push-pro-docker.sh b/deploy/push-pro-docker.sh
index 03155946..4257fcbd 100755
--- a/deploy/push-pro-docker.sh
+++ b/deploy/push-pro-docker.sh
@@ -1,13 +1,20 @@
 #!/bin/bash
 set -e -u -o pipefail
 
-name="docker.eyeseetea.com/eyeseetea/dhis2-data:2.36.11.1-sp-ip-pro"
-sql_filename="$(basename $name).sql.gz"
+script_dir=$(dirname "$0")
+source "./lib.sh"
 
-echo "Dump DB: $name -> $sql_filename"
+sql_filename="/tmp/db.sql.gz"
+
+cd /tmp
+echo "Dump DB: $image_pro -> $sql_filename"
 sudo -u postgres pg_dump dhis2 | gzip >"$sql_filename"
 
-echo "Create d2-docker image: $name"
-sudo d2-docker create data --sql="$sql_filename" "$name" \
-    --apps-dir=/home/dhis/config/files/apps/ --documents-dir=/home/dhis/config/files/document/
-sudo docker push "$name"
+echo "Create d2-docker image: $image_pro"
+
+sudo d2-docker create data "$image_pro" \
+    --sql="$sql_filename" \
+    --apps-dir=/home/dhis/ip-40/config/files/apps/ \
+    --documents-dir=/home/dhis/ip-40/config/files/document/
+
+sudo docker push "$image_pro"

From aaa87ffe8367cfd35f013b56dfc8caa217d01873 Mon Sep 17 00:00:00 2001
From: Arnau Sanchez <pyarnau@gmail.com>
Date: Fri, 27 Sep 2024 09:10:44 +0200
Subject: [PATCH 07/51] Update deploy to version changes

---
 deploy/clone-pro-to-test.sh    |  5 -----
 deploy/deploy-test-from-pro.sh | 11 ++++++-----
 deploy/lib.sh                  |  6 +++---
 deploy/push-pro-docker.sh      | 12 +++++++++---
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/deploy/clone-pro-to-test.sh b/deploy/clone-pro-to-test.sh
index 9e09c2a1..1f39feed 100644
--- a/deploy/clone-pro-to-test.sh
+++ b/deploy/clone-pro-to-test.sh
@@ -1,11 +1,6 @@
 #!/bin/bash
 set -e -u -o pipefail
 
-# Actions:
-#
-#   - In PRO: Create docker image and push to Harbor.
-#   - In TEST: Pull docker from Harbor and start.
-
 # Requirements: Open vendorlink (spintldhis01, stintldhis01)
 
 cd "$(dirname "$0")"
diff --git a/deploy/deploy-test-from-pro.sh b/deploy/deploy-test-from-pro.sh
index 1de1e26d..981a83b9 100755
--- a/deploy/deploy-test-from-pro.sh
+++ b/deploy/deploy-test-from-pro.sh
@@ -6,21 +6,22 @@ script_dir=$(pwd)
 source "./lib.sh"
 source "./tasks.sh"
 
-image_test="docker.eyeseetea.com/samaritans/dhis2-data:40.4.0-sp-ip-test"
+image_test="docker.eyeseetea.com/samaritans/dhis2-data:40.4.1-sp-ip-test"
 
 start_from_pro() {
     local url=$1
-    local image_test_running
 
+    local image_test_running
     image_test_running=$(d2-docker list | grep RUN | awk '{print $1}' | grep -m1 ip-test) || true
+
     if test "$image_test_running"; then
         d2-docker commit "$image_test_running"
-        d2-docker copy "$image_test_running" "backup/sp-ip-test-$(timestamp)"
+        docker tag "$image_test_running" "backup/sp-ip-test-$(timestamp)"
         d2-docker stop "$image_test_running"
     fi
 
     d2-docker pull "$image_pro"
-    d2-docker copy "$image_pro" "$image_test"
+    docker tag "$image_pro" "$image_test"
     sudo image=$image_test /usr/local/bin/start-dhis2-test
 
     wait_for_dhis2_server "$url"
@@ -29,9 +30,9 @@ start_from_pro() {
 post_clone() {
     local url=$1
 
-    #set_email_password "$url"
     change_server_name "$url" "SP Platform - Test"
     set_logos "$url" "$script_dir/test-icons"
+    set_email_password "$url"
 }
 
 main() {
diff --git a/deploy/lib.sh b/deploy/lib.sh
index 298e1adc..da910b8f 100755
--- a/deploy/lib.sh
+++ b/deploy/lib.sh
@@ -2,9 +2,9 @@
 script_dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-$0}")")"
 source "$script_dir/auth.sh"
 
-export image_pro="docker.eyeseetea.com/eyeseetea/dhis2-data:2.36.11.1-sp-ip-pro"
-export image_dev="docker.eyeseetea.com/samaritans/dhis2-data:2.36.11.1-sp-ip-dev"
-export image_training="docker.eyeseetea.com/samaritans/dhis2-data:2.36.11.1-sp-ip-training"
+export image_pro="docker.eyeseetea.com/eyeseetea/dhis2-data:40.4.1-sp-ip-pro"
+export image_dev="docker.eyeseetea.com/samaritans/dhis2-data:40.4.1-sp-ip-dev"
+export image_training="docker.eyeseetea.com/samaritans/dhis2-data:40.4.1-sp-ip-training"
 
 debug() {
     echo "$@" >&2
diff --git a/deploy/push-pro-docker.sh b/deploy/push-pro-docker.sh
index 03155946..76bc811b 100755
--- a/deploy/push-pro-docker.sh
+++ b/deploy/push-pro-docker.sh
@@ -1,13 +1,19 @@
 #!/bin/bash
 set -e -u -o pipefail
 
-name="docker.eyeseetea.com/eyeseetea/dhis2-data:2.36.11.1-sp-ip-pro"
-sql_filename="$(basename $name).sql.gz"
+cd "$(dirname "$0")"
+source "./auth.sh"
 
+version=$(curl -sS -u "$auth" http://localhost/api/system/info.json | jq -r .version | sed "s/2\.4/4/")
+name="docker.eyeseetea.com/eyeseetea/dhis2-data:$version-sp-ip-pro"
+sql_filename="/tmp/db.sql.gz"
+
+cd /tmp
 echo "Dump DB: $name -> $sql_filename"
 sudo -u postgres pg_dump dhis2 | gzip >"$sql_filename"
 
 echo "Create d2-docker image: $name"
 sudo d2-docker create data --sql="$sql_filename" "$name" \
-    --apps-dir=/home/dhis/config/files/apps/ --documents-dir=/home/dhis/config/files/document/
+    --apps-dir=/home/dhis/ip-40/config/files/apps/ \
+    --documents-dir=/home/dhis/ip-40/config/files/document/
 sudo docker push "$name"

From 39c52160b6c9f6df990afabd3cb9903e9ebf06c5 Mon Sep 17 00:00:00 2001
From: Arnau Sanchez <pyarnau@gmail.com>
Date: Thu, 10 Oct 2024 14:08:15 +0200
Subject: [PATCH 08/51] Use data approval as plugin + pass info with query
 strings

---
 src/pages/data-approval/DataApproval.tsx      |  2 +-
 src/pages/data-approval/DataApprovalTable.tsx | 29 +++++++------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/pages/data-approval/DataApproval.tsx b/src/pages/data-approval/DataApproval.tsx
index c2a8e3ae..ac5d1b3b 100644
--- a/src/pages/data-approval/DataApproval.tsx
+++ b/src/pages/data-approval/DataApproval.tsx
@@ -171,7 +171,7 @@ const DataApproval: React.FC = () => {
                 <Paper style={{ marginBottom: 20, padding: 20 }}>
                     <DataApprovalTable
                         dataSetId={projectDataSet.getDataSet().id}
-                        orgUnitId={projectDataSet.getOrgUnit().id}
+                        orgUnit={projectDataSet.getOrgUnit()}
                         attributeOptionComboId={projectDataSet.getAttributeOptionCombo().id}
                         period={periodStartEnd}
                     />
diff --git a/src/pages/data-approval/DataApprovalTable.tsx b/src/pages/data-approval/DataApprovalTable.tsx
index 8941b5a3..55f99693 100644
--- a/src/pages/data-approval/DataApprovalTable.tsx
+++ b/src/pages/data-approval/DataApprovalTable.tsx
@@ -2,11 +2,11 @@ import React from "react";
 import { useAppContext } from "../../contexts/api-context";
 // @ts-ignore
 import { Plugin } from "@dhis2/app-runtime/build/cjs/experimental";
+import { OrganisationUnit } from "../../models/Project";
 
 export interface DataApprovalTableProps {
     dataSetId: string;
-    //orgUnit: NamedRef;
-    orgUnitId: string;
+    orgUnit: OrganisationUnit;
     period: { startDate: string; endDate: string };
     attributeOptionComboId: string;
 }
@@ -17,27 +17,20 @@ export function useDhis2Url(path: string) {
 }
 
 export const DataApprovalTable: React.FunctionComponent<DataApprovalTableProps> = props => {
+    const { config } = useAppContext();
     const pluginBaseUrl = useDhis2Url("/dhis-web-approval/plugin.html");
     const params = {
-        dataSet: "uQ6xLjyXjI1",
-        ou: "/AGZEUf9meZ6/aqWKqMN5pUb/BYGtHgVKWLY",
-        ouDisplayName: "2023-2025 SHINE",
-        pe: "202406",
-        wf: "CCy0oNyvlV1",
+        dataSet: props.dataSetId,
+        ou: props.orgUnit.path,
+        ouDisplayName: props.orgUnit.displayName,
+        pe: props.period.startDate.replace(/-/g, ""),
+        wf: config.dataApprovalWorkflows.project.id,
+        hideSelectors: "true",
+        filter: `ao:${props.attributeOptionComboId}`,
     };
     const pluginUrl = pluginBaseUrl + "#/?" + new URLSearchParams(params).toString();
-    const iframeRef = React.useRef<HTMLIFrameElement>(null);
 
-    return (
-        <Plugin
-            pluginSource={pluginBaseUrl}
-            onError={(err: any) => {
-                console.error("ERROR", err);
-            }}
-            showAlertsInPlugin={true}
-            propToPass={"42"}
-        />
-    );
+    return <Plugin pluginSource={pluginUrl} showAlertsInPlugin={true} />;
 };
 
 const styles = {

From 5c66140c609280e899dd14d082cda0e4e5fee8ad Mon Sep 17 00:00:00 2001
From: Arnau Sanchez <pyarnau@gmail.com>
Date: Thu, 10 Oct 2024 14:13:57 +0200
Subject: [PATCH 09/51] Set width to 1000

---
 src/pages/data-approval/DataApprovalTable.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/data-approval/DataApprovalTable.tsx b/src/pages/data-approval/DataApprovalTable.tsx
index 55f99693..7e2c85b1 100644
--- a/src/pages/data-approval/DataApprovalTable.tsx
+++ b/src/pages/data-approval/DataApprovalTable.tsx
@@ -19,6 +19,7 @@ export function useDhis2Url(path: string) {
 export const DataApprovalTable: React.FunctionComponent<DataApprovalTableProps> = props => {
     const { config } = useAppContext();
     const pluginBaseUrl = useDhis2Url("/dhis-web-approval/plugin.html");
+
     const params = {
         dataSet: props.dataSetId,
         ou: props.orgUnit.path,
@@ -30,7 +31,7 @@ export const DataApprovalTable: React.FunctionComponent<DataApprovalTableProps>
     };
     const pluginUrl = pluginBaseUrl + "#/?" + new URLSearchParams(params).toString();
 
-    return <Plugin pluginSource={pluginUrl} showAlertsInPlugin={true} />;
+    return <Plugin width="1000" pluginSource={pluginUrl} showAlertsInPlugin={true} />;
 };
 
 const styles = {

From af86d7191733ba046068686a29f5961624a2c57d Mon Sep 17 00:00:00 2001
From: Arnau Sanchez <pyarnau@gmail.com>
Date: Thu, 10 Oct 2024 15:02:48 +0200
Subject: [PATCH 10/51] fix lint warning

---
 src/pages/data-approval/DataApprovalTable.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/data-approval/DataApprovalTable.tsx b/src/pages/data-approval/DataApprovalTable.tsx
index 7e2c85b1..f1131203 100644
--- a/src/pages/data-approval/DataApprovalTable.tsx
+++ b/src/pages/data-approval/DataApprovalTable.tsx
@@ -34,8 +34,4 @@ export const DataApprovalTable: React.FunctionComponent<DataApprovalTableProps>
     return <Plugin width="1000" pluginSource={pluginUrl} showAlertsInPlugin={true} />;
 };
 
-const styles = {
-    iframe: { border: "none", overflow: "hidden" },
-};
-
 export default React.memo(DataApprovalTable);

From 6d4aa3750523573dc50110904c7cce6958ba97ac Mon Sep 17 00:00:00 2001
From: Arnau Sanchez <pyarnau@gmail.com>
Date: Mon, 14 Oct 2024 12:54:24 +0200
Subject: [PATCH 11/51] Refactor deploy for dev/training

---
 deploy/clone-pro-to-test.sh           |  10 --
 deploy/clone-pro-to-training.sh       |  20 ---
 deploy/clone-pro.sh                   |  30 ++++
 deploy/deploy-dev-from-pro.sh         |  49 ++++++
 deploy/deploy-test-from-pro.sh        |  18 +--
 deploy/deploy-training-from-pro.sh    |  99 ++++++++++++
 deploy/icons/dev/logo_banner.png      | Bin 0 -> 68597 bytes
 deploy/icons/dev/logo_front.png       | Bin 0 -> 10452 bytes
 deploy/icons/training/logo_banner.png | Bin 0 -> 52193 bytes
 deploy/icons/training/logo_front.png  | Bin 0 -> 11568 bytes
 deploy/lib.sh                         |   8 +-
 deploy/opts.sh                        | 209 ++++++++++++++++++++++++++
 deploy/push-pro-docker.sh             |  35 +++--
 deploy/sql/create-guest-user.sql      |   8 +
 deploy/sql/delete-projects.sql        |  80 ++++++++++
 deploy/sql/empty_data_tables_228.sql  |  59 ++++++++
 deploy/tasks.sh                       |   7 +-
 17 files changed, 572 insertions(+), 60 deletions(-)
 delete mode 100644 deploy/clone-pro-to-test.sh
 delete mode 100644 deploy/clone-pro-to-training.sh
 create mode 100644 deploy/clone-pro.sh
 create mode 100755 deploy/deploy-dev-from-pro.sh
 create mode 100644 deploy/deploy-training-from-pro.sh
 create mode 100644 deploy/icons/dev/logo_banner.png
 create mode 100644 deploy/icons/dev/logo_front.png
 create mode 100644 deploy/icons/training/logo_banner.png
 create mode 100644 deploy/icons/training/logo_front.png
 create mode 100644 deploy/opts.sh
 create mode 100644 deploy/sql/create-guest-user.sql
 create mode 100644 deploy/sql/delete-projects.sql
 create mode 100644 deploy/sql/empty_data_tables_228.sql

diff --git a/deploy/clone-pro-to-test.sh b/deploy/clone-pro-to-test.sh
deleted file mode 100644
index 1f39feed..00000000
--- a/deploy/clone-pro-to-test.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e -u -o pipefail
-
-# Requirements: Open vendorlink (spintldhis01, stintldhis01)
-
-cd "$(dirname "$0")"
-source "./lib.sh"
-
-run spintldhis01 bash push-pro-docker.sh
-run stintldhis01 bash deploy-test-from-pro.sh
diff --git a/deploy/clone-pro-to-training.sh b/deploy/clone-pro-to-training.sh
deleted file mode 100644
index a6758271..00000000
--- a/deploy/clone-pro-to-training.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e -u -o pipefail
-
-# Actions:
-#
-#   - Save last projects for 60 days in training instance.
-#   - Clone instance in proj-dhis-prod to localhost.
-#   - Setup of the local docker + recover training projects
-
-# Requirements: Open vendorlink before running the script:
-#
-#   $ vendorlink sp-proj-dhis-test-00.clt1.theark.cloud sp-proj-dhis-prod-00.clt1.theark.cloud
-
-cd "$(dirname "$0")"
-source "./lib.sh"
-
-#run sp-proj-dhis-test-00.clt1.theark.cloud sudo usermod -a -G docker asanchez
-
-run boone-ip-pro bash push-pro-docker.sh
-#run boone-ip-test bash start-training-from-pro.sh
diff --git a/deploy/clone-pro.sh b/deploy/clone-pro.sh
new file mode 100644
index 00000000..2b3f815b
--- /dev/null
+++ b/deploy/clone-pro.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e -u -o pipefail
+
+# Requirements: vendorlink SSH channel open with spintldhis01, stintldhis01, sdintldhis01.
+
+cd "$(dirname "$0")"
+source "./lib.sh"
+
+clone() {
+    setup_training
+    image_pro=$(run spintldhis01 bash -x push-pro-docker.sh --skip_dump)
+    run stintldhis01 bash deploy-test-from-pro.sh "$image_pro"
+    run stintldhis01 bash -x deploy-training-from-pro.sh "$image_pro"
+    run sdintldhis01 bash -x deploy-dev-from-pro.sh "$image_pro"
+}
+
+setup_training() {
+    local repo_url="https://github.com/eyeseetea/project-monitoring-app"
+
+    if test -e "project-monitoring-app"; then
+        cd "project-monitoring-app"
+        git fetch
+        cd ..
+    else
+        git clone "$repo_url"
+    fi
+
+}
+
+clone
diff --git a/deploy/deploy-dev-from-pro.sh b/deploy/deploy-dev-from-pro.sh
new file mode 100755
index 00000000..ec398abe
--- /dev/null
+++ b/deploy/deploy-dev-from-pro.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+# shellcheck disable=SC2001
+
+set -e -u -o pipefail
+
+cd "$(dirname "$0")"
+script_dir=$(pwd)
+source "./lib.sh"
+source "./tasks.sh"
+
+start_from_pro() {
+    local url=$1 image_pro=$2
+    image=$(echo "$image_pro" | sed "s/ip-pro/ip-dev/")
+
+    export TMPDIR=/data/tmp
+
+    local image_running
+    image_running=$(d2-docker list | grep RUN | awk '{print $1}' | grep -m1 ip-dev) || true
+
+    if test "$image_running"; then
+        d2-docker commit "$image_running"
+        docker tag "$image_running" "$image_running-$(timestamp)"
+        d2-docker stop "$image_running"
+    fi
+
+    d2-docker pull "$image_pro"
+    docker tag "$image_pro" "$image"
+    sudo image="$image" /usr/local/bin/start-dhis2-dev
+
+    wait_for_dhis2_server "$url"
+}
+
+post_clone() {
+    local url=$1
+
+    change_server_name "$url" "SP Platform - DEV"
+    set_logos "$url" "$script_dir/icons/dev"
+    set_email_password "$url"
+}
+
+main() {
+    local image_pro=$1
+    url=$(get_url 80)
+
+    start_from_pro "$url" "$image_pro"
+    post_clone "$url"
+}
+
+main "$@"
diff --git a/deploy/deploy-test-from-pro.sh b/deploy/deploy-test-from-pro.sh
index 981a83b9..6879384f 100755
--- a/deploy/deploy-test-from-pro.sh
+++ b/deploy/deploy-test-from-pro.sh
@@ -6,18 +6,18 @@ script_dir=$(pwd)
 source "./lib.sh"
 source "./tasks.sh"
 
-image_test="docker.eyeseetea.com/samaritans/dhis2-data:40.4.1-sp-ip-test"
-
 start_from_pro() {
-    local url=$1
+    local url=$1 image_pro=$2
+    # shellcheck disable=SC2001
+    image_test=$(echo "$image_pro" | sed "s/ip-pro/ip-test/")
 
-    local image_test_running
-    image_test_running=$(d2-docker list | grep RUN | awk '{print $1}' | grep -m1 ip-test) || true
+    local running_image
+    running_image=$(d2-docker list | grep RUN | awk '{print $1}' | grep -m1 ip-test) || true
 
-    if test "$image_test_running"; then
-        d2-docker commit "$image_test_running"
-        docker tag "$image_test_running" "backup/sp-ip-test-$(timestamp)"
-        d2-docker stop "$image_test_running"
+    if test "$running_image"; then
+        d2-docker commit "$running_image"
+        docker tag "$running_image" "$running_image-$(timestamp)"
+        d2-docker stop "$running_image"
     fi
 
     d2-docker pull "$image_pro"
diff --git a/deploy/deploy-training-from-pro.sh b/deploy/deploy-training-from-pro.sh
new file mode 100644
index 00000000..891f3896
--- /dev/null
+++ b/deploy/deploy-training-from-pro.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+set -e -u -o pipefail
+
+cd "$(dirname "$0")"
+script_dir=$(pwd)
+source "./lib.sh"
+source "./tasks.sh"
+
+load_training_projects() {
+    local url=$1
+    cd "$script_dir/project-monitoring-app" || return 1
+    yarn ts-node src/scripts/projects.ts --url="$url" import training-projects.json
+}
+
+training_post_clone() {
+    local url=$1
+    set_email_password "$url"
+    enable_users "$url" "traindatareviewer,traindataviewer,traindataentry"
+    change_server_name "$url" "SP Platform - Training"
+    add_users_to_maintainer_roles "$url"
+    set_logos "$url" "$script_dir/icons/training"
+}
+
+get_app_version() {
+    local url=$1
+    curl -sS -u "$auth" "$url/api/apps" |
+        jq '.[] | select(.key == "Data-Management-App").version' -r
+}
+
+get_project_monitoring_app_source() {
+    local url=$1
+
+    app_version=$(get_app_version "$url")
+    cd "$script_dir" || return 1
+
+    # Connection to github is flaky from SP servers, clone locally and rsync it (before the script is run)
+    cd "project-monitoring-app" || return 1
+
+    git checkout v"$app_version" -f
+    yarn install
+    yarn add ts-node@10.8.1
+    yarn localize
+}
+
+save_last_training_projects() {
+    local url=$1
+    date=$(date --date="60 day ago" "+%Y-%m-%d")
+    cd "$script_dir/project-monitoring-app" || return 1
+    yarn ts-node src/scripts/projects.ts --url="$url" --from="$date" export training-projects.json
+}
+
+delete_projects() {
+    local image_training=$1
+    d2-docker run-sql -i "$image_training" "$script_dir/sql/create-guest-user.sql"
+    d2-docker run-sql -i "$image_training" "$script_dir/sql/empty_data_tables_228.sql"
+    d2-docker run-sql -i "$image_training" "$script_dir/sql/delete-projects.sql"
+}
+
+start_from_pro() {
+    local url=$1 image_pro=$2
+    # shellcheck disable=SC2001
+    image_training=$(echo "$image_pro" | sed "s/ip-pro/ip-training/")
+
+    {
+        d2-docker pull "$image_pro"
+        if test 1 = 2; then
+            current_image=$(d2-docker list | grep RUN | awk '{print $1}' | grep -m1 ip-training) || true
+
+            if test "$current_image"; then
+                d2-docker commit "$current_image"
+                docker tag "$current_image" "$current_image-$(timestamp)"
+                d2-docker stop "$current_image"
+            fi
+
+            docker tag "$image_pro" "$image_training"
+            sudo image="$image_training" /usr/local/bin/start-dhis2-training
+            wait_for_dhis2_server "$url"
+        fi
+    } >&2
+
+    echo "$image_training"
+}
+
+main() {
+    local image_pro=$1
+    url=$(get_url 81)
+
+    if curl -s "$url"; then
+        get_project_monitoring_app_source "$url"
+        save_last_training_projects "$url"
+    fi
+
+    image_training=$(start_from_pro "$url" "$image_pro")
+    delete_projects "$image_training"
+    load_training_projects "$url"
+    training_post_clone "$url"
+}
+
+main "$@"
diff --git a/deploy/icons/dev/logo_banner.png b/deploy/icons/dev/logo_banner.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f623c02e95f3a21e9f3dc608c40bd8d2d4042bb
GIT binary patch
literal 68597
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

literal 0
HcmV?d00001

diff --git a/deploy/icons/dev/logo_front.png b/deploy/icons/dev/logo_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..79602be133b3c17e01077775e1a7b2f7e7e55366
GIT binary patch
literal 10452
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
KMNUMnLSTZ?OA+({

literal 0
HcmV?d00001

diff --git a/deploy/icons/training/logo_banner.png b/deploy/icons/training/logo_banner.png
new file mode 100644
index 0000000000000000000000000000000000000000..90ffe04e310fd3b9e3672fe94448db8ba77fbb51
GIT binary patch
literal 52193
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%0Dq8VWJP9
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

literal 0
HcmV?d00001

diff --git a/deploy/icons/training/logo_front.png b/deploy/icons/training/logo_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..5456b3ddb8cecf07609f184d73d201d7d7b39ddb
GIT binary patch
literal 11568
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
QpEJzz(#lem5=LMDA1EZuVgLXD

literal 0
HcmV?d00001

diff --git a/deploy/lib.sh b/deploy/lib.sh
index da910b8f..bb0c2817 100755
--- a/deploy/lib.sh
+++ b/deploy/lib.sh
@@ -2,10 +2,6 @@
 script_dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-$0}")")"
 source "$script_dir/auth.sh"
 
-export image_pro="docker.eyeseetea.com/eyeseetea/dhis2-data:40.4.1-sp-ip-pro"
-export image_dev="docker.eyeseetea.com/samaritans/dhis2-data:40.4.1-sp-ip-dev"
-export image_training="docker.eyeseetea.com/samaritans/dhis2-data:40.4.1-sp-ip-training"
-
 debug() {
     echo "$@" >&2
 }
@@ -20,7 +16,7 @@ run() {
     local command=$2
     shift 2
 
-    debug "Copy deploy folder"
+    debug "Copy deploy folder to $host"
     rsync -a . "$host":deploy/
     debug "Run: $command $*"
     ssh "$host" "cd deploy &&" "$command" "$@"
@@ -30,7 +26,7 @@ wait_for_dhis2_server() {
     local url=$url
     local port
     port=$(echo "$url" | grep -o ':[[:digit:]]*$' | cut -d: -f2)
-    echo "Wait for server: port=$port"
+    debug "Wait for server: port=$port"
 
     while ! curl -sS -f "http://localhost:$port"; do
         sleep 10
diff --git a/deploy/opts.sh b/deploy/opts.sh
new file mode 100644
index 00000000..49d5bab9
--- /dev/null
+++ b/deploy/opts.sh
@@ -0,0 +1,209 @@
+#!/bin/bash
+
+declare -a __OPTS__=() __VARS__=()
+
+function opts() {
+  function opt_name() {
+    local opt=$1
+    local type name
+    type=$(opt_type "$opt")
+    name=$(echo "${opt/--no-/}" | tr -d '\-=[]')
+
+    if [[ $type == array && ${name: -1} == s ]]; then
+      name=${name%?}
+    fi
+    echo "$name"
+  }
+
+  function var_name() {
+    local opt=$1
+    echo "${opt/--no-/}" | tr -d '\-=[]'
+  }
+
+  function short_name() {
+    local opt=$1
+    local name=${opt/[]//}
+    if [[ $name =~ (\[(.)\]) ]]; then
+      echo "${BASH_REMATCH[2]}"
+    fi
+  }
+
+  function opt_type() {
+    local opt=$1
+    local type=flag
+    [[ ! $opt =~ =$ ]] || type=var
+    [[ ! $opt =~ \[\] ]] || type=array
+    echo $type
+  }
+
+  function negated() {
+    local opt=$1
+    [[ $opt =~ ^--no- ]] && echo true || echo false
+  }
+
+  local opts=("$@")
+
+  for opt in "${opts[@]}"; do
+    __OPTS__[${#__OPTS__[@]}]="
+      opt=$(opt_name "$opt")
+      name=$(var_name "$opt")
+      type=$(opt_type "$opt")
+      short=$(short_name "$opt")
+      negated=$(negated "$opt")
+    "
+  done
+}
+
+function opts_eval() {
+  function puts() {
+    echo "$@" >&2
+  }
+
+  function opts_declare() {
+    for opt in "${__OPTS__[@]}"; do
+      local type="" name="" short="" negated=""
+      eval "$opt"
+      [[ $type != var ]] || store_var "$name="
+      [[ $type != array ]] || store_var "$name=()"
+      [[ $type != flag ]] || store_var "$name=$([[ $negated == true ]] && echo true || echo false)"
+    done
+  }
+
+  function store_var() {
+    __VARS__[${#__VARS__[@]}]="$1"
+  }
+
+  function opt_value() {
+    local arg=$1 opt=$2 name=$3 short=$4
+    [[ $arg =~ --$opt=(.*)$ || $arg =~ -$short=(.*)$ ]] || return 1
+    echo "${BASH_REMATCH[1]}"
+  }
+
+  function set_var() {
+    local name=$3 value=
+    value=$(opt_value "$@") && store_var "$name=\"$value\""
+  }
+
+  function set_array() {
+    local name=$3 value=
+    value=$(opt_value "$@") && store_var "$name""[\${#""$name""[@]}]=\"$value\""
+  }
+
+  function set_flag() {
+    local arg=$1 opt=$2 name=$3 short=$4 value=
+
+    if [[ $arg == -$short ]]; then
+      value=true
+    elif [[ $arg =~ --(no-)?$opt$ ]]; then
+      value=$([[ -n ${BASH_REMATCH[1]} ]] && echo false || echo true)
+    fi
+
+    [[ -n $value ]] && store_var "$name=$value"
+  }
+
+  function opts_parse() {
+    local arg=$1
+
+    for opt in "${__OPTS__[@]}"; do
+      local type="" name="" short="" negated="" value=""
+      eval "$opt"
+      if "set_$type" "$arg" "$opt" "$name" "$short"; then
+        return 0
+      fi
+    done
+
+    return 1
+  }
+
+  function opts_join_assignment() {
+
+    local arg=$1 type="" name="" short="" negated="" value=""
+    for opt in "${__OPTS__[@]}"; do
+      eval "$opt"
+      if [[ $type != flag && ($arg == --$opt || $arg == -$short) ]]; then #  && (( $# > 0 ))
+        return 0
+      fi
+    done
+
+    return 1
+  }
+
+  opts_declare
+
+  local arg var
+  args=(0)
+
+  while (($# > 0)); do
+    if opts_join_assignment "$1"; then
+      arg="$1=$2"
+      shift || true
+    else
+      arg=$1
+    fi
+    shift || true
+
+    if [[ $arg == '--' ]]; then
+      args=("${args[@]}" "$@")
+      break
+    elif opts_parse "$arg"; then
+      true
+    elif [[ $arg =~ ^- ]]; then
+      echo "Unknown option: ${arg}" >&2 && exit 1
+    else
+      args[${#args[@]}]="$arg"
+    fi
+  done
+
+  for var in "${__VARS__[@]}"; do
+    eval "$var"
+  done
+
+  args=("${args[@]:1}")
+}
+
+function opt() {
+  function opt_type() {
+    local opt line
+    line=$(echo "${__OPTS__[@]}" | grep -A 1 "name=$1" | tail -n 1)
+    echo "${line#*=}"
+  }
+
+  function opt_var() {
+    echo "--$1=\"$(eval "echo \$$1")\""
+  }
+
+  function opt_array() {
+    local _length
+    _length=$(eval "echo \${#$1[@]}")
+    ((_length == 0)) || echo "$(
+      for ((_i = 0; _i < _length; _i++)); do
+        echo "--${1%s}=\"$(eval "echo \${$1[$_i]}")\""
+      done
+    )" | tr "\n" ' ' | sed 's/ *$//'
+  }
+
+  function opt_flag() {
+    [[ $(eval "echo \$$1") == false ]] || echo "--$1"
+  }
+
+  "opt_$(opt_type "$1")" "$1"
+}
+
+options() {
+  local index=0
+
+  for arg in "$@"; do
+    if [[ $arg == "--" ]]; then
+      opts "${@:1:$index}"
+      shift $((index + 1))
+      opts_eval "$@"
+      return
+    else
+      index=$((index + 1))
+    fi
+  done
+
+  return 1
+}
+
+export -f options
diff --git a/deploy/push-pro-docker.sh b/deploy/push-pro-docker.sh
index 76bc811b..632f1028 100755
--- a/deploy/push-pro-docker.sh
+++ b/deploy/push-pro-docker.sh
@@ -2,18 +2,31 @@
 set -e -u -o pipefail
 
 cd "$(dirname "$0")"
+source "./lib.sh"
 source "./auth.sh"
+source "./opts.sh"
 
-version=$(curl -sS -u "$auth" http://localhost/api/system/info.json | jq -r .version | sed "s/2\.4/4/")
-name="docker.eyeseetea.com/eyeseetea/dhis2-data:$version-sp-ip-pro"
-sql_filename="/tmp/db.sql.gz"
+dump_and_push() {
+    options --skip_dump -- "$@"
 
-cd /tmp
-echo "Dump DB: $name -> $sql_filename"
-sudo -u postgres pg_dump dhis2 | gzip >"$sql_filename"
+    version=$(curl -sS -u "$auth" http://localhost/api/system/info.json | jq -r .version | sed "s/2\.4/4/")
+    name="docker.eyeseetea.com/samaritans/dhis2-data:$version-sp-ip-pro"
+    debug "Docker image: $name"
 
-echo "Create d2-docker image: $name"
-sudo d2-docker create data --sql="$sql_filename" "$name" \
-    --apps-dir=/home/dhis/ip-40/config/files/apps/ \
-    --documents-dir=/home/dhis/ip-40/config/files/document/
-sudo docker push "$name"
+    if test -z "${skip_dump:-}"; then
+        sql_filename="/tmp/db.sql.gz"
+        cd /tmp
+        debug "Dump DB: $name -> $sql_filename"
+        sudo -u postgres pg_dump dhis2 | gzip >"$sql_filename"
+
+        debug "Create d2-docker image: $name"
+        sudo d2-docker create data --sql="$sql_filename" "$name" \
+            --apps-dir=/home/dhis/ip-40/config/files/apps/ \
+            --documents-dir=/home/dhis/ip-40/config/files/document/
+        sudo docker push "$name"
+    fi
+
+    echo "$name"
+}
+
+dump_and_push "$@"
diff --git a/deploy/sql/create-guest-user.sql b/deploy/sql/create-guest-user.sql
new file mode 100644
index 00000000..39368baa
--- /dev/null
+++ b/deploy/sql/create-guest-user.sql
@@ -0,0 +1,8 @@
+\c postgres;
+CREATE ROLE guest WITH LOGIN PASSWORD 'j9d&2r5P' NOSUPERUSER INHERIT NOCREATEDB NOCREATEROLE NOREPLICATION VALID UNTIL 'infinity';
+GRANT CONNECT ON DATABASE dhis2 TO guest;
+\c dhis2;
+GRANT USAGE ON SCHEMA public TO guest;
+GRANT SELECT ON ALL TABLES IN SCHEMA public TO guest;
+GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO guest;
+ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO guest;
diff --git a/deploy/sql/delete-projects.sql b/deploy/sql/delete-projects.sql
new file mode 100644
index 00000000..300af09e
--- /dev/null
+++ b/deploy/sql/delete-projects.sql
@@ -0,0 +1,80 @@
+DELETE FROM
+    datasetindicators;
+
+DELETE FROM
+    datasetoperands;
+
+DELETE FROM
+    visualization_organisationunits;
+
+DELETE FROM
+    sectiondataelements;
+
+DELETE FROM
+    section;
+
+DELETE FROM
+    datasetsource;
+
+DELETE FROM
+    completedatasetregistration;
+
+DELETE FROM
+    datasetelement;
+
+DELETE FROM
+    datainputperiod;
+
+DELETE FROM
+    dataset;
+
+DELETE FROM
+    orgunitgroupmembers
+WHERE
+    (organisationunitid) IN (
+        SELECT
+            ou.organisationunitid
+        FROM
+            organisationunit ou
+            JOIN orgunitgroupmembers oug USING (organisationunitid)
+        WHERE
+            ou.hierarchylevel >= 3
+    );
+
+DELETE FROM
+    userdatavieworgunits
+WHERE
+    (organisationunitid) IN (
+        SELECT
+            ou.organisationunitid
+        FROM
+            organisationunit ou
+            JOIN userdatavieworgunits oug USING (organisationunitid)
+        WHERE
+            ou.hierarchylevel >= 3
+    );
+
+DELETE FROM
+    usermembership
+WHERE
+    (organisationunitid) IN (
+        SELECT
+            ou.organisationunitid
+        FROM
+            organisationunit ou
+            JOIN usermembership oug USING (organisationunitid)
+        WHERE
+            ou.hierarchylevel >= 3
+    );
+
+DELETE FROM
+    userteisearchorgunits;
+
+-- This fails
+-- dhis2-# WHERE hierarchylevel = 3;
+-- ERROR:  update or delete on table "organisationunit" violates foreign key constraint "fk_visualization_organisationunits_organisationunitid" on table "visualization_organisationunits"
+-- DETAIL:  Key (organisationunitid)=(2606892) is still referenced from table "visualization_organisationunits"
+DELETE FROM
+    organisationunit
+WHERE
+    hierarchylevel >= 3;
diff --git a/deploy/sql/empty_data_tables_228.sql b/deploy/sql/empty_data_tables_228.sql
new file mode 100644
index 00000000..1409de72
--- /dev/null
+++ b/deploy/sql/empty_data_tables_228.sql
@@ -0,0 +1,59 @@
+DELETE FROM
+    trackedentitydatavalueaudit;
+
+DELETE FROM
+    datavalueaudit;
+
+DELETE FROM
+    datavalue;
+
+DELETE FROM
+    programstageinstance_messageconversation;
+
+DELETE FROM
+    programstageinstancecomments;
+
+DELETE FROM
+    programstageinstance;
+
+DELETE FROM
+    trackedentityattributevalue;
+
+DELETE FROM
+    programinstancecomments;
+
+DELETE FROM
+    programinstance;
+
+DELETE FROM
+    programownershiphistory;
+
+DELETE FROM
+    trackedentityattributevalueaudit;
+
+DELETE FROM
+    trackedentityprogramowner;
+
+DELETE FROM
+    trackedentityinstance;
+
+DELETE FROM
+    dataapprovalaudit;
+
+DELETE FROM
+    dataapproval;
+
+DELETE FROM
+    interpretation_comments;
+
+DELETE FROM
+    interpretationcomment;
+
+DELETE FROM
+    messageconversation_messages;
+
+DELETE FROM
+    messageconversation_usermessages;
+
+DELETE FROM
+    messageconversation;
diff --git a/deploy/tasks.sh b/deploy/tasks.sh
index e89852c8..cb99df35 100755
--- a/deploy/tasks.sh
+++ b/deploy/tasks.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 script_dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-$0}")")"
-# shellcheck source=./lib.sh
 source "$script_dir/lib.sh"
 
 add_users_to_maintainer_roles() {
@@ -43,16 +42,16 @@ enable_users() {
 
 set_email_password() {
     local url=$1
-    echo "Set email password"
+    debug "Set SMTP password"
     curl -sS -H 'Content-Type: text/plain' -u "$auth" \
         "$url/api/systemSettings/keyEmailPassword" \
-        -d 'RLIi96f3TJSBsV2h1IO6Vy52ToWzH0' | jq -r '.status'
+        -d 'NO_PASSWORD_NECESSARY' | jq -r '.status'
 }
 
 set_logos() {
     local url=$1 folder=$2
 
-    echo "Set logs: url=$url, folder=$folder"
+    debug "Set logs: url=$url, folder=$folder"
 
     curl -sS -F "file=@$folder/logo_front.png;type=image/png" \
         -X POST -u "$auth" \

From b6caa4d1c7987839cfb4107084a78714ebde0ad4 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Tue, 15 Oct 2024 11:58:37 -0500
Subject: [PATCH 12/51] fix incorrect summary for documents

---
 src/models/Project.ts | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/models/Project.ts b/src/models/Project.ts
index 92f0acb0..129c24c3 100644
--- a/src/models/Project.ts
+++ b/src/models/Project.ts
@@ -669,8 +669,8 @@ class Project {
     }
 
     static async clone(api: D2Api, config: Config, id: Id): Promise<Project> {
-        const projectToClone = await Project.get(api, config, id);
-        const clonedDocuments = await promiseMap(projectToClone.documents, async document => {
+        const existingProject = await Project.get(api, config, id);
+        const clonedDocuments = await promiseMap(existingProject.documents, async document => {
             if (!document.id) throw new Error("Document id is missing");
             const fileResourceBlob = await api.files.get(document.id).getData();
             return ProjectDocument.create({
@@ -682,12 +682,17 @@ class Project {
             });
         });
 
-        return projectToClone
-            .set("id", generateUid())
-            .set("orgUnit", undefined)
-            .set("dataSets", undefined)
-            .set("documents", clonedDocuments)
-            .set("created", undefined);
+        const projectToClone = Project.create(api, config).set("initialData", {
+            ...existingProject.data,
+            documents: clonedDocuments,
+        });
+        return projectToClone.setObj({
+            ...existingProject.data,
+            id: generateUid(),
+            orgUnit: undefined,
+            dataSets: undefined,
+            created: undefined,
+        });
     }
 }
 

From 97b6c8ac38d01b7b80382228bfffafbc101e17b9 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Fri, 18 Oct 2024 20:05:55 -0500
Subject: [PATCH 13/51] Save+Delete periods

---
 estimation.md                                 | 114 +++++++++++++
 i18n/en.pot                                   |  79 ++++++++-
 src/CompositionRoot.ts                        |  16 ++
 src/components/app/App.tsx                    |   3 +
 .../UniqueBeneficiariesTable.tsx              |  86 ++++++++++
 src/contexts/api-context.ts                   |   2 +
 .../ImportDataElementSpreadSheetRepository.ts |   8 +-
 ...UniqueBeneficiariesSettingsD2Repository.ts |  75 +++++++++
 .../entities/UniqueBeneficiariesPeriods.ts    | 123 ++++++++++++++
 .../entities/UniqueBeneficiariesSettings.ts   |   4 +
 src/domain/entities/generic/Either.ts         | 105 ++++++++++++
 src/domain/entities/generic/Errors.ts         |  34 ++++
 src/domain/entities/generic/Validations.ts    |  18 +++
 .../UniqueBeneficiariesSettingsRepository.ts  |   7 +
 .../GetUniqueBeneficiariesSettingsUseCase.ts  |  11 ++
 .../RemoveUniqueBeneficiariesPeriodUseCase.ts |  26 +++
 .../SaveUniqueBeneficiariesSettingsUseCase.ts |  56 +++++++
 src/models/user.ts                            |   4 +-
 .../projects-list/ProjectsListConfig.tsx      |   8 +
 src/pages/root/Root.tsx                       |   6 +
 .../UniqueBeneficiariesPeriodsPage.tsx        | 150 ++++++++++++++++++
 .../unique-periods/UniquePeriodsForm.tsx      | 119 ++++++++++++++
 src/router.ts                                 |   1 +
 23 files changed, 1045 insertions(+), 10 deletions(-)
 create mode 100644 estimation.md
 create mode 100644 src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx
 create mode 100644 src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
 create mode 100644 src/domain/entities/UniqueBeneficiariesPeriods.ts
 create mode 100644 src/domain/entities/UniqueBeneficiariesSettings.ts
 create mode 100644 src/domain/entities/generic/Either.ts
 create mode 100644 src/domain/entities/generic/Errors.ts
 create mode 100644 src/domain/entities/generic/Validations.ts
 create mode 100644 src/domain/repositories/UniqueBeneficiariesSettingsRepository.ts
 create mode 100644 src/domain/usecases/GetUniqueBeneficiariesSettingsUseCase.ts
 create mode 100644 src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts
 create mode 100644 src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
 create mode 100644 src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
 create mode 100644 src/pages/unique-periods/UniquePeriodsForm.tsx

diff --git a/estimation.md b/estimation.md
new file mode 100644
index 00000000..afbb5ed8
--- /dev/null
+++ b/estimation.md
@@ -0,0 +1,114 @@
+Total Hours: 48.5 hours
+
+-   Add step "Select of Unique Indicators" (3 hours)
+
+    -   Configure stepper component
+    -   Only shows indicators of type "People"
+    -   Save selected indicators
+
+-   Manage Unique Beneficiaries Periods (3 hours)
+
+    -   List periods
+    -   Add period form
+    -   Delete period form + validation
+
+-   "Project Indicators Validation" (22 hours)
+
+    -   Add period selector 0.5h
+    -   Get existing information from datastore (by period) 3h
+    -   Add datatable configuration 1h
+    -   Get dataValues from actual project 1h
+    -   Sum "new" values (combinations) 2h
+    -   Copy values in column "Editable new" 0.5h
+    -   Make column "Returning from Previous Project" editable 3h
+    -   Calculate column "Total" -> "Editable New" + "Returning" 1h
+    -   Add column "comments". Required if there's any change in column G or H. 2.5h
+    -   Add modal in case indicators has been updated 4h
+    -   Generate sum for "Total" column in footer table 0.5h
+    -   Save logic in datastore 3h
+
+-   Add "Unique Beneficiaries" button (16.5 hours)
+
+    -   Add period selector 0.5h
+    -   Add org. unit tree 1h
+    -   Get projects according period and org. unit 6h
+    -   Add datatable configuration 1h
+    -   Add editable checkbox in column "Include" (all checkbox marked as selected by default) 2h
+    -   Calculate total unique served. Sum unique beneficiaries marked as included. 1h
+    -   Calculate total in the footer of the table "Country unique beneficiaries" 1h
+    -   Save logic in datastore 2h
+    -   Download button. Generate excel report 2h
+
+-   Testing + Meetings + PR review (4 hours)
+
+```json
+{
+    "documents": [],
+    "merDataElementIds": ["WUCuxbfpPJz", "uam4rE1aVKS"],
+    "uniqueBeneficiaries": {
+        "periods": [
+            {
+                "id": "ABC",
+                "startDate": 3,
+                "endDate": 4,
+                "type": "CUSTOM",
+                "label": "Custom"
+            },
+            {
+                "id": "XYZ",
+                "startDate": 1,
+                "endDate": 12,
+                "type": "YEARLY",
+                "label": "Custom"
+            },
+            {
+                "id": "RGW",
+                "startDate": 1,
+                "endDate": 6,
+                "type": "SEMIANNUAL",
+                "label": "Semi Annual"
+            }
+        ],
+        "indicatorsValidation": [
+            {
+                "period": "ABC",
+                "createdAt": "",
+                "lastUpdatedAt": "",
+                "indicators": [
+                    {
+                        "indicatorId": "P010100",
+                        "newValue": 100,
+                        "editableNewValue": 50,
+                        "returningValue": 150,
+                        "total": 200,
+                        "comments": "a comment"
+                    }
+                ]
+            }
+        ],
+        "report": {
+            "periodId": "XYZ",
+            "orgUnit": "",
+            "createdAt": "",
+            "lastUpdatedAt": "",
+            "projects": [
+                {
+                    "projectId": "PRABC",
+                    "indicators": [
+                        {
+                            "indicatorId": "P010100",
+                            "newValue": 50,
+                            "include": true
+                        },
+                        {
+                            "indicatorId": "P020200",
+                            "newValue": 200,
+                            "include": false
+                        }
+                    ]
+                }
+            ]
+        }
+    }
+}
+```
diff --git a/i18n/en.pot b/i18n/en.pot
index 8c8782a5..2a80ceda 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-08-20T12:07:28.358Z\n"
-"PO-Revision-Date: 2024-08-20T12:07:28.358Z\n"
+"POT-Creation-Date: 2024-10-18T23:21:33.588Z\n"
+"PO-Revision-Date: 2024-10-18T23:21:33.588Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -325,6 +325,15 @@ msgid ""
 "be added to this project"
 msgstr ""
 
+msgid "Edit"
+msgstr ""
+
+msgid "Start Month"
+msgstr ""
+
+msgid "End Month"
+msgstr ""
+
 msgid "Cancel Project creation?"
 msgstr ""
 
@@ -333,6 +342,12 @@ msgid ""
 "lost. Are you sure you want to proceed?"
 msgstr ""
 
+msgid "Cannot be blank: {{fieldName}}"
+msgstr ""
+
+msgid "{{value}} is not a valid value for {{fieldName}}"
+msgstr ""
+
 msgid "Error saving dashboard"
 msgstr ""
 
@@ -1024,6 +1039,9 @@ msgstr ""
 msgid "API Link"
 msgstr ""
 
+msgid "Manage Unique Beneficiaries Periods"
+msgstr ""
+
 msgid "Add Actual Values"
 msgstr ""
 
@@ -1039,9 +1057,6 @@ msgstr ""
 msgid "Download Data"
 msgstr ""
 
-msgid "Edit"
-msgstr ""
-
 msgid "Clone"
 msgstr ""
 
@@ -1134,6 +1149,60 @@ msgstr ""
 msgid "You have reached the limit for this field"
 msgstr ""
 
+msgid "Loading Periods..."
+msgstr ""
+
+msgid "Saving Period..."
+msgstr ""
+
+msgid "Period saved successfully"
+msgstr ""
+
+msgid "Unique Beneficiaries Periods"
+msgstr ""
+
+msgid "{{actionPeriod}} Period"
+msgstr ""
+
+msgid "Create"
+msgstr ""
+
+msgid "January"
+msgstr ""
+
+msgid "February"
+msgstr ""
+
+msgid "March"
+msgstr ""
+
+msgid "April"
+msgstr ""
+
+msgid "May"
+msgstr ""
+
+msgid "June"
+msgstr ""
+
+msgid "July"
+msgstr ""
+
+msgid "August"
+msgstr ""
+
+msgid "September"
+msgstr ""
+
+msgid "October"
+msgstr ""
+
+msgid "November"
+msgstr ""
+
+msgid "December"
+msgstr ""
+
 msgid "{{field}} cannot be blank"
 msgstr ""
 
diff --git a/src/CompositionRoot.ts b/src/CompositionRoot.ts
index 34d53586..a12f0ee3 100644
--- a/src/CompositionRoot.ts
+++ b/src/CompositionRoot.ts
@@ -4,11 +4,16 @@ import { DataValueExportJsonRepository } from "./data/repositories/DataValueExpo
 import { ExportDataElementJsonRepository } from "./data/repositories/ExportDataElementJsonRepository";
 import { ImportDataElementSpreadSheetRepository } from "./data/repositories/ImportDataElementSpreadSheetRepository";
 import { OrgUnitD2Repository } from "./data/repositories/OrgUnitD2Repository";
+import { UniqueBeneficiariesSettingsD2Repository } from "./data/repositories/UniqueBeneficiariesSettingsD2Repository";
+import { GetUniqueBeneficiariesSettingsUseCase } from "./domain/usecases/GetUniqueBeneficiariesSettingsUseCase";
 import { ImportDataElementsUseCase } from "./domain/usecases/ImportDataElementsUseCase";
+import { RemoveUniqueBeneficiariesPeriodUseCase } from "./domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase";
+import { SaveUniqueBeneficiariesSettingsUseCase } from "./domain/usecases/SaveUniqueBeneficiariesSettingsUseCase";
 import { Config } from "./models/Config";
 import { D2Api } from "./types/d2-api";
 
 export function getCompositionRoot(api: D2Api, config: Config) {
+    const uniqueBeneficiariesSettingsRepository = new UniqueBeneficiariesSettingsD2Repository(api);
     const dataValueRepository = new DataValueD2Repository(api);
     const dataElementRepository = new DataElementD2Repository(api, config);
     const importDataElementSpreadSheetRepository = new ImportDataElementSpreadSheetRepository(
@@ -30,6 +35,17 @@ export function getCompositionRoot(api: D2Api, config: Config) {
                 orgUnitRepository
             ),
         },
+        uniqueBeneficiaries: {
+            getSettings: new GetUniqueBeneficiariesSettingsUseCase(
+                uniqueBeneficiariesSettingsRepository
+            ),
+            saveSettings: new SaveUniqueBeneficiariesSettingsUseCase(
+                uniqueBeneficiariesSettingsRepository
+            ),
+            removePeriod: new RemoveUniqueBeneficiariesPeriodUseCase(
+                uniqueBeneficiariesSettingsRepository
+            ),
+        },
     };
 }
 
diff --git a/src/components/app/App.tsx b/src/components/app/App.tsx
index 2d2433f0..fa7d7022 100644
--- a/src/components/app/App.tsx
+++ b/src/components/app/App.tsx
@@ -26,6 +26,7 @@ import { useMigrations } from "../migrations/hooks";
 import { appConfig } from "../../app-config";
 import { isTest } from "../../utils/testing";
 import i18n from "../../locales";
+import { getCompositionRoot } from "../../CompositionRoot";
 
 const settingsQuery = { userSettings: { resource: "/userSettings" } };
 
@@ -51,6 +52,7 @@ const App: React.FC<AppProps> = props => {
             const config = await getConfig(api);
             const currentUser = new User(config);
             setUsername(currentUser.data.username);
+            const compositionRoot = getCompositionRoot(api, config);
             const appContext: AppContext = {
                 d2,
                 api,
@@ -60,6 +62,7 @@ const App: React.FC<AppProps> = props => {
                 isTest: isTest(),
                 appConfig,
                 dhis2Url,
+                compositionRoot,
             };
             setAppContext(appContext);
 
diff --git a/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx b/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx
new file mode 100644
index 00000000..449bfd6e
--- /dev/null
+++ b/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx
@@ -0,0 +1,86 @@
+import { ObjectsList, useObjectsTable, TableConfig } from "@eyeseetea/d2-ui-components";
+import DeleteIcon from "@material-ui/icons/Delete";
+import EditIcon from "@material-ui/icons/Edit";
+import React from "react";
+import {
+    UniqueBeneficiariesPeriods,
+    UniqueBeneficiariesPeriodsAttrs,
+} from "../../domain/entities/UniqueBeneficiariesPeriods";
+import i18n from "../../locales";
+
+export type ActionTable = { action: string; id: string };
+
+export type UniqueBeneficiariesTableProps = {
+    onChangeAction: (options: ActionTable) => void;
+    periods: UniqueBeneficiariesPeriods[];
+};
+
+export const UniqueBeneficiariesTable = React.memo((props: UniqueBeneficiariesTableProps) => {
+    const { onChangeAction, periods } = props;
+    const config = React.useMemo((): TableConfig<UniqueBeneficiariesPeriodsAttrs> => {
+        return {
+            onActionButtonClick: () => {
+                onChangeAction({ action: "add", id: "" });
+            },
+            actions: [
+                {
+                    name: "edit",
+                    text: i18n.t("Edit"),
+                    icon: <EditIcon />,
+                    isActive: showAction,
+                    onClick: ids => onChangeAction({ action: "edit", id: getFirstItem(ids) }),
+                },
+                {
+                    name: "remove",
+                    text: i18n.t("Delete"),
+                    icon: <DeleteIcon />,
+                    isActive: showAction,
+                    onClick: ids => onChangeAction({ action: "delete", id: getFirstItem(ids) }),
+                },
+            ],
+            columns: [
+                {
+                    name: "name",
+                    text: i18n.t("Name"),
+                    sortable: false,
+                },
+                {
+                    name: "startDateMonth",
+                    text: i18n.t("Start Month"),
+                    sortable: false,
+                },
+                {
+                    name: "endDateMonth",
+                    text: i18n.t("End Month"),
+                    sortable: false,
+                },
+            ],
+            initialSorting: { field: "name", order: "asc" },
+            paginationOptions: { pageSizeInitialValue: 100, pageSizeOptions: [100] },
+        };
+    }, [onChangeAction]);
+
+    const tableConfig = useObjectsTable(
+        config,
+        React.useCallback(() => {
+            return Promise.resolve({
+                objects: periods,
+                pager: { page: 1, pageCount: 1, total: periods.length, pageSize: 100 },
+            });
+        }, [periods])
+    );
+
+    return <ObjectsList {...tableConfig} onChangeSearch={undefined} />;
+});
+
+UniqueBeneficiariesTable.displayName = "UniqueBeneficiariesTable";
+
+function getFirstItem(values: string[]): string {
+    const value = values[0];
+    if (!value) throw new Error("Value is empty");
+    return value;
+}
+
+function showAction(rows: UniqueBeneficiariesPeriodsAttrs[]): boolean {
+    return rows.filter(row => !UniqueBeneficiariesPeriods.isProtected(row)).length === 1;
+}
diff --git a/src/contexts/api-context.ts b/src/contexts/api-context.ts
index f5352304..fb34696b 100644
--- a/src/contexts/api-context.ts
+++ b/src/contexts/api-context.ts
@@ -3,6 +3,7 @@ import React, { useContext } from "react";
 import { D2Api } from "../types/d2-api";
 import User from "../models/user";
 import { AppConfig } from "../components/app/AppConfig";
+import { CompositionRoot } from "../CompositionRoot";
 
 export interface AppContext {
     api: D2Api;
@@ -13,6 +14,7 @@ export interface AppContext {
     isDev: boolean;
     isTest: boolean;
     dhis2Url: string;
+    compositionRoot: CompositionRoot;
 }
 
 export type CurrentUser = AppContext["currentUser"];
diff --git a/src/data/repositories/ImportDataElementSpreadSheetRepository.ts b/src/data/repositories/ImportDataElementSpreadSheetRepository.ts
index 142ba7bf..0da58381 100644
--- a/src/data/repositories/ImportDataElementSpreadSheetRepository.ts
+++ b/src/data/repositories/ImportDataElementSpreadSheetRepository.ts
@@ -1,5 +1,5 @@
 import _ from "lodash";
-import xlsx from "xlsx";
+import * as XLSX from "xlsx";
 
 import { D2Api } from "../../types/d2-api";
 import { Config } from "../../models/Config";
@@ -317,13 +317,13 @@ export class ImportDataElementSpreadSheetRepository implements ImportDataElement
 
     private getDataElementFromSheet(path: string): DataElementExcel[] {
         const sheet = this.getSheetOrThrow(path, "CreateUpdate");
-        const excelRows = xlsx.utils.sheet_to_json<SpreadSheetRecord>(sheet);
+        const excelRows = XLSX.utils.sheet_to_json<SpreadSheetRecord>(sheet);
         return this.parseRecords(excelRows);
     }
 
     private getDataElementToRemoveFromSheet(path: string): Id[] {
         const sheet = this.getSheetOrThrow(path, "Delete");
-        const excelRows = xlsx.utils.sheet_to_json<SpreadSheetRecordRemove>(sheet);
+        const excelRows = XLSX.utils.sheet_to_json<SpreadSheetRecordRemove>(sheet);
         return this.parseRecordsToRemove(excelRows);
     }
 
@@ -332,7 +332,7 @@ export class ImportDataElementSpreadSheetRepository implements ImportDataElement
     }
 
     private getSheetOrThrow(path: string, sheetName: string) {
-        const excelFile = xlsx.readFile(path);
+        const excelFile = XLSX.readFile(path);
         const excelSheetName = excelFile.SheetNames.find(sn => sn === sheetName);
         if (!excelSheetName) throw Error(`Sheet not found: ${sheetName}`);
         const sheet = excelFile.Sheets[excelSheetName];
diff --git a/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts b/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
new file mode 100644
index 00000000..6fbb33f6
--- /dev/null
+++ b/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
@@ -0,0 +1,75 @@
+import { generateUid } from "d2/uid";
+import { Id } from "../../domain/entities/Ref";
+import { UniqueBeneficiariesPeriods } from "../../domain/entities/UniqueBeneficiariesPeriods";
+import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
+import { UniqueBeneficiariesSettingsRepository } from "../../domain/repositories/UniqueBeneficiariesSettingsRepository";
+import { D2Api, DataStore } from "../../types/d2-api";
+import { Maybe } from "../../types/utils";
+
+export class UniqueBeneficiariesSettingsD2Repository
+    implements UniqueBeneficiariesSettingsRepository
+{
+    private dataStore: DataStore;
+    constructor(private api: D2Api) {
+        this.dataStore = this.api.dataStore("data-management-app");
+    }
+
+    async get(projectId: Id): Promise<UniqueBeneficiariesSettings> {
+        const d2Response = await this.dataStore
+            .get<D2ProjectSettings>(this.buildKeyId(projectId))
+            .getData();
+
+        return {
+            projectId: projectId,
+            periods: this.mergeDefaultPeriodsWithExisting(d2Response?.uniqueBeneficiaries?.periods),
+        };
+    }
+
+    async save(settings: UniqueBeneficiariesSettings): Promise<void> {
+        const existingSettings = await this.dataStore
+            .get<D2ProjectSettings>(this.buildKeyId(settings.projectId))
+            .getData();
+
+        await this.dataStore
+            .save(this.buildKeyId(settings.projectId), {
+                ...existingSettings,
+                uniqueBeneficiaries: { periods: this.buildPeriods(settings.periods) },
+            })
+            .getData();
+    }
+
+    private buildPeriods(periods: UniqueBeneficiariesPeriods[]): UniqueBeneficiariesPeriods[] {
+        const periodsWithIds = this.validateIdsInPeriods(periods);
+        return this.excludeDefaultPeriods(periodsWithIds);
+    }
+
+    private validateIdsInPeriods(
+        periods: UniqueBeneficiariesPeriods[]
+    ): UniqueBeneficiariesPeriods[] {
+        return periods.map(period => {
+            if (!period.id) {
+                return UniqueBeneficiariesPeriods.build({ ...period, id: generateUid() }).get();
+            }
+            return period;
+        });
+    }
+
+    private buildKeyId(projectId: Id) {
+        return `project-${projectId}`;
+    }
+
+    private excludeDefaultPeriods(periods: UniqueBeneficiariesPeriods[]) {
+        return periods.filter(period => !UniqueBeneficiariesPeriods.isProtected(period));
+    }
+
+    private mergeDefaultPeriodsWithExisting(existingPeriods: Maybe<UniqueBeneficiariesPeriods[]>) {
+        const defaultData = UniqueBeneficiariesPeriods.defaultPeriods();
+        if (!existingPeriods) return defaultData;
+        return [
+            ...existingPeriods.map(period => UniqueBeneficiariesPeriods.build(period).get()),
+            ...defaultData,
+        ];
+    }
+}
+
+type D2ProjectSettings = { uniqueBeneficiaries?: { periods: UniqueBeneficiariesPeriods[] } };
diff --git a/src/domain/entities/UniqueBeneficiariesPeriods.ts b/src/domain/entities/UniqueBeneficiariesPeriods.ts
new file mode 100644
index 00000000..7f8c4166
--- /dev/null
+++ b/src/domain/entities/UniqueBeneficiariesPeriods.ts
@@ -0,0 +1,123 @@
+import _ from "lodash";
+
+import { Either } from "./generic/Either";
+import { ValidationError } from "./generic/Errors";
+import { Struct } from "./generic/Struct";
+import {
+    betweenValue,
+    periodsTypes,
+    validatePeriodType,
+    validateRequired,
+} from "./generic/Validations";
+
+export type PeriodType = typeof periodsTypes[number];
+
+export type UniqueBeneficiariesPeriodsAttrs = {
+    id: string;
+    name: string;
+    type: PeriodType;
+    startDateMonth: number;
+    endDateMonth: number;
+};
+
+export class UniqueBeneficiariesPeriods extends Struct<UniqueBeneficiariesPeriodsAttrs>() {
+    static build(
+        data: UniqueBeneficiariesPeriodsAttrs
+    ): Either<ValidationError<UniqueBeneficiariesPeriods>[], UniqueBeneficiariesPeriods> {
+        const errors = this.checkDataAndGetErrors(data);
+        if (errors.length > 0) {
+            return Either.error(errors);
+        }
+        return Either.success(UniqueBeneficiariesPeriods.create(data));
+    }
+
+    public static defaultPeriods(): UniqueBeneficiariesPeriods[] {
+        const yearlyPeriod = UniqueBeneficiariesPeriods.create({
+            id: "annual",
+            name: "Annual",
+            type: "ANNUAL",
+            startDateMonth: 1,
+            endDateMonth: 12,
+        });
+        const semiAnnualPeriod = UniqueBeneficiariesPeriods.create({
+            id: "semi-annual",
+            name: "Semi-annual",
+            type: "SEMIANNUAL",
+            startDateMonth: 1,
+            endDateMonth: 6,
+        });
+
+        return [semiAnnualPeriod, yearlyPeriod];
+    }
+
+    public static isProtected(data: UniqueBeneficiariesPeriodsAttrs): boolean {
+        return data.id === "annual" || data.id === "semi-annual";
+    }
+
+    public static initialPeriodData(): UniqueBeneficiariesPeriods {
+        return this.create({
+            endDateMonth: 12,
+            id: "",
+            name: "",
+            startDateMonth: 1,
+            type: "CUSTOM",
+        });
+    }
+
+    public static validate(data: UniqueBeneficiariesPeriodsAttrs): {
+        isValid: boolean;
+        errorMessage: string;
+    } {
+        const errors = this.checkDataAndGetErrors(data).filter(
+            validation => validation.errors.length > 0
+        );
+        return {
+            isValid: errors.length === 0,
+            errorMessage: errors.map(error => error.errors.join(", ")).join(", "),
+        };
+    }
+
+    private static checkDataAndGetErrors(
+        data: UniqueBeneficiariesPeriodsAttrs
+    ): ValidationError<UniqueBeneficiariesPeriods>[] {
+        const errors: ValidationError<UniqueBeneficiariesPeriods>[] = _([
+            {
+                property: "name" as const,
+                errors: validateRequired(data.name),
+                value: data.name,
+            },
+            {
+                property: "type" as const,
+                errors: validatePeriodType(data.type),
+                value: data.type,
+            },
+            {
+                property: "startDateMonth" as const,
+                errors: betweenValue(data.startDateMonth, 1, 12),
+                value: data.startDateMonth,
+            },
+            {
+                property: "endDateMonth" as const,
+                errors: betweenValue(data.endDateMonth, 1, 12),
+                value: data.endDateMonth,
+            },
+        ])
+            .filter(validation => validation.errors.length > 0)
+            .value();
+
+        return errors;
+    }
+
+    private static validateAndGetError(value: string | number, errorMessage: string): string {
+        const valueToValidate = String(value);
+        return valueToValidate.length === 0 ? errorMessage : "";
+    }
+
+    private static validateTypes(value: PeriodType, errorMessage: string): string {
+        return periodsTypes.includes(value) ? "" : errorMessage;
+    }
+
+    private static validateMonths(monthNumber: number, errorMessage: string): string {
+        return monthNumber >= 1 && monthNumber <= 12 ? "" : errorMessage;
+    }
+}
diff --git a/src/domain/entities/UniqueBeneficiariesSettings.ts b/src/domain/entities/UniqueBeneficiariesSettings.ts
new file mode 100644
index 00000000..2dde7137
--- /dev/null
+++ b/src/domain/entities/UniqueBeneficiariesSettings.ts
@@ -0,0 +1,4 @@
+import { Id } from "./Ref";
+import { UniqueBeneficiariesPeriods } from "./UniqueBeneficiariesPeriods";
+
+export type UniqueBeneficiariesSettings = { projectId: Id; periods: UniqueBeneficiariesPeriods[] };
diff --git a/src/domain/entities/generic/Either.ts b/src/domain/entities/generic/Either.ts
new file mode 100644
index 00000000..626f1588
--- /dev/null
+++ b/src/domain/entities/generic/Either.ts
@@ -0,0 +1,105 @@
+/**
+ * Either a success value or an error. Example:
+ *
+ * ```
+ * Either.success<{ message: string }, string>("9")
+ *     .map(s => parseInt(s))
+ *     .flatMap(x => {
+ *         return x > 0 ? Either.success(Math.sqrt(x)) : Either.error({ message: "negative!" });
+ *     })
+ *     .match({
+ *         success: x => console.log(`Value is ${x}`),
+ *         error: error => console.error(`Some error: ${error.message}`),
+ *     }); // prints `Value is 3`
+ * ```
+ */
+
+export class Either<Error, Data> {
+    constructor(public value: EitherValue<Error, Data>) {}
+
+    match<Res>(matchObj: MatchObject<Error, Data, Res>): Res {
+        switch (this.value.type) {
+            case "success":
+                return matchObj.success(this.value.data);
+            case "error":
+                return matchObj.error(this.value.error);
+        }
+    }
+
+    isError(): this is this & { value: EitherValueError<Error> } {
+        return this.value.type === "error";
+    }
+
+    isSuccess(): this is this & { value: EitherValueSuccess<Data> } {
+        return this.value.type === "success";
+    }
+
+    map<Data1>(fn: (data: Data) => Data1): Either<Error, Data1> {
+        return this.flatMap(data => new Either<Error, Data1>({ type: "success", data: fn(data) }));
+    }
+
+    mapError<Error1>(fn: (error: Error) => Error1): Either<Error1, Data> {
+        return this.flatMapError(
+            error => new Either<Error1, Data>({ type: "error", error: fn(error) })
+        );
+    }
+
+    flatMap<Data1>(fn: (data: Data) => Either<Error, Data1>): Either<Error, Data1> {
+        return this.match({
+            success: data => fn(data),
+            error: () => this as Either<Error, any>,
+        });
+    }
+
+    flatMapError<Error1>(fn: (error: Error) => Either<Error1, Data>): Either<Error1, Data> {
+        return this.match({
+            success: () => this as Either<any, Data>,
+            error: error => fn(error),
+        });
+    }
+
+    static error<Error>(error: Error) {
+        return new Either<Error, never>({ type: "error", error });
+    }
+
+    static success<Error, Data>(data: Data) {
+        return new Either<Error, Data>({ type: "success", data });
+    }
+
+    static map2<Error, Res, Data1, Data2>(
+        [either1, either2]: [Either<Error, Data1>, Either<Error, Data2>],
+        fn: (data1: Data1, data2: Data2) => Res
+    ): Either<Error, Res> {
+        return either1.flatMap<Res>(data1 => {
+            return either2.map<Res>(data2 => fn(data1, data2));
+        });
+    }
+
+    get(errorMessage?: string): Data {
+        return this.getOrThrow(errorMessage);
+    }
+
+    getOrThrow(errorMessage?: string): Data {
+        const throwFn = () => {
+            throw Error(
+                errorMessage
+                    ? errorMessage
+                    : "An error has ocurred retrieving value: " + JSON.stringify(this.value)
+            );
+        };
+
+        return this.match({
+            error: () => throwFn(),
+            success: value => value,
+        });
+    }
+}
+
+type EitherValueError<Error> = { type: "error"; error: Error; data?: never };
+type EitherValueSuccess<Data> = { type: "success"; error?: never; data: Data };
+type EitherValue<Error, Data> = EitherValueError<Error> | EitherValueSuccess<Data>;
+
+type MatchObject<Error, Data, Res> = {
+    success: (data: Data) => Res;
+    error: (error: Error) => Res;
+};
diff --git a/src/domain/entities/generic/Errors.ts b/src/domain/entities/generic/Errors.ts
new file mode 100644
index 00000000..ce875c77
--- /dev/null
+++ b/src/domain/entities/generic/Errors.ts
@@ -0,0 +1,34 @@
+import i18n from "../../../locales";
+
+export type ValidationErrorKey = "field_cannot_be_blank" | "not_in_list";
+
+export const validationErrorMessages: Record<
+    ValidationErrorKey,
+    (fieldName: string, value: unknown) => string
+> = {
+    field_cannot_be_blank: (fieldName: string) =>
+        i18n.t(`Cannot be blank: {{fieldName}}`, { fieldName: fieldName, nsSeparator: false }),
+    not_in_list: (fieldName: string, value: unknown) =>
+        i18n.t(`{{value}} is not a valid value for {{fieldName}}`, {
+            fieldName: fieldName,
+            value: value,
+            nsSeparator: false,
+        }),
+};
+
+export function getErrors<T>(errors: ValidationError<T>[]) {
+    return errors
+        .map(error => {
+            return error.errors.map(err =>
+                validationErrorMessages[err](error.property as string, error.value)
+            );
+        })
+        .flat()
+        .join("\n");
+}
+
+export type ValidationError<T> = {
+    property: keyof T;
+    value: unknown;
+    errors: ValidationErrorKey[];
+};
diff --git a/src/domain/entities/generic/Validations.ts b/src/domain/entities/generic/Validations.ts
new file mode 100644
index 00000000..8d84754e
--- /dev/null
+++ b/src/domain/entities/generic/Validations.ts
@@ -0,0 +1,18 @@
+import { PeriodType } from "../UniqueBeneficiariesPeriods";
+import { ValidationErrorKey } from "./Errors";
+
+export const periodsTypes = ["CUSTOM", "ANNUAL", "SEMIANNUAL"] as const;
+
+export function validateRequired(value: any): ValidationErrorKey[] {
+    const isBlank = !value || (value.length !== undefined && value.length === 0);
+
+    return isBlank ? ["field_cannot_be_blank"] : [];
+}
+
+export function validatePeriodType(periodType: PeriodType): ValidationErrorKey[] {
+    return periodsTypes.includes(periodType) ? [] : ["not_in_list"];
+}
+
+export function betweenValue(value: number, from: number, to: number): ValidationErrorKey[] {
+    return value >= from && value <= to ? [] : ["not_in_list"];
+}
diff --git a/src/domain/repositories/UniqueBeneficiariesSettingsRepository.ts b/src/domain/repositories/UniqueBeneficiariesSettingsRepository.ts
new file mode 100644
index 00000000..65cdc395
--- /dev/null
+++ b/src/domain/repositories/UniqueBeneficiariesSettingsRepository.ts
@@ -0,0 +1,7 @@
+import { Id } from "../entities/Ref";
+import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
+
+export interface UniqueBeneficiariesSettingsRepository {
+    get(projectId: Id): Promise<UniqueBeneficiariesSettings>;
+    save(settings: UniqueBeneficiariesSettings): Promise<void>;
+}
diff --git a/src/domain/usecases/GetUniqueBeneficiariesSettingsUseCase.ts b/src/domain/usecases/GetUniqueBeneficiariesSettingsUseCase.ts
new file mode 100644
index 00000000..39d14efa
--- /dev/null
+++ b/src/domain/usecases/GetUniqueBeneficiariesSettingsUseCase.ts
@@ -0,0 +1,11 @@
+import { Id } from "../entities/Ref";
+import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
+import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBeneficiariesSettingsRepository";
+
+export class GetUniqueBeneficiariesSettingsUseCase {
+    constructor(private uniqueBeneficiariesRepository: UniqueBeneficiariesSettingsRepository) {}
+
+    execute(id: Id): Promise<UniqueBeneficiariesSettings> {
+        return this.uniqueBeneficiariesRepository.get(id);
+    }
+}
diff --git a/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts b/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts
new file mode 100644
index 00000000..439f7caf
--- /dev/null
+++ b/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts
@@ -0,0 +1,26 @@
+import { UniqueBeneficiariesPeriods } from "../entities/UniqueBeneficiariesPeriods";
+import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
+import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBeneficiariesSettingsRepository";
+
+export class RemoveUniqueBeneficiariesPeriodUseCase {
+    constructor(private repository: UniqueBeneficiariesSettingsRepository) {}
+
+    async execute(options: Options): Promise<void> {
+        const settings = await this.repository.get(options.projectId);
+        const isPeriodProtected = UniqueBeneficiariesPeriods.isProtected(options.period);
+        if (isPeriodProtected) {
+            throw new Error("Cannot delete a protected period");
+        }
+        return this.save(settings, options);
+    }
+
+    private save(settings: UniqueBeneficiariesSettings, options: Options) {
+        const newSettings: UniqueBeneficiariesSettings = {
+            ...settings,
+            periods: settings.periods.filter(period => period.id !== options.period.id),
+        };
+        return this.repository.save(newSettings);
+    }
+}
+
+export type Options = { projectId: string; period: UniqueBeneficiariesPeriods };
diff --git a/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts b/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
new file mode 100644
index 00000000..987f59b7
--- /dev/null
+++ b/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
@@ -0,0 +1,56 @@
+import { UniqueBeneficiariesPeriods } from "../entities/UniqueBeneficiariesPeriods";
+import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
+import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBeneficiariesSettingsRepository";
+
+export class SaveUniqueBeneficiariesSettingsUseCase {
+    constructor(private repository: UniqueBeneficiariesSettingsRepository) {}
+
+    async execute(options: SaveSettingsOptions): Promise<void> {
+        const settings = await this.repository.get(options.projectId);
+        const periodExist = settings.periods.some(period => period.id === options.period.id);
+        const isPeriodProtected = UniqueBeneficiariesPeriods.isProtected(options.period);
+        const { isValid, errorMessage } = UniqueBeneficiariesPeriods.validate(options.period);
+        if (!isValid) {
+            throw new Error(errorMessage);
+        }
+        if (isPeriodProtected) {
+            throw new Error("Cannot save a protected period");
+        }
+        return this.saveSettings(settings, periodExist, options);
+    }
+
+    private saveSettings(
+        settings: UniqueBeneficiariesSettings,
+        periodExist: boolean,
+        options: SaveSettingsOptions
+    ) {
+        const newSettings: UniqueBeneficiariesSettings = {
+            ...settings,
+            periods: this.buildPeriodsToSave(settings.periods, options.period, periodExist),
+        };
+        return this.repository.save(newSettings);
+    }
+
+    private buildPeriodsToSave(
+        existingPeriods: UniqueBeneficiariesPeriods[],
+        currentPeriod: UniqueBeneficiariesPeriods,
+        periodExist: boolean
+    ): UniqueBeneficiariesPeriods[] {
+        const periodsToSave = periodExist
+            ? existingPeriods.map(period => {
+                  return period.id === currentPeriod.id ? currentPeriod : period;
+              })
+            : [...existingPeriods, currentPeriod];
+
+        if (!this.checkDuplicatesInPeriods(periodsToSave)) {
+            throw new Error("Cannot save duplicate periods");
+        }
+        return periodsToSave;
+    }
+
+    private checkDuplicatesInPeriods(periods: UniqueBeneficiariesPeriods[]): boolean {
+        return periods.length === new Set(periods.map(period => period.name)).size;
+    }
+}
+
+export type SaveSettingsOptions = { projectId: string; period: UniqueBeneficiariesPeriods };
diff --git a/src/models/user.ts b/src/models/user.ts
index 4538e9a0..7cc36424 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -18,7 +18,8 @@ export type Action =
     | "dataApproval"
     | "reopen"
     | "delete"
-    | "attachFiles";
+    | "attachFiles"
+    | "periods";
 
 const actionsByRole: Record<Role, Action[]> = {
     admin: [
@@ -36,6 +37,7 @@ const actionsByRole: Record<Role, Action[]> = {
         "accessMER",
         "reopen",
         "attachFiles",
+        "periods",
     ],
     dataReviewer: [
         "create",
diff --git a/src/pages/projects-list/ProjectsListConfig.tsx b/src/pages/projects-list/ProjectsListConfig.tsx
index fba60407..70bc36ee 100644
--- a/src/pages/projects-list/ProjectsListConfig.tsx
+++ b/src/pages/projects-list/ProjectsListConfig.tsx
@@ -112,6 +112,14 @@ export function getComponentConfig(
     ];
 
     const allActions: Record<ContextualAction, TableAction<ProjectForList>> = {
+        periods: {
+            name: "periods",
+            text: i18n.t("Manage Unique Beneficiaries Periods"),
+            icon: <Icon>date_range</Icon>,
+            multiple: false,
+            primary: true,
+            onClick: (ids: Id[]) => onFirst(ids, id => goTo("uniqueBeneficiariesPeriods", { id })),
+        },
         details: {
             name: "details",
             text: i18n.t("Details"),
diff --git a/src/pages/root/Root.tsx b/src/pages/root/Root.tsx
index ad4cef69..04490717 100644
--- a/src/pages/root/Root.tsx
+++ b/src/pages/root/Root.tsx
@@ -12,6 +12,7 @@ import ProjectDashboard from "../dashboard/ProjectDashboard";
 import CountryDashboard from "../dashboard/CountryDashboard";
 import AwardNumberDashboard from "../dashboard/AwardNumberDashboard";
 import { LastLocationProvider } from "react-router-last-location";
+import { UniqueBeneficiariesPeriodsPage } from "../unique-periods/UniqueBeneficiariesPeriodsPage";
 
 const Root = () => {
     const idParam = { id: ":id" };
@@ -73,6 +74,11 @@ const Root = () => {
                         path={generateUrl("dataApproval", { id: ":id" })}
                         render={() => <DataApproval />}
                     />
+                    <Route
+                        path={generateUrl("uniqueBeneficiariesPeriods", { id: ":id" })}
+                        render={() => <UniqueBeneficiariesPeriodsPage />}
+                    />
+
                     <Route path={generateUrl("countries")} render={() => <CountriesList />} />
 
                     <Route render={() => <ProjectsList />} />
diff --git a/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx b/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
new file mode 100644
index 00000000..1a7613dc
--- /dev/null
+++ b/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
@@ -0,0 +1,150 @@
+import React from "react";
+import { ConfirmationDialog, useLoading, useSnackbar } from "@eyeseetea/d2-ui-components";
+import { Dialog, DialogContent, DialogTitle } from "@material-ui/core";
+import { useHistory, useParams } from "react-router-dom";
+import PageHeader from "../../components/page-header/PageHeader";
+import {
+    ActionTable,
+    UniqueBeneficiariesTable,
+} from "../../components/unique-beneficiaries/UniqueBeneficiariesTable";
+import { useAppContext } from "../../contexts/api-context";
+import { Ref } from "../../domain/entities/Ref";
+import {
+    UniqueBeneficiariesPeriods,
+    UniqueBeneficiariesPeriodsAttrs,
+} from "../../domain/entities/UniqueBeneficiariesPeriods";
+import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
+import i18n from "../../locales";
+import { UniquePeriodsForm } from "./UniquePeriodsForm";
+
+export const UniqueBeneficiariesPeriodsPage = React.memo(() => {
+    const { compositionRoot } = useAppContext();
+    const { id } = useParams<Ref>();
+    const history = useHistory();
+    const snackbar = useSnackbar();
+    const loading = useLoading();
+    const [settings, setSettings] = React.useState<UniqueBeneficiariesSettings>();
+    const [savePeriodModal, setSavePeriodModal] = React.useState(false);
+    const [deleteModal, setDeleteModal] = React.useState(false);
+    const [selectedPeriod, setSelectedPeriod] = React.useState<UniqueBeneficiariesPeriodsAttrs>();
+    const [refresh, setRefresh] = React.useState(1);
+
+    React.useEffect(() => {
+        loading.show(true, i18n.t("Loading Periods..."));
+        compositionRoot.uniqueBeneficiaries.getSettings
+            .execute(id)
+            .then(setSettings, err => {
+                snackbar.error(err.message);
+            })
+            .finally(() => loading.hide());
+    }, [compositionRoot.uniqueBeneficiaries.getSettings, loading, snackbar, id, refresh]);
+
+    const openSavePeriodDialog = React.useCallback(
+        (options: ActionTable) => {
+            setSelectedPeriod(settings?.periods.find(period => period.id === options.id));
+            if (options.action === "add" || options.action === "edit") {
+                setSavePeriodModal(true);
+            } else if (options.action === "delete") {
+                setDeleteModal(true);
+            }
+        },
+        [settings?.periods]
+    );
+
+    const savePeriod = React.useCallback(
+        (periodData: UniqueBeneficiariesPeriods) => {
+            loading.show(true, i18n.t("Saving Period..."));
+            compositionRoot.uniqueBeneficiaries.saveSettings
+                .execute({ period: periodData, projectId: id })
+                .then(() => {
+                    snackbar.success(i18n.t("Period saved successfully"));
+                    setRefresh(refresh + 1);
+                    setSavePeriodModal(false);
+                    setSelectedPeriod(undefined);
+                })
+                .catch(err => {
+                    snackbar.error(err.message);
+                })
+                .finally(() => {
+                    loading.hide();
+                });
+        },
+        [compositionRoot.uniqueBeneficiaries.saveSettings, id, loading, refresh, snackbar]
+    );
+
+    const removePeriod = React.useCallback(() => {
+        if (!selectedPeriod) return;
+        const period = UniqueBeneficiariesPeriods.build(selectedPeriod).get();
+        loading.show(true, i18n.t("Removing Period..."));
+        compositionRoot.uniqueBeneficiaries.removePeriod
+            .execute({ projectId: id, period })
+            .then(() => {
+                setRefresh(refresh + 1);
+                snackbar.success(i18n.t("Period removed successfully"));
+            })
+            .catch(err => {
+                snackbar.error(err.message);
+            })
+            .finally(() => {
+                setDeleteModal(false);
+                setSelectedPeriod(undefined);
+                loading.hide();
+            });
+    }, [
+        compositionRoot.uniqueBeneficiaries.removePeriod,
+        id,
+        loading,
+        refresh,
+        selectedPeriod,
+        snackbar,
+    ]);
+
+    return (
+        <div>
+            <PageHeader
+                title={i18n.t("Unique Beneficiaries Periods")}
+                onBackClick={() => history.push("/")}
+            />
+
+            <UniqueBeneficiariesTable
+                periods={settings?.periods || []}
+                onChangeAction={openSavePeriodDialog}
+            />
+
+            <Dialog open={savePeriodModal}>
+                <DialogTitle>
+                    {i18n.t("{{actionPeriod}} Period", {
+                        actionPeriod: selectedPeriod ? i18n.t("Edit") : i18n.t("Create"),
+                    })}
+                </DialogTitle>
+                <DialogContent>
+                    <UniquePeriodsForm
+                        existingPeriod={selectedPeriod}
+                        onSubmit={savePeriod}
+                        onClose={() => {
+                            setSavePeriodModal(false);
+                            setSelectedPeriod(undefined);
+                        }}
+                    />
+                </DialogContent>
+            </Dialog>
+
+            <ConfirmationDialog
+                open={deleteModal}
+                onSave={removePeriod}
+                title={i18n.t("Are you sure you want to delete the period: {{period}}?", {
+                    nsSeparator: false,
+                    period: selectedPeriod?.name,
+                })}
+                onCancel={() => {
+                    setDeleteModal(false);
+                    setSelectedPeriod(undefined);
+                }}
+                saveText={i18n.t("Delete")}
+                cancelText={i18n.t("Cancel")}
+            />
+        </div>
+    );
+});
+
+UniqueBeneficiariesPeriodsPage.displayName = "UniqueBeneficiariesPeriodsPage";
diff --git a/src/pages/unique-periods/UniquePeriodsForm.tsx b/src/pages/unique-periods/UniquePeriodsForm.tsx
new file mode 100644
index 00000000..50ca2a87
--- /dev/null
+++ b/src/pages/unique-periods/UniquePeriodsForm.tsx
@@ -0,0 +1,119 @@
+import React from "react";
+import { Dropdown, useSnackbar } from "@eyeseetea/d2-ui-components";
+import { Button, TextField } from "@material-ui/core";
+import { makeStyles, createStyles } from "@material-ui/styles";
+
+import {
+    UniqueBeneficiariesPeriods,
+    UniqueBeneficiariesPeriodsAttrs,
+} from "../../domain/entities/UniqueBeneficiariesPeriods";
+import i18n from "../../locales";
+import { Maybe } from "../../types/utils";
+import { getErrors } from "../../domain/entities/generic/Errors";
+
+export type UniquePeriodsFormProps = {
+    existingPeriod?: UniqueBeneficiariesPeriodsAttrs;
+    onClose: () => void;
+    onSubmit: (uniquePeriods: UniqueBeneficiariesPeriods) => void;
+};
+
+const months = [
+    { value: "1", text: i18n.t("January") },
+    { value: "2", text: i18n.t("February") },
+    { value: "3", text: i18n.t("March") },
+    { value: "4", text: i18n.t("April") },
+    { value: "5", text: i18n.t("May") },
+    { value: "6", text: i18n.t("June") },
+    { value: "7", text: i18n.t("July") },
+    { value: "8", text: i18n.t("August") },
+    { value: "9", text: i18n.t("September") },
+    { value: "10", text: i18n.t("October") },
+    { value: "11", text: i18n.t("November") },
+    { value: "12", text: i18n.t("December") },
+];
+
+function getValueByAttribute(
+    value: string,
+    attribute: keyof UniqueBeneficiariesPeriods
+): number | string {
+    if (attribute === "endDateMonth" || attribute === "startDateMonth") {
+        return Number(value);
+    } else {
+        return value;
+    }
+}
+
+export const UniquePeriodsForm = React.memo((props: UniquePeriodsFormProps) => {
+    const { existingPeriod, onClose, onSubmit } = props;
+    const snackbar = useSnackbar();
+    const classes = useStyles();
+    const [uniquePeriod, setUniquePeriod] = React.useState<UniqueBeneficiariesPeriodsAttrs>(
+        existingPeriod || UniqueBeneficiariesPeriods.initialPeriodData()
+    );
+
+    const validateAndSubmit = React.useCallback(
+        (e: React.FormEvent) => {
+            e.preventDefault();
+            UniqueBeneficiariesPeriods.build(uniquePeriod).match({
+                success: period => onSubmit(period),
+                error: errors => {
+                    const errorMessage = getErrors(errors);
+                    snackbar.error(errorMessage, { autoHideDuration: 3000 });
+                },
+            });
+        },
+        [onSubmit, snackbar, uniquePeriod]
+    );
+
+    const updatePeriod = React.useCallback(
+        (value: Maybe<string>, attribute: keyof UniqueBeneficiariesPeriods) => {
+            setUniquePeriod(prev => {
+                if (!prev) return prev;
+                return { ...prev, [attribute]: getValueByAttribute(value || "", attribute) };
+            });
+        },
+        []
+    );
+
+    return (
+        <form className={classes.form} onSubmit={validateAndSubmit}>
+            <TextField
+                placeholder={i18n.t("Name")}
+                onChange={event => updatePeriod(event.target.value, "name")}
+                value={uniquePeriod.name}
+            />
+            <Dropdown
+                hideEmpty
+                items={months}
+                label={i18n.t("Start Month")}
+                onChange={value => updatePeriod(value, "startDateMonth")}
+                value={uniquePeriod.startDateMonth.toString()}
+            />
+            <Dropdown
+                hideEmpty
+                items={months}
+                label={i18n.t("End Month")}
+                onChange={value => updatePeriod(value, "endDateMonth")}
+                value={uniquePeriod.endDateMonth.toString()}
+            />
+
+            <section className={classes.buttonContainer}>
+                <Button variant="contained" color="primary" type="submit">
+                    {i18n.t("Save")}
+                </Button>
+                <Button variant="outlined" color="secondary" type="button" onClick={onClose}>
+                    {i18n.t("Cancel")}
+                </Button>
+            </section>
+        </form>
+    );
+});
+
+const useStyles = makeStyles(() =>
+    createStyles({
+        form: { display: "flex", flexDirection: "column", gap: "1rem" },
+        buttonContainer: { display: "flex", alignItems: "center", justifyContent: "space-between" },
+    })
+);
+
+UniquePeriodsForm.displayName = "UniquePeriodsForm";
diff --git a/src/router.ts b/src/router.ts
index c9a9897c..a7ce90e0 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -15,6 +15,7 @@ const routes = {
     countryDashboard: ({ id }: { id: string }) => `/country-dashboard/${id}`,
     dataApproval: dataApproval,
     countries: () => `/countries`,
+    uniqueBeneficiariesPeriods: ({ id }: { id: string }) => `/unique-beneficiaries-periods/${id}`,
 };
 
 type Routes = typeof routes;

From 62ba313d76c34ab99c31c085fcc8bdcf81fd356e Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Tue, 22 Oct 2024 20:05:41 -0500
Subject: [PATCH 14/51] add unique indicators step

---
 i18n/en.pot                                   | 30 ++++++++++++-
 .../data-elements/DataElementsFilters.tsx     |  3 +-
 .../steps/data-elements/DataElementsStep.tsx  |  5 ++-
 .../steps/data-elements/DataElementsTable.tsx |  4 +-
 src/components/steps/save/SaveStep.tsx        | 11 ++++-
 .../UniqueIndicatorsStep.tsx                  | 24 ++++++++++
 .../UniqueBeneficiariesTable.tsx              |  8 ++--
 ...UniqueBeneficiariesSettingsD2Repository.ts | 27 ++++++-----
 ...eriods.ts => UniqueBeneficiariesPeriod.ts} | 18 ++++----
 .../entities/UniqueBeneficiariesSettings.ts   |  4 +-
 src/domain/entities/generic/Validations.ts    |  2 +-
 .../RemoveUniqueBeneficiariesPeriodUseCase.ts |  6 +--
 .../SaveUniqueBeneficiariesSettingsUseCase.ts | 16 +++----
 src/models/MerReport.ts                       |  1 +
 src/models/Project.ts                         | 34 +++++++++++++-
 src/models/ProjectDb.ts                       | 45 ++++++++++++++++---
 src/models/ProjectInfo.ts                     |  4 +-
 src/models/dataElementsSet.ts                 |  1 -
 src/models/user.ts                            |  9 +++-
 src/pages/project-wizard/ProjectWizard.tsx    |  8 ++++
 src/pages/project-wizard/help-texts.tsx       |  3 ++
 .../projects-list/ProjectsListConfig.tsx      |  7 +++
 .../UniqueBeneficiariesPeriodsPage.tsx        | 10 ++---
 .../unique-periods/UniquePeriodsForm.tsx      | 14 +++---
 src/router.ts                                 |  1 +
 25 files changed, 223 insertions(+), 72 deletions(-)
 create mode 100644 src/components/steps/unique-beneficiaries/UniqueIndicatorsStep.tsx
 rename src/domain/entities/{UniqueBeneficiariesPeriods.ts => UniqueBeneficiariesPeriod.ts} (85%)

diff --git a/i18n/en.pot b/i18n/en.pot
index 2a80ceda..a061bba7 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-10-18T23:21:33.588Z\n"
-"PO-Revision-Date: 2024-10-18T23:21:33.588Z\n"
+"POT-Creation-Date: 2024-10-22T23:20:24.479Z\n"
+"PO-Revision-Date: 2024-10-22T23:20:24.479Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -535,6 +535,9 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
+msgid "Unique Indicators"
+msgstr ""
+
 msgid "Award Number should be a number of 5 digits"
 msgstr ""
 
@@ -699,6 +702,9 @@ msgstr ""
 msgid "MER"
 msgstr ""
 
+msgid "Unique Beneficiary"
+msgstr ""
+
 msgid "[SP Platform] Request for Data Review: {{-name}} ({{code}})"
 msgstr ""
 
@@ -947,6 +953,9 @@ msgstr ""
 msgid "Selection of MER Indicators"
 msgstr ""
 
+msgid "Select of Unique Indicators"
+msgstr ""
+
 msgid "Username Access"
 msgstr ""
 
@@ -1005,6 +1014,11 @@ msgid ""
 "         - Up to three sectors and three indicators per sectors."
 msgstr ""
 
+msgid ""
+"Select indicators in each project that represent unique beneficiaries in "
+"the project"
+msgstr ""
+
 msgid ""
 "For activity indicators that include a response to COVID-19 (examples: "
 "COVID-19 messaging, COVID-19 specific healthcare worker trainings, etc.), "
@@ -1039,6 +1053,9 @@ msgstr ""
 msgid "API Link"
 msgstr ""
 
+msgid "Project Indicators Validation"
+msgstr ""
+
 msgid "Manage Unique Beneficiaries Periods"
 msgstr ""
 
@@ -1158,6 +1175,12 @@ msgstr ""
 msgid "Period saved successfully"
 msgstr ""
 
+msgid "Removing Period..."
+msgstr ""
+
+msgid "Period removed successfully"
+msgstr ""
+
 msgid "Unique Beneficiaries Periods"
 msgstr ""
 
@@ -1167,6 +1190,9 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
+msgid "Are you sure you want to delete the period: {{period}}?"
+msgstr ""
+
 msgid "January"
 msgstr ""
 
diff --git a/src/components/steps/data-elements/DataElementsFilters.tsx b/src/components/steps/data-elements/DataElementsFilters.tsx
index a8003ca1..f9e54164 100644
--- a/src/components/steps/data-elements/DataElementsFilters.tsx
+++ b/src/components/steps/data-elements/DataElementsFilters.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { indicatorTypes, IndicatorType } from "../../../models/dataElementsSet";
+import { indicatorTypes, IndicatorType, PeopleOrBenefit } from "../../../models/dataElementsSet";
 import Dropdown from "../../dropdown/Dropdown";
 import i18n from "../../../locales";
 import { Checkbox, FormControlLabel } from "@material-ui/core";
@@ -21,6 +21,7 @@ export interface Filter {
     indicatorType?: IndicatorType;
     onlySelected?: boolean;
     external?: string;
+    peopleOrBenefit?: PeopleOrBenefit;
 }
 
 export interface FilterOptions {
diff --git a/src/components/steps/data-elements/DataElementsStep.tsx b/src/components/steps/data-elements/DataElementsStep.tsx
index 2b927726..fbbbe1e2 100644
--- a/src/components/steps/data-elements/DataElementsStep.tsx
+++ b/src/components/steps/data-elements/DataElementsStep.tsx
@@ -5,14 +5,16 @@ import { Id } from "../../../types/d2-api";
 import DataElementsSet, { ProjectSelection } from "../../../models/dataElementsSet";
 import SectionsSidebar from "../../sections-sidebar/SectionsSidebar";
 import { useSectionsSidebar } from "../../sections-sidebar/sections-sidebar-hooks";
+import { Filter } from "./DataElementsFilters";
 
 export interface DataElementsStepProps extends StepProps {
     onSelect(sectorId: Id, dataElementIds: Id[]): ProjectSelection;
     dataElementsSet: DataElementsSet;
+    initialFilters?: Filter;
 }
 
 const DataElementsStep: React.FC<DataElementsStepProps> = props => {
-    const { onChange, project, dataElementsSet, onSelect } = props;
+    const { onChange, project, dataElementsSet, onSelect, initialFilters } = props;
     const { items, sectorId, setSector, onSectorsMatchChange } = useSectionsSidebar(project);
 
     const onSelectionChange = React.useCallback(
@@ -36,6 +38,7 @@ const DataElementsStep: React.FC<DataElementsStepProps> = props => {
                 sectorId={sectorId}
                 onSelectionChange={onSelectionChange}
                 columns={initialColumns}
+                initialFilters={initialFilters}
             />
         </SectionsSidebar>
     );
diff --git a/src/components/steps/data-elements/DataElementsTable.tsx b/src/components/steps/data-elements/DataElementsTable.tsx
index fca8d5bf..111e1ad3 100644
--- a/src/components/steps/data-elements/DataElementsTable.tsx
+++ b/src/components/steps/data-elements/DataElementsTable.tsx
@@ -37,6 +37,7 @@ export interface DataElementsTableProps {
     actions?: TableAction<DataElement>[];
     visibleFilters?: FilterKey[];
     onSectorsMatchChange(matches: Record<Id, number | undefined>): void;
+    initialFilters?: Filter;
 }
 
 const paginationOptions = {
@@ -88,9 +89,10 @@ const DataElementsTable: React.FC<DataElementsTableProps> = props => {
         customColumns,
         actions,
         onSectorsMatchChange,
+        initialFilters = {},
     } = props;
     const snackbar = useSnackbar();
-    const [filter, setFilter] = useState<Filter>({});
+    const [filter, setFilter] = useState<Filter>(initialFilters);
 
     const resetKey = { onlySelected, ...filter, sectorId };
 
diff --git a/src/components/steps/save/SaveStep.tsx b/src/components/steps/save/SaveStep.tsx
index 2287fc0e..d20a82a6 100644
--- a/src/components/steps/save/SaveStep.tsx
+++ b/src/components/steps/save/SaveStep.tsx
@@ -123,11 +123,12 @@ const NodeList: React.FC<{ nodes: ProjectInfoNode[] }> = props => {
 
     return (
         <ul>
-            {nodes.map(node => {
+            {nodes.map((node, index) => {
                 switch (node.type) {
                     case "field":
                         return (
                             <LiEntry
+                                key={index}
                                 label={node.name}
                                 value={node.value}
                                 prevValue={node.prevValue}
@@ -137,6 +138,7 @@ const NodeList: React.FC<{ nodes: ProjectInfoNode[] }> = props => {
                     case "value":
                         return (
                             <LiEntry
+                                key={index}
                                 label={undefined}
                                 value={node.value}
                                 prevValue={node.prevValue}
@@ -145,7 +147,12 @@ const NodeList: React.FC<{ nodes: ProjectInfoNode[] }> = props => {
                         );
                     case "section":
                         return (
-                            <LiEntry label={node.title} value={undefined} action={node.action}>
+                            <LiEntry
+                                key={index}
+                                label={node.title}
+                                value={undefined}
+                                action={node.action}
+                            >
                                 <NodeList nodes={node.children} />
                             </LiEntry>
                         );
diff --git a/src/components/steps/unique-beneficiaries/UniqueIndicatorsStep.tsx b/src/components/steps/unique-beneficiaries/UniqueIndicatorsStep.tsx
new file mode 100644
index 00000000..04eb31b6
--- /dev/null
+++ b/src/components/steps/unique-beneficiaries/UniqueIndicatorsStep.tsx
@@ -0,0 +1,24 @@
+import React from "react";
+import { StepProps } from "../../../pages/project-wizard/ProjectWizard";
+import DataElementsStep, { DataElementsStepProps } from "../data-elements/DataElementsStep";
+
+const UniqueIndicatorsStep: React.FC<StepProps> = props => {
+    const { project } = props;
+    const getSelection: DataElementsStepProps["onSelect"] = React.useCallback(
+        (sectorId, dataElementIds) => {
+            return project.updateUniqueBeneficiariesSelection(sectorId, dataElementIds);
+        },
+        [project]
+    );
+
+    return (
+        <DataElementsStep
+            {...props}
+            onSelect={getSelection}
+            dataElementsSet={project.uniqueIndicators}
+            initialFilters={{ peopleOrBenefit: "people" }}
+        />
+    );
+};
+
+export default React.memo(UniqueIndicatorsStep);
diff --git a/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx b/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx
index 449bfd6e..417a754e 100644
--- a/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx
+++ b/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx
@@ -3,16 +3,16 @@ import DeleteIcon from "@material-ui/icons/Delete";
 import EditIcon from "@material-ui/icons/Edit";
 import React from "react";
 import {
-    UniqueBeneficiariesPeriods,
+    UniqueBeneficiariesPeriod,
     UniqueBeneficiariesPeriodsAttrs,
-} from "../../domain/entities/UniqueBeneficiariesPeriods";
+} from "../../domain/entities/UniqueBeneficiariesPeriod";
 import i18n from "../../locales";
 
 export type ActionTable = { action: string; id: string };
 
 export type UniqueBeneficiariesTableProps = {
     onChangeAction: (options: ActionTable) => void;
-    periods: UniqueBeneficiariesPeriods[];
+    periods: UniqueBeneficiariesPeriod[];
 };
 
 export const UniqueBeneficiariesTable = React.memo((props: UniqueBeneficiariesTableProps) => {
@@ -82,5 +82,5 @@ function getFirstItem(values: string[]): string {
 }
 
 function showAction(rows: UniqueBeneficiariesPeriodsAttrs[]): boolean {
-    return rows.filter(row => !UniqueBeneficiariesPeriods.isProtected(row)).length === 1;
+    return rows.filter(row => !UniqueBeneficiariesPeriod.isProtected(row)).length === 1;
 }
diff --git a/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts b/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
index 6fbb33f6..86637ccd 100644
--- a/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
+++ b/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
@@ -1,6 +1,6 @@
 import { generateUid } from "d2/uid";
 import { Id } from "../../domain/entities/Ref";
-import { UniqueBeneficiariesPeriods } from "../../domain/entities/UniqueBeneficiariesPeriods";
+import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
 import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
 import { UniqueBeneficiariesSettingsRepository } from "../../domain/repositories/UniqueBeneficiariesSettingsRepository";
 import { D2Api, DataStore } from "../../types/d2-api";
@@ -33,22 +33,25 @@ export class UniqueBeneficiariesSettingsD2Repository
         await this.dataStore
             .save(this.buildKeyId(settings.projectId), {
                 ...existingSettings,
-                uniqueBeneficiaries: { periods: this.buildPeriods(settings.periods) },
+                uniqueBeneficiaries: {
+                    ...(existingSettings?.uniqueBeneficiaries || {}),
+                    periods: this.buildPeriods(settings.periods),
+                },
             })
             .getData();
     }
 
-    private buildPeriods(periods: UniqueBeneficiariesPeriods[]): UniqueBeneficiariesPeriods[] {
+    private buildPeriods(periods: UniqueBeneficiariesPeriod[]): UniqueBeneficiariesPeriod[] {
         const periodsWithIds = this.validateIdsInPeriods(periods);
         return this.excludeDefaultPeriods(periodsWithIds);
     }
 
     private validateIdsInPeriods(
-        periods: UniqueBeneficiariesPeriods[]
-    ): UniqueBeneficiariesPeriods[] {
+        periods: UniqueBeneficiariesPeriod[]
+    ): UniqueBeneficiariesPeriod[] {
         return periods.map(period => {
             if (!period.id) {
-                return UniqueBeneficiariesPeriods.build({ ...period, id: generateUid() }).get();
+                return UniqueBeneficiariesPeriod.build({ ...period, id: generateUid() }).get();
             }
             return period;
         });
@@ -58,18 +61,18 @@ export class UniqueBeneficiariesSettingsD2Repository
         return `project-${projectId}`;
     }
 
-    private excludeDefaultPeriods(periods: UniqueBeneficiariesPeriods[]) {
-        return periods.filter(period => !UniqueBeneficiariesPeriods.isProtected(period));
+    private excludeDefaultPeriods(periods: UniqueBeneficiariesPeriod[]) {
+        return periods.filter(period => !UniqueBeneficiariesPeriod.isProtected(period));
     }
 
-    private mergeDefaultPeriodsWithExisting(existingPeriods: Maybe<UniqueBeneficiariesPeriods[]>) {
-        const defaultData = UniqueBeneficiariesPeriods.defaultPeriods();
+    private mergeDefaultPeriodsWithExisting(existingPeriods: Maybe<UniqueBeneficiariesPeriod[]>) {
+        const defaultData = UniqueBeneficiariesPeriod.defaultPeriods();
         if (!existingPeriods) return defaultData;
         return [
-            ...existingPeriods.map(period => UniqueBeneficiariesPeriods.build(period).get()),
+            ...existingPeriods.map(period => UniqueBeneficiariesPeriod.build(period).get()),
             ...defaultData,
         ];
     }
 }
 
-type D2ProjectSettings = { uniqueBeneficiaries?: { periods: UniqueBeneficiariesPeriods[] } };
+type D2ProjectSettings = { uniqueBeneficiaries?: { periods: UniqueBeneficiariesPeriod[] } };
diff --git a/src/domain/entities/UniqueBeneficiariesPeriods.ts b/src/domain/entities/UniqueBeneficiariesPeriod.ts
similarity index 85%
rename from src/domain/entities/UniqueBeneficiariesPeriods.ts
rename to src/domain/entities/UniqueBeneficiariesPeriod.ts
index 7f8c4166..b90a9749 100644
--- a/src/domain/entities/UniqueBeneficiariesPeriods.ts
+++ b/src/domain/entities/UniqueBeneficiariesPeriod.ts
@@ -20,26 +20,26 @@ export type UniqueBeneficiariesPeriodsAttrs = {
     endDateMonth: number;
 };
 
-export class UniqueBeneficiariesPeriods extends Struct<UniqueBeneficiariesPeriodsAttrs>() {
+export class UniqueBeneficiariesPeriod extends Struct<UniqueBeneficiariesPeriodsAttrs>() {
     static build(
         data: UniqueBeneficiariesPeriodsAttrs
-    ): Either<ValidationError<UniqueBeneficiariesPeriods>[], UniqueBeneficiariesPeriods> {
+    ): Either<ValidationError<UniqueBeneficiariesPeriod>[], UniqueBeneficiariesPeriod> {
         const errors = this.checkDataAndGetErrors(data);
         if (errors.length > 0) {
             return Either.error(errors);
         }
-        return Either.success(UniqueBeneficiariesPeriods.create(data));
+        return Either.success(UniqueBeneficiariesPeriod.create(data));
     }
 
-    public static defaultPeriods(): UniqueBeneficiariesPeriods[] {
-        const yearlyPeriod = UniqueBeneficiariesPeriods.create({
+    public static defaultPeriods(): UniqueBeneficiariesPeriod[] {
+        const yearlyPeriod = UniqueBeneficiariesPeriod.create({
             id: "annual",
             name: "Annual",
             type: "ANNUAL",
             startDateMonth: 1,
             endDateMonth: 12,
         });
-        const semiAnnualPeriod = UniqueBeneficiariesPeriods.create({
+        const semiAnnualPeriod = UniqueBeneficiariesPeriod.create({
             id: "semi-annual",
             name: "Semi-annual",
             type: "SEMIANNUAL",
@@ -54,7 +54,7 @@ export class UniqueBeneficiariesPeriods extends Struct<UniqueBeneficiariesPeriod
         return data.id === "annual" || data.id === "semi-annual";
     }
 
-    public static initialPeriodData(): UniqueBeneficiariesPeriods {
+    public static initialPeriodData(): UniqueBeneficiariesPeriod {
         return this.create({
             endDateMonth: 12,
             id: "",
@@ -79,8 +79,8 @@ export class UniqueBeneficiariesPeriods extends Struct<UniqueBeneficiariesPeriod
 
     private static checkDataAndGetErrors(
         data: UniqueBeneficiariesPeriodsAttrs
-    ): ValidationError<UniqueBeneficiariesPeriods>[] {
-        const errors: ValidationError<UniqueBeneficiariesPeriods>[] = _([
+    ): ValidationError<UniqueBeneficiariesPeriod>[] {
+        const errors: ValidationError<UniqueBeneficiariesPeriod>[] = _([
             {
                 property: "name" as const,
                 errors: validateRequired(data.name),
diff --git a/src/domain/entities/UniqueBeneficiariesSettings.ts b/src/domain/entities/UniqueBeneficiariesSettings.ts
index 2dde7137..f6a6b148 100644
--- a/src/domain/entities/UniqueBeneficiariesSettings.ts
+++ b/src/domain/entities/UniqueBeneficiariesSettings.ts
@@ -1,4 +1,4 @@
 import { Id } from "./Ref";
-import { UniqueBeneficiariesPeriods } from "./UniqueBeneficiariesPeriods";
+import { UniqueBeneficiariesPeriod } from "./UniqueBeneficiariesPeriod";
 
-export type UniqueBeneficiariesSettings = { projectId: Id; periods: UniqueBeneficiariesPeriods[] };
+export type UniqueBeneficiariesSettings = { projectId: Id; periods: UniqueBeneficiariesPeriod[] };
diff --git a/src/domain/entities/generic/Validations.ts b/src/domain/entities/generic/Validations.ts
index 8d84754e..416d3e71 100644
--- a/src/domain/entities/generic/Validations.ts
+++ b/src/domain/entities/generic/Validations.ts
@@ -1,4 +1,4 @@
-import { PeriodType } from "../UniqueBeneficiariesPeriods";
+import { PeriodType } from "../UniqueBeneficiariesPeriod";
 import { ValidationErrorKey } from "./Errors";
 
 export const periodsTypes = ["CUSTOM", "ANNUAL", "SEMIANNUAL"] as const;
diff --git a/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts b/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts
index 439f7caf..9243f824 100644
--- a/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts
+++ b/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts
@@ -1,4 +1,4 @@
-import { UniqueBeneficiariesPeriods } from "../entities/UniqueBeneficiariesPeriods";
+import { UniqueBeneficiariesPeriod } from "../entities/UniqueBeneficiariesPeriod";
 import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
 import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBeneficiariesSettingsRepository";
 
@@ -7,7 +7,7 @@ export class RemoveUniqueBeneficiariesPeriodUseCase {
 
     async execute(options: Options): Promise<void> {
         const settings = await this.repository.get(options.projectId);
-        const isPeriodProtected = UniqueBeneficiariesPeriods.isProtected(options.period);
+        const isPeriodProtected = UniqueBeneficiariesPeriod.isProtected(options.period);
         if (isPeriodProtected) {
             throw new Error("Cannot delete a protected period");
         }
@@ -23,4 +23,4 @@ export class RemoveUniqueBeneficiariesPeriodUseCase {
     }
 }
 
-export type Options = { projectId: string; period: UniqueBeneficiariesPeriods };
+export type Options = { projectId: string; period: UniqueBeneficiariesPeriod };
diff --git a/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts b/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
index 987f59b7..be730145 100644
--- a/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
+++ b/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
@@ -1,4 +1,4 @@
-import { UniqueBeneficiariesPeriods } from "../entities/UniqueBeneficiariesPeriods";
+import { UniqueBeneficiariesPeriod } from "../entities/UniqueBeneficiariesPeriod";
 import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
 import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBeneficiariesSettingsRepository";
 
@@ -8,8 +8,8 @@ export class SaveUniqueBeneficiariesSettingsUseCase {
     async execute(options: SaveSettingsOptions): Promise<void> {
         const settings = await this.repository.get(options.projectId);
         const periodExist = settings.periods.some(period => period.id === options.period.id);
-        const isPeriodProtected = UniqueBeneficiariesPeriods.isProtected(options.period);
-        const { isValid, errorMessage } = UniqueBeneficiariesPeriods.validate(options.period);
+        const isPeriodProtected = UniqueBeneficiariesPeriod.isProtected(options.period);
+        const { isValid, errorMessage } = UniqueBeneficiariesPeriod.validate(options.period);
         if (!isValid) {
             throw new Error(errorMessage);
         }
@@ -32,10 +32,10 @@ export class SaveUniqueBeneficiariesSettingsUseCase {
     }
 
     private buildPeriodsToSave(
-        existingPeriods: UniqueBeneficiariesPeriods[],
-        currentPeriod: UniqueBeneficiariesPeriods,
+        existingPeriods: UniqueBeneficiariesPeriod[],
+        currentPeriod: UniqueBeneficiariesPeriod,
         periodExist: boolean
-    ): UniqueBeneficiariesPeriods[] {
+    ): UniqueBeneficiariesPeriod[] {
         const periodsToSave = periodExist
             ? existingPeriods.map(period => {
                   return period.id === currentPeriod.id ? currentPeriod : period;
@@ -48,9 +48,9 @@ export class SaveUniqueBeneficiariesSettingsUseCase {
         return periodsToSave;
     }
 
-    private checkDuplicatesInPeriods(periods: UniqueBeneficiariesPeriods[]): boolean {
+    private checkDuplicatesInPeriods(periods: UniqueBeneficiariesPeriod[]): boolean {
         return periods.length === new Set(periods.map(period => period.name)).size;
     }
 }
 
-export type SaveSettingsOptions = { projectId: string; period: UniqueBeneficiariesPeriods };
+export type SaveSettingsOptions = { projectId: string; period: UniqueBeneficiariesPeriod };
diff --git a/src/models/MerReport.ts b/src/models/MerReport.ts
index 0b41f41e..49932c5e 100644
--- a/src/models/MerReport.ts
+++ b/src/models/MerReport.ts
@@ -92,6 +92,7 @@ interface OrgUnit {
 }
 
 export interface ProjectInfo {
+    uniqueBeneficiaries: { indicatorsIds: Id[] };
     merDataElementIds: string[];
     documents: string[];
 }
diff --git a/src/models/Project.ts b/src/models/Project.ts
index 129c24c3..e40c15d5 100644
--- a/src/models/Project.ts
+++ b/src/models/Project.ts
@@ -103,6 +103,7 @@ export interface ProjectData {
     parentOrgUnit: OrganisationUnit | undefined;
     dataElementsSelection: DataElementsSet;
     dataElementsMER: DataElementsSet;
+    uniqueIndicators: DataElementsSet;
     disaggregation: Disaggregation;
     dataSets: { actual: DataSet; target: DataSet } | undefined;
     dashboard: Partial<Dashboards>;
@@ -186,6 +187,7 @@ const validationKeys = [
     "dataElementsSelection" as const,
     "dataElementsMER" as const,
     "endDateAfterStartDate" as const,
+    "uniqueIndicators" as const,
 ];
 
 export type ProjectField = keyof ProjectData;
@@ -238,6 +240,7 @@ class Project {
         documents: i18n.t("Documents"),
         isDartApplicable: i18n.t("DART"),
         partner: i18n.t("Partner"),
+        uniqueIndicators: i18n.t("Unique Indicators"),
     };
 
     static getFieldName(field: ProjectField): string {
@@ -401,9 +404,17 @@ class Project {
     }
 
     public getSectorsInfo(): SectorsInfo {
-        const { dataElementsSelection, dataElementsMER, sectors } = this;
+        const {
+            dataElementsSelection,
+            dataElementsMER,
+            sectors,
+            uniqueIndicators: uniqueBeneficiaries,
+        } = this;
         const dataElementsBySectorMapping = new ProjectDb(this).getDataElementsBySectorMapping();
         const selectedMER = new Set(dataElementsMER.get({ onlySelected: true }).map(de => de.id));
+        const selectedBeneficiaries = new Set(
+            uniqueBeneficiaries.get({ onlySelected: true }).map(de => de.id)
+        );
 
         return sectors.map(sector => {
             const getOptions = { onlySelected: true, includePaired: true, sectorId: sector.id };
@@ -411,6 +422,7 @@ class Project {
             const dataElementsInfo = dataElements.map(dataElement => ({
                 dataElement,
                 isMER: selectedMER.has(dataElement.id),
+                isUniqueBeneficiary: selectedBeneficiaries.has(dataElement.id),
                 isCovid19: this.disaggregation.isCovid19(dataElement.id),
                 usedInDataSetSection: dataElementsBySectorMapping[dataElement.id] === sector.id,
             }));
@@ -462,6 +474,12 @@ class Project {
             groupPaired: false,
             superSet: dataElementsSelection,
         });
+
+        const uniqueIndicators = DataElementsSet.build(config, {
+            groupPaired: false,
+            superSet: dataElementsSelection,
+        });
+
         const projectData = {
             ...defaultProjectData,
             id: generateUid(),
@@ -472,6 +490,7 @@ class Project {
             initialData: undefined,
             isDartApplicable: false,
             partner: false,
+            uniqueIndicators: uniqueIndicators,
         };
         return new Project(api, config, projectData);
     }
@@ -539,7 +558,7 @@ class Project {
     }
 
     updateDataElementsSelection(sectorId: string, dataElementIds: string[]) {
-        const { dataElementsSelection, dataElementsMER, sectors } = this.data;
+        const { dataElementsSelection, dataElementsMER, sectors, uniqueIndicators } = this.data;
         const res = dataElementsSelection.updateSelectedWithRelations({ sectorId, dataElementIds });
         const { dataElements: dataElementsUpdate, selectionInfo } = res;
 
@@ -558,6 +577,7 @@ class Project {
             sectors: newSectors,
             dataElementsSelection: dataElementsUpdate,
             dataElementsMER: dataElementsMER.updateSuperSet(dataElementsUpdate),
+            uniqueIndicators: uniqueIndicators.updateSuperSet(dataElementsUpdate),
         });
         return { selectionInfo, project: newProject };
     }
@@ -569,6 +589,15 @@ class Project {
         return { selectionInfo: {}, project: newProject };
     }
 
+    updateUniqueBeneficiariesSelection(sectorId: string, dataElementIds: string[]) {
+        const { uniqueIndicators: uniqueBeneficiaries } = this.data;
+        const newDataElementsSelected = uniqueBeneficiaries.updateSelected({
+            [sectorId]: dataElementIds,
+        });
+        const newProject = this.setObj({ uniqueIndicators: newDataElementsSelected });
+        return { selectionInfo: {}, project: newProject };
+    }
+
     public get uid() {
         return this.id;
     }
@@ -781,6 +810,7 @@ export function getPeriodsData(dataSet: DataSet) {
 export type DataElementInfo = {
     dataElement: DataElement;
     isMER: boolean;
+    isUniqueBeneficiary: boolean;
     isCovid19: boolean;
     usedInDataSetSection: boolean;
 };
diff --git a/src/models/ProjectDb.ts b/src/models/ProjectDb.ts
index 50256bec..f07779ed 100644
--- a/src/models/ProjectDb.ts
+++ b/src/models/ProjectDb.ts
@@ -10,7 +10,7 @@ import {
     DataValueSetsPostRequest,
     DataValueSetsPostResponse,
 } from "../types/d2-api";
-import { D2DataSet, D2OrganisationUnit, D2ApiResponse } from "../types/d2-api";
+import { D2DataSet, D2OrganisationUnit } from "../types/d2-api";
 import { PartialModel, Ref, PartialPersistedModel, MetadataResponse } from "../types/d2-api";
 import Project, {
     getOrgUnitDatesFromProject,
@@ -371,7 +371,7 @@ export default class ProjectDb {
         await this.saveMERData(
             project.id,
             projectDocumentsSaved.filter(document => !document.markAsDeleted)
-        ).getData();
+        );
     }
 
     async saveMetadata() {
@@ -503,15 +503,26 @@ export default class ProjectDb {
         }
     }
 
-    saveMERData(orgUnitId: Id, projectDocuments: ProjectDocument[]): D2ApiResponse<void> {
+    async saveMERData(orgUnitId: Id, projectDocuments: ProjectDocument[]): Promise<void> {
         const dataStore = getDataStore(this.project.api);
+        const existingData = await dataStore
+            .get<ProjectInfo>(getProjectStorageKey({ id: orgUnitId }))
+            .getData();
+
         const dataElementsForMER = this.project.dataElementsMER.get({ onlySelected: true });
+        const selectedUniqueBeneficiariesIds = this.project.uniqueIndicators
+            .get({ onlySelected: true })
+            .map(dataElement => dataElement.id);
         const ids = _.sortBy(_.uniq(dataElementsForMER.map(de => de.id)));
         const value: ProjectInfo = {
             merDataElementIds: ids,
+            uniqueBeneficiaries: {
+                ...existingData?.uniqueBeneficiaries,
+                indicatorsIds: selectedUniqueBeneficiariesIds,
+            },
             documents: projectDocuments.map(document => document.id),
         };
-        return dataStore.save(getProjectStorageKey({ id: orgUnitId }), value);
+        await dataStore.save(getProjectStorageKey({ id: orgUnitId }), value).getData();
     }
 
     /*
@@ -728,8 +739,16 @@ export default class ProjectDb {
                 const sector = _(sectorsByCode).get(sectorCode);
                 const selectedIds = section.dataElements.map(de => de.id);
                 const selectedMERIds = _.intersection(selectedIds, projectInfo.merDataElementIds);
-                const value = { selectedIds, selectedMERIds };
-                type Value = { selectedIds: Id[]; selectedMERIds: Id[] };
+                const uniqueIndicatorsIds = _.intersection(
+                    selectedIds,
+                    projectInfo.uniqueBeneficiaries.indicatorsIds
+                );
+                const value = { selectedIds, selectedMERIds, uniqueIndicatorsIds };
+                type Value = {
+                    selectedIds: Id[];
+                    selectedMERIds: Id[];
+                    uniqueIndicatorsIds: Id[];
+                };
                 return sector ? ([sector.id, value] as [string, Value]) : null;
             })
             .compact()
@@ -746,6 +765,11 @@ export default class ProjectDb {
             superSet: dataElementsSelection,
         }).updateSelected(_.mapValues(dataElementsBySectorId, value => value.selectedMERIds));
 
+        const uniqueIndicators = DataElementsSet.build(config, {
+            groupPaired: false,
+            superSet: dataElementsSelection,
+        }).updateSelected(_.mapValues(dataElementsBySectorId, value => value.uniqueIndicatorsIds));
+
         const { dataSetElements } = projectDataSets.actual;
         const disaggregation = Disaggregation.buildFromDataSetElements(config, dataSetElements);
         const codeInfo = ProjectDb.getCodeInfo(code);
@@ -788,6 +812,7 @@ export default class ProjectDb {
             }),
             isDartApplicable: isInDartApplicableGroup,
             partner: partnerGroup,
+            uniqueIndicators,
         };
         const project = new Project(api, config, { ...projectData, initialData: projectData });
         return project;
@@ -880,7 +905,13 @@ async function getDataElementIdsForMer(api: D2Api, id: string) {
         .get<ProjectInfo | undefined>(getProjectStorageKey({ id }))
         .getData();
     if (!value) console.error("Cannot get MER selections");
-    return { documents: value?.documents || [], merDataElementIds: value?.merDataElementIds || [] };
+    return {
+        uniqueBeneficiaries: {
+            indicatorsIds: value?.uniqueBeneficiaries?.indicatorsIds || [],
+        },
+        documents: value?.documents || [],
+        merDataElementIds: value?.merDataElementIds || [],
+    };
 }
 
 export function getSectorCodeFromSectionCode(code: string | undefined) {
diff --git a/src/models/ProjectInfo.ts b/src/models/ProjectInfo.ts
index 69c2aa6f..4b7ee29a 100644
--- a/src/models/ProjectInfo.ts
+++ b/src/models/ProjectInfo.ts
@@ -209,13 +209,13 @@ export class ProjectInfo {
     }
 
     private getDataElementInfoAsString(info: DataElementInfo) {
-        const { dataElement, isMER, isCovid19 } = info;
+        const { dataElement, isMER, isUniqueBeneficiary, isCovid19 } = info;
         const hiddenMsg = i18n.t("Hidden in data entry as it is selected in multiple sectors!");
-
         return [
             `${dataElement.name} - ${dataElement.code}`,
             isCovid19 ? ` [${i18n.t("COVID-19")}]` : "",
             isMER ? ` [${i18n.t("MER")}]` : "",
+            isUniqueBeneficiary ? ` [${i18n.t("Unique Beneficiary")}]` : "",
             info.usedInDataSetSection ? "" : ` - ${hiddenMsg}`,
         ].join("");
     }
diff --git a/src/models/dataElementsSet.ts b/src/models/dataElementsSet.ts
index b3c5e0fe..772f1cc8 100644
--- a/src/models/dataElementsSet.ts
+++ b/src/models/dataElementsSet.ts
@@ -300,7 +300,6 @@ export default class DataElementsSet {
         const { indicatorType, peopleOrBenefit, external } = options;
         const dataElementsBySector = this.data.dataElementsBySector;
         const sectorsIds = sectorId ? [sectorId] : _.keys(dataElementsBySector);
-
         return _.flatMap(sectorsIds, sectorId => {
             const dataElements1: DataElement[] = _(dataElementsBySector).get(sectorId, []);
             if (_.isEqual(options, {})) return dataElements1;
diff --git a/src/models/user.ts b/src/models/user.ts
index 7cc36424..e6b7c918 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -19,7 +19,8 @@ export type Action =
     | "reopen"
     | "delete"
     | "attachFiles"
-    | "periods";
+    | "periods"
+    | "projectIndicators";
 
 const actionsByRole: Record<Role, Action[]> = {
     admin: [
@@ -38,6 +39,7 @@ const actionsByRole: Record<Role, Action[]> = {
         "reopen",
         "attachFiles",
         "periods",
+        "projectIndicators",
     ],
     dataReviewer: [
         "create",
@@ -52,14 +54,16 @@ const actionsByRole: Record<Role, Action[]> = {
         "accessMER",
         "reopen",
         "attachFiles",
+        "projectIndicators",
     ],
-    dataViewer: ["dashboard", "awardNumberDashboard", "downloadData"],
+    dataViewer: ["dashboard", "awardNumberDashboard", "downloadData", "projectIndicators"],
     merApprover: [
         "dashboard",
         "countryDashboard",
         "awardNumberDashboard",
         "downloadData",
         "accessMER",
+        "projectIndicators",
     ],
     dataEntry: [
         "targetValues",
@@ -68,6 +72,7 @@ const actionsByRole: Record<Role, Action[]> = {
         "awardNumberDashboard",
         "downloadData",
         "attachFiles",
+        "projectIndicators",
     ],
 };
 
diff --git a/src/pages/project-wizard/ProjectWizard.tsx b/src/pages/project-wizard/ProjectWizard.tsx
index 10c212a0..b8a2373d 100644
--- a/src/pages/project-wizard/ProjectWizard.tsx
+++ b/src/pages/project-wizard/ProjectWizard.tsx
@@ -27,6 +27,7 @@ import MerSelectionStep from "../../components/steps/mer-selection/MerSelectionS
 import { useAppHistory } from "../../utils/use-app-history";
 import { Maybe } from "../../types/utils";
 import { AttachFilesStep } from "../../components/steps/attach-files/AttachFilesStep";
+import UniqueIndicatorsStep from "../../components/steps/unique-beneficiaries/UniqueIndicatorsStep";
 
 type Action = { type: "create" } | { type: "edit"; id: string } | { type: "clone"; id: string };
 
@@ -171,6 +172,13 @@ class ProjectWizardImpl extends React.Component<Props, State> {
                 validationKeys: ["dataElementsMER"],
                 help: helpTexts.merIndicators,
             },
+            {
+                key: "unique-beneficiaries",
+                label: i18n.t("Select of Unique Indicators"),
+                component: UniqueIndicatorsStep,
+                validationKeys: ["uniqueIndicators"],
+                help: helpTexts.uniqueIndicators,
+            },
             {
                 key: "sharing",
                 label: i18n.t("Username Access"),
diff --git a/src/pages/project-wizard/help-texts.tsx b/src/pages/project-wizard/help-texts.tsx
index 7c2f3d9c..c1138f37 100644
--- a/src/pages/project-wizard/help-texts.tsx
+++ b/src/pages/project-wizard/help-texts.tsx
@@ -35,6 +35,9 @@ export const helpTexts = {
          - Up to three sectors and three indicators per sectors.`,
         { nsSeparator: false }
     ),
+    uniqueIndicators: i18n.t(
+        "Select indicators in each project that represent unique beneficiaries in the project"
+    ),
     disaggregation: i18n.t(
         `For activity indicators that include a response to COVID-19 (examples: COVID-19 messaging, COVID-19 specific healthcare worker trainings, etc.), please select "yes" under the COVID-19 column. In the future, more disaggregations (in addition to new, returning, gender, and COVID-19) will be available.`,
         { nsSeparator: false }
diff --git a/src/pages/projects-list/ProjectsListConfig.tsx b/src/pages/projects-list/ProjectsListConfig.tsx
index 70bc36ee..cdb958a7 100644
--- a/src/pages/projects-list/ProjectsListConfig.tsx
+++ b/src/pages/projects-list/ProjectsListConfig.tsx
@@ -112,6 +112,13 @@ export function getComponentConfig(
     ];
 
     const allActions: Record<ContextualAction, TableAction<ProjectForList>> = {
+        projectIndicators: {
+            name: "projectIndicators",
+            text: i18n.t("Project Indicators Validation"),
+            icon: <Icon>done_all</Icon>,
+            multiple: false,
+            onClick: (ids: Id[]) => onFirst(ids, id => goTo("projectIndicators", { id })),
+        },
         periods: {
             name: "periods",
             text: i18n.t("Manage Unique Beneficiaries Periods"),
diff --git a/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx b/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
index 1a7613dc..6e8cf78a 100644
--- a/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
+++ b/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
@@ -10,9 +10,9 @@ import {
 import { useAppContext } from "../../contexts/api-context";
 import { Ref } from "../../domain/entities/Ref";
 import {
-    UniqueBeneficiariesPeriods,
+    UniqueBeneficiariesPeriod,
     UniqueBeneficiariesPeriodsAttrs,
-} from "../../domain/entities/UniqueBeneficiariesPeriods";
+} from "../../domain/entities/UniqueBeneficiariesPeriod";
 import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
 import i18n from "../../locales";
 import { UniquePeriodsForm } from "./UniquePeriodsForm";
@@ -52,7 +52,7 @@ export const UniqueBeneficiariesPeriodsPage = React.memo(() => {
     );
 
     const savePeriod = React.useCallback(
-        (periodData: UniqueBeneficiariesPeriods) => {
+        (periodData: UniqueBeneficiariesPeriod) => {
             loading.show(true, i18n.t("Saving Period..."));
             compositionRoot.uniqueBeneficiaries.saveSettings
                 .execute({ period: periodData, projectId: id })
@@ -74,7 +74,7 @@ export const UniqueBeneficiariesPeriodsPage = React.memo(() => {
 
     const removePeriod = React.useCallback(() => {
         if (!selectedPeriod) return;
-        const period = UniqueBeneficiariesPeriods.build(selectedPeriod).get();
+        const period = UniqueBeneficiariesPeriod.build(selectedPeriod).get();
         loading.show(true, i18n.t("Removing Period..."));
         compositionRoot.uniqueBeneficiaries.removePeriod
             .execute({ projectId: id, period })
@@ -134,7 +134,7 @@ export const UniqueBeneficiariesPeriodsPage = React.memo(() => {
                 onSave={removePeriod}
                 title={i18n.t("Are you sure you want to delete the period: {{period}}?", {
                     nsSeparator: false,
-                    period: selectedPeriod?.name,
+                    period: selectedPeriod ? selectedPeriod.name : "",
                 })}
                 onCancel={() => {
                     setDeleteModal(false);
diff --git a/src/pages/unique-periods/UniquePeriodsForm.tsx b/src/pages/unique-periods/UniquePeriodsForm.tsx
index 50ca2a87..dbabab9f 100644
--- a/src/pages/unique-periods/UniquePeriodsForm.tsx
+++ b/src/pages/unique-periods/UniquePeriodsForm.tsx
@@ -4,9 +4,9 @@ import { Button, TextField } from "@material-ui/core";
 import { makeStyles, createStyles } from "@material-ui/styles";
 
 import {
-    UniqueBeneficiariesPeriods,
+    UniqueBeneficiariesPeriod,
     UniqueBeneficiariesPeriodsAttrs,
-} from "../../domain/entities/UniqueBeneficiariesPeriods";
+} from "../../domain/entities/UniqueBeneficiariesPeriod";
 import i18n from "../../locales";
 import { Maybe } from "../../types/utils";
 import { getErrors } from "../../domain/entities/generic/Errors";
@@ -14,7 +14,7 @@ import { getErrors } from "../../domain/entities/generic/Errors";
 export type UniquePeriodsFormProps = {
     existingPeriod?: UniqueBeneficiariesPeriodsAttrs;
     onClose: () => void;
-    onSubmit: (uniquePeriods: UniqueBeneficiariesPeriods) => void;
+    onSubmit: (uniquePeriods: UniqueBeneficiariesPeriod) => void;
 };
 
 const months = [
@@ -34,7 +34,7 @@ const months = [
 
 function getValueByAttribute(
     value: string,
-    attribute: keyof UniqueBeneficiariesPeriods
+    attribute: keyof UniqueBeneficiariesPeriod
 ): number | string {
     if (attribute === "endDateMonth" || attribute === "startDateMonth") {
         return Number(value);
@@ -48,13 +48,13 @@ export const UniquePeriodsForm = React.memo((props: UniquePeriodsFormProps) => {
     const snackbar = useSnackbar();
     const classes = useStyles();
     const [uniquePeriod, setUniquePeriod] = React.useState<UniqueBeneficiariesPeriodsAttrs>(
-        existingPeriod || UniqueBeneficiariesPeriods.initialPeriodData()
+        existingPeriod || UniqueBeneficiariesPeriod.initialPeriodData()
     );
 
     const validateAndSubmit = React.useCallback(
         (e: React.FormEvent) => {
             e.preventDefault();
-            UniqueBeneficiariesPeriods.build(uniquePeriod).match({
+            UniqueBeneficiariesPeriod.build(uniquePeriod).match({
                 success: period => onSubmit(period),
                 error: errors => {
                     const errorMessage = getErrors(errors);
@@ -66,7 +66,7 @@ export const UniquePeriodsForm = React.memo((props: UniquePeriodsFormProps) => {
     );
 
     const updatePeriod = React.useCallback(
-        (value: Maybe<string>, attribute: keyof UniqueBeneficiariesPeriods) => {
+        (value: Maybe<string>, attribute: keyof UniqueBeneficiariesPeriod) => {
             setUniquePeriod(prev => {
                 if (!prev) return prev;
                 return { ...prev, [attribute]: getValueByAttribute(value || "", attribute) };
diff --git a/src/router.ts b/src/router.ts
index a7ce90e0..c68f2e2a 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -16,6 +16,7 @@ const routes = {
     dataApproval: dataApproval,
     countries: () => `/countries`,
     uniqueBeneficiariesPeriods: ({ id }: { id: string }) => `/unique-beneficiaries-periods/${id}`,
+    projectIndicators: ({ id }: { id: string }) => `/project-indicators/${id}`,
 };
 
 type Routes = typeof routes;

From 4838eca5d839ae262277b30ff97dfd8486034692 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Tue, 22 Oct 2024 21:22:38 -0500
Subject: [PATCH 15/51] fixed tests

---
 src/models/ProjectDb.ts                | 2 +-
 src/models/__tests__/ProjectDb.spec.ts | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/models/ProjectDb.ts b/src/models/ProjectDb.ts
index f07779ed..694678e6 100644
--- a/src/models/ProjectDb.ts
+++ b/src/models/ProjectDb.ts
@@ -517,7 +517,7 @@ export default class ProjectDb {
         const value: ProjectInfo = {
             merDataElementIds: ids,
             uniqueBeneficiaries: {
-                ...existingData?.uniqueBeneficiaries,
+                ...(existingData?.uniqueBeneficiaries || {}),
                 indicatorsIds: selectedUniqueBeneficiariesIds,
             },
             documents: projectDocuments.map(document => document.id),
diff --git a/src/models/__tests__/ProjectDb.spec.ts b/src/models/__tests__/ProjectDb.spec.ts
index c2def890..24addf68 100644
--- a/src/models/__tests__/ProjectDb.spec.ts
+++ b/src/models/__tests__/ProjectDb.spec.ts
@@ -154,6 +154,11 @@ describe("ProjectDb", () => {
                 dataStoreUpdateResponse
             );
 
+            mock.onGet("/dataStore/data-management-app/project-WGC0DJ0YSis").replyOnce(
+                200,
+                expectedDataStoreMer
+            );
+
             mock.onPut(
                 "/dataStore/data-management-app/project-WGC0DJ0YSis",
                 expectedDataStoreMer
@@ -223,6 +228,7 @@ const orgUnitsMetadata = {
 const expectedDataStoreMer = {
     merDataElementIds: ["yMqK9DKbA3X"],
     documents: [],
+    uniqueBeneficiaries: { periods: [], indicatorsIds: [] },
 };
 
 const expectedOrgUnitPut = {

From 5036f5610c3a0cd3b80a26b397d8f4e728e6e261 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Sat, 26 Oct 2024 16:58:11 -0500
Subject: [PATCH 16/51] add project indicators validation

---
 i18n/en.pot                                   |  51 ++++-
 src/CompositionRoot.ts                        |  15 ++
 src/data/repositories/D2DataElementGroup.ts   |   5 +-
 .../repositories/DataValueD2Repository.ts     |   6 +-
 src/data/repositories/ProjectD2Repository.ts  |  13 ++
 ...UniqueBeneficiariesSettingsD2Repository.ts | 123 ++++++++++-
 src/domain/entities/IndicatorCalculation.ts   | 120 +++++++++++
 src/domain/entities/IndicatorValidation.ts    |  57 +++++
 src/domain/entities/Ref.ts                    |   1 +
 .../entities/UniqueBeneficiariesPeriod.ts     |  13 --
 .../entities/UniqueBeneficiariesSettings.ts   |   8 +-
 src/domain/entities/generic/Errors.ts         |   7 +-
 src/domain/entities/generic/Validations.ts    |   4 +
 .../repositories/DataValueRepository.ts       |   2 +
 src/domain/repositories/ProjectRepository.ts  |   6 +
 .../GetIndicatorsValidationUseCase.ts         | 147 +++++++++++++
 .../usecases/ImportDataElementsUseCase.ts     |   2 +
 .../SaveIndicatorsValidationUseCase.ts        |  52 +++++
 src/hooks/UniqueBeneficiaries.ts              |  23 ++
 .../IndicatorNotification.tsx                 |  68 ++++++
 .../IndicatorValidationForm.tsx               | 197 ++++++++++++++++++
 .../IndicatorValidationTable.tsx              | 145 +++++++++++++
 .../ProjectIndicatorsValidation.tsx           |  65 ++++++
 .../projects-list/ProjectsListConfig.tsx      |   2 +-
 src/pages/root/Root.tsx                       |   6 +
 .../UniqueBeneficiariesPeriodsPage.tsx        |  13 +-
 .../unique-periods/UniquePeriodsForm.tsx      |   6 +-
 src/router.ts                                 |   2 +-
 28 files changed, 1103 insertions(+), 56 deletions(-)
 create mode 100644 src/data/repositories/ProjectD2Repository.ts
 create mode 100644 src/domain/entities/IndicatorCalculation.ts
 create mode 100644 src/domain/entities/IndicatorValidation.ts
 create mode 100644 src/domain/repositories/ProjectRepository.ts
 create mode 100644 src/domain/usecases/GetIndicatorsValidationUseCase.ts
 create mode 100644 src/domain/usecases/SaveIndicatorsValidationUseCase.ts
 create mode 100644 src/hooks/UniqueBeneficiaries.ts
 create mode 100644 src/pages/project-indicators-validation/IndicatorNotification.tsx
 create mode 100644 src/pages/project-indicators-validation/IndicatorValidationForm.tsx
 create mode 100644 src/pages/project-indicators-validation/IndicatorValidationTable.tsx
 create mode 100644 src/pages/project-indicators-validation/ProjectIndicatorsValidation.tsx

diff --git a/i18n/en.pot b/i18n/en.pot
index a061bba7..e230ba03 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-10-22T23:20:24.479Z\n"
-"PO-Revision-Date: 2024-10-22T23:20:24.479Z\n"
+"POT-Creation-Date: 2024-10-26T18:05:17.719Z\n"
+"PO-Revision-Date: 2024-10-26T18:05:17.719Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -348,6 +348,12 @@ msgstr ""
 msgid "{{value}} is not a valid value for {{fieldName}}"
 msgstr ""
 
+msgid "{{fieldName}} must be a positive number"
+msgstr ""
+
+msgid "Loading Periods..."
+msgstr ""
+
 msgid "Error saving dashboard"
 msgstr ""
 
@@ -938,6 +944,41 @@ msgid ""
 "Data Entry Section"
 msgstr ""
 
+msgid ""
+"Please review the following indicators  which have been updated since "
+"{{monthName}}"
+msgstr ""
+
+msgid "Period not found"
+msgstr ""
+
+msgid "Project Indicators Validation"
+msgstr ""
+
+msgid "Select a Period"
+msgstr ""
+
+msgid "Select a period"
+msgstr ""
+
+msgid "Editable New"
+msgstr ""
+
+msgid "Returning from previous Project"
+msgstr ""
+
+msgid "Comment is required"
+msgstr ""
+
+msgid "Loading Indicators..."
+msgstr ""
+
+msgid "Saving Indicators..."
+msgstr ""
+
+msgid "Indicators saved"
+msgstr ""
+
 msgid "Cannot load project"
 msgstr ""
 
@@ -1053,9 +1094,6 @@ msgstr ""
 msgid "API Link"
 msgstr ""
 
-msgid "Project Indicators Validation"
-msgstr ""
-
 msgid "Manage Unique Beneficiaries Periods"
 msgstr ""
 
@@ -1166,9 +1204,6 @@ msgstr ""
 msgid "You have reached the limit for this field"
 msgstr ""
 
-msgid "Loading Periods..."
-msgstr ""
-
 msgid "Saving Period..."
 msgstr ""
 
diff --git a/src/CompositionRoot.ts b/src/CompositionRoot.ts
index a12f0ee3..69be911b 100644
--- a/src/CompositionRoot.ts
+++ b/src/CompositionRoot.ts
@@ -4,10 +4,13 @@ import { DataValueExportJsonRepository } from "./data/repositories/DataValueExpo
 import { ExportDataElementJsonRepository } from "./data/repositories/ExportDataElementJsonRepository";
 import { ImportDataElementSpreadSheetRepository } from "./data/repositories/ImportDataElementSpreadSheetRepository";
 import { OrgUnitD2Repository } from "./data/repositories/OrgUnitD2Repository";
+import { ProjectD2Repository } from "./data/repositories/ProjectD2Repository";
 import { UniqueBeneficiariesSettingsD2Repository } from "./data/repositories/UniqueBeneficiariesSettingsD2Repository";
+import { GetIndicatorsValidationUseCase } from "./domain/usecases/GetIndicatorsValidationUseCase";
 import { GetUniqueBeneficiariesSettingsUseCase } from "./domain/usecases/GetUniqueBeneficiariesSettingsUseCase";
 import { ImportDataElementsUseCase } from "./domain/usecases/ImportDataElementsUseCase";
 import { RemoveUniqueBeneficiariesPeriodUseCase } from "./domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase";
+import { SaveIndicatorsValidationUseCase } from "./domain/usecases/SaveIndicatorsValidationUseCase";
 import { SaveUniqueBeneficiariesSettingsUseCase } from "./domain/usecases/SaveUniqueBeneficiariesSettingsUseCase";
 import { Config } from "./models/Config";
 import { D2Api } from "./types/d2-api";
@@ -23,6 +26,7 @@ export function getCompositionRoot(api: D2Api, config: Config) {
     const exportDataElementJsonRepository = new ExportDataElementJsonRepository(api, config);
     const dataValueExportRepository = new DataValueExportJsonRepository();
     const orgUnitRepository = new OrgUnitD2Repository(api);
+    const projectRepository = new ProjectD2Repository(api, config);
 
     return {
         dataElements: {
@@ -46,6 +50,17 @@ export function getCompositionRoot(api: D2Api, config: Config) {
                 uniqueBeneficiariesSettingsRepository
             ),
         },
+        indicators: {
+            getValidation: new GetIndicatorsValidationUseCase({
+                dataValueRepository,
+                uniqueBeneficiariesSettingsRepository,
+                projectRepository,
+                config,
+            }),
+            saveValidation: new SaveIndicatorsValidationUseCase({
+                settingsRepository: uniqueBeneficiariesSettingsRepository,
+            }),
+        },
     };
 }
 
diff --git a/src/data/repositories/D2DataElementGroup.ts b/src/data/repositories/D2DataElementGroup.ts
index 7c879260..8f79efa7 100644
--- a/src/data/repositories/D2DataElementGroup.ts
+++ b/src/data/repositories/D2DataElementGroup.ts
@@ -72,6 +72,7 @@ export class D2DataElementGroup {
                         id: dataElementGroup.id,
                         name: dataElementGroup.name,
                         code: dataElementGroup.code,
+                        shortName: dataElementGroup.shortName,
                         dataElements:
                             idsToDelete.length > 0
                                 ? mergeDataElements.filter(
@@ -146,9 +147,7 @@ export class D2DataElementGroup {
                         return { id: dataElementGroup.id };
                     }),
                 },
-                {
-                    importStrategy: "DELETE",
-                }
+                { importStrategy: "DELETE" }
             )
             .getData();
     }
diff --git a/src/data/repositories/DataValueD2Repository.ts b/src/data/repositories/DataValueD2Repository.ts
index d6242998..246201d0 100644
--- a/src/data/repositories/DataValueD2Repository.ts
+++ b/src/data/repositories/DataValueD2Repository.ts
@@ -22,7 +22,7 @@ export class DataValueD2Repository implements DataValueRepository {
     async get(options: GetDataValueOptions): Promise<DataValue[]> {
         const dataElementGroup = await this.createTempDataElementGroup(options);
         const res$ = this.api.dataValues.getSet({
-            dataSet: [],
+            dataSet: options.dataSetIds || [],
             orgUnit: options.orgUnitIds,
             dataElementGroup: dataElementGroup ? [dataElementGroup.id] : undefined,
             children: options.children,
@@ -33,7 +33,9 @@ export class DataValueD2Repository implements DataValueRepository {
         const res = await res$.getData();
         if (dataElementGroup) {
             await this.d2DataElementGroup.remove([dataElementGroup]);
-            await this.exportSqlAuditDataElements(dataElementGroup.dataElements);
+            if (options.logDataElements) {
+                await this.exportSqlAuditDataElements(dataElementGroup.dataElements);
+            }
         }
         return res.dataValues;
     }
diff --git a/src/data/repositories/ProjectD2Repository.ts b/src/data/repositories/ProjectD2Repository.ts
new file mode 100644
index 00000000..6afac01f
--- /dev/null
+++ b/src/data/repositories/ProjectD2Repository.ts
@@ -0,0 +1,13 @@
+import { Id } from "../../domain/entities/Ref";
+import { ProjectRepository } from "../../domain/repositories/ProjectRepository";
+import { Config } from "../../models/Config";
+import Project from "../../models/Project";
+import { D2Api } from "../../types/d2-api";
+
+export class ProjectD2Repository implements ProjectRepository {
+    constructor(private api: D2Api, private config: Config) {}
+
+    async getById(id: Id): Promise<Project> {
+        return Project.get(this.api, this.config, id);
+    }
+}
diff --git a/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts b/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
index 86637ccd..32dbcfc2 100644
--- a/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
+++ b/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
@@ -1,10 +1,19 @@
+import _ from "lodash";
 import { generateUid } from "d2/uid";
+import {
+    IndicatorValidation,
+    IndicatorValidationAttrs,
+} from "../../domain/entities/IndicatorValidation";
 import { Id } from "../../domain/entities/Ref";
 import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
 import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
 import { UniqueBeneficiariesSettingsRepository } from "../../domain/repositories/UniqueBeneficiariesSettingsRepository";
 import { D2Api, DataStore } from "../../types/d2-api";
 import { Maybe } from "../../types/utils";
+import {
+    IndicatorCalculation,
+    IndicatorCalculationAttrs,
+} from "../../domain/entities/IndicatorCalculation";
 
 export class UniqueBeneficiariesSettingsD2Repository
     implements UniqueBeneficiariesSettingsRepository
@@ -19,9 +28,23 @@ export class UniqueBeneficiariesSettingsD2Repository
             .get<D2ProjectSettings>(this.buildKeyId(projectId))
             .getData();
 
+        const periods = this.mergeDefaultPeriodsWithExisting(
+            d2Response?.uniqueBeneficiaries?.periods
+        );
+
+        const indicatorsIds = d2Response?.uniqueBeneficiaries?.indicatorsIds || [];
+        const indicatorsValidation = d2Response?.uniqueBeneficiaries?.indicatorsValidation || [];
+
+        const hasIndicatorsValidation = indicatorsValidation.length > 0;
+        const indicatorsToInclude = hasIndicatorsValidation
+            ? this.buildExistingIndicatorsValidation(d2Response, periods)
+            : this.buildIndicatorsValidationFromPeriods(periods, indicatorsIds);
+
         return {
             projectId: projectId,
-            periods: this.mergeDefaultPeriodsWithExisting(d2Response?.uniqueBeneficiaries?.periods),
+            periods,
+            indicatorsIds: indicatorsIds,
+            indicatorsValidation: indicatorsToInclude,
         };
     }
 
@@ -30,15 +53,81 @@ export class UniqueBeneficiariesSettingsD2Repository
             .get<D2ProjectSettings>(this.buildKeyId(settings.projectId))
             .getData();
 
-        await this.dataStore
-            .save(this.buildKeyId(settings.projectId), {
-                ...existingSettings,
-                uniqueBeneficiaries: {
-                    ...(existingSettings?.uniqueBeneficiaries || {}),
-                    periods: this.buildPeriods(settings.periods),
-                },
+        const d2SettingsToSave: D2ProjectSettings = {
+            ...existingSettings,
+            uniqueBeneficiaries: {
+                ...(existingSettings?.uniqueBeneficiaries || {}),
+                indicatorsIds: existingSettings?.uniqueBeneficiaries?.indicatorsIds || [],
+                periods: this.buildPeriods(settings.periods),
+                indicatorsValidation: settings.indicatorsValidation.map(indicatorValidation => {
+                    return {
+                        periodId: indicatorValidation.period.id,
+                        createdAt: indicatorValidation.createdAt,
+                        lastUpdatedAt: indicatorValidation.lastUpdatedAt,
+                        indicatorsCalculation: indicatorValidation.indicatorsCalculation.map(
+                            indicatorCalculation => {
+                                return {
+                                    comment: indicatorCalculation.comment,
+                                    editableNewValue: indicatorCalculation.editableNewValue,
+                                    id: indicatorCalculation.id,
+                                    newValue: indicatorCalculation.newValue,
+                                    returningValue: indicatorCalculation.returningValue,
+                                    total: IndicatorCalculation.getTotal(indicatorCalculation),
+                                };
+                            }
+                        ),
+                    };
+                }),
+            },
+        };
+
+        await this.dataStore.save(this.buildKeyId(settings.projectId), d2SettingsToSave).getData();
+    }
+
+    private buildIndicatorsValidationFromPeriods(
+        periods: UniqueBeneficiariesPeriod[],
+        indicatorsIds: Id[]
+    ): IndicatorValidation[] {
+        return periods.map(period => {
+            return IndicatorValidation.build({
+                createdAt: new Date().toISOString(),
+                lastUpdatedAt: undefined,
+                period,
+                indicatorsCalculation: indicatorsIds.map(indicatorId => {
+                    return IndicatorCalculation.build({
+                        id: indicatorId,
+                        newValue: 0,
+                        editableNewValue: undefined,
+                        returningValue: undefined,
+                        comment: "",
+                    }).get();
+                }),
+            }).get();
+        });
+    }
+
+    private buildExistingIndicatorsValidation(
+        settings: Maybe<D2ProjectSettings>,
+        periods: UniqueBeneficiariesPeriod[]
+    ): IndicatorValidation[] {
+        return _(settings?.uniqueBeneficiaries?.indicatorsValidation || [])
+            .map(d2IndicatorValidation => {
+                const period = periods.find(period => period.id === d2IndicatorValidation.periodId);
+                if (!period) return undefined;
+
+                return IndicatorValidation.build({
+                    createdAt: d2IndicatorValidation.createdAt,
+                    lastUpdatedAt: d2IndicatorValidation.lastUpdatedAt,
+                    period: period,
+                    indicatorsCalculation: d2IndicatorValidation.indicatorsCalculation.map(
+                        d2IndicatorCalculation => {
+                            return IndicatorCalculation.build(d2IndicatorCalculation).get();
+                        }
+                    ),
+                }).get();
             })
-            .getData();
+            .compact()
+            .value();
     }
 
     private buildPeriods(periods: UniqueBeneficiariesPeriod[]): UniqueBeneficiariesPeriod[] {
@@ -75,4 +164,18 @@ export class UniqueBeneficiariesSettingsD2Repository
     }
 }
 
-type D2ProjectSettings = { uniqueBeneficiaries?: { periods: UniqueBeneficiariesPeriod[] } };
+type D2ProjectSettings = {
+    uniqueBeneficiaries?: {
+        periods: UniqueBeneficiariesPeriod[];
+        indicatorsIds: Id[];
+        indicatorsValidation: D2IndicatorValidation[];
+    };
+};
+
+type D2IndicatorValidation = Omit<IndicatorValidationAttrs, "period" | "indicatorsCalculation"> & {
+    periodId: Id;
+    indicatorsCalculation: Omit<
+        IndicatorCalculationAttrs,
+        "previousValue" | "nextValue" | "code"
+    >[];
+};
diff --git a/src/domain/entities/IndicatorCalculation.ts b/src/domain/entities/IndicatorCalculation.ts
new file mode 100644
index 00000000..b2423198
--- /dev/null
+++ b/src/domain/entities/IndicatorCalculation.ts
@@ -0,0 +1,120 @@
+import _ from "lodash";
+import { Maybe } from "../../types/utils";
+import { DataElement } from "./DataElement";
+import { DataValue } from "./DataValue";
+import { Either } from "./generic/Either";
+import { ValidationError } from "./generic/Errors";
+import { Struct } from "./generic/Struct";
+import { isPositive, validateRequired } from "./generic/Validations";
+import { Code, Id } from "./Ref";
+
+export type IndicatorCalculationKeys = keyof IndicatorCalculationAttrs;
+export type IndicatorCalculationAttrs = {
+    id: Id;
+    newValue: number;
+    editableNewValue: Maybe<number>;
+    returningValue: Maybe<number>;
+    comment: string;
+    previousValue?: number;
+    nextValue?: number;
+    code?: Code;
+};
+
+export class IndicatorCalculation extends Struct<IndicatorCalculationAttrs>() {
+    static getTotal(data: IndicatorCalculationAttrs): number {
+        return this.calculateTotalValue(data.editableNewValue, data.returningValue);
+    }
+
+    static hasChanged(data: IndicatorCalculationAttrs): boolean {
+        return data.nextValue !== undefined;
+    }
+
+    static build(
+        data: IndicatorCalculationAttrs
+    ): Either<ValidationError<IndicatorCalculation>[], IndicatorCalculation> {
+        const errors = this.checkDataAndGetErrors(data);
+        if (errors.length > 0) return Either.error(errors);
+
+        return Either.success(IndicatorCalculation.create(data));
+    }
+
+    static checkDataAndGetErrors(
+        data: IndicatorCalculationAttrs
+    ): ValidationError<IndicatorCalculation>[] {
+        const idProperty: ValidationError<IndicatorCalculation> = {
+            property: "id",
+            errors: validateRequired(data.id),
+            value: data.id,
+        };
+
+        const newProperty: ValidationError<IndicatorCalculation> = {
+            property: "newValue",
+            errors: [...isPositive(data.newValue)],
+            value: data.newValue,
+        };
+
+        const editableNewValueProperty: ValidationError<IndicatorCalculation> = {
+            property: "editableNewValue",
+            errors: data.editableNewValue ? [...isPositive(data.editableNewValue)] : [],
+            value: data.editableNewValue,
+        };
+
+        const returningProperty: ValidationError<IndicatorCalculation> = {
+            property: "returningValue",
+            errors: data.returningValue ? [...isPositive(data.returningValue)] : [],
+            value: data.returningValue,
+        };
+
+        const errors: ValidationError<IndicatorCalculation>[] = _([
+            idProperty,
+            newProperty,
+            editableNewValueProperty,
+            returningProperty,
+        ])
+            .filter(validation => validation.errors.length > 0)
+            .value();
+
+        return errors;
+    }
+
+    static updateValuesById(
+        id: Id,
+        existingRecord: Maybe<IndicatorCalculation>,
+        dataValues: DataValue[],
+        details: Pick<DataElement, "id" | "code">
+    ): IndicatorCalculation {
+        const verifyChangesInValues = Boolean(existingRecord);
+        const newValueSum = _(dataValues)
+            .filter(dataValue => dataValue.dataElement === id)
+            .sumBy(dataValue => Number(dataValue.value || 0));
+
+        const returningValue = existingRecord?.returningValue;
+
+        const newValueHasChanged = verifyChangesInValues
+            ? existingRecord?.newValue !== newValueSum
+            : false;
+
+        return IndicatorCalculation.build({
+            id: id,
+            newValue: newValueSum,
+            editableNewValue: newValueSum,
+            returningValue,
+            comment: existingRecord?.comment || "",
+            previousValue: newValueHasChanged ? existingRecord?.newValue : undefined,
+            nextValue: newValueHasChanged ? newValueSum : undefined,
+            code: details.code,
+        }).get();
+    }
+
+    static commentIsRequired(attrs: IndicatorCalculationAttrs): boolean {
+        const entity = IndicatorCalculation.create(attrs);
+        const newAndTotalAreDifferent = IndicatorCalculation.getTotal(entity) !== entity.newValue;
+        return newAndTotalAreDifferent && entity.comment.length === 0;
+    }
+
+    static calculateTotalValue(editable: Maybe<number>, returning: Maybe<number>): number {
+        if (!editable) return returning || 0;
+        if (!returning) return editable;
+        return editable + returning;
+    }
+}
diff --git a/src/domain/entities/IndicatorValidation.ts b/src/domain/entities/IndicatorValidation.ts
new file mode 100644
index 00000000..c515ed55
--- /dev/null
+++ b/src/domain/entities/IndicatorValidation.ts
@@ -0,0 +1,57 @@
+import _ from "lodash";
+import { Maybe } from "../../types/utils";
+import { Either } from "./generic/Either";
+import { ValidationError } from "./generic/Errors";
+import { Struct } from "./generic/Struct";
+import { validateRequired } from "./generic/Validations";
+import { IndicatorCalculation } from "./IndicatorCalculation";
+import { ISODateTimeString } from "./Ref";
+import { UniqueBeneficiariesPeriod } from "./UniqueBeneficiariesPeriod";
+
+export type IndicatorValidationAttrs = {
+    period: UniqueBeneficiariesPeriod;
+    createdAt: ISODateTimeString;
+    lastUpdatedAt: Maybe<ISODateTimeString>;
+    indicatorsCalculation: IndicatorCalculation[];
+};
+
+export class IndicatorValidation extends Struct<IndicatorValidationAttrs>() {
+    static build(
+        attrs: IndicatorValidationAttrs
+    ): Either<ValidationError<IndicatorValidation>[], IndicatorValidation> {
+        const errors = this.checkDataAndGetErrors(attrs);
+        if (errors.length > 0) {
+            return Either.error(errors);
+        }
+        return Either.success(IndicatorValidation.create(attrs));
+    }
+
+    private static checkDataAndGetErrors(
+        data: IndicatorValidationAttrs
+    ): ValidationError<IndicatorValidation>[] {
+        const periodProperty: ValidationError<IndicatorValidation> = {
+            property: "period",
+            errors: validateRequired(data.period),
+            value: data.period,
+        };
+
+        const calculatorsProperty: ValidationError<IndicatorValidation> = {
+            property: "indicatorsCalculation",
+            errors: validateRequired(data.indicatorsCalculation),
+            value: data.indicatorsCalculation,
+        };
+
+        const errors: ValidationError<IndicatorValidation>[] = _([
+            periodProperty,
+            calculatorsProperty,
+        ])
+            .filter(validation => validation.errors.length > 0)
+            .value();
+
+        return errors;
+    }
+
+    static validateCommentIndicators(indicators: IndicatorCalculation[]): boolean {
+        return indicators.some(indicator => IndicatorCalculation.commentIsRequired(indicator));
+    }
+}
diff --git a/src/domain/entities/Ref.ts b/src/domain/entities/Ref.ts
index 14f8fdef..9c1fdb1a 100644
--- a/src/domain/entities/Ref.ts
+++ b/src/domain/entities/Ref.ts
@@ -9,3 +9,4 @@ export interface NamedRef extends Ref {
 }
 
 export type Code = string;
+export type ISODateTimeString = string;
diff --git a/src/domain/entities/UniqueBeneficiariesPeriod.ts b/src/domain/entities/UniqueBeneficiariesPeriod.ts
index b90a9749..c1c4ed92 100644
--- a/src/domain/entities/UniqueBeneficiariesPeriod.ts
+++ b/src/domain/entities/UniqueBeneficiariesPeriod.ts
@@ -107,17 +107,4 @@ export class UniqueBeneficiariesPeriod extends Struct<UniqueBeneficiariesPeriods
 
         return errors;
     }
-
-    private static validateAndGetError(value: string | number, errorMessage: string): string {
-        const valueToValidate = String(value);
-        return valueToValidate.length === 0 ? errorMessage : "";
-    }
-
-    private static validateTypes(value: PeriodType, errorMessage: string): string {
-        return periodsTypes.includes(value) ? "" : errorMessage;
-    }
-
-    private static validateMonths(monthNumber: number, errorMessage: string): string {
-        return monthNumber >= 1 && monthNumber <= 12 ? "" : errorMessage;
-    }
 }
diff --git a/src/domain/entities/UniqueBeneficiariesSettings.ts b/src/domain/entities/UniqueBeneficiariesSettings.ts
index f6a6b148..eebfcc66 100644
--- a/src/domain/entities/UniqueBeneficiariesSettings.ts
+++ b/src/domain/entities/UniqueBeneficiariesSettings.ts
@@ -1,4 +1,10 @@
+import { IndicatorValidation } from "./IndicatorValidation";
 import { Id } from "./Ref";
 import { UniqueBeneficiariesPeriod } from "./UniqueBeneficiariesPeriod";
 
-export type UniqueBeneficiariesSettings = { projectId: Id; periods: UniqueBeneficiariesPeriod[] };
+export type UniqueBeneficiariesSettings = {
+    projectId: Id;
+    periods: UniqueBeneficiariesPeriod[];
+    indicatorsIds: Id[];
+    indicatorsValidation: IndicatorValidation[];
+};
diff --git a/src/domain/entities/generic/Errors.ts b/src/domain/entities/generic/Errors.ts
index ce875c77..ebfb68bd 100644
--- a/src/domain/entities/generic/Errors.ts
+++ b/src/domain/entities/generic/Errors.ts
@@ -1,6 +1,6 @@
 import i18n from "../../../locales";
 
-export type ValidationErrorKey = "field_cannot_be_blank" | "not_in_list";
+export type ValidationErrorKey = "field_cannot_be_blank" | "not_in_list" | "positive_number";
 
 export const validationErrorMessages: Record<
     ValidationErrorKey,
@@ -14,6 +14,11 @@ export const validationErrorMessages: Record<
             value: value,
             nsSeparator: false,
         }),
+    positive_number: (fieldName: string) => {
+        return i18n.t(`{{fieldName}} must be a positive number`, {
+            fieldName: fieldName,
+        });
+    },
 };
 
 export function getErrors<T>(errors: ValidationError<T>[]) {
diff --git a/src/domain/entities/generic/Validations.ts b/src/domain/entities/generic/Validations.ts
index 416d3e71..2adee389 100644
--- a/src/domain/entities/generic/Validations.ts
+++ b/src/domain/entities/generic/Validations.ts
@@ -16,3 +16,7 @@ export function validatePeriodType(periodType: PeriodType): ValidationErrorKey[]
 export function betweenValue(value: number, from: number, to: number): ValidationErrorKey[] {
     return value >= from && value <= to ? [] : ["not_in_list"];
 }
+
+export function isPositive(value: number): ValidationErrorKey[] {
+    return value >= 0 ? [] : ["positive_number"];
+}
diff --git a/src/domain/repositories/DataValueRepository.ts b/src/domain/repositories/DataValueRepository.ts
index 5b9c12f1..0097d9e2 100644
--- a/src/domain/repositories/DataValueRepository.ts
+++ b/src/domain/repositories/DataValueRepository.ts
@@ -8,10 +8,12 @@ export interface DataValueRepository {
 }
 
 export interface GetDataValueOptions {
+    dataSetIds: Maybe<Id[]>;
     orgUnitIds: Id[];
     children: boolean;
     includeDeleted: boolean;
     startDate: string;
     endDate: string;
     dataElementsIds: Maybe<Id[]>;
+    logDataElements: boolean;
 }
diff --git a/src/domain/repositories/ProjectRepository.ts b/src/domain/repositories/ProjectRepository.ts
new file mode 100644
index 00000000..f88c2a43
--- /dev/null
+++ b/src/domain/repositories/ProjectRepository.ts
@@ -0,0 +1,6 @@
+import Project from "../../models/Project";
+import { Id } from "../entities/Ref";
+
+export interface ProjectRepository {
+    getById(id: Id): Promise<Project>;
+}
diff --git a/src/domain/usecases/GetIndicatorsValidationUseCase.ts b/src/domain/usecases/GetIndicatorsValidationUseCase.ts
new file mode 100644
index 00000000..7d1e94dc
--- /dev/null
+++ b/src/domain/usecases/GetIndicatorsValidationUseCase.ts
@@ -0,0 +1,147 @@
+import { promiseMap } from "../../migrations/utils";
+import { Config } from "../../models/Config";
+import Project from "../../models/Project";
+import { DataValue } from "../entities/DataValue";
+import { IndicatorCalculation } from "../entities/IndicatorCalculation";
+import { IndicatorValidation } from "../entities/IndicatorValidation";
+import { Code, Id, Ref } from "../entities/Ref";
+import { UniqueBeneficiariesPeriod } from "../entities/UniqueBeneficiariesPeriod";
+import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
+import { DataValueRepository } from "../repositories/DataValueRepository";
+import { ProjectRepository } from "../repositories/ProjectRepository";
+import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBeneficiariesSettingsRepository";
+
+export class GetIndicatorsValidationUseCase {
+    private actualCombination: Ref & { displayName: string };
+    constructor(
+        private repositories: {
+            dataValueRepository: DataValueRepository;
+            uniqueBeneficiariesSettingsRepository: UniqueBeneficiariesSettingsRepository;
+            projectRepository: ProjectRepository;
+            config: Config;
+        }
+    ) {
+        this.actualCombination = this.repositories.config.categoryOptionCombos.actual;
+    }
+
+    async execute(options: GetIndicatorsOptions): Promise<IndicatorValidation[]> {
+        const [settings, project] = await Promise.all([
+            this.getSettings(options.projectId),
+            this.getProjectById(options.projectId),
+        ]);
+
+        if (settings.indicatorsIds.length === 0) throw Error("No unique indicators selected");
+
+        return this.getIndicatorsWithValues(project, settings);
+    }
+
+    private async getSettings(projectId: Id): Promise<UniqueBeneficiariesSettings> {
+        return this.repositories.uniqueBeneficiariesSettingsRepository.get(projectId);
+    }
+
+    private async getProjectById(projectId: Id): Promise<Project> {
+        return this.repositories.projectRepository.getById(projectId);
+    }
+
+    private async getIndicatorsWithValues(
+        project: Project,
+        settings: UniqueBeneficiariesSettings
+    ): Promise<IndicatorValidation[]> {
+        const dataSetId = project.dataSets?.actual.id;
+        if (!dataSetId) throw new Error(`Actual dataSet not found for project: ${project.name}`);
+
+        const indicatorsDetails = project.uniqueIndicators.get({ onlySelected: true });
+
+        const indicatorsWithValues = await promiseMap(settings.periods, period => {
+            return this.setValuesToIndicators(
+                period,
+                dataSetId,
+                project.id,
+                settings,
+                indicatorsDetails
+            );
+        });
+
+        return indicatorsWithValues;
+    }
+
+    private async setValuesToIndicators(
+        period: UniqueBeneficiariesPeriod,
+        dataSetId: Id,
+        projectId: Id,
+        settings: UniqueBeneficiariesSettings,
+        indicatorsDetails: Array<{ id: Id; code: Code }>
+    ): Promise<IndicatorValidation> {
+        const dateRange = this.getDatesRange(period);
+        const dataValues = await this.getDataValues(dataSetId, projectId, settings, dateRange);
+        const actualDataValues = this.getOnlyActualDataValues(dataValues);
+        const indicatorCalculation = settings.indicatorsValidation.find(
+            item => item.period.id === period.id
+        );
+
+        const indicatorCalculations = settings.indicatorsIds.map(indicatorId => {
+            const existingRecord = indicatorCalculation?.indicatorsCalculation.find(
+                item => item.id === indicatorId
+            );
+            const details = indicatorsDetails.find(item => item.id === indicatorId);
+            if (!details) throw new Error(`Indicator details not found for id: ${indicatorId}`);
+            return IndicatorCalculation.updateValuesById(
+                indicatorId,
+                existingRecord,
+                actualDataValues,
+                details
+            );
+        });
+
+        return IndicatorValidation.build({
+            createdAt: indicatorCalculation?.createdAt || "",
+            lastUpdatedAt: indicatorCalculation?.lastUpdatedAt,
+            period: period,
+            indicatorsCalculation: indicatorCalculations,
+        }).get();
+    }
+
+    private async getDataValues(
+        dataSetId: Id,
+        projectId: Id,
+        settings: UniqueBeneficiariesSettings,
+        dateRange: DateRange
+    ) {
+        const { startDate, endDate } = dateRange;
+        return this.repositories.dataValueRepository.get({
+            dataSetIds: [dataSetId],
+            orgUnitIds: [projectId],
+            startDate: startDate.toISOString(),
+            endDate: endDate.toISOString(),
+            children: false,
+            dataElementsIds: settings.indicatorsIds,
+            includeDeleted: false,
+            logDataElements: false,
+        });
+    }
+
+    private getDatesRange(period: UniqueBeneficiariesPeriod): DateRange {
+        const startDate = this.getMonthDay(period.startDateMonth, "first");
+        const endDate = this.getMonthDay(period.endDateMonth, "last");
+        return { startDate, endDate };
+    }
+
+    private getOnlyActualDataValues(dataValues: DataValue[]): DataValue[] {
+        return dataValues.filter(
+            dataValue => dataValue.attributeOptionCombo === this.actualCombination.id
+        );
+    }
+
+    private getMonthDay(month: number, option: "first" | "last"): Date {
+        if (month < 1 || month > 12) {
+            throw new Error(`Invalid month number: ${month}`);
+        }
+        const currentYear = new Date().getFullYear();
+        return option === "first"
+            ? new Date(currentYear, month - 1, 1)
+            : new Date(currentYear, month, 0);
+    }
+}
+
+type GetIndicatorsOptions = { projectId: Id };
+type DateRange = { startDate: Date; endDate: Date };
diff --git a/src/domain/usecases/ImportDataElementsUseCase.ts b/src/domain/usecases/ImportDataElementsUseCase.ts
index 15d8f9ee..d950e9a1 100644
--- a/src/domain/usecases/ImportDataElementsUseCase.ts
+++ b/src/domain/usecases/ImportDataElementsUseCase.ts
@@ -84,12 +84,14 @@ export class ImportDataElementsUseCase {
         const orgUnit = await this.getOrgUnitId();
         console.info("Looking for data values in dataElements to be removed...");
         const dataValues = await this.dataValueRepository.get({
+            dataSetIds: undefined,
             includeDeleted: false,
             orgUnitIds: [orgUnit.id],
             children: true,
             endDate: "2050",
             startDate: "1950",
             dataElementsIds: dataElementsToRemove.map(dataElement => dataElement.id),
+            logDataElements: true,
         });
 
         await this.exportDataValues(dataValues);
diff --git a/src/domain/usecases/SaveIndicatorsValidationUseCase.ts b/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
new file mode 100644
index 00000000..8bc50efa
--- /dev/null
+++ b/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
@@ -0,0 +1,52 @@
+import { IndicatorValidation, IndicatorValidationAttrs } from "../entities/IndicatorValidation";
+import { Id } from "../entities/Ref";
+import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
+import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBeneficiariesSettingsRepository";
+
+export class SaveIndicatorsValidationUseCase {
+    constructor(
+        private repositories: { settingsRepository: UniqueBeneficiariesSettingsRepository }
+    ) {}
+
+    async execute(options: SaveIndicatorsOptions): Promise<void> {
+        const { indicatorsValidation, projectId } = options;
+        const settings = await this.repositories.settingsRepository.get(projectId);
+
+        const hasErrors = IndicatorValidation.validateCommentIndicators(
+            indicatorsValidation.indicatorsCalculation
+        );
+
+        if (hasErrors) throw new Error("Cannot save indicators without comments");
+
+        const periodIsValid = settings.periods.find(
+            period => period.id === indicatorsValidation.period.id
+        );
+        if (!periodIsValid) throw new Error(`Period not found: ${indicatorsValidation.period.id}`);
+
+        const indicatorExist = settings.indicatorsValidation.find(
+            item => item.period.id === indicatorsValidation.period.id
+        );
+
+        const currentDate = new Date().toISOString();
+        const indicatorAttributes: IndicatorValidationAttrs = {
+            ...options.indicatorsValidation,
+            lastUpdatedAt: indicatorExist ? currentDate : undefined,
+            createdAt: indicatorExist ? indicatorExist.createdAt : currentDate,
+        };
+
+        const indicatorValidationToSave = IndicatorValidation.build(indicatorAttributes).get();
+
+        const settingsToSave: UniqueBeneficiariesSettings = {
+            ...settings,
+            indicatorsValidation: indicatorExist
+                ? settings.indicatorsValidation.map(indicator => {
+                      if (indicator.period.id !== indicatorsValidation.period.id) return indicator;
+                      return IndicatorValidation.build(indicatorValidationToSave).get();
+                  })
+                : settings.indicatorsValidation.concat(indicatorValidationToSave),
+        };
+        return this.repositories.settingsRepository.save(settingsToSave);
+    }
+}
+
+type SaveIndicatorsOptions = { projectId: Id; indicatorsValidation: IndicatorValidation };
diff --git a/src/hooks/UniqueBeneficiaries.ts b/src/hooks/UniqueBeneficiaries.ts
new file mode 100644
index 00000000..54083ebb
--- /dev/null
+++ b/src/hooks/UniqueBeneficiaries.ts
@@ -0,0 +1,23 @@
+import { useLoading, useSnackbar } from "@eyeseetea/d2-ui-components";
+import React from "react";
+import { useAppContext } from "../contexts/api-context";
+import { UniqueBeneficiariesSettings } from "../domain/entities/UniqueBeneficiariesSettings";
+import { Id } from "../models/ProjectDocument";
+
+export function useGetUniqueBeneficiaries(props: { id: Id; refresh: number }) {
+    const { id, refresh } = props;
+    const { compositionRoot } = useAppContext();
+    const loading = useLoading();
+    const snackbar = useSnackbar();
+    const [settings, setSettings] = React.useState<UniqueBeneficiariesSettings>();
+
+    React.useEffect(() => {
+        // loading.show(true, i18n.t("Loading Periods..."));
+        compositionRoot.uniqueBeneficiaries.getSettings.execute(id).then(setSettings, err => {
+            snackbar.error(err.message);
+        });
+        // .finally(() => loading.hide());
+    }, [compositionRoot.uniqueBeneficiaries.getSettings, loading, snackbar, id, refresh]);
+
+    return { settings, setSettings };
+}
diff --git a/src/pages/project-indicators-validation/IndicatorNotification.tsx b/src/pages/project-indicators-validation/IndicatorNotification.tsx
new file mode 100644
index 00000000..b7553606
--- /dev/null
+++ b/src/pages/project-indicators-validation/IndicatorNotification.tsx
@@ -0,0 +1,68 @@
+import React from "react";
+import { ConfirmationDialog } from "@eyeseetea/d2-ui-components";
+import i18n from "../../locales";
+import { IndicatorValidation } from "../../domain/entities/IndicatorValidation";
+import { ISODateTimeString } from "../../domain/entities/Ref";
+import { IndicatorCalculation } from "../../domain/entities/IndicatorCalculation";
+import { Typography } from "@material-ui/core";
+
+export type IndicatorNotificationProps = {
+    indicatorValidation: IndicatorValidation;
+    onClose: () => void;
+};
+
+export const IndicatorNotification = React.memo((props: IndicatorNotificationProps) => {
+    const { indicatorValidation, onClose } = props;
+
+    const monthName = getMonthName(
+        indicatorValidation.lastUpdatedAt
+            ? indicatorValidation.lastUpdatedAt
+            : indicatorValidation.createdAt
+    );
+
+    const onlyIndicatorsWithChanges = indicatorValidation.indicatorsCalculation.filter(
+        IndicatorCalculation.hasChanged
+    );
+
+    return (
+        <ConfirmationDialog
+            open
+            title="Indicators Notification"
+            description={i18n.t(
+                "Please review the following indicators  which have been updated since {{monthName}}",
+                {
+                    monthName: monthName,
+                }
+            )}
+            onSave={onClose}
+            saveText={i18n.t("Close")}
+        >
+            <ul>
+                {onlyIndicatorsWithChanges.map(indicatorCalculation => {
+                    return (
+                        <li key={indicatorCalculation.id}>
+                            <span>{i18n.t("Indicator Code")} </span>
+                            <span>
+                                <strong>{indicatorCalculation.code}: </strong>
+                            </span>
+                            <Typography component="span" color="error">
+                                {indicatorCalculation.previousValue}
+                            </Typography>
+                            <span> ➝ </span>
+                            <Typography component="span" color="primary">
+                                {indicatorCalculation.nextValue}
+                            </Typography>
+                        </li>
+                    );
+                })}
+            </ul>
+        </ConfirmationDialog>
+    );
+});
+
+IndicatorNotification.displayName = "IndicatorNotification";
+
+function getMonthName(dateIso: ISODateTimeString) {
+    const date = new Date(dateIso);
+    return date.toLocaleString("en", { month: "long" });
+}
diff --git a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
new file mode 100644
index 00000000..f7bcb33d
--- /dev/null
+++ b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
@@ -0,0 +1,197 @@
+import React from "react";
+import { Dropdown, useSnackbar } from "@eyeseetea/d2-ui-components";
+import i18n from "../../locales";
+import { IndicatorValidation } from "../../domain/entities/IndicatorValidation";
+import { Maybe } from "../../types/utils";
+import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
+import { Button, Grid, makeStyles, Paper, Typography } from "@material-ui/core";
+import { IndicatorValidationTable } from "./IndicatorValidationTable";
+import PageHeader from "../../components/page-header/PageHeader";
+import { useHistory } from "react-router-dom";
+import {
+    IndicatorCalculation,
+    IndicatorCalculationKeys,
+} from "../../domain/entities/IndicatorCalculation";
+import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
+import { getErrors } from "../../domain/entities/generic/Errors";
+import { IndicatorNotification } from "./IndicatorNotification";
+import { ISODateTimeString } from "../../domain/entities/Ref";
+
+export type IndicatorValidationFormProps = {
+    indicatorsValidation: IndicatorValidation[];
+    onSubmit: (indicatorValidation: IndicatorValidation) => void;
+    settings: UniqueBeneficiariesSettings;
+};
+
+export const IndicatorValidationForm = React.memo((props: IndicatorValidationFormProps) => {
+    const { indicatorsValidation, onSubmit, settings } = props;
+    const { periods } = settings;
+    const [selectedPeriod, setSelectedPeriod] = React.useState<UniqueBeneficiariesPeriod>();
+    const [selectedIndicator, setIndicatorValidation] = React.useState<IndicatorValidation>();
+    const [dismissNotification, setDismissNotification] = React.useState(false);
+    const snackbar = useSnackbar();
+    const history = useHistory();
+    const classes = useStyles();
+
+    const mapPeriodsToItems = periods.map(period => ({
+        value: period.id,
+        text: period.name,
+    }));
+
+    const loadIndicatorValidation = React.useCallback(
+        (period: Maybe<string>) => {
+            const uniquePeriod = periods.find(item => item.id === period);
+            if (!uniquePeriod) {
+                snackbar.error(i18n.t("Period not found"));
+                return;
+            }
+
+            const currentIndicatorValidation = indicatorsValidation.find(
+                indicator => indicator.period.id === period
+            );
+
+            setSelectedPeriod(uniquePeriod);
+            setDismissNotification(false);
+            IndicatorValidation.build({
+                createdAt: currentIndicatorValidation?.createdAt || "",
+                lastUpdatedAt: currentIndicatorValidation?.lastUpdatedAt,
+                period: uniquePeriod,
+                indicatorsCalculation: currentIndicatorValidation?.indicatorsCalculation || [],
+            }).match({
+                success: value => {
+                    setIndicatorValidation(value);
+                },
+                error: err => {
+                    const errorMessage = getErrors(err);
+                    snackbar.error(errorMessage);
+                },
+            });
+        },
+        [indicatorsValidation, periods, snackbar]
+    );
+
+    const updateIndicatorsValidationRow = React.useCallback(
+        (value: string, indexRow: number, attributeName: IndicatorCalculationKeys) => {
+            setIndicatorValidation(prevState => {
+                if (!prevState) return prevState;
+                return IndicatorValidation.build({
+                    ...prevState,
+                    indicatorsCalculation: prevState.indicatorsCalculation.map((item, index) => {
+                        if (index !== indexRow) return item;
+                        return IndicatorCalculation.build({
+                            ...item,
+                            [attributeName]: getValue(value, attributeName),
+                        }).get();
+                    }),
+                }).get();
+            });
+        },
+        []
+    );
+
+    const saveIndicatorValidation = React.useCallback(
+        (event: React.FormEvent<HTMLFormElement>) => {
+            event.preventDefault();
+            if (!selectedPeriod || !selectedIndicator) return;
+            onSubmit(selectedIndicator);
+        },
+        [selectedIndicator, onSubmit, selectedPeriod]
+    );
+
+    const hasChanged = selectedIndicator?.indicatorsCalculation.some(
+        IndicatorCalculation.hasChanged
+    );
+
+    const commentsNotValid = selectedIndicator?.indicatorsCalculation.some(
+        IndicatorCalculation.commentIsRequired
+    );
+
+    const showNotification = hasChanged || false;
+
+    return (
+        <div>
+            <PageHeader
+                title={i18n.t("Project Indicators Validation")}
+                onBackClick={() => history.push("/")}
+            />
+
+            <form onSubmit={saveIndicatorValidation}>
+                <Dropdown
+                    hideEmpty
+                    items={mapPeriodsToItems}
+                    label={i18n.t("Select a Period")}
+                    onChange={loadIndicatorValidation}
+                    value={selectedPeriod?.id || ""}
+                />
+
+                {selectedIndicator && (
+                    <Grid container>
+                        <Grid item className={classes.alignRight}>
+                            <Typography variant="body1">
+                                <strong>{i18n.t("Created")}:</strong>{" "}
+                                {convertToLocalDate(selectedIndicator.createdAt)}
+                            </Typography>
+
+                            <Typography variant="body1">
+                                <strong>{i18n.t("Last Updated")}:</strong>{" "}
+                                {convertToLocalDate(selectedIndicator.lastUpdatedAt)}
+                            </Typography>
+                        </Grid>
+
+                        <Grid item xs={12}>
+                            <IndicatorValidationTable
+                                data={selectedIndicator.indicatorsCalculation}
+                                onRowChange={updateIndicatorsValidationRow}
+                            />
+                        </Grid>
+
+                        <Grid item className={classes.alignRight}>
+                            <Button
+                                disabled={commentsNotValid}
+                                variant="contained"
+                                color="primary"
+                                type="submit"
+                                size="large"
+                            >
+                                {i18n.t("Save")}
+                            </Button>
+                        </Grid>
+                    </Grid>
+                )}
+            </form>
+
+            {showNotification && selectedIndicator && !dismissNotification && (
+                <IndicatorNotification
+                    onClose={() => setDismissNotification(true)}
+                    indicatorValidation={selectedIndicator}
+                />
+            )}
+        </div>
+    );
+});
+
+function getValue(value: string, attributeName: IndicatorCalculationKeys) {
+    switch (attributeName) {
+        case "editableNewValue":
+        case "returningValue":
+            return value.length > 0 ? Number(value) : undefined;
+        case "comment":
+            return value;
+        default:
+            throw new Error(`Attribute ${attributeName} not supported`);
+    }
+}
+
+type FieldValidation = { comment: { isRequired: boolean } };
+export type ErrorValidation = Record<number, FieldValidation>;
+
+function convertToLocalDate(isoDateString: Maybe<ISODateTimeString>): string {
+    if (!isoDateString) return "";
+    return new Date(isoDateString).toLocaleString();
+}
+
+const useStyles = makeStyles({
+    alignRight: { marginLeft: "auto" },
+});
+
+IndicatorValidationForm.displayName = "IndicatorValidationForm";
diff --git a/src/pages/project-indicators-validation/IndicatorValidationTable.tsx b/src/pages/project-indicators-validation/IndicatorValidationTable.tsx
new file mode 100644
index 00000000..1203dab8
--- /dev/null
+++ b/src/pages/project-indicators-validation/IndicatorValidationTable.tsx
@@ -0,0 +1,145 @@
+import React from "react";
+import { TextField, Tooltip, Typography } from "@material-ui/core";
+import { ObjectsTable, TableConfig, useObjectsTable } from "@eyeseetea/d2-ui-components";
+
+import {
+    IndicatorCalculation,
+    IndicatorCalculationAttrs,
+    IndicatorCalculationKeys,
+} from "../../domain/entities/IndicatorCalculation";
+import i18n from "../../locales";
+
+export type IndicatorValidationTableProps = {
+    data: IndicatorCalculation[];
+    onRowChange: (value: string, index: number, attributeName: IndicatorCalculationKeys) => void;
+};
+
+type IndicatorCalculationColumns = IndicatorCalculationAttrs & { total: number };
+
+export const IndicatorValidationTable = (props: IndicatorValidationTableProps) => {
+    const { data, onRowChange } = props;
+
+    const previousValueLabel = i18n.t("Previous Value");
+    const nextValueLabel = i18n.t("Next Value");
+
+    const config = React.useMemo((): TableConfig<IndicatorCalculationColumns> => {
+        return {
+            actions: [],
+            columns: [
+                {
+                    name: "code",
+                    text: i18n.t("Unique Indicators"),
+                    sortable: false,
+                    getValue(row) {
+                        const hasChanged = IndicatorCalculation.hasChanged(row);
+                        const tooltipTitle = `${previousValueLabel}: ${row.previousValue} -> ${nextValueLabel}: ${row.nextValue}`;
+                        return (
+                            <Tooltip title={hasChanged ? tooltipTitle : ""}>
+                                <Typography color={hasChanged ? "secondary" : "initial"}>
+                                    {row.code}
+                                </Typography>
+                            </Tooltip>
+                        );
+                    },
+                },
+                {
+                    name: "newValue",
+                    text: i18n.t("New"),
+                    sortable: false,
+                },
+                {
+                    name: "editableNewValue",
+                    text: i18n.t("Editable New"),
+                    getValue(row) {
+                        const index = data.findIndex(item => item.id === row.id);
+                        return (
+                            <TextField
+                                autoComplete="off"
+                                value={
+                                    row.editableNewValue !== undefined ? row.editableNewValue : ""
+                                }
+                                onChange={event =>
+                                    onRowChange(event.target.value, index, "editableNewValue")
+                                }
+                                inputProps={{ min: 0 }}
+                                type="number"
+                            />
+                        );
+                    },
+                    sortable: false,
+                },
+                {
+                    name: "returningValue",
+                    text: i18n.t("Returning from previous Project"),
+                    sortable: false,
+                    getValue(row) {
+                        const index = data.findIndex(item => item.id === row.id);
+                        return (
+                            <TextField
+                                autoComplete="off"
+                                value={row.returningValue !== undefined ? row.returningValue : ""}
+                                inputProps={{ min: 0 }}
+                                onChange={event => {
+                                    onRowChange(event.target.value, index, "returningValue");
+                                }}
+                                type="number"
+                            />
+                        );
+                    },
+                },
+                {
+                    name: "total",
+                    text: i18n.t("Total"),
+                    sortable: false,
+                    getValue(row) {
+                        return IndicatorCalculation.getTotal(row);
+                    },
+                },
+                {
+                    name: "comment",
+                    text: i18n.t("Comment"),
+                    sortable: false,
+                    getValue(row) {
+                        const index = data.findIndex(item => item.id === row.id);
+                        const hasError = IndicatorCalculation.commentIsRequired(row);
+                        const errorMessage = hasError ? i18n.t("Comment is required") : "";
+                        return (
+                            <TextField
+                                autoComplete="off"
+                                value={row.comment}
+                                onChange={event =>
+                                    onRowChange(event.target.value, index, "comment")
+                                }
+                                error={hasError}
+                                helperText={errorMessage}
+                            />
+                        );
+                    },
+                },
+            ],
+            initialSorting: { field: "id", order: "asc" },
+            paginationOptions: { pageSizeInitialValue: 100, pageSizeOptions: [] },
+        };
+    }, [data, nextValueLabel, previousValueLabel, onRowChange]);
+
+    const tableConfig = useObjectsTable<IndicatorCalculationColumns>(
+        config,
+        React.useCallback(() => {
+            return Promise.resolve({
+                objects: mapCalculationToTableRows(data),
+                pager: { page: 1, pageCount: 1, total: data.length, pageSize: data.length },
+            });
+        }, [data])
+    );
+
+    return <ObjectsTable {...tableConfig} onChangeSearch={undefined} />;
+};
+
+function mapCalculationToTableRows(data: IndicatorCalculation[]): IndicatorCalculationColumns[] {
+    return data.map(item => ({
+        ...item,
+        total: IndicatorCalculation.getTotal(item),
+    }));
+}
+
+IndicatorValidationTable.displayName = "IndicatorValidationTable";
diff --git a/src/pages/project-indicators-validation/ProjectIndicatorsValidation.tsx b/src/pages/project-indicators-validation/ProjectIndicatorsValidation.tsx
new file mode 100644
index 00000000..472fa44f
--- /dev/null
+++ b/src/pages/project-indicators-validation/ProjectIndicatorsValidation.tsx
@@ -0,0 +1,65 @@
+import React from "react";
+import { useParams } from "react-router-dom";
+import { useLoading, useSnackbar } from "@eyeseetea/d2-ui-components";
+
+import { useAppContext } from "../../contexts/api-context";
+import { Ref } from "../../domain/entities/Ref";
+import { useGetUniqueBeneficiaries } from "../../hooks/UniqueBeneficiaries";
+import { IndicatorValidationForm } from "./IndicatorValidationForm";
+import { IndicatorValidation } from "../../domain/entities/IndicatorValidation";
+import i18n from "../../locales";
+
+export const ProjectIndicatorsValidation = React.memo(() => {
+    const { id } = useParams<Ref>();
+    const { compositionRoot } = useAppContext();
+    const { settings } = useGetUniqueBeneficiaries({ id, refresh: 0 });
+    const [indicatorsValidation, setIndicatorsValidation] = React.useState<IndicatorValidation[]>(
+        []
+    );
+    const [refresh, setRefresh] = React.useState(0);
+    const loading = useLoading();
+    const snackbar = useSnackbar();
+
+    React.useEffect(() => {
+        console.debug("refresh", refresh);
+        loading.show(true, i18n.t("Loading Indicators..."));
+        compositionRoot.indicators.getValidation
+            .execute({ projectId: id })
+            .then(setIndicatorsValidation)
+            .catch(err => {
+                snackbar.error(err.message);
+            })
+            .finally(() => loading.hide());
+    }, [compositionRoot.indicators, id, loading, refresh, snackbar]);
+
+    const saveIndicator = React.useCallback(
+        (indicatorValidation: IndicatorValidation) => {
+            loading.show(true, i18n.t("Saving Indicators..."));
+            compositionRoot.indicators.saveValidation
+                .execute({ projectId: id, indicatorsValidation: indicatorValidation })
+                .then(() => {
+                    snackbar.success(i18n.t("Indicators saved"));
+                    setRefresh(prev => prev + 1);
+                })
+                .catch(err => {
+                    snackbar.error(err.message);
+                })
+                .finally(() => loading.hide());
+        },
+        [compositionRoot.indicators.saveValidation, id, loading, snackbar]
+    );
+
+    if (!settings) return null;
+
+    return (
+        <div>
+            <IndicatorValidationForm
+                indicatorsValidation={indicatorsValidation}
+                settings={settings}
+                onSubmit={saveIndicator}
+            />
+        </div>
+    );
+});
+
+ProjectIndicatorsValidation.displayName = "ProjectIndicatorsValidation";
diff --git a/src/pages/projects-list/ProjectsListConfig.tsx b/src/pages/projects-list/ProjectsListConfig.tsx
index cdb958a7..86e9ce10 100644
--- a/src/pages/projects-list/ProjectsListConfig.tsx
+++ b/src/pages/projects-list/ProjectsListConfig.tsx
@@ -117,7 +117,7 @@ export function getComponentConfig(
             text: i18n.t("Project Indicators Validation"),
             icon: <Icon>done_all</Icon>,
             multiple: false,
-            onClick: (ids: Id[]) => onFirst(ids, id => goTo("projectIndicators", { id })),
+            onClick: (ids: Id[]) => onFirst(ids, id => goTo("projectIndicatorsValidation", { id })),
         },
         periods: {
             name: "periods",
diff --git a/src/pages/root/Root.tsx b/src/pages/root/Root.tsx
index 04490717..1d8189db 100644
--- a/src/pages/root/Root.tsx
+++ b/src/pages/root/Root.tsx
@@ -13,6 +13,7 @@ import CountryDashboard from "../dashboard/CountryDashboard";
 import AwardNumberDashboard from "../dashboard/AwardNumberDashboard";
 import { LastLocationProvider } from "react-router-last-location";
 import { UniqueBeneficiariesPeriodsPage } from "../unique-periods/UniqueBeneficiariesPeriodsPage";
+import { ProjectIndicatorsValidation } from "../project-indicators-validation/ProjectIndicatorsValidation";
 
 const Root = () => {
     const idParam = { id: ":id" };
@@ -79,6 +80,11 @@ const Root = () => {
                         render={() => <UniqueBeneficiariesPeriodsPage />}
                     />
 
+                    <Route
+                        path={generateUrl("projectIndicatorsValidation", { id: ":id" })}
+                        render={() => <ProjectIndicatorsValidation />}
+                    />
+
                     <Route path={generateUrl("countries")} render={() => <CountriesList />} />
 
                     <Route render={() => <ProjectsList />} />
diff --git a/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx b/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
index 6e8cf78a..ae2a0b15 100644
--- a/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
+++ b/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
@@ -13,9 +13,9 @@ import {
     UniqueBeneficiariesPeriod,
     UniqueBeneficiariesPeriodsAttrs,
 } from "../../domain/entities/UniqueBeneficiariesPeriod";
-import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
 import i18n from "../../locales";
 import { UniquePeriodsForm } from "./UniquePeriodsForm";
+import { useGetUniqueBeneficiaries } from "../../hooks/UniqueBeneficiaries";
 
 export const UniqueBeneficiariesPeriodsPage = React.memo(() => {
     const { compositionRoot } = useAppContext();
@@ -23,21 +23,12 @@ export const UniqueBeneficiariesPeriodsPage = React.memo(() => {
     const history = useHistory();
     const snackbar = useSnackbar();
     const loading = useLoading();
-    const [settings, setSettings] = React.useState<UniqueBeneficiariesSettings>();
     const [savePeriodModal, setSavePeriodModal] = React.useState(false);
     const [deleteModal, setDeleteModal] = React.useState(false);
     const [selectedPeriod, setSelectedPeriod] = React.useState<UniqueBeneficiariesPeriodsAttrs>();
     const [refresh, setRefresh] = React.useState(1);
 
-    React.useEffect(() => {
-        loading.show(true, i18n.t("Loading Periods..."));
-        compositionRoot.uniqueBeneficiaries.getSettings
-            .execute(id)
-            .then(setSettings, err => {
-                snackbar.error(err.message);
-            })
-            .finally(() => loading.hide());
-    }, [compositionRoot.uniqueBeneficiaries.getSettings, loading, snackbar, id, refresh]);
+    const { settings } = useGetUniqueBeneficiaries({ id, refresh });
 
     const openSavePeriodDialog = React.useCallback(
         (options: ActionTable) => {
diff --git a/src/pages/unique-periods/UniquePeriodsForm.tsx b/src/pages/unique-periods/UniquePeriodsForm.tsx
index dbabab9f..f7f31211 100644
--- a/src/pages/unique-periods/UniquePeriodsForm.tsx
+++ b/src/pages/unique-periods/UniquePeriodsForm.tsx
@@ -36,11 +36,7 @@ function getValueByAttribute(
     value: string,
     attribute: keyof UniqueBeneficiariesPeriod
 ): number | string {
-    if (attribute === "endDateMonth" || attribute === "startDateMonth") {
-        return Number(value);
-    } else {
-        return value;
-    }
+    return attribute === "endDateMonth" || attribute === "startDateMonth" ? Number(value) : value;
 }
 
 export const UniquePeriodsForm = React.memo((props: UniquePeriodsFormProps) => {
diff --git a/src/router.ts b/src/router.ts
index c68f2e2a..c3109089 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -16,7 +16,7 @@ const routes = {
     dataApproval: dataApproval,
     countries: () => `/countries`,
     uniqueBeneficiariesPeriods: ({ id }: { id: string }) => `/unique-beneficiaries-periods/${id}`,
-    projectIndicators: ({ id }: { id: string }) => `/project-indicators/${id}`,
+    projectIndicatorsValidation: ({ id }: { id: string }) => `/project-indicators-validation/${id}`,
 };
 
 type Routes = typeof routes;

From b6913073ca8d496047850fd20f75bfe45c95e699 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Sat, 26 Oct 2024 17:01:02 -0500
Subject: [PATCH 17/51] update i18n

---
 i18n/en.pot                                              | 9 ++++++---
 .../IndicatorValidationForm.tsx                          | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index e230ba03..ca0db50b 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-10-26T18:05:17.719Z\n"
-"PO-Revision-Date: 2024-10-26T18:05:17.719Z\n"
+"POT-Creation-Date: 2024-10-26T21:58:24.624Z\n"
+"PO-Revision-Date: 2024-10-26T21:58:24.624Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -958,7 +958,10 @@ msgstr ""
 msgid "Select a Period"
 msgstr ""
 
-msgid "Select a period"
+msgid "Previous Value"
+msgstr ""
+
+msgid "Next Value"
 msgstr ""
 
 msgid "Editable New"
diff --git a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
index f7bcb33d..efa56a36 100644
--- a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
+++ b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
@@ -4,7 +4,7 @@ import i18n from "../../locales";
 import { IndicatorValidation } from "../../domain/entities/IndicatorValidation";
 import { Maybe } from "../../types/utils";
 import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
-import { Button, Grid, makeStyles, Paper, Typography } from "@material-ui/core";
+import { Button, Grid, makeStyles, Typography } from "@material-ui/core";
 import { IndicatorValidationTable } from "./IndicatorValidationTable";
 import PageHeader from "../../components/page-header/PageHeader";
 import { useHistory } from "react-router-dom";

From bf6bdc46f2a885f7554e7064db1b9576fa133a42 Mon Sep 17 00:00:00 2001
From: Arnau Sanchez <pyarnau@gmail.com>
Date: Tue, 5 Nov 2024 09:34:44 +0100
Subject: [PATCH 18/51] Run analytics in cloning process

---
 deploy/deploy-test-from-pro.sh     | 1 +
 deploy/deploy-training-from-pro.sh | 1 +
 deploy/tasks.sh                    | 5 +++++
 3 files changed, 7 insertions(+)

diff --git a/deploy/deploy-test-from-pro.sh b/deploy/deploy-test-from-pro.sh
index 6879384f..633c62bb 100755
--- a/deploy/deploy-test-from-pro.sh
+++ b/deploy/deploy-test-from-pro.sh
@@ -33,6 +33,7 @@ post_clone() {
     change_server_name "$url" "SP Platform - Test"
     set_logos "$url" "$script_dir/test-icons"
     set_email_password "$url"
+    run_analytics "$url"
 }
 
 main() {
diff --git a/deploy/deploy-training-from-pro.sh b/deploy/deploy-training-from-pro.sh
index 891f3896..5506b8d5 100644
--- a/deploy/deploy-training-from-pro.sh
+++ b/deploy/deploy-training-from-pro.sh
@@ -19,6 +19,7 @@ training_post_clone() {
     change_server_name "$url" "SP Platform - Training"
     add_users_to_maintainer_roles "$url"
     set_logos "$url" "$script_dir/icons/training"
+    run_analytics "$url"
 }
 
 get_app_version() {
diff --git a/deploy/tasks.sh b/deploy/tasks.sh
index cb99df35..c1813804 100755
--- a/deploy/tasks.sh
+++ b/deploy/tasks.sh
@@ -63,3 +63,8 @@ set_logos() {
         -H "Content-Type: multipart/form-data" \
         "$url/api/staticContent/logo_banner"
 }
+
+run_analytics() {
+    local url=$1
+    curl -sS -u "$auth" "$url/api/resourceTables/analytics" -X POST | jq
+}

From fe9278418497774d529a38af4ce2d184b0444e96 Mon Sep 17 00:00:00 2001
From: Arnau Sanchez <pyarnau@gmail.com>
Date: Tue, 5 Nov 2024 09:35:25 +0100
Subject: [PATCH 19/51] Fix linting warning

---
 src/pages/data-approval/DataApprovalTable.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/data-approval/DataApprovalTable.tsx b/src/pages/data-approval/DataApprovalTable.tsx
index 7e2c85b1..f1131203 100644
--- a/src/pages/data-approval/DataApprovalTable.tsx
+++ b/src/pages/data-approval/DataApprovalTable.tsx
@@ -34,8 +34,4 @@ export const DataApprovalTable: React.FunctionComponent<DataApprovalTableProps>
     return <Plugin width="1000" pluginSource={pluginUrl} showAlertsInPlugin={true} />;
 };
 
-const styles = {
-    iframe: { border: "none", overflow: "hidden" },
-};
-
 export default React.memo(DataApprovalTable);

From 120ebde72dffe9a2a36f613d5b32180326c7752c Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Wed, 6 Nov 2024 16:08:06 -0500
Subject: [PATCH 20/51] add country project indicators report

---
 i18n/en.pot                                   |  46 +++-
 package.json                                  |   2 +-
 src/CompositionRoot.ts                        |  25 +-
 src/data/common.ts                            |   2 +
 src/data/common/D2ApiUbSettings.ts            | 233 ++++++++++++++++++
 .../repositories/DataValueD2Repository.ts     |  36 +--
 .../IndicatorReportD2Repository.ts            | 161 ++++++++++++
 src/data/repositories/ProjectD2Repository.ts  |  30 +++
 ...UniqueBeneficiariesSettingsD2Repository.ts | 176 +------------
 src/domain/entities/IndicatorCalculation.ts   |   8 +-
 src/domain/entities/IndicatorReport.tsx       |  58 +++++
 src/domain/entities/IndicatorValidation.ts    |  16 +-
 .../entities/UniqueBeneficiariesPeriod.ts     |   2 +
 .../repositories/IndicatorReportRepository.ts |   7 +
 src/domain/repositories/ProjectRepository.ts  |   2 +
 .../UniqueBeneficiariesSettingsRepository.ts  |   1 +
 .../GetIndicatorsValidationUseCase.ts         |  23 +-
 .../usecases/GetProjectsByCountryUseCase.ts   | 188 ++++++++++++++
 .../usecases/SaveIndicatorReportUseCase.ts    |  16 ++
 .../SaveIndicatorsValidationUseCase.ts        |   8 +-
 src/hooks/UniqueBeneficiaries.ts              |   7 +-
 src/hooks/utils.ts                            |  17 ++
 .../CountryIndicatorReport.tsx                | 202 +++++++++++++++
 .../IndicatorReportTable.tsx                  | 165 +++++++++++++
 .../country-indicator-report/excel-report.ts  |  57 +++++
 .../IndicatorValidationForm.tsx               |  22 +-
 .../IndicatorValidationTable.tsx              |   2 +-
 src/pages/projects-list/ProjectsList.tsx      |  33 ++-
 src/pages/root/Root.tsx                       |   6 +
 .../UniqueBeneficiariesPeriodsPage.tsx        |   7 +-
 src/router.ts                                 |   1 +
 src/utils/date.ts                             |   5 +
 yarn.lock                                     |   9 +-
 33 files changed, 1296 insertions(+), 277 deletions(-)
 create mode 100644 src/data/common/D2ApiUbSettings.ts
 create mode 100644 src/data/repositories/IndicatorReportD2Repository.ts
 create mode 100644 src/domain/entities/IndicatorReport.tsx
 create mode 100644 src/domain/repositories/IndicatorReportRepository.ts
 create mode 100644 src/domain/usecases/GetProjectsByCountryUseCase.ts
 create mode 100644 src/domain/usecases/SaveIndicatorReportUseCase.ts
 create mode 100644 src/hooks/utils.ts
 create mode 100644 src/pages/country-indicator-report/CountryIndicatorReport.tsx
 create mode 100644 src/pages/country-indicator-report/IndicatorReportTable.tsx
 create mode 100644 src/pages/country-indicator-report/excel-report.ts

diff --git a/i18n/en.pot b/i18n/en.pot
index ca0db50b..ed5d0849 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-10-26T21:58:24.624Z\n"
-"PO-Revision-Date: 2024-10-26T21:58:24.624Z\n"
+"POT-Creation-Date: 2024-11-06T13:59:57.869Z\n"
+"PO-Revision-Date: 2024-11-06T13:59:57.869Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -162,6 +162,9 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+msgid "Loading..."
+msgstr ""
+
 msgid "Projects view"
 msgstr ""
 
@@ -861,6 +864,42 @@ msgstr ""
 msgid "Non-COVID-19"
 msgstr ""
 
+msgid "Country Project & Indicators"
+msgstr ""
+
+msgid "Select period"
+msgstr ""
+
+msgid "No projects found for selected period: {{period}}"
+msgstr ""
+
+msgid "Saving..."
+msgstr ""
+
+msgid "Loading projects and indicators..."
+msgstr ""
+
+msgid "Selected Activity Indicators"
+msgstr ""
+
+msgid "Unique Beneficiaries"
+msgstr ""
+
+msgid "Include?"
+msgstr ""
+
+msgid "Total Unique Served"
+msgstr ""
+
+msgid "Country Unique Beneficiaries"
+msgstr ""
+
+msgid "N/A"
+msgstr ""
+
+msgid "Country Projects & Indicators"
+msgstr ""
+
 msgid "Award Number Dashboard"
 msgstr ""
 
@@ -911,9 +950,6 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-msgid "Loading..."
-msgstr ""
-
 msgid "There is no data for this month"
 msgstr ""
 
diff --git a/package.json b/package.json
index 9a5442cc..82e61362 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
         "@dhis2/d2-ui-forms": "^6.5.3",
         "@dhis2/ui": "6.12.0",
         "@dhis2/ui-core": "^4.8.0",
-        "@eyeseetea/d2-api": "1.14.0",
+        "@eyeseetea/d2-api": "1.16.0-beta.13",
         "@eyeseetea/d2-ui-components": "2.7.0",
         "@eyeseetea/feedback-component": "0.1.2",
         "@krakenjs/post-robot": "^11.0.0",
diff --git a/src/CompositionRoot.ts b/src/CompositionRoot.ts
index 69be911b..44e040a2 100644
--- a/src/CompositionRoot.ts
+++ b/src/CompositionRoot.ts
@@ -3,13 +3,16 @@ import { DataValueD2Repository } from "./data/repositories/DataValueD2Repository
 import { DataValueExportJsonRepository } from "./data/repositories/DataValueExportJsonRepository";
 import { ExportDataElementJsonRepository } from "./data/repositories/ExportDataElementJsonRepository";
 import { ImportDataElementSpreadSheetRepository } from "./data/repositories/ImportDataElementSpreadSheetRepository";
+import { IndicatorReportD2Repository } from "./data/repositories/IndicatorReportD2Repository";
 import { OrgUnitD2Repository } from "./data/repositories/OrgUnitD2Repository";
 import { ProjectD2Repository } from "./data/repositories/ProjectD2Repository";
 import { UniqueBeneficiariesSettingsD2Repository } from "./data/repositories/UniqueBeneficiariesSettingsD2Repository";
 import { GetIndicatorsValidationUseCase } from "./domain/usecases/GetIndicatorsValidationUseCase";
+import { GetProjectsByCountryUseCase } from "./domain/usecases/GetProjectsByCountryUseCase";
 import { GetUniqueBeneficiariesSettingsUseCase } from "./domain/usecases/GetUniqueBeneficiariesSettingsUseCase";
 import { ImportDataElementsUseCase } from "./domain/usecases/ImportDataElementsUseCase";
 import { RemoveUniqueBeneficiariesPeriodUseCase } from "./domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase";
+import { SaveIndicatorReportUseCase } from "./domain/usecases/SaveIndicatorReportUseCase";
 import { SaveIndicatorsValidationUseCase } from "./domain/usecases/SaveIndicatorsValidationUseCase";
 import { SaveUniqueBeneficiariesSettingsUseCase } from "./domain/usecases/SaveUniqueBeneficiariesSettingsUseCase";
 import { Config } from "./models/Config";
@@ -27,6 +30,7 @@ export function getCompositionRoot(api: D2Api, config: Config) {
     const dataValueExportRepository = new DataValueExportJsonRepository();
     const orgUnitRepository = new OrgUnitD2Repository(api);
     const projectRepository = new ProjectD2Repository(api, config);
+    const indicatorReportRepository = new IndicatorReportD2Repository(api, config);
 
     return {
         dataElements: {
@@ -51,15 +55,24 @@ export function getCompositionRoot(api: D2Api, config: Config) {
             ),
         },
         indicators: {
-            getValidation: new GetIndicatorsValidationUseCase({
+            getValidation: new GetIndicatorsValidationUseCase(
                 dataValueRepository,
                 uniqueBeneficiariesSettingsRepository,
                 projectRepository,
-                config,
-            }),
-            saveValidation: new SaveIndicatorsValidationUseCase({
-                settingsRepository: uniqueBeneficiariesSettingsRepository,
-            }),
+                config
+            ),
+            saveValidation: new SaveIndicatorsValidationUseCase(
+                uniqueBeneficiariesSettingsRepository
+            ),
+            saveReports: new SaveIndicatorReportUseCase(indicatorReportRepository),
+        },
+        projects: {
+            getByCountry: new GetProjectsByCountryUseCase(
+                projectRepository,
+                uniqueBeneficiariesSettingsRepository,
+                dataElementRepository,
+                indicatorReportRepository
+            ),
         },
     };
 }
diff --git a/src/data/common.ts b/src/data/common.ts
index 16d5ce46..03c40a2d 100644
--- a/src/data/common.ts
+++ b/src/data/common.ts
@@ -20,3 +20,5 @@ export function getExistingAndNewDataElements(dataElements: DataElement[]) {
 
     return { existingDataElements, existingDataElementsKeys, newDataElements, newDataElementsKeys };
 }
+
+export const DATA_MANAGEMENT_NAMESPACE = "data-management-app";
diff --git a/src/data/common/D2ApiUbSettings.ts b/src/data/common/D2ApiUbSettings.ts
new file mode 100644
index 00000000..65d08fba
--- /dev/null
+++ b/src/data/common/D2ApiUbSettings.ts
@@ -0,0 +1,233 @@
+import _ from "lodash";
+import { generateUid } from "d2/uid";
+import {
+    IndicatorValidation,
+    IndicatorValidationAttrs,
+} from "../../domain/entities/IndicatorValidation";
+import { Id } from "../../domain/entities/Ref";
+import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
+import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
+import { D2Api, DataStore } from "../../types/d2-api";
+import { Maybe } from "../../types/utils";
+import {
+    IndicatorCalculation,
+    IndicatorCalculationAttrs,
+} from "../../domain/entities/IndicatorCalculation";
+import { DATA_MANAGEMENT_NAMESPACE } from "../common";
+
+export class D2ApiUbSettings {
+    private dataStore: DataStore;
+    private namespace = DATA_MANAGEMENT_NAMESPACE;
+
+    constructor(private api: D2Api) {
+        this.dataStore = this.api.dataStore(this.namespace);
+    }
+
+    async getAll(): Promise<UniqueBeneficiariesSettings[]> {
+        return this.getAllSettings(1, []);
+    }
+
+    async get(projectId: Id): Promise<UniqueBeneficiariesSettings> {
+        const d2Response = await this.dataStore
+            .get<D2ProjectSettings>(this.buildKeyId(projectId))
+            .getData();
+
+        return this.buildSettings(d2Response, projectId);
+    }
+
+    private buildSettings(d2Response: Maybe<D2ProjectSettings>, projectId: string) {
+        const periods = this.mergeDefaultPeriodsWithExisting(
+            d2Response?.uniqueBeneficiaries?.periods
+        );
+
+        const indicatorsIds = d2Response?.uniqueBeneficiaries?.indicatorsIds || [];
+        const indicatorsValidation = d2Response?.uniqueBeneficiaries?.indicatorsValidation || [];
+
+        const hasIndicatorsValidation = indicatorsValidation.length > 0;
+        const indicatorsToInclude = hasIndicatorsValidation
+            ? this.buildExistingIndicatorsValidation(d2Response, periods)
+            : this.buildIndicatorsValidationFromPeriods(periods, indicatorsIds);
+
+        return {
+            projectId: projectId,
+            periods,
+            indicatorsIds: indicatorsIds,
+            indicatorsValidation: indicatorsToInclude,
+        };
+    }
+
+    async save(settings: UniqueBeneficiariesSettings): Promise<void> {
+        const existingSettings = await this.dataStore
+            .get<D2ProjectSettings>(this.buildKeyId(settings.projectId))
+            .getData();
+
+        const currentDate = new Date().toISOString();
+
+        const d2SettingsToSave: D2ProjectSettings = {
+            ...existingSettings,
+            uniqueBeneficiaries: {
+                ...(existingSettings?.uniqueBeneficiaries || {}),
+                indicatorsIds: existingSettings?.uniqueBeneficiaries?.indicatorsIds || [],
+                periods: this.buildPeriods(settings.periods),
+                indicatorsValidation: settings.indicatorsValidation.map(indicatorValidation => {
+                    return {
+                        periodId: indicatorValidation.period.id,
+                        createdAt: indicatorValidation.createdAt || currentDate,
+                        lastUpdatedAt: currentDate,
+                        indicatorsCalculation: indicatorValidation.indicatorsCalculation.map(
+                            indicatorCalculation => {
+                                return {
+                                    comment: indicatorCalculation.comment,
+                                    editableNewValue: indicatorCalculation.editableNewValue,
+                                    id: indicatorCalculation.id,
+                                    newValue: indicatorCalculation.newValue,
+                                    returningValue: indicatorCalculation.returningValue,
+                                    total: IndicatorCalculation.getTotal(indicatorCalculation),
+                                    code: "",
+                                    name: "",
+                                };
+                            }
+                        ),
+                    };
+                }),
+            },
+        };
+
+        await this.dataStore.save(this.buildKeyId(settings.projectId), d2SettingsToSave).getData();
+    }
+
+    private async getAllSettings(
+        page: number,
+        settings: UniqueBeneficiariesSettings[]
+    ): Promise<UniqueBeneficiariesSettings[]> {
+        const response = await this.getEntriesPaginated(page);
+        const settingsFromEntries = this.convertEntriesToSettings(response.entries);
+        const acumSettings = [...settings, ...settingsFromEntries];
+        return response.entries.length === 0
+            ? acumSettings
+            : this.getAllSettings(page + 1, acumSettings);
+    }
+
+    private convertEntriesToSettings(entries: D2Entries[]): UniqueBeneficiariesSettings[] {
+        return entries.map((d2Entry): UniqueBeneficiariesSettings => {
+            return this.buildSettings(d2Entry, d2Entry.key.replace(this.getProjectKey(), ""));
+        });
+    }
+
+    private getEntriesPaginated(page: number): Promise<D2DataStoreResponse> {
+        return this.api
+            .request<D2DataStoreResponse>({
+                method: "get",
+                url: `/dataStore/${this.namespace}`,
+                params: { page: page, pageSize: 50, fields: "uniqueBeneficiaries" },
+            })
+            .getData();
+    }
+
+    private buildIndicatorsValidationFromPeriods(
+        periods: UniqueBeneficiariesPeriod[],
+        indicatorsIds: Id[]
+    ): IndicatorValidation[] {
+        return periods.map(period => {
+            return IndicatorValidation.build({
+                createdAt: "",
+                lastUpdatedAt: "",
+                period,
+                indicatorsCalculation: indicatorsIds.map(indicatorId => {
+                    return IndicatorCalculation.build({
+                        id: indicatorId,
+                        newValue: 0,
+                        editableNewValue: undefined,
+                        returningValue: undefined,
+                        comment: "",
+                        code: "",
+                        name: "",
+                    }).get();
+                }),
+            }).get();
+        });
+    }
+
+    private buildExistingIndicatorsValidation(
+        settings: Maybe<D2ProjectSettings>,
+        periods: UniqueBeneficiariesPeriod[]
+    ): IndicatorValidation[] {
+        return _(settings?.uniqueBeneficiaries?.indicatorsValidation || [])
+            .map(d2IndicatorValidation => {
+                const period = periods.find(period => period.id === d2IndicatorValidation.periodId);
+                if (!period) return undefined;
+
+                return IndicatorValidation.build({
+                    createdAt: d2IndicatorValidation.createdAt,
+                    lastUpdatedAt: d2IndicatorValidation.lastUpdatedAt,
+                    period: period,
+                    indicatorsCalculation: d2IndicatorValidation.indicatorsCalculation.map(
+                        d2IndicatorCalculation => {
+                            return IndicatorCalculation.build({
+                                ...d2IndicatorCalculation,
+                                code: "",
+                            }).get();
+                        }
+                    ),
+                }).get();
+            })
+            .compact()
+            .value();
+    }
+
+    private buildPeriods(periods: UniqueBeneficiariesPeriod[]): UniqueBeneficiariesPeriod[] {
+        const periodsWithIds = this.validateIdsInPeriods(periods);
+        return this.excludeDefaultPeriods(periodsWithIds);
+    }
+
+    private validateIdsInPeriods(
+        periods: UniqueBeneficiariesPeriod[]
+    ): UniqueBeneficiariesPeriod[] {
+        return periods.map(period => {
+            if (!period.id) {
+                return UniqueBeneficiariesPeriod.build({ ...period, id: generateUid() }).get();
+            }
+            return period;
+        });
+    }
+
+    private getProjectKey() {
+        return "project-";
+    }
+
+    private buildKeyId(projectId: Id) {
+        return `${this.getProjectKey()}${projectId}`;
+    }
+
+    private excludeDefaultPeriods(periods: UniqueBeneficiariesPeriod[]) {
+        return periods.filter(period => !UniqueBeneficiariesPeriod.isProtected(period));
+    }
+
+    private mergeDefaultPeriodsWithExisting(existingPeriods: Maybe<UniqueBeneficiariesPeriod[]>) {
+        const defaultData = UniqueBeneficiariesPeriod.defaultPeriods();
+        if (!existingPeriods) return defaultData;
+        return [
+            ...existingPeriods.map(period => UniqueBeneficiariesPeriod.build(period).get()),
+            ...defaultData,
+        ];
+    }
+}
+
+type D2DataStoreResponse = { pager: { page: number; pageSize: number }; entries: D2Entries[] };
+type D2Entries = { key: string; uniqueBeneficiaries: D2UniqueBeneficiary };
+
+type D2ProjectSettings = { uniqueBeneficiaries?: D2UniqueBeneficiary };
+
+type D2IndicatorValidation = Omit<IndicatorValidationAttrs, "period" | "indicatorsCalculation"> & {
+    periodId: Id;
+    indicatorsCalculation: Omit<
+        IndicatorCalculationAttrs,
+        "previousValue" | "nextValue" | "code"
+    >[];
+};
+
+type D2UniqueBeneficiary = {
+    periods: UniqueBeneficiariesPeriod[];
+    indicatorsIds: Id[];
+    indicatorsValidation: D2IndicatorValidation[];
+};
diff --git a/src/data/repositories/DataValueD2Repository.ts b/src/data/repositories/DataValueD2Repository.ts
index 246201d0..e0b69c39 100644
--- a/src/data/repositories/DataValueD2Repository.ts
+++ b/src/data/repositories/DataValueD2Repository.ts
@@ -5,14 +5,7 @@ import {
     GetDataValueOptions,
 } from "../../domain/repositories/DataValueRepository";
 import { D2DataElementGroup } from "./D2DataElementGroup";
-import { Ref } from "../../domain/entities/Ref";
-import { DataElementGroup } from "../DataElementGroup";
-import { getUid } from "../../utils/dhis2";
-import { Maybe } from "../../types/utils";
 import { writeToDisk } from "../../scripts/utils/logger";
-
-const DE_DELETE_GROUP_CODE = "DEG_TEMP_REMOVE_DATAELEMENTS";
-
 export class DataValueD2Repository implements DataValueRepository {
     d2DataElementGroup: D2DataElementGroup;
     constructor(private api: D2Api) {
@@ -20,22 +13,18 @@ export class DataValueD2Repository implements DataValueRepository {
     }
 
     async get(options: GetDataValueOptions): Promise<DataValue[]> {
-        const dataElementGroup = await this.createTempDataElementGroup(options);
         const res$ = this.api.dataValues.getSet({
             dataSet: options.dataSetIds || [],
+            dataElement: options.dataElementsIds || [],
             orgUnit: options.orgUnitIds,
-            dataElementGroup: dataElementGroup ? [dataElementGroup.id] : undefined,
             children: options.children,
             includeDeleted: false,
             startDate: options.startDate,
             endDate: options.endDate,
         });
         const res = await res$.getData();
-        if (dataElementGroup) {
-            await this.d2DataElementGroup.remove([dataElementGroup]);
-            if (options.logDataElements) {
-                await this.exportSqlAuditDataElements(dataElementGroup.dataElements);
-            }
+        if (options.logDataElements && options.dataElementsIds) {
+            await this.exportSqlAuditDataElements(options.dataElementsIds);
         }
         return res.dataValues;
     }
@@ -54,24 +43,7 @@ export class DataValueD2Repository implements DataValueRepository {
         console.info("Soft deleted data values finished.");
     }
 
-    private async createTempDataElementGroup(
-        options: GetDataValueOptions
-    ): Promise<Maybe<DataElementGroup>> {
-        if (!options.dataElementsIds) return undefined;
-        const tempDataElementGroup: DataElementGroup = {
-            id: getUid("dataElementGroups", DE_DELETE_GROUP_CODE),
-            code: DE_DELETE_GROUP_CODE,
-            name: DE_DELETE_GROUP_CODE,
-            shortName: DE_DELETE_GROUP_CODE,
-            dataElements: options.dataElementsIds.map(dataElementId => ({ id: dataElementId })),
-        };
-        const ids = [tempDataElementGroup.id];
-        await this.d2DataElementGroup.save(ids, [tempDataElementGroup], [], { post: true });
-        return tempDataElementGroup;
-    }
-
-    private async exportSqlAuditDataElements(dataElements: Ref[]): Promise<void> {
-        const dataElementsIds = dataElements.map(dataElement => `'${dataElement.id}'`).join(",");
+    private async exportSqlAuditDataElements(dataElementsIds: string[]): Promise<void> {
         const sqlContent = `delete from datavalueaudit where dataelementid IN (select dataelementid from dataelement where uid IN (${dataElementsIds}));`;
         writeToDisk("audit_data_element.sql", sqlContent);
     }
diff --git a/src/data/repositories/IndicatorReportD2Repository.ts b/src/data/repositories/IndicatorReportD2Repository.ts
new file mode 100644
index 00000000..814374f0
--- /dev/null
+++ b/src/data/repositories/IndicatorReportD2Repository.ts
@@ -0,0 +1,161 @@
+import _ from "lodash";
+import { D2Api, DataStore } from "../../types/d2-api";
+import {
+    IndicatorReport,
+    IndicatorReportToSave,
+    ProjectCountry,
+} from "../../domain/entities/IndicatorReport";
+import { IndicatorReportRepository } from "../../domain/repositories/IndicatorReportRepository";
+import { DATA_MANAGEMENT_NAMESPACE } from "../common";
+import { Id, ISODateTimeString } from "../../domain/entities/Ref";
+import { D2ApiUbSettings } from "../common/D2ApiUbSettings";
+import Project from "../../models/Project";
+import { promiseMap } from "../../migrations/utils";
+import { Config } from "../../models/Config";
+import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
+import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
+import { D2DataElement } from "./D2DataElement";
+
+export class IndicatorReportD2Repository implements IndicatorReportRepository {
+    private prefixKey = "ubreport";
+    private dataStore: DataStore;
+    private d2ApiUbSettings: D2ApiUbSettings;
+    private d2ApiDataElement: D2DataElement;
+
+    constructor(private api: D2Api, private config: Config) {
+        this.dataStore = this.api.dataStore(DATA_MANAGEMENT_NAMESPACE);
+        this.d2ApiUbSettings = new D2ApiUbSettings(this.api);
+        this.d2ApiDataElement = new D2DataElement(this.api, this.config);
+    }
+
+    async getByCountry(countryId: Id): Promise<IndicatorReport[]> {
+        const response = await this.dataStore.get<D2Response[]>(this.buildKey(countryId)).getData();
+        return this.buildReportsFromResponse(response || []);
+    }
+
+    async save(reports: IndicatorReportToSave[], countryId: Id): Promise<void> {
+        const existingReports = await this.dataStore
+            .get<D2Response[]>(this.buildKey(countryId))
+            .getData();
+
+        const reportsToSave = this.buildD2IndicatorReport(reports, existingReports || []);
+
+        await this.dataStore.save(this.buildKey(countryId), reportsToSave).getData();
+    }
+
+    private buildD2IndicatorReport(
+        reports: IndicatorReportToSave[],
+        existingReports: D2Response[]
+    ) {
+        const currentDate = new Date().toISOString();
+        return reports.map((report): D2Response => {
+            const existingRecord = existingReports?.find(
+                item => item.periodId === report.period.id
+            );
+
+            return {
+                countryId: report.countryId,
+                createdAt: existingRecord?.createdAt || currentDate,
+                updatedAt: currentDate,
+                periodId: report.period.id,
+                projects: report.projects.map((project): D2Response["projects"][number] => ({
+                    id: project.id,
+                    indicators: project.indicators.map(indicator => ({
+                        include: indicator.include,
+                        indicatorId: indicator.indicatorId,
+                        value: indicator.value || 0,
+                        periodNotAvailable: indicator.periodNotAvailable,
+                    })),
+                })),
+            };
+        });
+    }
+
+    private async buildReportsFromResponse(responses: D2Response[]): Promise<IndicatorReport[]> {
+        const projectIds = responses.flatMap(item => item.projects.map(project => project.id));
+        const projects = await this.getProjectsByIds(projectIds);
+        const settings = await this.d2ApiUbSettings.getAll();
+        const dataElementsIds = settings.flatMap(setting => setting.indicatorsIds);
+        const dataElements = await this.d2ApiDataElement.getByIds(dataElementsIds);
+        const settingsByProjects = settings.filter(setting =>
+            projectIds.includes(setting.projectId)
+        );
+        const periods = this.getPeriods(settingsByProjects);
+
+        return responses.map(response => {
+            const currentPeriod = periods.find(period => period.id === response.periodId);
+            if (!currentPeriod) throw Error(`Period ${response.periodId} not found`);
+
+            return IndicatorReport.create({
+                countryId: response.countryId,
+                createdAt: response.createdAt,
+                lastUpdatedAt: response.updatedAt,
+                period: currentPeriod,
+                projects: _(response.projects)
+                    .map(project => {
+                        const projectDetails = projects.find(
+                            projectDetail => projectDetail.id === project.id
+                        );
+                        if (!projectDetails) return undefined;
+
+                        return {
+                            id: project.id,
+                            indicators: project.indicators.map(indicator => {
+                                const dataElementDetails = dataElements.find(
+                                    dataElement => dataElement.id === indicator.indicatorId
+                                );
+                                return {
+                                    include: indicator.include,
+                                    indicatorId: indicator.indicatorId,
+                                    indicatorCode: dataElementDetails?.code || "",
+                                    indicatorName: dataElementDetails?.name || "",
+                                    value: indicator.value,
+                                    periodNotAvailable: indicator.periodNotAvailable,
+                                };
+                            }),
+                            project: projectDetails,
+                        };
+                    })
+                    .compact()
+                    .value(),
+            });
+        });
+    }
+
+    private getPeriods(settings: UniqueBeneficiariesSettings[]): UniqueBeneficiariesPeriod[] {
+        return _(settings)
+            .flatMap(setting => setting.periods)
+            .uniqBy(period => period.id)
+            .value();
+    }
+
+    private async getProjectsByIds(projectIds: Id[]): Promise<ProjectCountry[]> {
+        const projects = await promiseMap(projectIds, id => Project.get(this.api, this.config, id));
+        return projects.map(project => ({
+            closedDate: project.endDate?.toISOString() || "",
+            id: project.id,
+            name: project.name,
+            openingDate: project.startDate?.toISOString() || "",
+        }));
+    }
+
+    private buildKey(countryId: Id) {
+        return `${this.prefixKey}-${countryId}`;
+    }
+}
+
+type D2Response = {
+    countryId: Id;
+    periodId: Id;
+    createdAt: ISODateTimeString;
+    updatedAt: ISODateTimeString;
+    projects: Array<{
+        id: Id;
+        indicators: Array<{
+            include: boolean;
+            indicatorId: Id;
+            value: number;
+            periodNotAvailable: boolean;
+        }>;
+    }>;
+};
diff --git a/src/data/repositories/ProjectD2Repository.ts b/src/data/repositories/ProjectD2Repository.ts
index 6afac01f..c0974ca8 100644
--- a/src/data/repositories/ProjectD2Repository.ts
+++ b/src/data/repositories/ProjectD2Repository.ts
@@ -2,6 +2,7 @@ import { Id } from "../../domain/entities/Ref";
 import { ProjectRepository } from "../../domain/repositories/ProjectRepository";
 import { Config } from "../../models/Config";
 import Project from "../../models/Project";
+import { ProjectForList } from "../../models/ProjectsList";
 import { D2Api } from "../../types/d2-api";
 
 export class ProjectD2Repository implements ProjectRepository {
@@ -10,4 +11,33 @@ export class ProjectD2Repository implements ProjectRepository {
     async getById(id: Id): Promise<Project> {
         return Project.get(this.api, this.config, id);
     }
+
+    async getByCountries(countryId: Id): Promise<ProjectForList[]> {
+        return this.getAllProjectsByCountry(countryId, 1, []);
+    }
+
+    private async getAllProjectsByCountry(
+        countryId: Id,
+        initialPage: number,
+        initialProjects: ProjectForList[]
+    ) {
+        const response = await this.getByCountry(countryId, initialPage);
+        const newProjects = [...initialProjects, ...response.objects];
+        if (response.pager.page >= response.pager.pageCount) {
+            return newProjects;
+        } else {
+            const projects = await this.getByCountry(countryId, initialPage + 1);
+            return projects.objects;
+        }
+    }
+
+    private getByCountry(countryId: Id, page: number) {
+        return Project.getList(
+            this.api,
+            this.config,
+            { countryIds: [countryId], onlyActive: true },
+            { field: "created", order: "desc" },
+            { page: page, pageSize: 50 }
+        );
+    }
 }
diff --git a/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts b/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
index 32dbcfc2..573fe4d3 100644
--- a/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
+++ b/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
@@ -1,181 +1,27 @@
-import _ from "lodash";
-import { generateUid } from "d2/uid";
-import {
-    IndicatorValidation,
-    IndicatorValidationAttrs,
-} from "../../domain/entities/IndicatorValidation";
 import { Id } from "../../domain/entities/Ref";
-import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
 import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
 import { UniqueBeneficiariesSettingsRepository } from "../../domain/repositories/UniqueBeneficiariesSettingsRepository";
-import { D2Api, DataStore } from "../../types/d2-api";
-import { Maybe } from "../../types/utils";
-import {
-    IndicatorCalculation,
-    IndicatorCalculationAttrs,
-} from "../../domain/entities/IndicatorCalculation";
+import { D2Api } from "../../types/d2-api";
+import { D2ApiUbSettings } from "../common/D2ApiUbSettings";
 
 export class UniqueBeneficiariesSettingsD2Repository
     implements UniqueBeneficiariesSettingsRepository
 {
-    private dataStore: DataStore;
-    constructor(private api: D2Api) {
-        this.dataStore = this.api.dataStore("data-management-app");
-    }
-
-    async get(projectId: Id): Promise<UniqueBeneficiariesSettings> {
-        const d2Response = await this.dataStore
-            .get<D2ProjectSettings>(this.buildKeyId(projectId))
-            .getData();
-
-        const periods = this.mergeDefaultPeriodsWithExisting(
-            d2Response?.uniqueBeneficiaries?.periods
-        );
-
-        const indicatorsIds = d2Response?.uniqueBeneficiaries?.indicatorsIds || [];
-        const indicatorsValidation = d2Response?.uniqueBeneficiaries?.indicatorsValidation || [];
-
-        const hasIndicatorsValidation = indicatorsValidation.length > 0;
-        const indicatorsToInclude = hasIndicatorsValidation
-            ? this.buildExistingIndicatorsValidation(d2Response, periods)
-            : this.buildIndicatorsValidationFromPeriods(periods, indicatorsIds);
-
-        return {
-            projectId: projectId,
-            periods,
-            indicatorsIds: indicatorsIds,
-            indicatorsValidation: indicatorsToInclude,
-        };
-    }
-
-    async save(settings: UniqueBeneficiariesSettings): Promise<void> {
-        const existingSettings = await this.dataStore
-            .get<D2ProjectSettings>(this.buildKeyId(settings.projectId))
-            .getData();
-
-        const d2SettingsToSave: D2ProjectSettings = {
-            ...existingSettings,
-            uniqueBeneficiaries: {
-                ...(existingSettings?.uniqueBeneficiaries || {}),
-                indicatorsIds: existingSettings?.uniqueBeneficiaries?.indicatorsIds || [],
-                periods: this.buildPeriods(settings.periods),
-                indicatorsValidation: settings.indicatorsValidation.map(indicatorValidation => {
-                    return {
-                        periodId: indicatorValidation.period.id,
-                        createdAt: indicatorValidation.createdAt,
-                        lastUpdatedAt: indicatorValidation.lastUpdatedAt,
-                        indicatorsCalculation: indicatorValidation.indicatorsCalculation.map(
-                            indicatorCalculation => {
-                                return {
-                                    comment: indicatorCalculation.comment,
-                                    editableNewValue: indicatorCalculation.editableNewValue,
-                                    id: indicatorCalculation.id,
-                                    newValue: indicatorCalculation.newValue,
-                                    returningValue: indicatorCalculation.returningValue,
-                                    total: IndicatorCalculation.getTotal(indicatorCalculation),
-                                };
-                            }
-                        ),
-                    };
-                }),
-            },
-        };
-
-        await this.dataStore.save(this.buildKeyId(settings.projectId), d2SettingsToSave).getData();
-    }
-
-    private buildIndicatorsValidationFromPeriods(
-        periods: UniqueBeneficiariesPeriod[],
-        indicatorsIds: Id[]
-    ): IndicatorValidation[] {
-        return periods.map(period => {
-            return IndicatorValidation.build({
-                createdAt: new Date().toISOString(),
-                lastUpdatedAt: undefined,
-                period,
-                indicatorsCalculation: indicatorsIds.map(indicatorId => {
-                    return IndicatorCalculation.build({
-                        id: indicatorId,
-                        newValue: 0,
-                        editableNewValue: undefined,
-                        returningValue: undefined,
-                        comment: "",
-                    }).get();
-                }),
-            }).get();
-        });
-    }
-
-    private buildExistingIndicatorsValidation(
-        settings: Maybe<D2ProjectSettings>,
-        periods: UniqueBeneficiariesPeriod[]
-    ): IndicatorValidation[] {
-        return _(settings?.uniqueBeneficiaries?.indicatorsValidation || [])
-            .map(d2IndicatorValidation => {
-                const period = periods.find(period => period.id === d2IndicatorValidation.periodId);
-                if (!period) return undefined;
+    private d2ApiUbSettings: D2ApiUbSettings;
 
-                return IndicatorValidation.build({
-                    createdAt: d2IndicatorValidation.createdAt,
-                    lastUpdatedAt: d2IndicatorValidation.lastUpdatedAt,
-                    period: period,
-                    indicatorsCalculation: d2IndicatorValidation.indicatorsCalculation.map(
-                        d2IndicatorCalculation => {
-                            return IndicatorCalculation.build(d2IndicatorCalculation).get();
-                        }
-                    ),
-                }).get();
-            })
-            .compact()
-            .value();
-    }
-
-    private buildPeriods(periods: UniqueBeneficiariesPeriod[]): UniqueBeneficiariesPeriod[] {
-        const periodsWithIds = this.validateIdsInPeriods(periods);
-        return this.excludeDefaultPeriods(periodsWithIds);
-    }
-
-    private validateIdsInPeriods(
-        periods: UniqueBeneficiariesPeriod[]
-    ): UniqueBeneficiariesPeriod[] {
-        return periods.map(period => {
-            if (!period.id) {
-                return UniqueBeneficiariesPeriod.build({ ...period, id: generateUid() }).get();
-            }
-            return period;
-        });
+    constructor(private api: D2Api) {
+        this.d2ApiUbSettings = new D2ApiUbSettings(this.api);
     }
 
-    private buildKeyId(projectId: Id) {
-        return `project-${projectId}`;
+    async getAll(): Promise<UniqueBeneficiariesSettings[]> {
+        return this.d2ApiUbSettings.getAll();
     }
 
-    private excludeDefaultPeriods(periods: UniqueBeneficiariesPeriod[]) {
-        return periods.filter(period => !UniqueBeneficiariesPeriod.isProtected(period));
+    async get(projectId: Id): Promise<UniqueBeneficiariesSettings> {
+        return this.d2ApiUbSettings.get(projectId);
     }
 
-    private mergeDefaultPeriodsWithExisting(existingPeriods: Maybe<UniqueBeneficiariesPeriod[]>) {
-        const defaultData = UniqueBeneficiariesPeriod.defaultPeriods();
-        if (!existingPeriods) return defaultData;
-        return [
-            ...existingPeriods.map(period => UniqueBeneficiariesPeriod.build(period).get()),
-            ...defaultData,
-        ];
+    async save(settings: UniqueBeneficiariesSettings): Promise<void> {
+        await this.d2ApiUbSettings.save(settings);
     }
 }
-
-type D2ProjectSettings = {
-    uniqueBeneficiaries?: {
-        periods: UniqueBeneficiariesPeriod[];
-        indicatorsIds: Id[];
-        indicatorsValidation: D2IndicatorValidation[];
-    };
-};
-
-type D2IndicatorValidation = Omit<IndicatorValidationAttrs, "period" | "indicatorsCalculation"> & {
-    periodId: Id;
-    indicatorsCalculation: Omit<
-        IndicatorCalculationAttrs,
-        "previousValue" | "nextValue" | "code"
-    >[];
-};
diff --git a/src/domain/entities/IndicatorCalculation.ts b/src/domain/entities/IndicatorCalculation.ts
index b2423198..f5b8ac81 100644
--- a/src/domain/entities/IndicatorCalculation.ts
+++ b/src/domain/entities/IndicatorCalculation.ts
@@ -17,7 +17,8 @@ export type IndicatorCalculationAttrs = {
     comment: string;
     previousValue?: number;
     nextValue?: number;
-    code?: Code;
+    code: Code;
+    name: string;
 };
 
 export class IndicatorCalculation extends Struct<IndicatorCalculationAttrs>() {
@@ -81,9 +82,9 @@ export class IndicatorCalculation extends Struct<IndicatorCalculationAttrs>() {
         id: Id,
         existingRecord: Maybe<IndicatorCalculation>,
         dataValues: DataValue[],
-        details: Pick<DataElement, "id" | "code">
+        details: Pick<DataElement, "id" | "code" | "name">,
+        verifyChangesInValues: boolean
     ): IndicatorCalculation {
-        const verifyChangesInValues = Boolean(existingRecord);
         const newValueSum = _(dataValues)
             .filter(dataValue => dataValue.dataElement === id)
             .sumBy(dataValue => Number(dataValue.value || 0));
@@ -103,6 +104,7 @@ export class IndicatorCalculation extends Struct<IndicatorCalculationAttrs>() {
             previousValue: newValueHasChanged ? existingRecord?.newValue : undefined,
             nextValue: newValueHasChanged ? newValueSum : undefined,
             code: details.code,
+            name: details.name,
         }).get();
     }
 
diff --git a/src/domain/entities/IndicatorReport.tsx b/src/domain/entities/IndicatorReport.tsx
new file mode 100644
index 00000000..8738ad7e
--- /dev/null
+++ b/src/domain/entities/IndicatorReport.tsx
@@ -0,0 +1,58 @@
+import { ProjectForList } from "../../models/ProjectsList";
+import { Maybe } from "../../types/utils";
+import { Struct } from "./generic/Struct";
+import { Code, Id, ISODateTimeString } from "./Ref";
+import { UniqueBeneficiariesPeriod } from "./UniqueBeneficiariesPeriod";
+
+export type IndicatorReportAttrs = {
+    period: UniqueBeneficiariesPeriod;
+    countryId: Id;
+    createdAt: ISODateTimeString;
+    lastUpdatedAt: ISODateTimeString;
+    projects: ProjectRows[];
+};
+
+export type IndicatorReportToSave = Omit<IndicatorReportAttrs, "createdAt" | "lastUpdatedAt">;
+
+export type ProjectRows = {
+    id: Id;
+    project: ProjectCountry;
+    indicators: ProjectIndicatorRow[];
+};
+
+export type ProjectCountry = Pick<ProjectForList, "id" | "name" | "openingDate" | "closedDate">;
+
+export type ProjectIndicatorRow = {
+    indicatorId: Id;
+    indicatorCode: Code;
+    indicatorName: string;
+    value: Maybe<number>;
+    include: boolean;
+    periodNotAvailable: boolean;
+};
+
+export class IndicatorReport extends Struct<IndicatorReportAttrs>() {
+    updateProjectIndicators(projectId: Id, indicatorId: Id, include: boolean): IndicatorReport {
+        const newProjects = this.projects.map(project => {
+            if (project.id !== projectId) return project;
+
+            return project.id === projectId
+                ? {
+                      ...project,
+                      indicators: this.updateIndicators(project, indicatorId, include),
+                  }
+                : project;
+        });
+        return this._update({ projects: newProjects });
+    }
+
+    private updateIndicators(
+        project: ProjectRows,
+        indicatorId: Id,
+        include: boolean
+    ): ProjectIndicatorRow[] {
+        return project.indicators.map(indicator =>
+            indicator.indicatorId === indicatorId ? { ...indicator, include } : indicator
+        );
+    }
+}
diff --git a/src/domain/entities/IndicatorValidation.ts b/src/domain/entities/IndicatorValidation.ts
index c515ed55..ddf8322a 100644
--- a/src/domain/entities/IndicatorValidation.ts
+++ b/src/domain/entities/IndicatorValidation.ts
@@ -1,4 +1,3 @@
-import _ from "lodash";
 import { Maybe } from "../../types/utils";
 import { Either } from "./generic/Either";
 import { ValidationError } from "./generic/Errors";
@@ -35,18 +34,9 @@ export class IndicatorValidation extends Struct<IndicatorValidationAttrs>() {
             value: data.period,
         };
 
-        const calculatorsProperty: ValidationError<IndicatorValidation> = {
-            property: "indicatorsCalculation",
-            errors: validateRequired(data.indicatorsCalculation),
-            value: data.indicatorsCalculation,
-        };
-
-        const errors: ValidationError<IndicatorValidation>[] = _([
-            periodProperty,
-            calculatorsProperty,
-        ])
-            .filter(validation => validation.errors.length > 0)
-            .value();
+        const errors: ValidationError<IndicatorValidation>[] = [periodProperty].filter(
+            validation => validation.errors.length > 0
+        );
 
         return errors;
     }
diff --git a/src/domain/entities/UniqueBeneficiariesPeriod.ts b/src/domain/entities/UniqueBeneficiariesPeriod.ts
index c1c4ed92..6ae84f16 100644
--- a/src/domain/entities/UniqueBeneficiariesPeriod.ts
+++ b/src/domain/entities/UniqueBeneficiariesPeriod.ts
@@ -9,6 +9,7 @@ import {
     validatePeriodType,
     validateRequired,
 } from "./generic/Validations";
+import { Id } from "./Ref";
 
 export type PeriodType = typeof periodsTypes[number];
 
@@ -18,6 +19,7 @@ export type UniqueBeneficiariesPeriodsAttrs = {
     type: PeriodType;
     startDateMonth: number;
     endDateMonth: number;
+    projectId?: Id;
 };
 
 export class UniqueBeneficiariesPeriod extends Struct<UniqueBeneficiariesPeriodsAttrs>() {
diff --git a/src/domain/repositories/IndicatorReportRepository.ts b/src/domain/repositories/IndicatorReportRepository.ts
new file mode 100644
index 00000000..3d713314
--- /dev/null
+++ b/src/domain/repositories/IndicatorReportRepository.ts
@@ -0,0 +1,7 @@
+import { IndicatorReport, IndicatorReportToSave } from "../entities/IndicatorReport";
+import { Id } from "../entities/Ref";
+
+export interface IndicatorReportRepository {
+    getByCountry(countryId: Id): Promise<IndicatorReport[]>;
+    save(reports: IndicatorReportToSave[], countryId: Id): Promise<void>;
+}
diff --git a/src/domain/repositories/ProjectRepository.ts b/src/domain/repositories/ProjectRepository.ts
index f88c2a43..bd1e748f 100644
--- a/src/domain/repositories/ProjectRepository.ts
+++ b/src/domain/repositories/ProjectRepository.ts
@@ -1,6 +1,8 @@
 import Project from "../../models/Project";
+import { ProjectForList } from "../../models/ProjectsList";
 import { Id } from "../entities/Ref";
 
 export interface ProjectRepository {
     getById(id: Id): Promise<Project>;
+    getByCountries(countryId: Id): Promise<ProjectForList[]>;
 }
diff --git a/src/domain/repositories/UniqueBeneficiariesSettingsRepository.ts b/src/domain/repositories/UniqueBeneficiariesSettingsRepository.ts
index 65cdc395..08001e67 100644
--- a/src/domain/repositories/UniqueBeneficiariesSettingsRepository.ts
+++ b/src/domain/repositories/UniqueBeneficiariesSettingsRepository.ts
@@ -4,4 +4,5 @@ import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSett
 export interface UniqueBeneficiariesSettingsRepository {
     get(projectId: Id): Promise<UniqueBeneficiariesSettings>;
     save(settings: UniqueBeneficiariesSettings): Promise<void>;
+    getAll(): Promise<UniqueBeneficiariesSettings[]>;
 }
diff --git a/src/domain/usecases/GetIndicatorsValidationUseCase.ts b/src/domain/usecases/GetIndicatorsValidationUseCase.ts
index 7d1e94dc..4a005f81 100644
--- a/src/domain/usecases/GetIndicatorsValidationUseCase.ts
+++ b/src/domain/usecases/GetIndicatorsValidationUseCase.ts
@@ -14,14 +14,12 @@ import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBen
 export class GetIndicatorsValidationUseCase {
     private actualCombination: Ref & { displayName: string };
     constructor(
-        private repositories: {
-            dataValueRepository: DataValueRepository;
-            uniqueBeneficiariesSettingsRepository: UniqueBeneficiariesSettingsRepository;
-            projectRepository: ProjectRepository;
-            config: Config;
-        }
+        private dataValueRepository: DataValueRepository,
+        private uniqueBeneficiariesSettingsRepository: UniqueBeneficiariesSettingsRepository,
+        private projectRepository: ProjectRepository,
+        private config: Config
     ) {
-        this.actualCombination = this.repositories.config.categoryOptionCombos.actual;
+        this.actualCombination = this.config.categoryOptionCombos.actual;
     }
 
     async execute(options: GetIndicatorsOptions): Promise<IndicatorValidation[]> {
@@ -36,11 +34,11 @@ export class GetIndicatorsValidationUseCase {
     }
 
     private async getSettings(projectId: Id): Promise<UniqueBeneficiariesSettings> {
-        return this.repositories.uniqueBeneficiariesSettingsRepository.get(projectId);
+        return this.uniqueBeneficiariesSettingsRepository.get(projectId);
     }
 
     private async getProjectById(projectId: Id): Promise<Project> {
-        return this.repositories.projectRepository.getById(projectId);
+        return this.projectRepository.getById(projectId);
     }
 
     private async getIndicatorsWithValues(
@@ -70,7 +68,7 @@ export class GetIndicatorsValidationUseCase {
         dataSetId: Id,
         projectId: Id,
         settings: UniqueBeneficiariesSettings,
-        indicatorsDetails: Array<{ id: Id; code: Code }>
+        indicatorsDetails: Array<{ id: Id; name: string; code: Code }>
     ): Promise<IndicatorValidation> {
         const dateRange = this.getDatesRange(period);
         const dataValues = await this.getDataValues(dataSetId, projectId, settings, dateRange);
@@ -89,7 +87,8 @@ export class GetIndicatorsValidationUseCase {
                 indicatorId,
                 existingRecord,
                 actualDataValues,
-                details
+                details,
+                Boolean(indicatorCalculation?.createdAt)
             );
         });
 
@@ -108,7 +107,7 @@ export class GetIndicatorsValidationUseCase {
         dateRange: DateRange
     ) {
         const { startDate, endDate } = dateRange;
-        return this.repositories.dataValueRepository.get({
+        return this.dataValueRepository.get({
             dataSetIds: [dataSetId],
             orgUnitIds: [projectId],
             startDate: startDate.toISOString(),
diff --git a/src/domain/usecases/GetProjectsByCountryUseCase.ts b/src/domain/usecases/GetProjectsByCountryUseCase.ts
new file mode 100644
index 00000000..e610cea8
--- /dev/null
+++ b/src/domain/usecases/GetProjectsByCountryUseCase.ts
@@ -0,0 +1,188 @@
+import _ from "lodash";
+import { ProjectForList } from "../../models/ProjectsList";
+import { getId } from "../../utils/dhis2";
+import { DataElement } from "../entities/DataElement";
+import { IndicatorCalculation } from "../entities/IndicatorCalculation";
+import { IndicatorReport, ProjectIndicatorRow, ProjectRows } from "../entities/IndicatorReport";
+import { IndicatorValidation } from "../entities/IndicatorValidation";
+import { Id } from "../entities/Ref";
+import { UniqueBeneficiariesPeriod } from "../entities/UniqueBeneficiariesPeriod";
+import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
+import { DataElementRepository } from "../repositories/DataElementRepository";
+import { IndicatorReportRepository } from "../repositories/IndicatorReportRepository";
+import { ProjectRepository } from "../repositories/ProjectRepository";
+import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBeneficiariesSettingsRepository";
+
+export class GetProjectsByCountryUseCase {
+    constructor(
+        private projectRepository: ProjectRepository,
+        private beneficiariesSettingsRepository: UniqueBeneficiariesSettingsRepository,
+        private dataElementRepository: DataElementRepository,
+        private indicatorRepository: IndicatorReportRepository
+    ) {}
+
+    async execute(options: GetCountryIndicatorsOptions): Promise<IndicatorReport[]> {
+        const [projects, settings, existingReports] = await Promise.all([
+            this.getProjectsByCountry(options.countryId),
+            this.getAllSettings(),
+            this.indicatorRepository.getByCountry(options.countryId),
+        ]);
+
+        const settingsInProjects = this.filterSettingsByProjects(settings, projects);
+        const indicatorsIds = this.getAllIndicatorsIds(settingsInProjects);
+        const dataElements = await this.dataElementRepository.getByIds(indicatorsIds);
+
+        const settingsWithIndicatorsDetails = await this.buildSettingsWithIndicators(
+            settingsInProjects,
+            dataElements
+        );
+
+        return this.buildIndicatorReportFromProjects(
+            projects,
+            settingsWithIndicatorsDetails,
+            existingReports,
+            options.countryId,
+            dataElements
+        );
+    }
+
+    private buildIndicatorReportFromProjects(
+        projects: ProjectForList[],
+        settings: UniqueBeneficiariesSettings[],
+        existingReports: IndicatorReport[],
+        countryId: Id,
+        dataElements: DataElement[]
+    ): IndicatorReport[] {
+        const allPeriods = _(settings)
+            .flatMap(setting => setting.periods)
+            .uniqBy(period => period.id)
+            .value();
+
+        return allPeriods.map((period): IndicatorReport => {
+            const existingData = existingReports.find(
+                report => report.period?.id === period.id && report.countryId === countryId
+            );
+
+            return existingData
+                ? existingData
+                : IndicatorReport.create({
+                      countryId,
+                      createdAt: "",
+                      lastUpdatedAt: "",
+                      period,
+                      projects: this.generateProjects(projects, settings, period, dataElements),
+                  });
+        });
+    }
+
+    private generateProjects(
+        projectsByPeriod: ProjectForList[],
+        settings: UniqueBeneficiariesSettings[],
+        period: UniqueBeneficiariesPeriod,
+        dataElements: DataElement[]
+    ): ProjectRows[] {
+        return _(projectsByPeriod)
+            .map(project => {
+                const settingsProject = settings.find(setting => setting.projectId === project.id);
+
+                if (!settingsProject?.indicatorsIds || settingsProject.indicatorsIds.length === 0)
+                    return undefined;
+
+                const isCustomPeriod = period.type === "CUSTOM";
+                const periodExist = settingsProject?.periods.find(item => item.id === period.id);
+
+                const notIndicatorsAvailable = isCustomPeriod && !periodExist;
+
+                const indicatorsCalculation = settingsProject?.indicatorsValidation
+                    .find(item => item.period.id === period.id)
+                    ?.indicatorsCalculation.map((indicator): ProjectIndicatorRow => {
+                        return {
+                            periodNotAvailable: notIndicatorsAvailable,
+                            include: false,
+                            indicatorCode: indicator.code || "",
+                            indicatorName: indicator.name || "",
+                            indicatorId: indicator.id,
+                            value: IndicatorCalculation.getTotal(indicator),
+                        };
+                    });
+
+                const projectIndicators =
+                    indicatorsCalculation && indicatorsCalculation.length > 0
+                        ? indicatorsCalculation
+                        : settingsProject.indicatorsIds.map((indicatorId): ProjectIndicatorRow => {
+                              const dataElementDetails = dataElements.find(
+                                  dataElement => dataElement.id === indicatorId
+                              );
+                              return {
+                                  periodNotAvailable: notIndicatorsAvailable,
+                                  indicatorId,
+                                  indicatorCode: dataElementDetails?.code || "",
+                                  indicatorName: dataElementDetails?.name || "",
+                                  value: 0,
+                                  include: false,
+                              };
+                          });
+
+                return {
+                    id: project.id,
+                    project: project,
+                    indicators: projectIndicators,
+                };
+            })
+            .compact()
+            .value();
+    }
+
+    private async buildSettingsWithIndicators(
+        settings: UniqueBeneficiariesSettings[],
+        dataElements: DataElement[]
+    ): Promise<UniqueBeneficiariesSettings[]> {
+        return settings.map(setting => {
+            return {
+                ...setting,
+                indicatorsValidation: setting.indicatorsValidation.map(indicatorValidation => {
+                    return IndicatorValidation.build({
+                        ...indicatorValidation,
+                        indicatorsCalculation: indicatorValidation.indicatorsCalculation.map(
+                            indicatorCalculation => {
+                                const dataElement = dataElements.find(
+                                    dataElement => dataElement.id === indicatorCalculation.id
+                                );
+                                return IndicatorCalculation.build({
+                                    ...indicatorCalculation,
+                                    code: dataElement?.code || "",
+                                    name: dataElement?.name || "",
+                                }).get();
+                            }
+                        ),
+                    }).get();
+                }),
+            };
+        });
+    }
+
+    private getAllIndicatorsIds(settings: UniqueBeneficiariesSettings[]): Id[] {
+        return settings.flatMap(setting => setting.indicatorsIds);
+    }
+
+    private filterSettingsByProjects(
+        settings: UniqueBeneficiariesSettings[],
+        projects: ProjectForList[]
+    ): UniqueBeneficiariesSettings[] {
+        const projectIds = projects.map(getId);
+        const settingsByProjects = settings.filter(setting =>
+            projectIds.includes(setting.projectId)
+        );
+        return settingsByProjects;
+    }
+
+    private getProjectsByCountry(countryId: Id): Promise<ProjectForList[]> {
+        return this.projectRepository.getByCountries(countryId);
+    }
+
+    private getAllSettings(): Promise<UniqueBeneficiariesSettings[]> {
+        return this.beneficiariesSettingsRepository.getAll();
+    }
+}
+
+export type GetCountryIndicatorsOptions = { countryId: Id };
diff --git a/src/domain/usecases/SaveIndicatorReportUseCase.ts b/src/domain/usecases/SaveIndicatorReportUseCase.ts
new file mode 100644
index 00000000..c963394c
--- /dev/null
+++ b/src/domain/usecases/SaveIndicatorReportUseCase.ts
@@ -0,0 +1,16 @@
+import { IndicatorReport } from "../entities/IndicatorReport";
+import { Id } from "../entities/Ref";
+import { IndicatorReportRepository } from "../repositories/IndicatorReportRepository";
+
+export class SaveIndicatorReportUseCase {
+    constructor(private indicatorReportRepository: IndicatorReportRepository) {}
+
+    execute(options: SaveIndicatorOptions): Promise<void> {
+        const onlyReportsWithProjects = options.reports.filter(
+            report => report.projects.length > 0
+        );
+        return this.indicatorReportRepository.save(onlyReportsWithProjects, options.countryId);
+    }
+}
+
+type SaveIndicatorOptions = { countryId: Id; reports: IndicatorReport[] };
diff --git a/src/domain/usecases/SaveIndicatorsValidationUseCase.ts b/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
index 8bc50efa..03347140 100644
--- a/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
+++ b/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
@@ -4,13 +4,11 @@ import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSett
 import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBeneficiariesSettingsRepository";
 
 export class SaveIndicatorsValidationUseCase {
-    constructor(
-        private repositories: { settingsRepository: UniqueBeneficiariesSettingsRepository }
-    ) {}
+    constructor(private settingsRepository: UniqueBeneficiariesSettingsRepository) {}
 
     async execute(options: SaveIndicatorsOptions): Promise<void> {
         const { indicatorsValidation, projectId } = options;
-        const settings = await this.repositories.settingsRepository.get(projectId);
+        const settings = await this.settingsRepository.get(projectId);
 
         const hasErrors = IndicatorValidation.validateCommentIndicators(
             indicatorsValidation.indicatorsCalculation
@@ -45,7 +43,7 @@ export class SaveIndicatorsValidationUseCase {
                   })
                 : settings.indicatorsValidation.concat(indicatorValidationToSave),
         };
-        return this.repositories.settingsRepository.save(settingsToSave);
+        return this.settingsRepository.save(settingsToSave);
     }
 }
 
diff --git a/src/hooks/UniqueBeneficiaries.ts b/src/hooks/UniqueBeneficiaries.ts
index 54083ebb..8731707c 100644
--- a/src/hooks/UniqueBeneficiaries.ts
+++ b/src/hooks/UniqueBeneficiaries.ts
@@ -1,4 +1,4 @@
-import { useLoading, useSnackbar } from "@eyeseetea/d2-ui-components";
+import { useSnackbar } from "@eyeseetea/d2-ui-components";
 import React from "react";
 import { useAppContext } from "../contexts/api-context";
 import { UniqueBeneficiariesSettings } from "../domain/entities/UniqueBeneficiariesSettings";
@@ -7,17 +7,14 @@ import { Id } from "../models/ProjectDocument";
 export function useGetUniqueBeneficiaries(props: { id: Id; refresh: number }) {
     const { id, refresh } = props;
     const { compositionRoot } = useAppContext();
-    const loading = useLoading();
     const snackbar = useSnackbar();
     const [settings, setSettings] = React.useState<UniqueBeneficiariesSettings>();
 
     React.useEffect(() => {
-        // loading.show(true, i18n.t("Loading Periods..."));
         compositionRoot.uniqueBeneficiaries.getSettings.execute(id).then(setSettings, err => {
             snackbar.error(err.message);
         });
-        // .finally(() => loading.hide());
-    }, [compositionRoot.uniqueBeneficiaries.getSettings, loading, snackbar, id, refresh]);
+    }, [compositionRoot.uniqueBeneficiaries.getSettings, snackbar, id, refresh]);
 
     return { settings, setSettings };
 }
diff --git a/src/hooks/utils.ts b/src/hooks/utils.ts
new file mode 100644
index 00000000..5a85979e
--- /dev/null
+++ b/src/hooks/utils.ts
@@ -0,0 +1,17 @@
+import React from "react";
+import { useHistory } from "react-router-dom";
+
+export type HttpStatusType = "idle" | "loading" | "error" | "success" | "finished";
+
+export type HttpStatusProps = {
+    status: HttpStatusType;
+    message?: string;
+};
+
+export function useHttpStatus(initialStatus: HttpStatusType = "idle") {
+    const [httpStatus, setHttpStatus] = React.useState<HttpStatusProps>({
+        message: "",
+        status: initialStatus,
+    });
+    return { httpStatus, updateStatus: setHttpStatus };
+}
diff --git a/src/pages/country-indicator-report/CountryIndicatorReport.tsx b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
new file mode 100644
index 00000000..18380fa3
--- /dev/null
+++ b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
@@ -0,0 +1,202 @@
+import _ from "lodash";
+import React from "react";
+import { Dropdown, useLoading, useSnackbar } from "@eyeseetea/d2-ui-components";
+import { Button, Grid, Typography } from "@material-ui/core";
+
+import UserOrgUnits, { OrganisationUnit } from "../../components/org-units/UserOrgUnits";
+import PageHeader from "../../components/page-header/PageHeader";
+import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
+import i18n from "../../locales";
+import { useGoTo } from "../../router";
+import { Maybe } from "../../types/utils";
+import { GroupedRows, IndicatorReportTable } from "./IndicatorReportTable";
+import { useAppContext } from "../../contexts/api-context";
+import { getId } from "../../utils/dhis2";
+import { IndicatorReport } from "../../domain/entities/IndicatorReport";
+import { Id } from "../../domain/entities/Ref";
+import { buildSpreadSheet } from "./excel-report";
+import { downloadFile } from "../../utils/download";
+
+export const CountryIndicatorReport = React.memo(() => {
+    const goTo = useGoTo();
+    const [orgUnit, setOrgUnit] = React.useState<OrganisationUnit>();
+    const [selectedPeriod, setSelectedPeriod] = React.useState<UniqueBeneficiariesPeriod>();
+    const { indicatorsReports, setIndicatorsReports } = useGetIndicatorsReport({
+        countryId: orgUnit?.id,
+    });
+
+    const saveIndicatorReport = useSaveIndicatorReport({
+        countryId: orgUnit?.id,
+        indicatorsReports,
+    });
+
+    const updateSelectedOrgUnit = (orgUnit: OrganisationUnit) => {
+        setOrgUnit(orgUnit);
+    };
+
+    const updatePeriod = (periodId: Maybe<string>) => {
+        const periods = getUniquePeriods(indicatorsReports);
+        const period = periods.find(period => period.id === periodId);
+        if (period) {
+            setSelectedPeriod(period);
+        }
+    };
+
+    const updateReport = (value: boolean, row: GroupedRows) => {
+        if (!selectedPeriod) return;
+
+        const updatedIndicators = indicatorsReports.map(indicatorReport => {
+            if (indicatorReport.period.id !== selectedPeriod.id) return indicatorReport;
+
+            return indicatorReport.updateProjectIndicators(row.project.id, row.id, value);
+        });
+        setIndicatorsReports(updatedIndicators);
+    };
+
+    const indicatorReport = indicatorsReports.find(
+        report => report.period.id === selectedPeriod?.id
+    );
+
+    const downloadReport = () => {
+        if (indicatorReport && orgUnit) {
+            console.log(indicatorReport);
+            buildSpreadSheet(indicatorReport, orgUnit.displayName).then(downloadFile);
+        }
+    };
+
+    const reportHasProjects = indicatorReport && indicatorReport.projects.length > 0;
+
+    return (
+        <section>
+            <PageHeader
+                title={i18n.t("Country Project & Indicators")}
+                onBackClick={() => goTo("projects")}
+            />
+
+            <Grid container spacing={2}>
+                <Grid item xs={12}>
+                    <UserOrgUnits
+                        onChange={updateSelectedOrgUnit}
+                        selected={orgUnit}
+                        selectableLevels={[1, 2]}
+                        withElevation={false}
+                        height={200}
+                    />
+                </Grid>
+                <Grid item xs={12}>
+                    <Dropdown
+                        items={mapItemsToDropdown(getUniquePeriods(indicatorsReports))}
+                        onChange={period => updatePeriod(period)}
+                        label={i18n.t("Select period")}
+                        value={selectedPeriod?.id}
+                        hideEmpty
+                    />
+                </Grid>
+                {reportHasProjects && (
+                    <>
+                        <Grid item xs={12}>
+                            <IndicatorReportTable
+                                report={indicatorReport}
+                                onRowChange={updateReport}
+                            />
+                        </Grid>
+                        <Grid item>
+                            <Grid container spacing={2}>
+                                <Grid item>
+                                    <Button
+                                        size="large"
+                                        variant="contained"
+                                        color="primary"
+                                        onClick={() => saveIndicatorReport()}
+                                    >
+                                        {i18n.t("Save")}
+                                    </Button>
+                                </Grid>
+                                <Grid item>
+                                    <Button
+                                        onClick={downloadReport}
+                                        size="large"
+                                        variant="contained"
+                                        color="secondary"
+                                    >
+                                        {i18n.t("Download")}
+                                    </Button>
+                                </Grid>
+                            </Grid>
+                        </Grid>
+                    </>
+                )}
+                {selectedPeriod && !reportHasProjects && (
+                    <Typography>
+                        {i18n.t("No projects found for selected period: {{period}}", {
+                            nsSeparator: false,
+                            period: selectedPeriod ? selectedPeriod.name : "",
+                        })}
+                    </Typography>
+                )}
+            </Grid>
+        </section>
+    );
+});
+
+CountryIndicatorReport.displayName = "CountryIndicatorReport";
+
+function getUniquePeriods(settings: IndicatorReport[]): UniqueBeneficiariesPeriod[] {
+    return _(settings)
+        .map(setting => setting.period)
+        .compact()
+        .uniqBy(getId)
+        .value();
+}
+
+function mapItemsToDropdown(periods: UniqueBeneficiariesPeriod[]) {
+    return periods.map(period => {
+        return { text: period.name, value: period.id };
+    });
+}
+
+export function useSaveIndicatorReport(props: UseSaveCountryReportProps) {
+    const { compositionRoot } = useAppContext();
+    const { countryId, indicatorsReports: reports } = props;
+    const snackbar = useSnackbar();
+    const loading = useLoading();
+
+    const saveIndicatorReport = React.useCallback(() => {
+        if (!countryId) return;
+        loading.show(true, i18n.t("Saving..."));
+        compositionRoot.indicators.saveReports
+            .execute({ reports, countryId })
+            .then(() => {
+                snackbar.success("Report saved successfully");
+            })
+            .catch(err => {
+                snackbar.error(err.message);
+            })
+            .finally(() => loading.hide());
+    }, [compositionRoot, loading, snackbar, countryId, reports]);
+
+    return saveIndicatorReport;
+}
+
+export function useGetIndicatorsReport(props: { countryId: Maybe<Id> }) {
+    const { countryId } = props;
+    const { compositionRoot } = useAppContext();
+    const snackbar = useSnackbar();
+    const loading = useLoading();
+
+    const [indicatorsReports, setIndicatorsReports] = React.useState<IndicatorReport[]>([]);
+
+    React.useEffect(() => {
+        if (!countryId) return;
+        loading.show(true, i18n.t("Loading projects and indicators..."));
+        compositionRoot.projects.getByCountry
+            .execute({ countryId })
+            .then(setIndicatorsReports)
+            .catch(error => snackbar.error(error.message))
+            .finally(() => loading.hide());
+    }, [compositionRoot, countryId, loading, snackbar]);
+
+    return { indicatorsReports, setIndicatorsReports };
+}
+
+type UseSaveCountryReportProps = { countryId: Maybe<Id>; indicatorsReports: IndicatorReport[] };
diff --git a/src/pages/country-indicator-report/IndicatorReportTable.tsx b/src/pages/country-indicator-report/IndicatorReportTable.tsx
new file mode 100644
index 00000000..b811fca1
--- /dev/null
+++ b/src/pages/country-indicator-report/IndicatorReportTable.tsx
@@ -0,0 +1,165 @@
+import _ from "lodash";
+import React from "react";
+import {
+    Checkbox,
+    Paper,
+    Table,
+    TableCell,
+    TableFooter,
+    TableHead,
+    TableRow,
+    Typography,
+} from "@material-ui/core";
+import { IndicatorReportAttrs, ProjectCountry } from "../../domain/entities/IndicatorReport";
+import { Id } from "../../domain/entities/Ref";
+import i18n from "../../locales";
+import { Grouper, RowComponent } from "../report/rich-rows-utils";
+import TableBodyGrouped from "../report/TableBodyGrouped";
+import { buildMonthYearFormatDate } from "../../utils/date";
+
+type IndicatorReportTableProps = {
+    report: IndicatorReportAttrs;
+    onRowChange: (value: boolean, row: GroupedRows) => void;
+};
+
+export const IndicatorReportTable = React.memo((props: IndicatorReportTableProps) => {
+    const { report, onRowChange } = props;
+
+    const groupers: Grouper<GroupedRows>[] = React.useMemo(() => {
+        return [
+            {
+                name: "project",
+                getId: row => row.project.id,
+                component: ProjectCell,
+            },
+            {
+                name: "indicator",
+                getId: row => [row.project.id, row.id].join("-"),
+                component: function DataElementCellsForIndicator(props) {
+                    return <IndicatorCell row={props.row} onRowChange={onRowChange} />;
+                },
+            },
+            {
+                name: "total",
+                getId: row => [row.project.id, "total"].join("-"),
+                component: TotalCell,
+            },
+        ];
+    }, [onRowChange]);
+
+    const indicatorsRows = report.projects.flatMap(project => {
+        const sumIndicators = _(project.indicators)
+            .filter(indicator => indicator.include)
+            .sumBy(indicator => indicator.value || 0);
+        const allIndicators = project.indicators.map((indicator): GroupedRows => {
+            return {
+                id: indicator.indicatorId,
+                code: indicator.indicatorCode || "",
+                name: indicator.indicatorName,
+                value: indicator.value || 0,
+                include: indicator.include,
+                total: sumIndicators,
+                project: project.project,
+                periodNotAvailable: indicator.periodNotAvailable,
+            };
+        });
+        return allIndicators;
+    });
+
+    return (
+        <Paper>
+            <Table stickyHeader>
+                <TableHead>
+                    <TableRow>
+                        <TableCell>{i18n.t("Project")}</TableCell>
+                        <TableCell>{i18n.t("Selected Activity Indicators")}</TableCell>
+                        <TableCell>{i18n.t("Unique Beneficiaries")}</TableCell>
+                        <TableCell>{i18n.t("Include?")}</TableCell>
+                        <TableCell>{i18n.t("Total Unique Served")}</TableCell>
+                    </TableRow>
+                </TableHead>
+                <TableBodyGrouped rows={indicatorsRows} groupers={groupers} />
+                <TableFooter>
+                    <TableRow>
+                        <TableCell colSpan={3}></TableCell>
+                        <TableCell>
+                            <Typography>{i18n.t("Country Unique Beneficiaries")}</Typography>
+                        </TableCell>
+                        <TableCell>
+                            <Typography>
+                                {_(indicatorsRows).sumBy(row => (row.include ? row.value : 0))}
+                            </Typography>
+                        </TableCell>
+                    </TableRow>
+                </TableFooter>
+            </Table>
+        </Paper>
+    );
+});
+
+IndicatorReportTable.displayName = "IndicatorReportTable";
+
+const ProjectCell: RowComponent<GroupedRows> = props => {
+    return (
+        <TableCell rowSpan={props.rowSpan}>
+            {props.row.project.name} <br /> (
+            {buildMonthYearFormatDate(props.row.project.openingDate)} -{" "}
+            {buildMonthYearFormatDate(props.row.project.closedDate)})
+        </TableCell>
+    );
+};
+
+const TotalCell: RowComponent<GroupedRows> = props => {
+    return (
+        <TableCell rowSpan={props.rowSpan}>
+            {props.row.periodNotAvailable ? i18n.t("N/A") : props.row.total}
+        </TableCell>
+    );
+};
+
+const IndicatorCell = (props: IndicatorCellProps) => {
+    const onChangeCheckbox = (value: boolean, row: GroupedRows) => {
+        props.onRowChange(value, row);
+    };
+
+    const notAvailableText = i18n.t("N/A");
+    const isPeriodNotAvailable = props.row.periodNotAvailable;
+
+    return (
+        <>
+            <TableCell>
+                {props.row.name} ({props.row.code})
+            </TableCell>
+            <TableCell>{isPeriodNotAvailable ? notAvailableText : props.row.value}</TableCell>
+            <TableCell>
+                {isPeriodNotAvailable ? (
+                    notAvailableText
+                ) : (
+                    <Checkbox
+                        checked={props.row.include}
+                        onChange={event => onChangeCheckbox(event.target.checked, props.row)}
+                    />
+                )}
+            </TableCell>
+        </>
+    );
+};
+
+IndicatorCell.displayName = "IndicatorCell";
+ProjectCell.displayName = "ProjectCell";
+
+export type GroupedRows = {
+    id: Id;
+    code: string;
+    name: string;
+    value: number;
+    include: boolean;
+    total: number;
+    project: ProjectCountry;
+    periodNotAvailable: boolean;
+};
+
+type IndicatorCellProps = {
+    row: GroupedRows;
+    onRowChange: (value: boolean, row: GroupedRows) => void;
+};
diff --git a/src/pages/country-indicator-report/excel-report.ts b/src/pages/country-indicator-report/excel-report.ts
new file mode 100644
index 00000000..1ff0e7ae
--- /dev/null
+++ b/src/pages/country-indicator-report/excel-report.ts
@@ -0,0 +1,57 @@
+import ExcelJS from "exceljs";
+import _ from "lodash";
+import { IndicatorReport } from "../../domain/entities/IndicatorReport";
+import i18n from "../../locales";
+
+export async function buildSpreadSheet(indicatorReport: IndicatorReport, countryName: string) {
+    const workbook = new ExcelJS.Workbook();
+    const sheet = workbook.addWorksheet(i18n.t("Country Projects & Indicators"));
+    sheet.columns = generateColumns();
+    generateRows(indicatorReport, sheet);
+    return generateFileInBuffer(workbook, countryName, indicatorReport);
+}
+
+async function generateFileInBuffer(
+    workbook: ExcelJS.Workbook,
+    countryName: string,
+    indicatorReport: IndicatorReport
+) {
+    const buffer = await workbook.xlsx.writeBuffer();
+    const filename = `${countryName.toLowerCase()}_${indicatorReport.period.name.toLowerCase()}_report.xlsx`;
+    return { buffer, filename };
+}
+
+function generateRows(indicatorReport: IndicatorReport, sheet: ExcelJS.Worksheet) {
+    indicatorReport.projects.forEach(project => {
+        const projectName = project.project.name;
+
+        project.indicators.forEach((indicator, index) => {
+            sheet.addRow({
+                projectName: index === 0 ? projectName : null,
+                indicatorCode: indicator.indicatorCode,
+                value: indicator.value,
+                include: indicator.include ? i18n.t("Yes") : i18n.t("No"),
+                total: _(project.indicators).sumBy(indicator =>
+                    indicator.include ? indicator.value || 0 : 0
+                ),
+            });
+        });
+
+        const startRow = sheet.rowCount - project.indicators.length + 1;
+        const endRow = sheet.rowCount;
+        if (project.indicators.length > 1) {
+            sheet.mergeCells(`A${startRow}:A${endRow}`);
+            sheet.mergeCells(`E${startRow}:E${endRow}`);
+        }
+    });
+}
+
+function generateColumns(): Partial<ExcelJS.Column>[] {
+    return [
+        { header: i18n.t("Project"), key: "projectName" },
+        { header: i18n.t("Selected Activity Indicators"), key: "indicatorCode" },
+        { header: i18n.t("Unique Beneficiaries"), key: "value" },
+        { header: i18n.t("Include?"), key: "include" },
+        { header: i18n.t("Total Unique Served"), key: "total" },
+    ];
+}
diff --git a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
index efa56a36..e3c17258 100644
--- a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
+++ b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
@@ -127,15 +127,19 @@ export const IndicatorValidationForm = React.memo((props: IndicatorValidationFor
                 {selectedIndicator && (
                     <Grid container>
                         <Grid item className={classes.alignRight}>
-                            <Typography variant="body1">
-                                <strong>{i18n.t("Created")}:</strong>{" "}
-                                {convertToLocalDate(selectedIndicator.createdAt)}
-                            </Typography>
-
-                            <Typography variant="body1">
-                                <strong>{i18n.t("Last Updated")}:</strong>{" "}
-                                {convertToLocalDate(selectedIndicator.lastUpdatedAt)}
-                            </Typography>
+                            {selectedIndicator.createdAt && (
+                                <Typography variant="body1">
+                                    <strong>{i18n.t("Created")}:</strong>{" "}
+                                    {convertToLocalDate(selectedIndicator.createdAt)}
+                                </Typography>
+                            )}
+
+                            {selectedIndicator.lastUpdatedAt && (
+                                <Typography variant="body1">
+                                    <strong>{i18n.t("Last Updated")}:</strong>{" "}
+                                    {convertToLocalDate(selectedIndicator.lastUpdatedAt)}
+                                </Typography>
+                            )}
                         </Grid>
 
                         <Grid item xs={12}>
diff --git a/src/pages/project-indicators-validation/IndicatorValidationTable.tsx b/src/pages/project-indicators-validation/IndicatorValidationTable.tsx
index 1203dab8..2ac0dc8b 100644
--- a/src/pages/project-indicators-validation/IndicatorValidationTable.tsx
+++ b/src/pages/project-indicators-validation/IndicatorValidationTable.tsx
@@ -36,7 +36,7 @@ export const IndicatorValidationTable = (props: IndicatorValidationTableProps) =
                         return (
                             <Tooltip title={hasChanged ? tooltipTitle : ""}>
                                 <Typography color={hasChanged ? "secondary" : "initial"}>
-                                    {row.code}
+                                    {row.name} ({row.code})
                                 </Typography>
                             </Tooltip>
                         );
diff --git a/src/pages/projects-list/ProjectsList.tsx b/src/pages/projects-list/ProjectsList.tsx
index 71158ad1..7d8d1cf9 100644
--- a/src/pages/projects-list/ProjectsList.tsx
+++ b/src/pages/projects-list/ProjectsList.tsx
@@ -89,6 +89,10 @@ const ProjectsList: React.FC = () => {
     const canCreateProjects = currentUser.can("create");
     const goToNewProject = React.useCallback(() => goTo("projects.new"), [goTo]);
     const newProjectPageHandler = canCreateProjects ? goToNewProject : undefined;
+    const goToCountryIndicatorReport = React.useCallback(
+        () => goTo("countryIndicatorsReport"),
+        [goTo]
+    );
 
     const onAttachModalClose = () => {
         setActionSelected(undefined);
@@ -117,20 +121,23 @@ const ProjectsList: React.FC = () => {
                     }
                 />
 
-                {canAccessReports && (
-                    <ActionButton
-                        label={i18n.t("Monthly Report")}
-                        onClick={goToMerReports}
-                        style={styles.merReports}
-                    />
-                )}
+                <section style={styles.actionsStyles}>
+                    {canAccessReports && (
+                        <ActionButton label={i18n.t("Monthly Report")} onClick={goToMerReports} />
+                    )}
+
+                    {newProjectPageHandler && (
+                        <ActionButton
+                            label={i18n.t("Create Project")}
+                            onClick={newProjectPageHandler}
+                        />
+                    )}
 
-                {newProjectPageHandler && (
                     <ActionButton
-                        label={i18n.t("Create Project")}
-                        onClick={newProjectPageHandler}
+                        label={i18n.t("Unique Beneficiaries")}
+                        onClick={goToCountryIndicatorReport}
                     />
-                )}
+                </section>
 
                 <ListSelector view="projects" onChange={onViewChange} />
             </ObjectsListStyled>
@@ -138,8 +145,8 @@ const ProjectsList: React.FC = () => {
     );
 };
 
-const styles = {
-    merReports: { marginLeft: 30, marginRight: 20 },
+const styles: Record<string, React.CSSProperties> = {
+    actionsStyles: { display: "flex", gap: "1em" },
 };
 
 const ObjectsListStyled = styled(ObjectsList)`
diff --git a/src/pages/root/Root.tsx b/src/pages/root/Root.tsx
index 1d8189db..12d95212 100644
--- a/src/pages/root/Root.tsx
+++ b/src/pages/root/Root.tsx
@@ -14,6 +14,7 @@ import AwardNumberDashboard from "../dashboard/AwardNumberDashboard";
 import { LastLocationProvider } from "react-router-last-location";
 import { UniqueBeneficiariesPeriodsPage } from "../unique-periods/UniqueBeneficiariesPeriodsPage";
 import { ProjectIndicatorsValidation } from "../project-indicators-validation/ProjectIndicatorsValidation";
+import { CountryIndicatorReport } from "../country-indicator-report/CountryIndicatorReport";
 
 const Root = () => {
     const idParam = { id: ":id" };
@@ -87,6 +88,11 @@ const Root = () => {
 
                     <Route path={generateUrl("countries")} render={() => <CountriesList />} />
 
+                    <Route
+                        path={generateUrl("countryIndicatorsReport")}
+                        render={() => <CountryIndicatorReport />}
+                    />
+
                     <Route render={() => <ProjectsList />} />
                 </Switch>
             </LastLocationProvider>
diff --git a/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx b/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
index ae2a0b15..5a36164e 100644
--- a/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
+++ b/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { ConfirmationDialog, useLoading, useSnackbar } from "@eyeseetea/d2-ui-components";
 import { Dialog, DialogContent, DialogTitle } from "@material-ui/core";
-import { useHistory, useParams } from "react-router-dom";
+import { useParams } from "react-router-dom";
 import PageHeader from "../../components/page-header/PageHeader";
 import {
     ActionTable,
@@ -16,11 +16,12 @@ import {
 import i18n from "../../locales";
 import { UniquePeriodsForm } from "./UniquePeriodsForm";
 import { useGetUniqueBeneficiaries } from "../../hooks/UniqueBeneficiaries";
+import { useGoTo } from "../../router";
 
 export const UniqueBeneficiariesPeriodsPage = React.memo(() => {
     const { compositionRoot } = useAppContext();
     const { id } = useParams<Ref>();
-    const history = useHistory();
+    const goTo = useGoTo();
     const snackbar = useSnackbar();
     const loading = useLoading();
     const [savePeriodModal, setSavePeriodModal] = React.useState(false);
@@ -94,7 +95,7 @@ export const UniqueBeneficiariesPeriodsPage = React.memo(() => {
         <div>
             <PageHeader
                 title={i18n.t("Unique Beneficiaries Periods")}
-                onBackClick={() => history.push("/")}
+                onBackClick={() => goTo("projects")}
             />
 
             <UniqueBeneficiariesTable
diff --git a/src/router.ts b/src/router.ts
index c3109089..3c8ed58c 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -17,6 +17,7 @@ const routes = {
     countries: () => `/countries`,
     uniqueBeneficiariesPeriods: ({ id }: { id: string }) => `/unique-beneficiaries-periods/${id}`,
     projectIndicatorsValidation: ({ id }: { id: string }) => `/project-indicators-validation/${id}`,
+    countryIndicatorsReport: () => "/country-indicators-report",
 };
 
 type Routes = typeof routes;
diff --git a/src/utils/date.ts b/src/utils/date.ts
index 6e216d93..64bc9ca6 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -48,3 +48,8 @@ export const monthFormat = "YYYYMM";
 export function getPeriodIds(range: Moment[]): Array<{ id: string }> {
     return range.map(m => ({ id: m.format(monthFormat) }));
 }
+
+export function buildMonthYearFormatDate(dateIsoString: string): string {
+    // examples: JAN 2021, NOV 2024
+    return new Date(dateIsoString).toLocaleString("default", { month: "short", year: "numeric" });
+}
diff --git a/yarn.lock b/yarn.lock
index 7a71c0b8..cb34942b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3414,10 +3414,10 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@eyeseetea/d2-api@1.14.0":
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/@eyeseetea/d2-api/-/d2-api-1.14.0.tgz#546398b00b9f01b60a72ecba648a35f57b6f7559"
-  integrity sha512-gVNXfK8sk1STuM8QDed0JY8DM63SwI3UJXeKsyzJjHtPIqi76ukdCYAo8XwtfqhGdZIwIMrrWPEOmAJ3dbvCKQ==
+"@eyeseetea/d2-api@1.16.0-beta.13":
+  version "1.16.0-beta.13"
+  resolved "https://registry.yarnpkg.com/@eyeseetea/d2-api/-/d2-api-1.16.0-beta.13.tgz#1b46c30c18f5f54339c7e801af18ad941ea028e7"
+  integrity sha512-HtQMSDgIKOaMuS1qqBV6BN5uy6AIVbsyqLsrrF3RrWPUcxZmsZyKqM955F1IYbOROLjEgxu5zJnI2B7n4YDKpA==
   dependencies:
     "@babel/runtime" "^7.5.4"
     "@dhis2/d2-i18n" "^1.0.5"
@@ -3442,6 +3442,7 @@
     node-schedule "^1.3.2"
     qs "^6.9.0"
     react "^16.12.0"
+    side-channel "^1.0.4"
     yargs "^14.0.0"
 
 "@eyeseetea/d2-ui-components@2.7.0":

From 8156728659743b1fe6f98fe2705f0544021cd8e3 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Wed, 6 Nov 2024 16:13:59 -0500
Subject: [PATCH 21/51] update i18n

---
 i18n/en.pot        |  7 ++-----
 src/hooks/utils.ts | 17 -----------------
 2 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 src/hooks/utils.ts

diff --git a/i18n/en.pot b/i18n/en.pot
index ed5d0849..9c5c4696 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-06T13:59:57.869Z\n"
-"PO-Revision-Date: 2024-11-06T13:59:57.869Z\n"
+"POT-Creation-Date: 2024-11-06T21:08:27.591Z\n"
+"PO-Revision-Date: 2024-11-06T21:08:27.591Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -354,9 +354,6 @@ msgstr ""
 msgid "{{fieldName}} must be a positive number"
 msgstr ""
 
-msgid "Loading Periods..."
-msgstr ""
-
 msgid "Error saving dashboard"
 msgstr ""
 
diff --git a/src/hooks/utils.ts b/src/hooks/utils.ts
deleted file mode 100644
index 5a85979e..00000000
--- a/src/hooks/utils.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from "react";
-import { useHistory } from "react-router-dom";
-
-export type HttpStatusType = "idle" | "loading" | "error" | "success" | "finished";
-
-export type HttpStatusProps = {
-    status: HttpStatusType;
-    message?: string;
-};
-
-export function useHttpStatus(initialStatus: HttpStatusType = "idle") {
-    const [httpStatus, setHttpStatus] = React.useState<HttpStatusProps>({
-        message: "",
-        status: initialStatus,
-    });
-    return { httpStatus, updateStatus: setHttpStatus };
-}

From 494e0f0a063b2735826b1a8b17c1cd3e820123ac Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Wed, 6 Nov 2024 16:16:13 -0500
Subject: [PATCH 22/51] update i18n

---
 i18n/en.pot | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 9c5c4696..1500c7c3 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-06T21:08:27.591Z\n"
-"PO-Revision-Date: 2024-11-06T21:08:27.591Z\n"
+"POT-Creation-Date: 2024-11-06T21:14:03.006Z\n"
+"PO-Revision-Date: 2024-11-06T21:14:03.006Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -162,9 +162,6 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-msgid "Loading..."
-msgstr ""
-
 msgid "Projects view"
 msgstr ""
 
@@ -947,6 +944,9 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
+msgid "Loading..."
+msgstr ""
+
 msgid "There is no data for this month"
 msgstr ""
 

From 74522dce7f9b062dc76e77ba8bf1eb1f7ccd0aa3 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Wed, 6 Nov 2024 16:38:36 -0500
Subject: [PATCH 23/51] update i18n

---
 i18n/en.pot                                      |  7 +++++--
 .../IndicatorValidationForm.tsx                  | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 1500c7c3..5123e9ef 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-06T21:14:03.006Z\n"
-"PO-Revision-Date: 2024-11-06T21:14:03.006Z\n"
+"POT-Creation-Date: 2024-11-06T21:38:31.863Z\n"
+"PO-Revision-Date: 2024-11-06T21:38:31.863Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -991,6 +991,9 @@ msgstr ""
 msgid "Select a Period"
 msgstr ""
 
+msgid "Unique in Project"
+msgstr ""
+
 msgid "Previous Value"
 msgstr ""
 
diff --git a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
index e3c17258..7a77ed7a 100644
--- a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
+++ b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
@@ -1,3 +1,4 @@
+import _ from "lodash";
 import React from "react";
 import { Dropdown, useSnackbar } from "@eyeseetea/d2-ui-components";
 import i18n from "../../locales";
@@ -108,6 +109,10 @@ export const IndicatorValidationForm = React.memo((props: IndicatorValidationFor
 
     const showNotification = hasChanged || false;
 
+    const total = _(selectedIndicator?.indicatorsCalculation).sumBy(indicator =>
+        IndicatorCalculation.getTotal(indicator)
+    );
+
     return (
         <div>
             <PageHeader
@@ -147,6 +152,11 @@ export const IndicatorValidationForm = React.memo((props: IndicatorValidationFor
                                 data={selectedIndicator.indicatorsCalculation}
                                 onRowChange={updateIndicatorsValidationRow}
                             />
+                            <div className={classes.totalContainer}>
+                                <Typography>
+                                    {i18n.t("Unique in Project")}: {total}
+                                </Typography>
+                            </div>
                         </Grid>
 
                         <Grid item className={classes.alignRight}>
@@ -196,6 +206,12 @@ function convertToLocalDate(isoDateString: Maybe<ISODateTimeString>): string {
 
 const useStyles = makeStyles({
     alignRight: { marginLeft: "auto" },
+    totalContainer: {
+        display: "flex",
+        paddingBlock: "0 1em",
+        paddingInline: "0 1em",
+        justifyContent: "flex-end",
+    },
 });
 
 IndicatorValidationForm.displayName = "IndicatorValidationForm";

From 49823aaa0b096109ae9fa1a03aa48900e6fd291f Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Wed, 6 Nov 2024 16:41:33 -0500
Subject: [PATCH 24/51] remove estimation file

---
 estimation.md | 114 --------------------------------------------------
 1 file changed, 114 deletions(-)
 delete mode 100644 estimation.md

diff --git a/estimation.md b/estimation.md
deleted file mode 100644
index afbb5ed8..00000000
--- a/estimation.md
+++ /dev/null
@@ -1,114 +0,0 @@
-Total Hours: 48.5 hours
-
--   Add step "Select of Unique Indicators" (3 hours)
-
-    -   Configure stepper component
-    -   Only shows indicators of type "People"
-    -   Save selected indicators
-
--   Manage Unique Beneficiaries Periods (3 hours)
-
-    -   List periods
-    -   Add period form
-    -   Delete period form + validation
-
--   "Project Indicators Validation" (22 hours)
-
-    -   Add period selector 0.5h
-    -   Get existing information from datastore (by period) 3h
-    -   Add datatable configuration 1h
-    -   Get dataValues from actual project 1h
-    -   Sum "new" values (combinations) 2h
-    -   Copy values in column "Editable new" 0.5h
-    -   Make column "Returning from Previous Project" editable 3h
-    -   Calculate column "Total" -> "Editable New" + "Returning" 1h
-    -   Add column "comments". Required if there's any change in column G or H. 2.5h
-    -   Add modal in case indicators has been updated 4h
-    -   Generate sum for "Total" column in footer table 0.5h
-    -   Save logic in datastore 3h
-
--   Add "Unique Beneficiaries" button (16.5 hours)
-
-    -   Add period selector 0.5h
-    -   Add org. unit tree 1h
-    -   Get projects according period and org. unit 6h
-    -   Add datatable configuration 1h
-    -   Add editable checkbox in column "Include" (all checkbox marked as selected by default) 2h
-    -   Calculate total unique served. Sum unique beneficiaries marked as included. 1h
-    -   Calculate total in the footer of the table "Country unique beneficiaries" 1h
-    -   Save logic in datastore 2h
-    -   Download button. Generate excel report 2h
-
--   Testing + Meetings + PR review (4 hours)
-
-```json
-{
-    "documents": [],
-    "merDataElementIds": ["WUCuxbfpPJz", "uam4rE1aVKS"],
-    "uniqueBeneficiaries": {
-        "periods": [
-            {
-                "id": "ABC",
-                "startDate": 3,
-                "endDate": 4,
-                "type": "CUSTOM",
-                "label": "Custom"
-            },
-            {
-                "id": "XYZ",
-                "startDate": 1,
-                "endDate": 12,
-                "type": "YEARLY",
-                "label": "Custom"
-            },
-            {
-                "id": "RGW",
-                "startDate": 1,
-                "endDate": 6,
-                "type": "SEMIANNUAL",
-                "label": "Semi Annual"
-            }
-        ],
-        "indicatorsValidation": [
-            {
-                "period": "ABC",
-                "createdAt": "",
-                "lastUpdatedAt": "",
-                "indicators": [
-                    {
-                        "indicatorId": "P010100",
-                        "newValue": 100,
-                        "editableNewValue": 50,
-                        "returningValue": 150,
-                        "total": 200,
-                        "comments": "a comment"
-                    }
-                ]
-            }
-        ],
-        "report": {
-            "periodId": "XYZ",
-            "orgUnit": "",
-            "createdAt": "",
-            "lastUpdatedAt": "",
-            "projects": [
-                {
-                    "projectId": "PRABC",
-                    "indicators": [
-                        {
-                            "indicatorId": "P010100",
-                            "newValue": 50,
-                            "include": true
-                        },
-                        {
-                            "indicatorId": "P020200",
-                            "newValue": 200,
-                            "include": false
-                        }
-                    ]
-                }
-            ]
-        }
-    }
-}
-```

From a04dd4c5fecb42191c6e65b2ead4d259754b9d5a Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Mon, 11 Nov 2024 11:39:29 -0500
Subject: [PATCH 25/51] add validations for periods + pr observations

---
 .../steps/data-elements/DataElementsTable.tsx |  2 +-
 .../UniqueIndicatorsStep.tsx                  | 12 ++-
 .../UniqueBeneficiariesTable.tsx              | 18 ++--
 src/data/common/D2ApiUbSettings.ts            | 89 ++++++++-----------
 .../IndicatorReportD2Repository.ts            |  2 +-
 src/domain/entities/IndicatorCalculation.ts   | 10 ++-
 src/domain/entities/IndicatorValidation.ts    | 30 ++++++-
 .../entities/UniqueBeneficiariesPeriod.ts     | 25 ++++--
 src/domain/entities/generic/Errors.ts         |  9 +-
 .../GetIndicatorsValidationUseCase.ts         |  5 +-
 .../RemoveUniqueBeneficiariesPeriodUseCase.ts |  5 +-
 .../SaveIndicatorsValidationUseCase.ts        |  8 +-
 .../SaveUniqueBeneficiariesSettingsUseCase.ts | 23 ++++-
 src/models/ProjectDb.ts                       |  7 +-
 .../CountryIndicatorReport.tsx                | 25 +++---
 .../IndicatorReportTable.tsx                  |  6 +-
 .../IndicatorValidationForm.tsx               |  2 +-
 .../UniqueBeneficiariesPeriodsPage.tsx        | 14 ++-
 .../unique-periods/UniquePeriodsForm.tsx      |  2 +-
 19 files changed, 174 insertions(+), 120 deletions(-)

diff --git a/src/components/steps/data-elements/DataElementsTable.tsx b/src/components/steps/data-elements/DataElementsTable.tsx
index 111e1ad3..b9165388 100644
--- a/src/components/steps/data-elements/DataElementsTable.tsx
+++ b/src/components/steps/data-elements/DataElementsTable.tsx
@@ -92,7 +92,7 @@ const DataElementsTable: React.FC<DataElementsTableProps> = props => {
         initialFilters = {},
     } = props;
     const snackbar = useSnackbar();
-    const [filter, setFilter] = useState<Filter>(initialFilters);
+    const [filter, setFilter] = useState(initialFilters);
 
     const resetKey = { onlySelected, ...filter, sectorId };
 
diff --git a/src/components/steps/unique-beneficiaries/UniqueIndicatorsStep.tsx b/src/components/steps/unique-beneficiaries/UniqueIndicatorsStep.tsx
index 04eb31b6..bbc819ae 100644
--- a/src/components/steps/unique-beneficiaries/UniqueIndicatorsStep.tsx
+++ b/src/components/steps/unique-beneficiaries/UniqueIndicatorsStep.tsx
@@ -1,11 +1,15 @@
 import React from "react";
+import { Id } from "../../../domain/entities/Ref";
 import { StepProps } from "../../../pages/project-wizard/ProjectWizard";
-import DataElementsStep, { DataElementsStepProps } from "../data-elements/DataElementsStep";
+import { Filter } from "../data-elements/DataElementsFilters";
+import DataElementsStep from "../data-elements/DataElementsStep";
+
+const initialFilters: Filter = { peopleOrBenefit: "people" };
 
 const UniqueIndicatorsStep: React.FC<StepProps> = props => {
     const { project } = props;
-    const getSelection: DataElementsStepProps["onSelect"] = React.useCallback(
-        (sectorId, dataElementIds) => {
+    const getSelection = React.useCallback(
+        (sectorId: Id, dataElementIds: Id[]) => {
             return project.updateUniqueBeneficiariesSelection(sectorId, dataElementIds);
         },
         [project]
@@ -16,7 +20,7 @@ const UniqueIndicatorsStep: React.FC<StepProps> = props => {
             {...props}
             onSelect={getSelection}
             dataElementsSet={project.uniqueIndicators}
-            initialFilters={{ peopleOrBenefit: "people" }}
+            initialFilters={initialFilters}
         />
     );
 };
diff --git a/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx b/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx
index 417a754e..927c936c 100644
--- a/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx
+++ b/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx
@@ -2,13 +2,11 @@ import { ObjectsList, useObjectsTable, TableConfig } from "@eyeseetea/d2-ui-comp
 import DeleteIcon from "@material-ui/icons/Delete";
 import EditIcon from "@material-ui/icons/Edit";
 import React from "react";
-import {
-    UniqueBeneficiariesPeriod,
-    UniqueBeneficiariesPeriodsAttrs,
-} from "../../domain/entities/UniqueBeneficiariesPeriod";
+import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
 import i18n from "../../locales";
+import { months } from "../../pages/unique-periods/UniquePeriodsForm";
 
-export type ActionTable = { action: string; id: string };
+export type ActionTable = { action: "edit" | "delete" | "add"; id: string };
 
 export type UniqueBeneficiariesTableProps = {
     onChangeAction: (options: ActionTable) => void;
@@ -17,7 +15,7 @@ export type UniqueBeneficiariesTableProps = {
 
 export const UniqueBeneficiariesTable = React.memo((props: UniqueBeneficiariesTableProps) => {
     const { onChangeAction, periods } = props;
-    const config = React.useMemo((): TableConfig<UniqueBeneficiariesPeriodsAttrs> => {
+    const config = React.useMemo((): TableConfig<UniqueBeneficiariesPeriod> => {
         return {
             onActionButtonClick: () => {
                 onChangeAction({ action: "add", id: "" });
@@ -48,11 +46,15 @@ export const UniqueBeneficiariesTable = React.memo((props: UniqueBeneficiariesTa
                     name: "startDateMonth",
                     text: i18n.t("Start Month"),
                     sortable: false,
+                    getValue: value =>
+                        months.find(month => month.value === String(value.startDateMonth))?.text,
                 },
                 {
                     name: "endDateMonth",
                     text: i18n.t("End Month"),
                     sortable: false,
+                    getValue: value =>
+                        months.find(month => month.value === String(value.endDateMonth))?.text,
                 },
             ],
             initialSorting: { field: "name", order: "asc" },
@@ -81,6 +83,6 @@ function getFirstItem(values: string[]): string {
     return value;
 }
 
-function showAction(rows: UniqueBeneficiariesPeriodsAttrs[]): boolean {
-    return rows.filter(row => !UniqueBeneficiariesPeriod.isProtected(row)).length === 1;
+function showAction(rows: UniqueBeneficiariesPeriod[]): boolean {
+    return rows.filter(row => !row.isProtected()).length === 1;
 }
diff --git a/src/data/common/D2ApiUbSettings.ts b/src/data/common/D2ApiUbSettings.ts
index 65d08fba..59bd03ff 100644
--- a/src/data/common/D2ApiUbSettings.ts
+++ b/src/data/common/D2ApiUbSettings.ts
@@ -36,17 +36,16 @@ export class D2ApiUbSettings {
     }
 
     private buildSettings(d2Response: Maybe<D2ProjectSettings>, projectId: string) {
-        const periods = this.mergeDefaultPeriodsWithExisting(
-            d2Response?.uniqueBeneficiaries?.periods
-        );
+        const uniqueBeneficiaries = d2Response?.uniqueBeneficiaries;
+        const periods = this.mergeDefaultPeriodsWithExisting(uniqueBeneficiaries?.periods);
 
-        const indicatorsIds = d2Response?.uniqueBeneficiaries?.indicatorsIds || [];
-        const indicatorsValidation = d2Response?.uniqueBeneficiaries?.indicatorsValidation || [];
+        const indicatorsIds = uniqueBeneficiaries?.indicatorsIds || [];
+        const indicatorsValidation = uniqueBeneficiaries?.indicatorsValidation || [];
 
         const hasIndicatorsValidation = indicatorsValidation.length > 0;
         const indicatorsToInclude = hasIndicatorsValidation
             ? this.buildExistingIndicatorsValidation(d2Response, periods)
-            : this.buildIndicatorsValidationFromPeriods(periods, indicatorsIds);
+            : IndicatorValidation.buildIndicatorsValidationFromPeriods(periods, indicatorsIds);
 
         return {
             projectId: projectId,
@@ -69,33 +68,40 @@ export class D2ApiUbSettings {
                 ...(existingSettings?.uniqueBeneficiaries || {}),
                 indicatorsIds: existingSettings?.uniqueBeneficiaries?.indicatorsIds || [],
                 periods: this.buildPeriods(settings.periods),
-                indicatorsValidation: settings.indicatorsValidation.map(indicatorValidation => {
-                    return {
-                        periodId: indicatorValidation.period.id,
-                        createdAt: indicatorValidation.createdAt || currentDate,
-                        lastUpdatedAt: currentDate,
-                        indicatorsCalculation: indicatorValidation.indicatorsCalculation.map(
-                            indicatorCalculation => {
-                                return {
-                                    comment: indicatorCalculation.comment,
-                                    editableNewValue: indicatorCalculation.editableNewValue,
-                                    id: indicatorCalculation.id,
-                                    newValue: indicatorCalculation.newValue,
-                                    returningValue: indicatorCalculation.returningValue,
-                                    total: IndicatorCalculation.getTotal(indicatorCalculation),
-                                    code: "",
-                                    name: "",
-                                };
-                            }
-                        ),
-                    };
-                }),
+                indicatorsValidation: this.mapIndicatorValidations(settings, currentDate),
             },
         };
 
         await this.dataStore.save(this.buildKeyId(settings.projectId), d2SettingsToSave).getData();
     }
 
+    private mapIndicatorValidations(
+        settings: UniqueBeneficiariesSettings,
+        currentDate: string
+    ): D2IndicatorValidation[] {
+        return settings.indicatorsValidation.map(indicatorValidation => {
+            return {
+                periodId: indicatorValidation.period.id,
+                createdAt: indicatorValidation.createdAt || currentDate,
+                lastUpdatedAt: currentDate,
+                indicatorsCalculation: indicatorValidation.indicatorsCalculation.map(
+                    indicatorCalculation => {
+                        return {
+                            comment: indicatorCalculation.comment,
+                            editableNewValue: indicatorCalculation.editableNewValue,
+                            id: indicatorCalculation.id,
+                            newValue: indicatorCalculation.newValue,
+                            returningValue: indicatorCalculation.returningValue,
+                            total: IndicatorCalculation.getTotal(indicatorCalculation),
+                            code: "",
+                            name: "",
+                        };
+                    }
+                ),
+            };
+        });
+    }
+
     private async getAllSettings(
         page: number,
         settings: UniqueBeneficiariesSettings[]
@@ -110,7 +116,8 @@ export class D2ApiUbSettings {
 
     private convertEntriesToSettings(entries: D2Entries[]): UniqueBeneficiariesSettings[] {
         return entries.map((d2Entry): UniqueBeneficiariesSettings => {
-            return this.buildSettings(d2Entry, d2Entry.key.replace(this.getProjectKey(), ""));
+            const projectId = d2Entry.key.replace(this.getProjectKey(), "");
+            return this.buildSettings(d2Entry, projectId);
         });
     }
 
@@ -124,30 +131,6 @@ export class D2ApiUbSettings {
             .getData();
     }
 
-    private buildIndicatorsValidationFromPeriods(
-        periods: UniqueBeneficiariesPeriod[],
-        indicatorsIds: Id[]
-    ): IndicatorValidation[] {
-        return periods.map(period => {
-            return IndicatorValidation.build({
-                createdAt: "",
-                lastUpdatedAt: "",
-                period,
-                indicatorsCalculation: indicatorsIds.map(indicatorId => {
-                    return IndicatorCalculation.build({
-                        id: indicatorId,
-                        newValue: 0,
-                        editableNewValue: undefined,
-                        returningValue: undefined,
-                        comment: "",
-                        code: "",
-                        name: "",
-                    }).get();
-                }),
-            }).get();
-        });
-    }
-
     private buildExistingIndicatorsValidation(
         settings: Maybe<D2ProjectSettings>,
         periods: UniqueBeneficiariesPeriod[]
@@ -200,7 +183,7 @@ export class D2ApiUbSettings {
     }
 
     private excludeDefaultPeriods(periods: UniqueBeneficiariesPeriod[]) {
-        return periods.filter(period => !UniqueBeneficiariesPeriod.isProtected(period));
+        return periods.filter(period => !period.isProtected());
     }
 
     private mergeDefaultPeriodsWithExisting(existingPeriods: Maybe<UniqueBeneficiariesPeriod[]>) {
diff --git a/src/data/repositories/IndicatorReportD2Repository.ts b/src/data/repositories/IndicatorReportD2Repository.ts
index 814374f0..4052b02d 100644
--- a/src/data/repositories/IndicatorReportD2Repository.ts
+++ b/src/data/repositories/IndicatorReportD2Repository.ts
@@ -132,10 +132,10 @@ export class IndicatorReportD2Repository implements IndicatorReportRepository {
     private async getProjectsByIds(projectIds: Id[]): Promise<ProjectCountry[]> {
         const projects = await promiseMap(projectIds, id => Project.get(this.api, this.config, id));
         return projects.map(project => ({
-            closedDate: project.endDate?.toISOString() || "",
             id: project.id,
             name: project.name,
             openingDate: project.startDate?.toISOString() || "",
+            closedDate: project.endDate?.toISOString() || "",
         }));
     }
 
diff --git a/src/domain/entities/IndicatorCalculation.ts b/src/domain/entities/IndicatorCalculation.ts
index f5b8ac81..83a2524f 100644
--- a/src/domain/entities/IndicatorCalculation.ts
+++ b/src/domain/entities/IndicatorCalculation.ts
@@ -115,8 +115,12 @@ export class IndicatorCalculation extends Struct<IndicatorCalculationAttrs>() {
     }
 
     static calculateTotalValue(editable: Maybe<number>, returning: Maybe<number>): number {
-        if (!editable) return returning || 0;
-        if (!returning) return editable;
-        return editable + returning;
+        if (!editable) {
+            return returning || 0;
+        } else if (!returning) {
+            return editable;
+        } else {
+            return editable + returning;
+        }
     }
 }
diff --git a/src/domain/entities/IndicatorValidation.ts b/src/domain/entities/IndicatorValidation.ts
index ddf8322a..e04b5e45 100644
--- a/src/domain/entities/IndicatorValidation.ts
+++ b/src/domain/entities/IndicatorValidation.ts
@@ -4,7 +4,7 @@ import { ValidationError } from "./generic/Errors";
 import { Struct } from "./generic/Struct";
 import { validateRequired } from "./generic/Validations";
 import { IndicatorCalculation } from "./IndicatorCalculation";
-import { ISODateTimeString } from "./Ref";
+import { Id, ISODateTimeString } from "./Ref";
 import { UniqueBeneficiariesPeriod } from "./UniqueBeneficiariesPeriod";
 
 export type IndicatorValidationAttrs = {
@@ -34,9 +34,7 @@ export class IndicatorValidation extends Struct<IndicatorValidationAttrs>() {
             value: data.period,
         };
 
-        const errors: ValidationError<IndicatorValidation>[] = [periodProperty].filter(
-            validation => validation.errors.length > 0
-        );
+        const errors = [periodProperty].filter(validation => validation.errors.length > 0);
 
         return errors;
     }
@@ -44,4 +42,28 @@ export class IndicatorValidation extends Struct<IndicatorValidationAttrs>() {
     static validateCommentIndicators(indicators: IndicatorCalculation[]): boolean {
         return indicators.some(indicator => IndicatorCalculation.commentIsRequired(indicator));
     }
+
+    static buildIndicatorsValidationFromPeriods(
+        periods: UniqueBeneficiariesPeriod[],
+        indicatorsIds: Id[]
+    ): IndicatorValidation[] {
+        return periods.map(period => {
+            return IndicatorValidation.build({
+                createdAt: "",
+                lastUpdatedAt: "",
+                period,
+                indicatorsCalculation: indicatorsIds.map(indicatorId => {
+                    return IndicatorCalculation.build({
+                        id: indicatorId,
+                        newValue: 0,
+                        editableNewValue: undefined,
+                        returningValue: undefined,
+                        comment: "",
+                        code: "",
+                        name: "",
+                    }).get();
+                }),
+            }).get();
+        });
+    }
 }
diff --git a/src/domain/entities/UniqueBeneficiariesPeriod.ts b/src/domain/entities/UniqueBeneficiariesPeriod.ts
index 6ae84f16..392730ba 100644
--- a/src/domain/entities/UniqueBeneficiariesPeriod.ts
+++ b/src/domain/entities/UniqueBeneficiariesPeriod.ts
@@ -1,7 +1,8 @@
 import _ from "lodash";
+import { getUid } from "../../utils/dhis2";
 
 import { Either } from "./generic/Either";
-import { ValidationError } from "./generic/Errors";
+import { ValidationError, ValidationErrorKey } from "./generic/Errors";
 import { Struct } from "./generic/Struct";
 import {
     betweenValue,
@@ -52,14 +53,14 @@ export class UniqueBeneficiariesPeriod extends Struct<UniqueBeneficiariesPeriods
         return [semiAnnualPeriod, yearlyPeriod];
     }
 
-    public static isProtected(data: UniqueBeneficiariesPeriodsAttrs): boolean {
-        return data.id === "annual" || data.id === "semi-annual";
+    isProtected(): boolean {
+        return this.id === "annual" || this.id === "semi-annual";
     }
 
     public static initialPeriodData(): UniqueBeneficiariesPeriod {
         return this.create({
             endDateMonth: 12,
-            id: "",
+            id: getUid("unique_beneficiaries_period", new Date().getTime().toString()),
             name: "",
             startDateMonth: 1,
             type: "CUSTOM",
@@ -82,6 +83,11 @@ export class UniqueBeneficiariesPeriod extends Struct<UniqueBeneficiariesPeriods
     private static checkDataAndGetErrors(
         data: UniqueBeneficiariesPeriodsAttrs
     ): ValidationError<UniqueBeneficiariesPeriod>[] {
+        const dateDifferentError: ValidationErrorKey[] =
+            data.startDateMonth > data.endDateMonth || data.startDateMonth === data.endDateMonth
+                ? ["invalid_period_date_range"]
+                : [];
+
         const errors: ValidationError<UniqueBeneficiariesPeriod>[] = _([
             {
                 property: "name" as const,
@@ -99,9 +105,14 @@ export class UniqueBeneficiariesPeriod extends Struct<UniqueBeneficiariesPeriods
                 value: data.startDateMonth,
             },
             {
-                property: "endDateMonth" as const,
-                errors: betweenValue(data.endDateMonth, 1, 12),
-                value: data.endDateMonth,
+                property: "startDateMonth" as const,
+                errors: betweenValue(data.startDateMonth, 1, 12),
+                value: data.startDateMonth,
+            },
+            {
+                property: "startDateMonth" as const,
+                errors: dateDifferentError,
+                value: data.startDateMonth,
             },
         ])
             .filter(validation => validation.errors.length > 0)
diff --git a/src/domain/entities/generic/Errors.ts b/src/domain/entities/generic/Errors.ts
index ebfb68bd..d9f836fa 100644
--- a/src/domain/entities/generic/Errors.ts
+++ b/src/domain/entities/generic/Errors.ts
@@ -1,6 +1,10 @@
 import i18n from "../../../locales";
 
-export type ValidationErrorKey = "field_cannot_be_blank" | "not_in_list" | "positive_number";
+export type ValidationErrorKey =
+    | "field_cannot_be_blank"
+    | "not_in_list"
+    | "positive_number"
+    | "invalid_period_date_range";
 
 export const validationErrorMessages: Record<
     ValidationErrorKey,
@@ -19,6 +23,9 @@ export const validationErrorMessages: Record<
             fieldName: fieldName,
         });
     },
+    invalid_period_date_range: () => {
+        return i18n.t(`Start date must be before end date`);
+    },
 };
 
 export function getErrors<T>(errors: ValidationError<T>[]) {
diff --git a/src/domain/usecases/GetIndicatorsValidationUseCase.ts b/src/domain/usecases/GetIndicatorsValidationUseCase.ts
index 4a005f81..b07237bc 100644
--- a/src/domain/usecases/GetIndicatorsValidationUseCase.ts
+++ b/src/domain/usecases/GetIndicatorsValidationUseCase.ts
@@ -1,3 +1,4 @@
+import i18n from "../../locales";
 import { promiseMap } from "../../migrations/utils";
 import { Config } from "../../models/Config";
 import Project from "../../models/Project";
@@ -13,6 +14,7 @@ import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBen
 
 export class GetIndicatorsValidationUseCase {
     private actualCombination: Ref & { displayName: string };
+
     constructor(
         private dataValueRepository: DataValueRepository,
         private uniqueBeneficiariesSettingsRepository: UniqueBeneficiariesSettingsRepository,
@@ -28,7 +30,8 @@ export class GetIndicatorsValidationUseCase {
             this.getProjectById(options.projectId),
         ]);
 
-        if (settings.indicatorsIds.length === 0) throw Error("No unique indicators selected");
+        if (settings.indicatorsIds.length === 0)
+            throw Error(i18n.t("No unique indicators selected"));
 
         return this.getIndicatorsWithValues(project, settings);
     }
diff --git a/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts b/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts
index 9243f824..9939a5ff 100644
--- a/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts
+++ b/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts
@@ -1,3 +1,4 @@
+import i18n from "../../locales";
 import { UniqueBeneficiariesPeriod } from "../entities/UniqueBeneficiariesPeriod";
 import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
 import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBeneficiariesSettingsRepository";
@@ -7,9 +8,9 @@ export class RemoveUniqueBeneficiariesPeriodUseCase {
 
     async execute(options: Options): Promise<void> {
         const settings = await this.repository.get(options.projectId);
-        const isPeriodProtected = UniqueBeneficiariesPeriod.isProtected(options.period);
+        const isPeriodProtected = options.period.isProtected();
         if (isPeriodProtected) {
-            throw new Error("Cannot delete a protected period");
+            throw new Error(i18n.t("Cannot delete a protected period"));
         }
         return this.save(settings, options);
     }
diff --git a/src/domain/usecases/SaveIndicatorsValidationUseCase.ts b/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
index 03347140..f1bb0029 100644
--- a/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
+++ b/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
@@ -1,3 +1,4 @@
+import i18n from "../../locales";
 import { IndicatorValidation, IndicatorValidationAttrs } from "../entities/IndicatorValidation";
 import { Id } from "../entities/Ref";
 import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
@@ -14,12 +15,15 @@ export class SaveIndicatorsValidationUseCase {
             indicatorsValidation.indicatorsCalculation
         );
 
-        if (hasErrors) throw new Error("Cannot save indicators without comments");
+        if (hasErrors) throw new Error(i18n.t("Cannot save indicators without comments"));
 
         const periodIsValid = settings.periods.find(
             period => period.id === indicatorsValidation.period.id
         );
-        if (!periodIsValid) throw new Error(`Period not found: ${indicatorsValidation.period.id}`);
+        if (!periodIsValid)
+            throw new Error(
+                i18n.t(`Period not found: {{period}}`, { period: indicatorsValidation.period.id })
+            );
 
         const indicatorExist = settings.indicatorsValidation.find(
             item => item.period.id === indicatorsValidation.period.id
diff --git a/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts b/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
index be730145..0b13e1e9 100644
--- a/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
+++ b/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
@@ -1,3 +1,4 @@
+import i18n from "../../locales";
 import { UniqueBeneficiariesPeriod } from "../entities/UniqueBeneficiariesPeriod";
 import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
 import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBeneficiariesSettingsRepository";
@@ -8,17 +9,33 @@ export class SaveUniqueBeneficiariesSettingsUseCase {
     async execute(options: SaveSettingsOptions): Promise<void> {
         const settings = await this.repository.get(options.projectId);
         const periodExist = settings.periods.some(period => period.id === options.period.id);
-        const isPeriodProtected = UniqueBeneficiariesPeriod.isProtected(options.period);
+        const isPeriodProtected = options.period.isProtected();
         const { isValid, errorMessage } = UniqueBeneficiariesPeriod.validate(options.period);
+
+        if (this.isAnnualOrSemiAnnual(options.period)) {
+            throw new Error(i18n.t("Period is equal to the predefined annual/semi-annual period"));
+        }
+
         if (!isValid) {
             throw new Error(errorMessage);
         }
+
         if (isPeriodProtected) {
-            throw new Error("Cannot save a protected period");
+            throw new Error(i18n.t("Cannot save a protected period"));
         }
+
         return this.saveSettings(settings, periodExist, options);
     }
 
+    private isAnnualOrSemiAnnual(period: UniqueBeneficiariesPeriod): boolean {
+        const defaultPeriods = UniqueBeneficiariesPeriod.defaultPeriods();
+        return defaultPeriods.some(
+            defaultPeriod =>
+                defaultPeriod.startDateMonth === period.startDateMonth &&
+                defaultPeriod.endDateMonth === period.endDateMonth
+        );
+    }
+
     private saveSettings(
         settings: UniqueBeneficiariesSettings,
         periodExist: boolean,
@@ -43,7 +60,7 @@ export class SaveUniqueBeneficiariesSettingsUseCase {
             : [...existingPeriods, currentPeriod];
 
         if (!this.checkDuplicatesInPeriods(periodsToSave)) {
-            throw new Error("Cannot save duplicate periods");
+            throw new Error(i18n.t("Cannot save duplicate periods"));
         }
         return periodsToSave;
     }
diff --git a/src/models/ProjectDb.ts b/src/models/ProjectDb.ts
index 694678e6..8f19f5e3 100644
--- a/src/models/ProjectDb.ts
+++ b/src/models/ProjectDb.ts
@@ -744,12 +744,7 @@ export default class ProjectDb {
                     projectInfo.uniqueBeneficiaries.indicatorsIds
                 );
                 const value = { selectedIds, selectedMERIds, uniqueIndicatorsIds };
-                type Value = {
-                    selectedIds: Id[];
-                    selectedMERIds: Id[];
-                    uniqueIndicatorsIds: Id[];
-                };
-                return sector ? ([sector.id, value] as [string, Value]) : null;
+                return sector ? ([sector.id, value] as [string, typeof value]) : null;
             })
             .compact()
             .fromPairs()
diff --git a/src/pages/country-indicator-report/CountryIndicatorReport.tsx b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
index 18380fa3..32d5f126 100644
--- a/src/pages/country-indicator-report/CountryIndicatorReport.tsx
+++ b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
@@ -30,10 +30,6 @@ export const CountryIndicatorReport = React.memo(() => {
         indicatorsReports,
     });
 
-    const updateSelectedOrgUnit = (orgUnit: OrganisationUnit) => {
-        setOrgUnit(orgUnit);
-    };
-
     const updatePeriod = (periodId: Maybe<string>) => {
         const periods = getUniquePeriods(indicatorsReports);
         const period = periods.find(period => period.id === periodId);
@@ -42,16 +38,19 @@ export const CountryIndicatorReport = React.memo(() => {
         }
     };
 
-    const updateReport = (value: boolean, row: GroupedRows) => {
-        if (!selectedPeriod) return;
+    const updateReport = React.useCallback(
+        (value: boolean, row: GroupedRows) => {
+            if (!selectedPeriod) return;
 
-        const updatedIndicators = indicatorsReports.map(indicatorReport => {
-            if (indicatorReport.period.id !== selectedPeriod.id) return indicatorReport;
+            const updatedIndicators = indicatorsReports.map(indicatorReport => {
+                if (indicatorReport.period.id !== selectedPeriod.id) return indicatorReport;
 
-            return indicatorReport.updateProjectIndicators(row.project.id, row.id, value);
-        });
-        setIndicatorsReports(updatedIndicators);
-    };
+                return indicatorReport.updateProjectIndicators(row.project.id, row.id, value);
+            });
+            setIndicatorsReports(updatedIndicators);
+        },
+        [indicatorsReports, selectedPeriod, setIndicatorsReports]
+    );
 
     const indicatorReport = indicatorsReports.find(
         report => report.period.id === selectedPeriod?.id
@@ -76,7 +75,7 @@ export const CountryIndicatorReport = React.memo(() => {
             <Grid container spacing={2}>
                 <Grid item xs={12}>
                     <UserOrgUnits
-                        onChange={updateSelectedOrgUnit}
+                        onChange={setOrgUnit}
                         selected={orgUnit}
                         selectableLevels={[1, 2]}
                         withElevation={false}
diff --git a/src/pages/country-indicator-report/IndicatorReportTable.tsx b/src/pages/country-indicator-report/IndicatorReportTable.tsx
index b811fca1..d695bf6e 100644
--- a/src/pages/country-indicator-report/IndicatorReportTable.tsx
+++ b/src/pages/country-indicator-report/IndicatorReportTable.tsx
@@ -118,10 +118,6 @@ const TotalCell: RowComponent<GroupedRows> = props => {
 };
 
 const IndicatorCell = (props: IndicatorCellProps) => {
-    const onChangeCheckbox = (value: boolean, row: GroupedRows) => {
-        props.onRowChange(value, row);
-    };
-
     const notAvailableText = i18n.t("N/A");
     const isPeriodNotAvailable = props.row.periodNotAvailable;
 
@@ -137,7 +133,7 @@ const IndicatorCell = (props: IndicatorCellProps) => {
                 ) : (
                     <Checkbox
                         checked={props.row.include}
-                        onChange={event => onChangeCheckbox(event.target.checked, props.row)}
+                        onChange={event => props.onRowChange(event.target.checked, props.row)}
                     />
                 )}
             </TableCell>
diff --git a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
index 7a77ed7a..0216b4d6 100644
--- a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
+++ b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
@@ -107,7 +107,7 @@ export const IndicatorValidationForm = React.memo((props: IndicatorValidationFor
         IndicatorCalculation.commentIsRequired
     );
 
-    const showNotification = hasChanged || false;
+    const showNotification = hasChanged ?? false;
 
     const total = _(selectedIndicator?.indicatorsCalculation).sumBy(indicator =>
         IndicatorCalculation.getTotal(indicator)
diff --git a/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx b/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
index 5a36164e..80dec63c 100644
--- a/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
+++ b/src/pages/unique-periods/UniqueBeneficiariesPeriodsPage.tsx
@@ -34,10 +34,16 @@ export const UniqueBeneficiariesPeriodsPage = React.memo(() => {
     const openSavePeriodDialog = React.useCallback(
         (options: ActionTable) => {
             setSelectedPeriod(settings?.periods.find(period => period.id === options.id));
-            if (options.action === "add" || options.action === "edit") {
-                setSavePeriodModal(true);
-            } else if (options.action === "delete") {
-                setDeleteModal(true);
+            switch (options.action) {
+                case "add":
+                case "edit":
+                    setSavePeriodModal(true);
+                    break;
+                case "delete":
+                    setDeleteModal(true);
+                    break;
+                default:
+                    break;
             }
         },
         [settings?.periods]
diff --git a/src/pages/unique-periods/UniquePeriodsForm.tsx b/src/pages/unique-periods/UniquePeriodsForm.tsx
index f7f31211..198ba202 100644
--- a/src/pages/unique-periods/UniquePeriodsForm.tsx
+++ b/src/pages/unique-periods/UniquePeriodsForm.tsx
@@ -17,7 +17,7 @@ export type UniquePeriodsFormProps = {
     onSubmit: (uniquePeriods: UniqueBeneficiariesPeriod) => void;
 };
 
-const months = [
+export const months = [
     { value: "1", text: i18n.t("January") },
     { value: "2", text: i18n.t("February") },
     { value: "3", text: i18n.t("March") },

From 01e915174b0d3ebf67b246666307ff07910ce825 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Mon, 11 Nov 2024 11:40:28 -0500
Subject: [PATCH 26/51] update i18n

---
 i18n/en.pot                                   | 28 +++++++++++++++++--
 .../SaveIndicatorsValidationUseCase.ts        |  5 +++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 5123e9ef..50acf41c 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-06T21:38:31.863Z\n"
-"PO-Revision-Date: 2024-11-06T21:38:31.863Z\n"
+"POT-Creation-Date: 2024-11-11T16:40:18.991Z\n"
+"PO-Revision-Date: 2024-11-11T16:40:18.991Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -351,6 +351,30 @@ msgstr ""
 msgid "{{fieldName}} must be a positive number"
 msgstr ""
 
+msgid "Start date must be before end date"
+msgstr ""
+
+msgid "No unique indicators selected"
+msgstr ""
+
+msgid "Cannot delete a protected period"
+msgstr ""
+
+msgid "Cannot save indicators without comments"
+msgstr ""
+
+msgid "Period not found: {{period}}"
+msgstr ""
+
+msgid "Period is equal to the predefined annual/semi-annual period"
+msgstr ""
+
+msgid "Cannot save a protected period"
+msgstr ""
+
+msgid "Cannot save duplicate periods"
+msgstr ""
+
 msgid "Error saving dashboard"
 msgstr ""
 
diff --git a/src/domain/usecases/SaveIndicatorsValidationUseCase.ts b/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
index f1bb0029..6e8f7f6b 100644
--- a/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
+++ b/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
@@ -22,7 +22,10 @@ export class SaveIndicatorsValidationUseCase {
         );
         if (!periodIsValid)
             throw new Error(
-                i18n.t(`Period not found: {{period}}`, { period: indicatorsValidation.period.id })
+                i18n.t("Period not found: {{period}}", {
+                    nsSeparator: false,
+                    period: indicatorsValidation.period.id,
+                })
             );
 
         const indicatorExist = settings.indicatorsValidation.find(

From 5a7914cca527f0825f77260026cdbd8444a5570f Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Mon, 11 Nov 2024 15:26:51 -0500
Subject: [PATCH 27/51] fixed errors in project indicators validation

---
 i18n/en.pot                                           |  7 +++++--
 src/domain/entities/IndicatorCalculation.ts           |  2 +-
 .../IndicatorValidationForm.tsx                       | 11 ++++++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 50acf41c..6c298f75 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-11T16:40:18.991Z\n"
-"PO-Revision-Date: 2024-11-11T16:40:18.991Z\n"
+"POT-Creation-Date: 2024-11-11T20:26:06.613Z\n"
+"PO-Revision-Date: 2024-11-11T20:26:06.613Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -1009,6 +1009,9 @@ msgstr ""
 msgid "Period not found"
 msgstr ""
 
+msgid "Value must be greater than or equal to zero"
+msgstr ""
+
 msgid "Project Indicators Validation"
 msgstr ""
 
diff --git a/src/domain/entities/IndicatorCalculation.ts b/src/domain/entities/IndicatorCalculation.ts
index 83a2524f..0df563a0 100644
--- a/src/domain/entities/IndicatorCalculation.ts
+++ b/src/domain/entities/IndicatorCalculation.ts
@@ -98,7 +98,7 @@ export class IndicatorCalculation extends Struct<IndicatorCalculationAttrs>() {
         return IndicatorCalculation.build({
             id: id,
             newValue: newValueSum,
-            editableNewValue: newValueSum,
+            editableNewValue: existingRecord?.editableNewValue || newValueSum,
             returningValue,
             comment: existingRecord?.comment || "",
             previousValue: newValueHasChanged ? existingRecord?.newValue : undefined,
diff --git a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
index 0216b4d6..2204be7a 100644
--- a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
+++ b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
@@ -75,6 +75,15 @@ export const IndicatorValidationForm = React.memo((props: IndicatorValidationFor
         (value: string, indexRow: number, attributeName: IndicatorCalculationKeys) => {
             setIndicatorValidation(prevState => {
                 if (!prevState) return prevState;
+
+                if (attributeName === "editableNewValue" || attributeName === "returningValue") {
+                    const numericValue = Number(value);
+                    if (numericValue < 0) {
+                        snackbar.error(i18n.t("Value must be greater than or equal to zero"));
+                        return prevState;
+                    }
+                }
+
                 return IndicatorValidation.build({
                     ...prevState,
                     indicatorsCalculation: prevState.indicatorsCalculation.map((item, index) => {
@@ -87,7 +96,7 @@ export const IndicatorValidationForm = React.memo((props: IndicatorValidationFor
                 }).get();
             });
         },
-        []
+        [snackbar]
     );
 
     const saveIndicatorValidation = React.useCallback(

From a783a89968d816100c99fc1e2a9946fa8a2fad4d Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Tue, 12 Nov 2024 08:24:40 -0500
Subject: [PATCH 28/51] fix errors in country project and indicators

---
 i18n/en.pot                                   |  31 ++--
 .../UniqueBeneficiariesTable.tsx              |   8 +-
 .../IndicatorReportD2Repository.ts            |  30 ++--
 src/domain/entities/IndicatorReport.tsx       |   4 +
 .../entities/UniqueBeneficiariesPeriod.ts     |  36 +++++
 .../usecases/GetProjectsByCountryUseCase.ts   |  25 ++--
 .../SaveIndicatorsValidationUseCase.ts        |  70 +++++----
 src/hooks/UseConfirmChanges.ts                |  35 +++++
 .../CountryIndicatorReport.tsx                |  93 ++++++++----
 .../IndicatorReportTable.tsx                  |  30 ++--
 .../country-indicator-report/excel-report.ts  |  37 ++++-
 .../IndicatorValidationForm.tsx               | 136 +++++-------------
 .../ProjectIndicatorsValidation.tsx           |  76 +++++++---
 .../project-indicators-validation/hooks.ts    | 119 +++++++++++++++
 src/pages/report/MerReport.tsx                |  44 +++---
 src/utils/date.ts                             |   5 +
 16 files changed, 510 insertions(+), 269 deletions(-)
 create mode 100644 src/hooks/UseConfirmChanges.ts
 create mode 100644 src/pages/project-indicators-validation/hooks.ts

diff --git a/i18n/en.pot b/i18n/en.pot
index 6c298f75..b08837da 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-11T20:26:06.613Z\n"
-"PO-Revision-Date: 2024-11-11T20:26:06.613Z\n"
+"POT-Creation-Date: 2024-11-12T13:23:47.083Z\n"
+"PO-Revision-Date: 2024-11-12T13:23:47.083Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -360,10 +360,7 @@ msgstr ""
 msgid "Cannot delete a protected period"
 msgstr ""
 
-msgid "Cannot save indicators without comments"
-msgstr ""
-
-msgid "Period not found: {{period}}"
+msgid "Cannot save indicators without comments for period: {{period}}"
 msgstr ""
 
 msgid "Period is equal to the predefined annual/semi-annual period"
@@ -891,6 +888,9 @@ msgstr ""
 msgid "No projects found for selected period: {{period}}"
 msgstr ""
 
+msgid "Any changes will be lost. Are you sure you want to proceed?"
+msgstr ""
+
 msgid "Saving..."
 msgstr ""
 
@@ -1006,12 +1006,6 @@ msgid ""
 "{{monthName}}"
 msgstr ""
 
-msgid "Period not found"
-msgstr ""
-
-msgid "Value must be greater than or equal to zero"
-msgstr ""
-
 msgid "Project Indicators Validation"
 msgstr ""
 
@@ -1036,13 +1030,19 @@ msgstr ""
 msgid "Comment is required"
 msgstr ""
 
+msgid "Saving Indicators..."
+msgstr ""
+
+msgid "Indicators saved"
+msgstr ""
+
 msgid "Loading Indicators..."
 msgstr ""
 
-msgid "Saving Indicators..."
+msgid "Period not found"
 msgstr ""
 
-msgid "Indicators saved"
+msgid "Value must be greater than or equal to zero"
 msgstr ""
 
 msgid "Cannot load project"
@@ -1214,9 +1214,6 @@ msgstr ""
 msgid "The report must be saved before it can be downloaded"
 msgstr ""
 
-msgid "Any changes will be lost. Are you sure you want to proceed?"
-msgstr ""
-
 msgid "Date"
 msgstr ""
 
diff --git a/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx b/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx
index 927c936c..d594d8ec 100644
--- a/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx
+++ b/src/components/unique-beneficiaries/UniqueBeneficiariesTable.tsx
@@ -4,7 +4,7 @@ import EditIcon from "@material-ui/icons/Edit";
 import React from "react";
 import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
 import i18n from "../../locales";
-import { months } from "../../pages/unique-periods/UniquePeriodsForm";
+import { getMonthNameFromNumber } from "../../utils/date";
 
 export type ActionTable = { action: "edit" | "delete" | "add"; id: string };
 
@@ -46,15 +46,13 @@ export const UniqueBeneficiariesTable = React.memo((props: UniqueBeneficiariesTa
                     name: "startDateMonth",
                     text: i18n.t("Start Month"),
                     sortable: false,
-                    getValue: value =>
-                        months.find(month => month.value === String(value.startDateMonth))?.text,
+                    getValue: value => getMonthNameFromNumber(value.startDateMonth),
                 },
                 {
                     name: "endDateMonth",
                     text: i18n.t("End Month"),
                     sortable: false,
-                    getValue: value =>
-                        months.find(month => month.value === String(value.endDateMonth))?.text,
+                    getValue: value => getMonthNameFromNumber(value.endDateMonth),
                 },
             ],
             initialSorting: { field: "name", order: "asc" },
diff --git a/src/data/repositories/IndicatorReportD2Repository.ts b/src/data/repositories/IndicatorReportD2Repository.ts
index 4052b02d..c867cd10 100644
--- a/src/data/repositories/IndicatorReportD2Repository.ts
+++ b/src/data/repositories/IndicatorReportD2Repository.ts
@@ -13,7 +13,6 @@ import Project from "../../models/Project";
 import { promiseMap } from "../../migrations/utils";
 import { Config } from "../../models/Config";
 import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
-import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
 import { D2DataElement } from "./D2DataElement";
 
 export class IndicatorReportD2Repository implements IndicatorReportRepository {
@@ -50,14 +49,17 @@ export class IndicatorReportD2Repository implements IndicatorReportRepository {
         const currentDate = new Date().toISOString();
         return reports.map((report): D2Response => {
             const existingRecord = existingReports?.find(
-                item => item.periodId === report.period.id
+                item =>
+                    item.startDate === report.period.startDateMonth &&
+                    item.endDate === report.period.endDateMonth
             );
 
             return {
                 countryId: report.countryId,
                 createdAt: existingRecord?.createdAt || currentDate,
                 updatedAt: currentDate,
-                periodId: report.period.id,
+                endDate: report.period.endDateMonth,
+                startDate: report.period.startDateMonth,
                 projects: report.projects.map((project): D2Response["projects"][number] => ({
                     id: project.id,
                     indicators: project.indicators.map(indicator => ({
@@ -80,11 +82,17 @@ export class IndicatorReportD2Repository implements IndicatorReportRepository {
         const settingsByProjects = settings.filter(setting =>
             projectIds.includes(setting.projectId)
         );
-        const periods = this.getPeriods(settingsByProjects);
+        const periods = settingsByProjects.flatMap(setting => setting.periods);
+        const groupedPeriods = UniqueBeneficiariesPeriod.uniquePeriodsByDates(periods);
 
         return responses.map(response => {
-            const currentPeriod = periods.find(period => period.id === response.periodId);
-            if (!currentPeriod) throw Error(`Period ${response.periodId} not found`);
+            const currentPeriod = groupedPeriods.find(
+                period =>
+                    period.startDateMonth === response.startDate &&
+                    period.endDateMonth === response.endDate
+            );
+            if (!currentPeriod)
+                throw Error(`Period ${response.startDate}-${response.endDate} not found`);
 
             return IndicatorReport.create({
                 countryId: response.countryId,
@@ -122,13 +130,6 @@ export class IndicatorReportD2Repository implements IndicatorReportRepository {
         });
     }
 
-    private getPeriods(settings: UniqueBeneficiariesSettings[]): UniqueBeneficiariesPeriod[] {
-        return _(settings)
-            .flatMap(setting => setting.periods)
-            .uniqBy(period => period.id)
-            .value();
-    }
-
     private async getProjectsByIds(projectIds: Id[]): Promise<ProjectCountry[]> {
         const projects = await promiseMap(projectIds, id => Project.get(this.api, this.config, id));
         return projects.map(project => ({
@@ -146,7 +147,8 @@ export class IndicatorReportD2Repository implements IndicatorReportRepository {
 
 type D2Response = {
     countryId: Id;
-    periodId: Id;
+    startDate: number;
+    endDate: number;
     createdAt: ISODateTimeString;
     updatedAt: ISODateTimeString;
     projects: Array<{
diff --git a/src/domain/entities/IndicatorReport.tsx b/src/domain/entities/IndicatorReport.tsx
index 8738ad7e..04124ec9 100644
--- a/src/domain/entities/IndicatorReport.tsx
+++ b/src/domain/entities/IndicatorReport.tsx
@@ -55,4 +55,8 @@ export class IndicatorReport extends Struct<IndicatorReportAttrs>() {
             indicator.indicatorId === indicatorId ? { ...indicator, include } : indicator
         );
     }
+
+    static generateIndicatorFullName(indicator: ProjectIndicatorRow): string {
+        return `${indicator.indicatorName} (${indicator.indicatorCode})`;
+    }
 }
diff --git a/src/domain/entities/UniqueBeneficiariesPeriod.ts b/src/domain/entities/UniqueBeneficiariesPeriod.ts
index 392730ba..9dee5b55 100644
--- a/src/domain/entities/UniqueBeneficiariesPeriod.ts
+++ b/src/domain/entities/UniqueBeneficiariesPeriod.ts
@@ -1,4 +1,6 @@
 import _ from "lodash";
+import { Maybe } from "../../types/utils";
+import { getMonthNameFromNumber } from "../../utils/date";
 import { getUid } from "../../utils/dhis2";
 
 import { Either } from "./generic/Either";
@@ -120,4 +122,38 @@ export class UniqueBeneficiariesPeriod extends Struct<UniqueBeneficiariesPeriods
 
         return errors;
     }
+
+    public static uniquePeriodsByDates(
+        periods: UniqueBeneficiariesPeriod[]
+    ): UniqueBeneficiariesPeriod[] {
+        const combinedPeriods = _(periods)
+            .groupBy(period => `${period.startDateMonth}-${period.endDateMonth}`)
+            .map((group, key): Maybe<UniqueBeneficiariesPeriod> => {
+                const [startDateMonth, endDateMonth] = key.split("-").map(Number);
+                const startMonthName = getMonthNameFromNumber(startDateMonth);
+                const endMonthName = getMonthNameFromNumber(endDateMonth);
+                const joinNames = group.map(period => period.name).join(", ");
+
+                const isAnnualOrSemiAnnual = group.some(
+                    period => period.type === "ANNUAL" || period.type === "SEMIANNUAL"
+                );
+
+                if (isAnnualOrSemiAnnual) return undefined;
+
+                return UniqueBeneficiariesPeriod.create({
+                    id: group[0].id || "",
+                    name: `${startMonthName} - ${endMonthName} (${joinNames})`,
+                    type: "CUSTOM",
+                    startDateMonth,
+                    endDateMonth,
+                });
+            })
+            .compact()
+            .value();
+
+        return _(combinedPeriods)
+            .concat(this.defaultPeriods())
+            .uniqBy(period => period.id)
+            .value();
+    }
 }
diff --git a/src/domain/usecases/GetProjectsByCountryUseCase.ts b/src/domain/usecases/GetProjectsByCountryUseCase.ts
index e610cea8..a4eec4a7 100644
--- a/src/domain/usecases/GetProjectsByCountryUseCase.ts
+++ b/src/domain/usecases/GetProjectsByCountryUseCase.ts
@@ -53,14 +53,15 @@ export class GetProjectsByCountryUseCase {
         countryId: Id,
         dataElements: DataElement[]
     ): IndicatorReport[] {
-        const allPeriods = _(settings)
-            .flatMap(setting => setting.periods)
-            .uniqBy(period => period.id)
-            .value();
+        const allPeriods = settings.flatMap(setting => setting.periods);
+        const uniquePeriods = UniqueBeneficiariesPeriod.uniquePeriodsByDates(allPeriods);
 
-        return allPeriods.map((period): IndicatorReport => {
+        return uniquePeriods.map((period): IndicatorReport => {
             const existingData = existingReports.find(
-                report => report.period?.id === period.id && report.countryId === countryId
+                report =>
+                    report.period.startDateMonth === period.startDateMonth &&
+                    report.period.endDateMonth === period.endDateMonth &&
+                    report.countryId === countryId
             );
 
             return existingData
@@ -89,12 +90,20 @@ export class GetProjectsByCountryUseCase {
                     return undefined;
 
                 const isCustomPeriod = period.type === "CUSTOM";
-                const periodExist = settingsProject?.periods.find(item => item.id === period.id);
+                const periodExist = settingsProject?.periods.find(
+                    item =>
+                        item.startDateMonth === period.startDateMonth &&
+                        item.endDateMonth === period.endDateMonth
+                );
 
                 const notIndicatorsAvailable = isCustomPeriod && !periodExist;
 
                 const indicatorsCalculation = settingsProject?.indicatorsValidation
-                    .find(item => item.period.id === period.id)
+                    .find(
+                        item =>
+                            item.period.startDateMonth === period.startDateMonth &&
+                            item.period.endDateMonth === period.endDateMonth
+                    )
                     ?.indicatorsCalculation.map((indicator): ProjectIndicatorRow => {
                         return {
                             periodNotAvailable: notIndicatorsAvailable,
diff --git a/src/domain/usecases/SaveIndicatorsValidationUseCase.ts b/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
index 6e8f7f6b..6d7dc27f 100644
--- a/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
+++ b/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
@@ -8,50 +8,62 @@ export class SaveIndicatorsValidationUseCase {
     constructor(private settingsRepository: UniqueBeneficiariesSettingsRepository) {}
 
     async execute(options: SaveIndicatorsOptions): Promise<void> {
-        const { indicatorsValidation, projectId } = options;
+        const { indicatorsValidations, projectId } = options;
         const settings = await this.settingsRepository.get(projectId);
 
-        const hasErrors = IndicatorValidation.validateCommentIndicators(
-            indicatorsValidation.indicatorsCalculation
-        );
-
-        if (hasErrors) throw new Error(i18n.t("Cannot save indicators without comments"));
+        const rowWithError = this.getIndexRowWithError(indicatorsValidations);
 
-        const periodIsValid = settings.periods.find(
-            period => period.id === indicatorsValidation.period.id
-        );
-        if (!periodIsValid)
+        if (rowWithError !== -1) {
+            const row = indicatorsValidations[rowWithError];
             throw new Error(
-                i18n.t("Period not found: {{period}}", {
+                i18n.t("Cannot save indicators without comments for period: {{period}}", {
+                    period: row.period.name,
                     nsSeparator: false,
-                    period: indicatorsValidation.period.id,
                 })
             );
+        }
 
-        const indicatorExist = settings.indicatorsValidation.find(
-            item => item.period.id === indicatorsValidation.period.id
-        );
+        const indicatorsToSave = this.buildIndicatorsToSave(indicatorsValidations, settings);
 
-        const currentDate = new Date().toISOString();
-        const indicatorAttributes: IndicatorValidationAttrs = {
-            ...options.indicatorsValidation,
-            lastUpdatedAt: indicatorExist ? currentDate : undefined,
-            createdAt: indicatorExist ? indicatorExist.createdAt : currentDate,
-        };
+        return this.saveIndicators(settings, indicatorsToSave);
+    }
 
-        const indicatorValidationToSave = IndicatorValidation.build(indicatorAttributes).get();
+    private getIndexRowWithError(indicatorsValidations: IndicatorValidation[]): number {
+        return indicatorsValidations.findIndex(item =>
+            IndicatorValidation.validateCommentIndicators(item.indicatorsCalculation)
+        );
+    }
 
+    private saveIndicators(
+        settings: UniqueBeneficiariesSettings,
+        indicatorsToSave: IndicatorValidation[]
+    ): Promise<void> {
         const settingsToSave: UniqueBeneficiariesSettings = {
             ...settings,
-            indicatorsValidation: indicatorExist
-                ? settings.indicatorsValidation.map(indicator => {
-                      if (indicator.period.id !== indicatorsValidation.period.id) return indicator;
-                      return IndicatorValidation.build(indicatorValidationToSave).get();
-                  })
-                : settings.indicatorsValidation.concat(indicatorValidationToSave),
+            indicatorsValidation: indicatorsToSave,
         };
+
         return this.settingsRepository.save(settingsToSave);
     }
+
+    private buildIndicatorsToSave(
+        indicatorsValidations: IndicatorValidation[],
+        settings: UniqueBeneficiariesSettings
+    ): IndicatorValidation[] {
+        return indicatorsValidations.map(indicator => {
+            const indicatorExist = settings.indicatorsValidation.find(
+                item => item.period.id === indicator.period.id
+            );
+
+            const currentDate = new Date().toISOString();
+            const indicatorAttributes: IndicatorValidationAttrs = {
+                ...indicator,
+                lastUpdatedAt: indicatorExist ? currentDate : undefined,
+                createdAt: indicatorExist ? indicatorExist.createdAt : currentDate,
+            };
+            return IndicatorValidation.build(indicatorAttributes).get();
+        });
+    }
 }
 
-type SaveIndicatorsOptions = { projectId: Id; indicatorsValidation: IndicatorValidation };
+type SaveIndicatorsOptions = { projectId: Id; indicatorsValidations: IndicatorValidation[] };
diff --git a/src/hooks/UseConfirmChanges.ts b/src/hooks/UseConfirmChanges.ts
new file mode 100644
index 00000000..4db7e4d6
--- /dev/null
+++ b/src/hooks/UseConfirmChanges.ts
@@ -0,0 +1,35 @@
+import React from "react";
+
+type ProceedWarning = { type: "hidden" } | { type: "visible"; action: () => void };
+
+export function useConfirmChanges() {
+    const [proceedWarning, setProceedWarning] = React.useState<ProceedWarning>({ type: "hidden" });
+    const [wasReportModified, wasReportModifiedSet] = React.useState(false);
+
+    const confirmIfUnsavedChanges = React.useCallback(
+        (action: () => void) => {
+            if (wasReportModified) {
+                setProceedWarning({ type: "visible", action });
+            } else {
+                action();
+            }
+        },
+        [wasReportModified, setProceedWarning]
+    );
+
+    const runProceedAction = React.useCallback(
+        (action: () => void) => {
+            setProceedWarning({ type: "hidden" });
+            action();
+        },
+        [setProceedWarning]
+    );
+
+    return {
+        confirmIfUnsavedChanges,
+        proceedWarning,
+        runProceedAction,
+        wasReportModified,
+        wasReportModifiedSet,
+    };
+}
diff --git a/src/pages/country-indicator-report/CountryIndicatorReport.tsx b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
index 32d5f126..e914ec50 100644
--- a/src/pages/country-indicator-report/CountryIndicatorReport.tsx
+++ b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
@@ -1,6 +1,5 @@
-import _ from "lodash";
 import React from "react";
-import { Dropdown, useLoading, useSnackbar } from "@eyeseetea/d2-ui-components";
+import { ConfirmationDialog, Dropdown, useLoading, useSnackbar } from "@eyeseetea/d2-ui-components";
 import { Button, Grid, Typography } from "@material-ui/core";
 
 import UserOrgUnits, { OrganisationUnit } from "../../components/org-units/UserOrgUnits";
@@ -11,27 +10,38 @@ import { useGoTo } from "../../router";
 import { Maybe } from "../../types/utils";
 import { GroupedRows, IndicatorReportTable } from "./IndicatorReportTable";
 import { useAppContext } from "../../contexts/api-context";
-import { getId } from "../../utils/dhis2";
 import { IndicatorReport } from "../../domain/entities/IndicatorReport";
 import { Id } from "../../domain/entities/Ref";
 import { buildSpreadSheet } from "./excel-report";
 import { downloadFile } from "../../utils/download";
+import { useConfirmChanges } from "../../hooks/UseConfirmChanges";
 
 export const CountryIndicatorReport = React.memo(() => {
     const goTo = useGoTo();
     const [orgUnit, setOrgUnit] = React.useState<OrganisationUnit>();
     const [selectedPeriod, setSelectedPeriod] = React.useState<UniqueBeneficiariesPeriod>();
+    const { confirmIfUnsavedChanges, proceedWarning, runProceedAction, wasReportModifiedSet } =
+        useConfirmChanges();
     const { indicatorsReports, setIndicatorsReports } = useGetIndicatorsReport({
         countryId: orgUnit?.id,
+        wasReportModifiedSet,
     });
 
     const saveIndicatorReport = useSaveIndicatorReport({
         countryId: orgUnit?.id,
         indicatorsReports,
+        wasReportModifiedSet,
     });
 
+    const updateOrgUnit = (orgUnit: OrganisationUnit) => {
+        confirmIfUnsavedChanges(() => {
+            setOrgUnit(orgUnit);
+            setSelectedPeriod(undefined);
+        });
+    };
+
     const updatePeriod = (periodId: Maybe<string>) => {
-        const periods = getUniquePeriods(indicatorsReports);
+        const periods = getAllPeriods(indicatorsReports);
         const period = periods.find(period => period.id === periodId);
         if (period) {
             setSelectedPeriod(period);
@@ -48,8 +58,9 @@ export const CountryIndicatorReport = React.memo(() => {
                 return indicatorReport.updateProjectIndicators(row.project.id, row.id, value);
             });
             setIndicatorsReports(updatedIndicators);
+            wasReportModifiedSet(true);
         },
-        [indicatorsReports, selectedPeriod, setIndicatorsReports]
+        [indicatorsReports, selectedPeriod, setIndicatorsReports, wasReportModifiedSet]
     );
 
     const indicatorReport = indicatorsReports.find(
@@ -58,24 +69,27 @@ export const CountryIndicatorReport = React.memo(() => {
 
     const downloadReport = () => {
         if (indicatorReport && orgUnit) {
-            console.log(indicatorReport);
             buildSpreadSheet(indicatorReport, orgUnit.displayName).then(downloadFile);
         }
     };
 
+    const changePage = React.useCallback(() => {
+        confirmIfUnsavedChanges(() => {
+            goTo("projects");
+        });
+    }, [confirmIfUnsavedChanges, goTo]);
+
     const reportHasProjects = indicatorReport && indicatorReport.projects.length > 0;
+    const titlePage = i18n.t("Country Project & Indicators");
 
     return (
         <section>
-            <PageHeader
-                title={i18n.t("Country Project & Indicators")}
-                onBackClick={() => goTo("projects")}
-            />
+            <PageHeader title={i18n.t("Country Project & Indicators")} onBackClick={changePage} />
 
             <Grid container spacing={2}>
                 <Grid item xs={12}>
                     <UserOrgUnits
-                        onChange={setOrgUnit}
+                        onChange={updateOrgUnit}
                         selected={orgUnit}
                         selectableLevels={[1, 2]}
                         withElevation={false}
@@ -84,19 +98,20 @@ export const CountryIndicatorReport = React.memo(() => {
                 </Grid>
                 <Grid item xs={12}>
                     <Dropdown
-                        items={mapItemsToDropdown(getUniquePeriods(indicatorsReports))}
+                        items={mapItemsToDropdown(getAllPeriods(indicatorsReports))}
                         onChange={period => updatePeriod(period)}
                         label={i18n.t("Select period")}
                         value={selectedPeriod?.id}
                         hideEmpty
                     />
                 </Grid>
-                {reportHasProjects && (
+                {reportHasProjects && selectedPeriod && (
                     <>
                         <Grid item xs={12}>
                             <IndicatorReportTable
                                 report={indicatorReport}
                                 onRowChange={updateReport}
+                                period={selectedPeriod}
                             />
                         </Grid>
                         <Grid item>
@@ -134,18 +149,29 @@ export const CountryIndicatorReport = React.memo(() => {
                     </Typography>
                 )}
             </Grid>
+
+            {proceedWarning.type === "visible" && (
+                <ConfirmationDialog
+                    isOpen
+                    onSave={() => runProceedAction(proceedWarning.action)}
+                    onCancel={() => runProceedAction(() => {})}
+                    title={titlePage}
+                    description={i18n.t(
+                        "Any changes will be lost. Are you sure you want to proceed?"
+                    )}
+                    saveText={i18n.t("Yes")}
+                    cancelText={i18n.t("No")}
+                />
+            )}
         </section>
     );
 });
 
 CountryIndicatorReport.displayName = "CountryIndicatorReport";
 
-function getUniquePeriods(settings: IndicatorReport[]): UniqueBeneficiariesPeriod[] {
-    return _(settings)
-        .map(setting => setting.period)
-        .compact()
-        .uniqBy(getId)
-        .value();
+function getAllPeriods(settings: IndicatorReport[]): UniqueBeneficiariesPeriod[] {
+    const allPeriods = settings.flatMap(setting => setting.period);
+    return allPeriods;
 }
 
 function mapItemsToDropdown(periods: UniqueBeneficiariesPeriod[]) {
@@ -156,7 +182,7 @@ function mapItemsToDropdown(periods: UniqueBeneficiariesPeriod[]) {
 
 export function useSaveIndicatorReport(props: UseSaveCountryReportProps) {
     const { compositionRoot } = useAppContext();
-    const { countryId, indicatorsReports: reports } = props;
+    const { countryId, indicatorsReports: reports, wasReportModifiedSet } = props;
     const snackbar = useSnackbar();
     const loading = useLoading();
 
@@ -171,14 +197,20 @@ export function useSaveIndicatorReport(props: UseSaveCountryReportProps) {
             .catch(err => {
                 snackbar.error(err.message);
             })
-            .finally(() => loading.hide());
-    }, [compositionRoot, loading, snackbar, countryId, reports]);
+            .finally(() => {
+                wasReportModifiedSet(false);
+                loading.hide();
+            });
+    }, [compositionRoot, loading, snackbar, countryId, reports, wasReportModifiedSet]);
 
     return saveIndicatorReport;
 }
 
-export function useGetIndicatorsReport(props: { countryId: Maybe<Id> }) {
-    const { countryId } = props;
+export function useGetIndicatorsReport(props: {
+    countryId: Maybe<Id>;
+    wasReportModifiedSet: React.Dispatch<React.SetStateAction<boolean>>;
+}) {
+    const { countryId, wasReportModifiedSet } = props;
     const { compositionRoot } = useAppContext();
     const snackbar = useSnackbar();
     const loading = useLoading();
@@ -192,10 +224,17 @@ export function useGetIndicatorsReport(props: { countryId: Maybe<Id> }) {
             .execute({ countryId })
             .then(setIndicatorsReports)
             .catch(error => snackbar.error(error.message))
-            .finally(() => loading.hide());
-    }, [compositionRoot, countryId, loading, snackbar]);
+            .finally(() => {
+                loading.hide();
+                wasReportModifiedSet(false);
+            });
+    }, [compositionRoot, countryId, loading, snackbar, wasReportModifiedSet]);
 
     return { indicatorsReports, setIndicatorsReports };
 }
 
-type UseSaveCountryReportProps = { countryId: Maybe<Id>; indicatorsReports: IndicatorReport[] };
+type UseSaveCountryReportProps = {
+    countryId: Maybe<Id>;
+    indicatorsReports: IndicatorReport[];
+    wasReportModifiedSet: React.Dispatch<React.SetStateAction<boolean>>;
+};
diff --git a/src/pages/country-indicator-report/IndicatorReportTable.tsx b/src/pages/country-indicator-report/IndicatorReportTable.tsx
index d695bf6e..20536f13 100644
--- a/src/pages/country-indicator-report/IndicatorReportTable.tsx
+++ b/src/pages/country-indicator-report/IndicatorReportTable.tsx
@@ -16,21 +16,24 @@ import i18n from "../../locales";
 import { Grouper, RowComponent } from "../report/rich-rows-utils";
 import TableBodyGrouped from "../report/TableBodyGrouped";
 import { buildMonthYearFormatDate } from "../../utils/date";
+import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
 
 type IndicatorReportTableProps = {
+    period: UniqueBeneficiariesPeriod;
     report: IndicatorReportAttrs;
     onRowChange: (value: boolean, row: GroupedRows) => void;
 };
 
 export const IndicatorReportTable = React.memo((props: IndicatorReportTableProps) => {
-    const { report, onRowChange } = props;
-
+    const { period, report, onRowChange } = props;
     const groupers: Grouper<GroupedRows>[] = React.useMemo(() => {
         return [
             {
                 name: "project",
                 getId: row => row.project.id,
-                component: ProjectCell,
+                component: function ProjectCells(props) {
+                    return <ProjectCell row={props.row} rowSpan={props.rowSpan} period={period} />;
+                },
             },
             {
                 name: "indicator",
@@ -45,7 +48,7 @@ export const IndicatorReportTable = React.memo((props: IndicatorReportTableProps
                 component: TotalCell,
             },
         ];
-    }, [onRowChange]);
+    }, [onRowChange, period]);
 
     const indicatorsRows = report.projects.flatMap(project => {
         const sumIndicators = _(project.indicators)
@@ -99,12 +102,15 @@ export const IndicatorReportTable = React.memo((props: IndicatorReportTableProps
 
 IndicatorReportTable.displayName = "IndicatorReportTable";
 
-const ProjectCell: RowComponent<GroupedRows> = props => {
+const ProjectCell = (props: ProjectCellProps) => {
+    const { rowSpan, row, period } = props;
+
     return (
-        <TableCell rowSpan={props.rowSpan}>
-            {props.row.project.name} <br /> (
-            {buildMonthYearFormatDate(props.row.project.openingDate)} -{" "}
-            {buildMonthYearFormatDate(props.row.project.closedDate)})
+        <TableCell rowSpan={rowSpan}>
+            {row.project.name} <br /> ({buildMonthYearFormatDate(row.project.openingDate)} -{" "}
+            {buildMonthYearFormatDate(row.project.closedDate)})
+            <br />
+            {period.name}
         </TableCell>
     );
 };
@@ -159,3 +165,9 @@ type IndicatorCellProps = {
     row: GroupedRows;
     onRowChange: (value: boolean, row: GroupedRows) => void;
 };
+
+type ProjectCellProps = {
+    row: GroupedRows;
+    rowSpan: number | undefined;
+    period: UniqueBeneficiariesPeriod;
+};
diff --git a/src/pages/country-indicator-report/excel-report.ts b/src/pages/country-indicator-report/excel-report.ts
index 1ff0e7ae..a80d5bdf 100644
--- a/src/pages/country-indicator-report/excel-report.ts
+++ b/src/pages/country-indicator-report/excel-report.ts
@@ -22,18 +22,25 @@ async function generateFileInBuffer(
 }
 
 function generateRows(indicatorReport: IndicatorReport, sheet: ExcelJS.Worksheet) {
+    const notAvailableText = i18n.t("N/A");
     indicatorReport.projects.forEach(project => {
         const projectName = project.project.name;
 
         project.indicators.forEach((indicator, index) => {
             sheet.addRow({
                 projectName: index === 0 ? projectName : null,
-                indicatorCode: indicator.indicatorCode,
-                value: indicator.value,
-                include: indicator.include ? i18n.t("Yes") : i18n.t("No"),
-                total: _(project.indicators).sumBy(indicator =>
-                    indicator.include ? indicator.value || 0 : 0
-                ),
+                indicatorCode: IndicatorReport.generateIndicatorFullName(indicator),
+                value: indicator.periodNotAvailable ? notAvailableText : indicator.value,
+                include: indicator.periodNotAvailable
+                    ? notAvailableText
+                    : indicator.include
+                    ? i18n.t("Yes")
+                    : i18n.t("No"),
+                total: indicator.periodNotAvailable
+                    ? notAvailableText
+                    : _(project.indicators).sumBy(indicator =>
+                          indicator.include ? indicator.value || 0 : 0
+                      ),
             });
         });
 
@@ -44,6 +51,24 @@ function generateRows(indicatorReport: IndicatorReport, sheet: ExcelJS.Worksheet
             sheet.mergeCells(`E${startRow}:E${endRow}`);
         }
     });
+
+    generateTotalFooter(indicatorReport, sheet);
+}
+
+function generateTotalFooter(indicatorReport: IndicatorReport, sheet: ExcelJS.Worksheet) {
+    const allIndicators = indicatorReport.projects.flatMap(project => project.indicators);
+    const totalCountryBeneficiaries = _(allIndicators).sumBy(indicator =>
+        indicator.include ? indicator.value || 0 : 0
+    );
+
+    sheet.addRow({});
+    sheet.addRow({
+        value: i18n.t("Country Unique Beneficiaries"),
+        include: totalCountryBeneficiaries,
+    });
+
+    const totalRows = sheet.rowCount;
+    sheet.mergeCells(`D${totalRows}:E${totalRows}`);
 }
 
 function generateColumns(): Partial<ExcelJS.Column>[] {
diff --git a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
index 2204be7a..e84b2d91 100644
--- a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
+++ b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
@@ -1,36 +1,39 @@
 import _ from "lodash";
 import React from "react";
-import { Dropdown, useSnackbar } from "@eyeseetea/d2-ui-components";
+import { Dropdown } from "@eyeseetea/d2-ui-components";
 import i18n from "../../locales";
 import { IndicatorValidation } from "../../domain/entities/IndicatorValidation";
 import { Maybe } from "../../types/utils";
-import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
 import { Button, Grid, makeStyles, Typography } from "@material-ui/core";
 import { IndicatorValidationTable } from "./IndicatorValidationTable";
 import PageHeader from "../../components/page-header/PageHeader";
 import { useHistory } from "react-router-dom";
-import {
-    IndicatorCalculation,
-    IndicatorCalculationKeys,
-} from "../../domain/entities/IndicatorCalculation";
+import { IndicatorCalculation } from "../../domain/entities/IndicatorCalculation";
 import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
-import { getErrors } from "../../domain/entities/generic/Errors";
 import { IndicatorNotification } from "./IndicatorNotification";
 import { ISODateTimeString } from "../../domain/entities/Ref";
+import { useIndicatorValidation } from "./hooks";
 
 export type IndicatorValidationFormProps = {
     indicatorsValidation: IndicatorValidation[];
     onSubmit: (indicatorValidation: IndicatorValidation) => void;
+    onUpdateIndicator: (indicator: IndicatorValidation) => void;
     settings: UniqueBeneficiariesSettings;
 };
 
 export const IndicatorValidationForm = React.memo((props: IndicatorValidationFormProps) => {
-    const { indicatorsValidation, onSubmit, settings } = props;
+    const { indicatorsValidation, onSubmit, settings, onUpdateIndicator } = props;
     const { periods } = settings;
-    const [selectedPeriod, setSelectedPeriod] = React.useState<UniqueBeneficiariesPeriod>();
-    const [selectedIndicator, setIndicatorValidation] = React.useState<IndicatorValidation>();
-    const [dismissNotification, setDismissNotification] = React.useState(false);
-    const snackbar = useSnackbar();
+    const {
+        dismissNotification,
+        selectedIndicator,
+        selectedPeriod,
+        loadIndicatorValidation,
+        saveIndicatorValidation,
+        setDismissNotification,
+        updateIndicatorsValidationRow,
+    } = useIndicatorValidation({ indicatorsValidation, onSubmit, periods, onUpdateIndicator });
+
     const history = useHistory();
     const classes = useStyles();
 
@@ -39,75 +42,6 @@ export const IndicatorValidationForm = React.memo((props: IndicatorValidationFor
         text: period.name,
     }));
 
-    const loadIndicatorValidation = React.useCallback(
-        (period: Maybe<string>) => {
-            const uniquePeriod = periods.find(item => item.id === period);
-            if (!uniquePeriod) {
-                snackbar.error(i18n.t("Period not found"));
-                return;
-            }
-
-            const currentIndicatorValidation = indicatorsValidation.find(
-                indicator => indicator.period.id === period
-            );
-
-            setSelectedPeriod(uniquePeriod);
-            setDismissNotification(false);
-            IndicatorValidation.build({
-                createdAt: currentIndicatorValidation?.createdAt || "",
-                lastUpdatedAt: currentIndicatorValidation?.lastUpdatedAt,
-                period: uniquePeriod,
-                indicatorsCalculation: currentIndicatorValidation?.indicatorsCalculation || [],
-            }).match({
-                success: value => {
-                    setIndicatorValidation(value);
-                },
-                error: err => {
-                    const errorMessage = getErrors(err);
-                    snackbar.error(errorMessage);
-                },
-            });
-        },
-        [indicatorsValidation, periods, snackbar]
-    );
-
-    const updateIndicatorsValidationRow = React.useCallback(
-        (value: string, indexRow: number, attributeName: IndicatorCalculationKeys) => {
-            setIndicatorValidation(prevState => {
-                if (!prevState) return prevState;
-
-                if (attributeName === "editableNewValue" || attributeName === "returningValue") {
-                    const numericValue = Number(value);
-                    if (numericValue < 0) {
-                        snackbar.error(i18n.t("Value must be greater than or equal to zero"));
-                        return prevState;
-                    }
-                }
-
-                return IndicatorValidation.build({
-                    ...prevState,
-                    indicatorsCalculation: prevState.indicatorsCalculation.map((item, index) => {
-                        if (index !== indexRow) return item;
-                        return IndicatorCalculation.build({
-                            ...item,
-                            [attributeName]: getValue(value, attributeName),
-                        }).get();
-                    }),
-                }).get();
-            });
-        },
-        [snackbar]
-    );
-
-    const saveIndicatorValidation = React.useCallback(
-        (event: React.FormEvent<HTMLFormElement>) => {
-            event.preventDefault();
-            if (!selectedPeriod || !selectedIndicator) return;
-            onSubmit(selectedIndicator);
-        },
-        [selectedIndicator, onSubmit, selectedPeriod]
-    );
-
     const hasChanged = selectedIndicator?.indicatorsCalculation.some(
         IndicatorCalculation.hasChanged
     );
@@ -141,19 +75,15 @@ export const IndicatorValidationForm = React.memo((props: IndicatorValidationFor
                 {selectedIndicator && (
                     <Grid container>
                         <Grid item className={classes.alignRight}>
-                            {selectedIndicator.createdAt && (
-                                <Typography variant="body1">
-                                    <strong>{i18n.t("Created")}:</strong>{" "}
-                                    {convertToLocalDate(selectedIndicator.createdAt)}
-                                </Typography>
-                            )}
+                            <DateDisplay
+                                label={i18n.t("Created")}
+                                date={selectedIndicator.createdAt}
+                            />
 
-                            {selectedIndicator.lastUpdatedAt && (
-                                <Typography variant="body1">
-                                    <strong>{i18n.t("Last Updated")}:</strong>{" "}
-                                    {convertToLocalDate(selectedIndicator.lastUpdatedAt)}
-                                </Typography>
-                            )}
+                            <DateDisplay
+                                label={i18n.t("Last Updated")}
+                                date={selectedIndicator.lastUpdatedAt}
+                            />
                         </Grid>
 
                         <Grid item xs={12}>
@@ -193,16 +123,16 @@ export const IndicatorValidationForm = React.memo((props: IndicatorValidationFor
     );
 });
 
-function getValue(value: string, attributeName: IndicatorCalculationKeys) {
-    switch (attributeName) {
-        case "editableNewValue":
-        case "returningValue":
-            return value.length > 0 ? Number(value) : undefined;
-        case "comment":
-            return value;
-        default:
-            throw new Error(`Attribute ${attributeName} not supported`);
-    }
+function DateDisplay(props: { label: string; date: Maybe<ISODateTimeString> }) {
+    const { date, label } = props;
+
+    if (!date) return null;
+
+    return (
+        <Typography variant="body1">
+            <strong>{label}:</strong> {convertToLocalDate(date)}
+        </Typography>
+    );
 }
 
 type FieldValidation = { comment: { isRequired: boolean } };
diff --git a/src/pages/project-indicators-validation/ProjectIndicatorsValidation.tsx b/src/pages/project-indicators-validation/ProjectIndicatorsValidation.tsx
index 472fa44f..c532ccc8 100644
--- a/src/pages/project-indicators-validation/ProjectIndicatorsValidation.tsx
+++ b/src/pages/project-indicators-validation/ProjectIndicatorsValidation.tsx
@@ -8,45 +8,49 @@ import { useGetUniqueBeneficiaries } from "../../hooks/UniqueBeneficiaries";
 import { IndicatorValidationForm } from "./IndicatorValidationForm";
 import { IndicatorValidation } from "../../domain/entities/IndicatorValidation";
 import i18n from "../../locales";
+import { Id } from "@eyeseetea/d2-api";
 
 export const ProjectIndicatorsValidation = React.memo(() => {
     const { id } = useParams<Ref>();
     const { compositionRoot } = useAppContext();
     const { settings } = useGetUniqueBeneficiaries({ id, refresh: 0 });
-    const [indicatorsValidation, setIndicatorsValidation] = React.useState<IndicatorValidation[]>(
-        []
-    );
-    const [refresh, setRefresh] = React.useState(0);
     const loading = useLoading();
     const snackbar = useSnackbar();
+    const { indicatorsValidation, setIndicatorsValidation, setRefresh } =
+        useLoadIndicatorsValidations({ id });
 
-    React.useEffect(() => {
-        console.debug("refresh", refresh);
-        loading.show(true, i18n.t("Loading Indicators..."));
-        compositionRoot.indicators.getValidation
-            .execute({ projectId: id })
-            .then(setIndicatorsValidation)
+    const saveIndicator = React.useCallback(() => {
+        loading.show(true, i18n.t("Saving Indicators..."));
+        compositionRoot.indicators.saveValidation
+            .execute({ projectId: id, indicatorsValidations: indicatorsValidation })
+            .then(() => {
+                snackbar.success(i18n.t("Indicators saved"));
+                setRefresh(prev => prev + 1);
+            })
             .catch(err => {
                 snackbar.error(err.message);
             })
             .finally(() => loading.hide());
-    }, [compositionRoot.indicators, id, loading, refresh, snackbar]);
+    }, [
+        compositionRoot.indicators.saveValidation,
+        id,
+        indicatorsValidation,
+        loading,
+        snackbar,
+        setRefresh,
+    ]);
 
-    const saveIndicator = React.useCallback(
+    const updateIndicator = React.useCallback(
         (indicatorValidation: IndicatorValidation) => {
-            loading.show(true, i18n.t("Saving Indicators..."));
-            compositionRoot.indicators.saveValidation
-                .execute({ projectId: id, indicatorsValidation: indicatorValidation })
-                .then(() => {
-                    snackbar.success(i18n.t("Indicators saved"));
-                    setRefresh(prev => prev + 1);
-                })
-                .catch(err => {
-                    snackbar.error(err.message);
+            setIndicatorsValidation(prev =>
+                prev.map(indicator => {
+                    return indicator.period.id === indicatorValidation.period.id
+                        ? indicatorValidation
+                        : indicator;
                 })
-                .finally(() => loading.hide());
+            );
         },
-        [compositionRoot.indicators.saveValidation, id, loading, snackbar]
+        [setIndicatorsValidation]
     );
 
     if (!settings) return null;
@@ -57,9 +61,35 @@ export const ProjectIndicatorsValidation = React.memo(() => {
                 indicatorsValidation={indicatorsValidation}
                 settings={settings}
                 onSubmit={saveIndicator}
+                onUpdateIndicator={updateIndicator}
             />
         </div>
     );
 });
 
+function useLoadIndicatorsValidations(props: { id: Id }) {
+    const { id } = props;
+    const { compositionRoot } = useAppContext();
+    const [indicatorsValidation, setIndicatorsValidation] = React.useState<IndicatorValidation[]>(
+        []
+    );
+    const [refresh, setRefresh] = React.useState(0);
+    const loading = useLoading();
+    const snackbar = useSnackbar();
+
+    React.useEffect(() => {
+        console.debug("refresh", refresh);
+        loading.show(true, i18n.t("Loading Indicators..."));
+        compositionRoot.indicators.getValidation
+            .execute({ projectId: id })
+            .then(setIndicatorsValidation)
+            .catch(err => {
+                snackbar.error(err.message);
+            })
+            .finally(() => loading.hide());
+    }, [compositionRoot.indicators, id, loading, refresh, snackbar]);
+
+    return { indicatorsValidation, setIndicatorsValidation, setRefresh };
+}
+
 ProjectIndicatorsValidation.displayName = "ProjectIndicatorsValidation";
diff --git a/src/pages/project-indicators-validation/hooks.ts b/src/pages/project-indicators-validation/hooks.ts
new file mode 100644
index 00000000..a88db769
--- /dev/null
+++ b/src/pages/project-indicators-validation/hooks.ts
@@ -0,0 +1,119 @@
+import { useSnackbar } from "@eyeseetea/d2-ui-components";
+import React from "react";
+import { getErrors } from "../../domain/entities/generic/Errors";
+import {
+    IndicatorCalculation,
+    IndicatorCalculationKeys,
+} from "../../domain/entities/IndicatorCalculation";
+import { IndicatorValidation } from "../../domain/entities/IndicatorValidation";
+import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
+import i18n from "../../locales";
+import { Maybe } from "../../types/utils";
+
+export type UseIndicatorValidationProps = {
+    periods: UniqueBeneficiariesPeriod[];
+    indicatorsValidation: IndicatorValidation[];
+    onSubmit: (indicatorValidation: IndicatorValidation) => void;
+    onUpdateIndicator: (indicator: IndicatorValidation) => void;
+};
+
+export function useIndicatorValidation(props: UseIndicatorValidationProps) {
+    const { indicatorsValidation, onSubmit, onUpdateIndicator, periods } = props;
+
+    const [selectedPeriod, setSelectedPeriod] = React.useState<UniqueBeneficiariesPeriod>();
+    const [selectedIndicator, setIndicatorValidation] = React.useState<IndicatorValidation>();
+    const [dismissNotification, setDismissNotification] = React.useState(false);
+    const snackbar = useSnackbar();
+    const loadIndicatorValidation = React.useCallback(
+        (period: Maybe<string>) => {
+            const uniquePeriod = periods.find(item => item.id === period);
+            if (!uniquePeriod) {
+                snackbar.error(i18n.t("Period not found"));
+                return;
+            }
+
+            const currentIndicatorValidation = indicatorsValidation.find(
+                indicator => indicator.period.id === period
+            );
+
+            setSelectedPeriod(uniquePeriod);
+            setDismissNotification(false);
+            IndicatorValidation.build({
+                createdAt: currentIndicatorValidation?.createdAt || "",
+                lastUpdatedAt: currentIndicatorValidation?.lastUpdatedAt,
+                period: uniquePeriod,
+                indicatorsCalculation: currentIndicatorValidation?.indicatorsCalculation || [],
+            }).match({
+                success: value => {
+                    setIndicatorValidation(value);
+                },
+                error: err => {
+                    const errorMessage = getErrors(err);
+                    snackbar.error(errorMessage);
+                },
+            });
+        },
+        [indicatorsValidation, periods, snackbar]
+    );
+
+    const updateIndicatorsValidationRow = React.useCallback(
+        (value: string, indexRow: number, attributeName: IndicatorCalculationKeys) => {
+            setIndicatorValidation(prevState => {
+                if (!prevState) return prevState;
+
+                if (attributeName === "editableNewValue" || attributeName === "returningValue") {
+                    const numericValue = Number(value);
+                    if (numericValue < 0) {
+                        snackbar.error(i18n.t("Value must be greater than or equal to zero"));
+                        return prevState;
+                    }
+                }
+
+                const record = IndicatorValidation.build({
+                    ...prevState,
+                    indicatorsCalculation: prevState.indicatorsCalculation.map((item, index) => {
+                        if (index !== indexRow) return item;
+                        return IndicatorCalculation.build({
+                            ...item,
+                            [attributeName]: getValue(value, attributeName),
+                        }).get();
+                    }),
+                }).get();
+                onUpdateIndicator(record);
+                return record;
+            });
+        },
+        [onUpdateIndicator, snackbar]
+    );
+
+    const saveIndicatorValidation = React.useCallback(
+        (event: React.FormEvent<HTMLFormElement>) => {
+            event.preventDefault();
+            if (!selectedPeriod || !selectedIndicator) return;
+            onSubmit(selectedIndicator);
+        },
+        [selectedIndicator, onSubmit, selectedPeriod]
+    );
+
+    return {
+        selectedIndicator,
+        selectedPeriod,
+        dismissNotification,
+        setDismissNotification,
+        loadIndicatorValidation,
+        updateIndicatorsValidationRow,
+        saveIndicatorValidation,
+    };
+}
+
+function getValue(value: string, attributeName: IndicatorCalculationKeys) {
+    switch (attributeName) {
+        case "editableNewValue":
+        case "returningValue":
+            return value.length > 0 ? Number(value) : undefined;
+        case "comment":
+            return value;
+        default:
+            throw new Error(`Attribute ${attributeName} not supported`);
+    }
+}
diff --git a/src/pages/report/MerReport.tsx b/src/pages/report/MerReport.tsx
index 922eb329..586a3b5d 100644
--- a/src/pages/report/MerReport.tsx
+++ b/src/pages/report/MerReport.tsx
@@ -27,8 +27,7 @@ import ExecutiveSummaries from "../../components/report/ExecutiveSummaries";
 import { useGoTo, generateUrl } from "../../router";
 import { useAppHistory } from "../../utils/use-app-history";
 import { ErrorMessage } from "./ErrorMessage";
-
-type ProceedWarning = { type: "hidden" } | { type: "visible"; action: () => void };
+import { useConfirmChanges } from "../../hooks/UseConfirmChanges";
 
 const MerReportComponent: React.FC = () => {
     const { api, config, isDev } = useAppContext();
@@ -37,8 +36,13 @@ const MerReportComponent: React.FC = () => {
     const classes = useStyles();
     const snackbar = useSnackbar();
     const initial = isDev ? getDevMerReport() : { date: null, orgUnit: null };
-    const [proceedWarning, setProceedWarning] = useState<ProceedWarning>({ type: "hidden" });
-    const [wasReportModified, wasReportModifiedSet] = useState(false);
+    const {
+        confirmIfUnsavedChanges,
+        proceedWarning,
+        runProceedAction,
+        wasReportModified,
+        wasReportModifiedSet,
+    } = useConfirmChanges();
     const datePickerState = useBoolean(false);
     const [date, setDate] = useState(initial.date);
     const [orgUnit, setOrgUnit] = useState(initial.orgUnit);
@@ -57,12 +61,15 @@ const MerReportComponent: React.FC = () => {
                 MerReport.create(api, config, selectData).then(setMerReportBase)
             );
         }
-    }, [api, config, snackbar, date, orgUnit]);
+    }, [api, config, snackbar, date, orgUnit, wasReportModifiedSet]);
 
-    const setMerReport = React.useCallback((report: MerReport) => {
-        setMerReportBase(report);
-        wasReportModifiedSet(true);
-    }, []);
+    const setMerReport = React.useCallback(
+        (report: MerReport) => {
+            setMerReportBase(report);
+            wasReportModifiedSet(true);
+        },
+        [wasReportModifiedSet]
+    );
 
     const onChange = React.useCallback(
         <Field extends keyof MerReportData>(field: Field, val: MerReportData[Field]) => {
@@ -95,25 +102,6 @@ const MerReportComponent: React.FC = () => {
         if (merReport) run(merReport);
     }, [merReport, snackbar, wasReportModifiedSet, loading]);
 
-    const confirmIfUnsavedChanges = React.useCallback(
-        (action: () => void) => {
-            if (wasReportModified) {
-                setProceedWarning({ type: "visible", action });
-            } else {
-                action();
-            }
-        },
-        [wasReportModified, setProceedWarning]
-    );
-
-    const runProceedAction = React.useCallback(
-        (action: () => void) => {
-            setProceedWarning({ type: "hidden" });
-            action();
-        },
-        [setProceedWarning]
-    );
-
     const setDateAndClosePicker = React.useCallback(
         (date: Moment) => {
             setDate(date);
diff --git a/src/utils/date.ts b/src/utils/date.ts
index 64bc9ca6..8180d29c 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -1,4 +1,5 @@
 import moment, { Moment } from "moment";
+import { months } from "../pages/unique-periods/UniquePeriodsForm";
 
 export function toISOString(date: Moment) {
     return date.format("YYYY-MM-DDTHH:mm:ss");
@@ -53,3 +54,7 @@ export function buildMonthYearFormatDate(dateIsoString: string): string {
     // examples: JAN 2021, NOV 2024
     return new Date(dateIsoString).toLocaleString("default", { month: "short", year: "numeric" });
 }
+
+export function getMonthNameFromNumber(monthNumber: string | number): string {
+    return months.find(month => month.value === monthNumber.toString())?.text || "";
+}

From 80060efee382fc02155d00568253a95ed3484ac9 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Tue, 12 Nov 2024 08:42:27 -0500
Subject: [PATCH 29/51] refactor hook for confirm changes in form

---
 src/hooks/UseConfirmChanges.ts                | 35 -------------------
 .../CountryIndicatorReport.tsx                |  2 +-
 src/pages/report/MerReport.tsx                | 35 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 37 deletions(-)
 delete mode 100644 src/hooks/UseConfirmChanges.ts

diff --git a/src/hooks/UseConfirmChanges.ts b/src/hooks/UseConfirmChanges.ts
deleted file mode 100644
index 4db7e4d6..00000000
--- a/src/hooks/UseConfirmChanges.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from "react";
-
-type ProceedWarning = { type: "hidden" } | { type: "visible"; action: () => void };
-
-export function useConfirmChanges() {
-    const [proceedWarning, setProceedWarning] = React.useState<ProceedWarning>({ type: "hidden" });
-    const [wasReportModified, wasReportModifiedSet] = React.useState(false);
-
-    const confirmIfUnsavedChanges = React.useCallback(
-        (action: () => void) => {
-            if (wasReportModified) {
-                setProceedWarning({ type: "visible", action });
-            } else {
-                action();
-            }
-        },
-        [wasReportModified, setProceedWarning]
-    );
-
-    const runProceedAction = React.useCallback(
-        (action: () => void) => {
-            setProceedWarning({ type: "hidden" });
-            action();
-        },
-        [setProceedWarning]
-    );
-
-    return {
-        confirmIfUnsavedChanges,
-        proceedWarning,
-        runProceedAction,
-        wasReportModified,
-        wasReportModifiedSet,
-    };
-}
diff --git a/src/pages/country-indicator-report/CountryIndicatorReport.tsx b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
index e914ec50..7eae008c 100644
--- a/src/pages/country-indicator-report/CountryIndicatorReport.tsx
+++ b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
@@ -14,7 +14,7 @@ import { IndicatorReport } from "../../domain/entities/IndicatorReport";
 import { Id } from "../../domain/entities/Ref";
 import { buildSpreadSheet } from "./excel-report";
 import { downloadFile } from "../../utils/download";
-import { useConfirmChanges } from "../../hooks/UseConfirmChanges";
+import { useConfirmChanges } from "../report/MerReport";
 
 export const CountryIndicatorReport = React.memo(() => {
     const goTo = useGoTo();
diff --git a/src/pages/report/MerReport.tsx b/src/pages/report/MerReport.tsx
index 586a3b5d..94f927d8 100644
--- a/src/pages/report/MerReport.tsx
+++ b/src/pages/report/MerReport.tsx
@@ -27,7 +27,8 @@ import ExecutiveSummaries from "../../components/report/ExecutiveSummaries";
 import { useGoTo, generateUrl } from "../../router";
 import { useAppHistory } from "../../utils/use-app-history";
 import { ErrorMessage } from "./ErrorMessage";
-import { useConfirmChanges } from "../../hooks/UseConfirmChanges";
+
+type ProceedWarning = { type: "hidden" } | { type: "visible"; action: () => void };
 
 const MerReportComponent: React.FC = () => {
     const { api, config, isDev } = useAppContext();
@@ -278,3 +279,35 @@ function useRedirectToProjectsPageIfUserHasNoAccess() {
 }
 
 export default React.memo(MerReportComponent);
+
+export function useConfirmChanges() {
+    const [proceedWarning, setProceedWarning] = React.useState<ProceedWarning>({ type: "hidden" });
+    const [wasReportModified, wasReportModifiedSet] = React.useState(false);
+
+    const confirmIfUnsavedChanges = React.useCallback(
+        (action: () => void) => {
+            if (wasReportModified) {
+                setProceedWarning({ type: "visible", action });
+            } else {
+                action();
+            }
+        },
+        [wasReportModified, setProceedWarning]
+    );
+
+    const runProceedAction = React.useCallback(
+        (action: () => void) => {
+            setProceedWarning({ type: "hidden" });
+            action();
+        },
+        [setProceedWarning]
+    );
+
+    return {
+        confirmIfUnsavedChanges,
+        proceedWarning,
+        runProceedAction,
+        wasReportModified,
+        wasReportModifiedSet,
+    };
+}

From f27173f8a6178094f876d3440fabe3ce044b18cc Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Wed, 13 Nov 2024 07:23:07 -0500
Subject: [PATCH 30/51] improvements for periods and indicator report

---
 .../UniqueIndicatorsStep.tsx                   |  7 +++----
 .../IndicatorReportD2Repository.ts             | 12 ++++--------
 src/domain/entities/IndicatorCalculation.ts    |  8 +-------
 .../entities/UniqueBeneficiariesPeriod.ts      |  4 ++++
 .../usecases/GetProjectsByCountryUseCase.ts    | 15 +++++----------
 .../SaveUniqueBeneficiariesSettingsUseCase.ts  | 18 ++++++------------
 .../CountryIndicatorReport.tsx                 |  5 ++---
 7 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/src/components/steps/unique-beneficiaries/UniqueIndicatorsStep.tsx b/src/components/steps/unique-beneficiaries/UniqueIndicatorsStep.tsx
index bbc819ae..993bfaa0 100644
--- a/src/components/steps/unique-beneficiaries/UniqueIndicatorsStep.tsx
+++ b/src/components/steps/unique-beneficiaries/UniqueIndicatorsStep.tsx
@@ -1,15 +1,14 @@
 import React from "react";
-import { Id } from "../../../domain/entities/Ref";
 import { StepProps } from "../../../pages/project-wizard/ProjectWizard";
 import { Filter } from "../data-elements/DataElementsFilters";
-import DataElementsStep from "../data-elements/DataElementsStep";
+import DataElementsStep, { DataElementsStepProps } from "../data-elements/DataElementsStep";
 
 const initialFilters: Filter = { peopleOrBenefit: "people" };
 
 const UniqueIndicatorsStep: React.FC<StepProps> = props => {
     const { project } = props;
-    const getSelection = React.useCallback(
-        (sectorId: Id, dataElementIds: Id[]) => {
+    const getSelection = React.useCallback<DataElementsStepProps["onSelect"]>(
+        (sectorId, dataElementIds) => {
             return project.updateUniqueBeneficiariesSelection(sectorId, dataElementIds);
         },
         [project]
diff --git a/src/data/repositories/IndicatorReportD2Repository.ts b/src/data/repositories/IndicatorReportD2Repository.ts
index c867cd10..e4272318 100644
--- a/src/data/repositories/IndicatorReportD2Repository.ts
+++ b/src/data/repositories/IndicatorReportD2Repository.ts
@@ -48,10 +48,8 @@ export class IndicatorReportD2Repository implements IndicatorReportRepository {
     ) {
         const currentDate = new Date().toISOString();
         return reports.map((report): D2Response => {
-            const existingRecord = existingReports?.find(
-                item =>
-                    item.startDate === report.period.startDateMonth &&
-                    item.endDate === report.period.endDateMonth
+            const existingRecord = existingReports?.find(item =>
+                report.period.equalMonths(item.startDate, item.endDate)
             );
 
             return {
@@ -86,10 +84,8 @@ export class IndicatorReportD2Repository implements IndicatorReportRepository {
         const groupedPeriods = UniqueBeneficiariesPeriod.uniquePeriodsByDates(periods);
 
         return responses.map(response => {
-            const currentPeriod = groupedPeriods.find(
-                period =>
-                    period.startDateMonth === response.startDate &&
-                    period.endDateMonth === response.endDate
+            const currentPeriod = groupedPeriods.find(period =>
+                period.equalMonths(response.startDate, response.endDate)
             );
             if (!currentPeriod)
                 throw Error(`Period ${response.startDate}-${response.endDate} not found`);
diff --git a/src/domain/entities/IndicatorCalculation.ts b/src/domain/entities/IndicatorCalculation.ts
index 0df563a0..5a5bcf59 100644
--- a/src/domain/entities/IndicatorCalculation.ts
+++ b/src/domain/entities/IndicatorCalculation.ts
@@ -115,12 +115,6 @@ export class IndicatorCalculation extends Struct<IndicatorCalculationAttrs>() {
     }
 
     static calculateTotalValue(editable: Maybe<number>, returning: Maybe<number>): number {
-        if (!editable) {
-            return returning || 0;
-        } else if (!returning) {
-            return editable;
-        } else {
-            return editable + returning;
-        }
+        return (editable ?? 0) + (returning ?? 0);
     }
 }
diff --git a/src/domain/entities/UniqueBeneficiariesPeriod.ts b/src/domain/entities/UniqueBeneficiariesPeriod.ts
index 9dee5b55..e13833b7 100644
--- a/src/domain/entities/UniqueBeneficiariesPeriod.ts
+++ b/src/domain/entities/UniqueBeneficiariesPeriod.ts
@@ -156,4 +156,8 @@ export class UniqueBeneficiariesPeriod extends Struct<UniqueBeneficiariesPeriods
             .uniqBy(period => period.id)
             .value();
     }
+
+    public equalMonths(startDateMonth: number, endDateMonth: number): boolean {
+        return this.startDateMonth === startDateMonth && this.endDateMonth === endDateMonth;
+    }
 }
diff --git a/src/domain/usecases/GetProjectsByCountryUseCase.ts b/src/domain/usecases/GetProjectsByCountryUseCase.ts
index a4eec4a7..29443753 100644
--- a/src/domain/usecases/GetProjectsByCountryUseCase.ts
+++ b/src/domain/usecases/GetProjectsByCountryUseCase.ts
@@ -59,8 +59,7 @@ export class GetProjectsByCountryUseCase {
         return uniquePeriods.map((period): IndicatorReport => {
             const existingData = existingReports.find(
                 report =>
-                    report.period.startDateMonth === period.startDateMonth &&
-                    report.period.endDateMonth === period.endDateMonth &&
+                    report.period.equalMonths(period.startDateMonth, period.endDateMonth) &&
                     report.countryId === countryId
             );
 
@@ -90,19 +89,15 @@ export class GetProjectsByCountryUseCase {
                     return undefined;
 
                 const isCustomPeriod = period.type === "CUSTOM";
-                const periodExist = settingsProject?.periods.find(
-                    item =>
-                        item.startDateMonth === period.startDateMonth &&
-                        item.endDateMonth === period.endDateMonth
+                const periodExist = settingsProject?.periods.find(item =>
+                    period.equalMonths(item.startDateMonth, item.endDateMonth)
                 );
 
                 const notIndicatorsAvailable = isCustomPeriod && !periodExist;
 
                 const indicatorsCalculation = settingsProject?.indicatorsValidation
-                    .find(
-                        item =>
-                            item.period.startDateMonth === period.startDateMonth &&
-                            item.period.endDateMonth === period.endDateMonth
+                    .find(item =>
+                        period.equalMonths(item.period.startDateMonth, item.period.endDateMonth)
                     )
                     ?.indicatorsCalculation.map((indicator): ProjectIndicatorRow => {
                         return {
diff --git a/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts b/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
index 0b13e1e9..e8113572 100644
--- a/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
+++ b/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
@@ -14,25 +14,19 @@ export class SaveUniqueBeneficiariesSettingsUseCase {
 
         if (this.isAnnualOrSemiAnnual(options.period)) {
             throw new Error(i18n.t("Period is equal to the predefined annual/semi-annual period"));
-        }
-
-        if (!isValid) {
+        } else if (!isValid) {
             throw new Error(errorMessage);
-        }
-
-        if (isPeriodProtected) {
+        } else if (isPeriodProtected) {
             throw new Error(i18n.t("Cannot save a protected period"));
+        } else {
+            return this.saveSettings(settings, periodExist, options);
         }
-
-        return this.saveSettings(settings, periodExist, options);
     }
 
     private isAnnualOrSemiAnnual(period: UniqueBeneficiariesPeriod): boolean {
         const defaultPeriods = UniqueBeneficiariesPeriod.defaultPeriods();
-        return defaultPeriods.some(
-            defaultPeriod =>
-                defaultPeriod.startDateMonth === period.startDateMonth &&
-                defaultPeriod.endDateMonth === period.endDateMonth
+        return defaultPeriods.some(defaultPeriod =>
+            defaultPeriod.equalMonths(period.startDateMonth, period.endDateMonth)
         );
     }
 
diff --git a/src/pages/country-indicator-report/CountryIndicatorReport.tsx b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
index 7eae008c..35b0c728 100644
--- a/src/pages/country-indicator-report/CountryIndicatorReport.tsx
+++ b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
@@ -169,9 +169,8 @@ export const CountryIndicatorReport = React.memo(() => {
 
 CountryIndicatorReport.displayName = "CountryIndicatorReport";
 
-function getAllPeriods(settings: IndicatorReport[]): UniqueBeneficiariesPeriod[] {
-    const allPeriods = settings.flatMap(setting => setting.period);
-    return allPeriods;
+function getAllPeriods(indicatorsReports: IndicatorReport[]): UniqueBeneficiariesPeriod[] {
+    return indicatorsReports.flatMap(setting => setting.period);
 }
 
 function mapItemsToDropdown(periods: UniqueBeneficiariesPeriod[]) {

From aada02e309278b9e096b4f63a7ccac8705379b85 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Wed, 13 Nov 2024 10:09:45 -0500
Subject: [PATCH 31/51] validate periods with the same months

---
 src/domain/entities/IndicatorCalculation.ts           |  2 +-
 .../SaveUniqueBeneficiariesSettingsUseCase.ts         | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/domain/entities/IndicatorCalculation.ts b/src/domain/entities/IndicatorCalculation.ts
index 5a5bcf59..91861879 100644
--- a/src/domain/entities/IndicatorCalculation.ts
+++ b/src/domain/entities/IndicatorCalculation.ts
@@ -98,7 +98,7 @@ export class IndicatorCalculation extends Struct<IndicatorCalculationAttrs>() {
         return IndicatorCalculation.build({
             id: id,
             newValue: newValueSum,
-            editableNewValue: existingRecord?.editableNewValue || newValueSum,
+            editableNewValue: newValueHasChanged ? newValueSum : existingRecord?.editableNewValue,
             returningValue,
             comment: existingRecord?.comment || "",
             previousValue: newValueHasChanged ? existingRecord?.newValue : undefined,
diff --git a/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts b/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
index e8113572..8827f696 100644
--- a/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
+++ b/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
@@ -18,11 +18,22 @@ export class SaveUniqueBeneficiariesSettingsUseCase {
             throw new Error(errorMessage);
         } else if (isPeriodProtected) {
             throw new Error(i18n.t("Cannot save a protected period"));
+        } else if (this.validateMonths(options.period, settings.periods)) {
+            throw new Error(i18n.t("Already exist a period with the same months"));
         } else {
             return this.saveSettings(settings, periodExist, options);
         }
     }
 
+    private validateMonths(
+        period: UniqueBeneficiariesPeriod,
+        existingPeriods: UniqueBeneficiariesPeriod[]
+    ): boolean {
+        return existingPeriods.some(existingPeriod =>
+            existingPeriod.equalMonths(period.startDateMonth, period.endDateMonth)
+        );
+    }
+
     private isAnnualOrSemiAnnual(period: UniqueBeneficiariesPeriod): boolean {
         const defaultPeriods = UniqueBeneficiariesPeriod.defaultPeriods();
         return defaultPeriods.some(defaultPeriod =>

From 3a64f2f977361200a01c87bf156cee675b9c9e21 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Wed, 13 Nov 2024 10:11:00 -0500
Subject: [PATCH 32/51] update i18n

---
 i18n/en.pot | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index b08837da..ac0843f8 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-12T13:23:47.083Z\n"
-"PO-Revision-Date: 2024-11-12T13:23:47.083Z\n"
+"POT-Creation-Date: 2024-11-13T15:09:53.588Z\n"
+"PO-Revision-Date: 2024-11-13T15:09:53.588Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -369,6 +369,9 @@ msgstr ""
 msgid "Cannot save a protected period"
 msgstr ""
 
+msgid "Already exist a period with the same months"
+msgstr ""
+
 msgid "Cannot save duplicate periods"
 msgstr ""
 

From 645520e090562e652019a548be432fbc16c5ab63 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Thu, 14 Nov 2024 07:28:39 -0500
Subject: [PATCH 33/51] avoid generate indicators on saving periods

---
 src/CompositionRoot.ts                        | 12 ++--
 src/data/common/D2ApiUbSettings.ts            | 26 +--------
 .../repositories/UniquePeriodD2Repository.ts  | 56 +++++++++++++++++++
 src/domain/entities/IndicatorCalculation.ts   |  4 +-
 .../entities/UniqueBeneficiariesPeriod.ts     | 24 ++++++++
 .../repositories/UniquePeriodRepository.ts    |  7 +++
 .../RemoveUniqueBeneficiariesPeriodUseCase.ts | 18 +++---
 ...UseCase.ts => SaveUniquePeriodsUseCase.ts} | 24 ++++----
 8 files changed, 115 insertions(+), 56 deletions(-)
 create mode 100644 src/data/repositories/UniquePeriodD2Repository.ts
 create mode 100644 src/domain/repositories/UniquePeriodRepository.ts
 rename src/domain/usecases/{SaveUniqueBeneficiariesSettingsUseCase.ts => SaveUniquePeriodsUseCase.ts} (72%)

diff --git a/src/CompositionRoot.ts b/src/CompositionRoot.ts
index 44e040a2..9232e974 100644
--- a/src/CompositionRoot.ts
+++ b/src/CompositionRoot.ts
@@ -7,6 +7,7 @@ import { IndicatorReportD2Repository } from "./data/repositories/IndicatorReport
 import { OrgUnitD2Repository } from "./data/repositories/OrgUnitD2Repository";
 import { ProjectD2Repository } from "./data/repositories/ProjectD2Repository";
 import { UniqueBeneficiariesSettingsD2Repository } from "./data/repositories/UniqueBeneficiariesSettingsD2Repository";
+import { UniquePeriodD2Repository } from "./data/repositories/UniquePeriodD2Repository";
 import { GetIndicatorsValidationUseCase } from "./domain/usecases/GetIndicatorsValidationUseCase";
 import { GetProjectsByCountryUseCase } from "./domain/usecases/GetProjectsByCountryUseCase";
 import { GetUniqueBeneficiariesSettingsUseCase } from "./domain/usecases/GetUniqueBeneficiariesSettingsUseCase";
@@ -14,7 +15,7 @@ import { ImportDataElementsUseCase } from "./domain/usecases/ImportDataElementsU
 import { RemoveUniqueBeneficiariesPeriodUseCase } from "./domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase";
 import { SaveIndicatorReportUseCase } from "./domain/usecases/SaveIndicatorReportUseCase";
 import { SaveIndicatorsValidationUseCase } from "./domain/usecases/SaveIndicatorsValidationUseCase";
-import { SaveUniqueBeneficiariesSettingsUseCase } from "./domain/usecases/SaveUniqueBeneficiariesSettingsUseCase";
+import { SaveUniquePeriodsUseCase } from "./domain/usecases/SaveUniquePeriodsUseCase";
 import { Config } from "./models/Config";
 import { D2Api } from "./types/d2-api";
 
@@ -31,6 +32,7 @@ export function getCompositionRoot(api: D2Api, config: Config) {
     const orgUnitRepository = new OrgUnitD2Repository(api);
     const projectRepository = new ProjectD2Repository(api, config);
     const indicatorReportRepository = new IndicatorReportD2Repository(api, config);
+    const periodRepository = new UniquePeriodD2Repository(api);
 
     return {
         dataElements: {
@@ -47,12 +49,8 @@ export function getCompositionRoot(api: D2Api, config: Config) {
             getSettings: new GetUniqueBeneficiariesSettingsUseCase(
                 uniqueBeneficiariesSettingsRepository
             ),
-            saveSettings: new SaveUniqueBeneficiariesSettingsUseCase(
-                uniqueBeneficiariesSettingsRepository
-            ),
-            removePeriod: new RemoveUniqueBeneficiariesPeriodUseCase(
-                uniqueBeneficiariesSettingsRepository
-            ),
+            saveSettings: new SaveUniquePeriodsUseCase(periodRepository),
+            removePeriod: new RemoveUniqueBeneficiariesPeriodUseCase(periodRepository),
         },
         indicators: {
             getValidation: new GetIndicatorsValidationUseCase(
diff --git a/src/data/common/D2ApiUbSettings.ts b/src/data/common/D2ApiUbSettings.ts
index 59bd03ff..0cf12f0a 100644
--- a/src/data/common/D2ApiUbSettings.ts
+++ b/src/data/common/D2ApiUbSettings.ts
@@ -67,7 +67,7 @@ export class D2ApiUbSettings {
             uniqueBeneficiaries: {
                 ...(existingSettings?.uniqueBeneficiaries || {}),
                 indicatorsIds: existingSettings?.uniqueBeneficiaries?.indicatorsIds || [],
-                periods: this.buildPeriods(settings.periods),
+                periods: UniqueBeneficiariesPeriod.buildPeriods(settings.periods, generateUid()),
                 indicatorsValidation: this.mapIndicatorValidations(settings, currentDate),
             },
         };
@@ -158,34 +158,14 @@ export class D2ApiUbSettings {
             .value();
     }
 
-    private buildPeriods(periods: UniqueBeneficiariesPeriod[]): UniqueBeneficiariesPeriod[] {
-        const periodsWithIds = this.validateIdsInPeriods(periods);
-        return this.excludeDefaultPeriods(periodsWithIds);
-    }
-
-    private validateIdsInPeriods(
-        periods: UniqueBeneficiariesPeriod[]
-    ): UniqueBeneficiariesPeriod[] {
-        return periods.map(period => {
-            if (!period.id) {
-                return UniqueBeneficiariesPeriod.build({ ...period, id: generateUid() }).get();
-            }
-            return period;
-        });
-    }
-
-    private getProjectKey() {
+    getProjectKey() {
         return "project-";
     }
 
-    private buildKeyId(projectId: Id) {
+    buildKeyId(projectId: Id) {
         return `${this.getProjectKey()}${projectId}`;
     }
 
-    private excludeDefaultPeriods(periods: UniqueBeneficiariesPeriod[]) {
-        return periods.filter(period => !period.isProtected());
-    }
-
     private mergeDefaultPeriodsWithExisting(existingPeriods: Maybe<UniqueBeneficiariesPeriod[]>) {
         const defaultData = UniqueBeneficiariesPeriod.defaultPeriods();
         if (!existingPeriods) return defaultData;
diff --git a/src/data/repositories/UniquePeriodD2Repository.ts b/src/data/repositories/UniquePeriodD2Repository.ts
new file mode 100644
index 00000000..309bca5e
--- /dev/null
+++ b/src/data/repositories/UniquePeriodD2Repository.ts
@@ -0,0 +1,56 @@
+import { D2Api, DataStore } from "../../types/d2-api";
+import {
+    UniqueBeneficiariesPeriod,
+    UniqueBeneficiariesPeriodsAttrs,
+} from "../../domain/entities/UniqueBeneficiariesPeriod";
+import { UniquePeriodRepository } from "../../domain/repositories/UniquePeriodRepository";
+import { DATA_MANAGEMENT_NAMESPACE } from "../common";
+import { Id } from "../../domain/entities/Ref";
+import { D2ApiUbSettings } from "../common/D2ApiUbSettings";
+import { generateUid } from "d2/uid";
+
+export class UniquePeriodD2Repository implements UniquePeriodRepository {
+    private dataStore: DataStore;
+    private namespace = DATA_MANAGEMENT_NAMESPACE;
+    private d2ApiUbSettings: D2ApiUbSettings;
+
+    constructor(private api: D2Api) {
+        this.dataStore = this.api.dataStore(this.namespace);
+        this.d2ApiUbSettings = new D2ApiUbSettings(this.api);
+    }
+
+    async getByProject(projectId: Id): Promise<UniqueBeneficiariesPeriod[]> {
+        const settings = await this.d2ApiUbSettings.get(projectId);
+        return settings.periods;
+    }
+
+    async save(projectId: Id, periods: UniqueBeneficiariesPeriod[]): Promise<void> {
+        const d2Response = await this.dataStore
+            .get<D2PeriodResponse>(this.d2ApiUbSettings.buildKeyId(projectId))
+            .getData();
+
+        await this.dataStore
+            .save(this.buildKeyId(projectId), {
+                ...d2Response,
+                uniqueBeneficiaries: {
+                    ...(d2Response?.uniqueBeneficiaries || {}),
+                    periods: UniqueBeneficiariesPeriod.buildPeriods(periods, generateUid()),
+                },
+            })
+            .getData();
+    }
+
+    private getProjectKey() {
+        return "project-";
+    }
+
+    private buildKeyId(projectId: Id) {
+        return `${this.getProjectKey()}${projectId}`;
+    }
+}
+
+type D2PeriodResponse = {
+    uniqueBeneficiaries: {
+        periods: Omit<UniqueBeneficiariesPeriodsAttrs, "projectId">[];
+    };
+};
diff --git a/src/domain/entities/IndicatorCalculation.ts b/src/domain/entities/IndicatorCalculation.ts
index 91861879..11eda74c 100644
--- a/src/domain/entities/IndicatorCalculation.ts
+++ b/src/domain/entities/IndicatorCalculation.ts
@@ -98,7 +98,9 @@ export class IndicatorCalculation extends Struct<IndicatorCalculationAttrs>() {
         return IndicatorCalculation.build({
             id: id,
             newValue: newValueSum,
-            editableNewValue: newValueHasChanged ? newValueSum : existingRecord?.editableNewValue,
+            editableNewValue: newValueHasChanged
+                ? newValueSum
+                : existingRecord?.editableNewValue ?? newValueSum,
             returningValue,
             comment: existingRecord?.comment || "",
             previousValue: newValueHasChanged ? existingRecord?.newValue : undefined,
diff --git a/src/domain/entities/UniqueBeneficiariesPeriod.ts b/src/domain/entities/UniqueBeneficiariesPeriod.ts
index e13833b7..c8cc4e01 100644
--- a/src/domain/entities/UniqueBeneficiariesPeriod.ts
+++ b/src/domain/entities/UniqueBeneficiariesPeriod.ts
@@ -160,4 +160,28 @@ export class UniqueBeneficiariesPeriod extends Struct<UniqueBeneficiariesPeriods
     public equalMonths(startDateMonth: number, endDateMonth: number): boolean {
         return this.startDateMonth === startDateMonth && this.endDateMonth === endDateMonth;
     }
+
+    static buildPeriods(
+        periods: UniqueBeneficiariesPeriod[],
+        newId: Id
+    ): UniqueBeneficiariesPeriod[] {
+        const periodsWithIds = this.validateIdsInPeriods(periods, newId);
+        return this.excludeDefaultPeriods(periodsWithIds);
+    }
+
+    static validateIdsInPeriods(
+        periods: UniqueBeneficiariesPeriod[],
+        newId: Id
+    ): UniqueBeneficiariesPeriod[] {
+        return periods.map(period => {
+            if (!period.id) {
+                return UniqueBeneficiariesPeriod.build({ ...period, id: newId }).get();
+            }
+            return period;
+        });
+    }
+
+    static excludeDefaultPeriods(periods: UniqueBeneficiariesPeriod[]) {
+        return periods.filter(period => !period.isProtected());
+    }
 }
diff --git a/src/domain/repositories/UniquePeriodRepository.ts b/src/domain/repositories/UniquePeriodRepository.ts
new file mode 100644
index 00000000..4c2174be
--- /dev/null
+++ b/src/domain/repositories/UniquePeriodRepository.ts
@@ -0,0 +1,7 @@
+import { Id } from "../entities/Ref";
+import { UniqueBeneficiariesPeriod } from "../entities/UniqueBeneficiariesPeriod";
+
+export interface UniquePeriodRepository {
+    getByProject(projectId: Id): Promise<UniqueBeneficiariesPeriod[]>;
+    save(projectId: Id, periods: UniqueBeneficiariesPeriod[]): Promise<void>;
+}
diff --git a/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts b/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts
index 9939a5ff..4cd756dd 100644
--- a/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts
+++ b/src/domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase.ts
@@ -1,26 +1,22 @@
 import i18n from "../../locales";
 import { UniqueBeneficiariesPeriod } from "../entities/UniqueBeneficiariesPeriod";
-import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
-import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBeneficiariesSettingsRepository";
+import { UniquePeriodRepository } from "../repositories/UniquePeriodRepository";
 
 export class RemoveUniqueBeneficiariesPeriodUseCase {
-    constructor(private repository: UniqueBeneficiariesSettingsRepository) {}
+    constructor(private repository: UniquePeriodRepository) {}
 
     async execute(options: Options): Promise<void> {
-        const settings = await this.repository.get(options.projectId);
+        const periods = await this.repository.getByProject(options.projectId);
         const isPeriodProtected = options.period.isProtected();
         if (isPeriodProtected) {
             throw new Error(i18n.t("Cannot delete a protected period"));
         }
-        return this.save(settings, options);
+        return this.save(periods, options);
     }
 
-    private save(settings: UniqueBeneficiariesSettings, options: Options) {
-        const newSettings: UniqueBeneficiariesSettings = {
-            ...settings,
-            periods: settings.periods.filter(period => period.id !== options.period.id),
-        };
-        return this.repository.save(newSettings);
+    private save(periods: UniqueBeneficiariesPeriod[], options: Options) {
+        const periodsToSave = periods.filter(period => period.id !== options.period.id);
+        return this.repository.save(options.projectId, periodsToSave);
     }
 }
 
diff --git a/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts b/src/domain/usecases/SaveUniquePeriodsUseCase.ts
similarity index 72%
rename from src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
rename to src/domain/usecases/SaveUniquePeriodsUseCase.ts
index 8827f696..e3368ac7 100644
--- a/src/domain/usecases/SaveUniqueBeneficiariesSettingsUseCase.ts
+++ b/src/domain/usecases/SaveUniquePeriodsUseCase.ts
@@ -1,14 +1,13 @@
 import i18n from "../../locales";
 import { UniqueBeneficiariesPeriod } from "../entities/UniqueBeneficiariesPeriod";
-import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
-import { UniqueBeneficiariesSettingsRepository } from "../repositories/UniqueBeneficiariesSettingsRepository";
+import { UniquePeriodRepository } from "../repositories/UniquePeriodRepository";
 
-export class SaveUniqueBeneficiariesSettingsUseCase {
-    constructor(private repository: UniqueBeneficiariesSettingsRepository) {}
+export class SaveUniquePeriodsUseCase {
+    constructor(private repository: UniquePeriodRepository) {}
 
     async execute(options: SaveSettingsOptions): Promise<void> {
-        const settings = await this.repository.get(options.projectId);
-        const periodExist = settings.periods.some(period => period.id === options.period.id);
+        const periods = await this.repository.getByProject(options.projectId);
+        const periodExist = periods.some(period => period.id === options.period.id);
         const isPeriodProtected = options.period.isProtected();
         const { isValid, errorMessage } = UniqueBeneficiariesPeriod.validate(options.period);
 
@@ -18,10 +17,10 @@ export class SaveUniqueBeneficiariesSettingsUseCase {
             throw new Error(errorMessage);
         } else if (isPeriodProtected) {
             throw new Error(i18n.t("Cannot save a protected period"));
-        } else if (this.validateMonths(options.period, settings.periods)) {
+        } else if (this.validateMonths(options.period, periods)) {
             throw new Error(i18n.t("Already exist a period with the same months"));
         } else {
-            return this.saveSettings(settings, periodExist, options);
+            return this.saveSettings(periods, periodExist, options);
         }
     }
 
@@ -42,15 +41,12 @@ export class SaveUniqueBeneficiariesSettingsUseCase {
     }
 
     private saveSettings(
-        settings: UniqueBeneficiariesSettings,
+        periods: UniqueBeneficiariesPeriod[],
         periodExist: boolean,
         options: SaveSettingsOptions
     ) {
-        const newSettings: UniqueBeneficiariesSettings = {
-            ...settings,
-            periods: this.buildPeriodsToSave(settings.periods, options.period, periodExist),
-        };
-        return this.repository.save(newSettings);
+        const periodsToSave = this.buildPeriodsToSave(periods, options.period, periodExist);
+        return this.repository.save(options.projectId, periodsToSave);
     }
 
     private buildPeriodsToSave(

From 325d05154a171d1e82ebbd0f735b4fc27e6e5faf Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Thu, 14 Nov 2024 08:06:50 -0500
Subject: [PATCH 34/51] add period information in country report

---
 .../usecases/GetProjectsByCountryUseCase.ts   | 20 ++++++++---
 .../CountryIndicatorReport.tsx                | 21 ++++++++---
 .../IndicatorReportTable.tsx                  | 36 +++++++++++++++----
 .../country-indicator-report/excel-report.ts  | 29 ++++++++++++---
 4 files changed, 87 insertions(+), 19 deletions(-)

diff --git a/src/domain/usecases/GetProjectsByCountryUseCase.ts b/src/domain/usecases/GetProjectsByCountryUseCase.ts
index 29443753..16773272 100644
--- a/src/domain/usecases/GetProjectsByCountryUseCase.ts
+++ b/src/domain/usecases/GetProjectsByCountryUseCase.ts
@@ -21,7 +21,7 @@ export class GetProjectsByCountryUseCase {
         private indicatorRepository: IndicatorReportRepository
     ) {}
 
-    async execute(options: GetCountryIndicatorsOptions): Promise<IndicatorReport[]> {
+    async execute(options: GetCountryIndicatorsOptions): Promise<IndicatorsReportsResult> {
         const [projects, settings, existingReports] = await Promise.all([
             this.getProjectsByCountry(options.countryId),
             this.getAllSettings(),
@@ -37,13 +37,14 @@ export class GetProjectsByCountryUseCase {
             dataElements
         );
 
-        return this.buildIndicatorReportFromProjects(
+        const indicatorsReports = this.buildIndicatorReportFromProjects(
             projects,
             settingsWithIndicatorsDetails,
             existingReports,
             options.countryId,
             dataElements
         );
+        return { indicatorsReports, settings: settingsWithIndicatorsDetails };
     }
 
     private buildIndicatorReportFromProjects(
@@ -53,8 +54,7 @@ export class GetProjectsByCountryUseCase {
         countryId: Id,
         dataElements: DataElement[]
     ): IndicatorReport[] {
-        const allPeriods = settings.flatMap(setting => setting.periods);
-        const uniquePeriods = UniqueBeneficiariesPeriod.uniquePeriodsByDates(allPeriods);
+        const uniquePeriods = this.getUniquePeriodsFromSettings(settings);
 
         return uniquePeriods.map((period): IndicatorReport => {
             const existingData = existingReports.find(
@@ -75,6 +75,13 @@ export class GetProjectsByCountryUseCase {
         });
     }
 
+    private getUniquePeriodsFromSettings(
+        settings: UniqueBeneficiariesSettings[]
+    ): UniqueBeneficiariesPeriod[] {
+        const allPeriods = settings.flatMap(setting => setting.periods);
+        return UniqueBeneficiariesPeriod.uniquePeriodsByDates(allPeriods);
+    }
+
     private generateProjects(
         projectsByPeriod: ProjectForList[],
         settings: UniqueBeneficiariesSettings[],
@@ -190,3 +197,8 @@ export class GetProjectsByCountryUseCase {
 }
 
 export type GetCountryIndicatorsOptions = { countryId: Id };
+
+export type IndicatorsReportsResult = {
+    indicatorsReports: IndicatorReport[];
+    settings: UniqueBeneficiariesSettings[];
+};
diff --git a/src/pages/country-indicator-report/CountryIndicatorReport.tsx b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
index 35b0c728..fbf17d3b 100644
--- a/src/pages/country-indicator-report/CountryIndicatorReport.tsx
+++ b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
@@ -15,6 +15,7 @@ import { Id } from "../../domain/entities/Ref";
 import { buildSpreadSheet } from "./excel-report";
 import { downloadFile } from "../../utils/download";
 import { useConfirmChanges } from "../report/MerReport";
+import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
 
 export const CountryIndicatorReport = React.memo(() => {
     const goTo = useGoTo();
@@ -22,7 +23,7 @@ export const CountryIndicatorReport = React.memo(() => {
     const [selectedPeriod, setSelectedPeriod] = React.useState<UniqueBeneficiariesPeriod>();
     const { confirmIfUnsavedChanges, proceedWarning, runProceedAction, wasReportModifiedSet } =
         useConfirmChanges();
-    const { indicatorsReports, setIndicatorsReports } = useGetIndicatorsReport({
+    const { indicatorsReports, settings, setIndicatorsReports } = useGetIndicatorsReport({
         countryId: orgUnit?.id,
         wasReportModifiedSet,
     });
@@ -68,8 +69,13 @@ export const CountryIndicatorReport = React.memo(() => {
     );
 
     const downloadReport = () => {
-        if (indicatorReport && orgUnit) {
-            buildSpreadSheet(indicatorReport, orgUnit.displayName).then(downloadFile);
+        if (indicatorReport && orgUnit && selectedPeriod) {
+            buildSpreadSheet({
+                indicatorReport,
+                countryName: orgUnit.displayName,
+                period: selectedPeriod,
+                settings,
+            }).then(downloadFile);
         }
     };
 
@@ -112,6 +118,7 @@ export const CountryIndicatorReport = React.memo(() => {
                                 report={indicatorReport}
                                 onRowChange={updateReport}
                                 period={selectedPeriod}
+                                settings={settings}
                             />
                         </Grid>
                         <Grid item>
@@ -215,13 +222,17 @@ export function useGetIndicatorsReport(props: {
     const loading = useLoading();
 
     const [indicatorsReports, setIndicatorsReports] = React.useState<IndicatorReport[]>([]);
+    const [settings, setSettings] = React.useState<UniqueBeneficiariesSettings[]>([]);
 
     React.useEffect(() => {
         if (!countryId) return;
         loading.show(true, i18n.t("Loading projects and indicators..."));
         compositionRoot.projects.getByCountry
             .execute({ countryId })
-            .then(setIndicatorsReports)
+            .then(result => {
+                setIndicatorsReports(result.indicatorsReports);
+                setSettings(result.settings);
+            })
             .catch(error => snackbar.error(error.message))
             .finally(() => {
                 loading.hide();
@@ -229,7 +240,7 @@ export function useGetIndicatorsReport(props: {
             });
     }, [compositionRoot, countryId, loading, snackbar, wasReportModifiedSet]);
 
-    return { indicatorsReports, setIndicatorsReports };
+    return { indicatorsReports, settings, setIndicatorsReports };
 }
 
 type UseSaveCountryReportProps = {
diff --git a/src/pages/country-indicator-report/IndicatorReportTable.tsx b/src/pages/country-indicator-report/IndicatorReportTable.tsx
index 20536f13..78edb0ec 100644
--- a/src/pages/country-indicator-report/IndicatorReportTable.tsx
+++ b/src/pages/country-indicator-report/IndicatorReportTable.tsx
@@ -17,22 +17,31 @@ import { Grouper, RowComponent } from "../report/rich-rows-utils";
 import TableBodyGrouped from "../report/TableBodyGrouped";
 import { buildMonthYearFormatDate } from "../../utils/date";
 import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
+import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
 
 type IndicatorReportTableProps = {
     period: UniqueBeneficiariesPeriod;
+    settings: UniqueBeneficiariesSettings[];
     report: IndicatorReportAttrs;
     onRowChange: (value: boolean, row: GroupedRows) => void;
 };
 
 export const IndicatorReportTable = React.memo((props: IndicatorReportTableProps) => {
-    const { period, report, onRowChange } = props;
+    const { onRowChange, period, report, settings } = props;
     const groupers: Grouper<GroupedRows>[] = React.useMemo(() => {
         return [
             {
                 name: "project",
                 getId: row => row.project.id,
                 component: function ProjectCells(props) {
-                    return <ProjectCell row={props.row} rowSpan={props.rowSpan} period={period} />;
+                    return (
+                        <ProjectCell
+                            row={props.row}
+                            rowSpan={props.rowSpan}
+                            settings={settings}
+                            period={period}
+                        />
+                    );
                 },
             },
             {
@@ -48,7 +57,7 @@ export const IndicatorReportTable = React.memo((props: IndicatorReportTableProps
                 component: TotalCell,
             },
         ];
-    }, [onRowChange, period]);
+    }, [onRowChange, period, settings]);
 
     const indicatorsRows = report.projects.flatMap(project => {
         const sumIndicators = _(project.indicators)
@@ -103,14 +112,16 @@ export const IndicatorReportTable = React.memo((props: IndicatorReportTableProps
 IndicatorReportTable.displayName = "IndicatorReportTable";
 
 const ProjectCell = (props: ProjectCellProps) => {
-    const { rowSpan, row, period } = props;
+    const { period, rowSpan, row, settings } = props;
+
+    const currentPeriod = getCurrentPeriodForProject(settings, row.project.id, period);
 
     return (
         <TableCell rowSpan={rowSpan}>
             {row.project.name} <br /> ({buildMonthYearFormatDate(row.project.openingDate)} -{" "}
             {buildMonthYearFormatDate(row.project.closedDate)})
             <br />
-            {period.name}
+            Period: {currentPeriod?.name || i18n.t("N/A")}
         </TableCell>
     );
 };
@@ -167,7 +178,20 @@ type IndicatorCellProps = {
 };
 
 type ProjectCellProps = {
+    period: UniqueBeneficiariesPeriod;
     row: GroupedRows;
     rowSpan: number | undefined;
-    period: UniqueBeneficiariesPeriod;
+    settings: UniqueBeneficiariesSettings[];
 };
+
+export function getCurrentPeriodForProject(
+    settings: UniqueBeneficiariesSettings[],
+    projectId: Id,
+    period: UniqueBeneficiariesPeriod
+) {
+    const projectSettings = settings.find(setting => setting.projectId === projectId);
+    const currentPeriod = projectSettings?.periods.find(projectPeriod =>
+        projectPeriod.equalMonths(period.startDateMonth, period.endDateMonth)
+    );
+    return currentPeriod;
+}
diff --git a/src/pages/country-indicator-report/excel-report.ts b/src/pages/country-indicator-report/excel-report.ts
index a80d5bdf..062b1504 100644
--- a/src/pages/country-indicator-report/excel-report.ts
+++ b/src/pages/country-indicator-report/excel-report.ts
@@ -1,13 +1,25 @@
 import ExcelJS from "exceljs";
 import _ from "lodash";
 import { IndicatorReport } from "../../domain/entities/IndicatorReport";
+import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
+import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
 import i18n from "../../locales";
+import { buildMonthYearFormatDate } from "../../utils/date";
+import { getCurrentPeriodForProject } from "./IndicatorReportTable";
 
-export async function buildSpreadSheet(indicatorReport: IndicatorReport, countryName: string) {
+type SpreadSheetOptions = {
+    indicatorReport: IndicatorReport;
+    countryName: string;
+    settings: UniqueBeneficiariesSettings[];
+    period: UniqueBeneficiariesPeriod;
+};
+
+export async function buildSpreadSheet(options: SpreadSheetOptions) {
+    const { indicatorReport, countryName } = options;
     const workbook = new ExcelJS.Workbook();
     const sheet = workbook.addWorksheet(i18n.t("Country Projects & Indicators"));
     sheet.columns = generateColumns();
-    generateRows(indicatorReport, sheet);
+    generateRows(options, sheet);
     return generateFileInBuffer(workbook, countryName, indicatorReport);
 }
 
@@ -21,10 +33,18 @@ async function generateFileInBuffer(
     return { buffer, filename };
 }
 
-function generateRows(indicatorReport: IndicatorReport, sheet: ExcelJS.Worksheet) {
+function generateRows(options: SpreadSheetOptions, sheet: ExcelJS.Worksheet) {
+    const { indicatorReport, settings, period } = options;
     const notAvailableText = i18n.t("N/A");
     indicatorReport.projects.forEach(project => {
-        const projectName = project.project.name;
+        const projectDates = `${buildMonthYearFormatDate(
+            project.project.openingDate
+        )} - ${buildMonthYearFormatDate(project.project.closedDate)}`;
+        const currentPeriod = getCurrentPeriodForProject(settings, project.id, period);
+
+        const projectName = `${project.project.name} \r\n (${projectDates}) \r\n Period: ${
+            currentPeriod?.name || notAvailableText
+        }`;
 
         project.indicators.forEach((indicator, index) => {
             sheet.addRow({
@@ -48,6 +68,7 @@ function generateRows(indicatorReport: IndicatorReport, sheet: ExcelJS.Worksheet
         const endRow = sheet.rowCount;
         if (project.indicators.length > 1) {
             sheet.mergeCells(`A${startRow}:A${endRow}`);
+            sheet.getCell(`A${startRow}`).alignment = { wrapText: true };
             sheet.mergeCells(`E${startRow}:E${endRow}`);
         }
     });

From facca49ea7e48ece1d46220091b8395feb933e85 Mon Sep 17 00:00:00 2001
From: Adrian Quintana <adrianquintana@gmail.com>
Date: Fri, 15 Nov 2024 09:08:22 +0000
Subject: [PATCH 35/51] bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 82e61362..35c0d491 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "data-management-app",
     "description": "DHIS2 Data Management App",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",

From d6916cf85c6d6a18f987e265b8bd89656df9cda5 Mon Sep 17 00:00:00 2001
From: Ramon-Jimenez <ramon@eyeseetea.com>
Date: Fri, 15 Nov 2024 10:51:10 +0100
Subject: [PATCH 36/51] fix jest tests

---
 jest.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jest.config.js b/jest.config.js
index 344b01b8..273511fa 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,7 +1,7 @@
 module.exports = {
     collectCoverageFrom: ["src/**/*.js"],
     testPathIgnorePatterns: ["/node_modules/", "/cypress"],
-    transformIgnorePatterns: ["/node_modules/(?!@dhis2)"],
+    transformIgnorePatterns: ["/node_modules/(?!@eyeseetea/d2-ui-components)"],
     modulePaths: ["src"],
     moduleDirectories: ["node_modules"],
     moduleNameMapper: {

From 450dfc4a9806f1144922849ee69764723308d0a6 Mon Sep 17 00:00:00 2001
From: Arnau Sanchez <pyarnau@gmail.com>
Date: Mon, 18 Nov 2024 08:43:52 +0100
Subject: [PATCH 37/51] Add task analyze (use source-map-explorer)

---
 package.json |   2 +
 yarn.lock    | 135 +++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 132 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 35c0d491..568a759d 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
         "xlsx": "^0.18.5"
     },
     "scripts": {
+        "analyze": "source-map-explorer 'build/static/js/*.js'",
         "prestart": "yarn localize && d2-manifest package.json manifest.webapp",
         "start": "react-scripts start",
         "prebuild": "yarn localize && yarn test",
@@ -134,6 +135,7 @@
         "jest": "26.6.3",
         "parse-typed-args": "^0.2.0",
         "prettier": "2.5.1",
+        "source-map-explorer": "^2.5.3",
         "ts-node": "10.9.2",
         "typescript": "4.9.3",
         "wait-on": "5.2.1"
diff --git a/yarn.lock b/yarn.lock
index cb34942b..8c445021 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6657,6 +6657,14 @@ chalk@^4.0.0, chalk@^4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 change-emitter@^0.1.2:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515"
@@ -6862,6 +6870,15 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
 clone-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
@@ -8236,7 +8253,7 @@ duplexer2@~0.1.4:
   dependencies:
     readable-stream "^2.0.2"
 
-duplexer@^0.1.1:
+duplexer@^0.1.1, duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
@@ -8277,6 +8294,13 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
+ejs@^3.1.5:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
+  integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
+  dependencies:
+    jake "^10.8.5"
+
 electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.649:
   version "1.3.693"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.693.tgz#5089c506a925c31f93fcb173a003a22e341115dd"
@@ -8571,7 +8595,7 @@ escalade@^3.0.2, escalade@^3.1.1:
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
-escape-html@~1.0.3:
+escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
@@ -9299,6 +9323,13 @@ file-uri-to-path@1.0.0:
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
+filelist@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
+  integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==
+  dependencies:
+    minimatch "^5.0.1"
+
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
@@ -9695,7 +9726,7 @@ gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -9942,6 +9973,13 @@ gzip-size@5.1.1:
     duplexer "^0.1.1"
     pify "^4.0.1"
 
+gzip-size@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
+  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
+  dependencies:
+    duplexer "^0.1.2"
+
 handle-thing@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
@@ -11332,6 +11370,16 @@ istanbul-reports@^3.0.2:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
+jake@^10.8.5:
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.2.tgz#6ae487e6a69afec3a5e167628996b59f35ae2b7f"
+  integrity sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==
+  dependencies:
+    async "^3.2.3"
+    chalk "^4.0.2"
+    filelist "^1.0.4"
+    minimatch "^3.1.2"
+
 jest-changed-files@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
@@ -12840,7 +12888,14 @@ minimatch@3.0.4, minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.1.0:
+minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimatch@^5.0.1, minimatch@^5.1.0:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
   integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
@@ -13438,7 +13493,7 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@^7.0.2:
+open@^7.0.2, open@^7.3.1:
   version "7.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
   integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
@@ -15798,6 +15853,13 @@ rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rimraf@~2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -16340,6 +16402,24 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
+source-map-explorer@^2.5.3:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.5.3.tgz#33551b51e33b70f56d15e79083cdd4c43e583b69"
+  integrity sha512-qfUGs7UHsOBE5p/lGfQdaAj/5U/GWYBw2imEpD6UQNkqElYonkow8t+HBL1qqIl3CuGZx7n8/CQo4x1HwSHhsg==
+  dependencies:
+    btoa "^1.2.1"
+    chalk "^4.1.0"
+    convert-source-map "^1.7.0"
+    ejs "^3.1.5"
+    escape-html "^1.0.3"
+    glob "^7.1.6"
+    gzip-size "^6.0.0"
+    lodash "^4.17.20"
+    open "^7.3.1"
+    source-map "^0.7.4"
+    temp "^0.9.4"
+    yargs "^16.2.0"
+
 source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -16386,6 +16466,11 @@ source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
+source-map@^0.7.4:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
+  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
+
 sourcemap-codec@^1.4.4:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
@@ -16954,6 +17039,14 @@ temp-dir@^1.0.0:
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
   integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
 
+temp@^0.9.4:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.4.tgz#cd20a8580cb63635d0e4e9d4bd989d44286e7620"
+  integrity sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==
+  dependencies:
+    mkdirp "^0.5.1"
+    rimraf "~2.6.2"
+
 tempy@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/tempy/-/tempy-0.3.0.tgz#6f6c5b295695a16130996ad5ab01a8bd726e8bf8"
@@ -18295,6 +18388,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -18360,6 +18462,11 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
   integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
 
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
@@ -18399,6 +18506,11 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
 yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
@@ -18449,6 +18561,19 @@ yargs@^15.4.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yargs@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"

From 24ca45a3159cf972fdcc644951ded79dc10476a7 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Mon, 18 Nov 2024 07:51:30 -0500
Subject: [PATCH 38/51] allow data reviewers to clone projects

---
 src/models/user.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/models/user.ts b/src/models/user.ts
index e6b7c918..3b223eb1 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -55,6 +55,7 @@ const actionsByRole: Record<Role, Action[]> = {
         "reopen",
         "attachFiles",
         "projectIndicators",
+        "clone",
     ],
     dataViewer: ["dashboard", "awardNumberDashboard", "downloadData", "projectIndicators"],
     merApprover: [

From 5aee4e6119c2a6c7386430ea9b38b5119a48fa7e Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Mon, 18 Nov 2024 21:16:22 -0500
Subject: [PATCH 39/51] add year for indicators validation and unique
 beneficiaries report

---
 i18n/en.pot                                   |  12 +-
 src/CompositionRoot.ts                        |   9 +-
 src/data/common/D2ApiProject.ts               |  63 ++++++++++
 src/data/common/D2ApiUbSettings.ts            |  61 ++++++++--
 .../IndicatorReportD2Repository.ts            | 114 ++++++++++++------
 src/data/repositories/ProjectD2Repository.ts  |  34 ++----
 ...UniqueBeneficiariesSettingsD2Repository.ts |  10 +-
 .../repositories/UniquePeriodD2Repository.ts  |   5 +-
 src/domain/entities/IndicatorReport.tsx       |   5 +
 src/domain/entities/IndicatorValidation.ts    |  46 ++++++-
 .../UniqueBeneficiariesSettingsRepository.ts  |   3 +-
 .../GetIndicatorsValidationUseCase.ts         |  57 ++++++---
 src/domain/usecases/GetProjectByIdUseCase.ts  |  11 ++
 .../usecases/GetProjectsByCountryUseCase.ts   |  35 ++++--
 .../SaveIndicatorsValidationUseCase.ts        |   4 +-
 .../CountryIndicatorReport.tsx                |  70 +++++++++--
 .../IndicatorValidationForm.tsx               |  57 +++++++--
 .../ProjectIndicatorsValidation.tsx           |  60 +++++++--
 .../project-indicators-validation/hooks.ts    |  16 ++-
 19 files changed, 520 insertions(+), 152 deletions(-)
 create mode 100644 src/data/common/D2ApiProject.ts
 create mode 100644 src/domain/usecases/GetProjectByIdUseCase.ts

diff --git a/i18n/en.pot b/i18n/en.pot
index ac0843f8..620156f4 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-13T15:09:53.588Z\n"
-"PO-Revision-Date: 2024-11-13T15:09:53.588Z\n"
+"POT-Creation-Date: 2024-11-18T23:17:59.995Z\n"
+"PO-Revision-Date: 2024-11-18T23:17:59.995Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -888,6 +888,9 @@ msgstr ""
 msgid "Select period"
 msgstr ""
 
+msgid "Select Year"
+msgstr ""
+
 msgid "No projects found for selected period: {{period}}"
 msgstr ""
 
@@ -1012,7 +1015,7 @@ msgstr ""
 msgid "Project Indicators Validation"
 msgstr ""
 
-msgid "Select a Period"
+msgid "Select Period"
 msgstr ""
 
 msgid "Unique in Project"
@@ -1039,6 +1042,9 @@ msgstr ""
 msgid "Indicators saved"
 msgstr ""
 
+msgid "Loading Project"
+msgstr ""
+
 msgid "Loading Indicators..."
 msgstr ""
 
diff --git a/src/CompositionRoot.ts b/src/CompositionRoot.ts
index 9232e974..069b53cf 100644
--- a/src/CompositionRoot.ts
+++ b/src/CompositionRoot.ts
@@ -9,6 +9,7 @@ import { ProjectD2Repository } from "./data/repositories/ProjectD2Repository";
 import { UniqueBeneficiariesSettingsD2Repository } from "./data/repositories/UniqueBeneficiariesSettingsD2Repository";
 import { UniquePeriodD2Repository } from "./data/repositories/UniquePeriodD2Repository";
 import { GetIndicatorsValidationUseCase } from "./domain/usecases/GetIndicatorsValidationUseCase";
+import { GetProjectByIdUseCase } from "./domain/usecases/GetProjectByIdUseCase";
 import { GetProjectsByCountryUseCase } from "./domain/usecases/GetProjectsByCountryUseCase";
 import { GetUniqueBeneficiariesSettingsUseCase } from "./domain/usecases/GetUniqueBeneficiariesSettingsUseCase";
 import { ImportDataElementsUseCase } from "./domain/usecases/ImportDataElementsUseCase";
@@ -20,7 +21,10 @@ import { Config } from "./models/Config";
 import { D2Api } from "./types/d2-api";
 
 export function getCompositionRoot(api: D2Api, config: Config) {
-    const uniqueBeneficiariesSettingsRepository = new UniqueBeneficiariesSettingsD2Repository(api);
+    const uniqueBeneficiariesSettingsRepository = new UniqueBeneficiariesSettingsD2Repository(
+        api,
+        config
+    );
     const dataValueRepository = new DataValueD2Repository(api);
     const dataElementRepository = new DataElementD2Repository(api, config);
     const importDataElementSpreadSheetRepository = new ImportDataElementSpreadSheetRepository(
@@ -32,7 +36,7 @@ export function getCompositionRoot(api: D2Api, config: Config) {
     const orgUnitRepository = new OrgUnitD2Repository(api);
     const projectRepository = new ProjectD2Repository(api, config);
     const indicatorReportRepository = new IndicatorReportD2Repository(api, config);
-    const periodRepository = new UniquePeriodD2Repository(api);
+    const periodRepository = new UniquePeriodD2Repository(api, config);
 
     return {
         dataElements: {
@@ -65,6 +69,7 @@ export function getCompositionRoot(api: D2Api, config: Config) {
             saveReports: new SaveIndicatorReportUseCase(indicatorReportRepository),
         },
         projects: {
+            getById: new GetProjectByIdUseCase(projectRepository),
             getByCountry: new GetProjectsByCountryUseCase(
                 projectRepository,
                 uniqueBeneficiariesSettingsRepository,
diff --git a/src/data/common/D2ApiProject.ts b/src/data/common/D2ApiProject.ts
new file mode 100644
index 00000000..62a1f6b3
--- /dev/null
+++ b/src/data/common/D2ApiProject.ts
@@ -0,0 +1,63 @@
+import { ProjectCountry } from "../../domain/entities/IndicatorReport";
+import { Config } from "../../models/Config";
+import Project, { getDatesFromOrgUnit } from "../../models/Project";
+import { ProjectForList } from "../../models/ProjectsList";
+import { D2Api, Id } from "../../types/d2-api";
+
+export class D2ApiProject {
+    constructor(private api: D2Api, private config: Config) {}
+
+    async getByIds(ids: string[]): Promise<ProjectCountry[]> {
+        if (ids.length === 0) return [];
+
+        const response = await this.api.models.organisationUnits
+            .get({
+                fields: {
+                    id: true,
+                    code: true,
+                    name: true,
+                    displayName: true,
+                    openingDate: true,
+                    closedDate: true,
+                },
+                paging: false,
+                filter: { id: { in: ids } },
+            })
+            .getData();
+
+        return response.objects.map((d2OrgUnit): ProjectCountry => {
+            const { startDate, endDate } = getDatesFromOrgUnit(d2OrgUnit);
+            return {
+                closedDate: endDate?.toISOString() || "",
+                id: d2OrgUnit.id,
+                name: d2OrgUnit.displayName,
+                openingDate: startDate?.toISOString() || "",
+            };
+        });
+    }
+
+    async getAllProjectsByCountry(
+        countryId: Id,
+        initialPage: number,
+        initialProjects: ProjectForList[]
+    ) {
+        const response = await this.getByCountry(countryId, initialPage);
+        const newProjects = [...initialProjects, ...response.objects];
+        if (response.pager.page >= response.pager.pageCount) {
+            return newProjects;
+        } else {
+            const projects = await this.getByCountry(countryId, initialPage + 1);
+            return projects.objects;
+        }
+    }
+
+    private getByCountry(countryId: Id, page: number) {
+        return Project.getList(
+            this.api,
+            this.config,
+            { countryIds: [countryId], onlyActive: true },
+            { field: "created", order: "desc" },
+            { page: page, pageSize: 50 }
+        );
+    }
+}
diff --git a/src/data/common/D2ApiUbSettings.ts b/src/data/common/D2ApiUbSettings.ts
index 0cf12f0a..56b59f1d 100644
--- a/src/data/common/D2ApiUbSettings.ts
+++ b/src/data/common/D2ApiUbSettings.ts
@@ -14,28 +14,38 @@ import {
     IndicatorCalculationAttrs,
 } from "../../domain/entities/IndicatorCalculation";
 import { DATA_MANAGEMENT_NAMESPACE } from "../common";
+import { Config } from "../../models/Config";
+import { promiseMap } from "../../migrations/utils";
+import { ProjectCountry } from "../../domain/entities/IndicatorReport";
+import { D2ApiProject } from "./D2ApiProject";
 
 export class D2ApiUbSettings {
     private dataStore: DataStore;
+    private d2ApiProject: D2ApiProject;
     private namespace = DATA_MANAGEMENT_NAMESPACE;
 
-    constructor(private api: D2Api) {
+    constructor(private api: D2Api, private config: Config) {
         this.dataStore = this.api.dataStore(this.namespace);
+        this.d2ApiProject = new D2ApiProject(api, this.config);
     }
 
-    async getAll(): Promise<UniqueBeneficiariesSettings[]> {
-        return this.getAllSettings(1, []);
+    async getAll(options: { projectsIds: Maybe<Id[]> }): Promise<UniqueBeneficiariesSettings[]> {
+        return this.getAllSettings(1, [], options);
     }
 
     async get(projectId: Id): Promise<UniqueBeneficiariesSettings> {
+        const projects = await this.d2ApiProject.getByIds([projectId]);
+        const project = _(projects).first();
+        if (!project) throw new Error(`Project not found for id: ${projectId}`);
+
         const d2Response = await this.dataStore
-            .get<D2ProjectSettings>(this.buildKeyId(projectId))
+            .get<D2ProjectSettings>(this.buildKeyId(project.id))
             .getData();
 
-        return this.buildSettings(d2Response, projectId);
+        return this.buildSettings(d2Response, project);
     }
 
-    private buildSettings(d2Response: Maybe<D2ProjectSettings>, projectId: string) {
+    private buildSettings(d2Response: Maybe<D2ProjectSettings>, project: ProjectCountry) {
         const uniqueBeneficiaries = d2Response?.uniqueBeneficiaries;
         const periods = this.mergeDefaultPeriodsWithExisting(uniqueBeneficiaries?.periods);
 
@@ -45,10 +55,14 @@ export class D2ApiUbSettings {
         const hasIndicatorsValidation = indicatorsValidation.length > 0;
         const indicatorsToInclude = hasIndicatorsValidation
             ? this.buildExistingIndicatorsValidation(d2Response, periods)
-            : IndicatorValidation.buildIndicatorsValidationFromPeriods(periods, indicatorsIds);
+            : IndicatorValidation.buildIndicatorsValidationFromPeriods(
+                  periods,
+                  indicatorsIds,
+                  project
+              );
 
         return {
-            projectId: projectId,
+            projectId: project.id,
             periods,
             indicatorsIds: indicatorsIds,
             indicatorsValidation: indicatorsToInclude,
@@ -81,6 +95,7 @@ export class D2ApiUbSettings {
     ): D2IndicatorValidation[] {
         return settings.indicatorsValidation.map(indicatorValidation => {
             return {
+                year: indicatorValidation.year,
                 periodId: indicatorValidation.period.id,
                 createdAt: indicatorValidation.createdAt || currentDate,
                 lastUpdatedAt: currentDate,
@@ -104,20 +119,39 @@ export class D2ApiUbSettings {
 
     private async getAllSettings(
         page: number,
-        settings: UniqueBeneficiariesSettings[]
+        settings: UniqueBeneficiariesSettings[],
+        options: { projectsIds: Maybe<Id[]> }
     ): Promise<UniqueBeneficiariesSettings[]> {
         const response = await this.getEntriesPaginated(page);
-        const settingsFromEntries = this.convertEntriesToSettings(response.entries);
+        const filterByProjects = options.projectsIds
+            ? response.entries.filter(entry => {
+                  const projectId = entry.key.replace(this.getProjectKey(), "");
+                  return options.projectsIds?.includes(projectId);
+              })
+            : response.entries;
+
+        const settingsFromEntries = await this.convertEntriesToSettings(filterByProjects);
         const acumSettings = [...settings, ...settingsFromEntries];
         return response.entries.length === 0
             ? acumSettings
-            : this.getAllSettings(page + 1, acumSettings);
+            : this.getAllSettings(page + 1, acumSettings, options);
     }
 
-    private convertEntriesToSettings(entries: D2Entries[]): UniqueBeneficiariesSettings[] {
+    private async convertEntriesToSettings(
+        entries: D2Entries[]
+    ): Promise<UniqueBeneficiariesSettings[]> {
+        const projectsIds = entries.map(entry => entry.key.replace(this.getProjectKey(), ""));
+        const allProjects = await promiseMap(projectsIds, projectId =>
+            this.d2ApiProject.getByIds([projectId])
+        );
+
+        const projects = _(allProjects).flatten().value();
+
         return entries.map((d2Entry): UniqueBeneficiariesSettings => {
             const projectId = d2Entry.key.replace(this.getProjectKey(), "");
-            return this.buildSettings(d2Entry, projectId);
+            const project = projects.find(project => project.id === projectId);
+            if (!project) throw new Error(`Project not found for id: ${projectId}`);
+            return this.buildSettings(d2Entry, project);
         });
     }
 
@@ -144,6 +178,7 @@ export class D2ApiUbSettings {
                     createdAt: d2IndicatorValidation.createdAt,
                     lastUpdatedAt: d2IndicatorValidation.lastUpdatedAt,
                     period: period,
+                    year: d2IndicatorValidation.year,
                     indicatorsCalculation: d2IndicatorValidation.indicatorsCalculation.map(
                         d2IndicatorCalculation => {
                             return IndicatorCalculation.build({
diff --git a/src/data/repositories/IndicatorReportD2Repository.ts b/src/data/repositories/IndicatorReportD2Repository.ts
index e4272318..fd500df6 100644
--- a/src/data/repositories/IndicatorReportD2Repository.ts
+++ b/src/data/repositories/IndicatorReportD2Repository.ts
@@ -3,33 +3,36 @@ import { D2Api, DataStore } from "../../types/d2-api";
 import {
     IndicatorReport,
     IndicatorReportToSave,
-    ProjectCountry,
+    ProjectIndicatorRow,
 } from "../../domain/entities/IndicatorReport";
 import { IndicatorReportRepository } from "../../domain/repositories/IndicatorReportRepository";
 import { DATA_MANAGEMENT_NAMESPACE } from "../common";
 import { Id, ISODateTimeString } from "../../domain/entities/Ref";
 import { D2ApiUbSettings } from "../common/D2ApiUbSettings";
-import Project from "../../models/Project";
-import { promiseMap } from "../../migrations/utils";
 import { Config } from "../../models/Config";
 import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
 import { D2DataElement } from "./D2DataElement";
+import { D2ApiProject } from "../common/D2ApiProject";
+import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
+import { DataElement } from "../../domain/entities/DataElement";
 
 export class IndicatorReportD2Repository implements IndicatorReportRepository {
     private prefixKey = "ubreport";
     private dataStore: DataStore;
     private d2ApiUbSettings: D2ApiUbSettings;
     private d2ApiDataElement: D2DataElement;
+    private d2ApiProject: D2ApiProject;
 
     constructor(private api: D2Api, private config: Config) {
         this.dataStore = this.api.dataStore(DATA_MANAGEMENT_NAMESPACE);
-        this.d2ApiUbSettings = new D2ApiUbSettings(this.api);
+        this.d2ApiUbSettings = new D2ApiUbSettings(this.api, config);
         this.d2ApiDataElement = new D2DataElement(this.api, this.config);
+        this.d2ApiProject = new D2ApiProject(api, config);
     }
 
     async getByCountry(countryId: Id): Promise<IndicatorReport[]> {
         const response = await this.dataStore.get<D2Response[]>(this.buildKey(countryId)).getData();
-        return this.buildReportsFromResponse(response || []);
+        return this.buildReportsFromResponse(response || [], countryId);
     }
 
     async save(reports: IndicatorReportToSave[], countryId: Id): Promise<void> {
@@ -53,6 +56,7 @@ export class IndicatorReportD2Repository implements IndicatorReportRepository {
             );
 
             return {
+                year: report.year,
                 countryId: report.countryId,
                 createdAt: existingRecord?.createdAt || currentDate,
                 updatedAt: currentDate,
@@ -71,14 +75,19 @@ export class IndicatorReportD2Repository implements IndicatorReportRepository {
         });
     }
 
-    private async buildReportsFromResponse(responses: D2Response[]): Promise<IndicatorReport[]> {
-        const projectIds = responses.flatMap(item => item.projects.map(project => project.id));
-        const projects = await this.getProjectsByIds(projectIds);
-        const settings = await this.d2ApiUbSettings.getAll();
+    private async buildReportsFromResponse(
+        responses: D2Response[],
+        countryId: Id
+    ): Promise<IndicatorReport[]> {
+        const projectResponse = await this.d2ApiProject.getAllProjectsByCountry(countryId, 1, []);
+
+        const projectsIds = projectResponse.map(item => item.id);
+        const projects = await this.d2ApiProject.getByIds(projectsIds);
+        const settings = await this.d2ApiUbSettings.getAll({ projectsIds });
         const dataElementsIds = settings.flatMap(setting => setting.indicatorsIds);
         const dataElements = await this.d2ApiDataElement.getByIds(dataElementsIds);
         const settingsByProjects = settings.filter(setting =>
-            projectIds.includes(setting.projectId)
+            projectsIds.includes(setting.projectId)
         );
         const periods = settingsByProjects.flatMap(setting => setting.periods);
         const groupedPeriods = UniqueBeneficiariesPeriod.uniquePeriodsByDates(periods);
@@ -91,33 +100,32 @@ export class IndicatorReportD2Repository implements IndicatorReportRepository {
                 throw Error(`Period ${response.startDate}-${response.endDate} not found`);
 
             return IndicatorReport.create({
+                year: response.year,
                 countryId: response.countryId,
                 createdAt: response.createdAt,
                 lastUpdatedAt: response.updatedAt,
                 period: currentPeriod,
-                projects: _(response.projects)
+                projects: _(projects)
                     .map(project => {
-                        const projectDetails = projects.find(
-                            projectDetail => projectDetail.id === project.id
+                        const projectResult = response.projects.find(
+                            item => item.id === project.id
                         );
-                        if (!projectDetails) return undefined;
 
                         return {
                             id: project.id,
-                            indicators: project.indicators.map(indicator => {
-                                const dataElementDetails = dataElements.find(
-                                    dataElement => dataElement.id === indicator.indicatorId
-                                );
-                                return {
-                                    include: indicator.include,
-                                    indicatorId: indicator.indicatorId,
-                                    indicatorCode: dataElementDetails?.code || "",
-                                    indicatorName: dataElementDetails?.name || "",
-                                    value: indicator.value,
-                                    periodNotAvailable: indicator.periodNotAvailable,
-                                };
-                            }),
-                            project: projectDetails,
+                            indicators: projectResult?.indicators
+                                ? this.buildExistingIndicators(projectResult, dataElements)
+                                : this.buildIndicators(
+                                      settingsByProjects,
+                                      project.id,
+                                      dataElements
+                                  ),
+                            project: {
+                                id: project.id,
+                                name: project.name,
+                                openingDate: project.openingDate,
+                                closedDate: project.closedDate,
+                            },
                         };
                     })
                     .compact()
@@ -126,14 +134,47 @@ export class IndicatorReportD2Repository implements IndicatorReportRepository {
         });
     }
 
-    private async getProjectsByIds(projectIds: Id[]): Promise<ProjectCountry[]> {
-        const projects = await promiseMap(projectIds, id => Project.get(this.api, this.config, id));
-        return projects.map(project => ({
-            id: project.id,
-            name: project.name,
-            openingDate: project.startDate?.toISOString() || "",
-            closedDate: project.endDate?.toISOString() || "",
-        }));
+    private buildExistingIndicators(
+        projectResult: D2Response["projects"][number],
+        dataElements: DataElement[]
+    ): ProjectIndicatorRow[] {
+        return _(projectResult.indicators)
+            .map(indicator => {
+                const dataElementDetails = dataElements.find(
+                    dataElement => dataElement.id === indicator.indicatorId
+                );
+                return {
+                    include: indicator.include,
+                    indicatorId: indicator.indicatorId,
+                    indicatorCode: dataElementDetails?.code || "",
+                    indicatorName: dataElementDetails?.name || "",
+                    value: indicator.value,
+                    periodNotAvailable: indicator.periodNotAvailable,
+                };
+            })
+            .value();
+    }
+
+    private buildIndicators(
+        settings: UniqueBeneficiariesSettings[],
+        projectId: Id,
+        dataElements: DataElement[]
+    ): ProjectIndicatorRow[] {
+        const projectSettings = settings.find(setting => setting.projectId === projectId);
+        const indicatorsIds = projectSettings?.indicatorsIds || [];
+        return indicatorsIds.map((indicatorId): ProjectIndicatorRow => {
+            const dataElementDetails = dataElements.find(
+                dataElement => dataElement.id === indicatorId
+            );
+            return {
+                include: false,
+                indicatorCode: dataElementDetails?.code || "",
+                indicatorName: dataElementDetails?.name || "",
+                indicatorId: indicatorId,
+                value: 0,
+                periodNotAvailable: false,
+            };
+        });
     }
 
     private buildKey(countryId: Id) {
@@ -147,6 +188,7 @@ type D2Response = {
     endDate: number;
     createdAt: ISODateTimeString;
     updatedAt: ISODateTimeString;
+    year: number;
     projects: Array<{
         id: Id;
         indicators: Array<{
diff --git a/src/data/repositories/ProjectD2Repository.ts b/src/data/repositories/ProjectD2Repository.ts
index c0974ca8..688375d4 100644
--- a/src/data/repositories/ProjectD2Repository.ts
+++ b/src/data/repositories/ProjectD2Repository.ts
@@ -4,40 +4,20 @@ import { Config } from "../../models/Config";
 import Project from "../../models/Project";
 import { ProjectForList } from "../../models/ProjectsList";
 import { D2Api } from "../../types/d2-api";
+import { D2ApiProject } from "../common/D2ApiProject";
 
 export class ProjectD2Repository implements ProjectRepository {
-    constructor(private api: D2Api, private config: Config) {}
+    private d2ApiProject: D2ApiProject;
+
+    constructor(private api: D2Api, private config: Config) {
+        this.d2ApiProject = new D2ApiProject(api, config);
+    }
 
     async getById(id: Id): Promise<Project> {
         return Project.get(this.api, this.config, id);
     }
 
     async getByCountries(countryId: Id): Promise<ProjectForList[]> {
-        return this.getAllProjectsByCountry(countryId, 1, []);
-    }
-
-    private async getAllProjectsByCountry(
-        countryId: Id,
-        initialPage: number,
-        initialProjects: ProjectForList[]
-    ) {
-        const response = await this.getByCountry(countryId, initialPage);
-        const newProjects = [...initialProjects, ...response.objects];
-        if (response.pager.page >= response.pager.pageCount) {
-            return newProjects;
-        } else {
-            const projects = await this.getByCountry(countryId, initialPage + 1);
-            return projects.objects;
-        }
-    }
-
-    private getByCountry(countryId: Id, page: number) {
-        return Project.getList(
-            this.api,
-            this.config,
-            { countryIds: [countryId], onlyActive: true },
-            { field: "created", order: "desc" },
-            { page: page, pageSize: 50 }
-        );
+        return this.d2ApiProject.getAllProjectsByCountry(countryId, 1, []);
     }
 }
diff --git a/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts b/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
index 573fe4d3..4f93378a 100644
--- a/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
+++ b/src/data/repositories/UniqueBeneficiariesSettingsD2Repository.ts
@@ -1,7 +1,9 @@
 import { Id } from "../../domain/entities/Ref";
 import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
 import { UniqueBeneficiariesSettingsRepository } from "../../domain/repositories/UniqueBeneficiariesSettingsRepository";
+import { Config } from "../../models/Config";
 import { D2Api } from "../../types/d2-api";
+import { Maybe } from "../../types/utils";
 import { D2ApiUbSettings } from "../common/D2ApiUbSettings";
 
 export class UniqueBeneficiariesSettingsD2Repository
@@ -9,12 +11,12 @@ export class UniqueBeneficiariesSettingsD2Repository
 {
     private d2ApiUbSettings: D2ApiUbSettings;
 
-    constructor(private api: D2Api) {
-        this.d2ApiUbSettings = new D2ApiUbSettings(this.api);
+    constructor(private api: D2Api, private config: Config) {
+        this.d2ApiUbSettings = new D2ApiUbSettings(this.api, this.config);
     }
 
-    async getAll(): Promise<UniqueBeneficiariesSettings[]> {
-        return this.d2ApiUbSettings.getAll();
+    async getAll(options: { projectsIds: Maybe<Id[]> }): Promise<UniqueBeneficiariesSettings[]> {
+        return this.d2ApiUbSettings.getAll(options);
     }
 
     async get(projectId: Id): Promise<UniqueBeneficiariesSettings> {
diff --git a/src/data/repositories/UniquePeriodD2Repository.ts b/src/data/repositories/UniquePeriodD2Repository.ts
index 309bca5e..f7d7cf80 100644
--- a/src/data/repositories/UniquePeriodD2Repository.ts
+++ b/src/data/repositories/UniquePeriodD2Repository.ts
@@ -8,15 +8,16 @@ import { DATA_MANAGEMENT_NAMESPACE } from "../common";
 import { Id } from "../../domain/entities/Ref";
 import { D2ApiUbSettings } from "../common/D2ApiUbSettings";
 import { generateUid } from "d2/uid";
+import { Config } from "../../models/Config";
 
 export class UniquePeriodD2Repository implements UniquePeriodRepository {
     private dataStore: DataStore;
     private namespace = DATA_MANAGEMENT_NAMESPACE;
     private d2ApiUbSettings: D2ApiUbSettings;
 
-    constructor(private api: D2Api) {
+    constructor(private api: D2Api, config: Config) {
         this.dataStore = this.api.dataStore(this.namespace);
-        this.d2ApiUbSettings = new D2ApiUbSettings(this.api);
+        this.d2ApiUbSettings = new D2ApiUbSettings(this.api, config);
     }
 
     async getByProject(projectId: Id): Promise<UniqueBeneficiariesPeriod[]> {
diff --git a/src/domain/entities/IndicatorReport.tsx b/src/domain/entities/IndicatorReport.tsx
index 04124ec9..b7ee97ec 100644
--- a/src/domain/entities/IndicatorReport.tsx
+++ b/src/domain/entities/IndicatorReport.tsx
@@ -10,6 +10,7 @@ export type IndicatorReportAttrs = {
     createdAt: ISODateTimeString;
     lastUpdatedAt: ISODateTimeString;
     projects: ProjectRows[];
+    year: number;
 };
 
 export type IndicatorReportToSave = Omit<IndicatorReportAttrs, "createdAt" | "lastUpdatedAt">;
@@ -46,6 +47,10 @@ export class IndicatorReport extends Struct<IndicatorReportAttrs>() {
         return this._update({ projects: newProjects });
     }
 
+    checkPeriodAndYear(periodId: Id, year: number): boolean {
+        return this.period.id === periodId && this.year === year;
+    }
+
     private updateIndicators(
         project: ProjectRows,
         indicatorId: Id,
diff --git a/src/domain/entities/IndicatorValidation.ts b/src/domain/entities/IndicatorValidation.ts
index e04b5e45..d8d88a51 100644
--- a/src/domain/entities/IndicatorValidation.ts
+++ b/src/domain/entities/IndicatorValidation.ts
@@ -1,14 +1,18 @@
+import _ from "lodash";
+import { getYearsFromProject } from "../../pages/project-indicators-validation/ProjectIndicatorsValidation";
 import { Maybe } from "../../types/utils";
 import { Either } from "./generic/Either";
 import { ValidationError } from "./generic/Errors";
 import { Struct } from "./generic/Struct";
 import { validateRequired } from "./generic/Validations";
 import { IndicatorCalculation } from "./IndicatorCalculation";
+import { ProjectCountry } from "./IndicatorReport";
 import { Id, ISODateTimeString } from "./Ref";
 import { UniqueBeneficiariesPeriod } from "./UniqueBeneficiariesPeriod";
 
 export type IndicatorValidationAttrs = {
     period: UniqueBeneficiariesPeriod;
+    year: number;
     createdAt: ISODateTimeString;
     lastUpdatedAt: Maybe<ISODateTimeString>;
     indicatorsCalculation: IndicatorCalculation[];
@@ -45,13 +49,22 @@ export class IndicatorValidation extends Struct<IndicatorValidationAttrs>() {
 
     static buildIndicatorsValidationFromPeriods(
         periods: UniqueBeneficiariesPeriod[],
-        indicatorsIds: Id[]
+        indicatorsIds: Id[],
+        project: ProjectCountry
     ): IndicatorValidation[] {
-        return periods.map(period => {
+        const { periodsKeys, periodsByYears } = this.getPeriodsAndYearsFromDates(
+            project.openingDate,
+            project.closedDate,
+            periods
+        );
+
+        return periodsKeys.map(periodYearKey => {
+            const { period, year } = periodsByYears[periodYearKey];
             return IndicatorValidation.build({
                 createdAt: "",
                 lastUpdatedAt: "",
                 period,
+                year,
                 indicatorsCalculation: indicatorsIds.map(indicatorId => {
                     return IndicatorCalculation.build({
                         id: indicatorId,
@@ -66,4 +79,33 @@ export class IndicatorValidation extends Struct<IndicatorValidationAttrs>() {
             }).get();
         });
     }
+
+    checkPeriodAndYear(periodId: Id, year: number): boolean {
+        return this.period.id === periodId && this.year === year;
+    }
+
+    static getPeriodsAndYearsFromDates(
+        startDate: ISODateTimeString,
+        endDate: ISODateTimeString,
+        periods: UniqueBeneficiariesPeriod[]
+    ) {
+        const years = getYearsFromProject(startDate, endDate);
+        return this.groupPeriodsAndYears(years, periods);
+    }
+
+    static groupPeriodsAndYears(years: number[], periods: UniqueBeneficiariesPeriod[]) {
+        const periodsByYears = _(years)
+            .flatMap(year =>
+                periods.map(period => ({
+                    id: `${year}-${period.id}`,
+                    value: { period: period, year },
+                }))
+            )
+            .keyBy(item => item.id)
+            .mapValues(item => item.value)
+            .value();
+
+        const periodsKeys = Object.keys(periodsByYears);
+        return { periodsByYears, periodsKeys };
+    }
 }
diff --git a/src/domain/repositories/UniqueBeneficiariesSettingsRepository.ts b/src/domain/repositories/UniqueBeneficiariesSettingsRepository.ts
index 08001e67..cb996836 100644
--- a/src/domain/repositories/UniqueBeneficiariesSettingsRepository.ts
+++ b/src/domain/repositories/UniqueBeneficiariesSettingsRepository.ts
@@ -1,8 +1,9 @@
+import { Maybe } from "../../types/utils";
 import { Id } from "../entities/Ref";
 import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
 
 export interface UniqueBeneficiariesSettingsRepository {
     get(projectId: Id): Promise<UniqueBeneficiariesSettings>;
     save(settings: UniqueBeneficiariesSettings): Promise<void>;
-    getAll(): Promise<UniqueBeneficiariesSettings[]>;
+    getAll(options: { projectsIds: Maybe<Id[]> }): Promise<UniqueBeneficiariesSettings[]>;
 }
diff --git a/src/domain/usecases/GetIndicatorsValidationUseCase.ts b/src/domain/usecases/GetIndicatorsValidationUseCase.ts
index b07237bc..11ce6fff 100644
--- a/src/domain/usecases/GetIndicatorsValidationUseCase.ts
+++ b/src/domain/usecases/GetIndicatorsValidationUseCase.ts
@@ -1,7 +1,9 @@
+import _ from "lodash";
 import i18n from "../../locales";
 import { promiseMap } from "../../migrations/utils";
 import { Config } from "../../models/Config";
 import Project from "../../models/Project";
+import { getYearsFromProject } from "../../pages/project-indicators-validation/ProjectIndicatorsValidation";
 import { DataValue } from "../entities/DataValue";
 import { IndicatorCalculation } from "../entities/IndicatorCalculation";
 import { IndicatorValidation } from "../entities/IndicatorValidation";
@@ -51,33 +53,61 @@ export class GetIndicatorsValidationUseCase {
         const dataSetId = project.dataSets?.actual.id;
         if (!dataSetId) throw new Error(`Actual dataSet not found for project: ${project.name}`);
 
+        const { periodsKeys, periodsByYears } = IndicatorValidation.getPeriodsAndYearsFromDates(
+            project.startDate?.toISOString() || "",
+            project.endDate?.toISOString() || "",
+            settings.periods
+        );
+
         const indicatorsDetails = project.uniqueIndicators.get({ onlySelected: true });
 
-        const indicatorsWithValues = await promiseMap(settings.periods, period => {
+        const indicatorsWithValues = await promiseMap(periodsKeys, periodYearKey => {
+            const { period, year } = periodsByYears[periodYearKey];
             return this.setValuesToIndicators(
                 period,
                 dataSetId,
                 project.id,
                 settings,
-                indicatorsDetails
+                indicatorsDetails,
+                year
             );
         });
 
         return indicatorsWithValues;
     }
 
+    private getPeriodsAndYearsFromProject(project: Project, periods: UniqueBeneficiariesPeriod[]) {
+        const years = getYearsFromProject(
+            project.startDate?.toISOString() || "",
+            project.endDate?.toISOString() || ""
+        );
+        const periodsByYears = _(years)
+            .flatMap(year =>
+                periods.map(period => ({
+                    key: `${year}-${period.id}`,
+                    value: { period, year },
+                }))
+            )
+            .keyBy("key")
+            .mapValues("value")
+            .value();
+
+        return { years, periodsByYears };
+    }
+
     private async setValuesToIndicators(
         period: UniqueBeneficiariesPeriod,
         dataSetId: Id,
         projectId: Id,
         settings: UniqueBeneficiariesSettings,
-        indicatorsDetails: Array<{ id: Id; name: string; code: Code }>
+        indicatorsDetails: Array<{ id: Id; name: string; code: Code }>,
+        year: number
     ): Promise<IndicatorValidation> {
-        const dateRange = this.getDatesRange(period);
+        const dateRange = this.getDatesRange(period, year);
         const dataValues = await this.getDataValues(dataSetId, projectId, settings, dateRange);
         const actualDataValues = this.getOnlyActualDataValues(dataValues);
-        const indicatorCalculation = settings.indicatorsValidation.find(
-            item => item.period.id === period.id
+        const indicatorCalculation = settings.indicatorsValidation.find(item =>
+            item.checkPeriodAndYear(period.id, year)
         );
 
         const indicatorCalculations = settings.indicatorsIds.map(indicatorId => {
@@ -100,6 +130,7 @@ export class GetIndicatorsValidationUseCase {
             lastUpdatedAt: indicatorCalculation?.lastUpdatedAt,
             period: period,
             indicatorsCalculation: indicatorCalculations,
+            year: year,
         }).get();
     }
 
@@ -122,9 +153,9 @@ export class GetIndicatorsValidationUseCase {
         });
     }
 
-    private getDatesRange(period: UniqueBeneficiariesPeriod): DateRange {
-        const startDate = this.getMonthDay(period.startDateMonth, "first");
-        const endDate = this.getMonthDay(period.endDateMonth, "last");
+    private getDatesRange(period: UniqueBeneficiariesPeriod, year: number): DateRange {
+        const startDate = this.getMonthDay(period.startDateMonth, "first", year);
+        const endDate = this.getMonthDay(period.endDateMonth, "last", year);
         return { startDate, endDate };
     }
 
@@ -134,14 +165,12 @@ export class GetIndicatorsValidationUseCase {
         );
     }
 
-    private getMonthDay(month: number, option: "first" | "last"): Date {
+    private getMonthDay(month: number, option: "first" | "last", year: number): Date {
         if (month < 1 || month > 12) {
             throw new Error(`Invalid month number: ${month}`);
         }
-        const currentYear = new Date().getFullYear();
-        return option === "first"
-            ? new Date(currentYear, month - 1, 1)
-            : new Date(currentYear, month, 0);
+
+        return option === "first" ? new Date(year, month - 1, 1) : new Date(year, month, 0);
     }
 }
 
diff --git a/src/domain/usecases/GetProjectByIdUseCase.ts b/src/domain/usecases/GetProjectByIdUseCase.ts
new file mode 100644
index 00000000..548966d6
--- /dev/null
+++ b/src/domain/usecases/GetProjectByIdUseCase.ts
@@ -0,0 +1,11 @@
+import Project from "../../models/Project";
+import { Id } from "../entities/Ref";
+import { ProjectRepository } from "../repositories/ProjectRepository";
+
+export class GetProjectByIdUseCase {
+    constructor(private projectRepository: ProjectRepository) {}
+
+    execute(id: Id): Promise<Project> {
+        return this.projectRepository.getById(id);
+    }
+}
diff --git a/src/domain/usecases/GetProjectsByCountryUseCase.ts b/src/domain/usecases/GetProjectsByCountryUseCase.ts
index 16773272..edad5438 100644
--- a/src/domain/usecases/GetProjectsByCountryUseCase.ts
+++ b/src/domain/usecases/GetProjectsByCountryUseCase.ts
@@ -1,5 +1,6 @@
 import _ from "lodash";
 import { ProjectForList } from "../../models/ProjectsList";
+import { getYearsFromProject } from "../../pages/project-indicators-validation/ProjectIndicatorsValidation";
 import { getId } from "../../utils/dhis2";
 import { DataElement } from "../entities/DataElement";
 import { IndicatorCalculation } from "../entities/IndicatorCalculation";
@@ -22,9 +23,9 @@ export class GetProjectsByCountryUseCase {
     ) {}
 
     async execute(options: GetCountryIndicatorsOptions): Promise<IndicatorsReportsResult> {
-        const [projects, settings, existingReports] = await Promise.all([
-            this.getProjectsByCountry(options.countryId),
-            this.getAllSettings(),
+        const projects = await this.getProjectsByCountry(options.countryId);
+        const [settings, existingReports] = await Promise.all([
+            this.getAllSettings(projects.map(project => project.id)),
             this.indicatorRepository.getByCountry(options.countryId),
         ]);
 
@@ -55,17 +56,33 @@ export class GetProjectsByCountryUseCase {
         dataElements: DataElement[]
     ): IndicatorReport[] {
         const uniquePeriods = this.getUniquePeriodsFromSettings(settings);
+        const allYears = _(projects)
+            .map(project => {
+                return getYearsFromProject(project.openingDate, project.closedDate);
+            })
+            .flatten()
+            .uniq()
+            .sort()
+            .value();
+
+        const { periodsKeys, periodsByYears } = IndicatorValidation.groupPeriodsAndYears(
+            allYears,
+            uniquePeriods
+        );
 
-        return uniquePeriods.map((period): IndicatorReport => {
+        return periodsKeys.map((periodYearKey): IndicatorReport => {
+            const { period, year } = periodsByYears[periodYearKey];
             const existingData = existingReports.find(
                 report =>
                     report.period.equalMonths(period.startDateMonth, period.endDateMonth) &&
+                    report.year === year &&
                     report.countryId === countryId
             );
 
             return existingData
                 ? existingData
                 : IndicatorReport.create({
+                      year,
                       countryId,
                       createdAt: "",
                       lastUpdatedAt: "",
@@ -134,11 +151,7 @@ export class GetProjectsByCountryUseCase {
                               };
                           });
 
-                return {
-                    id: project.id,
-                    project: project,
-                    indicators: projectIndicators,
-                };
+                return { id: project.id, project: project, indicators: projectIndicators };
             })
             .compact()
             .value();
@@ -191,8 +204,8 @@ export class GetProjectsByCountryUseCase {
         return this.projectRepository.getByCountries(countryId);
     }
 
-    private getAllSettings(): Promise<UniqueBeneficiariesSettings[]> {
-        return this.beneficiariesSettingsRepository.getAll();
+    private getAllSettings(projectsIds: Id[]): Promise<UniqueBeneficiariesSettings[]> {
+        return this.beneficiariesSettingsRepository.getAll({ projectsIds });
     }
 }
 
diff --git a/src/domain/usecases/SaveIndicatorsValidationUseCase.ts b/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
index 6d7dc27f..0a4c76f9 100644
--- a/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
+++ b/src/domain/usecases/SaveIndicatorsValidationUseCase.ts
@@ -51,8 +51,8 @@ export class SaveIndicatorsValidationUseCase {
         settings: UniqueBeneficiariesSettings
     ): IndicatorValidation[] {
         return indicatorsValidations.map(indicator => {
-            const indicatorExist = settings.indicatorsValidation.find(
-                item => item.period.id === indicator.period.id
+            const indicatorExist = settings.indicatorsValidation.find(item =>
+                item.checkPeriodAndYear(indicator.period.id, indicator.year)
             );
 
             const currentDate = new Date().toISOString();
diff --git a/src/pages/country-indicator-report/CountryIndicatorReport.tsx b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
index fbf17d3b..9f8014ef 100644
--- a/src/pages/country-indicator-report/CountryIndicatorReport.tsx
+++ b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
@@ -1,5 +1,12 @@
+import _ from "lodash";
 import React from "react";
-import { ConfirmationDialog, Dropdown, useLoading, useSnackbar } from "@eyeseetea/d2-ui-components";
+import {
+    ConfirmationDialog,
+    Dropdown,
+    useLoading,
+    useSnackbar,
+    DropdownItem,
+} from "@eyeseetea/d2-ui-components";
 import { Button, Grid, Typography } from "@material-ui/core";
 
 import UserOrgUnits, { OrganisationUnit } from "../../components/org-units/UserOrgUnits";
@@ -16,10 +23,12 @@ import { buildSpreadSheet } from "./excel-report";
 import { downloadFile } from "../../utils/download";
 import { useConfirmChanges } from "../report/MerReport";
 import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
+import { getYearsFromProject } from "../project-indicators-validation/ProjectIndicatorsValidation";
 
 export const CountryIndicatorReport = React.memo(() => {
     const goTo = useGoTo();
     const [orgUnit, setOrgUnit] = React.useState<OrganisationUnit>();
+    const [year, setYear] = React.useState<number>();
     const [selectedPeriod, setSelectedPeriod] = React.useState<UniqueBeneficiariesPeriod>();
     const { confirmIfUnsavedChanges, proceedWarning, runProceedAction, wasReportModifiedSet } =
         useConfirmChanges();
@@ -49,24 +58,30 @@ export const CountryIndicatorReport = React.memo(() => {
         }
     };
 
+    const updateYear = (year: Maybe<string>) => {
+        if (year) setYear(Number(year));
+    };
+
     const updateReport = React.useCallback(
         (value: boolean, row: GroupedRows) => {
-            if (!selectedPeriod) return;
+            if (!selectedPeriod || !year) return;
 
             const updatedIndicators = indicatorsReports.map(indicatorReport => {
-                if (indicatorReport.period.id !== selectedPeriod.id) return indicatorReport;
+                if (!indicatorReport.checkPeriodAndYear(selectedPeriod.id, year))
+                    return indicatorReport;
 
                 return indicatorReport.updateProjectIndicators(row.project.id, row.id, value);
             });
             setIndicatorsReports(updatedIndicators);
             wasReportModifiedSet(true);
         },
-        [indicatorsReports, selectedPeriod, setIndicatorsReports, wasReportModifiedSet]
+        [indicatorsReports, selectedPeriod, setIndicatorsReports, wasReportModifiedSet, year]
     );
 
-    const indicatorReport = indicatorsReports.find(
-        report => report.period.id === selectedPeriod?.id
-    );
+    const indicatorReport =
+        year && selectedPeriod
+            ? indicatorsReports.find(report => report.checkPeriodAndYear(selectedPeriod.id, year))
+            : undefined;
 
     const downloadReport = () => {
         if (indicatorReport && orgUnit && selectedPeriod) {
@@ -88,6 +103,8 @@ export const CountryIndicatorReport = React.memo(() => {
     const reportHasProjects = indicatorReport && indicatorReport.projects.length > 0;
     const titlePage = i18n.t("Country Project & Indicators");
 
+    const years = mapYearsToItems(indicatorsReports);
+
     return (
         <section>
             <PageHeader title={i18n.t("Country Project & Indicators")} onBackClick={changePage} />
@@ -102,16 +119,25 @@ export const CountryIndicatorReport = React.memo(() => {
                         height={200}
                     />
                 </Grid>
-                <Grid item xs={12}>
+                <Grid item>
                     <Dropdown
                         items={mapItemsToDropdown(getAllPeriods(indicatorsReports))}
-                        onChange={period => updatePeriod(period)}
+                        onChange={updatePeriod}
                         label={i18n.t("Select period")}
                         value={selectedPeriod?.id}
                         hideEmpty
                     />
                 </Grid>
-                {reportHasProjects && selectedPeriod && (
+                <Grid item>
+                    <Dropdown
+                        items={years}
+                        onChange={updateYear}
+                        label={i18n.t("Select Year")}
+                        value={year?.toString()}
+                        hideEmpty
+                    />
+                </Grid>
+                {reportHasProjects && selectedPeriod && year && (
                     <>
                         <Grid item xs={12}>
                             <IndicatorReportTable
@@ -147,7 +173,7 @@ export const CountryIndicatorReport = React.memo(() => {
                         </Grid>
                     </>
                 )}
-                {selectedPeriod && !reportHasProjects && (
+                {selectedPeriod && year && !reportHasProjects && (
                     <Typography>
                         {i18n.t("No projects found for selected period: {{period}}", {
                             nsSeparator: false,
@@ -176,8 +202,28 @@ export const CountryIndicatorReport = React.memo(() => {
 
 CountryIndicatorReport.displayName = "CountryIndicatorReport";
 
+function getUniqueYearsFromProjects(indicatorsReports: IndicatorReport[]): number[] {
+    return _(indicatorsReports)
+        .flatMap(report =>
+            report.projects.map(project => {
+                return getYearsFromProject(project.project.openingDate, project.project.closedDate);
+            })
+        )
+        .flatten()
+        .uniq()
+        .value();
+}
+
+function mapYearsToItems(indicatorsReports: IndicatorReport[]): DropdownItem[] {
+    const years = getUniqueYearsFromProjects(indicatorsReports);
+    return years.map(year => ({ text: year.toString(), value: year.toString() }));
+}
+
 function getAllPeriods(indicatorsReports: IndicatorReport[]): UniqueBeneficiariesPeriod[] {
-    return indicatorsReports.flatMap(setting => setting.period);
+    return _(indicatorsReports)
+        .flatMap(setting => setting.period)
+        .uniqBy(period => period.name)
+        .value();
 }
 
 function mapItemsToDropdown(periods: UniqueBeneficiariesPeriod[]) {
diff --git a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
index e84b2d91..95fdfb5e 100644
--- a/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
+++ b/src/pages/project-indicators-validation/IndicatorValidationForm.tsx
@@ -13,26 +13,35 @@ import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBenefic
 import { IndicatorNotification } from "./IndicatorNotification";
 import { ISODateTimeString } from "../../domain/entities/Ref";
 import { useIndicatorValidation } from "./hooks";
+import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
 
 export type IndicatorValidationFormProps = {
     indicatorsValidation: IndicatorValidation[];
     onSubmit: (indicatorValidation: IndicatorValidation) => void;
     onUpdateIndicator: (indicator: IndicatorValidation) => void;
     settings: UniqueBeneficiariesSettings;
+    years: number[];
 };
 
 export const IndicatorValidationForm = React.memo((props: IndicatorValidationFormProps) => {
-    const { indicatorsValidation, onSubmit, settings, onUpdateIndicator } = props;
+    const { indicatorsValidation, onSubmit, settings, onUpdateIndicator, years } = props;
     const { periods } = settings;
+    const [selectedYear, setSelectedYear] = React.useState<number>();
+    const [selectedPeriod, setSelectedPeriod] = React.useState<UniqueBeneficiariesPeriod>();
     const {
         dismissNotification,
         selectedIndicator,
-        selectedPeriod,
         loadIndicatorValidation,
         saveIndicatorValidation,
         setDismissNotification,
         updateIndicatorsValidationRow,
-    } = useIndicatorValidation({ indicatorsValidation, onSubmit, periods, onUpdateIndicator });
+    } = useIndicatorValidation({
+        indicatorsValidation,
+        onSubmit,
+        periods,
+        onUpdateIndicator,
+        selectedPeriod,
+    });
 
     const history = useHistory();
     const classes = useStyles();
@@ -56,6 +65,30 @@ export const IndicatorValidationForm = React.memo((props: IndicatorValidationFor
         IndicatorCalculation.getTotal(indicator)
     );
 
+    const mapsYearsToItems = years.map(year => ({
+        value: year.toString(),
+        text: year.toString(),
+    }));
+
+    const updateYear = React.useCallback(
+        (value: Maybe<string>) => {
+            if (value) setSelectedYear(Number(value));
+            if (selectedPeriod) loadIndicatorValidation(selectedPeriod.id, Number(value));
+        },
+        [loadIndicatorValidation, selectedPeriod]
+    );
+
+    const updatePeriod = React.useCallback(
+        (value: Maybe<string>) => {
+            const period = periods.find(period => period.id === value);
+            if (period && selectedYear) {
+                setSelectedPeriod(period);
+                loadIndicatorValidation(period.id, Number(selectedYear));
+            }
+        },
+        [loadIndicatorValidation, periods, selectedYear]
+    );
+
     return (
         <div>
             <PageHeader
@@ -66,12 +99,22 @@ export const IndicatorValidationForm = React.memo((props: IndicatorValidationFor
             <form onSubmit={saveIndicatorValidation}>
                 <Dropdown
                     hideEmpty
-                    items={mapPeriodsToItems}
-                    label={i18n.t("Select a Period")}
-                    onChange={loadIndicatorValidation}
-                    value={selectedPeriod?.id || ""}
+                    items={mapsYearsToItems}
+                    label={i18n.t("Select Year")}
+                    onChange={updateYear}
+                    value={selectedYear?.toString()}
                 />
 
+                {selectedYear && (
+                    <Dropdown
+                        hideEmpty
+                        items={mapPeriodsToItems}
+                        label={i18n.t("Select Period")}
+                        onChange={updatePeriod}
+                        value={selectedPeriod?.id || ""}
+                    />
+                )}
+
                 {selectedIndicator && (
                     <Grid container>
                         <Grid item className={classes.alignRight}>
diff --git a/src/pages/project-indicators-validation/ProjectIndicatorsValidation.tsx b/src/pages/project-indicators-validation/ProjectIndicatorsValidation.tsx
index c532ccc8..7165bfac 100644
--- a/src/pages/project-indicators-validation/ProjectIndicatorsValidation.tsx
+++ b/src/pages/project-indicators-validation/ProjectIndicatorsValidation.tsx
@@ -1,23 +1,27 @@
+import _ from "lodash";
 import React from "react";
 import { useParams } from "react-router-dom";
 import { useLoading, useSnackbar } from "@eyeseetea/d2-ui-components";
 
 import { useAppContext } from "../../contexts/api-context";
-import { Ref } from "../../domain/entities/Ref";
+import { ISODateTimeString, Ref } from "../../domain/entities/Ref";
 import { useGetUniqueBeneficiaries } from "../../hooks/UniqueBeneficiaries";
 import { IndicatorValidationForm } from "./IndicatorValidationForm";
 import { IndicatorValidation } from "../../domain/entities/IndicatorValidation";
 import i18n from "../../locales";
 import { Id } from "@eyeseetea/d2-api";
+import Project from "../../models/Project";
+import { Maybe } from "../../types/utils";
 
 export const ProjectIndicatorsValidation = React.memo(() => {
     const { id } = useParams<Ref>();
     const { compositionRoot } = useAppContext();
+    const { project } = useGetProjectById({ id });
     const { settings } = useGetUniqueBeneficiaries({ id, refresh: 0 });
     const loading = useLoading();
     const snackbar = useSnackbar();
     const { indicatorsValidation, setIndicatorsValidation, setRefresh } =
-        useLoadIndicatorsValidations({ id });
+        useLoadIndicatorsValidations({ project });
 
     const saveIndicator = React.useCallback(() => {
         loading.show(true, i18n.t("Saving Indicators..."));
@@ -44,7 +48,10 @@ export const ProjectIndicatorsValidation = React.memo(() => {
         (indicatorValidation: IndicatorValidation) => {
             setIndicatorsValidation(prev =>
                 prev.map(indicator => {
-                    return indicator.period.id === indicatorValidation.period.id
+                    return indicator.checkPeriodAndYear(
+                        indicatorValidation.period.id,
+                        indicatorValidation.year
+                    )
                         ? indicatorValidation
                         : indicator;
                 })
@@ -53,7 +60,12 @@ export const ProjectIndicatorsValidation = React.memo(() => {
         [setIndicatorsValidation]
     );
 
-    if (!settings) return null;
+    if (!settings || !project) return null;
+
+    const years = getYearsFromProject(
+        project.startDate?.toISOString() || "",
+        project.endDate?.toISOString() || ""
+    );
 
     return (
         <div>
@@ -62,14 +74,47 @@ export const ProjectIndicatorsValidation = React.memo(() => {
                 settings={settings}
                 onSubmit={saveIndicator}
                 onUpdateIndicator={updateIndicator}
+                years={years}
             />
         </div>
     );
 });
 
-function useLoadIndicatorsValidations(props: { id: Id }) {
+export function getYearsFromProject(
+    startDate: ISODateTimeString,
+    endDate: ISODateTimeString
+): number[] {
+    if (!startDate || !endDate) return [];
+    const startYear = new Date(startDate).getFullYear();
+    const endYear = new Date(endDate).getFullYear();
+    return _.range(startYear, endYear + 1);
+}
+
+function useGetProjectById(props: { id: Id }) {
     const { id } = props;
     const { compositionRoot } = useAppContext();
+    const [project, setProject] = React.useState<Project>();
+
+    const loading = useLoading();
+    const snackbar = useSnackbar();
+
+    React.useEffect(() => {
+        loading.show(true, i18n.t("Loading Project"));
+        compositionRoot.projects.getById
+            .execute(id)
+            .then(setProject)
+            .catch(err => {
+                snackbar.error(err.message);
+            })
+            .finally(() => loading.hide());
+    }, [compositionRoot.projects.getById, id, loading, snackbar]);
+
+    return { project };
+}
+
+function useLoadIndicatorsValidations(props: { project: Maybe<Project> }) {
+    const { project } = props;
+    const { compositionRoot } = useAppContext();
     const [indicatorsValidation, setIndicatorsValidation] = React.useState<IndicatorValidation[]>(
         []
     );
@@ -78,16 +123,17 @@ function useLoadIndicatorsValidations(props: { id: Id }) {
     const snackbar = useSnackbar();
 
     React.useEffect(() => {
+        if (!project) return;
         console.debug("refresh", refresh);
         loading.show(true, i18n.t("Loading Indicators..."));
         compositionRoot.indicators.getValidation
-            .execute({ projectId: id })
+            .execute({ projectId: project.id })
             .then(setIndicatorsValidation)
             .catch(err => {
                 snackbar.error(err.message);
             })
             .finally(() => loading.hide());
-    }, [compositionRoot.indicators, id, loading, refresh, snackbar]);
+    }, [compositionRoot.indicators, loading, project, refresh, snackbar]);
 
     return { indicatorsValidation, setIndicatorsValidation, setRefresh };
 }
diff --git a/src/pages/project-indicators-validation/hooks.ts b/src/pages/project-indicators-validation/hooks.ts
index a88db769..0569930d 100644
--- a/src/pages/project-indicators-validation/hooks.ts
+++ b/src/pages/project-indicators-validation/hooks.ts
@@ -15,38 +15,36 @@ export type UseIndicatorValidationProps = {
     indicatorsValidation: IndicatorValidation[];
     onSubmit: (indicatorValidation: IndicatorValidation) => void;
     onUpdateIndicator: (indicator: IndicatorValidation) => void;
+    selectedPeriod: Maybe<UniqueBeneficiariesPeriod>;
 };
 
 export function useIndicatorValidation(props: UseIndicatorValidationProps) {
-    const { indicatorsValidation, onSubmit, onUpdateIndicator, periods } = props;
+    const { indicatorsValidation, onSubmit, onUpdateIndicator, periods, selectedPeriod } = props;
 
-    const [selectedPeriod, setSelectedPeriod] = React.useState<UniqueBeneficiariesPeriod>();
     const [selectedIndicator, setIndicatorValidation] = React.useState<IndicatorValidation>();
     const [dismissNotification, setDismissNotification] = React.useState(false);
     const snackbar = useSnackbar();
     const loadIndicatorValidation = React.useCallback(
-        (period: Maybe<string>) => {
+        (period: string, year: number) => {
             const uniquePeriod = periods.find(item => item.id === period);
             if (!uniquePeriod) {
                 snackbar.error(i18n.t("Period not found"));
                 return;
             }
 
-            const currentIndicatorValidation = indicatorsValidation.find(
-                indicator => indicator.period.id === period
+            const currentIndicatorValidation = indicatorsValidation.find(indicator =>
+                indicator.checkPeriodAndYear(uniquePeriod.id, Number(year))
             );
 
-            setSelectedPeriod(uniquePeriod);
             setDismissNotification(false);
             IndicatorValidation.build({
+                year: Number(year),
                 createdAt: currentIndicatorValidation?.createdAt || "",
                 lastUpdatedAt: currentIndicatorValidation?.lastUpdatedAt,
                 period: uniquePeriod,
                 indicatorsCalculation: currentIndicatorValidation?.indicatorsCalculation || [],
             }).match({
-                success: value => {
-                    setIndicatorValidation(value);
-                },
+                success: setIndicatorValidation,
                 error: err => {
                     const errorMessage = getErrors(err);
                     snackbar.error(errorMessage);

From 8a86beb1d233f20d2e42b4ddfeb69fbfafa5500a Mon Sep 17 00:00:00 2001
From: Arnau Sanchez <pyarnau@gmail.com>
Date: Tue, 19 Nov 2024 09:09:56 +0100
Subject: [PATCH 40/51] Move xlsx to devDependencies + useCase to the script

---
 package.json                             |  6 ++---
 src/CompositionRoot.ts                   | 23 +------------------
 src/scripts/import-data-element-excel.ts | 29 +++++++++++++++++++++---
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 568a759d..126e80b9 100644
--- a/package.json
+++ b/package.json
@@ -53,8 +53,7 @@
         "styled-components": "^5.2.1",
         "styled-jsx": "3.4.1",
         "use-debounce": "7.0.0",
-        "word-wrap": "1.2.5",
-        "xlsx": "^0.18.5"
+        "word-wrap": "1.2.5"
     },
     "scripts": {
         "analyze": "source-map-explorer 'build/static/js/*.js'",
@@ -138,7 +137,8 @@
         "source-map-explorer": "^2.5.3",
         "ts-node": "10.9.2",
         "typescript": "4.9.3",
-        "wait-on": "5.2.1"
+        "wait-on": "5.2.1",
+        "xlsx": "^0.18.5"
     },
     "manifest.webapp": {
         "name": "Data Management App",
diff --git a/src/CompositionRoot.ts b/src/CompositionRoot.ts
index 9232e974..f7da8b2e 100644
--- a/src/CompositionRoot.ts
+++ b/src/CompositionRoot.ts
@@ -1,17 +1,12 @@
 import { DataElementD2Repository } from "./data/repositories/DataElementD2Repository";
 import { DataValueD2Repository } from "./data/repositories/DataValueD2Repository";
-import { DataValueExportJsonRepository } from "./data/repositories/DataValueExportJsonRepository";
-import { ExportDataElementJsonRepository } from "./data/repositories/ExportDataElementJsonRepository";
-import { ImportDataElementSpreadSheetRepository } from "./data/repositories/ImportDataElementSpreadSheetRepository";
 import { IndicatorReportD2Repository } from "./data/repositories/IndicatorReportD2Repository";
-import { OrgUnitD2Repository } from "./data/repositories/OrgUnitD2Repository";
 import { ProjectD2Repository } from "./data/repositories/ProjectD2Repository";
 import { UniqueBeneficiariesSettingsD2Repository } from "./data/repositories/UniqueBeneficiariesSettingsD2Repository";
 import { UniquePeriodD2Repository } from "./data/repositories/UniquePeriodD2Repository";
 import { GetIndicatorsValidationUseCase } from "./domain/usecases/GetIndicatorsValidationUseCase";
 import { GetProjectsByCountryUseCase } from "./domain/usecases/GetProjectsByCountryUseCase";
 import { GetUniqueBeneficiariesSettingsUseCase } from "./domain/usecases/GetUniqueBeneficiariesSettingsUseCase";
-import { ImportDataElementsUseCase } from "./domain/usecases/ImportDataElementsUseCase";
 import { RemoveUniqueBeneficiariesPeriodUseCase } from "./domain/usecases/RemoveUniqueBeneficiariesPeriodUseCase";
 import { SaveIndicatorReportUseCase } from "./domain/usecases/SaveIndicatorReportUseCase";
 import { SaveIndicatorsValidationUseCase } from "./domain/usecases/SaveIndicatorsValidationUseCase";
@@ -23,28 +18,12 @@ export function getCompositionRoot(api: D2Api, config: Config) {
     const uniqueBeneficiariesSettingsRepository = new UniqueBeneficiariesSettingsD2Repository(api);
     const dataValueRepository = new DataValueD2Repository(api);
     const dataElementRepository = new DataElementD2Repository(api, config);
-    const importDataElementSpreadSheetRepository = new ImportDataElementSpreadSheetRepository(
-        api,
-        config
-    );
-    const exportDataElementJsonRepository = new ExportDataElementJsonRepository(api, config);
-    const dataValueExportRepository = new DataValueExportJsonRepository();
-    const orgUnitRepository = new OrgUnitD2Repository(api);
+
     const projectRepository = new ProjectD2Repository(api, config);
     const indicatorReportRepository = new IndicatorReportD2Repository(api, config);
     const periodRepository = new UniquePeriodD2Repository(api);
 
     return {
-        dataElements: {
-            import: new ImportDataElementsUseCase(
-                importDataElementSpreadSheetRepository,
-                dataElementRepository,
-                exportDataElementJsonRepository,
-                dataValueRepository,
-                dataValueExportRepository,
-                orgUnitRepository
-            ),
-        },
         uniqueBeneficiaries: {
             getSettings: new GetUniqueBeneficiariesSettingsUseCase(
                 uniqueBeneficiariesSettingsRepository
diff --git a/src/scripts/import-data-element-excel.ts b/src/scripts/import-data-element-excel.ts
index 0b6d2919..9c4b803d 100644
--- a/src/scripts/import-data-element-excel.ts
+++ b/src/scripts/import-data-element-excel.ts
@@ -2,7 +2,13 @@ import parse from "parse-typed-args";
 
 import { getApp } from "./common";
 import { getConfig } from "../models/Config";
-import { getCompositionRoot } from "../CompositionRoot";
+import { DataValueExportJsonRepository } from "../data/repositories/DataValueExportJsonRepository";
+import { ExportDataElementJsonRepository } from "../data/repositories/ExportDataElementJsonRepository";
+import { ImportDataElementSpreadSheetRepository } from "../data/repositories/ImportDataElementSpreadSheetRepository";
+import { OrgUnitD2Repository } from "../data/repositories/OrgUnitD2Repository";
+import { ImportDataElementsUseCase } from "../domain/usecases/ImportDataElementsUseCase";
+import { DataElementD2Repository } from "../data/repositories/DataElementD2Repository";
+import { DataValueD2Repository } from "../data/repositories/DataValueD2Repository";
 
 async function main() {
     const parser = parse({
@@ -14,6 +20,7 @@ async function main() {
             deleteDataValues: { switch: true },
         },
     });
+
     const { opts } = parser(process.argv);
 
     if (!opts.url) return;
@@ -22,8 +29,24 @@ async function main() {
     const { api } = await getApp({ baseUrl: opts.url });
     console.info("Loading config. metadata...");
     const config = await getConfig(api);
-    const compositionRoot = getCompositionRoot(api, config);
-    await compositionRoot.dataElements.import.execute({
+
+    const dataValueRepository = new DataValueD2Repository(api);
+    const dataElementRepository = new DataElementD2Repository(api, config);
+    const importRepository = new ImportDataElementSpreadSheetRepository(api, config);
+    const exportDataElementJsonRepository = new ExportDataElementJsonRepository(api, config);
+    const dataValueExportRepository = new DataValueExportJsonRepository();
+    const orgUnitRepository = new OrgUnitD2Repository(api);
+
+    const importDataElementUseCase = new ImportDataElementsUseCase(
+        importRepository,
+        dataElementRepository,
+        exportDataElementJsonRepository,
+        dataValueRepository,
+        dataValueExportRepository,
+        orgUnitRepository
+    );
+
+    await importDataElementUseCase.execute({
         excelPath: opts.excelPath,
         post: opts.post ?? false,
         export: opts.export ?? false,

From b16e212ce63cbc34a6cd59f08e84347e915ce5ed Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Tue, 19 Nov 2024 12:41:41 -0500
Subject: [PATCH 41/51] check year to validate if report is not available

---
 .../GetIndicatorsValidationUseCase.ts         |  21 ----
 .../usecases/GetProjectsByCountryUseCase.ts   | 118 +++++++++++++++---
 .../CountryIndicatorReport.tsx                |  16 +--
 .../IndicatorReportTable.tsx                  |  11 +-
 4 files changed, 120 insertions(+), 46 deletions(-)

diff --git a/src/domain/usecases/GetIndicatorsValidationUseCase.ts b/src/domain/usecases/GetIndicatorsValidationUseCase.ts
index 11ce6fff..d1c3c468 100644
--- a/src/domain/usecases/GetIndicatorsValidationUseCase.ts
+++ b/src/domain/usecases/GetIndicatorsValidationUseCase.ts
@@ -1,9 +1,7 @@
-import _ from "lodash";
 import i18n from "../../locales";
 import { promiseMap } from "../../migrations/utils";
 import { Config } from "../../models/Config";
 import Project from "../../models/Project";
-import { getYearsFromProject } from "../../pages/project-indicators-validation/ProjectIndicatorsValidation";
 import { DataValue } from "../entities/DataValue";
 import { IndicatorCalculation } from "../entities/IndicatorCalculation";
 import { IndicatorValidation } from "../entities/IndicatorValidation";
@@ -76,25 +74,6 @@ export class GetIndicatorsValidationUseCase {
         return indicatorsWithValues;
     }
 
-    private getPeriodsAndYearsFromProject(project: Project, periods: UniqueBeneficiariesPeriod[]) {
-        const years = getYearsFromProject(
-            project.startDate?.toISOString() || "",
-            project.endDate?.toISOString() || ""
-        );
-        const periodsByYears = _(years)
-            .flatMap(year =>
-                periods.map(period => ({
-                    key: `${year}-${period.id}`,
-                    value: { period, year },
-                }))
-            )
-            .keyBy("key")
-            .mapValues("value")
-            .value();
-
-        return { years, periodsByYears };
-    }
-
     private async setValuesToIndicators(
         period: UniqueBeneficiariesPeriod,
         dataSetId: Id,
diff --git a/src/domain/usecases/GetProjectsByCountryUseCase.ts b/src/domain/usecases/GetProjectsByCountryUseCase.ts
index edad5438..3e37f18c 100644
--- a/src/domain/usecases/GetProjectsByCountryUseCase.ts
+++ b/src/domain/usecases/GetProjectsByCountryUseCase.ts
@@ -1,12 +1,18 @@
 import _ from "lodash";
 import { ProjectForList } from "../../models/ProjectsList";
 import { getYearsFromProject } from "../../pages/project-indicators-validation/ProjectIndicatorsValidation";
+import { Maybe } from "../../types/utils";
 import { getId } from "../../utils/dhis2";
 import { DataElement } from "../entities/DataElement";
 import { IndicatorCalculation } from "../entities/IndicatorCalculation";
-import { IndicatorReport, ProjectIndicatorRow, ProjectRows } from "../entities/IndicatorReport";
+import {
+    IndicatorReport,
+    ProjectCountry,
+    ProjectIndicatorRow,
+    ProjectRows,
+} from "../entities/IndicatorReport";
 import { IndicatorValidation } from "../entities/IndicatorValidation";
-import { Id } from "../entities/Ref";
+import { Id, ISODateTimeString } from "../entities/Ref";
 import { UniqueBeneficiariesPeriod } from "../entities/UniqueBeneficiariesPeriod";
 import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
 import { DataElementRepository } from "../repositories/DataElementRepository";
@@ -80,18 +86,73 @@ export class GetProjectsByCountryUseCase {
             );
 
             return existingData
-                ? existingData
+                ? this.buildExistingReport(existingData, settings, period, year)
                 : IndicatorReport.create({
                       year,
                       countryId,
                       createdAt: "",
                       lastUpdatedAt: "",
                       period,
-                      projects: this.generateProjects(projects, settings, period, dataElements),
+                      projects: this.generateProjects(
+                          projects,
+                          settings,
+                          period,
+                          dataElements,
+                          year
+                      ),
                   });
         });
     }
 
+    private buildExistingReport(
+        indicatorReport: IndicatorReport,
+        settings: UniqueBeneficiariesSettings[],
+        period: UniqueBeneficiariesPeriod,
+        year: number
+    ): IndicatorReport {
+        return IndicatorReport.create({
+            ...indicatorReport,
+            projects: _(indicatorReport.projects)
+                .map(projectIndicator => {
+                    const settingsProject = this.getSettingsProject(
+                        settings,
+                        projectIndicator.project.id
+                    );
+
+                    if (!settingsProject) return undefined;
+
+                    return {
+                        ...projectIndicator,
+                        indicators: projectIndicator.indicators.map(indicator => {
+                            return {
+                                ...indicator,
+                                include: false,
+                                periodNotAvailable: this.isProjectNotAvailable(
+                                    period,
+                                    settingsProject,
+                                    projectIndicator.project,
+                                    year
+                                ),
+                            };
+                        }),
+                    };
+                })
+                .compact()
+                .value(),
+        });
+    }
+
+    private getSettingsProject(
+        settings: UniqueBeneficiariesSettings[],
+        projectId: Id
+    ): Maybe<UniqueBeneficiariesSettings> {
+        const currentSettings = settings.find(setting => setting.projectId === projectId);
+
+        return !currentSettings?.indicatorsIds || currentSettings?.indicatorsIds.length === 0
+            ? undefined
+            : currentSettings;
+    }
+
     private getUniquePeriodsFromSettings(
         settings: UniqueBeneficiariesSettings[]
     ): UniqueBeneficiariesPeriod[] {
@@ -103,22 +164,21 @@ export class GetProjectsByCountryUseCase {
         projectsByPeriod: ProjectForList[],
         settings: UniqueBeneficiariesSettings[],
         period: UniqueBeneficiariesPeriod,
-        dataElements: DataElement[]
+        dataElements: DataElement[],
+        year: number
     ): ProjectRows[] {
         return _(projectsByPeriod)
             .map(project => {
-                const settingsProject = settings.find(setting => setting.projectId === project.id);
+                const settingsProject = this.getSettingsProject(settings, project.id);
+                if (!settingsProject) return undefined;
 
-                if (!settingsProject?.indicatorsIds || settingsProject.indicatorsIds.length === 0)
-                    return undefined;
-
-                const isCustomPeriod = period.type === "CUSTOM";
-                const periodExist = settingsProject?.periods.find(item =>
-                    period.equalMonths(item.startDateMonth, item.endDateMonth)
+                const notIndicatorsAvailable = this.isProjectNotAvailable(
+                    period,
+                    settingsProject,
+                    project,
+                    year
                 );
 
-                const notIndicatorsAvailable = isCustomPeriod && !periodExist;
-
                 const indicatorsCalculation = settingsProject?.indicatorsValidation
                     .find(item =>
                         period.equalMonths(item.period.startDateMonth, item.period.endDateMonth)
@@ -157,6 +217,36 @@ export class GetProjectsByCountryUseCase {
             .value();
     }
 
+    private isProjectNotAvailable(
+        period: UniqueBeneficiariesPeriod,
+        settings: UniqueBeneficiariesSettings,
+        project: ProjectCountry,
+        year: number
+    ): boolean {
+        const isCustomPeriod = period.type === "CUSTOM";
+        const periodExist = settings.periods.find(item =>
+            period.equalMonths(item.startDateMonth, item.endDateMonth)
+        );
+
+        const projectIsInYear = this.checkProjectDateIsInYear(
+            project.openingDate,
+            project.closedDate,
+            year
+        );
+
+        return isCustomPeriod ? !periodExist || !projectIsInYear : false;
+    }
+
+    private checkProjectDateIsInYear(
+        startDate: ISODateTimeString,
+        endDate: ISODateTimeString,
+        year: number
+    ): boolean {
+        const start = new Date(startDate);
+        const end = new Date(endDate);
+        return year >= start.getFullYear() && year <= end.getFullYear();
+    }
+
     private async buildSettingsWithIndicators(
         settings: UniqueBeneficiariesSettings[],
         dataElements: DataElement[]
diff --git a/src/pages/country-indicator-report/CountryIndicatorReport.tsx b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
index 9f8014ef..5387e3d1 100644
--- a/src/pages/country-indicator-report/CountryIndicatorReport.tsx
+++ b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
@@ -121,19 +121,19 @@ export const CountryIndicatorReport = React.memo(() => {
                 </Grid>
                 <Grid item>
                     <Dropdown
-                        items={mapItemsToDropdown(getAllPeriods(indicatorsReports))}
-                        onChange={updatePeriod}
-                        label={i18n.t("Select period")}
-                        value={selectedPeriod?.id}
+                        items={years}
+                        onChange={updateYear}
+                        label={i18n.t("Select Year")}
+                        value={year?.toString()}
                         hideEmpty
                     />
                 </Grid>
                 <Grid item>
                     <Dropdown
-                        items={years}
-                        onChange={updateYear}
-                        label={i18n.t("Select Year")}
-                        value={year?.toString()}
+                        items={mapItemsToDropdown(getAllPeriods(indicatorsReports))}
+                        onChange={updatePeriod}
+                        label={i18n.t("Select period")}
+                        value={selectedPeriod?.id}
                         hideEmpty
                     />
                 </Grid>
diff --git a/src/pages/country-indicator-report/IndicatorReportTable.tsx b/src/pages/country-indicator-report/IndicatorReportTable.tsx
index 78edb0ec..2e023564 100644
--- a/src/pages/country-indicator-report/IndicatorReportTable.tsx
+++ b/src/pages/country-indicator-report/IndicatorReportTable.tsx
@@ -115,13 +115,14 @@ const ProjectCell = (props: ProjectCellProps) => {
     const { period, rowSpan, row, settings } = props;
 
     const currentPeriod = getCurrentPeriodForProject(settings, row.project.id, period);
+    const periodName = `Period: ${currentPeriod?.name || getNotAvailableText()}`;
 
     return (
         <TableCell rowSpan={rowSpan}>
             {row.project.name} <br /> ({buildMonthYearFormatDate(row.project.openingDate)} -{" "}
             {buildMonthYearFormatDate(row.project.closedDate)})
             <br />
-            Period: {currentPeriod?.name || i18n.t("N/A")}
+            {row.periodNotAvailable ? getNotAvailableText() : periodName}
         </TableCell>
     );
 };
@@ -129,13 +130,13 @@ const ProjectCell = (props: ProjectCellProps) => {
 const TotalCell: RowComponent<GroupedRows> = props => {
     return (
         <TableCell rowSpan={props.rowSpan}>
-            {props.row.periodNotAvailable ? i18n.t("N/A") : props.row.total}
+            {props.row.periodNotAvailable ? getNotAvailableText() : props.row.total}
         </TableCell>
     );
 };
 
 const IndicatorCell = (props: IndicatorCellProps) => {
-    const notAvailableText = i18n.t("N/A");
+    const notAvailableText = getNotAvailableText();
     const isPeriodNotAvailable = props.row.periodNotAvailable;
 
     return (
@@ -195,3 +196,7 @@ export function getCurrentPeriodForProject(
     );
     return currentPeriod;
 }
+
+function getNotAvailableText() {
+    return i18n.t("N/A");
+}

From 47e000931d2f04cdf78f433334d8b6c6a5e646a2 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Tue, 19 Nov 2024 12:42:22 -0500
Subject: [PATCH 42/51] update i18n

---
 i18n/en.pot | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 620156f4..1d91140c 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-18T23:17:59.995Z\n"
-"PO-Revision-Date: 2024-11-18T23:17:59.995Z\n"
+"POT-Creation-Date: 2024-11-19T17:41:51.262Z\n"
+"PO-Revision-Date: 2024-11-19T17:41:51.262Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -885,10 +885,10 @@ msgstr ""
 msgid "Country Project & Indicators"
 msgstr ""
 
-msgid "Select period"
+msgid "Select Year"
 msgstr ""
 
-msgid "Select Year"
+msgid "Select period"
 msgstr ""
 
 msgid "No projects found for selected period: {{period}}"

From 5139248bfee139b5f13d8220b1470adf83656c5d Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Tue, 19 Nov 2024 12:50:00 -0500
Subject: [PATCH 43/51] include year in excel filename

---
 .../CountryIndicatorReport.tsx                         |  3 ++-
 src/pages/country-indicator-report/excel-report.ts     | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages/country-indicator-report/CountryIndicatorReport.tsx b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
index 5387e3d1..d75ee92e 100644
--- a/src/pages/country-indicator-report/CountryIndicatorReport.tsx
+++ b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
@@ -84,12 +84,13 @@ export const CountryIndicatorReport = React.memo(() => {
             : undefined;
 
     const downloadReport = () => {
-        if (indicatorReport && orgUnit && selectedPeriod) {
+        if (indicatorReport && orgUnit && selectedPeriod && year) {
             buildSpreadSheet({
                 indicatorReport,
                 countryName: orgUnit.displayName,
                 period: selectedPeriod,
                 settings,
+                year,
             }).then(downloadFile);
         }
     };
diff --git a/src/pages/country-indicator-report/excel-report.ts b/src/pages/country-indicator-report/excel-report.ts
index 062b1504..9da3f24d 100644
--- a/src/pages/country-indicator-report/excel-report.ts
+++ b/src/pages/country-indicator-report/excel-report.ts
@@ -12,24 +12,26 @@ type SpreadSheetOptions = {
     countryName: string;
     settings: UniqueBeneficiariesSettings[];
     period: UniqueBeneficiariesPeriod;
+    year: number;
 };
 
 export async function buildSpreadSheet(options: SpreadSheetOptions) {
-    const { indicatorReport, countryName } = options;
+    const { indicatorReport, countryName, year } = options;
     const workbook = new ExcelJS.Workbook();
     const sheet = workbook.addWorksheet(i18n.t("Country Projects & Indicators"));
     sheet.columns = generateColumns();
     generateRows(options, sheet);
-    return generateFileInBuffer(workbook, countryName, indicatorReport);
+    return generateFileInBuffer(workbook, countryName, indicatorReport, year);
 }
 
 async function generateFileInBuffer(
     workbook: ExcelJS.Workbook,
     countryName: string,
-    indicatorReport: IndicatorReport
+    indicatorReport: IndicatorReport,
+    year: number
 ) {
     const buffer = await workbook.xlsx.writeBuffer();
-    const filename = `${countryName.toLowerCase()}_${indicatorReport.period.name.toLowerCase()}_report.xlsx`;
+    const filename = `${countryName.toLowerCase()}_${indicatorReport.period.name.toLowerCase()}_${year}_report.xlsx`;
     return { buffer, filename };
 }
 

From ed34876dbe899795bd879ab1e4f6e7002d329ab3 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Wed, 20 Nov 2024 08:38:02 -0500
Subject: [PATCH 44/51] get values for ub report by year and fix period
 validation

---
 .../usecases/GetProjectsByCountryUseCase.ts   | 96 +++++++------------
 1 file changed, 35 insertions(+), 61 deletions(-)

diff --git a/src/domain/usecases/GetProjectsByCountryUseCase.ts b/src/domain/usecases/GetProjectsByCountryUseCase.ts
index 3e37f18c..20a58559 100644
--- a/src/domain/usecases/GetProjectsByCountryUseCase.ts
+++ b/src/domain/usecases/GetProjectsByCountryUseCase.ts
@@ -85,60 +85,21 @@ export class GetProjectsByCountryUseCase {
                     report.countryId === countryId
             );
 
-            return existingData
-                ? this.buildExistingReport(existingData, settings, period, year)
-                : IndicatorReport.create({
-                      year,
-                      countryId,
-                      createdAt: "",
-                      lastUpdatedAt: "",
-                      period,
-                      projects: this.generateProjects(
-                          projects,
-                          settings,
-                          period,
-                          dataElements,
-                          year
-                      ),
-                  });
-        });
-    }
-
-    private buildExistingReport(
-        indicatorReport: IndicatorReport,
-        settings: UniqueBeneficiariesSettings[],
-        period: UniqueBeneficiariesPeriod,
-        year: number
-    ): IndicatorReport {
-        return IndicatorReport.create({
-            ...indicatorReport,
-            projects: _(indicatorReport.projects)
-                .map(projectIndicator => {
-                    const settingsProject = this.getSettingsProject(
-                        settings,
-                        projectIndicator.project.id
-                    );
-
-                    if (!settingsProject) return undefined;
-
-                    return {
-                        ...projectIndicator,
-                        indicators: projectIndicator.indicators.map(indicator => {
-                            return {
-                                ...indicator,
-                                include: false,
-                                periodNotAvailable: this.isProjectNotAvailable(
-                                    period,
-                                    settingsProject,
-                                    projectIndicator.project,
-                                    year
-                                ),
-                            };
-                        }),
-                    };
-                })
-                .compact()
-                .value(),
+            return IndicatorReport.create({
+                year,
+                countryId,
+                createdAt: existingData?.createdAt || "",
+                lastUpdatedAt: existingData?.lastUpdatedAt || "",
+                period,
+                projects: this.generateProjects(
+                    projects,
+                    settings,
+                    period,
+                    dataElements,
+                    year,
+                    existingData
+                ),
+            });
         });
     }
 
@@ -165,10 +126,14 @@ export class GetProjectsByCountryUseCase {
         settings: UniqueBeneficiariesSettings[],
         period: UniqueBeneficiariesPeriod,
         dataElements: DataElement[],
-        year: number
+        year: number,
+        existingRecord: Maybe<IndicatorReport>
     ): ProjectRows[] {
         return _(projectsByPeriod)
             .map(project => {
+                const existingProject = existingRecord?.projects.find(
+                    item => item.id === project.id
+                );
                 const settingsProject = this.getSettingsProject(settings, project.id);
                 if (!settingsProject) return undefined;
 
@@ -180,13 +145,20 @@ export class GetProjectsByCountryUseCase {
                 );
 
                 const indicatorsCalculation = settingsProject?.indicatorsValidation
-                    .find(item =>
-                        period.equalMonths(item.period.startDateMonth, item.period.endDateMonth)
+                    .find(
+                        item =>
+                            period.equalMonths(
+                                item.period.startDateMonth,
+                                item.period.endDateMonth
+                            ) && item.year === year
                     )
                     ?.indicatorsCalculation.map((indicator): ProjectIndicatorRow => {
+                        const existingIndicator = existingProject?.indicators.find(
+                            item => item.indicatorId === indicator.id
+                        );
                         return {
                             periodNotAvailable: notIndicatorsAvailable,
-                            include: false,
+                            include: existingIndicator?.include || false,
                             indicatorCode: indicator.code || "",
                             indicatorName: indicator.name || "",
                             indicatorId: indicator.id,
@@ -201,13 +173,16 @@ export class GetProjectsByCountryUseCase {
                               const dataElementDetails = dataElements.find(
                                   dataElement => dataElement.id === indicatorId
                               );
+                              const existingIndicator = existingProject?.indicators.find(
+                                  item => item.indicatorId === indicatorId
+                              );
                               return {
                                   periodNotAvailable: notIndicatorsAvailable,
                                   indicatorId,
                                   indicatorCode: dataElementDetails?.code || "",
                                   indicatorName: dataElementDetails?.name || "",
                                   value: 0,
-                                  include: false,
+                                  include: existingIndicator?.include || false,
                               };
                           });
 
@@ -223,7 +198,6 @@ export class GetProjectsByCountryUseCase {
         project: ProjectCountry,
         year: number
     ): boolean {
-        const isCustomPeriod = period.type === "CUSTOM";
         const periodExist = settings.periods.find(item =>
             period.equalMonths(item.startDateMonth, item.endDateMonth)
         );
@@ -234,7 +208,7 @@ export class GetProjectsByCountryUseCase {
             year
         );
 
-        return isCustomPeriod ? !periodExist || !projectIsInYear : false;
+        return !periodExist || !projectIsInYear;
     }
 
     private checkProjectDateIsInYear(

From fc473dcc98a0aef9e954ede6b57110ce8e832a8f Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Wed, 20 Nov 2024 09:51:12 -0500
Subject: [PATCH 45/51] update titles in project wizard

---
 i18n/en.pot                                | 11 ++++-------
 src/pages/project-wizard/ProjectWizard.tsx |  6 +++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 1d91140c..2dd19b3e 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-19T17:41:51.262Z\n"
-"PO-Revision-Date: 2024-11-19T17:41:51.262Z\n"
+"POT-Creation-Date: 2024-11-20T14:50:17.120Z\n"
+"PO-Revision-Date: 2024-11-20T14:50:17.120Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -1063,13 +1063,10 @@ msgstr ""
 msgid "Country & Project Locations"
 msgstr ""
 
-msgid "Selection of Indicators"
+msgid "Indicators"
 msgstr ""
 
-msgid "Selection of MER Indicators"
-msgstr ""
-
-msgid "Select of Unique Indicators"
+msgid "MER Indicators"
 msgstr ""
 
 msgid "Username Access"
diff --git a/src/pages/project-wizard/ProjectWizard.tsx b/src/pages/project-wizard/ProjectWizard.tsx
index b8a2373d..106fc880 100644
--- a/src/pages/project-wizard/ProjectWizard.tsx
+++ b/src/pages/project-wizard/ProjectWizard.tsx
@@ -151,7 +151,7 @@ class ProjectWizardImpl extends React.Component<Props, State> {
             },
             {
                 key: "indicators",
-                label: i18n.t("Selection of Indicators"),
+                label: i18n.t("Indicators"),
                 component: DataElementsSelectionStep,
                 validationKeys: ["dataElementsSelection"],
                 help: helpTexts.indicators,
@@ -167,14 +167,14 @@ class ProjectWizardImpl extends React.Component<Props, State> {
                 : null,
             {
                 key: "mer-indicators",
-                label: i18n.t("Selection of MER Indicators"),
+                label: i18n.t("MER Indicators"),
                 component: MerSelectionStep,
                 validationKeys: ["dataElementsMER"],
                 help: helpTexts.merIndicators,
             },
             {
                 key: "unique-beneficiaries",
-                label: i18n.t("Select of Unique Indicators"),
+                label: i18n.t("Unique Indicators"),
                 component: UniqueIndicatorsStep,
                 validationKeys: ["uniqueIndicators"],
                 help: helpTexts.uniqueIndicators,

From d3b043decf97b27df3194eaf9a0f430a3e8bafe6 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Wed, 20 Nov 2024 10:07:01 -0500
Subject: [PATCH 46/51] show warning message for cloning projects

---
 i18n/en.pot                                | 12 ++++++++++--
 src/pages/project-wizard/ProjectWizard.tsx | 17 +++++++++++++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 2dd19b3e..c540a012 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-20T14:50:17.120Z\n"
-"PO-Revision-Date: 2024-11-20T14:50:17.120Z\n"
+"POT-Creation-Date: 2024-11-20T15:06:33.223Z\n"
+"PO-Revision-Date: 2024-11-20T15:06:33.223Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -1095,6 +1095,14 @@ msgstr ""
 msgid "New project"
 msgstr ""
 
+msgid ""
+"Please review all prefilled information including Project numbers and dates "
+"which MUST be updated."
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
 msgid ""
 "- Starred (*) items are required to be filled out\n"
 "        - Award Number- refers to the first 5 digits of the project’s award "
diff --git a/src/pages/project-wizard/ProjectWizard.tsx b/src/pages/project-wizard/ProjectWizard.tsx
index 106fc880..86cd2c6f 100644
--- a/src/pages/project-wizard/ProjectWizard.tsx
+++ b/src/pages/project-wizard/ProjectWizard.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { useLocation } from "react-router";
 import _ from "lodash";
-import { Wizard, useSnackbar } from "@eyeseetea/d2-ui-components";
+import { Wizard, useSnackbar, ConfirmationDialog } from "@eyeseetea/d2-ui-components";
 import { LinearProgress } from "@material-ui/core";
 import { Location } from "history";
 
@@ -57,6 +57,7 @@ interface State {
     project: Project | undefined;
     dialogOpen: boolean;
     isUpdated: boolean;
+    showCloneWarning: boolean;
 }
 
 interface Step {
@@ -74,6 +75,7 @@ class ProjectWizardImpl extends React.Component<Props, State> {
         project: undefined,
         dialogOpen: false,
         isUpdated: false,
+        showCloneWarning: true,
     };
 
     async componentDidMount() {
@@ -252,7 +254,7 @@ class ProjectWizardImpl extends React.Component<Props, State> {
     };
 
     render() {
-        const { project, dialogOpen } = this.state;
+        const { project, dialogOpen, showCloneWarning } = this.state;
         const { api, location, action } = this.props;
         if (project) Object.assign(window, { project, Project });
 
@@ -285,6 +287,17 @@ class ProjectWizardImpl extends React.Component<Props, State> {
                     title={`${title}: ${project ? project.name : i18n.t("Loading...")}`}
                     onBackClick={this.cancelSave}
                 />
+
+                <ConfirmationDialog
+                    open={action.type === "clone" && Boolean(project) && showCloneWarning}
+                    title={`${title}: ${project ? project.name : ""}`}
+                    description={i18n.t(
+                        "Please review all prefilled information including Project numbers and dates which MUST be updated."
+                    )}
+                    saveText={i18n.t("OK")}
+                    onSave={() => this.setState({ showCloneWarning: false })}
+                />
+
                 {project ? (
                     <Wizard
                         steps={steps}

From c2a876f0560d9124d746c49500281a54a11bbd03 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Thu, 21 Nov 2024 09:40:36 -0500
Subject: [PATCH 47/51] hide reports in unique beneficiaries report

---
 .../IndicatorReportTable.tsx                  | 45 +++++++++++--------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/pages/country-indicator-report/IndicatorReportTable.tsx b/src/pages/country-indicator-report/IndicatorReportTable.tsx
index 2e023564..810d7ef6 100644
--- a/src/pages/country-indicator-report/IndicatorReportTable.tsx
+++ b/src/pages/country-indicator-report/IndicatorReportTable.tsx
@@ -18,6 +18,7 @@ import TableBodyGrouped from "../report/TableBodyGrouped";
 import { buildMonthYearFormatDate } from "../../utils/date";
 import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
 import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
+import { Maybe } from "../../types/utils";
 
 type IndicatorReportTableProps = {
     period: UniqueBeneficiariesPeriod;
@@ -59,24 +60,7 @@ export const IndicatorReportTable = React.memo((props: IndicatorReportTableProps
         ];
     }, [onRowChange, period, settings]);
 
-    const indicatorsRows = report.projects.flatMap(project => {
-        const sumIndicators = _(project.indicators)
-            .filter(indicator => indicator.include)
-            .sumBy(indicator => indicator.value || 0);
-        const allIndicators = project.indicators.map((indicator): GroupedRows => {
-            return {
-                id: indicator.indicatorId,
-                code: indicator.indicatorCode || "",
-                name: indicator.indicatorName,
-                value: indicator.value || 0,
-                include: indicator.include,
-                total: sumIndicators,
-                project: project.project,
-                periodNotAvailable: indicator.periodNotAvailable,
-            };
-        });
-        return allIndicators;
-    });
+    const indicatorsRows = generateRows(report);
 
     return (
         <Paper>
@@ -185,6 +169,31 @@ type ProjectCellProps = {
     settings: UniqueBeneficiariesSettings[];
 };
 
+function generateRows(report: IndicatorReportAttrs): GroupedRows[] {
+    return report.projects.flatMap(project => {
+        const sumIndicators = _(project.indicators)
+            .filter(indicator => indicator.include)
+            .sumBy(indicator => indicator.value || 0);
+        const allIndicators = _(project.indicators)
+            .map((indicator): Maybe<GroupedRows> => {
+                if (indicator.periodNotAvailable) return undefined;
+                return {
+                    id: indicator.indicatorId,
+                    code: indicator.indicatorCode || "",
+                    name: indicator.indicatorName,
+                    value: indicator.value || 0,
+                    include: indicator.include,
+                    total: sumIndicators,
+                    project: project.project,
+                    periodNotAvailable: indicator.periodNotAvailable,
+                };
+            })
+            .compact()
+            .value();
+        return allIndicators.length ? allIndicators : [];
+    });
+}
+
 export function getCurrentPeriodForProject(
     settings: UniqueBeneficiariesSettings[],
     projectId: Id,

From 971e4aaae816810ffc4a2ed263dd739bc614cc42 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Thu, 21 Nov 2024 10:26:03 -0500
Subject: [PATCH 48/51] filter reports by year

---
 .../usecases/GetProjectsByCountryUseCase.ts   | 15 ++-----
 src/models/Project.ts                         | 11 +++++
 .../CountryIndicatorReport.tsx                |  1 +
 .../IndicatorReportTable.tsx                  | 45 ++++++++++---------
 4 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/src/domain/usecases/GetProjectsByCountryUseCase.ts b/src/domain/usecases/GetProjectsByCountryUseCase.ts
index 20a58559..9e17d3ba 100644
--- a/src/domain/usecases/GetProjectsByCountryUseCase.ts
+++ b/src/domain/usecases/GetProjectsByCountryUseCase.ts
@@ -1,4 +1,5 @@
 import _ from "lodash";
+import { checkProjectDateIsInYear } from "../../models/Project";
 import { ProjectForList } from "../../models/ProjectsList";
 import { getYearsFromProject } from "../../pages/project-indicators-validation/ProjectIndicatorsValidation";
 import { Maybe } from "../../types/utils";
@@ -12,7 +13,7 @@ import {
     ProjectRows,
 } from "../entities/IndicatorReport";
 import { IndicatorValidation } from "../entities/IndicatorValidation";
-import { Id, ISODateTimeString } from "../entities/Ref";
+import { Id } from "../entities/Ref";
 import { UniqueBeneficiariesPeriod } from "../entities/UniqueBeneficiariesPeriod";
 import { UniqueBeneficiariesSettings } from "../entities/UniqueBeneficiariesSettings";
 import { DataElementRepository } from "../repositories/DataElementRepository";
@@ -202,7 +203,7 @@ export class GetProjectsByCountryUseCase {
             period.equalMonths(item.startDateMonth, item.endDateMonth)
         );
 
-        const projectIsInYear = this.checkProjectDateIsInYear(
+        const projectIsInYear = checkProjectDateIsInYear(
             project.openingDate,
             project.closedDate,
             year
@@ -211,16 +212,6 @@ export class GetProjectsByCountryUseCase {
         return !periodExist || !projectIsInYear;
     }
 
-    private checkProjectDateIsInYear(
-        startDate: ISODateTimeString,
-        endDate: ISODateTimeString,
-        year: number
-    ): boolean {
-        const start = new Date(startDate);
-        const end = new Date(endDate);
-        return year >= start.getFullYear() && year <= end.getFullYear();
-    }
-
     private async buildSettingsWithIndicators(
         settings: UniqueBeneficiariesSettings[],
         dataElements: DataElement[]
diff --git a/src/models/Project.ts b/src/models/Project.ts
index e40c15d5..4d885074 100644
--- a/src/models/Project.ts
+++ b/src/models/Project.ts
@@ -29,6 +29,7 @@ import { ProjectInfo } from "./ProjectInfo";
 import { isTest } from "../utils/testing";
 import { MAX_SIZE_PROJECT_IN_MB, ProjectDocument } from "./ProjectDocument";
 import { promiseMap } from "../migrations/utils";
+import { ISODateTimeString } from "../domain/entities/Ref";
 
 /*
 Project model.
@@ -807,6 +808,16 @@ export function getPeriodsData(dataSet: DataSet) {
     return { periodIds, currentPeriodId };
 }
 
+export function checkProjectDateIsInYear(
+    startDate: ISODateTimeString,
+    endDate: ISODateTimeString,
+    year: number
+): boolean {
+    const start = new Date(startDate);
+    const end = new Date(endDate);
+    return year >= start.getFullYear() && year <= end.getFullYear();
+}
+
 export type DataElementInfo = {
     dataElement: DataElement;
     isMER: boolean;
diff --git a/src/pages/country-indicator-report/CountryIndicatorReport.tsx b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
index d75ee92e..fe0c77ef 100644
--- a/src/pages/country-indicator-report/CountryIndicatorReport.tsx
+++ b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
@@ -146,6 +146,7 @@ export const CountryIndicatorReport = React.memo(() => {
                                 onRowChange={updateReport}
                                 period={selectedPeriod}
                                 settings={settings}
+                                year={year}
                             />
                         </Grid>
                         <Grid item>
diff --git a/src/pages/country-indicator-report/IndicatorReportTable.tsx b/src/pages/country-indicator-report/IndicatorReportTable.tsx
index 810d7ef6..1009e7cc 100644
--- a/src/pages/country-indicator-report/IndicatorReportTable.tsx
+++ b/src/pages/country-indicator-report/IndicatorReportTable.tsx
@@ -18,17 +18,18 @@ import TableBodyGrouped from "../report/TableBodyGrouped";
 import { buildMonthYearFormatDate } from "../../utils/date";
 import { UniqueBeneficiariesPeriod } from "../../domain/entities/UniqueBeneficiariesPeriod";
 import { UniqueBeneficiariesSettings } from "../../domain/entities/UniqueBeneficiariesSettings";
-import { Maybe } from "../../types/utils";
+import { checkProjectDateIsInYear } from "../../models/Project";
 
 type IndicatorReportTableProps = {
     period: UniqueBeneficiariesPeriod;
     settings: UniqueBeneficiariesSettings[];
     report: IndicatorReportAttrs;
     onRowChange: (value: boolean, row: GroupedRows) => void;
+    year: number;
 };
 
 export const IndicatorReportTable = React.memo((props: IndicatorReportTableProps) => {
-    const { onRowChange, period, report, settings } = props;
+    const { onRowChange, period, report, settings, year } = props;
     const groupers: Grouper<GroupedRows>[] = React.useMemo(() => {
         return [
             {
@@ -60,7 +61,7 @@ export const IndicatorReportTable = React.memo((props: IndicatorReportTableProps
         ];
     }, [onRowChange, period, settings]);
 
-    const indicatorsRows = generateRows(report);
+    const indicatorsRows = generateRows(report, year);
 
     return (
         <Paper>
@@ -169,28 +170,30 @@ type ProjectCellProps = {
     settings: UniqueBeneficiariesSettings[];
 };
 
-function generateRows(report: IndicatorReportAttrs): GroupedRows[] {
+function generateRows(report: IndicatorReportAttrs, year: number): GroupedRows[] {
     return report.projects.flatMap(project => {
         const sumIndicators = _(project.indicators)
             .filter(indicator => indicator.include)
             .sumBy(indicator => indicator.value || 0);
-        const allIndicators = _(project.indicators)
-            .map((indicator): Maybe<GroupedRows> => {
-                if (indicator.periodNotAvailable) return undefined;
-                return {
-                    id: indicator.indicatorId,
-                    code: indicator.indicatorCode || "",
-                    name: indicator.indicatorName,
-                    value: indicator.value || 0,
-                    include: indicator.include,
-                    total: sumIndicators,
-                    project: project.project,
-                    periodNotAvailable: indicator.periodNotAvailable,
-                };
-            })
-            .compact()
-            .value();
-        return allIndicators.length ? allIndicators : [];
+
+        if (
+            !checkProjectDateIsInYear(project.project.openingDate, project.project.closedDate, year)
+        )
+            return [];
+
+        const allIndicators = project.indicators.map((indicator): GroupedRows => {
+            return {
+                id: indicator.indicatorId,
+                code: indicator.indicatorCode || "",
+                name: indicator.indicatorName,
+                value: indicator.value || 0,
+                include: indicator.include,
+                total: sumIndicators,
+                project: project.project,
+                periodNotAvailable: indicator.periodNotAvailable,
+            };
+        });
+        return allIndicators;
     });
 }
 

From dc01705e8baebb8bd88973d13c5d21bf2ac3895e Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Wed, 11 Dec 2024 09:02:45 -0500
Subject: [PATCH 49/51] show non active projects in UB report

---
 src/data/common/D2ApiProject.ts               |  2 +-
 .../IndicatorValidationTable.tsx              | 31 ++++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/data/common/D2ApiProject.ts b/src/data/common/D2ApiProject.ts
index 62a1f6b3..71fc5e73 100644
--- a/src/data/common/D2ApiProject.ts
+++ b/src/data/common/D2ApiProject.ts
@@ -55,7 +55,7 @@ export class D2ApiProject {
         return Project.getList(
             this.api,
             this.config,
-            { countryIds: [countryId], onlyActive: true },
+            { countryIds: [countryId] },
             { field: "created", order: "desc" },
             { page: page, pageSize: 50 }
         );
diff --git a/src/pages/project-indicators-validation/IndicatorValidationTable.tsx b/src/pages/project-indicators-validation/IndicatorValidationTable.tsx
index 2ac0dc8b..847602da 100644
--- a/src/pages/project-indicators-validation/IndicatorValidationTable.tsx
+++ b/src/pages/project-indicators-validation/IndicatorValidationTable.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { TextField, Tooltip, Typography } from "@material-ui/core";
-import { ObjectsTable, TableConfig, useObjectsTable } from "@eyeseetea/d2-ui-components";
+import { ObjectsTable, TableConfig } from "@eyeseetea/d2-ui-components";
 
 import {
     IndicatorCalculation,
@@ -16,7 +16,7 @@ export type IndicatorValidationTableProps = {
 
 type IndicatorCalculationColumns = IndicatorCalculationAttrs & { total: number };
 
-export const IndicatorValidationTable = (props: IndicatorValidationTableProps) => {
+export const IndicatorValidationTable = React.memo((props: IndicatorValidationTableProps) => {
     const { data, onRowChange } = props;
 
     const previousValueLabel = i18n.t("Previous Value");
@@ -32,7 +32,9 @@ export const IndicatorValidationTable = (props: IndicatorValidationTableProps) =
                     sortable: false,
                     getValue(row) {
                         const hasChanged = IndicatorCalculation.hasChanged(row);
-                        const tooltipTitle = `${previousValueLabel}: ${row.previousValue} -> ${nextValueLabel}: ${row.nextValue}`;
+                        const tooltipTitle = `${previousValueLabel}: ${
+                            row.previousValue ?? i18n.t("Blank")
+                        } -> ${nextValueLabel}: ${row.nextValue}`;
                         return (
                             <Tooltip title={hasChanged ? tooltipTitle : ""}>
                                 <Typography color={hasChanged ? "secondary" : "initial"}>
@@ -122,18 +124,19 @@ export const IndicatorValidationTable = (props: IndicatorValidationTableProps) =
         };
     }, [data, nextValueLabel, previousValueLabel, onRowChange]);
 
-    const tableConfig = useObjectsTable<IndicatorCalculationColumns>(
-        config,
-        React.useCallback(() => {
-            return Promise.resolve({
-                objects: mapCalculationToTableRows(data),
-                pager: { page: 1, pageCount: 1, total: data.length, pageSize: data.length },
-            });
-        }, [data])
-    );
+    const rows = mapCalculationToTableRows(data);
 
-    return <ObjectsTable {...tableConfig} onChangeSearch={undefined} />;
-};
+    return (
+        <ObjectsTable
+            columns={config.columns}
+            actions={config.actions}
+            sorting={config.initialSorting}
+            paginationOptions={config.paginationOptions}
+            rows={rows}
+            onChangeSearch={undefined}
+        />
+    );
+});
 
 function mapCalculationToTableRows(data: IndicatorCalculation[]): IndicatorCalculationColumns[] {
     return data.map(item => ({

From fe28205b22c64702e91ea177c1b000168f99bcd0 Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Wed, 11 Dec 2024 09:03:21 -0500
Subject: [PATCH 50/51] update i18n

---
 i18n/en.pot | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index c540a012..0209b1fc 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-11-20T15:06:33.223Z\n"
-"PO-Revision-Date: 2024-11-20T15:06:33.223Z\n"
+"POT-Creation-Date: 2024-12-11T14:02:52.077Z\n"
+"PO-Revision-Date: 2024-12-11T14:02:52.077Z\n"
 
 msgid "Validating Project"
 msgstr ""
@@ -1027,6 +1027,9 @@ msgstr ""
 msgid "Next Value"
 msgstr ""
 
+msgid "Blank"
+msgstr ""
+
 msgid "Editable New"
 msgstr ""
 

From cfcd8f10ffda7ffa7cf981494b83d6abfc74cfdd Mon Sep 17 00:00:00 2001
From: Eduardo Peredo Rivero <jrperedo@gmail.com>
Date: Thu, 12 Dec 2024 06:18:05 -0500
Subject: [PATCH 51/51] order years in unique beneficiaries report

---
 .../country-indicator-report/CountryIndicatorReport.tsx      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/country-indicator-report/CountryIndicatorReport.tsx b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
index fe0c77ef..3a535fb4 100644
--- a/src/pages/country-indicator-report/CountryIndicatorReport.tsx
+++ b/src/pages/country-indicator-report/CountryIndicatorReport.tsx
@@ -218,7 +218,10 @@ function getUniqueYearsFromProjects(indicatorsReports: IndicatorReport[]): numbe
 
 function mapYearsToItems(indicatorsReports: IndicatorReport[]): DropdownItem[] {
     const years = getUniqueYearsFromProjects(indicatorsReports);
-    return years.map(year => ({ text: year.toString(), value: year.toString() }));
+    return _(years)
+        .map(year => ({ text: year.toString(), value: year.toString() }))
+        .orderBy(item => item.text, "desc")
+        .value();
 }
 
 function getAllPeriods(indicatorsReports: IndicatorReport[]): UniqueBeneficiariesPeriod[] {