aleksis/AlekSIS-App-Chronos
8
0
Fork 0
Code Issues 51 Pull requests 5 Projects Releases 4 Packages Activity Actions

Resolve "Next/prev functions for persons don't return the next/prev lesson" #447

Merged
hansegucker merged 1 commit from 121-next-prev-functions-for-persons-don-t-return-the-next-prev-lesson into master 2021-03-25 21:46:40 +01:00
Conversation 11 Commits 1 Files changed 1 +1 -1
hansegucker commented 2021-03-25 16:49:38 +01:00 (Migrated from edugit.org)
Copy link

Closes #121

Closes #121
hansegucker commented 2021-03-25 17:07:59 +01:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 0de18355 - Fix position of order_by in lessons_on_day query on person model

Compare with previous version

added 1 commit <ul><li>0de18355 - Fix position of order_by in lessons_on_day query on person model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/143/diffs?diff_id=6348&start_sha=9c92bdfc442abe451fc05364ec73414fc6672f8c)
hansegucker commented 2021-03-25 17:08:09 +01:00 (Migrated from edugit.org)
Copy link

assigned to @nik and unassigned @hansegucker

assigned to @nik and unassigned @hansegucker
hansegucker commented 2021-03-25 17:08:12 +01:00 (Migrated from edugit.org)
Copy link

marked this merge request as ready

marked this merge request as **ready**
nik commented 2021-03-25 17:34:07 +01:00 (Migrated from edugit.org)
Copy link

Huh… that should not make a difference.

Please paste the diff between the generated queries.

Huh… that should not make a difference. Please paste the diff between the generated queries.
hansegucker commented 2021-03-25 17:44:30 +01:00 (Migrated from edugit.org)
Copy link

Before

	
(
        SELECT "chronos_lessonperiod"."id",
               "chronos_lessonperiod"."site_id",
               "chronos_lessonperiod"."extended_data",
               "chronos_lessonperiod"."lesson_id",
               "chronos_lessonperiod"."period_id",
               "chronos_lessonperiod"."room_id",
               11 AS "_week",
               2021 AS "_year",
               "chronos_lesson"."id",
               "chronos_lesson"."site_id",
               "chronos_lesson"."extended_data",
               "chronos_lesson"."validity_id",
               "chronos_lesson"."subject_id",
               "chronos_validityrange"."id",
               "chronos_validityrange"."site_id",
               "chronos_validityrange"."extended_data",
               "chronos_validityrange"."school_term_id",
               "chronos_validityrange"."name",
               "chronos_validityrange"."date_start",
               "chronos_validityrange"."date_end",
               "core_schoolterm"."id",
               "core_schoolterm"."site_id",
               "core_schoolterm"."extended_data",
               "core_schoolterm"."name",
               "core_schoolterm"."date_start",
               "core_schoolterm"."date_end",
               "chronos_subject"."id",
               "chronos_subject"."site_id",
               "chronos_subject"."extended_data",
               "chronos_subject"."short_name",
               "chronos_subject"."name",
               "chronos_subject"."colour_fg",
               "chronos_subject"."colour_bg",
               "chronos_timeperiod"."id",
               "chronos_timeperiod"."site_id",
               "chronos_timeperiod"."extended_data",
               "chronos_timeperiod"."validity_id",
               "chronos_timeperiod"."weekday",
               "chronos_timeperiod"."period",
               "chronos_timeperiod"."time_start",
               "chronos_timeperiod"."time_end",
               "chronos_room"."id",
               "chronos_room"."site_id",
               "chronos_room"."extended_data",
               "chronos_room"."short_name",
               "chronos_room"."name"
          FROM "chronos_lessonperiod"
         INNER JOIN "chronos_lesson"
            ON ("chronos_lessonperiod"."lesson_id" = "chronos_lesson"."id")
         INNER JOIN "chronos_validityrange"
            ON ("chronos_lesson"."validity_id" = "chronos_validityrange"."id")
         INNER JOIN "chronos_timeperiod"
            ON ("chronos_lessonperiod"."period_id" = "chronos_timeperiod"."id")
         INNER JOIN "chronos_lesson_teachers"
            ON ("chronos_lesson"."id" = "chronos_lesson_teachers"."lesson_id")
         INNER JOIN "core_schoolterm"
            ON ("chronos_validityrange"."school_term_id" = "core_schoolterm"."id")
         INNER JOIN "chronos_subject"
            ON ("chronos_lesson"."subject_id" = "chronos_subject"."id")
          LEFT OUTER JOIN "chronos_room"
            ON ("chronos_lessonperiod"."room_id" = "chronos_room"."id")
         WHERE ("chronos_lessonperiod"."site_id" = 1 AND "chronos_validityrange"."date_end" >= '2021-03-16'::date AND "chronos_validityrange"."date_start" <= '2021-03-16'::date AND "chronos_timeperiod"."weekday" = 1 AND "chronos_lesson_teachers"."person_id" = 1738)
         ORDER BY "chronos_timeperiod"."period" ASC
       )
 UNION (
        SELECT "chronos_lessonperiod"."id",
               "chronos_lessonperiod"."site_id",
               "chronos_lessonperiod"."extended_data",
               "chronos_lessonperiod"."lesson_id",
               "chronos_lessonperiod"."period_id",
               "chronos_lessonperiod"."room_id",
               11 AS "_week",
               2021 AS "_year",
               "chronos_lesson"."id",
               "chronos_lesson"."site_id",
               "chronos_lesson"."extended_data",
               "chronos_lesson"."validity_id",
               "chronos_lesson"."subject_id",
               "chronos_validityrange"."id",
               "chronos_validityrange"."site_id",
               "chronos_validityrange"."extended_data",
               "chronos_validityrange"."school_term_id",
               "chronos_validityrange"."name",
               "chronos_validityrange"."date_start",
               "chronos_validityrange"."date_end",
               "core_schoolterm"."id",
               "core_schoolterm"."site_id",
               "core_schoolterm"."extended_data",
               "core_schoolterm"."name",
               "core_schoolterm"."date_start",
               "core_schoolterm"."date_end",
               "chronos_subject"."id",
               "chronos_subject"."site_id",
               "chronos_subject"."extended_data",
               "chronos_subject"."short_name",
               "chronos_subject"."name",
               "chronos_subject"."colour_fg",
               "chronos_subject"."colour_bg",
               "chronos_timeperiod"."id",
               "chronos_timeperiod"."site_id",
               "chronos_timeperiod"."extended_data",
               "chronos_timeperiod"."validity_id",
               "chronos_timeperiod"."weekday",
               "chronos_timeperiod"."period",
               "chronos_timeperiod"."time_start",
               "chronos_timeperiod"."time_end",
               "chronos_room"."id",
               "chronos_room"."site_id",
               "chronos_room"."extended_data",
               "chronos_room"."short_name",
               "chronos_room"."name"
          FROM "chronos_lessonperiod"
         INNER JOIN "chronos_lesson"
            ON ("chronos_lessonperiod"."lesson_id" = "chronos_lesson"."id")
         INNER JOIN "chronos_validityrange"
            ON ("chronos_lesson"."validity_id" = "chronos_validityrange"."id")
         INNER JOIN "chronos_timeperiod"
            ON ("chronos_lessonperiod"."period_id" = "chronos_timeperiod"."id")
         INNER JOIN "chronos_lessonsubstitution"
            ON ("chronos_lessonperiod"."id" = "chronos_lessonsubstitution"."lesson_period_id")
         INNER JOIN "chronos_lessonsubstitution_teachers"
            ON ("chronos_lessonsubstitution"."id" = "chronos_lessonsubstitution_teachers"."lessonsubstitution_id")
         INNER JOIN "core_schoolterm"
            ON ("chronos_validityrange"."school_term_id" = "core_schoolterm"."id")
         INNER JOIN "chronos_subject"
            ON ("chronos_lesson"."subject_id" = "chronos_subject"."id")
          LEFT OUTER JOIN "chronos_room"
            ON ("chronos_lessonperiod"."room_id" = "chronos_room"."id")
         WHERE ("chronos_lessonperiod"."site_id" = 1 AND "chronos_validityrange"."date_end" >= '2021-03-16'::date AND "chronos_validityrange"."date_start" <= '2021-03-16'::date AND "chronos_timeperiod"."weekday" = 1 AND "chronos_lessonsubstitution_teachers"."person_id" = 1738 AND "chronos_lessonsubstitution"."week" = 11 AND "chronos_lessonsubstitution"."year" = 2021)
         ORDER BY "chronos_timeperiod"."period" ASC
       )

After

	
(
        SELECT "chronos_lessonperiod"."id",
               "chronos_lessonperiod"."site_id",
               "chronos_lessonperiod"."extended_data",
               "chronos_lessonperiod"."lesson_id",
               "chronos_lessonperiod"."period_id",
               "chronos_lessonperiod"."room_id",
               11 AS "_week",
               2021 AS "_year",
               "chronos_lesson"."id",
               "chronos_lesson"."site_id",
               "chronos_lesson"."extended_data",
               "chronos_lesson"."validity_id",
               "chronos_lesson"."subject_id",
               "chronos_validityrange"."id",
               "chronos_validityrange"."site_id",
               "chronos_validityrange"."extended_data",
               "chronos_validityrange"."school_term_id",
               "chronos_validityrange"."name",
               "chronos_validityrange"."date_start",
               "chronos_validityrange"."date_end",
               "core_schoolterm"."id",
               "core_schoolterm"."site_id",
               "core_schoolterm"."extended_data",
               "core_schoolterm"."name",
               "core_schoolterm"."date_start",
               "core_schoolterm"."date_end",
               "chronos_subject"."id",
               "chronos_subject"."site_id",
               "chronos_subject"."extended_data",
               "chronos_subject"."short_name",
               "chronos_subject"."name",
               "chronos_subject"."colour_fg",
               "chronos_subject"."colour_bg",
               "chronos_timeperiod"."id",
               "chronos_timeperiod"."site_id",
               "chronos_timeperiod"."extended_data",
               "chronos_timeperiod"."validity_id",
               "chronos_timeperiod"."weekday",
               "chronos_timeperiod"."period",
               "chronos_timeperiod"."time_start",
               "chronos_timeperiod"."time_end",
               "chronos_room"."id",
               "chronos_room"."site_id",
               "chronos_room"."extended_data",
               "chronos_room"."short_name",
               "chronos_room"."name"
          FROM "chronos_lessonperiod"
         INNER JOIN "chronos_lesson"
            ON ("chronos_lessonperiod"."lesson_id" = "chronos_lesson"."id")
         INNER JOIN "chronos_validityrange"
            ON ("chronos_lesson"."validity_id" = "chronos_validityrange"."id")
         INNER JOIN "chronos_timeperiod"
            ON ("chronos_lessonperiod"."period_id" = "chronos_timeperiod"."id")
         INNER JOIN "chronos_lesson_teachers"
            ON ("chronos_lesson"."id" = "chronos_lesson_teachers"."lesson_id")
         INNER JOIN "core_schoolterm"
            ON ("chronos_validityrange"."school_term_id" = "core_schoolterm"."id")
         INNER JOIN "chronos_subject"
            ON ("chronos_lesson"."subject_id" = "chronos_subject"."id")
          LEFT OUTER JOIN "chronos_room"
            ON ("chronos_lessonperiod"."room_id" = "chronos_room"."id")
         WHERE ("chronos_lessonperiod"."site_id" = 1 AND "chronos_validityrange"."date_end" >= '2021-03-16'::date AND "chronos_validityrange"."date_start" <= '2021-03-16'::date AND "chronos_timeperiod"."weekday" = 1 AND "chronos_lesson_teachers"."person_id" = 1738)
         ORDER BY "chronos_validityrange"."date_start" ASC, "chronos_timeperiod"."weekday" ASC, "chronos_timeperiod"."period" ASC, "chronos_subject"."name" ASC, "chronos_subject"."short_name" ASC
       )
 UNION (
        SELECT "chronos_lessonperiod"."id",
               "chronos_lessonperiod"."site_id",
               "chronos_lessonperiod"."extended_data",
               "chronos_lessonperiod"."lesson_id",
               "chronos_lessonperiod"."period_id",
               "chronos_lessonperiod"."room_id",
               11 AS "_week",
               2021 AS "_year",
               "chronos_lesson"."id",
               "chronos_lesson"."site_id",
               "chronos_lesson"."extended_data",
               "chronos_lesson"."validity_id",
               "chronos_lesson"."subject_id",
               "chronos_validityrange"."id",
               "chronos_validityrange"."site_id",
               "chronos_validityrange"."extended_data",
               "chronos_validityrange"."school_term_id",
               "chronos_validityrange"."name",
               "chronos_validityrange"."date_start",
               "chronos_validityrange"."date_end",
               "core_schoolterm"."id",
               "core_schoolterm"."site_id",
               "core_schoolterm"."extended_data",
               "core_schoolterm"."name",
               "core_schoolterm"."date_start",
               "core_schoolterm"."date_end",
               "chronos_subject"."id",
               "chronos_subject"."site_id",
               "chronos_subject"."extended_data",
               "chronos_subject"."short_name",
               "chronos_subject"."name",
               "chronos_subject"."colour_fg",
               "chronos_subject"."colour_bg",
               "chronos_timeperiod"."id",
               "chronos_timeperiod"."site_id",
               "chronos_timeperiod"."extended_data",
               "chronos_timeperiod"."validity_id",
               "chronos_timeperiod"."weekday",
               "chronos_timeperiod"."period",
               "chronos_timeperiod"."time_start",
               "chronos_timeperiod"."time_end",
               "chronos_room"."id",
               "chronos_room"."site_id",
               "chronos_room"."extended_data",
               "chronos_room"."short_name",
               "chronos_room"."name"
          FROM "chronos_lessonperiod"
         INNER JOIN "chronos_lesson"
            ON ("chronos_lessonperiod"."lesson_id" = "chronos_lesson"."id")
         INNER JOIN "chronos_validityrange"
            ON ("chronos_lesson"."validity_id" = "chronos_validityrange"."id")
         INNER JOIN "chronos_timeperiod"
            ON ("chronos_lessonperiod"."period_id" = "chronos_timeperiod"."id")
         INNER JOIN "chronos_lessonsubstitution"
            ON ("chronos_lessonperiod"."id" = "chronos_lessonsubstitution"."lesson_period_id")
         INNER JOIN "chronos_lessonsubstitution_teachers"
            ON ("chronos_lessonsubstitution"."id" = "chronos_lessonsubstitution_teachers"."lessonsubstitution_id")
         INNER JOIN "core_schoolterm"
            ON ("chronos_validityrange"."school_term_id" = "core_schoolterm"."id")
         INNER JOIN "chronos_subject"
            ON ("chronos_lesson"."subject_id" = "chronos_subject"."id")
          LEFT OUTER JOIN "chronos_room"
            ON ("chronos_lessonperiod"."room_id" = "chronos_room"."id")
         WHERE ("chronos_lessonperiod"."site_id" = 1 AND "chronos_validityrange"."date_end" >= '2021-03-16'::date AND "chronos_validityrange"."date_start" <= '2021-03-16'::date AND "chronos_timeperiod"."weekday" = 1 AND "chronos_lessonsubstitution_teachers"."person_id" = 1738 AND "chronos_lessonsubstitution"."week" = 11 AND "chronos_lessonsubstitution"."year" = 2021)
         ORDER BY "chronos_validityrange"."date_start" ASC, "chronos_timeperiod"."weekday" ASC, "chronos_timeperiod"."period" ASC, "chronos_subject"."name" ASC, "chronos_subject"."short_name" ASC
       )
 ORDER BY (39) ASC
## Before ```sql ( SELECT "chronos_lessonperiod"."id", "chronos_lessonperiod"."site_id", "chronos_lessonperiod"."extended_data", "chronos_lessonperiod"."lesson_id", "chronos_lessonperiod"."period_id", "chronos_lessonperiod"."room_id", 11 AS "_week", 2021 AS "_year", "chronos_lesson"."id", "chronos_lesson"."site_id", "chronos_lesson"."extended_data", "chronos_lesson"."validity_id", "chronos_lesson"."subject_id", "chronos_validityrange"."id", "chronos_validityrange"."site_id", "chronos_validityrange"."extended_data", "chronos_validityrange"."school_term_id", "chronos_validityrange"."name", "chronos_validityrange"."date_start", "chronos_validityrange"."date_end", "core_schoolterm"."id", "core_schoolterm"."site_id", "core_schoolterm"."extended_data", "core_schoolterm"."name", "core_schoolterm"."date_start", "core_schoolterm"."date_end", "chronos_subject"."id", "chronos_subject"."site_id", "chronos_subject"."extended_data", "chronos_subject"."short_name", "chronos_subject"."name", "chronos_subject"."colour_fg", "chronos_subject"."colour_bg", "chronos_timeperiod"."id", "chronos_timeperiod"."site_id", "chronos_timeperiod"."extended_data", "chronos_timeperiod"."validity_id", "chronos_timeperiod"."weekday", "chronos_timeperiod"."period", "chronos_timeperiod"."time_start", "chronos_timeperiod"."time_end", "chronos_room"."id", "chronos_room"."site_id", "chronos_room"."extended_data", "chronos_room"."short_name", "chronos_room"."name" FROM "chronos_lessonperiod" INNER JOIN "chronos_lesson" ON ("chronos_lessonperiod"."lesson_id" = "chronos_lesson"."id") INNER JOIN "chronos_validityrange" ON ("chronos_lesson"."validity_id" = "chronos_validityrange"."id") INNER JOIN "chronos_timeperiod" ON ("chronos_lessonperiod"."period_id" = "chronos_timeperiod"."id") INNER JOIN "chronos_lesson_teachers" ON ("chronos_lesson"."id" = "chronos_lesson_teachers"."lesson_id") INNER JOIN "core_schoolterm" ON ("chronos_validityrange"."school_term_id" = "core_schoolterm"."id") INNER JOIN "chronos_subject" ON ("chronos_lesson"."subject_id" = "chronos_subject"."id") LEFT OUTER JOIN "chronos_room" ON ("chronos_lessonperiod"."room_id" = "chronos_room"."id") WHERE ("chronos_lessonperiod"."site_id" = 1 AND "chronos_validityrange"."date_end" >= '2021-03-16'::date AND "chronos_validityrange"."date_start" <= '2021-03-16'::date AND "chronos_timeperiod"."weekday" = 1 AND "chronos_lesson_teachers"."person_id" = 1738) ORDER BY "chronos_timeperiod"."period" ASC ) UNION ( SELECT "chronos_lessonperiod"."id", "chronos_lessonperiod"."site_id", "chronos_lessonperiod"."extended_data", "chronos_lessonperiod"."lesson_id", "chronos_lessonperiod"."period_id", "chronos_lessonperiod"."room_id", 11 AS "_week", 2021 AS "_year", "chronos_lesson"."id", "chronos_lesson"."site_id", "chronos_lesson"."extended_data", "chronos_lesson"."validity_id", "chronos_lesson"."subject_id", "chronos_validityrange"."id", "chronos_validityrange"."site_id", "chronos_validityrange"."extended_data", "chronos_validityrange"."school_term_id", "chronos_validityrange"."name", "chronos_validityrange"."date_start", "chronos_validityrange"."date_end", "core_schoolterm"."id", "core_schoolterm"."site_id", "core_schoolterm"."extended_data", "core_schoolterm"."name", "core_schoolterm"."date_start", "core_schoolterm"."date_end", "chronos_subject"."id", "chronos_subject"."site_id", "chronos_subject"."extended_data", "chronos_subject"."short_name", "chronos_subject"."name", "chronos_subject"."colour_fg", "chronos_subject"."colour_bg", "chronos_timeperiod"."id", "chronos_timeperiod"."site_id", "chronos_timeperiod"."extended_data", "chronos_timeperiod"."validity_id", "chronos_timeperiod"."weekday", "chronos_timeperiod"."period", "chronos_timeperiod"."time_start", "chronos_timeperiod"."time_end", "chronos_room"."id", "chronos_room"."site_id", "chronos_room"."extended_data", "chronos_room"."short_name", "chronos_room"."name" FROM "chronos_lessonperiod" INNER JOIN "chronos_lesson" ON ("chronos_lessonperiod"."lesson_id" = "chronos_lesson"."id") INNER JOIN "chronos_validityrange" ON ("chronos_lesson"."validity_id" = "chronos_validityrange"."id") INNER JOIN "chronos_timeperiod" ON ("chronos_lessonperiod"."period_id" = "chronos_timeperiod"."id") INNER JOIN "chronos_lessonsubstitution" ON ("chronos_lessonperiod"."id" = "chronos_lessonsubstitution"."lesson_period_id") INNER JOIN "chronos_lessonsubstitution_teachers" ON ("chronos_lessonsubstitution"."id" = "chronos_lessonsubstitution_teachers"."lessonsubstitution_id") INNER JOIN "core_schoolterm" ON ("chronos_validityrange"."school_term_id" = "core_schoolterm"."id") INNER JOIN "chronos_subject" ON ("chronos_lesson"."subject_id" = "chronos_subject"."id") LEFT OUTER JOIN "chronos_room" ON ("chronos_lessonperiod"."room_id" = "chronos_room"."id") WHERE ("chronos_lessonperiod"."site_id" = 1 AND "chronos_validityrange"."date_end" >= '2021-03-16'::date AND "chronos_validityrange"."date_start" <= '2021-03-16'::date AND "chronos_timeperiod"."weekday" = 1 AND "chronos_lessonsubstitution_teachers"."person_id" = 1738 AND "chronos_lessonsubstitution"."week" = 11 AND "chronos_lessonsubstitution"."year" = 2021) ORDER BY "chronos_timeperiod"."period" ASC ) ``` ## After ```sql ( SELECT "chronos_lessonperiod"."id", "chronos_lessonperiod"."site_id", "chronos_lessonperiod"."extended_data", "chronos_lessonperiod"."lesson_id", "chronos_lessonperiod"."period_id", "chronos_lessonperiod"."room_id", 11 AS "_week", 2021 AS "_year", "chronos_lesson"."id", "chronos_lesson"."site_id", "chronos_lesson"."extended_data", "chronos_lesson"."validity_id", "chronos_lesson"."subject_id", "chronos_validityrange"."id", "chronos_validityrange"."site_id", "chronos_validityrange"."extended_data", "chronos_validityrange"."school_term_id", "chronos_validityrange"."name", "chronos_validityrange"."date_start", "chronos_validityrange"."date_end", "core_schoolterm"."id", "core_schoolterm"."site_id", "core_schoolterm"."extended_data", "core_schoolterm"."name", "core_schoolterm"."date_start", "core_schoolterm"."date_end", "chronos_subject"."id", "chronos_subject"."site_id", "chronos_subject"."extended_data", "chronos_subject"."short_name", "chronos_subject"."name", "chronos_subject"."colour_fg", "chronos_subject"."colour_bg", "chronos_timeperiod"."id", "chronos_timeperiod"."site_id", "chronos_timeperiod"."extended_data", "chronos_timeperiod"."validity_id", "chronos_timeperiod"."weekday", "chronos_timeperiod"."period", "chronos_timeperiod"."time_start", "chronos_timeperiod"."time_end", "chronos_room"."id", "chronos_room"."site_id", "chronos_room"."extended_data", "chronos_room"."short_name", "chronos_room"."name" FROM "chronos_lessonperiod" INNER JOIN "chronos_lesson" ON ("chronos_lessonperiod"."lesson_id" = "chronos_lesson"."id") INNER JOIN "chronos_validityrange" ON ("chronos_lesson"."validity_id" = "chronos_validityrange"."id") INNER JOIN "chronos_timeperiod" ON ("chronos_lessonperiod"."period_id" = "chronos_timeperiod"."id") INNER JOIN "chronos_lesson_teachers" ON ("chronos_lesson"."id" = "chronos_lesson_teachers"."lesson_id") INNER JOIN "core_schoolterm" ON ("chronos_validityrange"."school_term_id" = "core_schoolterm"."id") INNER JOIN "chronos_subject" ON ("chronos_lesson"."subject_id" = "chronos_subject"."id") LEFT OUTER JOIN "chronos_room" ON ("chronos_lessonperiod"."room_id" = "chronos_room"."id") WHERE ("chronos_lessonperiod"."site_id" = 1 AND "chronos_validityrange"."date_end" >= '2021-03-16'::date AND "chronos_validityrange"."date_start" <= '2021-03-16'::date AND "chronos_timeperiod"."weekday" = 1 AND "chronos_lesson_teachers"."person_id" = 1738) ORDER BY "chronos_validityrange"."date_start" ASC, "chronos_timeperiod"."weekday" ASC, "chronos_timeperiod"."period" ASC, "chronos_subject"."name" ASC, "chronos_subject"."short_name" ASC ) UNION ( SELECT "chronos_lessonperiod"."id", "chronos_lessonperiod"."site_id", "chronos_lessonperiod"."extended_data", "chronos_lessonperiod"."lesson_id", "chronos_lessonperiod"."period_id", "chronos_lessonperiod"."room_id", 11 AS "_week", 2021 AS "_year", "chronos_lesson"."id", "chronos_lesson"."site_id", "chronos_lesson"."extended_data", "chronos_lesson"."validity_id", "chronos_lesson"."subject_id", "chronos_validityrange"."id", "chronos_validityrange"."site_id", "chronos_validityrange"."extended_data", "chronos_validityrange"."school_term_id", "chronos_validityrange"."name", "chronos_validityrange"."date_start", "chronos_validityrange"."date_end", "core_schoolterm"."id", "core_schoolterm"."site_id", "core_schoolterm"."extended_data", "core_schoolterm"."name", "core_schoolterm"."date_start", "core_schoolterm"."date_end", "chronos_subject"."id", "chronos_subject"."site_id", "chronos_subject"."extended_data", "chronos_subject"."short_name", "chronos_subject"."name", "chronos_subject"."colour_fg", "chronos_subject"."colour_bg", "chronos_timeperiod"."id", "chronos_timeperiod"."site_id", "chronos_timeperiod"."extended_data", "chronos_timeperiod"."validity_id", "chronos_timeperiod"."weekday", "chronos_timeperiod"."period", "chronos_timeperiod"."time_start", "chronos_timeperiod"."time_end", "chronos_room"."id", "chronos_room"."site_id", "chronos_room"."extended_data", "chronos_room"."short_name", "chronos_room"."name" FROM "chronos_lessonperiod" INNER JOIN "chronos_lesson" ON ("chronos_lessonperiod"."lesson_id" = "chronos_lesson"."id") INNER JOIN "chronos_validityrange" ON ("chronos_lesson"."validity_id" = "chronos_validityrange"."id") INNER JOIN "chronos_timeperiod" ON ("chronos_lessonperiod"."period_id" = "chronos_timeperiod"."id") INNER JOIN "chronos_lessonsubstitution" ON ("chronos_lessonperiod"."id" = "chronos_lessonsubstitution"."lesson_period_id") INNER JOIN "chronos_lessonsubstitution_teachers" ON ("chronos_lessonsubstitution"."id" = "chronos_lessonsubstitution_teachers"."lessonsubstitution_id") INNER JOIN "core_schoolterm" ON ("chronos_validityrange"."school_term_id" = "core_schoolterm"."id") INNER JOIN "chronos_subject" ON ("chronos_lesson"."subject_id" = "chronos_subject"."id") LEFT OUTER JOIN "chronos_room" ON ("chronos_lessonperiod"."room_id" = "chronos_room"."id") WHERE ("chronos_lessonperiod"."site_id" = 1 AND "chronos_validityrange"."date_end" >= '2021-03-16'::date AND "chronos_validityrange"."date_start" <= '2021-03-16'::date AND "chronos_timeperiod"."weekday" = 1 AND "chronos_lessonsubstitution_teachers"."person_id" = 1738 AND "chronos_lessonsubstitution"."week" = 11 AND "chronos_lessonsubstitution"."year" = 2021) ORDER BY "chronos_validityrange"."date_start" ASC, "chronos_timeperiod"."weekday" ASC, "chronos_timeperiod"."period" ASC, "chronos_subject"."name" ASC, "chronos_subject"."short_name" ASC ) ORDER BY (39) ASC ```
hansegucker commented 2021-03-25 17:45:53 +01:00 (Migrated from edugit.org)
Copy link
diff /tmp/a.sql /tmp/b.sql 
0a1
> 	
64c65
<          ORDER BY "chronos_timeperiod"."period" ASC
---
>          ORDER BY "chronos_validityrange"."date_start" ASC, "chronos_timeperiod"."weekday" ASC, "chronos_timeperiod"."period" ASC, "chronos_subject"."name" ASC, "chronos_subject"."short_name" ASC
131c132
<          ORDER BY "chronos_timeperiod"."period" ASC
---
>          ORDER BY "chronos_validityrange"."date_start" ASC, "chronos_timeperiod"."weekday" ASC, "chronos_timeperiod"."period" ASC, "chronos_subject"."name" ASC, "chronos_subject"."short_name" ASC
132a134
>  ORDER BY (39) ASC
```diff diff /tmp/a.sql /tmp/b.sql 0a1 > 64c65 < ORDER BY "chronos_timeperiod"."period" ASC --- > ORDER BY "chronos_validityrange"."date_start" ASC, "chronos_timeperiod"."weekday" ASC, "chronos_timeperiod"."period" ASC, "chronos_subject"."name" ASC, "chronos_subject"."short_name" ASC 131c132 < ORDER BY "chronos_timeperiod"."period" ASC --- > ORDER BY "chronos_validityrange"."date_start" ASC, "chronos_timeperiod"."weekday" ASC, "chronos_timeperiod"."period" ASC, "chronos_subject"."name" ASC, "chronos_subject"."short_name" ASC 132a134 > ORDER BY (39) ASC ```
nik commented 2021-03-25 17:51:07 +01:00 (Migrated from edugit.org)
Copy link

Please use a unified diff, I cannot read this.

Please use a unified diff, I cannot read this.
hansegucker commented 2021-03-25 17:52:56 +01:00 (Migrated from edugit.org)
Copy link

I'm sure, you can 😉 :

--- /tmp/a.sql	2021-03-25 17:45:06.719025587 +0100
+++ /tmp/b.sql	2021-03-25 17:45:16.502566177 +0100
@@ -1,3 +1,4 @@
+	
 (
         SELECT "chronos_lessonperiod"."id",
                "chronos_lessonperiod"."site_id",
@@ -61,7 +62,7 @@
           LEFT OUTER JOIN "chronos_room"
             ON ("chronos_lessonperiod"."room_id" = "chronos_room"."id")
          WHERE ("chronos_lessonperiod"."site_id" = 1 AND "chronos_validityrange"."date_end" >= '2021-03-16'::date AND "chronos_validityrange"."date_start" <= '2021-03-16'::date AND "chronos_timeperiod"."weekday" = 1 AND "chronos_lesson_teachers"."person_id" = 1738)
-         ORDER BY "chronos_timeperiod"."period" ASC
+         ORDER BY "chronos_validityrange"."date_start" ASC, "chronos_timeperiod"."weekday" ASC, "chronos_timeperiod"."period" ASC, "chronos_subject"."name" ASC, "chronos_subject"."short_name" ASC
        )
  UNION (
         SELECT "chronos_lessonperiod"."id",
@@ -128,5 +129,6 @@
           LEFT OUTER JOIN "chronos_room"
             ON ("chronos_lessonperiod"."room_id" = "chronos_room"."id")
          WHERE ("chronos_lessonperiod"."site_id" = 1 AND "chronos_validityrange"."date_end" >= '2021-03-16'::date AND "chronos_validityrange"."date_start" <= '2021-03-16'::date AND "chronos_timeperiod"."weekday" = 1 AND "chronos_lessonsubstitution_teachers"."person_id" = 1738 AND "chronos_lessonsubstitution"."week" = 11 AND "chronos_lessonsubstitution"."year" = 2021)
-         ORDER BY "chronos_timeperiod"."period" ASC
+         ORDER BY "chronos_validityrange"."date_start" ASC, "chronos_timeperiod"."weekday" ASC, "chronos_timeperiod"."period" ASC, "chronos_subject"."name" ASC, "chronos_subject"."short_name" ASC
        )
+ ORDER BY (39) ASC
I'm sure, you can :wink: : ```diff --- /tmp/a.sql 2021-03-25 17:45:06.719025587 +0100 +++ /tmp/b.sql 2021-03-25 17:45:16.502566177 +0100 @@ -1,3 +1,4 @@ + ( SELECT "chronos_lessonperiod"."id", "chronos_lessonperiod"."site_id", @@ -61,7 +62,7 @@ LEFT OUTER JOIN "chronos_room" ON ("chronos_lessonperiod"."room_id" = "chronos_room"."id") WHERE ("chronos_lessonperiod"."site_id" = 1 AND "chronos_validityrange"."date_end" >= '2021-03-16'::date AND "chronos_validityrange"."date_start" <= '2021-03-16'::date AND "chronos_timeperiod"."weekday" = 1 AND "chronos_lesson_teachers"."person_id" = 1738) - ORDER BY "chronos_timeperiod"."period" ASC + ORDER BY "chronos_validityrange"."date_start" ASC, "chronos_timeperiod"."weekday" ASC, "chronos_timeperiod"."period" ASC, "chronos_subject"."name" ASC, "chronos_subject"."short_name" ASC ) UNION ( SELECT "chronos_lessonperiod"."id", @@ -128,5 +129,6 @@ LEFT OUTER JOIN "chronos_room" ON ("chronos_lessonperiod"."room_id" = "chronos_room"."id") WHERE ("chronos_lessonperiod"."site_id" = 1 AND "chronos_validityrange"."date_end" >= '2021-03-16'::date AND "chronos_validityrange"."date_start" <= '2021-03-16'::date AND "chronos_timeperiod"."weekday" = 1 AND "chronos_lessonsubstitution_teachers"."person_id" = 1738 AND "chronos_lessonsubstitution"."week" = 11 AND "chronos_lessonsubstitution"."year" = 2021) - ORDER BY "chronos_timeperiod"."period" ASC + ORDER BY "chronos_validityrange"."date_start" ASC, "chronos_timeperiod"."weekday" ASC, "chronos_timeperiod"."period" ASC, "chronos_subject"."name" ASC, "chronos_subject"."short_name" ASC ) + ORDER BY (39) ASC ```
nik commented 2021-03-25 21:45:33 +01:00 (Migrated from edugit.org)
Copy link

I'm sure, you can

No, I can't. (At least not without manually calculating and looking up what context "132a134" might refer to)

> I'm sure, you can No, I can't. (At least not without manually calculating and looking up what context "132a134" might refer to)
nik commented 2021-03-25 21:45:34 +01:00 (Migrated from edugit.org)
Copy link

resolved all threads

resolved all threads
nik commented 2021-03-25 21:46:39 +01:00 (Migrated from edugit.org)
Copy link

mentioned in commit 7e1aaf782a

mentioned in commit 7e1aaf782a68c9d040662b7dc5134c06fd25f77a
nik (Migrated from edugit.org) merged commit 7e1aaf782a into master 2021-03-25 21:46:40 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Security

   
TeX
Needs LaTeX template

  
auto-update
  
board
done

  
board
ready

  
board
todo

  
check
delete-eslint-rc-js

  
check
update-builddeps-package-json

  
check
update-eslint-rc-js

  
check
update-gitignore

  
check
update-merge-request-template

  
check
update-prettier-ignore

  
check
update-pyproject-toml

  
check
update-renovate-json

  
check
update-tox-ini

  
part
backend
 Backend (view code, models, logic, etc.)

  
part
ci

  
part
docs
 Issue or addition to the documentation

  
part
frontend
 Frontend (templates, etc.)

  
part
i18n
 Translation or internationalisation issue

  
part
non-technical
 Non-technical (policy, maintenance, etc.) issue or discussion

  
part
packaging
 Issue concerning the packaging of AlekSIS and components

  
prio
1
 Priority High

  
prio
2
 Priority Medium

  
prio
3
 Priority Low

  
release-mr-5.x
  
size
large

  
size
medium

  
size
small

  
source
customer
 Requested by a customer or affiliated user

  
source
customer::fsmw

  
source
customer::fss

  
source
customer::teckids

  
source
downstream
 Issue or merge request from other projects using AlekSIS or parts of it

  
type
breaking

  
type
bug
 Bug

  
type
feature
 New feature

  
type
refactoring

  
workflow
blocked
 Issue is blocked by another issue

  
workflow
confirmed
 The bug is reproducible and will be fixed

  
workflow
current-todo

  
workflow
discussing
 Needs to be discussed before implementation

  
workflow
new-app
 Requires new AlekSIS app, which has to be created

  
workflow
wontfix
 The bug is not reproducible or the feature was decided against

No labels
Security
TeX
auto-update
board
done
board
ready
board
todo
check
delete-eslint-rc-js
check
update-builddeps-package-json
check
update-eslint-rc-js
check
update-gitignore
check
update-merge-request-template
check
update-prettier-ignore
check
update-pyproject-toml
check
update-renovate-json
check
update-tox-ini
part
backend
part
ci
part
docs
part
frontend
part
i18n
part
non-technical
part
packaging
prio
1
prio
2
prio
3
release-mr-5.x
size
large
size
medium
size
small
source
customer
source
customer::fsmw
source
customer::fss
source
customer::teckids
source
downstream
type
breaking
type
bug
type
feature
type
refactoring
workflow
blocked
workflow
confirmed
workflow
current-todo
workflow
discussing
workflow
new-app
workflow
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
aleksis/AlekSIS-App-Chronos!447
No description provided.