Changeset 32cd040 for src

Timestamp:

10/27/21 21:37:43 (3 years ago)

Author:

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

Branches:

dev

Children:

15a34a3

Parents:

c205cc4

Message:

Added generic component for asking questions

Location:

src/Clients/Angular/finki-chattery/src/app

Files:

• core/guards/authorized-student.guard.ts (modified) (2 diffs)
• modules/questioning/components/ask-question/ask-question.component.html (modified) (1 diff)
• modules/questioning/components/ask-question/ask-question.component.ts (modified) (2 diffs)
• shared-app/components/components.ts (modified) (2 diffs)
• shared-app/components/question/ask-question-shared/ask-question-shared.component.html (added)
• shared-app/components/question/ask-question-shared/ask-question-shared.component.scss (added)
• shared-app/components/question/ask-question-shared/ask-question-shared.component.spec.ts (added)
• shared-app/components/question/ask-question-shared/ask-question-shared.component.ts (added)
• shared-app/models/index.ts (modified) (1 diff)
• shared-app/models/questioning-request.models.ts (moved) (moved from src/Clients/Angular/finki-chattery/src/app/modules/questioning/models/questioning-request.models.ts )

src/Clients/Angular/finki-chattery/src/app/core/guards/authorized-student.guard.ts

@@ -1 +1 @@
 import { Injectable } from '@angular/core';
 import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { ApplicationUserType } from 'src/app/shared-app/models';
 import { AuthService } from '../services';
 
@@ -11 +10 @@
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
-    return this.auth.user?.userType === ApplicationUserType.Student;
+    return this.auth.isStudent();
   }
 }

src/Clients/Angular/finki-chattery/src/app/modules/questioning/components/ask-question/ask-question.component.html

@@ -1 @@
-<form class="example-container" [formGroup]="questionFormGroup">
-  <mat-form-field class="full-width margin-bottom-sm" appearance="fill" appHandleInputFormErrors>
-    <mat-label>{{ 'ask-question-question-title' | translate }}</mat-label>
-    <input matInput [formControl]="titleForm" />
-  </mat-form-field>
-
-  <editor
-    matInput
-    class="margin-bottom-sm"
-    [formControl]="textForm"
-    [init]="{
-      apiKey: 'fx28x0d64jeufa35u7mcd80fgveayg5c4ap9gnr6posehzny',
-      menubar: false,
-      plugins: [
-        'advlist autolink lists link image charmap print preview anchor',
-        'searchreplace visualblocks code fullscreen',
-        'insertdatetime media table paste code help wordcount'
-      ],
-      toolbar:
-        'undo redo | formatselect | bold italic backcolor | code | \
-        alignleft aligncenter alignright alignjustify | \
-        bullist numlist outdent indent | removeformat | help'
-    }"
-  ></editor>
-  <mat-error *ngIf="textForm?.touched && textForm?.errors?.required">{{ 'not-found' | translate }}</mat-error>
-  <mat-error *ngIf="textForm?.touched && textForm?.errors?.maxlength">{{
-    'error-message-max-length' | translate: { maxlength: textForm?.errors?.maxlength?.requiredLength }
-  }}</mat-error>
-
-  <mat-form-field class="full-width margin-bottom-sm" appearance="fill" appHandleInputFormErrors>
-    <mat-label>{{ 'ask-question-categories' | translate }}</mat-label>
-    <mat-select [formControl]="categoriesForm" multiple>
-      <mat-option *ngFor="let category of categoriesList$ | async" [value]="category.uid">{{ category.translatedName }}</mat-option>
-    </mat-select>
-  </mat-form-field>
-
-  <app-button [disabled]="questionFormGroup.invalid" [buttonType]="ButtonType.CallToAction" (action)="askQuestion()">
-    {{ 'ask-question-ask-button' | translate }}
-  </app-button>
-</form>
+<app-ask-question-shared (askQuestion)="askQuestionAsStudent($event)"></app-ask-question-shared>

src/Clients/Angular/finki-chattery/src/app/modules/questioning/components/ask-question/ask-question.component.ts

@@ -1 +1 @@
 import { Component, OnInit } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
 
-import { CategoryFacadeService } from 'src/app/core/state/category-facade.service';
-import { ButtonType } from 'src/app/shared-app/components/generic/button/button.models';
-import { AskQuestionRequest } from '../../models/questioning-request.models';
+import { AskQuestionRequest } from 'src/app/shared-app/models';
 import { QuestioningApiService } from '../../services/questioning-api.service';
 
@@ -14 +11 @@
 })
 export class AskQuestionComponent implements OnInit {
-  public titleForm = new FormControl('', [Validators.required, Validators.maxLength(500)]);
-  public textForm = new FormControl('', [Validators.required, Validators.maxLength(4000)]);
-  public categoriesForm = new FormControl([]);
-  public questionFormGroup: FormGroup;
-  public ButtonType = ButtonType;
-  public categoriesList$ = this.categoriesFacade.getCategories();
-
-  constructor(private api: QuestioningApiService, private categoriesFacade: CategoryFacadeService, private router: Router) {
-    this.questionFormGroup = new FormGroup({
-      title: this.titleForm,
-      text: this.textForm,
-      categories: this.categoriesForm
-    });
-  }
+  constructor(private api: QuestioningApiService, private router: Router) {}
 
   ngOnInit(): void {}
 
-  public askQuestion(): void {
-    const body = new AskQuestionRequest(this.titleForm.value, this.textForm.value, this.categoriesForm.value);
+  public askQuestionAsStudent(body: AskQuestionRequest): void {
     this.api.askQuestion(body).subscribe((questionUid) => {
       this.router.navigateByUrl(`questioning/${questionUid}`);

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

@@ -4 +4 @@
 import { HeaderComponent } from './generic/header/header.component';
 import { VoteComponent } from './generic/vote/vote.component';
+import { AskQuestionSharedComponent } from './question/ask-question-shared/ask-question-shared.component';
 import { PreviewQuestionDisplayComponent } from './question/preview-question-display/preview-question-display.component';
 import { QuestionPreviewComponent } from './question/question-preview/question-preview.component';
@@ -18 +19 @@
   HeaderComponent,
   SearchQuestionComponent,
-  PreviewQuestionDisplayComponent
+  PreviewQuestionDisplayComponent,
+  AskQuestionSharedComponent
 ];

src/Clients/Angular/finki-chattery/src/app/shared-app/models/index.ts

@@ -4 +4 @@
 export * from './category-state-view-models.models';
 export * from './question-state-enums.models';
+export * from './questioning-request.models';