Skip to content
Snippets Groups Projects
Verified Commit 581ab8bf authored by Hangzhi Yu's avatar Hangzhi Yu Committed by magicfelix
Browse files

Fix saving of excuse types and extra marks

parent 2e63c743
No related branches found
No related tags found
1 merge request!284Draft: Redesign entering of lesson documentation
query CourseBook($lessonId: ID!) {
excuseTypes {
id
name
shortName
}
......@@ -55,17 +56,20 @@ query CourseBook($lessonId: ID!) {
absent
excused
excuseType {
id
name
shortName
}
remarks
extraMarks {
id
name
shortName
}
}
}
extraMarks {
id
name
shortName
}
......
......@@ -16,11 +16,13 @@ mutation UpdateOrCreateLessonDocumentation($year:Int!, $week:Int!, $lessonPeriod
absent
excused
excuseType {
id
name
shortName
}
remarks
extraMarks {
id
name
shortName
}
......
......@@ -70,16 +70,15 @@
v-model="editedExcuseType"
:items="excuseTypes"
item-text="name"
item-value="shortName"
return-object
:disabled="editedPersonID === ID_NO_PERSON || !editedAbsent || !editedExcused"
></v-select>
<!-- FIXME: get extra mark itself as value -->
<v-select
label="Extra Marks"
v-model="editedExtraMarks"
:items="extraMarks"
item-text="name"
item-value="valueOf"
return-object
:disabled="editedPersonID === ID_NO_PERSON"
multiple
chips
......@@ -180,14 +179,18 @@ export default {
return
}
let editedExcuseTypeID = (this.editedExcuseType) ? this.editedExcuseType.id : null;
let editedExtraMarksIDs = [];
this.editedExtraMarks.forEach(item => {editedExtraMarksIDs.push(item.id);});
// We save the user input in case of an error
const variables = {
"personId": this.editedPersonID,
"late": this.editedTardiness,
"absent": this.editedAbsent,
"excused": this.editedExcused,
"excuseType": this.editedExcuseType,
"extraMarks": this.editedExtraMarks,
"excuseType": editedExcuseTypeID,
"extraMarks": editedExtraMarksIDs,
"remarks": this.editedRemarks,
"lessonDocumentation": this.lessonDocumentationId,
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment