Skip to content

Commit

Permalink
#352: Implemented duration limitation for the study duration and the …
Browse files Browse the repository at this point in the history
…relativeScheduler.

Also added a better error handling system and refined the UI a bit
  • Loading branch information
janoliver20 committed Dec 10, 2024
1 parent 6656909 commit 3388714
Show file tree
Hide file tree
Showing 18 changed files with 837 additions and 13,287 deletions.
12,937 changes: 0 additions & 12,937 deletions package-lock.json

This file was deleted.

24 changes: 13 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,47 +23,49 @@
"npm": "9.8.1"
},
"dependencies": {
"axios": "1.7.2",
"chart.js": "^4.4.3",
"axios": "1.7.4",
"chart.js": "^4.4.7",
"cron-validate": "1.4.5",
"keycloak-js": "25.0.1",
"luxon": "^3.5.0",
"normalize.css": "8.0.1",
"pg": "8.12.0",
"pinia": "2.1.7",
"primeicons": "5.0.0",
"primeicons": "7.0.0",
"primevue": "3.46.0",
"quill": "^2.0.2",
"quill": "^2.0.3",
"starwars-names": "1.6.0",
"vue": "3.4.31",
"vue-cal": "^4.8.1",
"vue-i18n": "9.13.1",
"vue-cal": "^4.10.0",
"vue-i18n": "10.0.5",
"vue-router": "4.4.0"
},
"devDependencies": {
"@babel/core": "7.24.8",
"@headlessui/vue": "1.7.22",
"@heroicons/vue": "2.1.5",
"@intlify/unplugin-vue-i18n": "^4.0.0",
"@intlify/unplugin-vue-i18n": "^6.0.0",
"@openapitools/openapi-generator-cli": "2.13.4",
"@tailwindcss/aspect-ratio": "0.4.2",
"@tailwindcss/forms": "0.5.7",
"@tailwindcss/typography": "0.5.13",
"@testing-library/vue": "8.1.0",
"@types/luxon": "^3.4.2",
"@types/node": "20.14.10",
"@types/starwars-names": "1.6.2",
"@types/tailwindcss": "3.0.11",
"@typescript-eslint/eslint-plugin": "7.16.0",
"@typescript-eslint/parser": "7.16.0",
"@vitejs/plugin-vue": "5.0.5",
"@vitest/coverage-v8": "^2.0.2",
"@vitest/coverage-v8": "^2.1.8",
"@vue/eslint-config-prettier": "9.0.0",
"@vue/eslint-config-typescript": "13.0.0",
"autoprefixer": "10.4.19",
"babel-loader": "9.1.3",
"eslint": "8.56.0",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-vue": "9.27.0",
"jsdom": "^24.1.0",
"jsdom": "^25.0.1",
"licensee": "10.0.0",
"postcss": "8.4.39",
"postcss-css-variables": "0.19.0",
Expand All @@ -76,8 +78,8 @@
"prettier-plugin-tailwindcss": "0.6.5",
"tailwindcss": "3.4.4",
"typescript": "5.5.3",
"vite": "5.3.3",
"vitest": "2.0.2",
"vite": "5.4.6",
"vitest": "2.1.8",
"vue-loader": "17.4.2",
"vue-tsc": "2.0.26"
}
Expand Down
10 changes: 6 additions & 4 deletions src/components/StudyList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,12 @@ Licensed under the Elastic License 2.0. */
message: '',
showMessage: false,
});
function setAlertMessage(message: string): void {
alert.message = message;
alert.showMessage = true;
}
function clearAlertMessage(): void {
alert.message = '';
alert.showMessage = false;
Expand Down Expand Up @@ -324,24 +326,24 @@ Licensed under the Elastic License 2.0. */
<Button
type="button"
icon="pi pi-plus"
:label="t('study.studyList.action.addStudy')"
:label="$t('study.studyList.action.addStudy')"
@click="openCreateDialog()"
/>
</div>
<div class="ml-2.5">
<FileUpload
mode="basic"
upload-icon="pi pi-upload"
:choose-label="t('study.studyList.action.importStudy')"
:choose-label="$t('study.studyList.action.importStudy')"
:custom-upload="true"
:auto="true"
accept=".json"
@uploader="onImportStudy($event)"
></FileUpload>
/>
</div>
</template>
</MoreTable>
<ConfirmDialog></ConfirmDialog>
<ConfirmDialog />
<DynamicDialog />

<AlertMsg
Expand Down
Loading

0 comments on commit 3388714

Please sign in to comment.