Changes between Version 16 and Version 17 of WikiStart/AdvancedReports


Ignore:
Timestamp:
02/05/24 16:42:36 (4 months ago)
Author:
133039
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • WikiStart/AdvancedReports

    v16 v17  
    44
    55{{{
    6 DECLARE correct_student_id INT;
    7 SET correct_student_id = 11111;
    8 
    9 WITH EventData AS (
     6WITH EventResult AS (
    107    SELECT
     8        NULL::INTEGER AS task_id,
    119        ce.calendar_event_id,
    1210        ce.event_name,
    … …  
    1614        nre.event_date
    1715    FROM
    18         student_event AS se
     16        calendar_event AS ce
    1917    JOIN
    20         calendar_event AS ce ON se.calendar_event_id = ce.calendar_event_id
    21     JOIN
    22         non_repeating_events AS nre ON ce.calendar_event_id = nre.calendar_event_id
     18        non_repeating_event AS nre ON ce.calendar_event_id = nre.calendar_event_id
     19    LEFT JOIN
     20        student_event AS se ON se.calendar_event_id = ce.calendar_event_id
     21    LEFT JOIN
     22        subject_event AS sje ON sje.calendar_event_id = ce.calendar_event_id
    2323    WHERE
    2424        nre.event_date = CURRENT_DATE
    25         AND se.student_id = correct_student_id
    26 
     25        AND (se.student_id = 91324 OR sje.calendar_event_id = 91324)
     26       
    2727    UNION
    2828
    2929    SELECT
     30        NULL::INTEGER AS task_id,
    3031        ce.calendar_event_id,
    3132        ce.event_name,
    … …  
    3536        CASE
    3637            WHEN re.event_week_day = 'MONDAY' THEN date_trunc('week', CURRENT_DATE)::DATE
    37             WHEN re.event_week_day = 'TUESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '1 day'::DATE
    38             WHEN re.event_week_day = 'WEDNESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '2 days'::DATE
    39             WHEN re.event_week_day = 'THURSDAY' THEN date_trunc('week', CURRENT_DATE) + interval '3 days'::DATE
    40             WHEN re.event_week_day = 'FRIDAY' THEN date_trunc('week', CURRENT_DATE) + interval '4 days'::DATE
    41             WHEN re.event_week_day = 'SATURDAY' THEN date_trunc('week', CURRENT_DATE) + interval '5 days'::DATE
    42             WHEN re.event_week_day = 'SUNDAY' THEN date_trunc('week', CURRENT_DATE) + interval '6 days'::DATE
     38            WHEN re.event_week_day = 'TUESDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '1 day')::DATE
     39            WHEN re.event_week_day = 'WEDNESDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '2 days')::DATE
     40            WHEN re.event_week_day = 'THURSDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '3 days')::DATE
     41            WHEN re.event_week_day = 'FRIDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '4 days')::DATE
     42            WHEN re.event_week_day = 'SATURDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '5 days')::DATE
     43            WHEN re.event_week_day = 'SUNDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '6 days')::DATE
    4344        END AS event_date
    4445    FROM
    45         student_event AS se
     46        calendar_event AS ce
    4647    JOIN
    47         calendar_event AS ce ON se.calendar_event_id = ce.calendar_event_id
    48     JOIN
    49         repeating_events AS re ON ce.calendar_event_id = re.calendar_event_id
     48        repeating_event AS re ON ce.calendar_event_id = re.calendar_event_id
     49    LEFT JOIN
     50        student_event AS se ON se.calendar_event_id = ce.calendar_event_id
     51    LEFT JOIN
     52        subject_event AS sje ON sje.calendar_event_id = ce.calendar_event_id
    5053    WHERE
    5154        re.starting_date <= (
    5255            CASE
    5356                WHEN re.event_week_day = 'MONDAY' THEN date_trunc('week', CURRENT_DATE)::DATE
    54                 WHEN re.event_week_day = 'TUESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '1 day'::DATE
    55                 WHEN re.event_week_day = 'WEDNESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '2 days'::DATE
    56                 WHEN re.event_week_day = 'THURSDAY' THEN date_trunc('week', CURRENT_DATE) + interval '3 days'::DATE
    57                 WHEN re.event_week_day = 'FRIDAY' THEN date_trunc('week', CURRENT_DATE) + interval '4 days'::DATE
    58                 WHEN re.event_week_day = 'SATURDAY' THEN date_trunc('week', CURRENT_DATE) + interval '5 days'::DATE
    59                 WHEN re.event_week_day = 'SUNDAY' THEN date_trunc('week', CURRENT_DATE) + interval '6 days'::DATE
     57                WHEN re.event_week_day = 'TUESDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '1 day')::DATE
     58                WHEN re.event_week_day = 'WEDNESDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '2 days')::DATE
     59                WHEN re.event_week_day = 'THURSDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '3 days')::DATE
     60                WHEN re.event_week_day = 'FRIDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '4 days')::DATE
     61                WHEN re.event_week_day = 'SATURDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '5 days')::DATE
     62                WHEN re.event_week_day = 'SUNDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '6 days')::DATE
    6063            END
    6164        )
    … …  
    6366            CASE
    6467                WHEN re.event_week_day = 'MONDAY' THEN date_trunc('week', CURRENT_DATE)::DATE
    65                 WHEN re.event_week_day = 'TUESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '1 day'::DATE
    66                 WHEN re.event_week_day = 'WEDNESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '2 days'::DATE
    67                 WHEN re.event_week_day = 'THURSDAY' THEN date_trunc('week', CURRENT_DATE) + interval '3 days'::DATE
    68                 WHEN re.event_week_day = 'FRIDAY' THEN date_trunc('week', CURRENT_DATE) + interval '4 days'::DATE
    69                 WHEN re.event_week_day = 'SATURDAY' THEN date_trunc('week', CURRENT_DATE) + interval '5 days'::DATE
    70                 WHEN re.event_week_day = 'SUNDAY' THEN date_trunc('week', CURRENT_DATE) + interval '6 days'::DATE
     68                WHEN re.event_week_day = 'TUESDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '1 day')::DATE
     69                WHEN re.event_week_day = 'WEDNESDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '2 days')::DATE
     70                WHEN re.event_week_day = 'THURSDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '3 days')::DATE
     71                WHEN re.event_week_day = 'FRIDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '4 days')::DATE
     72                WHEN re.event_week_day = 'SATURDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '5 days')::DATE
     73                WHEN re.event_week_day = 'SUNDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '6 days')::DATE
    7174            END
    7275        )
    … …  
    7477            CASE
    7578                WHEN re.event_week_day = 'MONDAY' THEN date_trunc('week', CURRENT_DATE)::DATE
    76                 WHEN re.event_week_day = 'TUESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '1 day'::DATE
    77                 WHEN re.event_week_day = 'WEDNESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '2 days'::DATE
    78                 WHEN re.event_week_day = 'THURSDAY' THEN date_trunc('week', CURRENT_DATE) + interval '3 days'::DATE
    79                 WHEN re.event_week_day = 'FRIDAY' THEN date_trunc('week', CURRENT_DATE) + interval '4 days'::DATE
    80                 WHEN re.event_week_day = 'SATURDAY' THEN date_trunc('week', CURRENT_DATE) + interval '5 days'::DATE
    81                 WHEN re.event_week_day = 'SUNDAY' THEN date_trunc('week', CURRENT_DATE) + interval '6 days'::DATE
     79                WHEN re.event_week_day = 'TUESDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '1 day')::DATE
     80                WHEN re.event_week_day = 'WEDNESDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '2 days')::DATE
     81                WHEN re.event_week_day = 'THURSDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '3 days')::DATE
     82                WHEN re.event_week_day = 'FRIDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '4 days')::DATE
     83                WHEN re.event_week_day = 'SATURDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '5 days')::DATE
     84                WHEN re.event_week_day = 'SUNDAY' THEN (date_trunc('week', CURRENT_DATE) + INTERVAL '6 days')::DATE
    8285            END
    8386        ))) % (7 * re.repeats_every_n_weeks)) = 0
    84         AND se.student_id = correct_student_id
    85 ) AS EventResult
     87        AND (se.student_id = 91324 OR sje.student_id = 91324)
     88               
     89    UNION
     90     
     91    SELECT
     92        t.task_id,
     93        NULL AS calendar_event_id,
     94        NULL AS event_name,
     95        NULL AS event_type,
     96        NULL AS event_start_time,
     97        NULL AS event_end_time,
     98        NULL AS event_date
     99    FROM task t
     100    JOIN student_task st ON t.task_id = st.task_id
     101    LEFT JOIN creates_task ct ON t.task_id = ct.task_id
     102    WHERE (st.student_id = 91324 OR ct.task_id = 91324) AND task_due_date = CURRENT_DATE
     103)
    86104
    87105SELECT
    88106    COUNT(CASE WHEN event_type = 'Exam' THEN 1 END) AS exam_count,
    89107    COUNT(CASE WHEN event_type <> 'Exam' THEN 1 END) AS non_exam_count,
    90     COUNT(task.task_id) AS task_count
    91 FROM EventResult
    92 LEFT JOIN task ON EventResult.event_date = task.task_date;
     108    COUNT(DISTINCT task_id) AS distinct_task_count
     109FROM EventResult;
     110
    93111}}}
    94112
    … …  
    97115
    98116{{{
    99 DECLARE correct_student_id INT;
    100 SET correct_student_id = 11111;
    101 
    102117SELECT
    103118    t.task_name,
    104119    t.task_description,
    105     t.task_date,
     120    t.task_due_date,
    106121    t.task_priority
    107122FROM
    … …  
    109124JOIN
    110125    student_task AS st ON t.task_id = st.task_id
    111 JOIN
     126LEFT JOIN
    112127    creates_task AS ct ON t.task_id = ct.task_id
    113 JOIN
     128LEFT JOIN
    114129    subject_at_term AS sat ON ct.term_subject_id = sat.term_subject_id
    115130        AND ct.term_type = sat.term_type
    … …  
    118133        AND ct.student_id = sat.student_id
    119134WHERE
    120     st.student_id = correct_student_id
    121     AND t.task_date BETWEEN CURRENT_DATE AND CURRENT_DATE + INTERVAL '3 days'
     135    (st.student_id = 91324 OR ct.student_id = 91324)
     136    AND t.task_due_date BETWEEN CURRENT_DATE AND CURRENT_DATE + INTERVAL '3 days'
    122137ORDER BY
    123138    t.task_priority;
     139
    124140}}}
    125141
    … …  
    127143
    128144{{{
    129 DECLARE correct_student_id INT;
    130 SET correct_student_id = 11111;
    131 
    132145SELECT
    133146    ce.event_name,
    134147    sat.subject_name,
     148    ce.event_type,
    135149    ce.event_start_time,
    136     ce.event_end_time
     150    ce.event_end_time,
     151    nre.event_date
    137152FROM
    138153    subject_event AS se
    … …  
    146161        AND se.student_id = sat.student_id
    147162JOIN
    148     non_repeating_event AS nre ON ce.calendar_event_id = nre.calendar_event_id -- Corrected table name
     163    non_repeating_event AS nre ON ce.calendar_event_id = nre.calendar_event_id
    149164WHERE
    150165    ce.event_type = 'Exam'
    151     AND se.student_id = correct_student_id
     166    AND se.student_id = 91324
    152167    AND nre.event_date >= CURRENT_DATE
    153168    AND nre.event_date <= CURRENT_DATE + INTERVAL '7 days'
    … …  
    160175
    161176{{{
    162 DECLARE correct_student_id INT;
    163 SET correct_student_id = 11111;
    164 
    165 SELECT *
    166 FROM (
     177WITH Result AS (
    167178  SELECT
    168179    ce.calendar_event_id,
    … …  
    173184    nre.event_date
    174185  FROM
    175     student_event AS se
     186    calendar_event AS ce
    176187  JOIN
    177     calendar_event AS ce ON se.calendar_event_id = ce.calendar_event_id
    178   JOIN
    179     non_repeating_events AS nre ON ce.calendar_event_id = nre.calendar_event_id
     188    non_repeating_event AS nre ON ce.calendar_event_id = nre.calendar_event_id
     189  LEFT JOIN
     190    student_event AS se ON se.calendar_event_id = ce.calendar_event_id
     191  LEFT JOIN
     192    subject_event AS sje ON sje.calendar_event_id = ce.calendar_event_id
    180193  WHERE
    181194    nre.event_date >= date_trunc('week', CURRENT_DATE)
    182195    AND nre.event_date < date_trunc('week', CURRENT_DATE) + INTERVAL '1 week'
    183     AND se.student_id = correct_student_id
     196    AND (se.student_id = 91324 OR sje.student_id = 91324)
    184197
    185198  UNION
    … …  
    193206    CASE
    194207      WHEN re.event_week_day = 'MONDAY' THEN date_trunc('week', CURRENT_DATE)::DATE
    195       WHEN re.event_week_day = 'TUESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '1 day'::DATE
    196       WHEN re.event_week_day = 'WEDNESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '2 days'::DATE
    197       WHEN re.event_week_day = 'THURSDAY' THEN date_trunc('week', CURRENT_DATE) + interval '3 days'::DATE
    198       WHEN re.event_week_day = 'FRIDAY' THEN date_trunc('week', CURRENT_DATE) + interval '4 days'::DATE
    199       WHEN re.event_week_day = 'SATURDAY' THEN date_trunc('week', CURRENT_DATE) + interval '5 days'::DATE
    200       WHEN re.event_week_day = 'SUNDAY' THEN date_trunc('week', CURRENT_DATE) + interval '6 days'::DATE
     208      WHEN re.event_week_day = 'TUESDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '1 day'
     209      WHEN re.event_week_day = 'WEDNESDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '2 days'
     210      WHEN re.event_week_day = 'THURSDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '3 days'
     211      WHEN re.event_week_day = 'FRIDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '4 days'
     212      WHEN re.event_week_day = 'SATURDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '5 days'
     213      WHEN re.event_week_day = 'SUNDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '6 days'
    201214    END AS event_date
    202215  FROM
    203     student_event AS se
     216    calendar_event AS ce
    204217  JOIN
    205     calendar_event AS ce ON se.calendar_event_id = ce.calendar_event_id
    206   JOIN
    207     repeating_events AS re ON ce.calendar_event_id = re.calendar_event_id
     218    repeating_event AS re ON ce.calendar_event_id = re.calendar_event_id
     219  LEFT JOIN
     220    student_event AS se ON se.calendar_event_id = ce.calendar_event_id
     221  LEFT JOIN
     222    subject_event AS sje ON sje.calendar_event_id = ce.calendar_event_id
    208223  WHERE
    209224    re.starting_date <= (
    210225      CASE
    211226        WHEN re.event_week_day = 'MONDAY' THEN date_trunc('week', CURRENT_DATE)::DATE
    212         WHEN re.event_week_day = 'TUESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '1 day'::DATE
    213         WHEN re.event_week_day = 'WEDNESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '2 days'::DATE
    214         WHEN re.event_week_day = 'THURSDAY' THEN date_trunc('week', CURRENT_DATE) + interval '3 days'::DATE
    215         WHEN re.event_week_day = 'FRIDAY' THEN date_trunc('week', CURRENT_DATE) + interval '4 days'::DATE
    216         WHEN re.event_week_day = 'SATURDAY' THEN date_trunc('week', CURRENT_DATE) + interval '5 days'::DATE
    217         WHEN re.event_week_day = 'SUNDAY' THEN date_trunc('week', CURRENT_DATE) + interval '6 days'::DATE
     227        WHEN re.event_week_day = 'TUESDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '1 day'
     228        WHEN re.event_week_day = 'WEDNESDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '2 days'
     229        WHEN re.event_week_day = 'THURSDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '3 days'
     230        WHEN re.event_week_day = 'FRIDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '4 days'
     231        WHEN re.event_week_day = 'SATURDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '5 days'
     232        WHEN re.event_week_day = 'SUNDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '6 days'
    218233      END
    219234    )
    … …  
    221236      CASE
    222237        WHEN re.event_week_day = 'MONDAY' THEN date_trunc('week', CURRENT_DATE)::DATE
    223         WHEN re.event_week_day = 'TUESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '1 day'::DATE
    224         WHEN re.event_week_day = 'WEDNESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '2 days'::DATE
    225         WHEN re.event_week_day = 'THURSDAY' THEN date_trunc('week', CURRENT_DATE) + interval '3 days'::DATE
    226         WHEN re.event_week_day = 'FRIDAY' THEN date_trunc('week', CURRENT_DATE) + interval '4 days'::DATE
    227         WHEN re.event_week_day = 'SATURDAY' THEN date_trunc('week', CURRENT_DATE) + interval '5 days'::DATE
    228         WHEN re.event_week_day = 'SUNDAY' THEN date_trunc('week', CURRENT_DATE) + interval '6 days'::DATE
     238        WHEN re.event_week_day = 'TUESDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '1 day'
     239        WHEN re.event_week_day = 'WEDNESDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '2 days'
     240        WHEN re.event_week_day = 'THURSDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '3 days'
     241        WHEN re.event_week_day = 'FRIDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '4 days'
     242        WHEN re.event_week_day = 'SATURDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '5 days'
     243        WHEN re.event_week_day = 'SUNDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '6 days'
    229244      END
    230245    )
    231246    AND (EXTRACT(day FROM date_trunc('week', CURRENT_DATE) - date_trunc('week', (
    232         CASE
    233           WHEN re.event_week_day = 'MONDAY' THEN date_trunc('week', CURRENT_DATE)::DATE
    234           WHEN re.event_week_day = 'TUESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '1 day'::DATE
    235           WHEN re.event_week_day = 'WEDNESDAY' THEN date_trunc('week', CURRENT_DATE) + interval '2 days'::DATE
    236           WHEN re.event_week_day = 'THURSDAY' THEN date_trunc('week', CURRENT_DATE) + interval '3 days'::DATE
    237           WHEN re.event_week_day = 'FRIDAY' THEN date_trunc('week', CURRENT_DATE) + interval '4 days'::DATE
    238           WHEN re.event_week_day = 'SATURDAY' THEN date_trunc('week', CURRENT_DATE) + interval '5 days'::DATE
    239           WHEN re.event_week_day = 'SUNDAY' THEN date_trunc('week', CURRENT_DATE) + interval '6 days'::DATE
    240         END
    241       ))) % (7 * re.repeats_every_n_weeks)) = 0
    242     AND se.student_id = correct_student_id
    243 ) AS Result
     247      CASE
     248        WHEN re.event_week_day = 'MONDAY' THEN date_trunc('week', CURRENT_DATE)::DATE
     249        WHEN re.event_week_day = 'TUESDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '1 day'
     250        WHEN re.event_week_day = 'WEDNESDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '2 days'
     251        WHEN re.event_week_day = 'THURSDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '3 days'
     252        WHEN re.event_week_day = 'FRIDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '4 days'
     253        WHEN re.event_week_day = 'SATURDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '5 days'
     254        WHEN re.event_week_day = 'SUNDAY' THEN date_trunc('week', CURRENT_DATE)::DATE + INTERVAL '6 days'
     255      END
     256    ))) % (7 * re.repeats_every_n_weeks)) = 0
     257    AND (se.student_id = 91324 OR sje.student_id = 91324)
     258)
     259SELECT
     260  calendar_event_id,
     261  event_name,
     262  event_type,
     263  event_start_time,
     264  event_end_time,
     265  event_date::DATE
     266FROM Result
    244267ORDER BY
    245268  event_date, -- Order by day of the week
    246269  event_start_time; -- Order by time
     270
    247271}}}
    248272
    … …  
    252276
    253277{{{
    254 
    255  DECLARE correct_student_id INT;
    256 SET correct_student_id = 11111;
    257 DECLARE c_term_type VARCHAR(20);
    258 SET c_term_type = 'Zimski';
    259 DECLARE c_starting_year INT;
    260 SET c_starting_year = 2023;
    261 DECLARE c_finishing_year INT;
    262 SET c_finishing_year = 2024;
    263 
    264278SELECT
    265279    ce.event_name,
    … …  
    280294    ON se.calendar_event_id = ce.calendar_event_id
    281295WHERE
    282     se.student_id = correct_student_id
    283     AND se.starting_year = c_starting_year
    284     AND se.finishing_year = c_finishing_year
    285     AND se.term_type = c_term_type;
     296    se.student_id = 91324
     297    AND se.starting_year = '2023'
     298    AND se.finishing_year = '2024'
     299    AND se.term_type = 'Zimski';
    286300}}}
    287301
    … …  
    291305
    292306{{{
    293 DECLARE correct_student_id INT;
    294 SET correct_student_id = 11111;
    295 DECLARE c_term_type VARCHAR(20);
    296 SET c_term_type = 'Zimski';
    297 DECLARE c_starting_year INT;
    298 SET c_starting_year = 2023;
    299 DECLARE c_finishing_year INT;
    300 SET c_finishing_year = 2024;
    301 DECLARE c_term_subject_id INT;
    302 SET c_term_subject_id = 87654;
    303 
    304307SELECT
    305308    ce.calendar_event_id,
    … …  
    319322    calendar_event ce ON se.calendar_event_id = ce.calendar_event_id
    320323WHERE
    321     se.term_subject_id = c_term_subject_id
    322     AND se.term_type = c_term_type
    323     AND se.starting_year = c_starting_year
    324     AND se.finishing_year = c_finishing_year
    325     AND se.student_id = correct_student_id
     324    se.term_subject_id = 56
     325    AND se.term_type = 'Zimski'
     326    AND se.starting_year = 2023
     327    AND se.finishing_year = 2024
     328    AND se.student_id = 91324
    326329
    327330UNION
    … …  
    344347    task AS t ON ct.task_id = t.task_id
    345348WHERE
    346     ct.term_subject_id = c_term_subject_id
    347     AND ct.term_type = c_term_type
    348     AND ct.starting_year = c_starting_year
    349     AND ct.finishing_year = c_finishing_year
    350     AND ct.student_id = correct_student_id;
     349    ct.term_subject_id = 56
     350    AND ct.term_type = 'Zimski'
     351    AND ct.starting_year = 2023
     352    AND ct.finishing_year = 2024
     353    AND ct.student_id = 91324;
    351354}}}
    352355
    … …  
    355358
    356359{{{
    357 DECLARE correct_student_id INT;
    358 SET correct_student_id = 11111;
    359 DECLARE c_subject VARCHAR(255);
    360 SET c_subject = 'Bazi na podatoci';
    361360
    362361WITH SubjectBooks AS (
    … …  
    383382        author AS a ON ba.author_id = a.author_id
    384383    WHERE
    385         sat.subject_name = c_subject
    386         AND rb.student_id = correct_student_id
     384        sat.subject_name = 'Bazi na podatoci'
     385        AND rb.student_id = 91324
    387386)
    388387
    … …  
    402401
    403402{{{
    404 DECLARE correct_student_id INT;
    405 SET correct_student_id = 11111;
    406 
    407403SELECT
    408404    fb.fb_id,
    … …  
    421417        WHERE
    422418            gf.fb_id = fb.fb_id
    423             AND gf.student_id = correct_student_id
     419            AND gf.student_id = 91324
    424420    );
    425421}}}