feat: Add Support to defince currency (simpleangularcontrols#96)

jnetwork-gmbh · Jul 31, 2024 · 6b41c5e · 6b41c5e
1 parent f17e6aa
commit 6b41c5e
Show file tree

Hide file tree

Showing 16 changed files with 96 additions and 8 deletions.
diff --git a/ch.jnetwork.sac-controls/projects/demo-bootstrap3/src/app/input/input.component.html b/ch.jnetwork.sac-controls/projects/demo-bootstrap3/src/app/input/input.component.html
@@ -132,6 +132,20 @@ <h2>Input</h2>
       [(ngModel)]="values.fieldcurrency2"
       disabled="true"
     ></sac-inputcurrency>
+    <sac-inputcurrency
+      name="fieldcurrency3"
+      label="Preis (Required)"
+      [(ngModel)]="values.fieldcurrency3"
+      [isrequired]="true"
+      validationmessagerequired="Please enter a valid price"
+    ></sac-inputcurrency>
+    <sac-inputcurrency
+      name="fieldcurrency4"
+      label="Preis"
+      [(ngModel)]="values.fieldcurrency4"
+      currency="$"
+      disabled="true"
+    ></sac-inputcurrency>
 
     <sac-inputemail
       name="fieldemail1"

diff --git a/ch.jnetwork.sac-controls/projects/demo-bootstrap3/src/app/input/input.component.ts b/ch.jnetwork.sac-controls/projects/demo-bootstrap3/src/app/input/input.component.ts
@@ -47,6 +47,8 @@ export class DemoInputComponent {
     fieldi3: 0,
     fieldcurrency1: 0,
     fieldcurrency2: 0,
+    fieldcurrency3: null,
+    fieldcurrency4: null,
     fieldemail1: '',
     fieldemail2: '',
     fieldemail3: '',

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
@@ -14,6 +14,10 @@ export class CustomConfigurationService extends SacAbstractConfigurationService
     return ControlHeight.Small;
   }
 
+  public get CurrencyText(): string {
+    return 'CHF';
+  }
+
   public get LabelSizeLg(): number | null {
     return 3;
   }

diff --git a/ch.jnetwork.sac-controls/projects/demo-bootstrap4/src/app/input/input.component.html b/ch.jnetwork.sac-controls/projects/demo-bootstrap4/src/app/input/input.component.html
@@ -139,6 +139,13 @@ <h2>Input</h2>
       [isrequired]="true"
       validationmessagerequired="Please enter a valid price"
     ></sac-inputcurrency>
+    <sac-inputcurrency
+      name="fieldcurrency4"
+      label="Preis"
+      [(ngModel)]="values.fieldcurrency4"
+      currency="$"
+      disabled="true"
+    ></sac-inputcurrency>
 
     <sac-inputemail
       name="fieldemail1"

diff --git a/ch.jnetwork.sac-controls/projects/demo-bootstrap4/src/app/input/input.component.ts b/ch.jnetwork.sac-controls/projects/demo-bootstrap4/src/app/input/input.component.ts
@@ -48,6 +48,7 @@ export class DemoInputComponent {
     fieldcurrency1: 0,
     fieldcurrency2: 0,
     fieldcurrency3: null,
+    fieldcurrency4: null,
     fieldemail1: '',
     fieldemail2: '',
     fieldemail3: '',

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
@@ -14,6 +14,10 @@ export class CustomConfigurationService extends SacAbstractConfigurationService
     return ControlHeight.Default;
   }
 
+  public get CurrencyText(): string {
+    return 'CHF';
+  }
+
   public get LabelSizeLg(): number | null {
     return 3;
   }

diff --git a/ch.jnetwork.sac-controls/projects/demo-bootstrap5/src/app/input/input.component.html b/ch.jnetwork.sac-controls/projects/demo-bootstrap5/src/app/input/input.component.html
@@ -139,6 +139,13 @@ <h2>Input</h2>
       [isrequired]="true"
       validationmessagerequired="Please enter a valid price"
     ></sac-inputcurrency>
+    <sac-inputcurrency
+      name="fieldcurrency4"
+      label="Preis"
+      [(ngModel)]="values.fieldcurrency4"
+      currency="$"
+      disabled="true"
+    ></sac-inputcurrency>
 
     <sac-inputemail
       name="fieldemail1"

diff --git a/ch.jnetwork.sac-controls/projects/demo-bootstrap5/src/app/input/input.component.ts b/ch.jnetwork.sac-controls/projects/demo-bootstrap5/src/app/input/input.component.ts
@@ -1,13 +1,13 @@
 import { Component, ViewChild } from '@angular/core';
+import { FormsModule } from '@angular/forms';
 import {
-  SacFormDirective,
-  SACBootstrap5FormModule,
   SACBootstrap5ButtonModule,
-  SACBootstrap5ValidationSummaryModule,
+  SACBootstrap5FormModule,
   SACBootstrap5InputModule,
   SACBootstrap5StaticLabelModule,
+  SACBootstrap5ValidationSummaryModule,
+  SacFormDirective,
 } from '@simpleangularcontrols/sac-bootstrap5';
-import { FormsModule } from '@angular/forms';
 
 @Component({
   selector: 'app-input',
@@ -48,6 +48,7 @@ export class DemoInputComponent {
     fieldcurrency1: 0,
     fieldcurrency2: 0,
     fieldcurrency3: null,
+    fieldcurrency4: null,
     fieldemail1: '',
     fieldemail2: '',
     fieldemail3: '',

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
@@ -14,6 +14,10 @@ export class CustomConfigurationService extends SacAbstractConfigurationService
     return ControlHeight.Default;
   }
 
+  public get CurrencyText(): string {
+    return 'CHF';
+  }
+
   public get LabelSizeLg(): number | null {
     return 3;
   }

diff --git a/ch.jnetwork.sac-controls/projects/sac-bootstrap3/src/controls/input/inputcurrency.html b/ch.jnetwork.sac-controls/projects/sac-bootstrap3/src/controls/input/inputcurrency.html
@@ -42,7 +42,7 @@
         *ngIf="isAdaptiveLabel && !disablelabel"
         >{{label}}</label
       >
-      <div class="input-group-addon">CHF</div>
+      <div class="input-group-addon">{{currency}}</div>
     </div>
     <div
       class="help-block help-block-error"

diff --git a/ch.jnetwork.sac-controls/projects/sac-bootstrap4/src/controls/input/inputcurrency.html b/ch.jnetwork.sac-controls/projects/sac-bootstrap4/src/controls/input/inputcurrency.html
@@ -31,7 +31,7 @@
         [ngClass]="[componentHeight | toControlHeight]"
       />
       <div class="input-group-append">
-        <span class="input-group-text">CHF</span>
+        <span class="input-group-text">{{currency}}</span>
       </div>
       <div
         *ngIf="isinlineerrorenabled && invalid && (dirty || touched)"

diff --git a/ch.jnetwork.sac-controls/projects/sac-bootstrap5/src/controls/input/inputcurrency.html b/ch.jnetwork.sac-controls/projects/sac-bootstrap5/src/controls/input/inputcurrency.html
@@ -30,7 +30,7 @@
         [class.is-invalid]="invalid && (dirty || touched)"
         [ngClass]="[componentHeight | toControlHeight]"
       />
-      <span class="input-group-text">CHF</span>
+      <span class="input-group-text">{{currency}}</span>
       <div
         *ngIf="isinlineerrorenabled && invalid && (dirty || touched)"
         class="invalid-feedback"

diff --git a/ch.jnetwork.sac-controls/projects/sac-common/src/controls/input/inputcurrency.ts b/ch.jnetwork.sac-controls/projects/sac-common/src/controls/input/inputcurrency.ts
@@ -1,10 +1,30 @@
-import { Directive } from '@angular/core';
+import { Directive, Input } from '@angular/core';
 import { SacInputDecimalCommon } from './inputdecimal';
 
 /**
  * Basis Komponente für SacInputCurrency
  */
 @Directive()
 export class SacInputCurrencyCommon extends SacInputDecimalCommon {
+  // #region Properties
 
+  @Input()
+  public currency: string = '';
+
+  // #endregion Properties
+
+  // #region Protected Methods
+
+  /**
+   * Set currency during initialization if no value is defined.
+   */
+  protected OnClassInit(): void {
+    super.OnClassInit();
+
+    if (!this.currency) {
+      this.currency = this.configurationService.CurrencyText;
+    }
+  }
+
+  // #endregion Protected Methods
 }
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
@@ -10,6 +10,10 @@ export interface ISacConfigurationService {
    * Defines the standard height of the components
    */
   get ComponentHeight(): ControlHeight | null;
+  /**
+   * Defines the standard text for currencies. e.g. $, €, CHF
+   */
+  get CurrencyText(): string;
   /**
    * 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
@@ -13,6 +13,12 @@ import { SacAbstractConfigurationService } from '@simpleangularcontrols/sac-comm
   providedIn: 'root',
 })
 export class CustomConfigurationService extends SacAbstractConfigurationService {
+  get ComponentHeight(): ControlHeight | null {
+    return ControlHeight.Default;
+  }
+  get CurrencyText(): string {
+    return 'CHF';
+  }
   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
@@ -17,6 +17,10 @@ export abstract class SacAbstractConfigurationService
    * @inheritdoc
    */
   public abstract get ComponentHeight(): ControlHeight | null;
+  /**
+   * @inheritdoc
+   */
+  public abstract get CurrencyText(): string;
   /**
    * @inheritdoc
    */
@@ -52,10 +56,20 @@ export abstract class SacAbstractConfigurationService
 export class SacDefaultConfigurationService extends SacAbstractConfigurationService {
   // #region Public Getters And Setters
 
+  /**
+   * @inheritdoc
+   */
   public get ComponentHeight(): ControlHeight {
     return null;
   }
 
+  /**
+   * @inheritdoc
+   */
+  public get CurrencyText(): string {
+    return 'CHF';
+  }
+
   /**
    * @inheritdoc
    */