Changeset 7e7cc4c

Timestamp:

11/04/21 22:46:29 (3 years ago)

Author:

Стојков Марко <mst@…>

Branches:

dev

Children:

48f727d, 74ad056

Parents:

cbdbb49

Message:

Questions for student dropdown

Location:

src/Clients/Angular/finki-chattery/src

Files:

• app/app.module.ts (modified) (1 diff)
• app/core/interceptors/loader.interceptor.ts (modified) (1 diff)
• app/shared-app/components/generic/header/header.component.html (modified) (2 diffs)
• app/shared-app/components/generic/header/header.component.ts (modified) (1 diff)
• app/shared-app/components/generic/text-editor/text-editor.component.html (modified) (1 diff)
• assets/translations/en.json (modified) (1 diff)

src/Clients/Angular/finki-chattery/src/app/app.module.ts

@@ -15 +15 @@
   declarations: [AppComponent, AuthCallbackComponent],
   imports: [
+    AppRoutingModule,
     BrowserModule,
-    AppRoutingModule,
     CoreModule,
     BrowserAnimationsModule,

src/Clients/Angular/finki-chattery/src/app/core/interceptors/loader.interceptor.ts

@@ -13 +13 @@
 
   intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
-    this.loader.appIsLoading();
-    return next.handle(request).pipe(finalize(() => this.loader.appStopedLoading()));
+    setTimeout(() => {
+      this.loader.appIsLoading();
+    }, 0);
+    return next.handle(request).pipe(
+      finalize(() =>
+        setTimeout(() => {
+          this.loader.appStopedLoading();
+        }, 100)
+      )
+    );
   }
 }

src/Clients/Angular/finki-chattery/src/app/shared-app/components/generic/header/header.component.html

@@ -16 +16 @@
       'header-ask-question' | translate
     }}</app-button>
+    <app-button [matMenuTriggerFor]="menu" class="margin-y-xs" *ngIf="auth.isLoggedIn()" [buttonType]="ButtonType.Basic">{{
+      'header-student-questions' | translate
+    }}</app-button>
     <app-button class="margin-y-xs" *ngIf="auth.isLoggedIn()" (action)="logout()" [buttonType]="ButtonType.Basic">{{
       'header-logout' | translate
@@ -24 +27 @@
   </mat-toolbar-row>
 </mat-toolbar>
+
+<mat-menu #menu="matMenu">
+  <button (click)="goToQuestion(q.questionUid)" mat-menu-item *ngFor="let q of auth.selfUser?.student?.questions">
+    <mat-icon>question_answer</mat-icon>
+    <span>{{ q?.title }}</span>
+  </button>
+</mat-menu>

src/Clients/Angular/finki-chattery/src/app/shared-app/components/generic/header/header.component.ts

@@ -29 +29 @@
     }
   }
+
+  goToQuestion(questionUid: string): void {
+    this.router.navigateByUrl(`questioning/${questionUid}`);
+  }
 }

src/Clients/Angular/finki-chattery/src/app/shared-app/components/generic/text-editor/text-editor.component.html

@@ -4 +4 @@
   matInput
   [init]="configuration"
-  [disabled]="readonly"
+  [attr.disabled]="readonly"
   [initialValue]="text"
   [formControl]="textForm"

src/Clients/Angular/finki-chattery/src/assets/translations/en.json

@@ -62 +62 @@
   "close-button": "Close",
   "submit-button": "Submit",
+  "header-student-questions": "Your questions",
   "AnswerAlreadyUpvoted": "You have already upvoted this answer",
   "AnswerAlreadyDownvoted": "You have already downvoted this answer",