Skip to content

Commit 09ddcdc

Browse files
committed
Small fixes and audio component
1 parent 37beb08 commit 09ddcdc

File tree

8 files changed

+45
-4
lines changed

8 files changed

+45
-4
lines changed

eform-client/src/app/modules/advanced/components/workers/workers.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export class WorkersComponent implements OnInit {
5454
deleteSingle(id: number) {
5555
this.workersService.deleteSingleWorker(id).subscribe(operation => {
5656
if (operation && operation.success) {
57-
this.router.navigate(['/advanced/workers/']);
57+
this.loadAllWorkers();
5858
this.notifyService.success({text: operation.message});
5959
} else {
6060
this.notifyService.error({text: operation.message || 'Error'});

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
ElementInfoboxComponent,
2020
ElementTimerComponent,
2121
ElementSignatureComponent,
22+
ElementAudioComponent,
2223
TrumbowygComponent,
2324
ElementEntitysearchComponent,
2425
ElementEntityselectComponent,
@@ -66,7 +67,8 @@ import {NgxSelectModule} from 'ngx-select-ex';
6667
ElementTimerComponent,
6768
ElementSignatureComponent,
6869
ElementEntitysearchComponent,
69-
ElementEntityselectComponent
70+
ElementEntityselectComponent,
71+
ElementAudioComponent
7072
]
7173
})
7274
export class CasesModule {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656
<div *ngSwitchCase="'EntitySelect'">
5757
<element-entityselect [(fieldValue)]="dataItem.fieldValues[0]" [entityGroupUid]="dataItem.entityGroupId"></element-entityselect>
5858
</div>
59+
<div *ngSwitchCase="'Audio'">
60+
<element-audio [(fieldValue)]="dataItem.fieldValues[0]"></element-audio>
61+
</div>
5962
<div *ngSwitchDefault></div>
6063
</div>
6164

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

Whitespace-only changes.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<audio controls>
2+
<source src="" type="audio/ogg">
3+
</audio>
4+
<textarea class="form-control"
5+
name="value"></textarea>
6+
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import {Component, Input, OnInit} from '@angular/core';
2+
import {CaseFieldValue} from 'app/models';
3+
4+
@Component({
5+
selector: 'element-audio',
6+
templateUrl: './element-audio.component.html',
7+
styleUrls: ['./element-audio.component.css']
8+
})
9+
export class ElementAudioComponent implements OnInit {
10+
fieldValueObj: CaseFieldValue = new CaseFieldValue();
11+
12+
@Input()
13+
get fieldValue() {
14+
return this.fieldValueObj;
15+
}
16+
17+
set fieldValue(val) {
18+
this.fieldValueObj = val;
19+
}
20+
21+
constructor() {
22+
}
23+
24+
ngOnInit() {
25+
}
26+
27+
}

eform-client/src/app/modules/cases/components/case-elements/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ export * from './element-signature/element-signature.component'
1414
export * from './element-container/element-container.component'
1515
export * from './element-entitysearch/element-entitysearch.component';
1616
export * from './element-entityselect/element-entityselect.component';
17+
export * from './element-audio/element-audio.component';

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ <h4>{{ 'Create eForm' | translate }}</h4>
489489
<input type="search" [(ngModel)]="eFormCreateModel.newTag" class="form-control add-tag-input"
490490
id="addTagInput">
491491
<button class="btn btn-danger btn-xs btn-add-tag"
492-
(click)="isTagAddOpen = !isTagAddOpen; eFormCreateModel.newTag = '';" id="closeTagInputBtn">
492+
(click)="isTagAddOpen = !isTagAddOpen; eFormCreateModel.newTag = null;" id="closeTagInputBtn">
493493
<span class="glyphicon glyphicon-remove"></span>
494494
</button>
495495
</ng-container>
@@ -511,7 +511,9 @@ <h4>{{ 'Create eForm' | translate }}</h4>
511511
<button type="button" class="btn btn-default" data-dismiss="createTemplateModal"
512512
(click)="createTemplateModal.dismiss()" id="createEFormCancelBtn">
513513
{{ 'Cancel' | translate }}</button>
514-
<button type="button" class="btn btn-success" (click)="submitTemplateCreateModal()" id="createEFormSaveEFormBtn">
514+
<button type="button" class="btn btn-success"
515+
[disabled]="isTagAddOpen && !eFormCreateModel.newTag"
516+
(click)="submitTemplateCreateModal()" id="createEFormSaveEFormBtn">
515517
{{ 'Save eForm' | translate }}</button>
516518
</modal-footer>
517519
</modal>

0 commit comments

Comments
 (0)