Email validation fixes & multiple audio

Author: Gid733

eFormAPI/eFormAPI/Infrastructure/Helpers/CaseUpdateHelper.cs

@@ -123,6 +123,14 @@ public static List<string> GetFieldValuesByRequestField(CaseEditRequestField edi
                         list.Add(val);
                     }
                     break;
+                case "Audio":
+                    var audioFirst = editRequestField?.FieldValues?.First();
+                    if (audioFirst?.Value != null && audioFirst?.FieldId != null)
+                    {
+                        string val = $"{audioFirst.FieldId}|{audioFirst.Value.ToString()}";
+                        list.Add(val);
+                    }
+                    break;
             }
             return list;
         }

eFormAPI/eFormAPI/Infrastructure/Helpers/SettingsHelper.cs

@@ -41,6 +41,11 @@ public void CreateAdminUser(AdminSetupModel adminSetupModel)
             };
             if (!manager.Users.Any(x => x.Email.Equals(adminUser.Email)))
             {
+                manager.UserValidator = new UserValidator<EformUser, int>(manager)
+                {
+                    AllowOnlyAlphanumericUserNames = false,
+                    RequireUniqueEmail = true
+                };
                 IdentityResult ir = manager.Create(adminUser, adminSetupModel.Password);
                 if (ir != null)
                 {

eform-client/src/app/modules/cases/components/case-edit-switch/case-edit-switch.component.html

@@ -57,7 +57,7 @@
             <element-entityselect [(fieldValue)]="dataItem.fieldValues[0]" [entityGroupUid]="dataItem.entityGroupId"></element-entityselect>
           </div>
           <div *ngSwitchCase="'Audio'">
-            <element-audio [(fieldValue)]="dataItem.fieldValues[0]"></element-audio>
+            <element-audio [(fieldValues)]="dataItem.fieldValues"></element-audio>
           </div>
           <div *ngSwitchDefault></div>
         </div>

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

@@ -1,7 +1,12 @@
-<audio controls preload="auto"
-       *ngIf="fieldValueObj.uploadedDataObj && fieldValueObj.uploadedDataObj.fileName"
-       src="/api/audio/eform-audio?fileName={{fieldValueObj.uploadedDataObj.fileName}}">
-  This text displays if the audio tag isn't supported.
-</audio>
-<trumbowyg-editor [(content)]="fieldValueObj.value"></trumbowyg-editor>
+<div *ngFor="let fieldValueObj of fieldValueObjects" style="margin-bottom: 10px;">
+  <audio controls preload="auto"
+         *ngIf="fieldValueObj.uploadedDataObj && fieldValueObj.uploadedDataObj.fileName"
+         src="/api/audio/eform-audio?fileName={{fieldValueObj.uploadedDataObj.fileName}}">
+    This text displays if the audio tag isn't supported.
+  </audio>
+  <trumbowyg-editor [(content)]="fieldValueObj.value"></trumbowyg-editor>
+</div>
+
+
+
 

eform-client/src/app/modules/cases/components/case-elements/element-audio/element-audio.component.ts

@@ -7,15 +7,15 @@ import {CaseFieldValue} from 'app/models';
   styleUrls: ['./element-audio.component.css']
 })
 export class ElementAudioComponent implements OnInit {
-  fieldValueObj: CaseFieldValue = new CaseFieldValue();
+  fieldValueObjects: Array<CaseFieldValue> = [];
 
   @Input()
-  get fieldValue() {
-    return this.fieldValueObj;
+  get fieldValues() {
+    return this.fieldValueObjects;
   }
 
-  set fieldValue(val) {
-    this.fieldValueObj = val;
+  set fieldValues(val) {
+    this.fieldValueObjects = val;
   }
 
   constructor() {