add multi text support

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: 2025-08-27T03:27:08.033Z\n"
-"PO-Revision-Date: 2025-08-27T03:27:08.033Z\n"
+"POT-Creation-Date: 2025-09-13T17:01:13.807Z\n"
+"PO-Revision-Date: 2025-09-13T17:01:13.807Z\n"
 
 msgid "<No value>"
 msgstr ""
@@ -44,6 +44,9 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+msgid "Totals"
+msgstr ""
+
 msgid "Occupation"
 msgstr ""
 

i18n/es.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2025-08-27T03:27:08.033Z\n"
+"POT-Creation-Date: 2025-09-13T17:01:13.807Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,6 +44,9 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+msgid "Totals"
+msgstr ""
+
 msgid "Occupation"
 msgstr "Ocupación"
 

i18n/fr.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2025-08-27T03:27:08.033Z\n"
+"POT-Creation-Date: 2025-09-13T17:01:13.807Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,6 +44,9 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
+msgid "Totals"
+msgstr ""
+
 msgid "Occupation"
 msgstr "Profession"
 

src/data/common/Dhis2DataElement.ts

@@ -46,6 +46,7 @@ const dataElementFields = {
         categories: {
             id: true,
             name: true,
+            code: true,
             categoryOptions: {
                 id: true,
                 code: true,
@@ -75,7 +76,13 @@ type D2DataElement = MetadataPick<{
     dataElements: { fields: typeof dataElementFields };
 }>["dataElements"][number];
 
-function makeCocOrderArray(namesArray: string[][]): string[] {
+type D2DataElementTypes = D2DataElement["valueType"] | "MULTI_TEXT";
+
+type D2DataElementNewType = Omit<D2DataElement, "valueType"> & {
+    valueType: D2DataElementTypes;
+};
+
+export function makeCocOrderArray(namesArray: string[][]): string[] {
     return namesArray.reduce((prev, current) => {
         return prev
             .map(prevValue => {
@@ -90,6 +97,7 @@ function makeCocOrderArray(namesArray: string[][]): string[] {
 }
 
 function getCocOrdered(categoryCombo: D2DataElement["categoryCombo"], config: Dhis2DataStoreDataForm) {
+    const keyName = config.categoryCombinationsConfig[categoryCombo.code]?.viewType || "formName";
     const allCategoryOptions = categoryCombo.categories
         .map(c => {
             return c.categoryOptions.flatMap(co => ({
@@ -113,9 +121,13 @@ function getCocOrdered(categoryCombo: D2DataElement["categoryCombo"], config: Dh
             return coc.name === cocOrdered;
         });
 
-        const optionsNames = match?.categoryOptions.map(co => co.displayName);
-        const optionsShortNames = match?.categoryOptions.map(co => co.displayShortName);
-        const optionsFormNames = match?.categoryOptions.map(co => co.displayFormName);
+        const orderedOptions = categoryCombo.categories.map(category => {
+            return match?.categoryOptions.find(co => category.categoryOptions.some(catOpt => catOpt.id === co.id));
+        });
+
+        const optionsNames = orderedOptions.map(co => co?.displayName);
+        const optionsShortNames = orderedOptions.map(co => co?.displayShortName);
+        const optionsFormNames = orderedOptions.map(co => co?.displayFormName);
 
         const categoryOption =
             categoryCombo.categories.length === 1
@@ -136,11 +148,10 @@ function getCocOrdered(categoryCombo: D2DataElement["categoryCombo"], config: Dh
             : [];
     });
 
-    const keyName = config.categoryCombinationsConfig[categoryCombo.code]?.viewType || "formName";
     return result.map(x => ({ ...x, name: x[keyName] || x.name || "" }));
 }
 
-function getDataElement(dataElement: D2DataElement, config: Dhis2DataStoreDataForm): DataElement | null {
+function getDataElement(dataElement: D2DataElementNewType, config: Dhis2DataStoreDataForm): DataElement | null {
     const { valueType } = dataElement;
     const deConfig = config.dataElementsConfig[dataElement.code];
     const optionSetFromDataElement = dataElement.optionSet
@@ -157,6 +168,22 @@ function getDataElement(dataElement: D2DataElement, config: Dhis2DataStoreDataFo
     const categoryCombination = {
         id: dataElement.categoryCombo?.id,
         name: dataElement.categoryCombo?.name,
+        categories: dataElement.categoryCombo?.categories.map(cat => {
+            const keyName = config.categoryCombinationsConfig[dataElement.categoryCombo.code]?.viewType || "formName";
+            return {
+                ...cat,
+                categoryOptions: cat.categoryOptions.map(co => {
+                    const record = {
+                        id: co.id,
+                        name: co.displayName,
+                        formName: co.displayFormName,
+                        shortName: co.displayShortName,
+                        code: co.code,
+                    };
+                    return { id: record.id, code: co.code, name: record[keyName] ?? record.name };
+                }),
+            };
+        }),
         categoryOptionCombos: getCocOrdered(dataElement.categoryCombo, config),
     };
     const categoryOptionCombos = dataElement.categoryCombo.categoryOptionCombos;
@@ -173,12 +200,15 @@ function getDataElement(dataElement: D2DataElement, config: Dhis2DataStoreDataFo
             : undefined,
         rules: [],
         htmlText: undefined,
+        disabled: deConfig?.disabled || false,
     };
 
     switch (valueType) {
         case "TEXT":
         case "LONG_TEXT":
             return { type: "TEXT", related: undefined, ...base };
+        case "MULTI_TEXT":
+            return { type: "MULTI_TEXT", related: undefined, ...base };
         case "INTEGER":
         case "INTEGER_NEGATIVE":
         case "INTEGER_POSITIVE":

src/data/common/Dhis2DataFormRepository.ts

@@ -1,6 +1,7 @@
 import _ from "lodash";
 
 import { Code, getId, Id } from "../../domain/common/entities/Base";
+import { CompulsoryDataValue } from "../../domain/common/entities/CompulsoryDataValue";
 import { DataElement } from "../../domain/common/entities/DataElement";
 import {
     DataElementRuleOptions,
@@ -11,7 +12,7 @@ import {
     SectionTotalRule,
     TotalRules,
 } from "../../domain/common/entities/DataElementRule";
-import { DataForm, defaultTexts, Section, SectionBase } from "../../domain/common/entities/DataForm";
+import { DataForm, defaultTexts, RowConfigDetails, Section, SectionBase } from "../../domain/common/entities/DataForm";
 import { Period } from "../../domain/common/entities/DataValue";
 import { Indicator } from "../../domain/common/entities/Indicator";
 import { SectionStyle } from "../../domain/common/entities/SectionStyle";
@@ -54,6 +55,9 @@ export class Dhis2DataFormRepository implements DataFormRepository {
             texts: dataSetConfig.texts,
             options: { dataElements: dataElementsOptions },
             totalRules: totalRules,
+            compulsoryDataValues: dataSet.compulsoryDataElementOperands.map(
+                operand => new CompulsoryDataValue(operand.dataElement.id, operand.categoryOptionCombo.id)
+            ),
         };
     }
 
@@ -109,7 +113,7 @@ export class Dhis2DataFormRepository implements DataFormRepository {
                     texts: config?.texts || defaultTexts,
                     tabs:
                         config?.tabs && config.tabs.active
-                            ? { active: true, order: config.tabs.order.toString() }
+                            ? { active: true, order: config.tabs.order.toString(), rules: config.tabs.rules }
                             : { active: false },
                     sortRowsBy: config?.sortRowsBy || "",
                     disableComments: config?.disableComments ?? false,
@@ -151,9 +155,24 @@ export class Dhis2DataFormRepository implements DataFormRepository {
                     toggleMultiple: config?.toggleMultiple
                         ? buildToggleMultiple(config.toggleMultiple, dataElements)
                         : undefined,
+                    fixedHeaders: config?.fixedHeaders || false,
+                    enableTopScroll: config?.enableTopScroll || false,
+                    fixedRowNames: config?.fixedRowNames || false,
                 };
 
-                if (!config) return { viewType: "table", calculateTotals: undefined, ...base };
+                if (!config)
+                    return {
+                        viewType: "table",
+                        calculateTotals: undefined,
+                        ...base,
+                        fixedHeaders: false,
+                        columnsOrder: undefined,
+                        enableGroups: false,
+                        fixedRowNames: false,
+                        enableTopScroll: false,
+                        columnsConfig: undefined,
+                        firstColumnConfig: undefined,
+                    };
 
                 const base2 = getSectionBaseWithToggle(config, base, dataElements);
 
@@ -163,7 +182,15 @@ export class Dhis2DataFormRepository implements DataFormRepository {
                     case "table":
                     case "grid":
                     case "grid-with-totals":
-                        return { viewType: config.viewType, calculateTotals: config.calculateTotals, ...base2 };
+                        return {
+                            viewType: config.viewType,
+                            calculateTotals: config.calculateTotals,
+                            columnsOrder: config.columnsOrder,
+                            enableGroups: config.enableGroups || false,
+                            columnsConfig: config.columnsConfig,
+                            firstColumnConfig: config.firstColumnConfig,
+                            ...base2,
+                        };
                     case "grid-with-subnational-ous":
                         return {
                             viewType: config.viewType,
@@ -193,6 +220,33 @@ export class Dhis2DataFormRepository implements DataFormRepository {
                             }),
                             ...base2,
                         };
+                    case "grid-category-columns": {
+                        const rowsConfigWithTexts = _(config.rowsConfig)
+                            .map((rowConfig, key): [string, RowConfigDetails] => {
+                                const constant = configDataForm.constants.find(
+                                    c => c.code === rowConfig.rowNameConstant
+                                );
+
+                                return [
+                                    key,
+                                    {
+                                        cellsVisible: rowConfig.cellsVisible ?? true,
+                                        rowName: constant?.displayDescription,
+                                    },
+                                ];
+                            })
+                            .fromPairs()
+                            .value();
+
+                        return {
+                            ...base2,
+                            viewType: config.viewType,
+                            showCalculatedTotals: config.showCalculatedTotals,
+                            categoriesColumns: config.categoriesColumns,
+                            rowsConfig: rowsConfigWithTexts ?? undefined,
+                            singleCategoryInColumns: config.singleCategoryInColumns ?? false,
+                        };
+                    }
                     default:
                         return { viewType: config.viewType, ...base2 };
                 }
@@ -480,6 +534,7 @@ function getMetadataQuery(options: { dataSetId: Id }) {
                 id: true,
                 code: true,
                 expiryDays: true,
+                compulsoryDataElementOperands: { dataElement: { id: true }, categoryOptionCombo: { id: true } },
                 dataInputPeriods: {
                     closingDate: true,
                     openingDate: true,