diff --git a/src/app/components/creator/content-choice-creator/content-choice-creator.component.html b/src/app/components/creator/content-choice-creator/content-choice-creator.component.html
index e4d24bd803bf5172b87fcba70451aa88a87102b4..bf302a4be92a51b87a2502f9bba6467f4bbe27d7 100644
--- a/src/app/components/creator/content-choice-creator/content-choice-creator.component.html
+++ b/src/app/components/creator/content-choice-creator/content-choice-creator.component.html
@@ -1,12 +1,4 @@
-<form (ngSubmit)="submitContent(subject.value, body.value, group.value)" fxLayout="column" fxLayoutGap="20px">
- <mat-form-field class="input-block">
- <input matInput #subject [(ngModel)]="content.subject" placeholder="{{ 'content.subject' | translate }}" name="subject">
- </mat-form-field>
- <app-markdown-toolbar textareaId="content-choice-body"></app-markdown-toolbar>
- <mat-form-field class="input-block">
- <textarea matInput #body id="content-choice-body" [(ngModel)]="content.body" placeholder="{{ 'content.body' | translate }}" name="body"
- matTextareaAutosize matAutosizeMinRows="3" matAutosizeMaxRows="8"></textarea>
- </mat-form-field>
+<form (ngSubmit)="submitContent()" fxLayout="column" fxLayoutGap="20px">
<markdown [data]="content.body"></markdown>
<mat-divider></mat-divider>
@@ -58,15 +50,6 @@
{{ 'content.add-answer' | translate }}
</button>
</div>
- <mat-form-field>
- <input matInput #group matInput [formControl]="myControl" [matAutocomplete]="auto"
- value={{lastCollection}} placeholder="{{'content.collection' | translate}}"/>
- <mat-autocomplete #auto="matAutocomplete">
- <mat-option *ngFor="let collection of filteredOptions | async" [value]="collection">
- {{collection}}
- </mat-option>
- </mat-autocomplete>
- </mat-form-field>
<div *ngIf="!editDialogMode" fxLayout="row" fxLayoutAlign="center" fxLayoutGap="50px">
<button mat-raised-button type="submit" color="accent">{{ 'content.create' | translate }}</button>
<button mat-raised-button (click)="reset($event)" color="primary">{{ 'content.reset' | translate }}</button>
diff --git a/src/app/components/creator/content-choice-creator/content-choice-creator.component.ts b/src/app/components/creator/content-choice-creator/content-choice-creator.component.ts
index c6d304ad2b15f86165face2bcbc340596f26cc1f..2705dfdf1b5c9e84e009c57a916070b056994f31 100644
--- a/src/app/components/creator/content-choice-creator/content-choice-creator.component.ts
+++ b/src/app/components/creator/content-choice-creator/content-choice-creator.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
import { AnswerOption } from '../../../models/answer-option';
import { ContentChoice } from '../../../models/content-choice';
import { ContentService } from '../../../services/http/content.service';
@@ -29,6 +29,12 @@ export class DisplayAnswer {
styleUrls: ['./content-choice-creator.component.scss']
})
export class ContentChoiceCreatorComponent implements OnInit {
+ @Input() contentSub;
+ @Input() contentBod;
+ @Input() contentCol;
+ @Output() resetP = new EventEmitter<boolean>();
+
+
singleChoice = true;
content: ContentChoice = new ContentChoice(
'0',
@@ -249,8 +255,7 @@ export class ContentChoiceCreatorComponent implements OnInit {
}
resetAfterSubmit() {
- this.content.subject = '';
- this.content.body = '';
+ this.resetP.emit(true);
this.content.options = [];
this.content.correctOptionIndexes = [];
this.fillCorrectAnswers();
@@ -259,8 +264,8 @@ export class ContentChoiceCreatorComponent implements OnInit {
});
}
- submitContent(subject: string, body: string, group: string) {
- if (this.content.body.valueOf() === '' || this.content.body.valueOf() === '') {
+ submitContent() {
+ if (this.contentBod === '' || this.contentSub === '') {
this.translationService.get('content.no-empty').subscribe(message => {
this.notificationService.show(message);
});
@@ -299,10 +304,10 @@ export class ContentChoiceCreatorComponent implements OnInit {
'',
'',
this.roomId,
- subject,
- body,
+ this.contentSub,
+ this.contentBod,
1,
- [group],
+ [this.contentCol],
this.content.options,
this.content.correctOptionIndexes,
this.content.multiple,
@@ -314,7 +319,7 @@ export class ContentChoiceCreatorComponent implements OnInit {
editDialogClose($event, action: string) {
$event.preventDefault();
if (action.valueOf() === 'edit') {
- this.submitContent(this.content.subject, this.content.body, this.content.groups[1]);
+ this.submitContent();
}
if (action.valueOf() === 'abort') {
this.dialogRef.close(action);
diff --git a/src/app/components/creator/content-create-page/content-create-page.component.html b/src/app/components/creator/content-create-page/content-create-page.component.html
index 5f864effee7e13e389effb2b56c7b25a1f15a7d5..b1456b8d995fdfb7215cffd4a68fd5270b8fd10e 100644
--- a/src/app/components/creator/content-create-page/content-create-page.component.html
+++ b/src/app/components/creator/content-create-page/content-create-page.component.html
@@ -3,22 +3,22 @@
<mat-tab-group>
<mat-tab label="Text">
<div class="tab-container">
- <app-content-text-creator></app-content-text-creator>
+ <app-content-creator [format]="'text'" [contentGroups]="contentGroups"></app-content-creator>
</div>
</mat-tab>
<mat-tab label="Single / Multiple Choice">
<div class="tab-container">
- <app-content-choice-creator></app-content-choice-creator>
+ <app-content-creator [format]="'choice'" [contentGroups]="contentGroups"></app-content-creator>
</div>
</mat-tab>
<mat-tab label="Likert">
<div class="tab-container">
- <app-content-likert-creator></app-content-likert-creator>
+ <app-content-creator [format]="'likert'" [contentGroups]="contentGroups"></app-content-creator>
</div>
</mat-tab>
<mat-tab label="{{ 'content.yes' | translate }} / {{ 'content.no' | translate }}">
<div class="tab-container">
- <app-content-yes-no-creator></app-content-yes-no-creator>
+ <app-content-creator [format]="'yesno'" [contentGroups]="contentGroups"></app-content-creator>
</div>
</mat-tab>
</mat-tab-group>
diff --git a/src/app/components/creator/content-create-page/content-create-page.component.ts b/src/app/components/creator/content-create-page/content-create-page.component.ts
index 291fea722c732bac2314e6e7c3688891bc61aa86..2a7f4ab492505be9bdd8f1c9a979b07f782c70f7 100644
--- a/src/app/components/creator/content-create-page/content-create-page.component.ts
+++ b/src/app/components/creator/content-create-page/content-create-page.component.ts
@@ -1,6 +1,9 @@
import { Component, OnInit } from '@angular/core';
import { TranslateService } from '@ngx-translate/core';
import { LanguageService } from '../../../services/util/language.service';
+import { RoomService } from '../../../services/http/room.service';
+import { ActivatedRoute } from '@angular/router';
+import { ContentGroup } from '../../../models/content-group';
@Component({
selector: 'app-content-create-page',
@@ -9,12 +12,27 @@ import { LanguageService } from '../../../services/util/language.service';
})
export class ContentCreatePageComponent implements OnInit {
+ contentGroups: ContentGroup[];
+ lastCollection: string;
+
constructor(private translateService: TranslateService,
- protected langService: LanguageService) {
+ protected langService: LanguageService,
+ protected roomService: RoomService,
+ protected route: ActivatedRoute) {
langService.langEmitter.subscribe(lang => translateService.use(lang));
}
ngOnInit() {
this.translateService.use(sessionStorage.getItem('currentLang'));
+ this.route.params.subscribe(params => {
+ this.getGroups(params['roomId']);
+ });
+ this.lastCollection = sessionStorage.getItem('collection');
+ }
+
+ getGroups(id: string): void {
+ this.roomService.getRoomByShortId(id).subscribe(room => {
+ this.contentGroups = room.contentGroups;
+ });
}
}
diff --git a/src/app/components/creator/content-creator/content-creator.component.html b/src/app/components/creator/content-creator/content-creator.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..ea7f33d4c21bc5c87e7eded5509de6e46943badb
--- /dev/null
+++ b/src/app/components/creator/content-creator/content-creator.component.html
@@ -0,0 +1,32 @@
+<form>
+<mat-form-field class="input-block">
+ <input matInput #subject [(ngModel)]="content.subject" placeholder="{{'content.subject' | translate}}" name="subject">
+</mat-form-field>
+<app-markdown-toolbar textareaId="content-text-body"></app-markdown-toolbar>
+<mat-form-field class="input-block">
+ <textarea matInput #body [(ngModel)]="content.body" placeholder="{{'content.body' | translate}}" name="body"
+ matTextareaAutosize matAutosizeMinRows="3" matAutosizeMaxRows="8"></textarea>
+</mat-form-field>
+<markdown [data]="content.body"></markdown>
+<mat-form-field>
+ <input matInput #group matInput [formControl]="myControl" [matAutocomplete]="auto"
+ value={{lastCollection}} placeholder="{{'content.collection' | translate}}"/>
+ <mat-autocomplete #auto="matAutocomplete">
+ <mat-option *ngFor="let collection of contentGroups" [value]="collection.name">
+ {{collection.name}}
+ </mat-option>
+ </mat-autocomplete>
+</mat-form-field>
+ <app-content-text-creator *ngIf="format === 'text'" (reset)="resetInputs()"
+ [contentSub] = "subject.value" [contentBod]="body.value" [contentCol]="group.value">
+ </app-content-text-creator>
+ <app-content-choice-creator *ngIf="format === 'choice'" (resetP)="resetInputs()"
+ [contentSub] = "subject.value" [contentBod]="body.value" [contentCol]="group.value">
+ </app-content-choice-creator>
+ <app-content-likert-creator *ngIf="format === 'likert'" (reset)="resetInputs()"
+ [contentSub] = "subject.value" [contentBod]="body.value" [contentCol]="group.value">
+ </app-content-likert-creator>
+ <app-content-yes-no-creator *ngIf="format === 'yesno'" (reset)="resetInputs()"
+ [contentSub] = "subject.value" [contentBod]="body.value" [contentCol]="group.value">
+ </app-content-yes-no-creator>
+</form>
diff --git a/src/app/components/creator/content-creator/content-creator.component.scss b/src/app/components/creator/content-creator/content-creator.component.scss
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/app/components/creator/content-creator/content-creator.component.spec.ts b/src/app/components/creator/content-creator/content-creator.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..c79c967f95c2ebabcdd8a97787afa02ccb6c49ef
--- /dev/null
+++ b/src/app/components/creator/content-creator/content-creator.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ContentCreatorComponent } from './content-creator.component';
+
+describe('ContentCreatorComponent', () => {
+ let component: ContentCreatorComponent;
+ let fixture: ComponentFixture<ContentCreatorComponent>;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ContentCreatorComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ContentCreatorComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/components/creator/content-creator/content-creator.component.ts b/src/app/components/creator/content-creator/content-creator.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..aa4797f99e4fd69338ae4038e85f0554adb13265
--- /dev/null
+++ b/src/app/components/creator/content-creator/content-creator.component.ts
@@ -0,0 +1,46 @@
+import { Component, Inject, Input, OnInit } from '@angular/core';
+import { ContentText } from '../../../models/content-text';
+import { FormControl } from '@angular/forms';
+import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
+import { ContentListComponent } from '../../shared/content-list/content-list.component';
+import { Room } from '../../../models/room';
+
+@Component({
+ selector: 'app-content-creator',
+ templateUrl: './content-creator.component.html',
+ styleUrls: ['./content-creator.component.scss']
+})
+export class ContentCreatorComponent implements OnInit {
+ @Input() format;
+ @Input() contentGroups;
+
+ room: Room;
+
+ content: ContentText = new ContentText(
+ '1',
+ '1',
+ '0',
+ '',
+ '',
+ 1,
+ [],
+ );
+
+ lastCollection: string;
+ myControl = new FormControl();
+
+ editDialogMode = false;
+
+ constructor(public dialog: MatDialog,
+ public dialogRef: MatDialogRef<ContentListComponent>,
+ @Inject(MAT_DIALOG_DATA) public data: any) {
+ }
+
+ ngOnInit() {
+ }
+
+ resetInputs() {
+ this.content.subject = '';
+ this.content.body = '';
+ }
+}
diff --git a/src/app/components/creator/content-likert-creator/content-likert-creator.component.html b/src/app/components/creator/content-likert-creator/content-likert-creator.component.html
index 70efa98ee48465bfc75cb06bf25c9b76cc9e8a8b..b1e787a3afc9e6839abccaaf4aa47d22b74dfc30 100644
--- a/src/app/components/creator/content-likert-creator/content-likert-creator.component.html
+++ b/src/app/components/creator/content-likert-creator/content-likert-creator.component.html
@@ -1,10 +1,4 @@
-<form (ngSubmit)="submitContent(subject.value, body.value, group.value)">
- <mat-form-field class="input-block">
- <input matInput #subject [(ngModel)]="content.subject" placeholder="{{ 'content.subject' | translate }}" name="subject">
- </mat-form-field>
- <mat-form-field class="input-block">
- <textarea matInput #body [(ngModel)]="content.body" placeholder="{{ 'content.body' | translate }}" name="body"></textarea>
- </mat-form-field>
+<form (ngSubmit)="submitContent()">
<mat-divider></mat-divider>
<mat-table #table [dataSource]="displayAnswers">
<ng-container matColumnDef="label">
@@ -17,15 +11,6 @@
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
</mat-table>
- <mat-form-field>
- <input matInput #group matInput [formControl]="myControl" [matAutocomplete]="auto"
- value={{lastCollection}} placeholder="{{'content.collection' | translate}}"/>
- <mat-autocomplete #auto="matAutocomplete">
- <mat-option *ngFor="let collection of filteredOptions | async" [value]="collection">
- {{collection}}
- </mat-option>
- </mat-autocomplete>
- </mat-form-field>
<div *ngIf="!editDialogMode">
<button mat-raised-button type="submit" color="accent">{{ 'content.create' | translate }}</button>
</div>
diff --git a/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts b/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
index ddb83a240ff40aaaadd730ac2e53e835ad4e511a..3e3fe901050d98f1036bf65521f216c35cc4e6ee 100644
--- a/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
+++ b/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
import { DisplayAnswer } from '../content-choice-creator/content-choice-creator.component';
import { ContentChoice } from '../../../models/content-choice';
import { AnswerOption } from '../../../models/answer-option';
@@ -19,6 +19,11 @@ import { TranslateService } from '@ngx-translate/core';
styleUrls: ['./content-likert-creator.component.scss']
})
export class ContentLikertCreatorComponent implements OnInit {
+ @Input() contentSub;
+ @Input() contentBod;
+ @Input() contentCol;
+ @Output() reset = new EventEmitter<boolean>();
+
likertScale = [
'Strongly agree',
'Agree',
@@ -89,8 +94,7 @@ export class ContentLikertCreatorComponent implements OnInit {
}
resetAfterSubmit() {
- this.content.subject = '';
- this.content.body = '';
+ this.reset.emit(true);
this.content.correctOptionIndexes = [];
this.fillCorrectAnswers();
this.translationService.get('content.submitted').subscribe(message => {
@@ -98,8 +102,8 @@ export class ContentLikertCreatorComponent implements OnInit {
});
}
- submitContent(subject: string, body: string, group: string): void {
- if (subject.valueOf() === '' || body.valueOf() === '') {
+ submitContent(): void {
+ if (this.contentSub === '' || this.contentBod === '') {
this.translationService.get('content.no-empty').subscribe(message => {
this.notificationService.show(message);
});
@@ -109,10 +113,10 @@ export class ContentLikertCreatorComponent implements OnInit {
'',
'',
this.roomId,
- subject,
- body,
+ this.contentSub,
+ this.contentBod,
1,
- [group],
+ [this.contentCol],
this.content.options,
this.content.correctOptionIndexes,
this.content.multiple,
diff --git a/src/app/components/creator/content-text-creator/content-text-creator.component.html b/src/app/components/creator/content-text-creator/content-text-creator.component.html
index 27c51bdc62c6186a35aa2a54949867c30ae0992a..e7d342d9664fd48b4b2cf554dad8d51a0f579a07 100644
--- a/src/app/components/creator/content-text-creator/content-text-creator.component.html
+++ b/src/app/components/creator/content-text-creator/content-text-creator.component.html
@@ -1,22 +1,4 @@
-<form (ngSubmit)="submitContent(subject.value, body.value, group.value)">
- <mat-form-field class="input-block">
- <input matInput #subject [(ngModel)]="content.subject" placeholder="{{'content.subject' | translate}}" name="subject">
- </mat-form-field>
- <app-markdown-toolbar textareaId="content-text-body"></app-markdown-toolbar>
- <mat-form-field class="input-block">
- <textarea matInput #body id="content-text-body" [(ngModel)]="content.body" placeholder="{{'content.body' | translate}}" name="body"
- matTextareaAutosize matAutosizeMinRows="3" matAutosizeMaxRows="8"></textarea>
- </mat-form-field>
- <markdown [data]="content.body"></markdown>
- <mat-form-field>
- <input matInput #group matInput [formControl]="myControl" [matAutocomplete]="auto"
- value={{lastCollection}} placeholder="{{'content.collection' | translate}}"/>
- <mat-autocomplete #auto="matAutocomplete">
- <mat-option *ngFor="let collection of filteredOptions | async" [value]="collection">
- {{collection}}
- </mat-option>
- </mat-autocomplete>
- </mat-form-field>
+<form (ngSubmit)="submitContent()">
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="5px" *ngIf="!editDialogMode">
<button mat-raised-button type="submit" color="accent">{{'content.create' | translate}}</button>
</div>
diff --git a/src/app/components/creator/content-text-creator/content-text-creator.component.ts b/src/app/components/creator/content-text-creator/content-text-creator.component.ts
index 69a8c86ee017d96b822b4dfe4c3a28937d2496cc..7bc53c6401a0337143f71b75787e34cf0e78f22c 100644
--- a/src/app/components/creator/content-text-creator/content-text-creator.component.ts
+++ b/src/app/components/creator/content-text-creator/content-text-creator.component.ts
@@ -1,13 +1,10 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
import { ContentText } from '../../../models/content-text';
import { ContentService } from '../../../services/http/content.service';
import { NotificationService } from '../../../services/util/notification.service';
import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
import { ContentListComponent } from '../../shared/content-list/content-list.component';
import { ContentDeleteComponent } from '../_dialogs/content-delete/content-delete.component';
-import { map, startWith } from 'rxjs/operators';
-import { FormControl } from '@angular/forms';
-import { Observable } from 'rxjs/Observable';
import { TranslateService } from '@ngx-translate/core';
@Component({
@@ -16,6 +13,10 @@ import { TranslateService } from '@ngx-translate/core';
styleUrls: ['./content-text-creator.component.scss']
})
export class ContentTextCreatorComponent implements OnInit {
+ @Input() contentSub;
+ @Input() contentBod;
+ @Input() contentCol;
+ @Output() reset = new EventEmitter<boolean>();
roomId: string;
content: ContentText = new ContentText(
@@ -27,10 +28,6 @@ export class ContentTextCreatorComponent implements OnInit {
1,
[],
);
- collections: string[] = ['ARSnova', 'Angular', 'HTML', 'TypeScript' ];
- myControl = new FormControl();
- filteredOptions: Observable<string[]>;
- lastCollection: string;
editDialogMode = false;
@@ -44,44 +41,32 @@ export class ContentTextCreatorComponent implements OnInit {
ngOnInit() {
this.roomId = localStorage.getItem(`roomId`);
- this.lastCollection = sessionStorage.getItem('collection');
- this.filteredOptions = this.myControl.valueChanges
- .pipe(
- startWith(''),
- map(value => this._filter(value))
- );
- }
-
- private _filter(value: string): string[] {
- const filterValue = value.toLowerCase();
- return this.collections.filter(collection => collection.toLowerCase().includes(filterValue));
}
resetAfterSubmit() {
- this.content.subject = '';
- this.content.body = '';
+ this.reset.emit(true);
this.translationService.get('content.submitted').subscribe(message => {
this.notificationService.show(message);
});
}
- submitContent(subject: string, body: string, group: string) {
+ submitContent() {
this.contentService.addContent(new ContentText(
'1',
'1',
this.roomId,
- subject,
- body,
+ this.contentSub,
+ this.contentBod,
1,
- [group],
+ [this.contentCol],
)).subscribe();
- if (this.content.body.valueOf() === '' || this.content.body.valueOf() === '') {
+ if (this.contentSub === '' || this.contentBod === '') {
this.translationService.get('content.no-empty').subscribe(message => {
this.notificationService.show(message);
});
return;
}
- sessionStorage.setItem('collection', group);
+ sessionStorage.setItem('collection', this.contentCol);
this.resetAfterSubmit();
}
diff --git a/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.html b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.html
index 2a6489270632a49fa96d0390555f521657fce89a..adcc6f37f5e71e002782b4a5f94eca69fbc325b6 100644
--- a/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.html
+++ b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.html
@@ -1,27 +1,12 @@
-<form (ngSubmit)="submitContent(subject.value, body.value, group.value)">
- <mat-form-field class="input-block">
- <input matInput #subject [(ngModel)]="content.subject" placeholder="{{ 'content.subject' | translate }}" name="subject">
- </mat-form-field>
- <mat-form-field class="input-block">
- <textarea matInput #body [(ngModel)]="content.body" placeholder="{{ 'content.body' | translate }}" name="body"></textarea>
- </mat-form-field>
- <mat-radio-group [(ngModel)]="yesno" [ngModelOptions]="{standalone: true}" fxLayout="row" fxLayoutAlign="center" fxLayoutGap="20px">
- <mat-radio-button [value]=true [checked]=true>
- {{ 'content.yes' | translate }}
- </mat-radio-button>
- <mat-radio-button [value]=false [checked]=false>
- {{ 'content.no' | translate }}
- </mat-radio-button>
- </mat-radio-group>
- <mat-form-field>
- <input matInput #group matInput [formControl]="myControl" [matAutocomplete]="auto"
- value={{lastCollection}} placeholder="{{'content.collection' | translate}}"/>
- <mat-autocomplete #auto="matAutocomplete">
- <mat-option *ngFor="let collection of filteredOptions | async" [value]="collection">
- {{collection}}
- </mat-option>
- </mat-autocomplete>
- </mat-form-field>
+<form (ngSubmit)="submitContent()">
+ <mat-radio-group [(ngModel)]="yesno" [ngModelOptions]="{standalone: true}" fxLayout="row" fxLayoutAlign="center" fxLayoutGap="20px">
+ <mat-radio-button [value]=true [checked]=true>
+ {{ 'content.yes' | translate }}
+ </mat-radio-button>
+ <mat-radio-button [value]=false [checked]=false>
+ {{ 'content.no' | translate }}
+ </mat-radio-button>
+ </mat-radio-group>
<div *ngIf="!editDialogMode">
<button mat-raised-button type="submit" color="accent">{{ 'content.create' | translate }}</button>
</div>
diff --git a/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts
index f36749c3248391557e6358ff0b8ebddcab8039a4..20842d4118faefd2742b161c58937c1ef0c99c60 100644
--- a/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts
+++ b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
import { ContentChoice } from '../../../models/content-choice';
import { DisplayAnswer } from '../content-choice-creator/content-choice-creator.component';
import { AnswerOption } from '../../../models/answer-option';
@@ -19,6 +19,11 @@ import { TranslateService } from '@ngx-translate/core';
styleUrls: ['./content-yes-no-creator.component.scss']
})
export class ContentYesNoCreatorComponent implements OnInit {
+ @Input() contentSub;
+ @Input() contentBod;
+ @Input() contentCol;
+ @Output() reset = new EventEmitter<boolean>();
+
yesno = true;
answerLabels = [
'yes',
@@ -84,8 +89,7 @@ export class ContentYesNoCreatorComponent implements OnInit {
}
resetAfterSubmit() {
- this.content.subject = '';
- this.content.body = '';
+ this.reset.emit(true);
this.content.correctOptionIndexes = [];
this.fillCorrectAnswers();
this.translationService.get('content.submitted').subscribe(message => {
@@ -93,8 +97,8 @@ export class ContentYesNoCreatorComponent implements OnInit {
});
}
- submitContent(subject: string, body: string, group: string): void {
- if (subject.valueOf() === '' || body.valueOf() === '') {
+ submitContent(): void {
+ if (this.contentSub === '' || this.contentBod === '') {
this.translationService.get('content.no-empty').subscribe(message => {
this.notificationService.show(message);
});
@@ -109,10 +113,10 @@ export class ContentYesNoCreatorComponent implements OnInit {
'',
'',
this.roomId,
- subject,
- body,
+ this.contentSub,
+ this.contentBod,
1,
- [group],
+ [this.contentCol],
this.content.options,
this.content.correctOptionIndexes,
this.content.multiple,
diff --git a/src/app/components/creator/creator.module.ts b/src/app/components/creator/creator.module.ts
index ed9055e526c00c446c9088a00585b24bf2df0eed..3c6b8b3a742e5975ebcfaff35e1f8408fe5c1d02 100644
--- a/src/app/components/creator/creator.module.ts
+++ b/src/app/components/creator/creator.module.ts
@@ -21,6 +21,7 @@ import { SharedModule } from '../shared/shared.module';
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { HttpClient } from '@angular/common/http';
import { TranslateHttpLoader } from '@ngx-translate/http-loader';
+import { ContentCreatorComponent } from './content-creator/content-creator.component';
@NgModule({
imports: [
@@ -50,7 +51,8 @@ import { TranslateHttpLoader } from '@ngx-translate/http-loader';
RoomCreateComponent,
RoomDeleteComponent,
RoomEditComponent,
- CreatorContentCarouselPageComponent
+ CreatorContentCarouselPageComponent,
+ ContentCreatorComponent
],
entryComponents: [
RoomCreateComponent,
diff --git a/src/app/components/shared/content-groups/content-groups.component.html b/src/app/components/shared/content-groups/content-groups.component.html
index b23bd887ce7fa2fa465df0ca30b6a5dbd7b2b671..e3b214e60197a1eccbfa22ff1c42d4a960465219 100644
--- a/src/app/components/shared/content-groups/content-groups.component.html
+++ b/src/app/components/shared/content-groups/content-groups.component.html
@@ -1,5 +1,5 @@
- <mat-card *ngFor="let contentGroup of displayedContentGroups" (click)="viewContents(contentGroup)">
+ <mat-card *ngFor="let contentGroup of contentGroups" (click)="viewContents(contentGroup)">
<mat-divider></mat-divider>
<mat-card-header>
<mat-card-title>
diff --git a/src/app/components/shared/content-list/content-list.component.ts b/src/app/components/shared/content-list/content-list.component.ts
index 348f87a4fe4f9f6e64e0a2b4f4fc3448418f4f7b..fe84073e7f7a4b95f9f3976d8cd3d4d5f5e8541c 100644
--- a/src/app/components/shared/content-list/content-list.component.ts
+++ b/src/app/components/shared/content-list/content-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
import { ContentService } from '../../../services/http/content.service';
import { Content } from '../../../models/content';
import { ActivatedRoute } from '@angular/router';
@@ -13,8 +13,8 @@ import { ContentTextCreatorComponent } from '../../creator/content-text-creator/
import { NotificationService } from '../../../services/util/notification.service';
import { Room } from '../../../models/room';
import { RoomService } from '../../../services/http/room.service';
-import {TranslateService} from "@ngx-translate/core";
-import {LanguageService} from "../../../services/util/language.service";
+import { TranslateService } from '@ngx-translate/core';
+import { LanguageService } from '../../../services/util/language.service';
class ContentGroup {
name: string;
diff --git a/src/app/models/content-group.ts b/src/app/models/content-group.ts
new file mode 100644
index 0000000000000000000000000000000000000000..4b4b0de0ecf90368dfd7159ef052b3fdee8e8a20
--- /dev/null
+++ b/src/app/models/content-group.ts
@@ -0,0 +1,11 @@
+export class ContentGroup {
+ name: string;
+ contentIds: string[];
+ autoSort: boolean;
+
+ constructor(name: string, contentIds: string[], autoSort: boolean) {
+ this.name = name;
+ this.contentIds = contentIds;
+ this.autoSort = autoSort;
+ }
+}
diff --git a/src/app/models/room.ts b/src/app/models/room.ts
index ab5859c46c68beb8236bf4f32fad6fd72282ea9e..e657ecd236f482c25c1272098e2145ab38083a07 100644
--- a/src/app/models/room.ts
+++ b/src/app/models/room.ts
@@ -1,3 +1,5 @@
+import { ContentGroup } from './content-group';
+
export class Room {
id: string;
revision: string;
@@ -6,5 +8,5 @@ export class Room {
name: string;
description: string;
closed: boolean;
- contentGroups: {[key: string]: [string]};
+ contentGroups: ContentGroup[];
}
diff --git a/src/app/services/http/content.service.ts b/src/app/services/http/content.service.ts
index 93b918d925ad3447b208a5b10b68785df6b0d3c5..bcc485fe6d87b38163cf0589e63e5c30c94e9056 100644
--- a/src/app/services/http/content.service.ts
+++ b/src/app/services/http/content.service.ts
@@ -5,6 +5,7 @@ import { Observable } from 'rxjs/Observable';
import { catchError, tap } from 'rxjs/operators';
import { BaseHttpService } from './base-http.service';
import { ContentChoice } from '../../models/content-choice';
+import { ContentGroup } from '../../models/content-group';
const httpOptions = {
headers: new HttpHeaders({ 'Content-Type': 'application/json' })
diff --git a/src/app/services/http/room.service.ts b/src/app/services/http/room.service.ts
index 42b4aaf4d12c390c6acd4d7c56d073d436bee24f..aed1b90c4126e53f6a896dbd3f5da691202115b5 100644
--- a/src/app/services/http/room.service.ts
+++ b/src/app/services/http/room.service.ts
@@ -5,6 +5,8 @@ import { Observable } from 'rxjs/Observable';
import { catchError, tap } from 'rxjs/operators';
import { AuthenticationService } from './authentication.service';
import { BaseHttpService } from './base-http.service';
+import { ContentGroup } from '../../models/content-group';
+import { Content } from '../../models/content';
const httpOptions = {
headers: new HttpHeaders({})
@@ -32,7 +34,7 @@ export class RoomService extends BaseHttpService {
externalFilters: {}
}).pipe(
tap(() => ''),
- catchError(this.handleError('getRooms', []))
+ catchError(this.handleError('getCreatorRooms', []))
);
}
@@ -43,7 +45,7 @@ export class RoomService extends BaseHttpService {
externalFilters: { inHistoryOfUserId: this.authService.getUser().id }
}).pipe(
tap(() => ''),
- catchError(this.handleError('getRooms', []))
+ catchError(this.handleError('getParticipantRooms', []))
);
}
@@ -93,6 +95,6 @@ export class RoomService extends BaseHttpService {
}
setRoomId(room: Room): void {
- localStorage.setItem(`roomId`, room.id);
+ localStorage.setItem('roomId', room.id);
}
}