Merge pull request #33 from microting/master

Updates

Author: Gid733

eFormAPI/eFormAPI/Controllers/SettingsController.cs

@@ -356,7 +356,7 @@ public OperationResult ResetPageHeaderSettings()
 
         #endregion
 
-        [Authorize]
+        [AllowAnonymous]
         [HttpGet]
         [Route("api/settings/version")]
         public OperationDataResult<string> GetApplicationVersion()

eFormAPI/eFormAPI/Infrastructure/Helpers/CaseUpdateHelper.cs

@@ -46,7 +46,14 @@ public static List<string> GetFieldValuesByRequestField(CaseEditRequestField edi
                     var checkBoxfirst = editRequestField?.FieldValues?.First();
                     if (checkBoxfirst?.Value != null && checkBoxfirst?.FieldId != null)
                     {
-                        string val = $"{checkBoxfirst.FieldId}|{checkBoxfirst.Value.ToString()}";
+                        string val;
+                        if (checkBoxfirst.Value.ToString() == "1" || checkBoxfirst.Value.ToString() == "checked")
+                        {
+                            val = $"{checkBoxfirst.FieldId}|checked";
+                        } else
+                        {
+                            val = $"{checkBoxfirst.FieldId}|unchecked";
+                        }
                         list.Add(val);
                     }
 
@@ -55,7 +62,7 @@ public static List<string> GetFieldValuesByRequestField(CaseEditRequestField edi
                     var commentFirst = editRequestField?.FieldValues?.First();
                     if (commentFirst?.Value != null && commentFirst?.FieldId != null)
                     {
-                        string val = $"{commentFirst.FieldId}|{commentFirst.Value.ToString()}";
+                        string val = $"{commentFirst.FieldId}|{commentFirst.Value.ToString().Replace("</p>", "<br>").Replace("<p>", "").Replace("<div>", "").Replace("</div>", "<br>").Replace("&nbsp;", "").Replace("</span>","").Replace("<span style=\"font-size: 1rem;\">","").Replace("</br>","<br>")}";
                         list.Add(val);
                     }
 

eform-client/src/app/common/modules/eform-imported/pell/pell.component.ts

@@ -37,7 +37,7 @@ export class PellComponent implements OnInit, AfterViewInit, OnChanges {
 
   ngOnChanges(changes: any) {
     try {
-      if (this.editor.content.innerHTML != this.value) {
+      if (this.editor.content.innerHTML !== this.value) {
         this.editor.content.innerHTML = this.value;
       }
     } catch (err) {

eform-client/src/app/components/footer/footer.component.html

@@ -6,12 +6,14 @@
       </a> <span class="ml-2 mr-2"> | </span>
       <a href="https://www.microting.com/privacy-policy" target="_blank">
         {{'Privacy Policy' | translate}}
+      </a><span class="ml-2 mr-2"> | </span>
+      <a href="https://www.microting.com/data-protection-terms/" target="_blank">
+        {{'Data Protection Terms (GDPR)' | translate}}
       </a>
       <b></b>
     </div>
   </div>
   <div class="footer-copyright text-center p-2 copyright-section">
-    <p>© Microting A/S 2007 - 2018 </p>
-    <p>{{version}}</p>
+    <div>© Microting A/S 2007 - 2018 <div class="footer-version">v{{version}}</div> </div>
   </div>
 </footer>

eform-client/src/app/modules/application-settings/components/connection-setup/connection-setup.component.ts

@@ -21,6 +21,7 @@ export class ConnectionSetupComponent implements OnInit {
   }
 
   ngOnInit() {
+    this.settingsModel.generalAppSetupSettingsModel.defaultLocale = 'en-US';
   }
 
   updateConnectionString() {

eform-client/src/app/plugins/modules/shared/components/text-editor-pn/pell-pn.ts

@@ -66,10 +66,9 @@ export const init = settings => {
     actionbar.appendChild(button);
   });
 
-  if (settings.defaultParagraphSeparator) exec('defaultParagraphSeparator', settings.defaultParagraphSeparator)
+  if (settings.defaultParagraphSeparator) { exec('defaultParagraphSeparator', settings.defaultParagraphSeparator); }
   if (settings.styleWithCSS) { exec('styleWithCSS'); }
 
-
   return settings.element;
 };
 

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

@@ -91,6 +91,7 @@
   "Create new selectable list": "Opret ny valgbar liste",
   "Terms of Service": "Servicevilkår",
   "Privacy Policy": "Fortrolighedspolitik",
+  "Data Protection Terms (GDPR)": "Databeskyttelsesvilkår (GDPR) (en)",
   "Save password": "Gem adgangskode",
   "Edit Device User": "Rediger enhedsbruger",
   "First Name": "Fornavn",

eform-client/src/scss/styles.scss

@@ -1,4 +1,4 @@
-/* You can add global styles to this file, and also import other style files */
+/* You can add global styles to this file, and also import other style files 2 */
 //ng-select
 @import "components/index";
 @import "utilities/colors";
@@ -64,3 +64,7 @@ gallery {
 .pull-right {
   float: right !important;
 }
+.footer-version {
+  color: gray;
+  font-size: 0.8em;
+}