Skip to content

Commit 3388714

Browse files
committed
#352: Implemented duration limitation for the study duration and the relativeScheduler.
Also added a better error handling system and refined the UI a bit
1 parent 6656909 commit 3388714

18 files changed

Lines changed: 837 additions & 13287 deletions

package-lock.json

Lines changed: 0 additions & 12937 deletions
This file was deleted.

package.json

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,47 +23,49 @@
2323
"npm": "9.8.1"
2424
},
2525
"dependencies": {
26-
"axios": "1.7.2",
27-
"chart.js": "^4.4.3",
26+
"axios": "1.7.4",
27+
"chart.js": "^4.4.7",
2828
"cron-validate": "1.4.5",
2929
"keycloak-js": "25.0.1",
30+
"luxon": "^3.5.0",
3031
"normalize.css": "8.0.1",
3132
"pg": "8.12.0",
3233
"pinia": "2.1.7",
33-
"primeicons": "5.0.0",
34+
"primeicons": "7.0.0",
3435
"primevue": "3.46.0",
35-
"quill": "^2.0.2",
36+
"quill": "^2.0.3",
3637
"starwars-names": "1.6.0",
3738
"vue": "3.4.31",
38-
"vue-cal": "^4.8.1",
39-
"vue-i18n": "9.13.1",
39+
"vue-cal": "^4.10.0",
40+
"vue-i18n": "10.0.5",
4041
"vue-router": "4.4.0"
4142
},
4243
"devDependencies": {
4344
"@babel/core": "7.24.8",
4445
"@headlessui/vue": "1.7.22",
4546
"@heroicons/vue": "2.1.5",
46-
"@intlify/unplugin-vue-i18n": "^4.0.0",
47+
"@intlify/unplugin-vue-i18n": "^6.0.0",
4748
"@openapitools/openapi-generator-cli": "2.13.4",
4849
"@tailwindcss/aspect-ratio": "0.4.2",
4950
"@tailwindcss/forms": "0.5.7",
5051
"@tailwindcss/typography": "0.5.13",
5152
"@testing-library/vue": "8.1.0",
53+
"@types/luxon": "^3.4.2",
5254
"@types/node": "20.14.10",
5355
"@types/starwars-names": "1.6.2",
5456
"@types/tailwindcss": "3.0.11",
5557
"@typescript-eslint/eslint-plugin": "7.16.0",
5658
"@typescript-eslint/parser": "7.16.0",
5759
"@vitejs/plugin-vue": "5.0.5",
58-
"@vitest/coverage-v8": "^2.0.2",
60+
"@vitest/coverage-v8": "^2.1.8",
5961
"@vue/eslint-config-prettier": "9.0.0",
6062
"@vue/eslint-config-typescript": "13.0.0",
6163
"autoprefixer": "10.4.19",
6264
"babel-loader": "9.1.3",
6365
"eslint": "8.56.0",
6466
"eslint-plugin-prettier": "5.1.3",
6567
"eslint-plugin-vue": "9.27.0",
66-
"jsdom": "^24.1.0",
68+
"jsdom": "^25.0.1",
6769
"licensee": "10.0.0",
6870
"postcss": "8.4.39",
6971
"postcss-css-variables": "0.19.0",
@@ -76,8 +78,8 @@
7678
"prettier-plugin-tailwindcss": "0.6.5",
7779
"tailwindcss": "3.4.4",
7880
"typescript": "5.5.3",
79-
"vite": "5.3.3",
80-
"vitest": "2.0.2",
81+
"vite": "5.4.6",
82+
"vitest": "2.1.8",
8183
"vue-loader": "17.4.2",
8284
"vue-tsc": "2.0.26"
8385
}

src/components/StudyList.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,12 @@ Licensed under the Elastic License 2.0. */
4444
message: '',
4545
showMessage: false,
4646
});
47+
4748
function setAlertMessage(message: string): void {
4849
alert.message = message;
4950
alert.showMessage = true;
5051
}
52+
5153
function clearAlertMessage(): void {
5254
alert.message = '';
5355
alert.showMessage = false;
@@ -324,24 +326,24 @@ Licensed under the Elastic License 2.0. */
324326
<Button
325327
type="button"
326328
icon="pi pi-plus"
327-
:label="t('study.studyList.action.addStudy')"
329+
:label="$t('study.studyList.action.addStudy')"
328330
@click="openCreateDialog()"
329331
/>
330332
</div>
331333
<div class="ml-2.5">
332334
<FileUpload
333335
mode="basic"
334336
upload-icon="pi pi-upload"
335-
:choose-label="t('study.studyList.action.importStudy')"
337+
:choose-label="$t('study.studyList.action.importStudy')"
336338
:custom-upload="true"
337339
:auto="true"
338340
accept=".json"
339341
@uploader="onImportStudy($event)"
340-
></FileUpload>
342+
/>
341343
</div>
342344
</template>
343345
</MoreTable>
344-
<ConfirmDialog></ConfirmDialog>
346+
<ConfirmDialog />
345347
<DynamicDialog />
346348

347349
<AlertMsg

0 commit comments

Comments
 (0)