Add exercise group descriptions to help page, restructure timeline
This commit is contained in:
@@ -98,7 +98,7 @@
|
|||||||
"iban": "DE41500105172184936679"
|
"iban": "DE41500105172184936679"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"accountRoleId": 2
|
"accountRoleId": 3
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"username": "guitarhero",
|
"username": "guitarhero",
|
||||||
|
|||||||
@@ -243,7 +243,8 @@
|
|||||||
"yourFullName": "Vollständiger Name",
|
"yourFullName": "Vollständiger Name",
|
||||||
"chooseFile": "Datei auswählen",
|
"chooseFile": "Datei auswählen",
|
||||||
"chooseDestinationFolder": "Zielordner auswählen",
|
"chooseDestinationFolder": "Zielordner auswählen",
|
||||||
"upload": "Hochladen"
|
"upload": "Hochladen",
|
||||||
|
"fulfillYourPersonalDataFirst": "Gehe zu den Einstellungen und fülle deinen Namen und deine Matrikelnummer aus"
|
||||||
},
|
},
|
||||||
"genre": {
|
"genre": {
|
||||||
"withoutBand": "ohne Band"
|
"withoutBand": "ohne Band"
|
||||||
|
|||||||
@@ -243,7 +243,8 @@
|
|||||||
"yourFullName": "Full name",
|
"yourFullName": "Full name",
|
||||||
"chooseFile": "Choose file",
|
"chooseFile": "Choose file",
|
||||||
"chooseDestinationFolder": "Choose destination folder",
|
"chooseDestinationFolder": "Choose destination folder",
|
||||||
"upload": "Upload"
|
"upload": "Upload",
|
||||||
|
"fulfillYourPersonalDataFirst": "Go to settings and enter your name and the right register number"
|
||||||
},
|
},
|
||||||
"genre": {
|
"genre": {
|
||||||
"withoutBand": "without Band"
|
"withoutBand": "without Band"
|
||||||
|
|||||||
@@ -26,7 +26,20 @@ function getDotColor(exerciseGroupNr: number) {
|
|||||||
<v-row>
|
<v-row>
|
||||||
<v-spacer />
|
<v-spacer />
|
||||||
|
|
||||||
|
<v-col
|
||||||
|
v-if="preferencesStore.studentName.length < 3 || preferencesStore.registrationNumber.length < 7"
|
||||||
|
cols="auto"
|
||||||
|
>
|
||||||
|
<card-view variant="outlined" >
|
||||||
|
{{ $t('misc.fulfillYourPersonalDataFirst') }}
|
||||||
|
</card-view>
|
||||||
|
</v-col>
|
||||||
|
|
||||||
<v-col cols="auto">
|
<v-col cols="auto">
|
||||||
|
<v-tooltip :text="$t('misc.fulfillYourPersonalDataFirst')">
|
||||||
|
<template #activator="{ props }"></template>
|
||||||
|
|
||||||
|
</v-tooltip>
|
||||||
<outlined-button
|
<outlined-button
|
||||||
prepend-icon="mdi-file-pdf-box"
|
prepend-icon="mdi-file-pdf-box"
|
||||||
@click="generateResultsPdf()"
|
@click="generateResultsPdf()"
|
||||||
@@ -49,16 +62,13 @@ function getDotColor(exerciseGroupNr: number) {
|
|||||||
class="px-5"
|
class="px-5"
|
||||||
align="start"
|
align="start"
|
||||||
>
|
>
|
||||||
<v-timeline-item
|
<template v-for="exercise of exerciseStore.exercises">
|
||||||
v-for="exercise of exerciseStore.exercises"
|
<v-timeline-item v-if="exercise.exerciseNr == 1"
|
||||||
:dot-color="getDotColor(exercise.exerciseGroup.groupNr)"
|
dot-color="grey"
|
||||||
:icon="exercise.solved ? 'mdi-check' : 'mdi-pencil'"
|
fill-dot
|
||||||
>
|
>
|
||||||
<!-- Left side -->
|
|
||||||
<template #opposite>
|
|
||||||
<div
|
<div
|
||||||
v-if="exercise.exerciseNr == 1"
|
:class="`pt-1 text-h5 font-weight-bold text-${getDotColor(exercise.exerciseGroup.groupNr)}`"
|
||||||
:class="`pt-1 font-weight-bold text-${getDotColor(exercise.exerciseGroup.groupNr)}`"
|
|
||||||
>
|
>
|
||||||
{{
|
{{
|
||||||
(preferencesStore.language == LanguageEnum.GERMAN
|
(preferencesStore.language == LanguageEnum.GERMAN
|
||||||
@@ -66,17 +76,30 @@ function getDotColor(exerciseGroupNr: number) {
|
|||||||
: exercise.exerciseGroup.nameEn)
|
: exercise.exerciseGroup.nameEn)
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
</template>
|
|
||||||
|
|
||||||
<!-- Right side -->
|
<div>
|
||||||
<card-view
|
{{
|
||||||
:title="$t('help.scoreBoard.exerciseNr', [exercise.exerciseGroup.groupNr, exercise.exerciseNr]) +
|
(preferencesStore.language == LanguageEnum.GERMAN
|
||||||
(preferencesStore.language == LanguageEnum.GERMAN ? exercise.nameDe : exercise.nameEn)"
|
? exercise.exerciseGroup.descriptionDe
|
||||||
:color="exercise.solved ? 'green' : 'primary'"
|
: exercise.exerciseGroup.descriptionEn)
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
|
</v-timeline-item>
|
||||||
|
|
||||||
|
<v-timeline-item
|
||||||
|
:dot-color="getDotColor(exercise.exerciseGroup.groupNr)"
|
||||||
|
:icon="exercise.solved ? 'mdi-check' : 'mdi-pencil'"
|
||||||
>
|
>
|
||||||
{{ preferencesStore.language == LanguageEnum.GERMAN ? exercise.descriptionDe : exercise.descriptionEn }}
|
<!-- Right side -->
|
||||||
</card-view>
|
<card-view
|
||||||
</v-timeline-item>
|
:title="$t('help.scoreBoard.exerciseNr', [exercise.exerciseGroup.groupNr, exercise.exerciseNr]) +
|
||||||
|
(preferencesStore.language == LanguageEnum.GERMAN ? exercise.nameDe : exercise.nameEn)"
|
||||||
|
:color="exercise.solved ? 'green' : 'primary'"
|
||||||
|
>
|
||||||
|
{{ preferencesStore.language == LanguageEnum.GERMAN ? exercise.descriptionDe : exercise.descriptionEn }}
|
||||||
|
</card-view>
|
||||||
|
</v-timeline-item>
|
||||||
|
</template>
|
||||||
</v-timeline>
|
</v-timeline>
|
||||||
</template>
|
</template>
|
||||||
</card-view>
|
</card-view>
|
||||||
|
|||||||
Reference in New Issue
Block a user