Winsomnia/MireaFrontend
1
0
Fork 0
Code Pull Requests Actions Projects Releases Activity

Compare commits

base: Winsomnia:6450acf6a39cb950b96b86a5406ed3e86734b677
Branches Tags
Winsomnia:master
...
compare: Winsomnia:85b8bab5306d6627b7c2b8eeb162932de84bcbed
Branches Tags
Winsomnia:master

2 Commits
6450acf6a3 ... 85b8bab530

Author SHA1 Message Date
Polianin Nikita
85b8bab530 build: upgrade ref
Some checks failed
Build and Deploy Angular App / build (push) Failing after 31s
Details
2024-09-15 21:44:10 +03:00
Polianin Nikita
80a7e71b84 fix: sort weeks 2024-09-15 21:13:55 +03:00
3 changed files with 690 additions and 408 deletions
Show Stats Expand all files Collapse all files

1062
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

34
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "frontend", "name": "frontend",
"version": "1.0.0-b5", "version": "1.0.0-b6",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
@ -10,29 +10,29 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^18.2.2", "@angular/animations": "^18.2.4",
"@angular/cdk": "~18.2.2", "@angular/cdk": "~18.2.4",
"@angular/cdk-experimental": "^18.2.2", "@angular/cdk-experimental": "^18.2.4",
"@angular/common": "^18.2.2", "@angular/common": "^18.2.4",
"@angular/compiler": "^18.2.2", "@angular/compiler": "^18.2.4",
"@angular/core": "^18.2.2", "@angular/core": "^18.2.4",
"@angular/forms": "^18.2.2", "@angular/forms": "^18.2.4",
"@angular/material": "~18.2.2", "@angular/material": "~18.2.4",
"@angular/platform-browser": "^18.2.2", "@angular/platform-browser": "^18.2.4",
"@angular/platform-browser-dynamic": "^18.2.2", "@angular/platform-browser-dynamic": "^18.2.4",
"@angular/router": "^18.2.2", "@angular/router": "^18.2.4",
"@dhutaryan/ngx-mat-timepicker": "^18.0.1", "@dhutaryan/ngx-mat-timepicker": "^18.0.1",
"@progress/kendo-date-math": "^1.5.13", "@progress/kendo-date-math": "^1.5.13",
"rxjs": "~7.8.1", "rxjs": "~7.8.1",
"tslib": "^2.7.0", "tslib": "^2.7.0",
"zone.js": "^0.14.10" "zone.js": "^0.15.0"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^18.2.2", "@angular-devkit/build-angular": "^18.2.4",
"@angular/cli": "^18.2.2", "@angular/cli": "^18.2.4",
"@angular/compiler-cli": "^18.2.2", "@angular/compiler-cli": "^18.2.4",
"@types/jasmine": "~5.1.4", "@types/jasmine": "~5.1.4",
"jasmine-core": "~5.2.0", "jasmine-core": "~5.3.0",
"karma": "~6.4.4", "karma": "~6.4.4",
"karma-chrome-launcher": "~3.2.0", "karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.1", "karma-coverage": "~2.2.1",

2
src/components/schedule/table/table.component.ts
View File

@ -106,7 +106,7 @@ export class TableComponent implements OnChanges {
else else
this.backupDisciplines[item.disciplineId] = item.discipline; this.backupDisciplines[item.disciplineId] = item.discipline;
item.discipline = `${item.isExcludedWeeks ? 'кр.' : 'н.'} ${item.weeks.join(', ')} ${item.discipline}`; item.discipline = `${item.isExcludedWeeks ? 'кр.' : ''} ${item.weeks.sort((x, y) => x - y).join(', ')} н. ${item.discipline}`;
} else if (this.backupDisciplines[item.disciplineId]) } else if (this.backupDisciplines[item.disciplineId])
item.discipline = this.backupDisciplines[item.disciplineId]; item.discipline = this.backupDisciplines[item.disciplineId];