@operato/dataset 8.0.0-beta.5 → 8.0.0

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [8.0.0-beta.5](https://github.com/hatiolab/operato/compare/v8.0.0-beta.4...v8.0.0-beta.5) (2025-01-10)
+## [8.0.0](https://github.com/hatiolab/operato/compare/v7.1.33...v8.0.0) (2025-01-14)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -11,7 +11,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-beta.4](https://github.com/hatiolab/operato/compare/v8.0.0-beta.3...v8.0.0-beta.4) (2025-01-09)
+### [7.1.33](https://github.com/hatiolab/operato/compare/v7.1.32...v7.1.33) (2025-01-13)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -19,34 +19,17 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-beta.3](https://github.com/hatiolab/operato/compare/v8.0.0-beta.2...v8.0.0-beta.3) (2025-01-08)
+### [7.1.32](https://github.com/hatiolab/operato/compare/v7.1.31...v7.1.32) (2025-01-11)
 
 
 ### :bug: Bug Fix
 
-* dataset escaping exception from unsetting quota ([7cb081d](https://github.com/hatiolab/operato/commit/7cb081df54cfcab093341a17cdbfa5665360a005))
+* missing .npmignore ([03db207](https://github.com/hatiolab/operato/commit/03db207498088b294ccfb9645f6839c2f11645d5))
+* typo .npmignore ([df91cae](https://github.com/hatiolab/operato/commit/df91caea0f5938a3febd9307184e5b036a65e2bd))
 
 
 
-## [8.0.0-beta.2](https://github.com/hatiolab/operato/compare/v8.0.0-beta.1...v8.0.0-beta.2) (2025-01-08)
-
-
-### :bug: Bug Fix
-
-* typo .npmignore ([d9c0c8c](https://github.com/hatiolab/operato/commit/d9c0c8c79abc688c3c2cfb6c37fcb689483a5977))
-
-
-
-## [8.0.0-beta.1](https://github.com/hatiolab/operato/compare/v8.0.0-beta.0...v8.0.0-beta.1) (2025-01-08)
-
-
-### :bug: Bug Fix
-
-* missing .npmignore ([be05985](https://github.com/hatiolab/operato/commit/be05985abfae4af53501f718dd52932099f7fbcb))
-
-
-
-## [8.0.0-beta.0](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.56...v8.0.0-beta.0) (2025-01-07)
+### [7.1.31](https://github.com/hatiolab/operato/compare/v7.1.30...v7.1.31) (2025-01-10)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -54,16 +37,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-alpha.56](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.55...v8.0.0-alpha.56) (2025-01-05)
-
-
-### :bug: Bug Fix
-
-* [dataset] muultiple tables, subgroups at first occurrence, structured and modular ([89179fc](https://github.com/hatiolab/operato/commit/89179fc43024d34fa6bff4b364ce56541cefe16b))
-
-
-
-## [8.0.0-alpha.54](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.53...v8.0.0-alpha.54) (2024-12-09)
+### [7.1.30](https://github.com/hatiolab/operato/compare/v7.1.29...v7.1.30) (2025-01-10)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -71,7 +45,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-alpha.52](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.51...v8.0.0-alpha.52) (2024-12-03)
+### [7.1.28](https://github.com/hatiolab/operato/compare/v7.1.27...v7.1.28) (2024-12-09)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -79,24 +53,17 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-alpha.51](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.50...v8.0.0-alpha.51) (2024-11-29)
+### [7.1.27](https://github.com/hatiolab/operato/compare/v7.1.26...v7.1.27) (2024-12-09)
 
 
 ### :bug: Bug Fix
 
-* support radio type for dataset item spec ([8f6ba8f](https://github.com/hatiolab/operato/commit/8f6ba8f9929d6cfb94f2c8993a7d3dba37297954))
-
-
-
-## [8.0.0-alpha.50](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.49...v8.0.0-alpha.50) (2024-11-16)
-
-**Note:** Version bump only for package @operato/dataset
-
-
+* calendar css variables ([75a7eb0](https://github.com/hatiolab/operato/commit/75a7eb0c68a9d863f2b0db44152fdb9b9536ceca))
+* support radio type for dataset item spec ([8ccd1b9](https://github.com/hatiolab/operato/commit/8ccd1b92fb78e42f5998a578244ba804d9f5cedb))
 
 
 
-## [8.0.0-alpha.49](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.48...v8.0.0-alpha.49) (2024-11-13)
+### [7.1.26](https://github.com/hatiolab/operato/compare/v7.1.25...v7.1.26) (2024-11-28)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -104,7 +71,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-alpha.48](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.47...v8.0.0-alpha.48) (2024-11-13)
+### [7.1.25](https://github.com/hatiolab/operato/compare/v7.1.24...v7.1.25) (2024-11-23)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -112,7 +79,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-alpha.46](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.45...v8.0.0-alpha.46) (2024-10-23)
+### [7.1.21](https://github.com/hatiolab/operato/compare/v7.1.20...v7.1.21) (2024-11-13)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -120,7 +87,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-alpha.45](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.44...v8.0.0-alpha.45) (2024-10-23)
+### [7.1.18](https://github.com/hatiolab/operato/compare/v7.1.17...v7.1.18) (2024-10-31)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -128,7 +95,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-alpha.44](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.43...v8.0.0-alpha.44) (2024-10-23)
+### [7.1.13](https://github.com/hatiolab/operato/compare/v7.1.12...v7.1.13) (2024-09-23)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -136,7 +103,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-alpha.41](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.40...v8.0.0-alpha.41) (2024-10-21)
+### [7.1.10](https://github.com/hatiolab/operato/compare/v7.1.9...v7.1.10) (2024-09-15)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -144,24 +111,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-alpha.37](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.36...v8.0.0-alpha.37) (2024-10-20)
-
-
-### :bug: Bug Fix
-
-* update dev-dependencies version ([d6fe342](https://github.com/hatiolab/operato/commit/d6fe342de738c6bad3528550a862b5a1d2573161))
-
-
-
-## [8.0.0-alpha.34](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.33...v8.0.0-alpha.34) (2024-10-15)
-
-**Note:** Version bump only for package @operato/dataset
-
-
-
-
-
-## [8.0.0-alpha.33](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.32...v8.0.0-alpha.33) (2024-10-14)
+### [7.1.9](https://github.com/hatiolab/operato/compare/v7.1.8...v7.1.9) (2024-09-12)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -169,7 +119,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-alpha.30](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.29...v8.0.0-alpha.30) (2024-10-11)
+### [7.1.8](https://github.com/hatiolab/operato/compare/v7.1.7...v7.1.8) (2024-09-12)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -177,7 +127,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-alpha.29](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.28...v8.0.0-alpha.29) (2024-10-10)
+### [7.1.7](https://github.com/hatiolab/operato/compare/v7.1.6...v7.1.7) (2024-09-12)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -185,110 +135,37 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-alpha.27](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.26...v8.0.0-alpha.27) (2024-10-06)
+### [7.1.6](https://github.com/hatiolab/operato/compare/v7.1.5...v7.1.6) (2024-09-07)
 
 
 ### :bug: Bug Fix
 
-* calendar css variables ([9ea1918](https://github.com/hatiolab/operato/commit/9ea191844c72de5f920a8da85ad50209ba77cc07))
-
-
-
-## [8.0.0-alpha.26](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.25...v8.0.0-alpha.26) (2024-10-06)
-
-**Note:** Version bump only for package @operato/dataset
-
-
-
-
-
-## [8.0.0-alpha.21](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.20...v8.0.0-alpha.21) (2024-10-05)
-
-**Note:** Version bump only for package @operato/dataset
-
-
+* dataset components & styles ([d6836bd](https://github.com/hatiolab/operato/commit/d6836bd1c400962453dec31ab6e6055e4110900b))
 
 
 
-## [8.0.0-alpha.20](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.19...v8.0.0-alpha.20) (2024-10-04)
-
-**Note:** Version bump only for package @operato/dataset
-
-
-
-
-
-## [8.0.0-alpha.19](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.18...v8.0.0-alpha.19) (2024-10-04)
-
-**Note:** Version bump only for package @operato/dataset
-
-
-
-
-
-## [8.0.0-alpha.10](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.9...v8.0.0-alpha.10) (2024-09-18)
-
-**Note:** Version bump only for package @operato/dataset
-
-
-
-
-
-## [8.0.0-alpha.9](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.8...v8.0.0-alpha.9) (2024-09-15)
-
-**Note:** Version bump only for package @operato/dataset
-
-
-
-
-
-## [8.0.0-alpha.8](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.7...v8.0.0-alpha.8) (2024-09-15)
-
-**Note:** Version bump only for package @operato/dataset
-
-
-
-
-
-## [8.0.0-alpha.6](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.5...v8.0.0-alpha.6) (2024-09-14)
-
-**Note:** Version bump only for package @operato/dataset
-
-
-
-
-
-## [8.0.0-alpha.5](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.4...v8.0.0-alpha.5) (2024-09-12)
-
-**Note:** Version bump only for package @operato/dataset
-
-
-
-
-
-## [8.0.0-alpha.4](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.3...v8.0.0-alpha.4) (2024-09-07)
+### [7.1.5](https://github.com/hatiolab/operato/compare/v7.1.4...v7.1.5) (2024-09-06)
 
 
 ### :bug: Bug Fix
 
-* dataset components & styles ([be44acd](https://github.com/hatiolab/operato/commit/be44acde8f25980e5b27afc481a2c149f8c23dbd))
-* enable multiple file upload for ox-data-entry-form ([2753ffc](https://github.com/hatiolab/operato/commit/2753ffca2f67a4abff73109047e78dee9a7dff9d))
-* style for ox-data-sample-view ([8facbab](https://github.com/hatiolab/operato/commit/8facbaba683accc6e4cf2375902a0b25cde31c49))
+* enable multiple file upload for ox-data-entry-form ([33ce296](https://github.com/hatiolab/operato/commit/33ce296eefaad4f9d2b6a329b8274a8d650d618d))
 
 
 
-## [8.0.0-alpha.3](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.2...v8.0.0-alpha.3) (2024-09-06)
+### [7.1.4](https://github.com/hatiolab/operato/compare/v7.1.3...v7.1.4) (2024-09-06)
 
 
 ### :bug: Bug Fix
 
-* add ox-grist-editor/renderer-signature for dataset signature item ([b5dda5e](https://github.com/hatiolab/operato/commit/b5dda5ebe0afc8c9a3af73d9475bba160893155a))
-* dataset viewer 날짜 표기 ([f5bdead](https://github.com/hatiolab/operato/commit/f5bdead134ee9a989e84a2f758135b9e9333dc9f))
-* style for ox-data-sample-view ([f2a1266](https://github.com/hatiolab/operato/commit/f2a1266d9355b78a389e998129e16b8fba5ab480))
+* add ox-grist-editor/renderer-signature for dataset signature item ([6e31dc6](https://github.com/hatiolab/operato/commit/6e31dc68c04812182e192f82f810a33fab5ae6a4))
+* dataset viewer 날짜 표기 ([5a9f38e](https://github.com/hatiolab/operato/commit/5a9f38eebdc6df9d455565a81851d38a4087beca))
+* style for ox-data-sample-view ([17bd6b5](https://github.com/hatiolab/operato/commit/17bd6b58c728d2f4c3864f852d2a25ff1d360393))
+* style for ox-data-sample-view ([c533743](https://github.com/hatiolab/operato/commit/c533743913ef8d0eb58c5bc6109f05c34c6e5e1f))
 
 
 
-## [8.0.0-alpha.2](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.1...v8.0.0-alpha.2) (2024-09-05)
+### [7.1.3](https://github.com/hatiolab/operato/compare/v7.1.2...v7.1.3) (2024-09-04)
 
 **Note:** Version bump only for package @operato/dataset
 
@@ -296,20 +173,12 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [8.0.0-alpha.1](https://github.com/hatiolab/operato/compare/v8.0.0-alpha.0...v8.0.0-alpha.1) (2024-09-04)
+### [7.1.2](https://github.com/hatiolab/operato/compare/v7.1.1...v7.1.2) (2024-09-02)
 
 
 ### :bug: Bug Fix
 
-* support signature-input type for dataset ([613de5d](https://github.com/hatiolab/operato/commit/613de5dc5c14cc8288d2d19431dda5475c4b3303))
-
-
-
-## [8.0.0-alpha.0](https://github.com/hatiolab/operato/compare/v7.1.1...v8.0.0-alpha.0) (2024-09-01)
-
-**Note:** Version bump only for package @operato/dataset
-
-
+* support signature-input type for dataset ([f9e758e](https://github.com/hatiolab/operato/commit/f9e758eeb5efd6926af9d3526f0d7374e0c1b081))
 
 
 

package/dist/src/ox-data-entry-form.d.ts

@@ -14,9 +14,8 @@ export declare class OxDataEntryForm extends LitElement {
     render(): TemplateResult<1>;
     private onChange;
     private buildInputs;
-    private buildInputsForSubgroup;
-    private buildInputsForNonGrouped;
+    private buildInputs4Subgroup;
+    private buildInputs4NonGrouped;
     private buildValue;
-    private extractValuesFromInputs;
     private groupDataItemsByGroup;
 }

package/dist/src/ox-data-entry-form.js

@@ -4,50 +4,39 @@ import '@operato/input/ox-input-signature.js';
 import './ox-data-entry-subgroup-form.js';
 import { css, html, LitElement } from 'lit';
 import { customElement, property, queryAll } from 'lit/decorators.js';
-import { OxDataInputFactory } from './ox-data-input-factory';
 let OxDataEntryForm = class OxDataEntryForm extends LitElement {
-    constructor() {
-        super(...arguments);
-        this.onChange = (e) => {
-            this.value = this.buildValue();
-            this.dispatchEvent(new CustomEvent('change', {
-                bubbles: true,
-                composed: true,
-                detail: this.value
-            }));
-        };
-    }
     render() {
         var _a, _b;
-        return html `
-      <form @change=${this.onChange}>
-        <h2>${((_a = this.dataSet) === null || _a === void 0 ? void 0 : _a.name) || ''}</h2>
-        <h3>${((_b = this.dataSet) === null || _b === void 0 ? void 0 : _b.description) || ''}</h3>
-        ${this.buildInputs()}
-      </form>
-    `;
+        return html ` <form @change=${(e) => this.onChange(e)}>
+      <h2>${((_a = this.dataSet) === null || _a === void 0 ? void 0 : _a.name) || ''}</h2>
+      <h3>${((_b = this.dataSet) === null || _b === void 0 ? void 0 : _b.description) || ''}</h3>
+      ${this.buildInputs()}
+    </form>`;
+    }
+    onChange(e) {
+        this.value = this.buildValue();
+        this.dispatchEvent(new CustomEvent('change', {
+            bubbles: true,
+            composed: true,
+            detail: this.value
+        }));
     }
     buildInputs() {
         var _a;
         const dataItems = ((_a = this.dataSet) === null || _a === void 0 ? void 0 : _a.dataItems.filter(item => item.active)) || [];
-        const groupedItems = this.groupDataItemsByGroup(dataItems);
-        const renderedGroups = new Set();
-        return dataItems.flatMap(dataItem => {
-            if (dataItem.group) {
-                if (renderedGroups.has(dataItem.group))
-                    return [];
-                renderedGroups.add(dataItem.group);
-                return this.buildInputsForSubgroup(dataItem.group, groupedItems[dataItem.group]);
-            }
-            return this.buildInputsForNonGrouped([dataItem]);
+        const nonGroupDataItems = dataItems.filter(dataItem => !dataItem.group);
+        const dataItemSubgroups = Object.entries(this.groupDataItemsByGroup(dataItems)).map(([subgroup, dataItems]) => {
+            const tags = dataItems.map(dataItem => dataItem.tag);
+            const value = tags.reduce((partial, key) => {
+                var _a;
+                partial[key] = (_a = this.value) === null || _a === void 0 ? void 0 : _a[key];
+                return partial;
+            }, {});
+            return this.buildInputs4Subgroup(subgroup, dataItems, value);
         });
+        return [...this.buildInputs4NonGrouped(nonGroupDataItems), ...dataItemSubgroups];
     }
-    buildInputsForSubgroup(subgroup, dataItems) {
-        const subgroupValues = dataItems.reduce((values, item) => {
-            var _a;
-            values[item.tag] = (_a = this.value) === null || _a === void 0 ? void 0 : _a[item.tag];
-            return values;
-        }, {});
+    buildInputs4Subgroup(subgroup, dataItems, value) {
         return html `
       <div label>
         <div name>${subgroup}</div>
@@ -55,52 +44,100 @@ let OxDataEntryForm = class OxDataEntryForm extends LitElement {
           <ox-data-entry-subgroup-form
             .subgroup=${subgroup}
             .dataItems=${dataItems}
-            .value=${subgroupValues}
-            @change=${this.onChange}
+            .value=${value}
+            @change=${(e) => this.onChange(e)}
           ></ox-data-entry-subgroup-form>
         </div>
       </div>
     `;
     }
-    buildInputsForNonGrouped(dataItems) {
-        return dataItems.map(dataItem => {
-            var _a, _b;
+    buildInputs4NonGrouped(dataItems) {
+        return (dataItems || []).map(dataItem => {
             const { name, description, tag, type, quota = 1, options = {}, unit } = dataItem;
-            const value = ((_a = this.value) === null || _a === void 0 ? void 0 : _a[tag]) === undefined ? [] : (_b = this.value) === null || _b === void 0 ? void 0 : _b[tag];
-            return html `
-        <div label>
-          <div name>${name}${unit ? ` (${unit})` : ''}</div>
-          <div description><md-icon>info</md-icon> ${description}</div>
-          <div elements>
-            ${Array.from({ length: quota || 1 }, (_, idx) => OxDataInputFactory.createInputElement(type, tag, Array.isArray(value) ? value[idx] : idx === 0 ? value : undefined, options, idx))}
-          </div>
-        </div>
-      `;
+            const samples = new Array(quota).fill(0);
+            const value = this.value && this.value[tag];
+            const elements = samples.map((_, idx) => {
+                const v = value instanceof Array ? value[idx] : idx === 0 ? value : undefined;
+                switch (type) {
+                    case 'select':
+                        return html ` <select .name=${tag}>
+              <option value=""></option>
+              ${(options.options || []).map(option => html `<option value=${option.value} ?selected=${option.value === v}>${option.text}</option>`)}
+            </select>`;
+                    case 'radio':
+                        return html `<div
+              @change=${(e) => {
+                            const div = e.currentTarget;
+                            const inputHidden = div.querySelector(`input[name="${tag}"]`);
+                            inputHidden.value = e.target.value;
+                        }}
+            >
+              <input type="hidden" name=${tag} />
+
+              ${(options.options || []).map(option => html `<label>
+                    <input
+                      type="radio"
+                      name=${'$' + tag + '-' + idx}
+                      .value=${option.value}
+                      ?checked=${option.value === v}
+                    />
+                    ${option.text}
+                  </label>`)}
+            </div>`;
+                    case 'boolean':
+                        return html ` <input type="checkbox" name=${tag} .checked=${v} />`;
+                    case 'number':
+                        return html ` <input type="number" name=${tag} value=${v} />`;
+                    case 'date':
+                        return html ` <input type="date" name=${tag} value=${v} />`;
+                    case 'datetime':
+                        return html ` <input type="datetime-local" name=${tag} value=${v} />`;
+                    case 'file':
+                        return html `<ox-input-file name=${tag} multiple .value=${v}></ox-input-file>`;
+                    case 'signature':
+                        return html `<ox-input-signature name=${tag} value=${v}></ox-input-signature>`;
+                    case 'string':
+                    default:
+                        return html ` <input type="text" name=${tag} value=${v} />`;
+                }
+            });
+            return html ` <div label>
+        <div name>${name}${unit ? `(${unit})` : ''}</div>
+        <div description><md-icon>info</md-icon> ${description}</div>
+        <div elements>${elements}</div>
+      </div>`;
         });
     }
     buildValue() {
-        const nonGroupValues = this.extractValuesFromInputs();
-        return Array.from(this.subgroups).reduce((values, subgroup) => ({ ...values, ...subgroup.buildValue() }), nonGroupValues);
-    }
-    extractValuesFromInputs() {
-        var _a;
-        return (((_a = this.dataSet) === null || _a === void 0 ? void 0 : _a.dataItems.filter(item => !item.group)) || []).reduce((values, dataItem) => {
+        const dataItems = this.dataSet.dataItems;
+        const nonGroupDataItems = dataItems.filter(dataItem => !dataItem.group);
+        const nonGroupValue = (nonGroupDataItems || []).reduce((sum, dataItem) => {
             const { tag, type } = dataItem;
-            const editors = Array.from(this.renderRoot.querySelectorAll(`[name=${tag}]`));
+            const editors = Array.prototype.slice.call(this.renderRoot.querySelectorAll(`[name=${tag}]`));
             if (editors.length > 0) {
-                values[tag] = editors.map(editor => (type === 'boolean' ? editor.checked : editor.value));
+                sum[tag] = editors.map(editor => (type === 'boolean' ? editor.checked : editor.value));
             }
-            return values;
+            return sum;
         }, {});
+        return Array.from(this.subgroups).reduce((value, subgroup) => {
+            return {
+                ...value,
+                ...subgroup.buildValue()
+            };
+        }, nonGroupValue || {});
     }
     groupDataItemsByGroup(dataItems) {
-        return dataItems.reduce((groups, item) => {
-            if (item.group) {
-                ;
-                (groups[item.group] = groups[item.group] || []).push(item);
+        const groupedDataItems = {};
+        for (const dataItem of dataItems) {
+            const { group } = dataItem;
+            if (group) {
+                if (!groupedDataItems[group]) {
+                    groupedDataItems[group] = [];
+                }
+                groupedDataItems[group].push(dataItem);
             }
-            return groups;
-        }, {});
+        }
+        return groupedDataItems;
     }
 };
 OxDataEntryForm.styles = css `
@@ -133,12 +170,19 @@ OxDataEntryForm.styles = css `
 
     form > div[label] {
       display: grid;
+
       grid-template-rows: auto 1fr;
       grid-template-columns: 1fr 5fr;
       grid-template-areas: 'name description' 'empty inputs';
+
       grid-gap: 9px;
       align-items: center;
       margin-bottom: var(--spacing-medium);
+
+      &:nth-child(odd) {
+        background-color: var(--md-sys-color-background);
+        padding: var(--padding-default) 0;
+      }
     }
 
     div[name] {
@@ -147,13 +191,17 @@ OxDataEntryForm.styles = css `
       color: var(--label-color, var(--md-sys-color-on-surface));
       text-align: right;
     }
-
     div[description] {
       grid-area: description;
       opacity: 0.7;
       font: var(--item-description-font);
       color: var(--item-description-color);
       text-align: left;
+
+      * {
+        vertical-align: middle;
+      }
+
       md-icon {
         font-size: 0.9rem;
       }
@@ -166,15 +214,42 @@ OxDataEntryForm.styles = css `
       flex-wrap: wrap;
       gap: 10px;
       padding-right: var(--padding-default);
+
       * {
         flex: 1;
       }
+
+      input,
+      select {
+        border: var(--input-field-border);
+        border-radius: var(--input-field-border-radius);
+        padding: var(--input-field-padding);
+        font: var(--input-field-font);
+      }
     }
 
     div[subgroup] {
       grid-column: 1 / 3;
       grid-row: 2;
     }
+
+    @media only screen and (max-width: 460px) {
+      form > div[label] {
+        display: grid;
+
+        grid-template-rows: auto auto 1fr;
+        grid-template-columns: 1fr;
+        grid-template-areas: 'name' 'description' 'inputs';
+
+        grid-gap: 9px;
+        align-items: center;
+        margin-bottom: var(--spacing-medium);
+      }
+
+      div[name] {
+        text-align: left;
+      }
+    }
   `;
 __decorate([
     property({ type: Object })