Skip to content

Commit 5cc53df

Browse files
committed
Fix attendance calendar and assignment forms using base components #6862
1 parent ca28937 commit 5cc53df

File tree

2 files changed

+14
-17
lines changed

2 files changed

+14
-17
lines changed

assets/vue/components/assignments/CorrectAndRateModal.vue

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,15 @@
3636
<div class="flex flex-col gap-2">
3737
<label>{{ t("Score") }}</label>
3838

39-
<template v-if="!forceStudentView">
40-
<input
41-
type="number"
42-
v-model.number="qualification"
43-
class="input border p-2 rounded"
44-
min="0"
45-
:max="maxQualification"
46-
step="0.1"
47-
/>
48-
<template v-if="maxQualification">
49-
<span class="text-xs text-gray-600"> {{ t("Max score") }}: {{ maxQualification }} </span>
50-
</template>
51-
</template>
39+
<BaseInputNumber
40+
v-if="!forceStudentView"
41+
id="qualification"
42+
:label="t('Score')"
43+
v-model.number="qualification"
44+
:min="0"
45+
:max="maxQualification"
46+
:help-text="maxQualification ? t('Max score') + maxQualification : null"
47+
/>
5248

5349
<template v-else>
5450
<span class="border p-2 rounded bg-gray-100 text-sm">
@@ -138,6 +134,7 @@ import BaseCheckbox from "../basecomponents/BaseCheckbox.vue"
138134
import cStudentPublicationService from "../../services/cstudentpublication"
139135
import { useRoute } from "vue-router"
140136
import { useSecurityStore } from "../../store/securityStore"
137+
import BaseInputNumber from "../basecomponents/BaseInputNumber.vue"
141138
142139
const props = defineProps({
143140
modelValue: Boolean,

assets/vue/components/attendance/AttendanceCalendarForm.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111

1212
<!-- Repeat Date -->
1313
<BaseCheckbox
14+
id="repeat"
1415
v-model="formData.repeatDate"
1516
:label="t('Repeat date')"
1617
@change="toggleRepeatOptions"
18+
name="repeat"
1719
/>
1820

1921
<div v-if="formData.repeatDate">
@@ -30,9 +32,8 @@
3032
<BaseInputNumber
3133
v-model="formData.repeatDays"
3234
:label="t('Number of days')"
33-
type="number"
3435
min="1"
35-
required
36+
id="xdays_number"
3637
/>
3738
</div>
3839

@@ -47,11 +48,10 @@
4748
</div>
4849

4950
<BaseInputNumber
51+
id="end_date_time"
5052
v-model="formData.duration"
5153
:label="t('Duration (minutes)')"
52-
type="number"
5354
min="1"
54-
required
5555
/>
5656

5757
<!-- Group -->

0 commit comments

Comments
 (0)