Adding support for showing the signature also.

renemadsen · renemadsen · commit b4e260d311d6 · 2017-08-16T10:15:32.000+02:00
diff --git a/eform-client/src/app/modules/cases/cases.module.ts b/eform-client/src/app/modules/cases/cases.module.ts
@@ -14,6 +14,7 @@ import {
   ElementMultiselectComponent,
   ElementNumberComponent,
   ElementPictureComponent,
+  ElementSignatureComponent,
   ElementSingleselectComponent,
   ElementTextComponent,
   TrumbowygComponent
@@ -36,6 +37,7 @@ import {
     ElementNumberComponent,
     ElementTextComponent,
     ElementPictureComponent,
+    ElementSignatureComponent,
     ElementCheckboxComponent,
     ElementDateComponent
   ]
diff --git a/eform-client/src/app/modules/cases/components/case-edit-element/case-edit-element.component.html b/eform-client/src/app/modules/cases/components/case-edit-element/case-edit-element.component.html
@@ -40,6 +40,9 @@
             <td>
 
               <div [ngSwitch]="dataItem.fieldType">
+                <div *ngSwitchCase="'Signature'">
+                  <element-signature [fieldValues]="dataItem.fieldValues"></element-signature>
+                </div>
                 <div *ngSwitchCase="'Picture'">
                   <element-picture [fieldValues]="dataItem.fieldValues"></element-picture>
                 </div>
diff --git a/eform-client/src/app/modules/cases/components/case-edit-element/case-edit-element.component.spec.ts b/eform-client/src/app/modules/cases/components/case-edit-element/case-edit-element.component.spec.ts
@@ -16,6 +16,7 @@ import {
   ElementMultiselectComponent,
   ElementNumberComponent,
   ElementPictureComponent,
+  ElementSignatureComponent,
   ElementSingleselectComponent,
   ElementTextComponent,
   TrumbowygComponent
@@ -42,6 +43,7 @@ describe('CaseEditElementComponent', () => {
         ElementNumberComponent,
         ElementTextComponent,
         ElementPictureComponent,
+        ElementSignatureComponent,
         ElementCheckboxComponent,
         ElementDateComponent
       ],
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-checkbox/element-checkbox.component.spec.ts b/eform-client/src/app/modules/cases/components/case-elements/element-checkbox/element-checkbox.component.spec.ts
@@ -16,6 +16,7 @@ import {
   ElementMultiselectComponent,
   ElementNumberComponent,
   ElementPictureComponent,
+  ElementSignatureComponent,
   ElementSingleselectComponent,
   ElementTextComponent,
   TrumbowygComponent
@@ -42,6 +43,7 @@ describe('ElementCheckboxComponent', () => {
         ElementNumberComponent,
         ElementTextComponent,
         ElementPictureComponent,
+        ElementSignatureComponent,
         ElementCheckboxComponent,
         ElementDateComponent
       ],
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-comment/element-comment.component.spec.ts b/eform-client/src/app/modules/cases/components/case-elements/element-comment/element-comment.component.spec.ts
@@ -16,6 +16,7 @@ import {
   ElementMultiselectComponent,
   ElementNumberComponent,
   ElementPictureComponent,
+  ElementSignatureComponent,
   ElementSingleselectComponent,
   ElementTextComponent,
   TrumbowygComponent
@@ -42,6 +43,7 @@ describe('ElementCommentComponent', () => {
         ElementNumberComponent,
         ElementTextComponent,
         ElementPictureComponent,
+        ElementSignatureComponent,
         ElementCheckboxComponent,
         ElementDateComponent
       ],
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-date/element-date.component.spec.ts b/eform-client/src/app/modules/cases/components/case-elements/element-date/element-date.component.spec.ts
@@ -16,6 +16,7 @@ import {
   ElementMultiselectComponent,
   ElementNumberComponent,
   ElementPictureComponent,
+  ElementSignatureComponent,
   ElementSingleselectComponent,
   ElementTextComponent,
   TrumbowygComponent
@@ -42,6 +43,7 @@ describe('ElementDateComponent', () => {
         ElementNumberComponent,
         ElementTextComponent,
         ElementPictureComponent,
+        ElementSignatureComponent,
         ElementCheckboxComponent,
         ElementDateComponent
       ],
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-multiselect/element-multiselect.component.spec.ts b/eform-client/src/app/modules/cases/components/case-elements/element-multiselect/element-multiselect.component.spec.ts
@@ -16,6 +16,7 @@ import {
   ElementMultiselectComponent,
   ElementNumberComponent,
   ElementPictureComponent,
+  ElementSignatureComponent,
   ElementSingleselectComponent,
   ElementTextComponent,
   TrumbowygComponent
@@ -42,6 +43,7 @@ describe('ElementMultiselectComponent', () => {
         ElementNumberComponent,
         ElementTextComponent,
         ElementPictureComponent,
+        ElementSignatureComponent,
         ElementCheckboxComponent,
         ElementDateComponent
       ],
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-number/element-number.component.spec.ts b/eform-client/src/app/modules/cases/components/case-elements/element-number/element-number.component.spec.ts
@@ -16,6 +16,7 @@ import {
   ElementMultiselectComponent,
   ElementNumberComponent,
   ElementPictureComponent,
+  ElementSignatureComponent,
   ElementSingleselectComponent,
   ElementTextComponent,
   TrumbowygComponent
@@ -42,6 +43,7 @@ describe('ElementNumberComponent', () => {
         ElementNumberComponent,
         ElementTextComponent,
         ElementPictureComponent,
+        ElementSignatureComponent,
         ElementCheckboxComponent,
         ElementDateComponent
       ],
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-picture/element-picture.component.spec.ts b/eform-client/src/app/modules/cases/components/case-elements/element-picture/element-picture.component.spec.ts
@@ -16,6 +16,7 @@ import {
   ElementMultiselectComponent,
   ElementNumberComponent,
   ElementPictureComponent,
+  ElementSignatureComponent,
   ElementSingleselectComponent,
   ElementTextComponent,
   TrumbowygComponent
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-signature/element-signature.component.css b/eform-client/src/app/modules/cases/components/case-elements/element-signature/element-signature.component.css
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-signature/element-signature.component.html b/eform-client/src/app/modules/cases/components/case-elements/element-signature/element-signature.component.html
@@ -0,0 +1,6 @@
+<div class="row" *ngFor="let fieldValue of fieldValues">
+  <div class="col-md-2">
+    <img width="300px" src="/api/templates/getimage?&filename={{fieldValue.uploadedDataObj.fileName}}"/>
+  </div>
+</div>
+<br>
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-signature/element-signature.component.spec.ts b/eform-client/src/app/modules/cases/components/case-elements/element-signature/element-signature.component.spec.ts
@@ -0,0 +1,63 @@
+/* tslint:disable:no-unused-variable */
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+
+import {FormsModule} from '@angular/forms';
+import {CasesService} from 'app/services';
+import {CommonModule} from '@angular/common';
+import {CasesComponent} from '../../cases.component';
+import {CasesTableComponent} from '../../cases-table/cases-table.component';
+import {CasesEditComponent} from '../../cases-edit/cases-edit.component';
+import {CaseEditElementComponent} from '../../case-edit-element/case-edit-element.component';
+
+import {
+  ElementCheckboxComponent,
+  ElementCommentComponent,
+  ElementDateComponent,
+  ElementMultiselectComponent,
+  ElementNumberComponent,
+  ElementPictureComponent,
+  ElementSignatureComponent,
+  ElementSingleselectComponent,
+  ElementTextComponent,
+  TrumbowygComponent
+} from '../index';
+
+describe('ElementSignatureComponent', () => {
+  let component: ElementSignatureComponent;
+  let fixture: ComponentFixture<ElementSignatureComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        FormsModule
+      ],
+      declarations: [CasesComponent,
+        TrumbowygComponent,
+        CasesEditComponent,
+        CasesTableComponent,
+        CaseEditElementComponent,
+        ElementCommentComponent,
+        ElementMultiselectComponent,
+        ElementSingleselectComponent,
+        ElementNumberComponent,
+        ElementTextComponent,
+        ElementPictureComponent,
+        ElementCheckboxComponent,
+        ElementDateComponent
+      ],
+      providers: [CasesService]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ElementPictureComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-signature/element-signature.component.ts b/eform-client/src/app/modules/cases/components/case-elements/element-signature/element-signature.component.ts
@@ -0,0 +1,18 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {CaseFieldValue} from 'app/models';
+
+@Component({
+  selector: 'element-signature',
+  templateUrl: './element-signature.component.html',
+  styleUrls: ['./element-signature.component.css']
+})
+export class ElementSignatureComponent implements OnInit {
+  @Input() fieldValues: Array<CaseFieldValue> = new Array<CaseFieldValue>();
+
+  constructor() {
+  }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-singleselect/element-singleselect.component.spec.ts b/eform-client/src/app/modules/cases/components/case-elements/element-singleselect/element-singleselect.component.spec.ts
@@ -16,6 +16,7 @@ import {
   ElementMultiselectComponent,
   ElementNumberComponent,
   ElementPictureComponent,
+  ElementSignatureComponent,
   ElementSingleselectComponent,
   ElementTextComponent,
   TrumbowygComponent
@@ -42,6 +43,7 @@ describe('ElementSingleselectComponent', () => {
         ElementNumberComponent,
         ElementTextComponent,
         ElementPictureComponent,
+        ElementSignatureComponent,
         ElementCheckboxComponent,
         ElementDateComponent
       ],
diff --git a/eform-client/src/app/modules/cases/components/case-elements/element-text/element-text.component.spec.ts b/eform-client/src/app/modules/cases/components/case-elements/element-text/element-text.component.spec.ts
@@ -16,6 +16,7 @@ import {
   ElementMultiselectComponent,
   ElementNumberComponent,
   ElementPictureComponent,
+  ElementSignatureComponent,
   ElementSingleselectComponent,
   ElementTextComponent,
   TrumbowygComponent
@@ -42,6 +43,7 @@ describe('ElementTextComponent', () => {
         ElementNumberComponent,
         ElementTextComponent,
         ElementPictureComponent,
+        ElementSignatureComponent,
         ElementCheckboxComponent,
         ElementDateComponent
       ],
diff --git a/eform-client/src/app/modules/cases/components/case-elements/index.ts b/eform-client/src/app/modules/cases/components/case-elements/index.ts
@@ -4,6 +4,7 @@ export * from './element-date/element-date.component'
 export * from './element-multiselect/element-multiselect.component'
 export * from './element-number/element-number.component'
 export * from './element-picture/element-picture.component';
+export * from './element-signature/element-signature.component';
 export * from './element-singleselect/element-singleselect.component'
 export * from './element-text/element-text.component'
-export * from './element-comment/trumbowyg.component'
+export * from './element-comment/trumbowyg.component'
diff --git a/eform-client/src/app/modules/cases/components/cases-edit/cases-edit.component.spec.ts b/eform-client/src/app/modules/cases/components/cases-edit/cases-edit.component.spec.ts
@@ -16,6 +16,7 @@ import {
   ElementMultiselectComponent,
   ElementNumberComponent,
   ElementPictureComponent,
+  ElementSignatureComponent,
   ElementSingleselectComponent,
   ElementTextComponent,
   TrumbowygComponent
@@ -42,6 +43,7 @@ describe('CasesEditComponent', () => {
         ElementNumberComponent,
         ElementTextComponent,
         ElementPictureComponent,
+        ElementSignatureComponent,
         ElementCheckboxComponent,
         ElementDateComponent
       ],
diff --git a/eform-client/src/app/modules/cases/components/cases-table/cases-table.component.spec.ts b/eform-client/src/app/modules/cases/components/cases-table/cases-table.component.spec.ts
@@ -16,6 +16,7 @@ import {
   ElementMultiselectComponent,
   ElementNumberComponent,
   ElementPictureComponent,
+  ElementSignatureComponent,
   ElementSingleselectComponent,
   ElementTextComponent,
   TrumbowygComponent
@@ -42,6 +43,7 @@ describe('CasesTableComponent', () => {
         ElementNumberComponent,
         ElementTextComponent,
         ElementPictureComponent,
+        ElementSignatureComponent,
         ElementCheckboxComponent,
         ElementDateComponent
       ],
diff --git a/eform-client/src/app/modules/cases/components/cases.component.spec.ts b/eform-client/src/app/modules/cases/components/cases.component.spec.ts
@@ -16,6 +16,7 @@ import {
   ElementMultiselectComponent,
   ElementNumberComponent,
   ElementPictureComponent,
+  ElementSignatureComponent,
   ElementSingleselectComponent,
   ElementTextComponent,
   TrumbowygComponent
@@ -42,6 +43,7 @@ describe('CasesComponent', () => {
         ElementNumberComponent,
         ElementTextComponent,
         ElementPictureComponent,
+        ElementSignatureComponent,
         ElementCheckboxComponent,
         ElementDateComponent
       ],
