Merge pull request #46 from microting/master

Updates

Author: Gid733

eFormAPI/eFormAPI.Web.Integration.Tests/eFormAPI.Web.Integration.Tests.csproj

@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Microting.eForm" Version="3.0.144" />
+    <PackageReference Include="Microting.eForm" Version="3.0.145" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
   </ItemGroup>

eFormAPI/eFormAPI.Web.Tests/eFormAPI.Web.Tests.csproj

@@ -7,10 +7,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Microting.eForm" Version="3.0.144" />
+    <PackageReference Include="Microting.eForm" Version="3.0.145" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
-    <PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.87" />
+    <PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.88" />
   </ItemGroup>
 
   <ItemGroup>

eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj

@@ -23,8 +23,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.87" />
-    <PackageReference Include="Microting.eForm" Version="3.0.144" />
+    <PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.88" />
+    <PackageReference Include="Microting.eForm" Version="3.0.145" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4" />
     <PackageReference Include="SharpZipLib.NETStandard" Version="1.0.7" />
     <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0005" />

eform-client/package.json

@@ -48,7 +48,6 @@
     "ng2-file-upload": "1.3.0",
     "ngx-cookie-service": "1.0.10",
     "ngx-image-cropper": "^1.2.5",
-    "ngx-mask": "^7.3.3",
     "ngx-papaparse": "^3.0.0",
     "ngx-slimscroll": "5.2.2",
     "ngx-toastr": "8.10.2",

eform-client/src/app/app.module.ts

@@ -7,7 +7,6 @@ import {GallerizeModule} from '@ngx-gallery/gallerize';
 import {TranslateModule} from '@ngx-translate/core';
 import { LightboxModule } from '@ngx-gallery/lightbox';
 import {DragulaModule} from 'ng2-dragula';
-import {NgxMaskModule} from 'ngx-mask';
 import {ToastrModule} from 'ngx-toastr';
 
 import {MDBBootstrapModule} from 'port/angular-bootstrap-md';
@@ -50,7 +49,6 @@ import {
     GalleryModule.forRoot(),
     LightboxModule.forRoot(),
     GallerizeModule,
-    NgxMaskModule.forRoot(),
     // Modules
     PluginsModule
   ],

eform-client/src/app/modules/cases/cases.module.ts

@@ -8,7 +8,6 @@ import {LightboxModule} from '@ngx-gallery/lightbox';
 import {TranslateModule} from '@ngx-translate/core';
 import {OWL_DATE_TIME_FORMATS, OwlDateTimeModule, OwlNativeDateTimeModule} from 'ng-pick-datetime';
 import {OwlMomentDateTimeModule} from 'ng-pick-datetime-moment';
-import {NgxMaskModule} from 'ngx-mask';
 import {MDBBootstrapModule} from 'port/angular-bootstrap-md';
 import {MY_MOMENT_FORMATS} from 'src/app/common/helpers';
 import {EformImportedModule} from 'src/app/common/modules/eform-imported/eform-imported.module';
@@ -53,8 +52,7 @@ import {
     OwlDateTimeModule,
     OwlNativeDateTimeModule,
     OwlMomentDateTimeModule,
-    FormsModule,
-    NgxMaskModule.forChild()
+    FormsModule
   ],
   declarations: [
     CasesTableComponent,

eform-client/src/app/modules/cases/components/case-elements/element-number/element-number.component.html

@@ -1,10 +1,7 @@
-
-  <div class="md-form md-form-case-elem">
-    <input mdbInputDirective type="text"
-           [(ngModel)]="fieldValueObj.value"
-           [mdbValidate]="false"
-           mask="dot_separator"
-           id="numberElement{{fieldValueObj.fieldId}}"
-           name="numberElement" class="form-control">
-    <label for="numberElement{{fieldValueObj.fieldId}}">{{'Value' | translate}}</label>
-  </div>
+<div class="md-form md-form-case-elem">
+  <input mdbInputDirective type="number"
+         [(ngModel)]="fieldValueObj.value"
+         [mdbValidate]="false"
+         id="numberElement{{fieldValueObj.fieldId}}" name="numberElement" class="form-control">
+  <label for="numberElement{{fieldValueObj.fieldId}}">{{'Value' | translate}}</label>
+</div>

eform-client/src/assets/i18n/da-DK.json

@@ -89,9 +89,9 @@
   "Selectable lists": "Valgbare lister",
   "Selectable list": "Valgbar liste",
   "Create new selectable list": "Opret ny valgbar liste",
-  "Terms of Service": "Servicevilkår",
-  "Privacy Policy": "Fortrolighedspolitik",
-  "Data Protection Terms (GDPR)": "Databeskyttelsesvilkår (GDPR) (en)",
+  "Terms of Service": "Servicevilkår (Engelsk)",
+  "Privacy Policy": "Fortrolighedspolitik (Engelsk)",
+  "Data Protection Terms (GDPR)": "Databeskyttelsesvilkår (GDPR) (Engelsk)",
   "Save password": "Gem adgangskode",
   "Edit Device User": "Rediger enhedsbruger",
   "First Name": "Fornavn",

eform-client/src/assets/i18n/de-DE.json

@@ -87,8 +87,9 @@
   "Selectable lists": "Auswählbare Listen",
   "Selectable list": "Auswählbare Liste",
   "Create new selectable list": "Neue auswählbare Liste erstellen",
-  "Terms of Service": "Nutzungsbedingungen",
-  "Privacy Policy": "Datenschutz-Bestimmungen",
+  "Terms of Service": "Nutzungsbedingungen (Englisch)",
+  "Privacy Policy": "Datenschutzerklärung (Englisch)",
+  "Data Protection Terms (GDPR)": "Datenschutzbestimmungen (DSGVO) (Englisch)",
   "Save password": "Passwort speichern",
   "Edit Device User": "Gerätebenutzer bearbeiten",
   "First Name": "Vorname",