Skip to content
Snippets Groups Projects
Commit b88f7fd3 authored by Julian's avatar Julian
Browse files

Use new queries

parent c46a2427
No related branches found
No related tags found
1 merge request!361Resolve "Add statistics page for absences"
Pipeline #193388 failed
...@@ -19,40 +19,34 @@ ...@@ -19,40 +19,34 @@
<v-list-item-content> <v-list-item-content>
<v-list-item-title class="d-flex"> <v-list-item-title class="d-flex">
<!-- date & timeslot --> <!-- date & timeslot -->
<time :datetime="item.datetimeStart" class="text-no-wrap"> <time :datetime="item.relatedDocumentation.datetimeStart" class="text-no-wrap">
{{ $d(DateTime.fromISO(item.datetimeStart), "shortDate") }} {{ $d($parseISODate(item.relatedDocumentation.datetimeStart), "shortDate") }}
</time> </time>
<time :datetime="item.datetimeStart" class="text-no-wrap"> <time :datetime="item.relatedDocumentation.datetimeStart" class="text-no-wrap">
{{ $d(DateTime.fromISO(item.datetimeStart), "shortTime") }} {{ $d($parseISODate(item.relatedDocumentation.datetimeStart), "shortTime") }}
</time> </time>
<span>-</span> <span>-</span>
<time :datetime="item.datetimeEnd" class="text-no-wrap"> <time :datetime="item.relatedDocumentation.datetimeEnd" class="text-no-wrap">
{{ $d(DateTime.fromISO(item.datetimeEnd), "shortTime") }} {{ $d($parseISODate(item.relatedDocumentation.datetimeEnd), "shortTime") }}
</time> </time>
<!-- teacher --> <!-- teacher -->
<person-chip :person="item.teacher" no-link /> <person-chip v-for="teacher in item.relatedDocumentation.teachers" :person="teacher" no-link />
<!-- group --> <!-- group -->
<div> <div>
{{ item.groupShortName }} {{ item.groupShortName }}
</div> </div>
<!-- subject --> <!-- subject -->
<subject-chip :subject="item.subject" /> <subject-chip :subject="item.relatedDocumentation.subject" />
<v-spacer /> <v-spacer />
<!-- chips: absences & extraMarks --> <!-- chips: absences & extraMarks -->
<absence-reason-chip <absence-reason-chip
v-for="absence in items.absences" v-if="item.absenceReason"
:key="absence.id" :absenceReason="item.absenceReason"
:absenceReason="absence" />
<extra-mark-chip
v-if="item.extraMark"
:extra-mark="item.extraMark"
/> />
<v-chip
v-for="extraMark in item.extraMarks"
:key="extraMark.id"
:value="extraMark.id"
:color="extraMark.colourBg"
:text-color="extraMark.colourFg"
>
{{ extraMark.name }}
</v-chip>
</v-list-item-title> </v-list-item-title>
<v-list-item-subtitle> <v-list-item-subtitle>
{{ item.personalNote }} {{ item.personalNote }}
...@@ -67,24 +61,28 @@ ...@@ -67,24 +61,28 @@
class="flex-shrink-1" class="flex-shrink-1"
:compact="false" :compact="false"
:person="{ id: personId }" :person="{ id: personId }"
:school-term="{ id: schoolTerm }" :school-term="{ id: schoolTermId }"
/> />
</div> </div>
</template> </template>
<script> <script>
import AbsenceReasonChip from "aleksis.apps.kolego/components/AbsenceReasonChip.vue";
import SchoolTermField from "aleksis.core/components/school_term/SchoolTermField.vue"; import SchoolTermField from "aleksis.core/components/school_term/SchoolTermField.vue";
import CRUDIterator from "aleksis.core/components/generic/CRUDIterator.vue"; import CRUDIterator from "aleksis.core/components/generic/CRUDIterator.vue";
import PersonChip from "aleksis.core/components/person/PersonChip.vue"; import PersonChip from "aleksis.core/components/person/PersonChip.vue";
import SubjectChip from "aleksis.apps.cursus/components/SubjectChip.vue"; import SubjectChip from "aleksis.apps.cursus/components/SubjectChip.vue";
import StatisticsForPersonCard from "./StatisticsForPersonCard.vue"; import StatisticsForPersonCard from "./StatisticsForPersonCard.vue";
import { documentationsByPerson } from "./statistics.graphql"; import { participationsOfPerson, personalNotesForPerson } from "./statistics.graphql";
import { DateTime } from "luxon"; import { DateTime } from "luxon";
import ExtraMarkChip from "../../extra_marks/ExtraMarkChip.vue";
export default { export default {
name: "StatisticsForPersonPage", name: "StatisticsForPersonPage",
components: { components: {
ExtraMarkChip,
AbsenceReasonChip,
SchoolTermField, SchoolTermField,
CRUDIterator, CRUDIterator,
PersonChip, PersonChip,
...@@ -104,7 +102,6 @@ export default { ...@@ -104,7 +102,6 @@ export default {
}, },
data() { data() {
return { return {
schoolTerm: this.schoolTermId,
gqlQuery: documentationsByPerson, gqlQuery: documentationsByPerson,
}; };
}, },
...@@ -115,6 +112,14 @@ export default { ...@@ -115,6 +112,14 @@ export default {
term: this.schoolTermId, term: this.schoolTermId,
}; };
}, },
schoolTerm: {
get() {
return this.schoolTermId;
},
set(value) {
console.log("New SchoolTerm:", value);
}
},
}, },
}; };
</script> </script>
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