Compare commits
4 Commits
004671c006
...
master
Author | SHA1 | Date | |
---|---|---|---|
52b2af097f | |||
ea5e731bd2 | |||
74a7fe7eb6 | |||
2f9d552e43 |
@ -19,17 +19,21 @@
|
|||||||
<div style="margin-top: 15px;">
|
<div style="margin-top: 15px;">
|
||||||
<p>Выбранные файлы:</p>
|
<p>Выбранные файлы:</p>
|
||||||
@for (item of selectedFiles; track $index) {
|
@for (item of selectedFiles; track $index) {
|
||||||
<div>
|
<p>
|
||||||
<p>
|
{{ item.file.name }}
|
||||||
{{ item.file.name }}
|
</p>
|
||||||
</p>
|
<mat-form-field color="accent" style="margin-bottom: 18px;">
|
||||||
<mat-form-field color="accent">
|
<mat-label>Кампус по умолчанию</mat-label>
|
||||||
<mat-label>
|
<input matInput type="text" [(ngModel)]="item.campus"
|
||||||
Кампус по умолчанию
|
[matAutocomplete]="auto">
|
||||||
</mat-label>
|
<mat-autocomplete #auto="matAutocomplete" (optionSelected)="onSelectCampus($event.option.value, item)">
|
||||||
<input matInput type="text" [(ngModel)]="item.campus"/>
|
@for (option of onFilter(item.campus); track $index) {
|
||||||
</mat-form-field>
|
<mat-option [value]="option">
|
||||||
</div>
|
{{ option }}
|
||||||
|
</mat-option>
|
||||||
|
}
|
||||||
|
</mat-autocomplete>
|
||||||
|
</mat-form-field>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
@ -10,8 +10,11 @@ import {MatIcon} from "@angular/material/icon";
|
|||||||
import {ScheduleService} from "@api/v1/configuration/schedule.service";
|
import {ScheduleService} from "@api/v1/configuration/schedule.service";
|
||||||
import {DataSpinnerComponent} from "@component/common/data-spinner/data-spinner.component";
|
import {DataSpinnerComponent} from "@component/common/data-spinner/data-spinner.component";
|
||||||
import {MatFormFieldModule} from "@angular/material/form-field";
|
import {MatFormFieldModule} from "@angular/material/form-field";
|
||||||
import {FormsModule} from "@angular/forms";
|
import {FormsModule, ReactiveFormsModule} from "@angular/forms";
|
||||||
import {MatInput} from "@angular/material/input";
|
import {MatInput} from "@angular/material/input";
|
||||||
|
import {ToastrService} from "ngx-toastr";
|
||||||
|
import {MatAutocomplete, MatAutocompleteTrigger, MatOption} from "@angular/material/autocomplete";
|
||||||
|
import {CampusService} from "@api/v1/campus.service";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-schedule-file-upload',
|
selector: 'app-schedule-file-upload',
|
||||||
@ -22,17 +25,33 @@ import {MatInput} from "@angular/material/input";
|
|||||||
DataSpinnerComponent,
|
DataSpinnerComponent,
|
||||||
MatFormFieldModule,
|
MatFormFieldModule,
|
||||||
FormsModule,
|
FormsModule,
|
||||||
MatInput
|
MatInput,
|
||||||
|
MatAutocomplete,
|
||||||
|
MatAutocompleteTrigger,
|
||||||
|
MatOption,
|
||||||
|
ReactiveFormsModule
|
||||||
],
|
],
|
||||||
templateUrl: './schedule-file-upload.component.html',
|
templateUrl: './schedule-file-upload.component.html',
|
||||||
providers: [ScheduleService]
|
providers: [ScheduleService, CampusService]
|
||||||
})
|
})
|
||||||
export class ScheduleFileUploadComponent {
|
export class ScheduleFileUploadComponent {
|
||||||
selectedFiles: { file: File, campus: string }[] = [];
|
protected selectedFiles: { file: File, campus: string }[] = [];
|
||||||
fileLoading: boolean = false;
|
protected fileLoading: boolean = false;
|
||||||
|
protected campuses: string[] = [];
|
||||||
@ViewChild('fileInput') input!: ElementRef;
|
@ViewChild('fileInput') input!: ElementRef;
|
||||||
|
|
||||||
constructor(private dialog: MatDialog, private api: ScheduleService) {
|
constructor(
|
||||||
|
private dialog: MatDialog,
|
||||||
|
private api: ScheduleService,
|
||||||
|
private notify: ToastrService,
|
||||||
|
campus: CampusService) {
|
||||||
|
campus.getCampus().subscribe(data => {
|
||||||
|
this.campuses = data.map(x => x.codeName);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
protected onSelectCampus(value: string, item: { file: File, campus: string }) {
|
||||||
|
item.campus = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected saveFunction() {
|
protected saveFunction() {
|
||||||
@ -48,20 +67,24 @@ export class ScheduleFileUploadComponent {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
onFileChooseClick() {
|
protected onFilter(value: string): string[] {
|
||||||
|
const filterValue = value?.toLowerCase() || '';
|
||||||
|
return this.campuses.filter(campus => campus.toLowerCase().includes(filterValue));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected onFileChooseClick() {
|
||||||
this.fileLoading = true;
|
this.fileLoading = true;
|
||||||
this.input.nativeElement.click();
|
this.input.nativeElement.click();
|
||||||
}
|
}
|
||||||
|
|
||||||
onFileSelected(event: any): void {
|
protected onFileSelected(event: any): void {
|
||||||
this.fileLoading = false;
|
this.fileLoading = false;
|
||||||
console.log(Array.from(event.target.files));
|
this.selectedFiles = Array.from(event.target.files).map(file => ({file: <File>file, campus: ''}));
|
||||||
this.selectedFiles = Array.from(event.target.files)
|
|
||||||
.map(x => <{file: File, campus: string}>{file: x, campus: ''});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onUpload(data: Observable<any>): void {
|
protected onUpload(data: Observable<any>): void {
|
||||||
data.subscribe(_ => {
|
data.subscribe(_ => {
|
||||||
|
this.notify.info(`Файлы в размере ${this.selectedFiles.length} успешно загружены. Задача поставлена в очередь`);
|
||||||
this.selectedFiles = [];
|
this.selectedFiles = [];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -69,9 +69,9 @@ export class SkipUpdateScheduleComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
validateSaveButton(): boolean {
|
validateSaveButton(): boolean {
|
||||||
return this.dateItems.some(item =>
|
return (this.dateItems.length == 0 || this.dateItems.some(item =>
|
||||||
(item.start && item.end) || item.date
|
(item.start && item.end) || item.date
|
||||||
) && JSON.stringify(this.dateItems) != JSON.stringify(this.dateItemsBefore);
|
)) && JSON.stringify(this.dateItems) != JSON.stringify(this.dateItemsBefore);
|
||||||
}
|
}
|
||||||
|
|
||||||
saveFunction() {
|
saveFunction() {
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
.notification-content {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: center;
|
|
||||||
margin-bottom: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.close-button {
|
|
||||||
margin-left: 8px;
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
<div class="notification-content" [class]="data.className">
|
|
||||||
<span>
|
|
||||||
{{ data.message }}
|
|
||||||
</span>
|
|
||||||
<button mat-icon-button class="close-button" (click)="dismiss()">
|
|
||||||
<mat-icon>close</mat-icon>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
@if (showProgressBar) {
|
|
||||||
<mat-progress-bar mode="determinate" [value]="progress" [color]="color"/>
|
|
||||||
}
|
|
@ -1,50 +0,0 @@
|
|||||||
import {Component, Inject} from '@angular/core';
|
|
||||||
import {MatIcon} from "@angular/material/icon";
|
|
||||||
import {MatProgressBar} from "@angular/material/progress-bar";
|
|
||||||
import {MAT_SNACK_BAR_DATA, MatSnackBarRef} from "@angular/material/snack-bar";
|
|
||||||
import {MatIconButton} from "@angular/material/button";
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-notification',
|
|
||||||
standalone: true,
|
|
||||||
imports: [
|
|
||||||
MatIconButton,
|
|
||||||
MatIcon,
|
|
||||||
MatProgressBar
|
|
||||||
],
|
|
||||||
templateUrl: './notification.component.html',
|
|
||||||
styleUrl: './notification.component.css'
|
|
||||||
})
|
|
||||||
|
|
||||||
export class NotificationComponent {
|
|
||||||
showProgressBar: boolean = false;
|
|
||||||
progress: number = 100;
|
|
||||||
color: string = "primary";
|
|
||||||
|
|
||||||
constructor(@Inject(MAT_SNACK_BAR_DATA) public data: any, private snackBarRef: MatSnackBarRef<NotificationComponent>) {
|
|
||||||
if (data.duration) {
|
|
||||||
this.startProgress(data.duration);
|
|
||||||
this.showProgressBar = true;
|
|
||||||
}
|
|
||||||
if (data.color) {
|
|
||||||
this.color = data.color;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dismiss(): void {
|
|
||||||
this.snackBarRef.dismiss();
|
|
||||||
}
|
|
||||||
|
|
||||||
private startProgress(duration: number): void {
|
|
||||||
const interval: number = duration / 100;
|
|
||||||
const progressInterval = setInterval(async () => {
|
|
||||||
this.progress--;
|
|
||||||
if (this.progress === 0) {
|
|
||||||
clearInterval(progressInterval);
|
|
||||||
setTimeout(() => {
|
|
||||||
this.dismiss();
|
|
||||||
}, 1000);
|
|
||||||
}
|
|
||||||
}, interval);
|
|
||||||
}
|
|
||||||
}
|
|
Reference in New Issue
Block a user