{
- if (v.label !== undefined) {
- return v.label.toLowerCase() === args[1];
- }
- return v;
- })[args[0] as string] || group[args[0] as string]
- );
+ if (group.values) {
+ return (
+ group.values.find((v: DataFormBuilder) => {
+ if (v.label !== undefined) {
+ return v.label.toLowerCase() === args[1];
+ }
+ return v;
+ })[args[0] as string] || group[args[0] as string]
+ );
+ }
+ if (group.bulkValues) {
+ return (
+ group.bulkValues[args[1] as string].bulkValues[args[3] as string][
+ args[0] as string
+ ] || 'Nothing'
+ );
+ }
}
- const key = value.values.find((v: DataFormBuilder) => {
+ const key = value.values?.find((v: DataFormBuilder) => {
if (v.label) {
return v.label.toLowerCase() === (args[1] as string).toLowerCase();
}
diff --git a/ftx-sivan-shared/src/lib/components/input/sivan-input.component.html b/ftx-sivan-shared/src/lib/components/input/sivan-input.component.html
index 68aaf07..4fb0948 100644
--- a/ftx-sivan-shared/src/lib/components/input/sivan-input.component.html
+++ b/ftx-sivan-shared/src/lib/components/input/sivan-input.component.html
@@ -91,7 +91,7 @@
{{ mainControl.errors?.['error'] }}
diff --git a/src/app/components/contentSteps/infoUser/info-user.component.ts b/src/app/components/contentSteps/infoUser/info-user.component.ts
index d4523fd..318dbe4 100644
--- a/src/app/components/contentSteps/infoUser/info-user.component.ts
+++ b/src/app/components/contentSteps/infoUser/info-user.component.ts
@@ -201,11 +201,15 @@ export class InfoUserComponent {
errorMsg: 'Only' + ' char',
},
],
+ // TODO: inner validator
+ // validator: {
+ // field: 'ds6',
+ // },
},
{
- label: 'ds3',
+ label: 'ds6',
value: 'gasd',
- labelHint: 'Personal TEst',
+ placeholder: 'Personal TEst',
validators: [
{ type: TypeConstantEnum.REQUIRED },
{
@@ -218,6 +222,7 @@ export class InfoUserComponent {
{
label: 'ds25',
value: 'TssEST',
+ placeholder: 'Personal TEst25',
labelHint: 'Personal TEst',
validators: [
{ type: TypeConstantEnum.REQUIRED },
@@ -310,6 +315,7 @@ export class InfoUserComponent {
value: 1231,
validators: [{ type: TypeConstantEnum.REQUIRED }],
labelHint: 'Childrens',
+ placeholder: 'Avram Avramescu',
},
{
label: 'train',
@@ -319,49 +325,20 @@ export class InfoUserComponent {
},
],
},
+
{
- label: 'Barto',
- bulkValues: [
- {
- value: null,
- labelHint: 'barot Childrens',
- },
- {
- label: 'barot Childrens train',
- value: 23222,
- placeholder: ' barot NAMING',
- labelHint: 'Number',
- },
- ],
- },
- {
- label: 'Barto2',
- bulkValues: [
- {
- value: null,
- labelHint: 'barot Childrens',
- },
- {
- label: 'barot Childrens train',
- value: 23222,
- placeholder: ' barot NAMING',
- labelHint: 'Number',
- },
- ],
- },
- {
- label: 'Bartos',
+ label: 'Ivan2',
bulkValues: [
{
value: null,
- labelHint: 'barot Childrens',
+ validators: [{ type: TypeConstantEnum.REQUIRED }],
+ labelHint: 'Childrens',
},
{
- label: 'barot Childrens train',
- value: 23222,
- placeholder: ' barot NAMING',
+ label: 'train',
+ value: 232,
+ placeholder: 'NAMING',
labelHint: 'Number',
- validators: [{ type: TypeConstantEnum.REQUIRED }],
},
],
},