Skip to content
Snippets Groups Projects
Commit 7728c6cf authored by permcu's avatar permcu
Browse files

Rename lesson-objects-* queries to just lessons-* 

After parent renamed course-objects to timebound-course-configs,
this keeps uniform names.
parent abc870f2
No related branches found
No related tags found
2 merge requests!52Draft: Resolve "Always create TCCs and use them as single uniform inerface during planning",!50Resolve "Implement bundled courses/lessons"
Hide whitespace changes
Inline Side-by-side
aleksis/apps/lesrooster/frontend/components/timetable_management/TimetableManagement.vue
+ 31
− 31
View file @ 7728c6cf
......@@ -5,7 +5,7 @@ import {
createLessons,
deleteLessons,
gqlGroups,
lessonObjects,
lessons,
moveLesson,
overlayLessons,
updateLessons,
......@@ -187,8 +187,8 @@ export default defineComponent({
: 0;
},
},
lessonObjects: {
query: lessonObjects,
lessons: {
query: lessons,
variables() {
return {
timeGrid: this.internalTimeGrid.id,
......@@ -200,17 +200,17 @@ export default defineComponent({
},
result(
{
data: { lessonObjects = [] } = {
lessonObjects: [],
data: { lessons = [] } = {
lessons: [],
},
} = {
data: {
lessonObjects: [],
lessons: [],
},
},
) {
this.lessonsUsed = {};
lessonObjects.forEach((lesson) => {
lessons.forEach((lesson) => {
let increment =
this.periods.indexOf(lesson.slotEnd.period) -
this.periods.indexOf(lesson.slotStart.period) +
......@@ -252,8 +252,8 @@ export default defineComponent({
);
},
lessons() {
return this.lessonObjects
? this.lessonObjects.map((lesson) => ({
return this.lessons
? this.lessons.map((lesson) => ({
x: this.weekdays.indexOf(lesson.slotStart.weekday) + 1,
y: this.periods.indexOf(lesson.slotStart.period) + 1,
w:
......@@ -277,7 +277,7 @@ export default defineComponent({
gridLoading() {
return (
this.$apollo.queries.slots.loading ||
this.$apollo.queries.lessonObjects.loading ||
this.$apollo.queries.lessons.loading ||
this.$apollo.queries.groups.loading
);
},
......@@ -374,7 +374,7 @@ export default defineComponent({
}),
);
this.$apollo.queries.courses.refetch();
this.$apollo.queries.lessonObjects.refetch();
this.$apollo.queries.lessons.refetch();
},
internalTimeGrid(newTimeGrid, oldTimeGrid) {
if (!oldTimeGrid) return;
......@@ -449,9 +449,9 @@ export default defineComponent({
},
) {
let query = {
...that.$apollo.queries.lessonObjects.options,
...that.$apollo.queries.lessons.options,
variables: JSON.parse(
that.$apollo.queries.lessonObjects.previousVariablesJson,
that.$apollo.queries.lessons.previousVariablesJson,
),
};
// Read the data from cache for query
......@@ -463,11 +463,11 @@ export default defineComponent({
}
lessons.forEach((lesson) => {
const index = storedData.lessonObjects.findIndex(
const index = storedData.lessons.findIndex(
(lessonObject) => lessonObject.id === lesson.id,
);
storedData.lessonObjects[index].slotStart = lesson.slotStart;
storedData.lessonObjects[index].slotEnd = lesson.slotEnd;
storedData.lessons[index].slotStart = lesson.slotStart;
storedData.lessons[index].slotEnd = lesson.slotEnd;
// Write data back to the cache
store.writeQuery({ ...query, data: storedData });
......@@ -538,9 +538,9 @@ export default defineComponent({
},
) {
let query = {
...that.$apollo.queries.lessonObjects.options,
...that.$apollo.queries.lessons.options,
variables: JSON.parse(
that.$apollo.queries.lessonObjects.previousVariablesJson,
that.$apollo.queries.lessons.previousVariablesJson,
),
};
// Read the data from cache for query
......@@ -551,7 +551,7 @@ export default defineComponent({
return;
}
items.forEach((lesson) => storedData.lessonObjects.push(lesson));
items.forEach((lesson) => storedData.lessons.push(lesson));
// Write data back to the cache
store.writeQuery({ ...query, data: storedData });
......@@ -628,9 +628,9 @@ export default defineComponent({
},
) {
let query = {
...that.$apollo.queries.lessonObjects.options,
...that.$apollo.queries.lessons.options,
variables: JSON.parse(
that.$apollo.queries.lessonObjects.previousVariablesJson,
that.$apollo.queries.lessons.previousVariablesJson,
),
};
// Read the data from cache for query
......@@ -642,11 +642,11 @@ export default defineComponent({
}
lessons.forEach((lesson) => {
const index = storedData.lessonObjects.findIndex(
const index = storedData.lessons.findIndex(
(lessonObject) => lessonObject.id === lesson.id,
);
storedData.lessonObjects[index].slotStart = lesson.slotStart;
storedData.lessonObjects[index].slotEnd = lesson.slotEnd;
storedData.lessons[index].slotStart = lesson.slotStart;
storedData.lessons[index].slotEnd = lesson.slotEnd;
// Write data back to the cache
store.writeQuery({ ...query, data: storedData });
......@@ -735,9 +735,9 @@ export default defineComponent({
},
handleLessonEditUpdate(store, lesson) {
const query = {
...this.$apollo.queries.lessonObjects.options,
...this.$apollo.queries.lessons.options,
variables: JSON.parse(
this.$apollo.queries.lessonObjects.previousVariablesJson,
this.$apollo.queries.lessons.previousVariablesJson,
),
};
// Read the data from cache for query
......@@ -748,7 +748,7 @@ export default defineComponent({
return;
}
const index = storedData.lessonObjects.findIndex(
const index = storedData.lessons.findIndex(
(lessonObject) => lessonObject.id === lesson.id,
);
......@@ -756,9 +756,9 @@ export default defineComponent({
return;
}
storedData.lessonObjects[index].subject = lesson.subject;
storedData.lessonObjects[index].teachers = lesson.teachers;
storedData.lessonObjects[index].rooms = lesson.rooms;
storedData.lessons[index].subject = lesson.subject;
storedData.lessons[index].teachers = lesson.teachers;
storedData.lessons[index].rooms = lesson.rooms;
// Write data back to the cache
store.writeQuery({ ...query, data: storedData });
......@@ -1156,7 +1156,7 @@ export default defineComponent({
<delete-dialog
:gql-delete-mutation="deleteMutation"
:affected-query="$apollo.queries.lessonObjects"
:affected-query="$apollo.queries.lessons"
v-model="deleteDialog"
:items="itemsToDelete"
>
......
aleksis/apps/lesrooster/frontend/components/timetable_management/timetableManagement.graphql
+ 3
− 3
View file @ 7728c6cf
......@@ -43,8 +43,8 @@ query courses($group: ID!, $timeGrid: ID!) {
}
}
query lessonObjects($group: ID!, $timeGrid: ID!) {
lessonObjects: lessonObjectsForGroup(group: $group, timeGrid: $timeGrid) {
query lessons($group: ID!, $timeGrid: ID!) {
lessons: lessonsForGroup(group: $group, timeGrid: $timeGrid) {
id
slotStart {
id
......@@ -111,7 +111,7 @@ query lessonObjects($group: ID!, $timeGrid: ID!) {
}
query overlayLessons($rooms: [ID]!, $teachers: [ID]!, $timeGrid: ID!) {
overlayLessons: lessonsObjectsForRoomsOrTeachers(
overlayLessons: lessonsForRoomsOrTeachers(
rooms: $rooms
teachers: $teachers
timeGrid: $timeGrid
......
aleksis/apps/lesrooster/frontend/components/timetable_management/timetables/timetables.graphql
+ 2
− 2
View file @ 7728c6cf
query lessonsTeacher($teacher: ID!, $timeGrid: ID!) {
lessonsTeacher: lessonObjectsForTeacher(
lessonsTeacher: lessonsForTeacher(
teacher: $teacher
timeGrid: $timeGrid
) {
......@@ -57,7 +57,7 @@ query lessonsTeacher($teacher: ID!, $timeGrid: ID!) {
}
query lessonsRoom($room: ID!, $timeGrid: ID!) {
lessonsRoom: lessonObjectsForRoom(room: $room, timeGrid: $timeGrid) {
lessonsRoom: lessonsForRoom(room: $room, timeGrid: $timeGrid) {
id
slotStart {
id
......
aleksis/apps/lesrooster/schema/__init__.py
+ 7
− 7
View file @ 7728c6cf
......@@ -83,23 +83,23 @@ class Query(graphene.ObjectType):
group=graphene.ID(required=True),
time_grid=graphene.ID(required=True),
)
lesson_objects_for_group = graphene.List(
lessons_for_group = graphene.List(
LessonType,
group=graphene.ID(required=True),
time_grid=graphene.ID(required=True),
)
lesson_objects_for_teacher = graphene.List(
lessons_for_teacher = graphene.List(
LessonType,
teacher=graphene.ID(required=True),
time_grid=graphene.ID(required=True),
)
lesson_objects_for_room = graphene.List(
lessons_for_room = graphene.List(
LessonType,
room=graphene.ID(required=True),
time_grid=graphene.ID(required=True),
)
lessons_objects_for_rooms_or_teachers = graphene.List(
lessons_for_rooms_or_teachers = graphene.List(
LessonType,
rooms=graphene.List(graphene.ID, required=True),
teachers=graphene.List(graphene.ID, required=True),
......@@ -213,7 +213,7 @@ class Query(graphene.ObjectType):
return list(chain(courses, timebound_course_configs))
@staticmethod
def resolve_lesson_objects_for_group(root, info, group, time_grid):
def resolve_lessons_for_group(root, info, group, time_grid):
if not info.context.user.has_perm("lesrooster.plan_timetables_rule"):
return []
......@@ -231,7 +231,7 @@ class Query(graphene.ObjectType):
)
@staticmethod
def resolve_lesson_objects_for_teacher(root, info, teacher, time_grid):
def resolve_lessons_for_teacher(root, info, teacher, time_grid):
if not info.context.user.has_perm("lesrooster.plan_timetables_rule"):
return []
......@@ -242,7 +242,7 @@ class Query(graphene.ObjectType):
).distinct()
@staticmethod
def resolve_lesson_objects_for_room(root, info, room, time_grid):
def resolve_lessons_for_room(root, info, room, time_grid):
if not info.context.user.has_perm("lesrooster.plan_timetables_rule"):
return []
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment