Merge pull request #120 from Gid733/master

Enhancements audio and uploading

Author: renemadsen

eFormAPI/eFormAPI/Web.config

@@ -48,7 +48,7 @@
     -->
   <system.web>
     <compilation debug="true" targetFramework="4.6.1" />
-    <httpRuntime targetFramework="4.6" />
+    <httpRuntime targetFramework="4.6" maxRequestLength="1024000"/>
     <httpModules />
   </system.web>
   <system.webServer>
@@ -63,6 +63,11 @@
     </handlers>
     <validation validateIntegratedModeConfiguration="false" />
     <modules />
+    <security>
+      <requestFiltering>
+        <requestLimits maxAllowedContentLength="2147483648" /> 
+      </requestFiltering>
+    </security>
   </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

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

@@ -1,4 +1,6 @@
-<audio controls preload="auto" src="/api/audio/eform-audio?fileName={{fieldValueObj.uploadedDataObj.fileName}}">
+<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>

eform-client/src/app/modules/eform/components/eform-page/eform-table.component.html

@@ -501,7 +501,8 @@ <h4>{{ 'Create eForm' | translate }}</h4>
           <label class="mt-validation-container" for="eFormXML">
             {{ 'XML from eForm Builder' | translate }}
           </label>
-          <textarea [(ngModel)]="eFormCreateModel.eFormXml" class="form-control" placeholder="{{ 'Paste XML here' | translate }}"
+          <textarea [(ngModel)]="eFormCreateModel.eFormXml"
+                    class="form-control" placeholder="{{ 'Paste XML here' | translate }}"
                     name="eFormXML" id="eFormXml" rows="20" ></textarea>
         </div>
       </div>
@@ -512,8 +513,8 @@ <h4>{{ 'Create eForm' | translate }}</h4>
             (click)="createTemplateModal.dismiss()" id="createEFormCancelBtn">
       {{ 'Cancel' | translate }}</button>
     <button type="button" class="btn btn-success"
-            [disabled]="isTagAddOpen && !eFormCreateModel.newTag"
+            [disabled]="(isTagAddOpen && !eFormCreateModel.newTag) || isEformCreating"
             (click)="submitTemplateCreateModal()" id="createEFormSaveEFormBtn">
-      {{ 'Save eForm' | translate }}</button>
+      {{ 'Save eForm' | translate }} <i *ngIf="isEformCreating" class="fa fa-spinner fa-spin"></i></button>
   </modal-footer>
 </modal>

eform-client/src/app/modules/eform/components/eform-page/eform-table.component.ts

@@ -31,6 +31,7 @@ export class EFormTableComponent implements OnInit {
   matchFound = false;
   isDeploying = false;
   isTagsProcessing = false;
+  isEformCreating = false;
 
   eFormCreateModel: EFormCreateModel = new EFormCreateModel();
   templateListModel: TemplateListModel = new TemplateListModel();
@@ -157,7 +158,8 @@ export class EFormTableComponent implements OnInit {
   // Create modal
   createSingleTemplate() {
     if (this.eFormCreateModel != null) {
-      this.eFormService.createSingle(this.eFormCreateModel).subscribe(operation => {
+      this.isEformCreating = true;
+      this.eFormService.createSingle(this.eFormCreateModel).subscribe((operation => {
         if (operation && operation.success) {
           this.loadAllTemplates();
           this.eFormCreateModel = new EFormCreateModel;
@@ -166,7 +168,10 @@ export class EFormTableComponent implements OnInit {
           this.notifyService.error({text: operation.message || 'Error'});
         }
         this.createTemplateModal.close();
+        this.isEformCreating = false;
         this.loadAllTags();
+      }), error => {
+        this.isEformCreating = false;
       });
     }
   }