feat: Add InlineError Property to global ConfigurationService (simple…

…angularcontrols#104) (simpleangularcontrols#112)
jnetwork-gmbh · Aug 2, 2024 · a52698d · a52698d
1 parent 1f10fb1
commit a52698d
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 12 deletions.
diff --git a/ch.jnetwork.sac-controls/projects/demo-bootstrap3/src/app/form/form.component.html b/ch.jnetwork.sac-controls/projects/demo-bootstrap3/src/app/form/form.component.html
@@ -15,6 +15,7 @@ <h2>Form</h2>
       name="subformField1"
       label="field 1"
       [isrequired]="true"
+      [inlineerrorenabled]="false"
     ></sac-input>
     <div ngModelGroup="MyGroup2">
       <sac-input

diff --git a/ch.jnetwork.sac-controls/projects/demo-bootstrap3/src/app/form/subform.component.html b/ch.jnetwork.sac-controls/projects/demo-bootstrap3/src/app/form/subform.component.html
@@ -1,4 +1,10 @@
-<div style="border: 1px solid" sacInheritForm #formaccess="sacinheritform">
+<div
+  style="border: 1px solid"
+  sacInheritForm
+  sacFormLayout
+  [inlineError]="false"
+  #formaccess="sacinheritform"
+>
   <div>SubForm</div>
   <div>
     <sac-input

diff --git a/...ork.sac-controls/projects/demo-bootstrap3/src/app/services/customconfiguration.service.ts b/...ork.sac-controls/projects/demo-bootstrap3/src/app/services/customconfiguration.service.ts
@@ -18,6 +18,10 @@ export class CustomConfigurationService extends SacAbstractConfigurationService
     return 'CHF';
   }
 
+  public get InlineErrorEnabled(): boolean {
+    return true;
+  }
+
   public get LabelSizeLg(): number | null {
     return 3;
   }

diff --git a/ch.jnetwork.sac-controls/projects/demo-bootstrap4/src/app/form/form.component.html b/ch.jnetwork.sac-controls/projects/demo-bootstrap4/src/app/form/form.component.html
@@ -15,6 +15,7 @@ <h2>Form</h2>
       name="subformField1"
       label="field 1"
       [isrequired]="true"
+      [inlineerrorenabled]="false"
     ></sac-input>
     <div ngModelGroup="MyGroup2">
       <sac-input

diff --git a/ch.jnetwork.sac-controls/projects/demo-bootstrap4/src/app/form/subform.component.html b/ch.jnetwork.sac-controls/projects/demo-bootstrap4/src/app/form/subform.component.html
@@ -1,4 +1,10 @@
-<div style="border: 1px solid" sacInheritForm #formaccess="sacinheritform">
+<div
+  style="border: 1px solid"
+  sacInheritForm
+  sacFormLayout
+  [inlineError]="false"
+  #formaccess="sacinheritform"
+>
   <div>SubForm</div>
   <div>
     <sac-input

diff --git a/...ork.sac-controls/projects/demo-bootstrap4/src/app/services/customconfiguration.service.ts b/...ork.sac-controls/projects/demo-bootstrap4/src/app/services/customconfiguration.service.ts
@@ -18,6 +18,10 @@ export class CustomConfigurationService extends SacAbstractConfigurationService
     return 'CHF';
   }
 
+  public get InlineErrorEnabled(): boolean {
+    return true;
+  }
+
   public get LabelSizeLg(): number | null {
     return 3;
   }

diff --git a/ch.jnetwork.sac-controls/projects/demo-bootstrap5/src/app/form/form.component.html b/ch.jnetwork.sac-controls/projects/demo-bootstrap5/src/app/form/form.component.html
@@ -15,6 +15,7 @@ <h2>Form</h2>
       name="subformField1"
       label="field 1"
       [isrequired]="true"
+      [inlineerrorenabled]="false"
     ></sac-input>
     <div ngModelGroup="MyGroup2">
       <sac-input

diff --git a/ch.jnetwork.sac-controls/projects/demo-bootstrap5/src/app/form/subform.component.html b/ch.jnetwork.sac-controls/projects/demo-bootstrap5/src/app/form/subform.component.html
@@ -1,4 +1,10 @@
-<div style="border: 1px solid" sacInheritForm #formaccess="sacinheritform">
+<div
+  style="border: 1px solid"
+  sacInheritForm
+  sacFormLayout
+  [inlineError]="false"
+  #formaccess="sacinheritform"
+>
   <div>SubForm</div>
   <div>
     <sac-input

diff --git a/...ork.sac-controls/projects/demo-bootstrap5/src/app/services/customconfiguration.service.ts b/...ork.sac-controls/projects/demo-bootstrap5/src/app/services/customconfiguration.service.ts
@@ -18,6 +18,10 @@ export class CustomConfigurationService extends SacAbstractConfigurationService
     return 'CHF';
   }
 
+  public get InlineErrorEnabled(): boolean {
+    return true;
+  }
+
   public get LabelSizeLg(): number | null {
     return 3;
   }

diff --git a/ch.jnetwork.sac-controls/projects/sac-common/src/common/basemodelcontrol.ts b/ch.jnetwork.sac-controls/projects/sac-common/src/common/basemodelcontrol.ts
@@ -262,17 +262,22 @@ export abstract class SacBaseModelControl<VALUE>
    * Returns whether the inline error messages are active for this control.
    */
   public get isinlineerrorenabled(): boolean {
+    if (this._inlineerrorenabled !== null) {
+      return this._inlineerrorenabled;
+    }
+
     if (
-      this.formlayout?.IsInlineErrorEnabled === null ||
-      this.formlayout?.IsInlineErrorEnabled === undefined
+      this.formlayout !== null &&
+      this.formlayout.IsInlineErrorEnabled !== null
     ) {
-      return this._inlineerrorenabled;
+      return this.formlayout?.IsInlineErrorEnabled;
     }
 
-    return (
-      this.formlayout.IsInlineErrorEnabled !== false &&
-      this._inlineerrorenabled !== false
-    );
+    if (this.configurationService.InlineErrorEnabled !== null) {
+      return this.configurationService.InlineErrorEnabled;
+    }
+
+    return true;
   }
 
   /**

diff --git a/ch.jnetwork.sac-controls/projects/sac-common/src/controls/layout/formlayout.ts b/ch.jnetwork.sac-controls/projects/sac-common/src/controls/layout/formlayout.ts
@@ -15,7 +15,7 @@ export class SacFormLayoutCommon {
   /**
    * defines that error messages are displayed under the controls
    */
-  @Input() public inlineError: boolean = true;
+  @Input() public inlineError: boolean | null = null;
   /**
    * defines that the labels are displayed as adaptive labels
    */
@@ -59,7 +59,7 @@ export class SacFormLayoutCommon {
    * Returns whether the inline error messages for the form are active.
    */
   public get IsInlineErrorEnabled(): boolean {
-    return this.inlineError !== false;
+    return this.inlineError;
   }
 
   // #endregion Public Getters And Setters

diff --git a/ch.jnetwork.sac-controls/projects/sac-common/src/interfaces/ISacConfigurationService.ts b/ch.jnetwork.sac-controls/projects/sac-common/src/interfaces/ISacConfigurationService.ts
@@ -14,6 +14,10 @@ export interface ISacConfigurationService {
    * Defines the standard text for currencies. e.g. $, €, CHF
    */
   get CurrencyText(): string;
+  /**
+   * Activates the error messages below the controls
+   */
+  InlineErrorEnabled: boolean;
   /**
    * default labe size for large devices
    */

diff --git a/...work.sac-controls/projects/sac-common/src/services/sac-configuration.service.md b/...work.sac-controls/projects/sac-common/src/services/sac-configuration.service.md
@@ -19,6 +19,9 @@ export class CustomConfigurationService extends SacAbstractConfigurationService
   get CurrencyText(): string {
     return 'CHF';
   }
+  get InlineErrorEnabled(): boolean {
+    return true;
+  }
   get LabelSizeLg(): number | null {
     return 3;
   }

diff --git a/ch.jnetwork.sac-controls/projects/sac-common/src/services/sac-configuration.service.ts b/ch.jnetwork.sac-controls/projects/sac-common/src/services/sac-configuration.service.ts
@@ -21,6 +21,10 @@ export abstract class SacAbstractConfigurationService
    * @inheritdoc
    */
   public abstract get CurrencyText(): string;
+  /**
+   * @inheritdoc
+   */
+  public abstract get InlineErrorEnabled(): boolean;
   /**
    * @inheritdoc
    */
@@ -70,6 +74,13 @@ export class SacDefaultConfigurationService extends SacAbstractConfigurationServ
     return 'CHF';
   }
 
+  /**
+   * @inheritdoc
+   */
+  public get InlineErrorEnabled(): boolean {
+    return true;
+  }
+
   /**
    * @inheritdoc
    */