@agridea/suibi-module 0.1.0-preview.68e6607 → 0.1.0-preview.69e3ad6

package/dist/elements/browser/version.txt

@@ -1 +1 @@
-0.1.0-preview.68e6607 68e6607
+0.1.0-preview.69e3ad6 69e3ad6

package/dist/types/app/components/inline-table/inline-table.component.d.ts

@@ -106,6 +106,29 @@ export declare class InlineTableComponent {
     addRow(): void;
     /** Removes the row at `idx` from the array. */
     removeRow(idx: number): void;
+    /** Ids of the expanded sub-rows panels, keyed `${rowIdx}:${col.key}` (UI-only state). */
+    private readonly expandedSubrows;
+    isSubrowsExpanded(rowIdx: number, col: InlineColumnDef): boolean;
+    toggleSubrows(rowIdx: number, col: InlineColumnDef): void;
+    /** Reads the nested key/value entries of a sub-rows column (never null). */
+    getSubEntries(row: Record<string, unknown>, col: InlineColumnDef): Record<string, unknown>[];
+    /** Options for the key select of a sub-rows column. */
+    getSubrowOptions(col: InlineColumnDef): BaseCodeListEntry[];
+    /** Localized label for a sub-entry key (descriptor designation, id as fallback). */
+    subrowKeyLabel(col: InlineColumnDef, keyValue: unknown): string;
+    /** Collapsed-cell summary, e.g. "Bovins 25 %, Porcs 75 %" ('–' when empty). */
+    subrowsSummary(row: Record<string, unknown>, col: InlineColumnDef): string;
+    /** Sum of the value fields of all sub-entries. */
+    subEntryTotal(row: Record<string, unknown>, col: InlineColumnDef): number;
+    /** Whether the sub-entry values sum to the configured expected total. */
+    subEntryTotalOk(row: Record<string, unknown>, col: InlineColumnDef): boolean;
+    addSubEntry(rowIdx: number, col: InlineColumnDef): void;
+    removeSubEntry(rowIdx: number, col: InlineColumnDef, subIdx: number): void;
+    onSubEntryKeyChange(rowIdx: number, col: InlineColumnDef, subIdx: number, value: unknown): void;
+    /** Commits on every keystroke (not on blur) — same rationale as `onNumberChange`. */
+    onSubEntryValueChange(rowIdx: number, col: InlineColumnDef, subIdx: number, event: Event): void;
+    /** Writes the sub-entry array back to the row, runs rowTransform, emits rowsChange. */
+    private updateSubEntries;
     /**
      * Core change handler: sets the new value on the row, applies the optional
      * `rowTransform` for any cross-field side-effects, then emits the updated array.

package/dist/types/app/components/inline-table/inline-table.types.d.ts

@@ -15,8 +15,45 @@ import type { BaseCodeListEntry } from '../../jsonforms/shared/option-sources/co
 /** Supported cell widget types. Extend with new literal types as needed.
  *  'readonly' renders the resolved value as plain text (no input) — for columns
  *  that are fully derived from other fields and must not be user-editable.
- *  'checkbox' renders a boolean mat-checkbox bound to a true/false row field. */
-export type InlineCellType = 'select' | 'number' | 'text' | 'readonly' | 'checkbox';
+ *  'checkbox' renders a boolean mat-checkbox bound to a true/false row field.
+ *  'subrows' renders an expandable editor for a nested list of key/percentage
+ *  pairs (e.g. manureDerivation[]) — see `InlineSubrowsConfig`. */
+export type InlineCellType = 'select' | 'number' | 'text' | 'readonly' | 'checkbox' | 'subrows';
+/**
+ * Configuration for a `type: 'subrows'` column — an expandable editor for a nested
+ * array of `{ key, value }` entries (e.g. manureDerivation: zoologicalAnimal +
+ * percentageAllocation). The collapsed cell shows a joined summary; expanding it
+ * opens a floating panel with one select + number input per entry, an add button,
+ * and a total indicator (green when the sum matches `expectedTotal`).
+ */
+export interface InlineSubrowsConfig {
+    /** Path to the nested array on the row object (e.g. `'manureDerivation'`). */
+    arrayPath: string;
+    /** Field holding the code-list key in each sub-entry (e.g. `'zoologicalAnimal'`). */
+    keyField: string;
+    /** Key into the shared `CODE_LISTS` map for the key select options. */
+    keyCodeListKey: string;
+    /** i18n key for the key sub-column header inside the panel. */
+    keyLabelKey: string;
+    /** Field holding the numeric share in each sub-entry (e.g. `'percentageAllocation'`). */
+    valueField: string;
+    /** i18n key for the value sub-column header inside the panel. */
+    valueLabelKey: string;
+    /** i18n key for the "add sub-entry" button label. */
+    addLabelKey: string;
+    /** i18n key for the expand toggle label (collapsed state). */
+    expandLabelKey: string;
+    /** i18n key for the collapse toggle label (expanded state). */
+    collapseLabelKey: string;
+    /** i18n key for the total indicator label. */
+    totalLabelKey: string;
+    /** Expected sum of the value fields (e.g. 100) — the indicator turns green on match. */
+    expectedTotal?: number;
+    /** Min for the value number input (default 0). */
+    valueMin?: number;
+    /** Max for the value number input (default: none). */
+    valueMax?: number;
+}
 /**
  * Definition for a single column in an inline table.
  *
@@ -124,6 +161,11 @@ export interface InlineColumnDef {
     arrayKeyField?: string;
     arrayKeyValue?: string;
     arrayValueField?: string;
+    /**
+     * Sub-rows editor config — required when `type: 'subrows'`, ignored otherwise.
+     * Drives the expandable key/percentage pair editor (see `InlineSubrowsConfig`).
+     */
+    subrows?: InlineSubrowsConfig;
 }
 /**
  * Full configuration for one inline-table instance — the "uischema" equivalent.

package/dist/types/app/nutrient-cycle/farm-manure-trading/farm-manure-trading-master-detail/farm-manure-trading-master-detail.component.d.ts

@@ -1,25 +1,19 @@
-import { TradingMode } from '../farm-manure-trading-list/farm-manure-trading-list.component';
 import { FarmManureTradingSupply, FarmManureTradingDispense } from '../farm-manure-trading.types';
+/**
+ * Farm manure trading page — two inline tables (supply "Reprises" / dispense
+ * "Cessions") editing `nutrientCycle.farmManureTrading` directly. The former
+ * master-detail round-trip (list + JSONForms detail pane) was replaced by inline
+ * editing, so validation deep-links (`selectedFarmManureTrading`) are merely
+ * consumed and cleared — there is no detail pane left to open (fodder pattern).
+ */
 export declare class FarmManureTradingMasterDetailComponent {
     private readonly dataSvc;
     private readonly navigationSvc;
     constructor();
     readonly supplyRows: import("@angular/core").Signal<FarmManureTradingSupply[]>;
     readonly dispenseRows: import("@angular/core").Signal<FarmManureTradingDispense[]>;
-    readonly activeTab: import("@angular/core").WritableSignal<import("../../../core/navigation/navigation.service").FarmManureTradingMode>;
-    readonly selectedSupplyIndex: import("@angular/core").WritableSignal<number | null>;
-    readonly selectedDispenseIndex: import("@angular/core").WritableSignal<number | null>;
-    readonly currentDetail: import("@angular/core").Signal<FarmManureTradingSupply | null>;
-    readonly currentIndex: import("@angular/core").Signal<number | null>;
-    readonly detailOpen: import("@angular/core").Signal<boolean>;
-    readonly activeTabIndex: import("@angular/core").Signal<0 | 1>;
-    onTabChange(index: number): void;
-    openDetail(mode: TradingMode, index: number): void;
-    closeDetail(): void;
-    addEntry(mode: TradingMode): void;
-    deleteEntry(mode: TradingMode, index: number): void;
-    onDetailChange(payload: FarmManureTradingSupply | FarmManureTradingDispense): void;
-    private createEmptyEntry;
+    onSupplyChange(rows: FarmManureTradingSupply[]): void;
+    onDispenseChange(rows: FarmManureTradingDispense[]): void;
     private patchRows;
     private cloneTrading;
 }

package/dist/types/app/nutrient-cycle/farm-manure-trading/farm-manure-trading-table/farm-manure-trading-table.component.d.ts

@@ -0,0 +1,34 @@
+import type { InlineTableConfig } from '../../../components/inline-table/inline-table.types';
+import { FarmManureTradingMode } from '../../../core/navigation/navigation.service';
+import { FarmManureTradingSupply, FarmManureTradingDispense } from '../farm-manure-trading.types';
+type TradingRow = FarmManureTradingSupply | FarmManureTradingDispense;
+/**
+ * FarmManureTradingTableComponent — thin wrapper around InlineTableComponent.
+ *
+ * Responsibilities:
+ *   1. Provides the per-mode column/section config (the "uischema").
+ *   2. Bridges typed `FarmManureTradingSupply[]`/`Dispense[]` to/from the generic
+ *      `Record<string, unknown>[]` API of InlineTableComponent.
+ *   3. Supplies `deriveUnits` as a `rowTransform` — `transactionUnit` ('kg'/'m3') and
+ *      every ingredient's `unit` ('kg/t'/'kg/m3') are fully derived from the selected
+ *      product's matterState (never user-entered) — two independent mappings, NOT a
+ *      concatenation of one into the other.
+ */
+export declare class FarmManureTradingTableComponent {
+    readonly mode: import("@angular/core").InputSignal<FarmManureTradingMode>;
+    readonly entries: import("@angular/core").InputSignal<TradingRow[]>;
+    readonly entriesChange: import("@angular/core").OutputEmitterRef<TradingRow[]>;
+    protected readonly config: import("@angular/core").Signal<InlineTableConfig>;
+    /** Cast typed entries to generic Record[] for InlineTableComponent. */
+    readonly rowsForTable: import("@angular/core").Signal<Record<string, unknown>[]>;
+    /** Cast generic output back to typed trading rows. */
+    onRowsChange(rows: Record<string, unknown>[]): void;
+    /**
+     * Row transform re-deriving `transactionUnit` and every ingredient's `unit` from the
+     * product's matterState on each edit — runs unconditionally (not just when
+     * `typeOfManureRecyclingProduct` changes) so an edit made before the product is picked
+     * still resolves once it is.
+     */
+    readonly deriveUnits: (_changedKey: string, _newValue: unknown, row: Record<string, unknown>) => Record<string, unknown>;
+}
+export {};

package/dist/types/app/nutrient-cycle/farm-manure-trading/farm-manure-trading-table/farm-manure-trading-table.config.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Column and section configuration for the Farm Manure Trading inline tables.
+ *
+ * This is the "uischema" for the supply ("Reprises") and dispense ("Cessions")
+ * tables — one InlineTableConfig per mode, mirroring recycling-table.config.ts.
+ * Columns:
+ *   - Product:        typeOfManureRecyclingProduct (code list filtered per mode)
+ *   - Quantity:       quantity (number)
+ *   - Unit:           transactionUnit (readonly — derived from the product's
+ *                     matterState, never user-editable, per the API spec)
+ *   - Origin:         manureDerivation[] (expandable key/share pair editor,
+ *                     expected total 100 %)
+ *   - Nutrients:      Ntot, Nsol (molecularFormula 'Nlos'), P₂O₅, K₂O, Mg read/written
+ *                     via the ingredient[] sub-array (same 5 nutrients as recycling).
+ *   - Nutrient unit:  readonly, derived from the product's matterState (kg/t | kg/m³).
+ */
+import type { InlineTableConfig } from '../../../components/inline-table/inline-table.types';
+import type { FarmManureTradingMode } from '../../../core/navigation/navigation.service';
+/** Nutrient formulas tracked per trading entry, in display order. 'Nlos' = soluble nitrogen
+ *  (matches the `molecularFormula` enum from assets/master-data/substances.json — there is no 'NSol'). */
+export declare const TRADING_NUTRIENT_COLUMNS: readonly ["Ntot", "Nlos", "P2O5", "K2O", "Mg"];
+export type TradingNutrientFormula = (typeof TRADING_NUTRIENT_COLUMNS)[number];
+/** Builds the inline-table config for one mode ('supply' | 'dispense'). */
+export declare function createTradingTableConfig(mode: FarmManureTradingMode): InlineTableConfig;

package/dist/types/app/nutrient-cycle/farm-manure-trading/index.d.ts

@@ -1,4 +1,4 @@
-export * from './farm-manure-trading-list/farm-manure-trading-list.component';
-export * from './farm-manure-trading-detail/farm-manure-trading-detail.component';
+export * from './farm-manure-trading-table/farm-manure-trading-table.component';
+export * from './farm-manure-trading-table/farm-manure-trading-table.config';
 export * from './farm-manure-trading-master-detail/farm-manure-trading-master-detail.component';
 export * from './farm-manure-trading.types';

package/dist/types/app/nutrient-cycle/farm-manure-trading/transaction-unit.util.d.ts

@@ -1 +1,3 @@
 export declare function deriveTransactionUnit(productCode: string | null | undefined): string | undefined;
+/** Derives the mandatory ingredient unit ('kg/t' or 'kg/m3') from the product's matterState. */
+export declare function deriveTradingIngredientUnit(productCode: string | null | undefined): string | undefined;

package/dist/types/app/nutrient-cycle/field-spreading/field-spreading.types.d.ts

@@ -23,6 +23,7 @@ export interface FieldSpreadingIngredient {
     unit?: string | null;
 }
 export interface FieldSpreadingFertiliserEntry {
+    descriptor?: string | null;
     fertiliserProductCategory?: string | null;
     quantity?: number | null;
     transactionUnit?: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agridea/suibi-module",
-  "version": "0.1.0-preview.68e6607",
+  "version": "0.1.0-preview.69e3ad6",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

package/dist/types/app/nutrient-cycle/farm-manure-trading/farm-manure-trading-detail/farm-manure-trading-detail.component.d.ts

@@ -1,26 +0,0 @@
-import { JsonSchema, UISchemaElement } from '@jsonforms/core';
-import { FarmManureTradingSupply, FarmManureTradingDispense } from '../farm-manure-trading.types';
-type Mode = 'supply' | 'dispense';
-type TradingRow = FarmManureTradingSupply | FarmManureTradingDispense;
-export declare class FarmManureTradingDetailComponent {
-    private readonly i18n;
-    row: import("@angular/core").InputSignal<TradingRow | null>;
-    index: import("@angular/core").InputSignal<number | null>;
-    mode: import("@angular/core").InputSignal<Mode>;
-    rowChange: import("@angular/core").OutputEmitterRef<TradingRow>;
-    close: import("@angular/core").OutputEmitterRef<void>;
-    readonly renderers: {
-        tester: import("@jsonforms/core").RankedTester;
-        renderer: any;
-    }[];
-    readonly suibiAjv: import("ajv").Ajv;
-    private readonly baseSchemas;
-    private readonly baseUis;
-    itemSchema: import("@angular/core").Signal<JsonSchema>;
-    localizedUi: import("@angular/core").Signal<UISchemaElement>;
-    detailTitle: import("@angular/core").Signal<string>;
-    jsonFormsData: import("@angular/core").Signal<(FarmManureTradingSupply & import("../../../core/schemas/ui-helper-registry").UiHelperDefinitions) | null>;
-    onDataChange(event: any): void;
-    private applyDerivedFields;
-}
-export {};

package/dist/types/app/nutrient-cycle/farm-manure-trading/farm-manure-trading-list/farm-manure-trading-list.component.d.ts

@@ -1,22 +0,0 @@
-import { FarmManureTradingSupply, FarmManureTradingDispense } from '../farm-manure-trading.types';
-import { FarmManureTradingMode } from '../../../core/navigation/navigation.service';
-export type TradingMode = FarmManureTradingMode;
-type TradingRow = FarmManureTradingSupply | FarmManureTradingDispense;
-export declare class FarmManureTradingListComponent {
-    private readonly masterData;
-    private readonly i18n;
-    rows: import("@angular/core").InputSignal<TradingRow[]>;
-    selectedIndex: import("@angular/core").InputSignal<number | null>;
-    mode: import("@angular/core").InputSignal<FarmManureTradingMode>;
-    select: import("@angular/core").OutputEmitterRef<number>;
-    add: import("@angular/core").OutputEmitterRef<void>;
-    delete: import("@angular/core").OutputEmitterRef<number>;
-    readonly displayedColumns: string[];
-    resolveProduct(code: string | null | undefined): string;
-    emptyLabel(): string;
-    emptyHintLabel(): string;
-    addLabel(): string;
-    headerLabel(): string;
-    onDelete(index: number, event: Event): void;
-}
-export {};