Skip to content

Commit c6efd22

Browse files
committed
Fixed a rendering bug in the feedback report
1 parent 074d60c commit c6efd22

File tree

6 files changed

+14
-17
lines changed

6 files changed

+14
-17
lines changed

projects/gameboard-ui/src/app/admin/components/feedback-editor/feedback-editor.component.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
22
import { BehaviorSubject, debounceTime, tap } from 'rxjs';
33
import { FeedbackTemplate } from '@/api/feedback-models';
4-
import { YamlService } from '@/services/yaml.service';
54
import { UnsubscriberService } from '@/services/unsubscriber.service';
6-
import { isObject } from '@/../tools/functions';
7-
import { YAMLParseError } from 'yaml';
8-
import { FeedbackService } from '@/api/feedback.service';
95
import { ModalConfirmService } from '@/services/modal-confirm.service';
106

117
@Component({
@@ -25,10 +21,8 @@ export class FeedbackEditorComponent implements OnInit {
2521
private templateChangeSubject$ = new BehaviorSubject<FeedbackTemplate | null>(null);
2622

2723
public constructor(
28-
private feedbackService: FeedbackService,
2924
private modalService: ModalConfirmService,
30-
private unsub: UnsubscriberService,
31-
private yamlService: YamlService) {
25+
private unsub: UnsubscriberService) {
3226
this.unsub.add(
3327
this.templateChangeSubject$
3428
.pipe(

projects/gameboard-ui/src/app/api/game.service.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ export class GameService {
174174
try {
175175
if (game.feedbackConfig) {
176176
game.feedbackTemplate = this.yamlService.parse<FeedbackTemplate>(game.feedbackConfig);
177-
console.log("loaded game template", game.feedbackTemplate);
178177
}
179178
}
180179
catch {

projects/gameboard-ui/src/app/feedback/components/feedback-submission-form/feedback-submission-form.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<small><span class="font-weight-bold align-middle">{{template?.helpText}}</span></small>
88
</div>
99

10-
<ng-container *ngIf="!submission.whenFinalized && !isAdminView; else finalized">
10+
<ng-container *ngIf="!submission.whenFinalized; else finalized">
1111
<div *ngFor="let q of submission.responses; let i = index" class="mb-4">
1212
<label for="{{q.id}}">
1313
<div class="d-flex">
@@ -118,7 +118,7 @@
118118
</div>
119119

120120
<ng-template #finalized>
121-
<alert type="success" *ngIf="!isAdminView">
121+
<alert type="success">
122122
Thanks for submitting your feedback! We saved it on
123123
<strong>{{ submission.whenFinalized | friendlyDateAndTime }}</strong>.
124124
</alert>

projects/gameboard-ui/src/app/feedback/components/feedback-submission-form/feedback-submission-form.component.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import { SpinnerComponent } from '@/standalone/core/components/spinner/spinner.c
3131
export class FeedbackSubmissionFormComponent implements AfterViewInit, OnInit, OnDestroy {
3232
@Input() feedbackEntity?: FeedbackSubmissionAttachedEntity;
3333
@Input() templateId?: string;
34-
@Input() isAdminView = false;
3534
@Input() isPreview = false;
3635
@ViewChild(NgForm) form!: FormGroup;
3736

@@ -74,10 +73,6 @@ export class FeedbackSubmissionFormComponent implements AfterViewInit, OnInit, O
7473
}
7574

7675
async submit(isAutoSave = false) {
77-
if (this.isAdminView) {
78-
return;
79-
}
80-
8176
if (!this.feedbackEntity) {
8277
throw new Error("Feedback entity is required");
8378
}

projects/gameboard-ui/src/app/reports/components/reports/feedback-report/feedback-report.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ export class FeedbackReportComponent extends ReportComponentBase<FeedbackReportP
7777
};
7878

7979
protected handleRecordClick(record: FeedbackReportRecord) {
80+
console.log("opening record", record);
8081
this.modalService.openComponent({
8182
content: PlayerFeedbackResponsesModalComponent,
8283
context: {
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
<app-modal-content *ngIf="record" title="Feedback" [subtitle]="record.user.name" [hideCancel]="true">
2-
<app-feedback-submission-form [templateId]="templateId" [isAdminView]="true"
3-
[feedbackEntity]="record.entity"></app-feedback-submission-form>
2+
<ol>
3+
<li *ngFor="let response of record.responses; index as i" class="my-4">
4+
<strong>{{ i + 1 }}. {{ response.prompt }}</strong>
5+
<div class="my-2" *ngIf="response.answer">{{ response.answer }}</div>
6+
</li>
7+
</ol>
48
</app-modal-content>
9+
10+
<ng-template #noResponse>
11+
<em>(no response)</em>
12+
</ng-template>

0 commit comments

Comments
 (0)