refactor: clean code
This commit is contained in:
@ -1 +1 @@
|
||||
<mat-progress-spinner [color]="color" mode="indeterminate" [diameter]="scale" />
|
||||
<mat-progress-spinner [color]="color" mode="indeterminate" [diameter]="scale"/>
|
||||
|
@ -1,13 +1,11 @@
|
||||
import {Component, Input} from '@angular/core';
|
||||
import {MatProgressSpinner} from "@angular/material/progress-spinner";
|
||||
import {NgStyle} from "@angular/common";
|
||||
|
||||
@Component({
|
||||
selector: 'app-data-spinner',
|
||||
standalone: true,
|
||||
imports: [
|
||||
MatProgressSpinner,
|
||||
NgStyle
|
||||
],
|
||||
templateUrl: './data-spinner.component.html'
|
||||
})
|
||||
|
@ -22,8 +22,8 @@
|
||||
<hr/>
|
||||
<div class="app-footer-copyright">
|
||||
<span>Powered by <a href="https://winsomnia.net">Winsomnia</a> ©{{ currentYear }}.</span>
|
||||
<a href="https://opensource.org/license/mit/">Code licensed under an MIT-style License.</a>
|
||||
<span>Current Version: {{ version }}</span>
|
||||
<a href="https://opensource.org/license/mit/">Code licensed under an MIT-style License.</a>
|
||||
<span>Current Version: {{ version }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
|
@ -1,16 +1,13 @@
|
||||
import { Component } from '@angular/core';
|
||||
import {Component} from '@angular/core';
|
||||
import {MatToolbar} from "@angular/material/toolbar";
|
||||
import {MatAnchor, MatButton} from "@angular/material/button";
|
||||
import {HasRoleDirective} from "@/directives/has-role.directive";
|
||||
import {AuthRoles} from "@model/AuthRoles";
|
||||
import {AuthRoles} from "@model/authRoles";
|
||||
|
||||
@Component({
|
||||
selector: 'app-header',
|
||||
standalone: true,
|
||||
imports: [
|
||||
MatToolbar,
|
||||
MatButton,
|
||||
MatAnchor,
|
||||
HasRoleDirective
|
||||
],
|
||||
templateUrl: './header.component.html',
|
||||
|
@ -1,14 +1,13 @@
|
||||
import {Component, EventEmitter, Input, Output} from '@angular/core';
|
||||
import {DataSpinnerComponent} from "@component/common/data-spinner/data-spinner.component";
|
||||
import {MatIcon} from "@angular/material/icon";
|
||||
import {MatButton, MatFabButton} from "@angular/material/button";
|
||||
import {MatFabButton} from "@angular/material/button";
|
||||
|
||||
@Component({
|
||||
selector: 'app-loading-indicator',
|
||||
standalone: true,
|
||||
imports: [
|
||||
DataSpinnerComponent,
|
||||
MatButton,
|
||||
MatIcon,
|
||||
MatFabButton
|
||||
],
|
||||
|
@ -3,7 +3,6 @@ import {MatTableDataSource, MatTableModule} from "@angular/material/table";
|
||||
import {MatIcon} from "@angular/material/icon";
|
||||
import {DatePipe} from "@angular/common";
|
||||
import {addDays} from "@progress/kendo-date-math";
|
||||
import {MatDivider} from "@angular/material/divider";
|
||||
import {DataSpinnerComponent} from "@component/common/data-spinner/data-spinner.component";
|
||||
import {ScheduleResponse} from "@api/v1/scheduleResponse";
|
||||
|
||||
@ -23,7 +22,6 @@ interface Dictionary {
|
||||
MatTableModule,
|
||||
MatIcon,
|
||||
DatePipe,
|
||||
MatDivider,
|
||||
DataSpinnerComponent
|
||||
],
|
||||
templateUrl: './table.component.html',
|
||||
|
@ -90,7 +90,7 @@
|
||||
}
|
||||
|
||||
@if (((filteredGroupsSpecialist && filteredGroupsSpecialist.length > 0 && filteredGroupsBehaviour && filteredGroupsBehaviour.length > 0) ||
|
||||
((!filteredGroupsSpecialist || filteredGroupsSpecialist.length === 0) && filteredGroupsBehaviour && filteredGroupsBehaviour.length > 0)) &&
|
||||
((!filteredGroupsSpecialist || filteredGroupsSpecialist.length === 0) && filteredGroupsBehaviour && filteredGroupsBehaviour.length > 0)) &&
|
||||
filteredGroupsMagistracy && filteredGroupsMagistracy.length > 0) {
|
||||
<div class="div-wrapper">
|
||||
<hr/>
|
||||
|
@ -23,7 +23,8 @@
|
||||
Кабинет
|
||||
</mat-panel-title>
|
||||
</mat-expansion-panel-header>
|
||||
<mat-chip-listbox hideSingleSelectionIndicator (change)="onLectureHallSelected($event.value)" [formControl]="formLectureHalls" #lectureChip>
|
||||
<mat-chip-listbox hideSingleSelectionIndicator (change)="onLectureHallSelected($event.value)"
|
||||
[formControl]="formLectureHalls" #lectureChip>
|
||||
@for (lectureHall of lectureHallsFiltered; track $index) {
|
||||
<mat-chip-option [value]="lectureHall.id" color="accent">
|
||||
{{ lectureHall.name }}
|
||||
|
@ -1,5 +1,4 @@
|
||||
import {Component, EventEmitter, ViewChild} from '@angular/core';
|
||||
import {AsyncPipe} from "@angular/common";
|
||||
import {MatAccordion, MatExpansionModule, MatExpansionPanel} from "@angular/material/expansion";
|
||||
import {MatChipListbox, MatChipsModule} from "@angular/material/chips";
|
||||
import {catchError} from "rxjs";
|
||||
@ -22,7 +21,6 @@ enum Enclosure {
|
||||
imports: [
|
||||
MatChipsModule,
|
||||
MatExpansionModule,
|
||||
AsyncPipe,
|
||||
ReactiveFormsModule,
|
||||
MatAccordion,
|
||||
LoadingIndicatorComponent
|
||||
|
@ -1,11 +1,14 @@
|
||||
<!--suppress CssInvalidPropertyValue -->
|
||||
<button mat-button [matMenuTriggerFor]="menu" #menuTrigger="matMenuTrigger" [id]="idButton" style="margin-bottom: 10px;">{{ textButton }}</button>
|
||||
<button mat-button [matMenuTriggerFor]="menu" #menuTrigger="matMenuTrigger" [id]="idButton"
|
||||
style="margin-bottom: 10px;">{{ textButton }}
|
||||
</button>
|
||||
|
||||
<mat-menu #menu="matMenu" [hasBackdrop]="false" class="menu-options">
|
||||
<div (click)="$event.stopPropagation()" (keydown)="$event.stopPropagation()" style="padding: 0 15px 15px">
|
||||
<div class="header-menu">
|
||||
<mat-form-field appearance="outline" color="accent" style="display:flex;">
|
||||
<input matInput placeholder="Поиск..." [(ngModel)]="searchQuery" [disabled]="data === null || data.length === 0">
|
||||
<input matInput placeholder="Поиск..." [(ngModel)]="searchQuery"
|
||||
[disabled]="data === null || data.length === 0">
|
||||
<button mat-icon-button matSuffix (click)="clearSearchQuery()" [disabled]="data === null || data.length === 0">
|
||||
<mat-icon style="color: var(--mdc-filled-button-label-text-color);">close</mat-icon>
|
||||
</button>
|
||||
|
@ -4,7 +4,6 @@ import {MatTab, MatTabGroup} from "@angular/material/tabs";
|
||||
import {Observable} from "rxjs";
|
||||
import {FormsModule, ReactiveFormsModule} from "@angular/forms";
|
||||
import {MatButton} from "@angular/material/button";
|
||||
import {DataSpinnerComponent} from "@component/common/data-spinner/data-spinner.component";
|
||||
import {GroupComponent} from "@component/schedule/tabs/group/group.component";
|
||||
import {ProfessorComponent} from "@component/schedule/tabs/professor/professor.component";
|
||||
import {LectureHallComponent} from "@component/schedule/tabs/lecture-hall/lecture-hall.component";
|
||||
@ -15,7 +14,7 @@ import {DisciplineService} from "@api/v1/discipline.service";
|
||||
import {LectureHallService} from "@api/v1/lectureHall.service";
|
||||
import {GroupService} from "@api/v1/group.service";
|
||||
import {ProfessorService} from "@api/v1/professor.service";
|
||||
import {AuthRoles} from "@model/AuthRoles";
|
||||
import {AuthRoles} from "@model/authRoles";
|
||||
import {HasRoleDirective} from "@/directives/has-role.directive";
|
||||
import {TabSelectType, TabStorageService} from "@service/tab-storage.service";
|
||||
import {ScheduleRequest} from "@api/v1/scheduleRequest";
|
||||
@ -36,7 +35,6 @@ export enum TabsSelect {
|
||||
MatTab,
|
||||
ReactiveFormsModule,
|
||||
MatButton,
|
||||
DataSpinnerComponent,
|
||||
GroupComponent,
|
||||
ProfessorComponent,
|
||||
LectureHallComponent,
|
||||
|
Reference in New Issue
Block a user