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

Compare commits

base: Winsomnia:9231bd0d4a1528e7c9b99342faed139e33397d73
Branches Tags
Winsomnia:master
..
compare: Winsomnia:5d265e4b4831e431c1feb8c56d07f8e1931b4b9c
Branches Tags
Winsomnia:master

2 Commits
9231bd0d4a ... 5d265e4b48

Author SHA1 Message Date
Polianin Nikita
5d265e4b48 fix: combine typeOfOccupation
Some checks failed
Build and Deploy Angular App / build (push) Failing after 1m0s
Details
2024-10-25 01:53:25 +03:00
Polianin Nikita
a8159b4f27 build: update ref 2024-10-25 01:52:29 +03:00
4 changed files with 226 additions and 207 deletions
Show Stats Expand all files Collapse all files

387
package-lock.json generated
View File

@ -1,37 +1,37 @@
{
"name": "frontend",
"version": "1.0.0-b8",
"version": "1.0.0-b9",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "frontend",
"version": "1.0.0-b8",
"version": "1.0.0-b9",
"dependencies": {
"@angular/animations": "^18.2.7",
"@angular/cdk": "~18.2.7",
"@angular/cdk-experimental": "^18.2.7",
"@angular/common": "^18.2.7",
"@angular/compiler": "^18.2.7",
"@angular/core": "^18.2.7",
"@angular/forms": "^18.2.7",
"@angular/material": "~18.2.7",
"@angular/platform-browser": "^18.2.7",
"@angular/platform-browser-dynamic": "^18.2.7",
"@angular/router": "^18.2.7",
"@angular/animations": "^18.2.9",
"@angular/cdk": "~18.2.10",
"@angular/cdk-experimental": "^18.2.10",
"@angular/common": "^18.2.9",
"@angular/compiler": "^18.2.9",
"@angular/core": "^18.2.9",
"@angular/forms": "^18.2.9",
"@angular/material": "~18.2.10",
"@angular/platform-browser": "^18.2.9",
"@angular/platform-browser-dynamic": "^18.2.9",
"@angular/router": "^18.2.9",
"@dhutaryan/ngx-mat-timepicker": "^18.0.2",
"@progress/kendo-date-math": "^1.5.13",
"@progress/kendo-date-math": "^1.5.14",
"ngx-toastr": "^19.0.0",
"rxjs": "~7.8.1",
"tslib": "^2.7.0",
"tslib": "^2.8.0",
"zone.js": "^0.14.10"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.2.7",
"@angular/cli": "^18.2.7",
"@angular/compiler-cli": "^18.2.7",
"@angular-devkit/build-angular": "^18.2.10",
"@angular/cli": "^18.2.10",
"@angular/compiler-cli": "^18.2.9",
"@types/jasmine": "~5.1.4",
"jasmine-core": "~5.3.0",
"jasmine-core": "~5.4.0",
"karma": "~6.4.4",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.1",
@ -54,13 +54,13 @@
}
},
"node_modules/@angular-devkit/architect": {
"version": "0.1802.7",
"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.7.tgz",
"integrity": "sha512-kpcgXnepEXcoxDTbqbGj7Hg1WJLWj1HLR3/FKmC5TbpBf1xiLxiqfkQNwz3BbE/W9JWMLdrXr3GI9O3O2gWPLg==",
"version": "0.1802.10",
"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.10.tgz",
"integrity": "sha512-/xudcHK2s4J/GcL6qyobmGaWMHQcYLSMqCaWMT+nK6I6tu9VEAj/p3R83Tzx8B/eKi31Pz499uHw9pmqdtbafg==",
"dev": true,
"license": "MIT",
"dependencies": {
"@angular-devkit/core": "18.2.7",
"@angular-devkit/core": "18.2.10",
"rxjs": "7.8.1"
},
"engines": {
@ -70,17 +70,17 @@
}
},
"node_modules/@angular-devkit/build-angular": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.7.tgz",
"integrity": "sha512-u8PriYdgddK7k+OS/pOFPD1v4Iu5bztUJZXZVcGeXBZFFdnGFFzKmQw9mfcyGvTMJp2ABgBuuJT0YqYgNfAhzw==",
"version": "18.2.10",
"resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.10.tgz",
"integrity": "sha512-47XgJ5fdIqlZUFWAo/XtNsh3y597DtLZWvfsnwShw6/TgyiV0rbL1Z24Rn2TCV1D/b3VhLutAIIZ/i5O5BirxQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"@ampproject/remapping": "2.3.0",
"@angular-devkit/architect": "0.1802.7",
"@angular-devkit/build-webpack": "0.1802.7",
"@angular-devkit/core": "18.2.7",
"@angular/build": "18.2.7",
"@angular-devkit/architect": "0.1802.10",
"@angular-devkit/build-webpack": "0.1802.10",
"@angular-devkit/core": "18.2.10",
"@angular/build": "18.2.10",
"@babel/core": "7.25.2",
"@babel/generator": "7.25.0",
"@babel/helper-annotate-as-pure": "7.24.7",
@ -91,7 +91,7 @@
"@babel/preset-env": "7.25.3",
"@babel/runtime": "7.25.0",
"@discoveryjs/json-ext": "0.6.1",
"@ngtools/webpack": "18.2.7",
"@ngtools/webpack": "18.2.10",
"@vitejs/plugin-basic-ssl": "1.1.0",
"ansi-colors": "4.1.3",
"autoprefixer": "10.4.20",
@ -102,7 +102,7 @@
"css-loader": "7.1.2",
"esbuild-wasm": "0.23.0",
"fast-glob": "3.3.2",
"http-proxy-middleware": "3.0.0",
"http-proxy-middleware": "3.0.3",
"https-proxy-agent": "7.0.5",
"istanbul-lib-instrument": "6.0.3",
"jsonc-parser": "3.3.1",
@ -241,13 +241,13 @@
"license": "0BSD"
},
"node_modules/@angular-devkit/build-webpack": {
"version": "0.1802.7",
"resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.7.tgz",
"integrity": "sha512-VrtbrhZ+dht3f0GjtfRLRGRN4XHN/W+/bA9DqckdxVS6SydsrCWNHonvEPmOs4jJmGIGXIu6tUBMcWleTao2sg==",
"version": "0.1802.10",
"resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.10.tgz",
"integrity": "sha512-WRftK/RJ9rBDDmkx5IAtIpyNo0DJiMfgGUTuZNpNUaJfSfGeaSZYgC7o1++axMchID8pncmI3Hr8L8gaP94WQg==",
"dev": true,
"license": "MIT",
"dependencies": {
"@angular-devkit/architect": "0.1802.7",
"@angular-devkit/architect": "0.1802.10",
"rxjs": "7.8.1"
},
"engines": {
@ -261,9 +261,9 @@
}
},
"node_modules/@angular-devkit/core": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.7.tgz",
"integrity": "sha512-1ZTi4A6tEC2bkJ/puCIdIPYhesnlCVOMSDJL/lZAd0hC6X22T4pwu0AEvue7mcP5NbXpQDiBaXOZ3MmCA8PwOA==",
"version": "18.2.10",
"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.10.tgz",
"integrity": "sha512-LFqiNdraBujg8e1lhuB0bkFVAoIbVbeXXwfoeROKH60OPbP8tHdgV6sFTqU7UGBKA+b+bYye70KFTG2Ys8QzKQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@ -307,13 +307,13 @@
}
},
"node_modules/@angular-devkit/schematics": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.7.tgz",
"integrity": "sha512-j7198lpkOXMG+Gyfln/5aDgBZV7m4pWMzHFhkO3+w3cbCNUN1TVZW0SyJcF+CYaxANzTbuumfvpsYc/fTeAGLw==",
"version": "18.2.10",
"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.10.tgz",
"integrity": "sha512-EIm/yCYg3ZYPsPYJxXRX5F6PofJCbNQ5rZEuQEY09vy+ZRTqGezH0qoUP5WxlYeJrjiRLYqADI9WtVNzDyaD4w==",
"dev": true,
"license": "MIT",
"dependencies": {
"@angular-devkit/core": "18.2.7",
"@angular-devkit/core": "18.2.10",
"jsonc-parser": "3.3.1",
"magic-string": "0.30.11",
"ora": "5.4.1",
@ -326,9 +326,9 @@
}
},
"node_modules/@angular/animations": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.7.tgz",
"integrity": "sha512-5B7qD1K+kKOf9lgJT4VNMft3IK2BnRHjN1S6l38ywzQ/nxpmCG7f+qKAAU6CpCywhNUBeXW0hVXTMuMNPVOcQQ==",
"version": "18.2.9",
"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.9.tgz",
"integrity": "sha512-GAsTKENoTRVKgXX4ACBMMTp8SW4rW8u637uLag+ttJV2XBzC3YJlw5m6b/W4cdrmqZjztoEwUjR6CUTjBqMujQ==",
"license": "MIT",
"dependencies": {
"tslib": "^2.3.0"
@ -337,18 +337,18 @@
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
},
"peerDependencies": {
"@angular/core": "18.2.7"
"@angular/core": "18.2.9"
}
},
"node_modules/@angular/build": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.7.tgz",
"integrity": "sha512-oq6JsVxLP9/w9F2IjKroJwPB9CdlMblu2Xhfq/qQZRSUuM8Ppt1svr2FBTo1HrLIbosqukkVcSSdmKYDneo+cg==",
"version": "18.2.10",
"resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.10.tgz",
"integrity": "sha512-YFBKvAyC5sH17yRYcx7VHCtJ4KUg7xCjCQ4Pe16kiTvW6vuYsgU6Btyti0Qgewd7XaWpTM8hk8N6hE4Z0hpflw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@ampproject/remapping": "2.3.0",
"@angular-devkit/architect": "0.1802.7",
"@angular-devkit/architect": "0.1802.10",
"@babel/core": "7.25.2",
"@babel/helper-annotate-as-pure": "7.24.7",
"@babel/helper-split-export-declaration": "7.24.7",
@ -428,9 +428,9 @@
}
},
"node_modules/@angular/cdk": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.7.tgz",
"integrity": "sha512-Dfl37WBLeEUURQrDeuMcOgX2bkQJ+BGMOlr1qsFXzUWHH+qgYW2YwO1rbna/rjxyeFzc2Sy569dYRzNPqMewzg==",
"version": "18.2.10",
"resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.10.tgz",
"integrity": "sha512-Weh0slrfWNp5N6UO4m3tXzs2QBFexNsnJf1dq0oaLDBgfkuqUmxdCkurSv5+lWZRkTPLYmd/hQeJpvrhxMCleg==",
"license": "MIT",
"dependencies": {
"tslib": "^2.3.0"
@ -445,31 +445,31 @@
}
},
"node_modules/@angular/cdk-experimental": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular/cdk-experimental/-/cdk-experimental-18.2.7.tgz",
"integrity": "sha512-ugWpenAfED8RsCafuy7Gz28cTGwp/fNsiwLm9h4Hj7iWP5KNfNUWdocFBnegDXyiiqyNxml4DxH5XZjqFrqCyQ==",
"version": "18.2.10",
"resolved": "https://registry.npmjs.org/@angular/cdk-experimental/-/cdk-experimental-18.2.10.tgz",
"integrity": "sha512-dzfiKHaWRLpzJcWHqXZd3OXjtFN6NjVdL/Qc6YQbK8gMTqKmgWfxjtftR2v12ibZ20gNR8Plggkf9xixZ6rI8w==",
"license": "MIT",
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/cdk": "18.2.7",
"@angular/cdk": "18.2.10",
"@angular/core": "^18.0.0 || ^19.0.0"
}
},
"node_modules/@angular/cli": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.7.tgz",
"integrity": "sha512-KoWgSvhRsU05A2m6B7jw1kdpyoS+Ce5GGLW6xcnX7VF2AckW54vYd/8ZkgpzQrKfvIpVblYd4KJGizKoaLZ5jA==",
"version": "18.2.10",
"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.10.tgz",
"integrity": "sha512-qW/F3XVZMzzenFzbn+7FGpw8GOt9qW8UxBtYya7gUNdWlcsgGUk+ZaGC2OLbfI5gX6pchW4TOPMsDSMeaCEI2Q==",
"dev": true,
"license": "MIT",
"dependencies": {
"@angular-devkit/architect": "0.1802.7",
"@angular-devkit/core": "18.2.7",
"@angular-devkit/schematics": "18.2.7",
"@angular-devkit/architect": "0.1802.10",
"@angular-devkit/core": "18.2.10",
"@angular-devkit/schematics": "18.2.10",
"@inquirer/prompts": "5.3.8",
"@listr2/prompt-adapter-inquirer": "2.0.15",
"@schematics/angular": "18.2.7",
"@schematics/angular": "18.2.10",
"@yarnpkg/lockfile": "1.1.0",
"ini": "4.1.3",
"jsonc-parser": "3.3.1",
@ -492,9 +492,9 @@
}
},
"node_modules/@angular/common": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.7.tgz",
"integrity": "sha512-5vDBmBR2JcIxHVEDunKXNU+T+OvTGiHZTSo35GFOHJxKFgX5g6+0tJBZunK04oBZGbJQUmp3pg2kMvuKKjZnkQ==",
"version": "18.2.9",
"resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.9.tgz",
"integrity": "sha512-Opi6DVaU0aGyJqLk5jPmeYx559fp3afj4wuxM5aDzV4KEVGDVbNCpO0hMuwHZ6rtCjHhv1fQthgS48qoiQ6LKw==",
"license": "MIT",
"dependencies": {
"tslib": "^2.3.0"
@ -503,14 +503,14 @@
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
},
"peerDependencies": {
"@angular/core": "18.2.7",
"@angular/core": "18.2.9",
"rxjs": "^6.5.3 || ^7.4.0"
}
},
"node_modules/@angular/compiler": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.7.tgz",
"integrity": "sha512-XemlYyRGnu/HrICtXwTPmGtyOrI8BhbGg/HMiJ7sVx40AeEIX0uyDgnu9Gc5OjmtDqZZ8Qftg1sQAxaCVjLb1w==",
"version": "18.2.9",
"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.9.tgz",
"integrity": "sha512-fchbcbsyTOd/qHGy+yPEmE1p10OTNEjGrWHQzUbf3xdlm23EvxHTitHh8i6EBdwYnM5zz0IIBhltP8tt89oeYw==",
"license": "MIT",
"dependencies": {
"tslib": "^2.3.0"
@ -519,7 +519,7 @@
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
},
"peerDependencies": {
"@angular/core": "18.2.7"
"@angular/core": "18.2.9"
},
"peerDependenciesMeta": {
"@angular/core": {
@ -528,15 +528,15 @@
}
},
"node_modules/@angular/compiler-cli": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.7.tgz",
"integrity": "sha512-U7cveObj+rrXH5EC8egAhATCeAAcOceEQDTVIOWmBa0qMR4hOMjtI2XUS2QRuI1Q+fQZ2hVEOW95WVLvEMsANA==",
"version": "18.2.9",
"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.9.tgz",
"integrity": "sha512-4iMoRvyMmq/fdI/4Gob9HKjL/jvTlCjbS4kouAYHuGO9w9dmUhi1pY1z+mALtCEl9/Q8CzU2W8e5cU2xtV4nVg==",
"dev": true,
"license": "MIT",
"dependencies": {
"@babel/core": "7.25.2",
"@jridgewell/sourcemap-codec": "^1.4.14",
"chokidar": "^3.0.0",
"chokidar": "^4.0.0",
"convert-source-map": "^1.5.1",
"reflect-metadata": "^0.2.0",
"semver": "^7.0.0",
@ -552,14 +552,44 @@
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
},
"peerDependencies": {
"@angular/compiler": "18.2.7",
"@angular/compiler": "18.2.9",
"typescript": ">=5.4 <5.6"
}
},
"node_modules/@angular/compiler-cli/node_modules/chokidar": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
"integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
"dev": true,
"license": "MIT",
"dependencies": {
"readdirp": "^4.0.1"
},
"engines": {
"node": ">= 14.16.0"
},
"funding": {
"url": "https://paulmillr.com/funding/"
}
},
"node_modules/@angular/compiler-cli/node_modules/readdirp": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
"integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">= 14.16.0"
},
"funding": {
"type": "individual",
"url": "https://paulmillr.com/funding/"
}
},
"node_modules/@angular/core": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.7.tgz",
"integrity": "sha512-hLOxgxLiyWm9iVHBsUsJfx1hDsXWZnfJBlr+N7cev53f0CDoPfbshqq6KV+JFqXFDguzR9dKHm1ewT1jK3e6Tw==",
"version": "18.2.9",
"resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.9.tgz",
"integrity": "sha512-h9/Bzo/7LTPzzh9I/1Gk8TWOXPGeHt3jLlnYrCh2KbrWbTErNtW0V3ad5I3Zv+K2Z7RSl9Z3D3Y6ILH796N4ZA==",
"license": "MIT",
"dependencies": {
"tslib": "^2.3.0"
@ -573,9 +603,9 @@
}
},
"node_modules/@angular/forms": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.7.tgz",
"integrity": "sha512-WO3c9/OA7ekBnDBgmvi5TlHshOt5S4NREIP+/VVyuRgg28BwUWyO/Nqh19nguE1UNNRt6OMLkT6NSV2ewhcXUg==",
"version": "18.2.9",
"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.9.tgz",
"integrity": "sha512-yyN5dG60CXH6MRte8rv4aGUTeNOMz/pUV7rVxittpjN7tPHfGEL9Xz89Or90Aa1QiHuBmHFk+9A39s03aO1rDQ==",
"license": "MIT",
"dependencies": {
"tslib": "^2.3.0"
@ -584,23 +614,23 @@
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
},
"peerDependencies": {
"@angular/common": "18.2.7",
"@angular/core": "18.2.7",
"@angular/platform-browser": "18.2.7",
"@angular/common": "18.2.9",
"@angular/core": "18.2.9",
"@angular/platform-browser": "18.2.9",
"rxjs": "^6.5.3 || ^7.4.0"
}
},
"node_modules/@angular/material": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular/material/-/material-18.2.7.tgz",
"integrity": "sha512-mgPj2TCIrsngmu3iNnoaPc6su7uPv+NPCv9HaiKhTx4QGae8EW+RvUxEZJvh4Qaym1fJTi3hjnVeWvQDLQt4CA==",
"version": "18.2.10",
"resolved": "https://registry.npmjs.org/@angular/material/-/material-18.2.10.tgz",
"integrity": "sha512-XZISsICpTOzq2qR9yUaWrAz9WZCAh/B457gq/ftkkiiafLwFCvbKur19FFUJO5GX+uVdo074133L85xreOkFFw==",
"license": "MIT",
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/animations": "^18.0.0 || ^19.0.0",
"@angular/cdk": "18.2.7",
"@angular/cdk": "18.2.10",
"@angular/common": "^18.0.0 || ^19.0.0",
"@angular/core": "^18.0.0 || ^19.0.0",
"@angular/forms": "^18.0.0 || ^19.0.0",
@ -609,9 +639,9 @@
}
},
"node_modules/@angular/platform-browser": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.7.tgz",
"integrity": "sha512-xgj2DH/isFrMZ73dJJm89NRnWBI3AHtugQrZbIapkKBdEt/C1o4SR2W2cV4mPb9o+ELnWurfrxFt9o/q2vnVLw==",
"version": "18.2.9",
"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.9.tgz",
"integrity": "sha512-UNu6XjK0SV35FFe55yd1yefZI8tzflVKzev/RzC31XngrczhlH0+WCbae4rG1XJULzJwJ1R1p7gqq4+ktEczRQ==",
"license": "MIT",
"dependencies": {
"tslib": "^2.3.0"
@ -620,9 +650,9 @@
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
},
"peerDependencies": {
"@angular/animations": "18.2.7",
"@angular/common": "18.2.7",
"@angular/core": "18.2.7"
"@angular/animations": "18.2.9",
"@angular/common": "18.2.9",
"@angular/core": "18.2.9"
},
"peerDependenciesMeta": {
"@angular/animations": {
@ -631,9 +661,9 @@
}
},
"node_modules/@angular/platform-browser-dynamic": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.7.tgz",
"integrity": "sha512-BDldzUKjnUjo0NW5gHjBY6CeJP1bWVfF1h/T3idyYG+F4Lxlb3aykRgLWXg4srNLY1KqE7XOYUmgc5cV613bgw==",
"version": "18.2.9",
"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.9.tgz",
"integrity": "sha512-cUTB8Jc3I/fu2UKv/PJmNGQGvKyyTo8ln4GUX3EJ4wUHzgkrU0s4x7DNok0Ql8FZKs5dLR8C0xVbG7Dv/ViPdw==",
"license": "MIT",
"dependencies": {
"tslib": "^2.3.0"
@ -642,16 +672,16 @@
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
},
"peerDependencies": {
"@angular/common": "18.2.7",
"@angular/compiler": "18.2.7",
"@angular/core": "18.2.7",
"@angular/platform-browser": "18.2.7"
"@angular/common": "18.2.9",
"@angular/compiler": "18.2.9",
"@angular/core": "18.2.9",
"@angular/platform-browser": "18.2.9"
}
},
"node_modules/@angular/router": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.7.tgz",
"integrity": "sha512-TXE8Aw63hDp3PEaNu4B1DMNvlS0uCzs36o/OSCCmewmLnzyJygkgi4jeEj20FsWPAQOUj5g5tnCYgxz1IRrCUg==",
"version": "18.2.9",
"resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.9.tgz",
"integrity": "sha512-D0rSrMf/sbhr5yQgz+LNBxdv1BR3S4pYDj1Exq6yVRKX8HSbjc5hxe/44VaOEKBh8StJ6GRiNOMoIcDt73Jang==",
"license": "MIT",
"dependencies": {
"tslib": "^2.3.0"
@ -660,9 +690,9 @@
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
},
"peerDependencies": {
"@angular/common": "18.2.7",
"@angular/core": "18.2.7",
"@angular/platform-browser": "18.2.7",
"@angular/common": "18.2.9",
"@angular/core": "18.2.9",
"@angular/platform-browser": "18.2.9",
"rxjs": "^6.5.3 || ^7.4.0"
}
},
@ -3616,9 +3646,9 @@
]
},
"node_modules/@ngtools/webpack": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.7.tgz",
"integrity": "sha512-BmnFxss6zGobGyq9Mi7736golbK8RLgF+zYCQZ+4/OfMMA1jKVoELnyJqNyAx+DQn3m1qKVBjtGEL7pTNpPzOw==",
"version": "18.2.10",
"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.10.tgz",
"integrity": "sha512-CGYr8rdM5ntdb4kLUAhrLBPrhJQ4KBPo3KMT6qJE/S+jJJn5zHzedpuGFOCVhC1Siw+n1pOBSI8leTRJIW/eCQ==",
"dev": true,
"license": "MIT",
"engines": {
@ -3945,9 +3975,10 @@
}
},
"node_modules/@progress/kendo-date-math": {
"version": "1.5.13",
"resolved": "https://registry.npmjs.org/@progress/kendo-date-math/-/kendo-date-math-1.5.13.tgz",
"integrity": "sha512-uMVIbEEs7nyn4IeWXuMdV7lNGfrWgYheXiC2EDx6lpGG9s29QpUmn3NtnAcOOOHWj33/O9IwLIRAcEiFP/7DiA==",
"version": "1.5.14",
"resolved": "https://registry.npmjs.org/@progress/kendo-date-math/-/kendo-date-math-1.5.14.tgz",
"integrity": "sha512-uJDYQWIm5/kEc0SD6wG+yt2ttHE4/CfPlVhRPSYdrbNetZ1IAls/f37jCgXv7IYm6KZ5ImXlRWlwa/V1q9XXDg==",
"license": "SEE LICENSE IN LICENSE.md",
"dependencies": {
"tslib": "^1.7.0"
}
@ -4182,14 +4213,14 @@
]
},
"node_modules/@schematics/angular": {
"version": "18.2.7",
"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.7.tgz",
"integrity": "sha512-WOBzO11qstznHbC9tZXQf6/8+PqmaRI6QYcdTspqXNh9q9nNglvi43Xn4tSIpEhW8aSHea9hgWZV8sG+i/4W9Q==",
"version": "18.2.10",
"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.10.tgz",
"integrity": "sha512-2pDHT4aSzfs8Up4RQmHHuFd5FeuUebS1ZJwyt46MfXzRMFtzUZV/JKsIvDqyMwnkvFfLvgJyTCkl8JGw5jQObg==",
"dev": true,
"license": "MIT",
"dependencies": {
"@angular-devkit/core": "18.2.7",
"@angular-devkit/schematics": "18.2.7",
"@angular-devkit/core": "18.2.10",
"@angular-devkit/schematics": "18.2.10",
"jsonc-parser": "3.3.1"
},
"engines": {
@ -4450,10 +4481,11 @@
"license": "MIT"
},
"node_modules/@types/http-proxy": {
"version": "1.17.14",
"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz",
"integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==",
"version": "1.17.15",
"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz",
"integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"@types/node": "*"
}
@ -6283,12 +6315,13 @@
}
},
"node_modules/debug": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
"version": "4.3.7",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"ms": "2.1.2"
"ms": "^2.1.3"
},
"engines": {
"node": ">=6.0"
@ -6907,9 +6940,9 @@
"dev": true
},
"node_modules/express": {
"version": "4.21.0",
"resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
"integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
"version": "4.21.1",
"resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
"integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@ -6918,7 +6951,7 @@
"body-parser": "1.20.3",
"content-disposition": "0.5.4",
"content-type": "~1.0.4",
"cookie": "0.6.0",
"cookie": "0.7.1",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
"depd": "2.0.0",
@ -6950,9 +6983,9 @@
}
},
"node_modules/express/node_modules/cookie": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
"integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
"integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
"dev": true,
"license": "MIT",
"engines": {
@ -7724,22 +7757,33 @@
}
},
"node_modules/http-proxy-middleware": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.0.tgz",
"integrity": "sha512-36AV1fIaI2cWRzHo+rbcxhe3M3jUDCNzc4D5zRl57sEWRAxdXYtw7FSQKYY6PDKssiAKjLYypbssHk+xs/kMXw==",
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.3.tgz",
"integrity": "sha512-usY0HG5nyDUwtqpiZdETNbmKtw3QQ1jwYFZ9wi5iHzX2BcILwQKtYDJPo7XHTsu5Z0B2Hj3W9NNnbd+AjFWjqg==",
"dev": true,
"license": "MIT",
"dependencies": {
"@types/http-proxy": "^1.17.10",
"debug": "^4.3.4",
"@types/http-proxy": "^1.17.15",
"debug": "^4.3.6",
"http-proxy": "^1.18.1",
"is-glob": "^4.0.1",
"is-plain-obj": "^3.0.0",
"micromatch": "^4.0.5"
"is-glob": "^4.0.3",
"is-plain-object": "^5.0.0",
"micromatch": "^4.0.8"
},
"engines": {
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
}
},
"node_modules/http-proxy-middleware/node_modules/is-plain-object": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/https-proxy-agent": {
"version": "7.0.5",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
@ -8121,6 +8165,7 @@
"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
"integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=10"
},
@ -8347,9 +8392,9 @@
}
},
"node_modules/jasmine-core": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.3.0.tgz",
"integrity": "sha512-zsOmeBKESky4toybvWEikRiZ0jHoBEu79wNArLfMdSnlLMZx3Xcp6CSm2sUcYyoJC+Uyj8LBJap/MUbVSfJ27g==",
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.4.0.tgz",
"integrity": "sha512-T4fio3W++llLd7LGSGsioriDHgWyhoL6YTu4k37uwJLF7DzOzspz7mNxRoM3cQdLWtL/ebazQpIf/yZGJx/gzg==",
"dev": true,
"license": "MIT"
},
@ -9385,9 +9430,9 @@
}
},
"node_modules/memfs": {
"version": "4.12.0",
"resolved": "https://registry.npmjs.org/memfs/-/memfs-4.12.0.tgz",
"integrity": "sha512-74wDsex5tQDSClVkeK1vtxqYCAgCoXxx+K4NSHzgU/muYVYByFqa+0RnrPO9NM6naWm1+G9JmZ0p6QHhXmeYfA==",
"version": "4.14.0",
"resolved": "https://registry.npmjs.org/memfs/-/memfs-4.14.0.tgz",
"integrity": "sha512-JUeY0F/fQZgIod31Ja1eJgiSxLn7BfQlCnqhwXFBzFHEw63OdLK7VJUJ7bnzNsWgCyoUP5tEp1VRY8rDaYzqOA==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
@ -9780,10 +9825,11 @@
}
},
"node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"dev": true,
"license": "MIT"
},
"node_modules/msgpackr": {
"version": "1.11.0",
@ -11692,13 +11738,6 @@
"node": ">=4"
}
},
"node_modules/send/node_modules/ms": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"dev": true,
"license": "MIT"
},
"node_modules/send/node_modules/statuses": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@ -12627,9 +12666,9 @@
}
},
"node_modules/tslib": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
"integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
"version": "2.8.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
"integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==",
"license": "0BSD"
},
"node_modules/tuf-js": {
@ -13706,28 +13745,6 @@
"url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/webpack-dev-server/node_modules/ws": {
"version": "8.18.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=10.0.0"
},
"peerDependencies": {
"bufferutil": "^4.0.1",
"utf-8-validate": ">=5.0.2"
},
"peerDependenciesMeta": {
"bufferutil": {
"optional": true
},
"utf-8-validate": {
"optional": true
}
}
},
"node_modules/webpack-merge": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",

36
package.json
View File

@ -1,6 +1,6 @@
{
"name": "frontend",
"version": "1.0.0-b8",
"version": "1.0.0-b9",
"scripts": {
"ng": "ng",
"start": "ng serve",
@ -10,30 +10,30 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^18.2.7",
"@angular/cdk": "~18.2.7",
"@angular/cdk-experimental": "^18.2.7",
"@angular/common": "^18.2.7",
"@angular/compiler": "^18.2.7",
"@angular/core": "^18.2.7",
"@angular/forms": "^18.2.7",
"@angular/material": "~18.2.7",
"@angular/platform-browser": "^18.2.7",
"@angular/platform-browser-dynamic": "^18.2.7",
"@angular/router": "^18.2.7",
"@angular/animations": "^18.2.9",
"@angular/cdk": "~18.2.10",
"@angular/cdk-experimental": "^18.2.10",
"@angular/common": "^18.2.9",
"@angular/compiler": "^18.2.9",
"@angular/core": "^18.2.9",
"@angular/forms": "^18.2.9",
"@angular/material": "~18.2.10",
"@angular/platform-browser": "^18.2.9",
"@angular/platform-browser-dynamic": "^18.2.9",
"@angular/router": "^18.2.9",
"@dhutaryan/ngx-mat-timepicker": "^18.0.2",
"@progress/kendo-date-math": "^1.5.13",
"@progress/kendo-date-math": "^1.5.14",
"ngx-toastr": "^19.0.0",
"rxjs": "~7.8.1",
"tslib": "^2.7.0",
"tslib": "^2.8.0",
"zone.js": "^0.14.10"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.2.7",
"@angular/cli": "^18.2.7",
"@angular/compiler-cli": "^18.2.7",
"@angular-devkit/build-angular": "^18.2.10",
"@angular/cli": "^18.2.10",
"@angular/compiler-cli": "^18.2.9",
"@types/jasmine": "~5.1.4",
"jasmine-core": "~5.3.0",
"jasmine-core": "~5.4.0",
"karma": "~6.4.4",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.1",

8
src/components/schedule/table/table.component.html
View File

@ -51,10 +51,12 @@
<div class="mat-body-1">{{ elementData["discipline"] }}</div>
<!-- Type of Occupation -->
@for (typeOfOccupation of elementData["typeOfOccupations"]; track $index) {
@if ($index !== 0) {
<br/>
@if ($index === 0 && elementData["typeOfOccupations"][$index - 1] !== typeOfOccupation) {
@if ($index !== 0) {
<br/>
}
<div class="mat-body">({{ typeOfOccupation }})</div>
}
<div class="mat-body">({{ typeOfOccupation }})</div>
}
<!-- Professors -->

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

@ -89,7 +89,7 @@ export class TableComponent implements OnChanges {
);
const groupedData = filteredData.reduce((acc, item) => {
const key = `${item.lectureHalls}-${item.campus}-${item.discipline}-${item.professors.join(', ')}-${item.isExcludedWeeks}-${item.weeks?.join(', ') || ''}`;
const key = `${item.typeOfOccupations.join(', ')}-${item.lectureHalls}-${item.campus}-${item.discipline}-${item.professors.join(', ')}-${item.isExcludedWeeks}-${item.weeks?.join(', ') || ''}`;
if (!acc[key])
acc[key] = {...item, groups: [item.group]};
else