Skip to content

Commit 1b3f3f5

Browse files
committed
Merge branch 'tech-debt-cleanup-and-improvements' of https://github.com/MindLeaps/tracker into tech-debt-cleanup-and-improvements
2 parents de7dda2 + 571f668 commit 1b3f3f5

1 file changed

Lines changed: 24 additions & 1 deletion

File tree

db/structure.sql

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1752,6 +1752,30 @@ CREATE OR REPLACE VIEW public.student_averages AS
17521752
JOIN public.lessons l ON (((l.id = g.lesson_id) AND (l.subject_id = su.id))))
17531753
GROUP BY s.id, su.id, sk.skill_name;
17541754

1755+
--
1756+
-- Name: group_lesson_summaries _RETURN; Type: RULE; Schema: public; Owner: -
1757+
--
1758+
1759+
CREATE OR REPLACE VIEW public.group_lesson_summaries AS
1760+
SELECT slu.lesson_id,
1761+
slu.lesson_date,
1762+
gr.id AS group_id,
1763+
gr.chapter_id,
1764+
slu.subject_id,
1765+
concat(gr.group_name, ' - ', c.chapter_name) AS group_chapter_name,
1766+
(round(avg(slu.average_mark), 2))::double precision AS average_mark,
1767+
(sum(slu.grade_count))::bigint AS grade_count,
1768+
(round((((sum(
1769+
CASE
1770+
WHEN (slu.grade_count = 0) THEN 0
1771+
ELSE 1
1772+
END))::numeric / (count(slu.*))::numeric) * (100)::numeric), 2))::double precision AS attendance
1773+
FROM ((public.student_lesson_summaries slu
1774+
JOIN public.groups gr ON ((slu.group_id = gr.id)))
1775+
JOIN public.chapters c ON ((gr.chapter_id = c.id)))
1776+
WHERE (slu.deleted_at IS NULL)
1777+
GROUP BY slu.lesson_id, gr.id, c.id, slu.subject_id, slu.lesson_date
1778+
ORDER BY slu.lesson_date;
17551779

17561780
--
17571781
-- Name: student_lesson_summaries _RETURN; Type: RULE; Schema: public; Owner: -
@@ -1914,7 +1938,6 @@ CREATE OR REPLACE VIEW public.chapter_summaries AS
19141938
LEFT JOIN public.organizations o ON ((c.organization_id = o.id)))
19151939
GROUP BY c.id, o.id;
19161940

1917-
19181941
--
19191942
-- Name: organization_summaries _RETURN; Type: RULE; Schema: public; Owner: -
19201943
--

0 commit comments

Comments
 (0)