diff --git a/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c)/m_d.rec_cam(m_c)_to_decision_service.hpl b/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c)/m_d.rec_cam(m_c)_to_decision_service.hpl index c0afd4c..85504aa 100644 --- a/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c)/m_d.rec_cam(m_c)_to_decision_service.hpl +++ b/v1_apache-hop dash mapping/mil_com/main_dashboard.recruitment_campaign(m_c)/m_d.rec_cam(m_c)_to_decision_service.hpl @@ -81,7 +81,8 @@ SELECT current_date AS recording_date FROM last_status ls WHERE ls.recruitment_id IS NOT NULL - AND ls.postponement_date > DATE_TRUNC('year', CURRENT_DATE) + INTERVAL '12 months' + AND ((ls.postponement_date > DATE_TRUNC('year', CURRENT_DATE) + INTERVAL '12 months') or + (ls.postponement_date > DATE_TRUNC('year', CURRENT_DATE) + INTERVAL '6 months' + INTERVAL '14 days')) GROUP BY spring_autumn, ls.recruitment_id Y @@ -104,25 +105,21 @@ GROUP BY spring_autumn, ls.recruitment_id 100 ervu-dashboard Y - = recruitment_id recruitment_id - = spring_autumn spring_autumn - = recording_date recording_date - main_dashboard recruitment_campaign