Changes between Version 5 and Version 6 of AdvancedReports


Ignore:
Timestamp:
08/07/26 16:27:34 (23 hours ago)
Author:
231175
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • AdvancedReports

    v5 v6  
    1515                      total_revenue NUMERIC
    1616                  ) AS $$
    17 #variable_conflict use_column
     17    #variable_conflict use_column
    1818BEGIN
    1919    RETURN QUERY
     
    2525        FROM enrollment e
    2626                 LEFT JOIN payment p
    27                      ON p.enrollment_id = e.enrollment_id
    28                     AND p.payment_status = 'completed'   -- само наплатените пари се промет
     27                           ON p.enrollment_id = e.enrollment_id
     28                               AND p.payment_status = 'completed'   -- само наплатените пари се промет
    2929        GROUP BY
    3030            EXTRACT(YEAR FROM e.purchase_date),
     
    5454                      average_rating NUMERIC
    5555                  ) AS $$
    56 #variable_conflict use_column
     56    #variable_conflict use_column
    5757BEGIN
    5858    RETURN QUERY
     
    7474        FROM course c
    7575                 JOIN course_translate ct ON c.course_id = ct.course_id
    76                  JOIN language l ON l.id = ct.language_id AND l.value = 'en'
     76                 JOIN language l ON l.id = ct.language_id
    7777                 JOIN course_version cv ON c.course_id = cv.course_id
    7878                 JOIN enrollment e ON cv.course_version_id = e.course_version_id
     
    111111                      avg_lecture_completion_percentage NUMERIC
    112112                  ) AS $$
    113 #variable_conflict use_column
     113    #variable_conflict use_column
    114114BEGIN
    115115    RETURN QUERY
     
    140140                END), 0)::INTEGER AS avg_days_to_complete,
    141141            COALESCE(
    142                 ROUND(100.0 * COUNT(CASE WHEN e.completion_date IS NOT NULL THEN e.enrollment_id END)::NUMERIC
    143                       / NULLIF(COUNT(e.enrollment_id), 0), 2),
    144                 0)::NUMERIC AS completion_rate_percentage,
     142                    ROUND(100.0 * COUNT(CASE WHEN e.completion_date IS NOT NULL THEN e.enrollment_id END)::NUMERIC
     143                              / NULLIF(COUNT(e.enrollment_id), 0), 2),
     144                    0)::NUMERIC AS completion_rate_percentage,
    145145            COALESCE(ROUND(AVG(lp.completed_percentage), 2), 0)::NUMERIC AS avg_lecture_completion_percentage
    146146        FROM course c
     
    172172                      total_reviews BIGINT
    173173                  ) AS $$
    174 #variable_conflict use_column
     174    #variable_conflict use_column
    175175BEGIN
    176176    RETURN QUERY