From 74c12f4ed844505238448d5fad6979f68eeef501 Mon Sep 17 00:00:00 2001 From: "y.kuznetsova" Date: Mon, 3 Mar 2025 14:54:10 +0300 Subject: [PATCH] SUPPORT-8925 fix querys --- .../country/appeals.reasons_appeal.hpl | 38 +--- .../country/main_dashboard.appeals.hpl | 38 +--- .../main_dashboard.recruitment_campaign.hpl | 50 ++--- .../main_dashboard.total_registered.hpl | 42 ++-- .../main_dashboard.waiting_registration.hpl | 104 ++++------ .../country/recruitment_campaign.appeals.hpl | 32 +-- .../recruitment_campaign.subpoenas.hpl | 98 +++------ .../country/select_recruitments_country.hpl | 10 +- .../country/total_registered.age.hpl | 97 +++------ .../country/total_registered.busyness.hpl | 92 +++------ .../country/total_registered.child_minor.hpl | 64 ++---- .../total_registered.driver_license.hpl | 44 ++-- .../total_registered.education_level.hpl | 28 +-- .../total_registered.marital_status.hpl | 27 +-- .../country/total_registered.reg_mil_cat.hpl | 60 ++---- .../total_registered.removed_registry.hpl | 130 +++++------- .../country/total_registered.subpoenas.hpl | 110 +++------- .../appeals.reasons_appeal(m_d).hpl | 38 +--- .../main_dashboard.appeals(m_d).hpl | 158 +++++++------- ...in_dashboard.recruitment_campaign(m_d).hpl | 48 ++--- .../main_dashboard.total_registered(m_d).hpl | 45 ++-- ...in_dashboard.waiting_registration(m_d).hpl | 166 +++++++-------- .../recruitment_campaign.appeals(m_d).hpl | 27 +-- .../recruitment_campaign.subpoenas(m_d).hpl | 101 +++------ .../mil_district/rows_id-array_mildis.hpl | 2 +- .../total_registered.age(m_d).hpl | 95 +++------ .../total_registered.busyness(m_d).hpl | 50 ++--- .../total_registered.child_minor(m_d).hpl | 64 ++---- .../total_registered.driver_license(m_d).hpl | 73 ++----- .../total_registered.education_level(m_d).hpl | 51 ++--- .../total_registered.marital_status(m_d).hpl | 42 +--- .../total_registered.reg_mil_cat(m_d).hpl | 69 ++----- ...total_registered.removed_registry(m_d).hpl | 192 +++++++----------- .../total_registered.subpoenas(m_d).hpl | 113 +++-------- 34 files changed, 800 insertions(+), 1598 deletions(-) diff --git a/v1_apache-hop dash mapping/country/appeals.reasons_appeal.hpl b/v1_apache-hop dash mapping/country/appeals.reasons_appeal.hpl index 35d5b04..d8276b4 100644 --- a/v1_apache-hop dash mapping/country/appeals.reasons_appeal.hpl +++ b/v1_apache-hop dash mapping/country/appeals.reasons_appeal.hpl @@ -251,54 +251,38 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(appeal) END AS appeal, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(incorrect_inf) END AS incorrect_inf, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(no_data) END AS no_data, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(other) END AS other, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(appeal), 0) appeal, + COALESCE(SUM(incorrect_inf), 0) incorrect_inf, + COALESCE(SUM(no_data), 0) no_data, + COALESCE(SUM(other), 0) other, + COALESCE( CASE WHEN SUM(appeal) > 0 THEN ROUND((SUM(incorrect_inf) / SUM(appeal) * 100), 2) ELSE 0 END, 0 - ) - END AS incorrect_inf_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) incorrect_inf_percent, + COALESCE( CASE WHEN SUM(appeal) > 0 THEN ROUND((SUM(no_data) / SUM(appeal) * 100), 2) ELSE 0 END, 0 - ) - END AS no_data_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) no_data_percent, + COALESCE( CASE WHEN SUM(appeal) > 0 THEN ROUND((SUM(other) / SUM(appeal) * 100), 2) ELSE 0 END, 0 - ) - END AS other_percent, + ) other_percent, '${REG_ID}' AS recruitment_id, 'Ministry' AS schema FROM appeals.reasons_appeal -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE; Y diff --git a/v1_apache-hop dash mapping/country/main_dashboard.appeals.hpl b/v1_apache-hop dash mapping/country/main_dashboard.appeals.hpl index 637ef7d..b54794c 100644 --- a/v1_apache-hop dash mapping/country/main_dashboard.appeals.hpl +++ b/v1_apache-hop dash mapping/country/main_dashboard.appeals.hpl @@ -56,11 +56,8 @@ ervu-dashboard - N - N - Y N N @@ -68,7 +65,6 @@ WHERE recording_date = current_date AND schema = 'Ministry' AND recruitment_id = '${REG_ID}' - 336 @@ -261,44 +257,32 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(total_appeals) END AS total_appeals, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(resolved) END AS resolved, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(average_consideration) END AS average_consideration, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(average_rating) END AS average_rating, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(average_to_face) END AS average_to_face, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("average_EPGU") END AS average_epgu, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(total_appeals), 0) total_appeals, + COALESCE(SUM(resolved), 0) resolved, + COALESCE(SUM(average_consideration), 0) average_consideration, + COALESCE(SUM(average_rating), 0) average_rating, + COALESCE(SUM(average_to_face), 0) average_to_face, + COALESCE(SUM("average_EPGU"), 0) average_epgu, + COALESCE( CASE WHEN (SUM(average_to_face) + SUM("average_EPGU")) > 0 THEN ROUND((SUM(average_to_face) / (SUM(average_to_face) + SUM("average_EPGU")) * 100), 2) ELSE 0 END, 0 - ) - END AS average_to_face_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) average_to_face_percent, + COALESCE( CASE WHEN (SUM(average_to_face) + SUM("average_EPGU")) > 0 THEN ROUND((SUM("average_EPGU") / (SUM(average_to_face) + SUM("average_EPGU")) * 100), 2) ELSE 0 END, 0 - ) - END AS average_epgu_percent, + ) average_epgu_percent, '${REG_ID}' AS recruitment_id, 'Ministry' AS schema FROM main_dashboard.appeals -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE; Y diff --git a/v1_apache-hop dash mapping/country/main_dashboard.recruitment_campaign.hpl b/v1_apache-hop dash mapping/country/main_dashboard.recruitment_campaign.hpl index 16514c4..31bac5e 100644 --- a/v1_apache-hop dash mapping/country/main_dashboard.recruitment_campaign.hpl +++ b/v1_apache-hop dash mapping/country/main_dashboard.recruitment_campaign.hpl @@ -277,69 +277,49 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(subpoenas_sent) END AS count_subpoena, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(appeared_on_subpoenas) END AS count_appeared, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(not_appeared_on_subpoenas) END AS count_not_appeared, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(new_recruits) END AS new_recruits, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(postponement_have_right) END AS postponement_have_right, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(postponement_granted) END AS postponement_granted, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(subpoenas_sent), 0) count_subpoena, + COALESCE(SUM(appeared_on_subpoenas), 0) count_appeared, + COALESCE(SUM(not_appeared_on_subpoenas), 0) count_not_appeared, + COALESCE(SUM(new_recruits), 0) new_recruits, + COALESCE(SUM(postponement_have_right), 0) postponement_have_right, + COALESCE(SUM(postponement_granted), 0) postponement_granted, + COALESCE( CASE WHEN SUM(subpoenas_sent) > 0 THEN ROUND((SUM(appeared_on_subpoenas) / SUM(subpoenas_sent) * 100), 2) ELSE 0 END, 0 - ) - END AS appeared_on_subpoenas_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) appeared_on_subpoenas_percent, + COALESCE( CASE WHEN SUM(subpoenas_sent) > 0 THEN ROUND((SUM(not_appeared_on_subpoenas) / SUM(subpoenas_sent) * 100), 2) ELSE 0 END, 0 - ) - END AS not_appeared_on_subpoenas_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_appeared_on_subpoenas_percent, + COALESCE( CASE WHEN SUM(subpoenas_sent) > 0 THEN ROUND((SUM(postponement_have_right) / SUM(subpoenas_sent) * 100), 2) ELSE 0 END, 0 - ) - END AS postponement_have_right_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) postponement_have_right_percent, + COALESCE( CASE WHEN SUM(subpoenas_sent) > 0 THEN ROUND((SUM(postponement_granted) / SUM(subpoenas_sent) * 100), 2) ELSE 0 END, 0 - ) - END AS postponement_granted_percent, + ) postponement_granted_percent, '${REG_ID}' AS recruitment_id, spring_autumn, 'Ministry' AS schema FROM main_dashboard.recruitment_campaign -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE GROUP BY spring_autumn; diff --git a/v1_apache-hop dash mapping/country/main_dashboard.total_registered.hpl b/v1_apache-hop dash mapping/country/main_dashboard.total_registered.hpl index f5172dc..fb16125 100644 --- a/v1_apache-hop dash mapping/country/main_dashboard.total_registered.hpl +++ b/v1_apache-hop dash mapping/country/main_dashboard.total_registered.hpl @@ -272,57 +272,41 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(total_registered) END AS total_count, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("total_registered_M") END AS male_count, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("total_registered_W") END AS female_count, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(mobilization_criterion) END AS mobilization_criterion, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(volunteer_criterion) END AS volunteer_criterion, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(contract_criterion) END AS contract_criterion, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(total_registered), 0) total_count, + COALESCE(SUM("total_registered_M"), 0) male_count, + COALESCE(SUM("total_registered_W"), 0) female_count, + COALESCE(SUM(mobilization_criterion), 0) mobilization_criterion, + COALESCE(SUM(volunteer_criterion), 0) volunteer_criterion, + COALESCE(SUM(contract_criterion), 0) contract_criterion, + COALESCE( CASE WHEN SUM(total_registered) > 0 THEN ROUND((SUM(mobilization_criterion) / SUM(total_registered) * 100), 2) ELSE 0 END, 0 - ) - END AS mobilization_criterion_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) mobilization_criterion_percent, + COALESCE( CASE WHEN SUM(total_registered) > 0 THEN ROUND((SUM(volunteer_criterion) / SUM(total_registered) * 100), 2) ELSE 0 END, 0 - ) - END AS volunteer_criterion_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) volunteer_criterion_percent, + COALESCE( CASE WHEN SUM(total_registered) > 0 THEN ROUND((SUM(contract_criterion) / SUM(total_registered) * 100), 2) ELSE 0 END, 0 - ) - END AS contract_criterion_percent, + ) contract_criterion_percent, '${REG_ID}' AS recruitment_id, convicts, 'Ministry' AS schema FROM main_dashboard.total_registered -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE GROUP BY convicts; diff --git a/v1_apache-hop dash mapping/country/main_dashboard.waiting_registration.hpl b/v1_apache-hop dash mapping/country/main_dashboard.waiting_registration.hpl index cbac776..23c1201 100644 --- a/v1_apache-hop dash mapping/country/main_dashboard.waiting_registration.hpl +++ b/v1_apache-hop dash mapping/country/main_dashboard.waiting_registration.hpl @@ -42,6 +42,35 @@ Y + + Execute SQL script + ExecSql + + Y + + 1 + + none + + + + + ervu-dashboard + N + N + Y + N + N + DELETE FROM main_dashboard.waiting_registration +WHERE recording_date = current_date + AND schema = 'Ministry' + AND recruitment_id = '${REG_ID}' + + + 416 + 352 + + Get variables 2 2 GetVariable @@ -238,57 +267,41 @@ N 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(waiting_registration) END AS waiting_count, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("waiting_registration_M") END AS male_count, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("waiting_registration_W") END AS female_count, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(mobilization_criterion) END AS mobilization_criterion, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(volunteer_criterion) END AS volunteer_criterion, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(contract_criterion) END AS contract_criterion, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(waiting_registration), 0) waiting_count, + COALESCE(SUM("waiting_registration_M"), 0) male_count, + COALESCE(SUM("waiting_registration_W"), 0) female_count, + COALESCE(SUM(mobilization_criterion), 0) mobilization_criterion, + COALESCE(SUM(volunteer_criterion), 0) volunteer_criterion, + COALESCE(SUM(contract_criterion), 0) contract_criterion, + COALESCE( CASE WHEN SUM(waiting_registration) > 0 THEN ROUND((SUM(mobilization_criterion) / SUM(waiting_registration) * 100), 2) ELSE 0 END, 0 - ) - END AS mobilization_criterion_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) mobilization_criterion_percent, + COALESCE( CASE WHEN SUM(waiting_registration) > 0 THEN ROUND((SUM(volunteer_criterion) / SUM(waiting_registration) * 100), 2) ELSE 0 END, 0 - ) - END AS volunteer_criterion_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) volunteer_criterion_percent, + COALESCE( CASE WHEN SUM(waiting_registration) > 0 THEN ROUND((SUM(contract_criterion) / SUM(waiting_registration) * 100), 2) ELSE 0 END, 0 - ) - END AS contract_criterion_percent, + ) contract_criterion_percent, 0 AS waiting_percent, -- waiting_registration_percent '${REG_ID}' AS recruitment_id, 'Ministry' AS schema FROM main_dashboard.waiting_registration -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE; Y @@ -298,39 +311,6 @@ AND recording_date = CURRENT_DATE; 352 - - Execute SQL script - ExecSql - - Y - - 1 - - none - - - - - ervu-dashboard - - N - - N - - Y - N - N - DELETE FROM main_dashboard.waiting_registration -WHERE recording_date = current_date - AND schema = 'Ministry' - AND recruitment_id = '${REG_ID}' - - - - 416 - 352 - - diff --git a/v1_apache-hop dash mapping/country/recruitment_campaign.appeals.hpl b/v1_apache-hop dash mapping/country/recruitment_campaign.appeals.hpl index b1c5d3c..5e8e3a6 100644 --- a/v1_apache-hop dash mapping/country/recruitment_campaign.appeals.hpl +++ b/v1_apache-hop dash mapping/country/recruitment_campaign.appeals.hpl @@ -262,46 +262,34 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(total_appeals) END AS total_appeals, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(average_consideration) END AS average_consideration, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(resolved) END AS resolved, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(not_resolved) END AS not_resolved, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + SUM(total_appeals), 0) total_appeals, + SUM(average_consideration), 0) average_consideration, + SUM(resolved), 0) resolved, + SUM(not_resolved), 0) not_resolved, + COALESCE( CASE WHEN SUM(total_appeals) > 0 THEN ROUND((SUM(not_resolved) / SUM(total_appeals) * 100), 2) ELSE 0 END, 0 - ) - END AS not_resolved_percent, + ) not_resolved_percent, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(average_rating) END AS average_rating, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + SUM(average_rating) END AS average_rating, + COALESCE( CASE WHEN SUM(total_appeals) > 0 THEN ROUND((SUM(resolved) / SUM(total_appeals) * 100), 2) ELSE 0 END, 0 - ) - END AS resolved_percent, + ) resolved_percent, '${REG_ID}' AS recruitment_id, spring_autumn, 'Ministry' AS schema FROM recruitment_campaign.appeals -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE GROUP BY spring_autumn; diff --git a/v1_apache-hop dash mapping/country/recruitment_campaign.subpoenas.hpl b/v1_apache-hop dash mapping/country/recruitment_campaign.subpoenas.hpl index 02fa7e7..8ff426a 100644 --- a/v1_apache-hop dash mapping/country/recruitment_campaign.subpoenas.hpl +++ b/v1_apache-hop dash mapping/country/recruitment_campaign.subpoenas.hpl @@ -317,133 +317,93 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(subpoena) END AS count_subpoena, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(appeared) END AS count_appeared, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(not_appeared) END AS count_not_appeared, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(not_ap_good_reason) END AS count_not_ap_good_reason, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(introduced_measures) END AS count_introduced_measures, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(ap_not_required) END AS count_ap_not_required, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(restrictions_applied) END AS count_restrictions_applied, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(subpoena), 0) count_subpoena, + COALESCE(SUM(appeared), 0) count_appeared, + COALESCE(SUM(not_appeared), 0) count_not_appeared, + COALESCE(SUM(not_ap_good_reason), 0) count_not_ap_good_reason, + COALESCE(SUM(introduced_measures), 0) count_introduced_measures, + COALESCE(SUM(ap_not_required), 0) count_ap_not_required, + COALESCE(SUM(restrictions_applied), 0) count_restrictions_applied, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(appeared) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS appeared_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) appeared_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(not_appeared) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS not_appeared_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_appeared_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(not_ap_good_reason) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS not_ap_good_reason_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_ap_good_reason_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(ap_not_required) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS ap_not_required_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) ap_not_required_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(restrictions_applied) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS restrictions_applied_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) restrictions_applied_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(introduced_measures) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS introduced_measures_percent, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(rest) END AS rest, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(count_not_delivery) END AS count_not_delivery, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(appear_date_is_good) END AS appear_date_is_good, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) introduced_measures_percent, + COALESCE(SUM(rest), 0) rest, + COALESCE(SUM(count_not_delivery), 0) count_not_delivery, + COALESCE(SUM(appear_date_is_good), 0) appear_date_is_good, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(count_not_delivery) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS not_delivery_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_delivery_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(count_not_delivery) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS not_delivery_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_delivery_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(appear_date_is_good) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS appear_date_is_good_percent, + ) appear_date_is_good_percent, '${REG_ID}' AS recruitment_id, spring_autumn, 'Ministry' AS schema FROM recruitment_campaign.subpoenas -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE GROUP BY spring_autumn; diff --git a/v1_apache-hop dash mapping/country/select_recruitments_country.hpl b/v1_apache-hop dash mapping/country/select_recruitments_country.hpl index 9ecb16e..de9cad8 100644 --- a/v1_apache-hop dash mapping/country/select_recruitments_country.hpl +++ b/v1_apache-hop dash mapping/country/select_recruitments_country.hpl @@ -58,13 +58,9 @@ ervu-dashboard N - WITH -t1 AS (SELECT array_agg(recruitment_dstr_id) AS RECRUITMENT_COUNTRY_ID -FROM ervu_dashboard.array_mildis) -SELECT - t1.RECRUITMENT_COUNTRY_ID AS VK_ARRAY_ID, - 'f03fc8c0-2ce7-4121-a306-f82d65ea029d' AS RECRUITMENT_REG_ID -FROM t1 + SELECT 'f03fc8c0-2ce7-4121-a306-f82d65ea029d' AS RECRUITMENT_REG_ID, + array_agg(recruitment_dstr_id) AS VK_ARRAY_ID +FROM ervu_dashboard.array_mildis N diff --git a/v1_apache-hop dash mapping/country/total_registered.age.hpl b/v1_apache-hop dash mapping/country/total_registered.age.hpl index 7272a2c..6a9aaed 100644 --- a/v1_apache-hop dash mapping/country/total_registered.age.hpl +++ b/v1_apache-hop dash mapping/country/total_registered.age.hpl @@ -122,31 +122,26 @@ WHERE recording_date = current_date = recruitment_id REG_ID - = "all_M_W" gender - = registered registered - = schema schema - = convicts convicts - total_registered age
@@ -338,123 +333,87 @@ WHERE recording_date = current_date 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(total_count) END AS total_count, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("17_years") END AS "17_year_count", - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("18-26_years") END AS "18-26_year_count", - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("27-30_years") END AS "27-30_year_count", - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("31-35_years") END AS "31-35_year_count", - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("36-40_years") END AS "36-40_year_count", - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("41-45_years") END AS "41-45_year_count", - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("51+_years") END AS "51+_year_count", - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("46-50_years") END AS "46-50_year_count", - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(total_count), 0) total_count, + COALESCE(SUM("17_years"), 0) "17_year_count", + COALESCE(SUM("18-26_years"), 0) "18-26_year_count", + COALESCE(SUM("27-30_years"), 0) "27-30_year_count", + COALESCE(SUM("31-35_years"), 0) "31-35_year_count", + COALESCE(SUM("36-40_years"), 0) "36-40_year_count", + COALESCE(SUM("41-45_years"), 0) "41-45_year_count", + COALESCE(SUM("51+_years"), 0) "51+_year_count", + COALESCE(SUM("46-50_years"), 0) "46-50_year_count", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("17_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "17_year_percent", - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) "17_year_percent", + COALESCE( CASE - WHEN SUM(total_count) > 0 + WHEN SUM(total_count) > 0 THEN ROUND((SUM("18-26_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "18-26_year_percent", - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) "18-26_year_percent", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("27-30_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "27-30_year_percent", - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) "27-30_year_percent", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("31-35_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "31-35_year_percent", - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) "31-35_year_percent", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("36-40_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "36-40_year_percent", - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) "36-40_year_percent", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("41-45_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "41-45_year_percent", - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) "41-45_year_percent", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("46-50_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "46-50_year_percent", - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) "46-50_year_percent", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("51+_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "51+_year_percent", + ) "51+_year_percent", '${REG_ID}' AS recruitment_id, registered, "all_M_W" AS gender, - convicts, + convicts, 'Ministry' AS schema FROM total_registered.age -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE GROUP BY "all_M_W", registered, convicts; diff --git a/v1_apache-hop dash mapping/country/total_registered.busyness.hpl b/v1_apache-hop dash mapping/country/total_registered.busyness.hpl index e4f298d..0b45af9 100644 --- a/v1_apache-hop dash mapping/country/total_registered.busyness.hpl +++ b/v1_apache-hop dash mapping/country/total_registered.busyness.hpl @@ -284,58 +284,42 @@ WHERE recording_date = current_date WITH a AS ( SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(study) END AS study, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(work) END AS work, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(convicts) END AS convicts, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( - CASE - WHEN SUM(busyness) > 0 - THEN ROUND((SUM(study) / SUM(busyness) * 100), 2) - ELSE 0 - END, - 0 - ) - END AS study_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(study), 0) study, + COALESCE(SUM(work), 0) work, + COALESCE(SUM(convicts), 0) convicts, + COALESCE( CASE WHEN SUM(busyness) > 0 THEN ROUND((SUM(study) / SUM(busyness) * 100), 2) ELSE 0 END, 0 - ) - END AS work_percent, + ) study_percent, + COALESCE( + CASE + WHEN SUM(busyness) > 0 + THEN ROUND((SUM(study) / SUM(busyness) * 100), 2) + ELSE 0 + END, + 0 + ) work_percent, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(not_work) END AS not_work, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(not_work), 0) not_work, + COALESCE( CASE WHEN SUM(busyness) > 0 THEN ROUND((SUM(not_work) / SUM(busyness) * 100), 2) ELSE 0 END, 0 - ) - END AS not_work_percent, + ) not_work_percent, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(busyness) END AS total_people, + COALESCE(SUM(busyness), 0) total_people, '${REG_ID}' AS recruitment_id, "all_M_W" AS gender, registered FROM total_registered.busyness - WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] - ) + WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND "all_M_W" IN ('M', 'W') AND recording_date = CURRENT_DATE @@ -344,57 +328,41 @@ a AS ( a2 AS ( SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(study) END AS study, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(work) END AS work, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(convicts) END AS convicts, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(study), 0) study, + COALESCE(SUM(work), 0) work, + COALESCE(SUM(convicts), 0) convicts, + COALESCE( CASE WHEN SUM(busyness) > 0 THEN ROUND((SUM(study) / SUM(busyness) * 100), 2) ELSE 0 END, 0 - ) - END AS study_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) study_percent, + COALESCE( CASE WHEN SUM(busyness) > 0 THEN ROUND((SUM(study) / SUM(busyness) * 100), 2) ELSE 0 END, 0 - ) - END AS work_percent, + ) work_percent, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(not_work) END AS not_work, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(not_work), 0) not_work, + COALESCE( CASE WHEN SUM(busyness) > 0 THEN ROUND((SUM(not_work) / SUM(busyness) * 100), 2) ELSE 0 END, 0 - ) - END AS not_work_percent, + ) not_work_percent, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(busyness) END AS total_people, + COALESCE(SUM(busyness), 0) total_people, '${REG_ID}' AS recruitment_id, registered FROM total_registered.busyness - WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] - ) + WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND "all_M_W" = 'ALL' AND recording_date = CURRENT_DATE diff --git a/v1_apache-hop dash mapping/country/total_registered.child_minor.hpl b/v1_apache-hop dash mapping/country/total_registered.child_minor.hpl index a971270..4a42e43 100644 --- a/v1_apache-hop dash mapping/country/total_registered.child_minor.hpl +++ b/v1_apache-hop dash mapping/country/total_registered.child_minor.hpl @@ -122,25 +122,21 @@ WHERE recording_date = current_date = recruitment_id REG_ID - = "all_M_W" gender - = schema schema - = convicts convicts - total_registered child_minor
@@ -296,82 +292,58 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(total_count) END AS total_count, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(no_child) END AS no_children, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("1_child") END AS one_child, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("2_child") END AS two_children, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("3_child") END AS three_children, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("4_more_child") END AS four_or_more_children, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(total_count), 0) total_count, + COALESCE(SUM(no_child), 0) no_children, + COALESCE(SUM("1_child"), 0) one_child, + COALESCE(SUM("2_child"), 0) two_children, + COALESCE(SUM("3_child"), 0) three_children, + COALESCE(SUM("4_more_child"), 0) four_or_more_children, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM(no_child) / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS no_children_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) no_children_percent, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("1_child") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS one_child_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) one_child_percent, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("2_child") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS two_children_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) two_children_percent, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("3_child") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS three_children_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) three_children_percent, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("4_more_child") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS four_or_more_children_percent, + ) four_or_more_children_percent, '${REG_ID}' AS recruitment_id, "all_M_W" AS gender, - convicts, + convicts, 'Ministry' AS schema FROM total_registered.child_minor -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE GROUP BY "all_M_W", convicts; diff --git a/v1_apache-hop dash mapping/country/total_registered.driver_license.hpl b/v1_apache-hop dash mapping/country/total_registered.driver_license.hpl index f0cf246..add871f 100644 --- a/v1_apache-hop dash mapping/country/total_registered.driver_license.hpl +++ b/v1_apache-hop dash mapping/country/total_registered.driver_license.hpl @@ -122,25 +122,21 @@ WHERE recording_date = current_date = recruitment_id REG_ID - = "all_M_W" gender - = schema schema - = convicts convicts - total_registered driver_license
@@ -306,13 +302,13 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(total_count) END AS total, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("A") END AS a, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("B") END AS b, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("C") END AS c, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("D") END AS d, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM("E") END AS e, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(nope) END AS nope, + COALESCE(SUM(total_count), 0) total, + COALESCE(SUM("A"), 0) a, + COALESCE(SUM("B"), 0) b, + COALESCE(SUM("C"), 0) c, + COALESCE(SUM("D"), 0) d, + COALESCE(SUM("E"), 0) e, + COALESCE(SUM(nope), 0) nope, CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 @@ -323,8 +319,7 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS a_percent, + ) a_percent, CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 @@ -335,8 +330,7 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS b_percent, + ) b_percent, CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 @@ -347,8 +341,7 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS c_percent, + ) c_percent, CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 @@ -359,8 +352,7 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS d_percent, + ) d_percent, CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 @@ -371,8 +363,7 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS e_percent, -- нет такой категории + ) e_percent, -- нет такой категории CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 @@ -383,18 +374,13 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS nope_percent, + ) nope_percent, '${REG_ID}' AS recruitment_id, "all_M_W" AS gender, - convicts, + convicts, 'Ministry' AS schema FROM total_registered.driver_license -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE GROUP BY "all_M_W", convicts; diff --git a/v1_apache-hop dash mapping/country/total_registered.education_level.hpl b/v1_apache-hop dash mapping/country/total_registered.education_level.hpl index e7a4c1f..3335a85 100644 --- a/v1_apache-hop dash mapping/country/total_registered.education_level.hpl +++ b/v1_apache-hop dash mapping/country/total_registered.education_level.hpl @@ -272,10 +272,10 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(higher) END AS higher, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(average) END AS average_prof, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(only_general) END AS only_general, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(no_data) END AS count_nodata, + COALESCE(SUM(higher), 0) higher, + COALESCE(SUM(average), 0) average_prof, + COALESCE(SUM(only_general), 0) only_general, + COALESCE(SUM(no_data), 0) count_nodata, CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 @@ -286,8 +286,7 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS higher_percentage, + ) higher_percentage, CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 @@ -298,8 +297,7 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS average_prof_percentage, + ) average_prof_percentage, CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 @@ -310,8 +308,7 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS only_general_percentage, + ) only_general_percentage, CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 @@ -322,19 +319,14 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS count_nodata_percentage, + ) count_nodata_percentage, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(education_level) END AS total, + COALESCE(SUM(education_level)) total, '${REG_ID}' AS recruitment_id, "all_M_W" AS gender, 'Ministry' AS schema FROM total_registered.education_level -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE GROUP BY "all_M_W"; diff --git a/v1_apache-hop dash mapping/country/total_registered.marital_status.hpl b/v1_apache-hop dash mapping/country/total_registered.marital_status.hpl index c4b20cb..b549f68 100644 --- a/v1_apache-hop dash mapping/country/total_registered.marital_status.hpl +++ b/v1_apache-hop dash mapping/country/total_registered.marital_status.hpl @@ -122,25 +122,21 @@ WHERE recording_date = current_date = recruitment_id REG_ID - = "all_M_W" gender - = schema schema - = convicts convicts - total_registered marital_status
@@ -276,9 +272,9 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(married) END AS married, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(not_married) END AS not_married, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(other) END AS other, + COALESCE(SUM(married), 0) married, + COALESCE(SUM(not_married), 0) not_married, + COALESCE(SUM(other), 0) other, CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 @@ -289,8 +285,7 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS married_percent, + ) married_percent, CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 @@ -301,8 +296,7 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS not_married_percent, + ) not_married_percent, CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 @@ -313,19 +307,14 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS other_percent, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(marital_status) END AS total, + ) other_percent, + COALESCE(SUM(marital_status) END AS total, '${REG_ID}' AS recruitment_id, "all_M_W" AS gender, convicts, 'Ministry' AS schema FROM total_registered.marital_status -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE GROUP BY "all_M_W", convicts; diff --git a/v1_apache-hop dash mapping/country/total_registered.reg_mil_cat.hpl b/v1_apache-hop dash mapping/country/total_registered.reg_mil_cat.hpl index 08b2b06..50afd53 100644 --- a/v1_apache-hop dash mapping/country/total_registered.reg_mil_cat.hpl +++ b/v1_apache-hop dash mapping/country/total_registered.reg_mil_cat.hpl @@ -287,16 +287,13 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE COALESCE(SUM(first_reg_17), 0) END AS first_reg_17, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE COALESCE(SUM(first_reg_18), 0) END AS first_reg_18, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE COALESCE(SUM("mil_spec_W"), 0) END AS mil_spec_w, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE COALESCE(SUM(returned_dep_liberty), 0) END AS returned_dep_liberty, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE COALESCE(SUM(punished), 0) END AS punished, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE COALESCE(SUM(received_citizenship), 0) END AS received_citizenship, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(first_reg_17), 0) first_reg_17, + COALESCE(SUM(first_reg_18), 0) first_reg_18, + COALESCE(SUM("mil_spec_W"), 0) mil_spec_w, + COALESCE(SUM(returned_dep_liberty), 0) returned_dep_liberty, + COALESCE(SUM(punished), 0) punished, + COALESCE(SUM(received_citizenship), 0) received_citizenship, + COALESCE( CASE WHEN (SUM(first_reg_17) + SUM(first_reg_18)) > 0 THEN ROUND((SUM(first_reg_17) / (SUM(first_reg_17) + SUM(first_reg_18)) * 100), 2) @@ -304,11 +301,8 @@ WHERE recording_date = current_date END, 0 ) - END AS first_reg_17_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + first_reg_17_percent, + COALESCE( CASE WHEN (SUM(first_reg_17) + SUM(first_reg_18)) > 0 THEN ROUND((SUM(first_reg_18) / (SUM(first_reg_17) + SUM(first_reg_18)) * 100), 2) @@ -316,11 +310,8 @@ WHERE recording_date = current_date END, 0 ) - END AS first_reg_18_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + first_reg_18_percent, + COALESCE( CASE WHEN (SUM(first_reg_17) + SUM(first_reg_18)) > 0 THEN ROUND((SUM(returned_dep_liberty) / (SUM(first_reg_17) + SUM(first_reg_18)) * 100), 2) @@ -328,11 +319,8 @@ WHERE recording_date = current_date END, 0 ) - END AS returned_dep_liberty_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + returned_dep_liberty_percent, + COALESCE( CASE WHEN (SUM(first_reg_17) + SUM(first_reg_18)) > 0 THEN ROUND((SUM("mil_spec_W") / (SUM(first_reg_17) + SUM(first_reg_18)) * 100), 2) @@ -340,11 +328,8 @@ WHERE recording_date = current_date END, 0 ) - END AS mil_spec_w_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + mil_spec_w_percent, + COALESCE( CASE WHEN (SUM(first_reg_17) + SUM(first_reg_18)) > 0 THEN ROUND((SUM(punished) / (SUM(first_reg_17) + SUM(first_reg_18)) * 100), 2) @@ -352,11 +337,8 @@ WHERE recording_date = current_date END, 0 ) - END AS punished_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + punished_percent, + COALESCE( CASE WHEN (SUM(first_reg_17) + SUM(first_reg_18)) > 0 THEN ROUND((SUM(received_citizenship) / (SUM(first_reg_17) + SUM(first_reg_18)) * 100), 2) @@ -364,16 +346,12 @@ WHERE recording_date = current_date END, 0 ) - END AS received_citizenship_percent, + received_citizenship_percent, '${REG_ID}'::uuid AS recruitment_id, mil_reg, 'Ministry' AS schema FROM total_registered.reg_mil_cat -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE GROUP BY mil_reg; diff --git a/v1_apache-hop dash mapping/country/total_registered.removed_registry.hpl b/v1_apache-hop dash mapping/country/total_registered.removed_registry.hpl index dc3c5cc..b7f0711 100644 --- a/v1_apache-hop dash mapping/country/total_registered.removed_registry.hpl +++ b/v1_apache-hop dash mapping/country/total_registered.removed_registry.hpl @@ -42,6 +42,35 @@ Y + + Execute SQL script + ExecSql + + Y + + 1 + + none + + + + + ervu-dashboard + N + N + Y + N + N + DELETE FROM total_registered.removed_registry +WHERE recording_date = current_date + AND schema = 'Ministry' + AND recruitment_id = '${REG_ID}' + + + 224 + 224 + + Get variables 2 2 GetVariable @@ -253,93 +282,65 @@ N 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(age_limit) END AS age_limit, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(death) END AS death, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(removed_registry) END AS removed_registry, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(deprivation_citizenship) END AS deprivation_citizenship, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(travel_abroad) END AS travel_abroad, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(living_abroad) END AS living_abroad, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(other) END AS other, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + SUM(age_limit), 0) age_limit, + SUM(death), 0) death, + SUM(removed_registry), 0) removed_registry, + SUM(deprivation_citizenship), 0) deprivation_citizenship, + SUM(travel_abroad), 0) travel_abroad, + SUM(living_abroad), 0) living_abroad, + SUM(other), 0) other, + COALESCE( CASE WHEN SUM(removed_registry) > 0 THEN ROUND((SUM(deprivation_citizenship) / SUM(removed_registry) * 100), 2) ELSE 0 END, 0 - ) - END AS deprivation_citizen_percents, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) deprivation_citizen_percents, + COALESCE( CASE WHEN SUM(removed_registry) > 0 THEN ROUND((SUM(age_limit) / SUM(removed_registry) * 100), 2) ELSE 0 END, 0 - ) - END AS age_limit_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) age_limit_percent, + COALESCE( CASE WHEN SUM(removed_registry) > 0 THEN ROUND((SUM(death) / SUM(removed_registry) * 100), 2) ELSE 0 END, 0 - ) - END AS death_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) death_percent, + COALESCE( CASE WHEN SUM(removed_registry) > 0 THEN ROUND((SUM(travel_abroad) / SUM(removed_registry) * 100), 2) ELSE 0 END, 0 - ) - END AS travel_abroad_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) travel_abroad_percent, + COALESCE( CASE WHEN SUM(removed_registry) > 0 THEN ROUND((SUM(living_abroad) / SUM(removed_registry) * 100), 2) ELSE 0 END, 0 - ) - END AS living_abroad_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) living_abroad_percent, + COALESCE( CASE WHEN SUM(removed_registry) > 0 THEN ROUND((SUM(other) / SUM(removed_registry) * 100), 2) ELSE 0 END, 0 - ) - END AS other_percent, + ) other_percent, '${REG_ID}' AS recruitment_id, 'Ministry' AS schema FROM total_registered.removed_registry -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE; Y @@ -349,39 +350,6 @@ AND recording_date = CURRENT_DATE; 224 - - Execute SQL script - ExecSql - - Y - - 1 - - none - - - - - ervu-dashboard - - N - - N - - Y - N - N - DELETE FROM total_registered.removed_registry -WHERE recording_date = current_date - AND schema = 'Ministry' - AND recruitment_id = '${REG_ID}' - - - - 224 - 224 - - diff --git a/v1_apache-hop dash mapping/country/total_registered.subpoenas.hpl b/v1_apache-hop dash mapping/country/total_registered.subpoenas.hpl index a799d5a..30bcf9d 100644 --- a/v1_apache-hop dash mapping/country/total_registered.subpoenas.hpl +++ b/v1_apache-hop dash mapping/country/total_registered.subpoenas.hpl @@ -337,149 +337,105 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(subpoena) END AS count_subpoena, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(appeared) END AS count_appeared, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(average_appeared) END AS average_appeared, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(not_appeared) END AS count_not_appeared, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(not_ap_good_reason) END AS count_not_ap_good_reason, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(introduced_measures) END AS count_introduced_measures, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(ap_not_required) END AS count_ap_not_required, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(electron) END AS count_electron, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(paper) END AS count_paper, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(restrictions_applied) END AS count_restrictions_applied, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(subpoena), 0) count_subpoena, + COALESCE(SUM(appeared), 0) count_appeared, + COALESCE(SUM(average_appeared), 0) average_appeared, + COALESCE(SUM(not_appeared), 0) count_not_appeared, + COALESCE(SUM(not_ap_good_reason), 0) count_not_ap_good_reason, + COALESCE(SUM(introduced_measures), 0) count_introduced_measures, + COALESCE(SUM(ap_not_required), 0) count_ap_not_required, + COALESCE(SUM(electron), 0) count_electron, + COALESCE(SUM(paper), 0) count_paper, + COALESCE(SUM(restrictions_applied), 0) count_restrictions_applied, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(appeared) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS appeared_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) appeared_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(not_appeared) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS not_appeared_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_appeared_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(not_ap_good_reason) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS not_ap_good_reason_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_ap_good_reason_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(ap_not_required) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS ap_not_required_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) ap_not_required_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(electron) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS electron_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) electron_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(paper) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS paper_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) paper_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(restrictions_applied) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS restrictions_applied_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) restrictions_applied_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(introduced_measures) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS introduced_measures_percent, + ) introduced_measures_percent, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(count_not_delivery) END AS count_not_delivery, - CASE WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' THEN 0 ELSE SUM(appear_date_is_good) END AS appear_date_is_good, + COALESCE(SUM(count_not_delivery) END AS count_not_delivery, + COALESCE(SUM(appear_date_is_good) END AS appear_date_is_good, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(count_not_delivery) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS not_delivery_percent, - CASE - WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_delivery_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(appear_date_is_good) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS appear_date_is_good_percent, + ) appear_date_is_good_percent, '${REG_ID}' AS recruitment_id, mil_reg, 'Ministry' AS schema FROM total_registered.subpoenas -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${VK_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${VK_ARRAY}') AND schema = 'Region' AND recording_date = CURRENT_DATE GROUP BY mil_reg; diff --git a/v1_apache-hop dash mapping/mil_district/appeals.reasons_appeal(m_d).hpl b/v1_apache-hop dash mapping/mil_district/appeals.reasons_appeal(m_d).hpl index 1e75866..ba24115 100644 --- a/v1_apache-hop dash mapping/mil_district/appeals.reasons_appeal(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/appeals.reasons_appeal(m_d).hpl @@ -285,54 +285,38 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(appeal) END AS appeal, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(incorrect_inf) END AS incorrect_inf, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(no_data) END AS no_data, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(other) END AS other, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + (SUM(appeal), 0) appeal, + (SUM(incorrect_inf), 0) incorrect_inf, + (SUM(no_data), 0) no_data, + (SUM(other), 0) other, + COALESCE( CASE WHEN SUM(appeal) > 0 THEN ROUND((SUM(incorrect_inf) / SUM(appeal) * 100), 2) ELSE 0 END, 0 - ) - END AS incorrect_inf_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) incorrect_inf_percent, + COALESCE( CASE WHEN SUM(appeal) > 0 THEN ROUND((SUM(no_data) / SUM(appeal) * 100), 2) ELSE 0 END, 0 - ) - END AS no_data_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) no_data_percent, + COALESCE( CASE WHEN SUM(appeal) > 0 THEN ROUND((SUM(other) / SUM(appeal) * 100), 2) ELSE 0 END, 0 - ) - END AS other_percent, + ) other_percent, '${MD_ID}' AS recruitment_id, 'Region' AS schema FROM appeals.reasons_appeal -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE; Y diff --git a/v1_apache-hop dash mapping/mil_district/main_dashboard.appeals(m_d).hpl b/v1_apache-hop dash mapping/mil_district/main_dashboard.appeals(m_d).hpl index 4e6b2f6..781f3f4 100644 --- a/v1_apache-hop dash mapping/mil_district/main_dashboard.appeals(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/main_dashboard.appeals(m_d).hpl @@ -47,6 +47,64 @@ Y + + Execute SQL script + ExecSql + + N + + 1 + + none + + + + + ervu-dashboard + N + N + Y + N + N + DELETE FROM main_dashboard.appeals +WHERE recording_date = current_date + AND schema = 'Region' + AND recruitment_id = '${MD_ID}' + + + 240 + 192 + + + + Execute SQL script 2 + ExecSql + + N + + 1 + + none + + + + + ervu-dashboard + N + N + Y + N + N + DELETE FROM main_dashboard.appeals +WHERE recording_date = current_date + AND schema = 'MD_LVL' + AND recruitment_id = '${MD_ID}' + + + 1264 + 192 + + Get variables 3 2 GetVariable @@ -233,44 +291,32 @@ N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(total_appeals) END AS total_appeals, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(resolved) END AS resolved, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(average_consideration) END AS average_consideration, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(average_rating) END AS average_rating, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(average_to_face) END AS average_to_face, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("average_EPGU") END AS average_epgu, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(total_appeals), 0) total_appeals, + COALESCE(SUM(resolved), 0) resolved, + COALESCE(SUM(average_consideration), 0) average_consideration, + COALESCE(SUM(average_rating), 0) average_rating, + COALESCE(SUM(average_to_face), 0) average_to_face, + COALESCE(SUM("average_EPGU"), 0) average_epgu, + COALESCE( CASE WHEN (SUM(average_to_face) + SUM("average_EPGU")) > 0 THEN ROUND((SUM(average_to_face) / (SUM(average_to_face) + SUM("average_EPGU")) * 100), 2) ELSE 0 END, 0 - ) - END AS average_to_face_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) average_to_face_percent, + COALESCE( CASE WHEN (SUM(average_to_face) + SUM("average_EPGU")) > 0 THEN ROUND((SUM("average_EPGU") / (SUM(average_to_face) + SUM("average_EPGU")) * 100), 2) ELSE 0 END, 0 - ) - END AS average_epgu_percent, + ) average_epgu_percent, '${MD_ID}' AS recruitment_id, 'Region' AS schema FROM main_dashboard.appeals -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE; Y @@ -280,72 +326,6 @@ AND recording_date = CURRENT_DATE; 192 - - Execute SQL script - ExecSql - - N - - 1 - - none - - - - - ervu-dashboard - - N - - N - - Y - N - N - DELETE FROM main_dashboard.appeals -WHERE recording_date = current_date - AND schema = 'Region' - AND recruitment_id = '${MD_ID}' - - - - 240 - 192 - - - - Execute SQL script 2 - ExecSql - - N - - 1 - - none - - - - - ervu-dashboard - - N - - N - - Y - N - N - DELETE FROM main_dashboard.appeals -WHERE recording_date = current_date - AND schema = 'MD_LVL' - AND recruitment_id = '${MD_ID}' - - - - 1264 - 192 - - diff --git a/v1_apache-hop dash mapping/mil_district/main_dashboard.recruitment_campaign(m_d).hpl b/v1_apache-hop dash mapping/mil_district/main_dashboard.recruitment_campaign(m_d).hpl index 5b30ce4..c6a602a 100644 --- a/v1_apache-hop dash mapping/mil_district/main_dashboard.recruitment_campaign(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/main_dashboard.recruitment_campaign(m_d).hpl @@ -156,19 +156,16 @@ WHERE recording_date = current_date = recruitment_id MD_ID - = schema schema - = spring_autumn spring_autumn - main_dashboard recruitment_campaign
@@ -314,12 +311,12 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(subpoenas_sent) END AS count_subpoena, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(appeared_on_subpoenas) END AS count_appeared, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(not_appeared_on_subpoenas) END AS count_not_appeared, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(new_recruits) END AS new_recruits, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(postponement_have_right) END AS postponement_have_right, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(postponement_granted) END AS postponement_granted, + COALESCE(SUM(subpoenas_sent), 0) count_subpoena, + COALESCE(SUM(appeared_on_subpoenas), 0) count_appeared, + COALESCE(SUM(not_appeared_on_subpoenas), 0) count_not_appeared, + COALESCE(SUM(new_recruits), 0) new_recruits, + COALESCE(SUM(postponement_have_right), 0) postponement_have_right, + COALESCE(SUM(postponement_granted), 0) postponement_granted, CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 @@ -330,53 +327,36 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS appeared_on_subpoenas_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) appeared_on_subpoenas_percent, + COALESCE( CASE WHEN SUM(subpoenas_sent) > 0 THEN ROUND((SUM(not_appeared_on_subpoenas) / SUM(subpoenas_sent) * 100), 2) ELSE 0 END, 0 - ) - END AS not_appeared_on_subpoenas_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_appeared_on_subpoenas_percent, + COALESCE( CASE WHEN SUM(subpoenas_sent) > 0 THEN ROUND((SUM(postponement_have_right) / SUM(subpoenas_sent) * 100), 2) ELSE 0 END, 0 - ) - END AS postponement_have_right_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) postponement_have_right_percent, + COALESCE( CASE WHEN SUM(subpoenas_sent) > 0 THEN ROUND((SUM(postponement_granted) / SUM(subpoenas_sent) * 100), 2) ELSE 0 END, 0 - ) - END AS postponement_granted_percent, + ) postponement_granted_percent, '${MD_ID}' AS recruitment_id, spring_autumn, 'Region' AS schema FROM main_dashboard.recruitment_campaign -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE GROUP BY spring_autumn; diff --git a/v1_apache-hop dash mapping/mil_district/main_dashboard.total_registered(m_d).hpl b/v1_apache-hop dash mapping/mil_district/main_dashboard.total_registered(m_d).hpl index eb3b33e..732607d 100644 --- a/v1_apache-hop dash mapping/mil_district/main_dashboard.total_registered(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/main_dashboard.total_registered(m_d).hpl @@ -156,19 +156,16 @@ WHERE recording_date = current_date = recruitment_id MD_ID - = schema schema - = convicts convicts - main_dashboard total_registered
@@ -309,57 +306,41 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(total_registered) END AS total_count, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("total_registered_M") END AS male_count, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("total_registered_W") END AS female_count, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(mobilization_criterion) END AS mobilization_criterion, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(volunteer_criterion) END AS volunteer_criterion, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(contract_criterion) END AS contract_criterion, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(total_registered), 0) total_count, + COALESCE(SUM("total_registered_M"), 0) male_count, + COALESCE(SUM("total_registered_W"), 0) female_count, + COALESCE(SUM(mobilization_criterion), 0) mobilization_criterion, + COALESCE(SUM(volunteer_criterion), 0) volunteer_criterion, + COALESCE(SUM(contract_criterion), 0) contract_criterion, + COALESCE( CASE WHEN SUM(total_registered) > 0 THEN ROUND((SUM(mobilization_criterion) / SUM(total_registered) * 100), 2) ELSE 0 END, 0 - ) - END AS mobilization_criterion_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) mobilization_criterion_percent, + COALESCE( CASE WHEN SUM(total_registered) > 0 THEN ROUND((SUM(volunteer_criterion) / SUM(total_registered) * 100), 2) ELSE 0 END, 0 - ) - END AS volunteer_criterion_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) volunteer_criterion_percent, + COALESCE( CASE WHEN SUM(total_registered) > 0 THEN ROUND((SUM(contract_criterion) / SUM(total_registered) * 100), 2) ELSE 0 END, 0 - ) - END AS contract_criterion_percent, + ) contract_criterion_percent, '${MD_ID}' AS recruitment_id, convicts, 'Region' AS schema FROM main_dashboard.total_registered -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE GROUP BY convicts; diff --git a/v1_apache-hop dash mapping/mil_district/main_dashboard.waiting_registration(m_d).hpl b/v1_apache-hop dash mapping/mil_district/main_dashboard.waiting_registration(m_d).hpl index a75b5d6..c7def40 100644 --- a/v1_apache-hop dash mapping/mil_district/main_dashboard.waiting_registration(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/main_dashboard.waiting_registration(m_d).hpl @@ -47,6 +47,64 @@ Y + + Execute SQL script + ExecSql + + N + + 1 + + none + + + + + ervu-dashboard + N + N + Y + N + N + DELETE FROM main_dashboard.waiting_registration +WHERE recording_date = current_date + AND schema = 'Region' + AND recruitment_id = '${MD_ID}' + + + 320 + 336 + + + + Execute SQL script 2 + ExecSql + + N + + 1 + + none + + + + + ervu-dashboard + N + N + Y + N + N + DELETE FROM main_dashboard.waiting_registration +WHERE recording_date = current_date + AND schema = 'MD_LVL' + AND recruitment_id = '${MD_ID}' + + + 1504 + 336 + + Get variables 5 GetVariable @@ -243,57 +301,41 @@ N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(waiting_registration) END AS waiting_count, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("waiting_registration_M") END AS male_count, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("waiting_registration_W") END AS female_count, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(mobilization_criterion) END AS mobilization_criterion, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(volunteer_criterion) END AS volunteer_criterion, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(contract_criterion) END AS contract_criterion, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(waiting_registration), 0) waiting_count, + COALESCE(SUM("waiting_registration_M"), 0) male_count, + COALESCE(SUM("waiting_registration_W"), 0) female_count, + COALESCE(SUM(mobilization_criterion), 0) mobilization_criterion, + COALESCE(SUM(volunteer_criterion), 0) volunteer_criterion, + COALESCE(SUM(contract_criterion), 0) contract_criterion, + COALESCE( CASE WHEN SUM(waiting_registration) > 0 THEN ROUND((SUM(mobilization_criterion) / SUM(waiting_registration) * 100), 2) ELSE 0 END, 0 - ) - END AS mobilization_criterion_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) mobilization_criterion_percent, + COALESCE( CASE WHEN SUM(waiting_registration) > 0 THEN ROUND((SUM(volunteer_criterion) / SUM(waiting_registration) * 100), 2) ELSE 0 END, 0 - ) - END AS volunteer_criterion_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) volunteer_criterion_percent, + COALESCE( CASE WHEN SUM(waiting_registration) > 0 THEN ROUND((SUM(contract_criterion) / SUM(waiting_registration) * 100), 2) ELSE 0 END, 0 - ) - END AS contract_criterion_percent, + ) contract_criterion_percent, 0 AS waiting_percent, -- waiting_registration_percent '${MD_ID}' AS recruitment_id, 'Region' AS schema FROM main_dashboard.waiting_registration -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE; Y @@ -303,72 +345,6 @@ AND recording_date = CURRENT_DATE; 336 - - Execute SQL script - ExecSql - - N - - 1 - - none - - - - - ervu-dashboard - - N - - N - - Y - N - N - DELETE FROM main_dashboard.waiting_registration -WHERE recording_date = current_date - AND schema = 'Region' - AND recruitment_id = '${MD_ID}' - - - - 320 - 336 - - - - Execute SQL script 2 - ExecSql - - N - - 1 - - none - - - - - ervu-dashboard - - N - - N - - Y - N - N - DELETE FROM main_dashboard.waiting_registration -WHERE recording_date = current_date - AND schema = 'MD_LVL' - AND recruitment_id = '${MD_ID}' - - - - 1504 - 336 - - diff --git a/v1_apache-hop dash mapping/mil_district/recruitment_campaign.appeals(m_d).hpl b/v1_apache-hop dash mapping/mil_district/recruitment_campaign.appeals(m_d).hpl index 9013d1d..039aa69 100644 --- a/v1_apache-hop dash mapping/mil_district/recruitment_campaign.appeals(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/recruitment_campaign.appeals(m_d).hpl @@ -291,10 +291,10 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(total_appeals) END AS total_appeals, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(average_consideration) END AS average_consideration, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(resolved) END AS resolved, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(not_resolved) END AS not_resolved, + COALESCE(SUM(total_appeals), 0) total_appeals, + COALESCE(SUM(average_consideration), 0) average_consideration, + COALESCE(SUM(resolved), 0) resolved, + COALESCE(SUM(not_resolved), 0) not_resolved, CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 @@ -305,32 +305,23 @@ WHERE recording_date = current_date ELSE 0 END, 0 - ) - END AS not_resolved_percent, + ) not_resolved_percent, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(average_rating) END AS average_rating, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(average_rating), 0) average_rating, + COALESCE( CASE WHEN SUM(total_appeals) > 0 THEN ROUND((SUM(resolved) / SUM(total_appeals) * 100), 2) ELSE 0 END, 0 - ) - END AS resolved_percent, + ) resolved_percent, '${MD_ID}' AS recruitment_id, spring_autumn, 'Region' AS schema FROM recruitment_campaign.appeals -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE GROUP BY spring_autumn; diff --git a/v1_apache-hop dash mapping/mil_district/recruitment_campaign.subpoenas(m_d).hpl b/v1_apache-hop dash mapping/mil_district/recruitment_campaign.subpoenas(m_d).hpl index c5a6ba9..c4548f8 100644 --- a/v1_apache-hop dash mapping/mil_district/recruitment_campaign.subpoenas(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/recruitment_campaign.subpoenas(m_d).hpl @@ -156,19 +156,16 @@ WHERE recording_date = current_date = recruitment_id MD_ID - = schema schema - = spring_autumn spring_autumn - recruitment_campaign subpoenas
@@ -354,133 +351,93 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(subpoena) END AS count_subpoena, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(appeared) END AS count_appeared, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(not_appeared) END AS count_not_appeared, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(not_ap_good_reason) END AS count_not_ap_good_reason, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(introduced_measures) END AS count_introduced_measures, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(ap_not_required) END AS count_ap_not_required, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(restrictions_applied) END AS count_restrictions_applied, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(subpoena), 0) count_subpoena, + COALESCE(SUM(appeared), 0) count_appeared, + COALESCE(SUM(not_appeared), 0) count_not_appeared, + COALESCE(SUM(not_ap_good_reason), 0) count_not_ap_good_reason, + COALESCE(SUM(introduced_measures), 0) count_introduced_measures, + COALESCE(SUM(ap_not_required), 0) count_ap_not_required, + COALESCE(SUM(restrictions_applied), 0) count_restrictions_applied, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(appeared) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS appeared_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) appeared_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(not_appeared) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS not_appeared_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_appeared_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(not_ap_good_reason) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS not_ap_good_reason_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_ap_good_reason_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(ap_not_required) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS ap_not_required_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) ap_not_required_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(restrictions_applied) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS restrictions_applied_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) restrictions_applied_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(introduced_measures) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS introduced_measures_percent, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(rest) END AS rest, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(count_not_delivery) END AS count_not_delivery, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(appear_date_is_good) END AS appear_date_is_good, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) introduced_measures_percent, + COALESCE(SUM(rest), 0) rest, + COALESCE(SUM(count_not_delivery), 0) count_not_delivery, + COALESCE(SUM(appear_date_is_good), 0) appear_date_is_good, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(count_not_delivery) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS not_delivery_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_delivery_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(count_not_delivery) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS not_delivery_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_delivery_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(appear_date_is_good) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS appear_date_is_good_percent, + ) appear_date_is_good_percent, '${MD_ID}' AS recruitment_id, spring_autumn, 'Region' AS schema FROM recruitment_campaign.subpoenas -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE GROUP BY spring_autumn; diff --git a/v1_apache-hop dash mapping/mil_district/rows_id-array_mildis.hpl b/v1_apache-hop dash mapping/mil_district/rows_id-array_mildis.hpl index 7a721df..f893561 100644 --- a/v1_apache-hop dash mapping/mil_district/rows_id-array_mildis.hpl +++ b/v1_apache-hop dash mapping/mil_district/rows_id-array_mildis.hpl @@ -59,7 +59,7 @@ 0 SELECT recruitment_dstr_id AS RECRUITMENT_MD_ID, -reg_array_id AS MD_ARRAY_ID +string_to_array(trim(both '{}' FROM replace(reg_array_id, ' ', '')), ',')::uuid[] AS MD_ARRAY_ID FROM ervu_dashboard.array_mildis N diff --git a/v1_apache-hop dash mapping/mil_district/total_registered.age(m_d).hpl b/v1_apache-hop dash mapping/mil_district/total_registered.age(m_d).hpl index 4465405..d7d6863 100644 --- a/v1_apache-hop dash mapping/mil_district/total_registered.age(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/total_registered.age(m_d).hpl @@ -156,31 +156,26 @@ WHERE recording_date = current_date = recruitment_id MD_ID - = schema schema - = "all_M_W" gender - = registered registered - = convicts convicts - total_registered age
@@ -371,123 +366,87 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(total_count) END AS total_count, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("17_years") END AS "17_year_count", - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("18-26_years") END AS "18-26_year_count", - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("27-30_years") END AS "27-30_year_count", - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("31-35_years") END AS "31-35_year_count", - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("36-40_years") END AS "36-40_year_count", - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("41-45_years") END AS "41-45_year_count", - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("51+_years") END AS "51+_year_count", - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("46-50_years") END AS "46-50_year_count", - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(total_count), 0) total_count, + COALESCE(SUM("17_years"), 0) "17_year_count", + COALESCE(SUM("18-26_years"), 0) "18-26_year_count", + COALESCE(SUM("27-30_years"), 0) "27-30_year_count", + COALESCE(SUM("31-35_years"), 0) "31-35_year_count", + COALESCE(SUM("36-40_years"), 0) "36-40_year_count", + COALESCE(SUM("41-45_years"), 0) "41-45_year_count", + COALESCE(SUM("51+_years"), 0) "51+_year_count", + COALESCE(SUM("46-50_years"), 0) "46-50_year_count", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("17_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "17_year_percent", - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) "17_year_percent", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("18-26_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "18-26_year_percent", - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) "18-26_year_percent", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("27-30_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "27-30_year_percent", - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) "27-30_year_percent", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("31-35_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "31-35_year_percent", - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) "31-35_year_percent", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("36-40_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "36-40_year_percent", - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) "36-40_year_percent", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("41-45_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "41-45_year_percent", - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) "41-45_year_percent", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("46-50_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "46-50_year_percent", - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) "46-50_year_percent", + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("51+_years") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS "51+_year_percent", + ) "51+_year_percent", '${MD_ID}' AS recruitment_id, "all_M_W" AS gender, - convicts, + convicts, registered, 'Region' AS schema FROM total_registered.age -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE GROUP BY "all_M_W", registered, convicts; diff --git a/v1_apache-hop dash mapping/mil_district/total_registered.busyness(m_d).hpl b/v1_apache-hop dash mapping/mil_district/total_registered.busyness(m_d).hpl index cae82e6..5dc5395 100644 --- a/v1_apache-hop dash mapping/mil_district/total_registered.busyness(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/total_registered.busyness(m_d).hpl @@ -320,9 +320,9 @@ WHERE recording_date = current_date WITH a AS ( SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(study) END AS study, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(work) END AS work, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(convicts) END AS convicts, + COALESCE(SUM(study), 0) study, + COALESCE(SUM(work), 0) work, + COALESCE(SUM(convicts), 0) convicts, CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 @@ -333,8 +333,7 @@ a AS ( ELSE 0 END, 0 - ) - END AS study_percent, + ) study_percent, CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 @@ -345,10 +344,9 @@ a AS ( ELSE 0 END, 0 - ) - END AS work_percent, + ) work_percent, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(not_work) END AS not_work, + COALESCE(SUM(not_work), 0) not_work, CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 @@ -359,19 +357,14 @@ a AS ( ELSE 0 END, 0 - ) - END AS not_work_percent, + ) not_work_percent, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(busyness) END AS total_people, + COALESCE(SUM(busyness), 0) total_people, '${MD_ID}' AS recruitment_id, "all_M_W" AS gender, registered FROM total_registered.busyness - WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] - ) + WHERE recruitment_id = ANY ('${MD_ARRAY}') AND "all_M_W" IN ('M', 'W') AND schema = 'Organization' AND recording_date = CURRENT_DATE @@ -380,9 +373,9 @@ a AS ( a2 AS ( SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(study) END AS study, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(work) END AS work, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(convicts) END AS convicts, + COALESCE(SUM(study), 0) study, + COALESCE(SUM(work), 0) work, + COALESCE(SUM(convicts), 0) convicts, CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 @@ -393,8 +386,7 @@ a2 AS ( ELSE 0 END, 0 - ) - END AS study_percent, + ) study_percent, CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 @@ -405,10 +397,9 @@ a2 AS ( ELSE 0 END, 0 - ) - END AS work_percent, + ) work_percent, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(not_work) END AS not_work, + COALESCE(SUM(not_work), 0) not_work, CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 @@ -419,18 +410,13 @@ a2 AS ( ELSE 0 END, 0 - ) - END AS not_work_percent, + ) not_work_percent, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(busyness) END AS total_people, + COALESCE(SUM(busyness), 0) total_people, '${MD_ID}' AS recruitment_id, registered FROM total_registered.busyness - WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] - ) + WHERE recruitment_id = ANY ('${MD_ARRAY}') AND "all_M_W" = 'ALL' AND schema = 'Organization' AND recording_date = CURRENT_DATE diff --git a/v1_apache-hop dash mapping/mil_district/total_registered.child_minor(m_d).hpl b/v1_apache-hop dash mapping/mil_district/total_registered.child_minor(m_d).hpl index 643cbc7..ebb6a49 100644 --- a/v1_apache-hop dash mapping/mil_district/total_registered.child_minor(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/total_registered.child_minor(m_d).hpl @@ -156,25 +156,21 @@ WHERE recording_date = current_date = recruitment_id MD_ID - = schema schema - = "all_M_W" gender - = convicts convicts - total_registered child_minor
@@ -330,82 +326,58 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(total_count) END AS total_count, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(no_child) END AS no_children, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("1_child") END AS one_child, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("2_child") END AS two_children, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("3_child") END AS three_children, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("4_more_child") END AS four_or_more_children, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(total_count), 0) total_count, + COALESCE(SUM(no_child), 0) no_children, + COALESCE(SUM("1_child"), 0) one_child, + COALESCE(SUM("2_child"), 0) two_children, + COALESCE(SUM("3_child"), 0) three_children, + COALESCE(SUM("4_more_child"), 0) four_or_more_children, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM(no_child) / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS no_children_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) no_children_percent, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("1_child") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS one_child_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) one_child_percent, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("2_child") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS two_children_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) two_children_percent, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("3_child") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS three_children_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) three_children_percent, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("4_more_child") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS four_or_more_children_percent, + ) four_or_more_children_percent, '${MD_ID}' AS recruitment_id, "all_M_W" AS gender, - convicts, + convicts, 'Region' AS schema FROM total_registered.child_minor -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE GROUP BY "all_M_W", convicts; diff --git a/v1_apache-hop dash mapping/mil_district/total_registered.driver_license(m_d).hpl b/v1_apache-hop dash mapping/mil_district/total_registered.driver_license(m_d).hpl index 25a8ed4..9e6cbec 100644 --- a/v1_apache-hop dash mapping/mil_district/total_registered.driver_license(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/total_registered.driver_license(m_d).hpl @@ -156,19 +156,16 @@ WHERE recording_date = current_date = recruitment_id MD_ID - = schema schema - = convicts convicts - total_registered driver_license
@@ -329,95 +326,67 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(total_count) END AS total, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("A") END AS a, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("B") END AS b, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("C") END AS c, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("D") END AS d, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM("E") END AS e, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(nope) END AS nope, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(total_count), 0) total, + COALESCE(SUM("A"), 0) a, + COALESCE(SUM("B"), 0) b, + COALESCE(SUM("C"), 0) c, + COALESCE(SUM("D"), 0) d, + COALESCE(SUM("E"), 0) e, + COALESCE(SUM(nope), 0) nope, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("A") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS a_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) a_percent, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("B") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS b_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) b_percent, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("C") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS c_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) c_percent, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("D") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS d_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) d_percent, + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM("E") / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS e_percent, -- нет такой категории - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) e_percent, -- нет такой категории + COALESCE( CASE WHEN SUM(total_count) > 0 THEN ROUND((SUM(nope) / SUM(total_count) * 100), 2) ELSE 0 END, 0 - ) - END AS nope_percent, + ) nope_percent, '${MD_ID}' AS recruitment_id, "all_M_W" AS gender, - convicts, + convicts, 'Region' AS schema FROM total_registered.driver_license -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE GROUP BY "all_M_W", convicts; diff --git a/v1_apache-hop dash mapping/mil_district/total_registered.education_level(m_d).hpl b/v1_apache-hop dash mapping/mil_district/total_registered.education_level(m_d).hpl index a414e06..b696acf 100644 --- a/v1_apache-hop dash mapping/mil_district/total_registered.education_level(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/total_registered.education_level(m_d).hpl @@ -156,19 +156,16 @@ WHERE recording_date = current_date = recruitment_id MD_ID - = schema schema - = "all_M_W" gender - total_registered education_level
@@ -309,69 +306,49 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(higher) END AS higher, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(average) END AS average_prof, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(only_general) END AS only_general, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(no_data) END AS count_nodata, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(higher), 0) higher, + COALESCE(SUM(average), 0) average_prof, + COALESCE(SUM(only_general), 0) only_general, + COALESCE(SUM(no_data), 0) count_nodata, + COALESCE( CASE WHEN SUM(education_level) > 0 THEN ROUND((SUM(higher) / SUM(education_level) * 100), 2) ELSE 0 END, 0 - ) - END AS higher_percentage, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) higher_percentage, + COALESCE( CASE WHEN SUM(education_level) > 0 THEN ROUND((SUM(average) / SUM(education_level) * 100), 2) ELSE 0 END, 0 - ) - END AS average_prof_percentage, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) average_prof_percentage, + COALESCE( CASE WHEN SUM(education_level) > 0 THEN ROUND((SUM(only_general) / SUM(education_level) * 100), 2) ELSE 0 END, 0 - ) - END AS only_general_percentage, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) only_general_percentage, + COALESCE( CASE WHEN SUM(education_level) > 0 THEN ROUND((SUM(no_data) / SUM(education_level) * 100), 2) ELSE 0 END, 0 - ) - END AS count_nodata_percentage, + ) count_nodata_percentage, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(education_level) END AS total, + COALESCE(SUM(education_level), 0) total, '${MD_ID}' AS recruitment_id, "all_M_W" AS gender, 'Region' AS schema FROM total_registered.education_level -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE GROUP BY "all_M_W"; diff --git a/v1_apache-hop dash mapping/mil_district/total_registered.marital_status(m_d).hpl b/v1_apache-hop dash mapping/mil_district/total_registered.marital_status(m_d).hpl index e5ee5c4..d9b0404 100644 --- a/v1_apache-hop dash mapping/mil_district/total_registered.marital_status(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/total_registered.marital_status(m_d).hpl @@ -156,25 +156,21 @@ WHERE recording_date = current_date = recruitment_id MD_ID - = schema schema - = "all_M_W" gender - = convicts convicts - total_registered marital_status
@@ -310,56 +306,40 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(married) END AS married, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(not_married) END AS not_married, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(other) END AS other, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(married), 0) married, + COALESCE(SUM(not_married), 0) not_married, + COALESCE(SUM(other), 0) other, + COALESCE( CASE WHEN SUM(marital_status) > 0 THEN ROUND((SUM(married) / SUM(marital_status) * 100), 2) ELSE 0 END, 0 - ) - END AS married_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) married_percent, + COALESCE( CASE WHEN SUM(marital_status) > 0 THEN ROUND((SUM(not_married) / SUM(marital_status) * 100), 2) ELSE 0 END, 0 - ) - END AS not_married_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_married_percent, + COALESCE( CASE WHEN SUM(marital_status) > 0 THEN ROUND((SUM(other) / SUM(marital_status) * 100), 2) ELSE 0 END, 0 - ) - END AS other_percent, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(marital_status) END AS total, + ) other_percent, + COALESCE(SUM(marital_status), 0) total, '${MD_ID}' AS recruitment_id, "all_M_W" AS gender, convicts, 'Region' AS schema FROM total_registered.marital_status -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE GROUP BY "all_M_W", convicts; diff --git a/v1_apache-hop dash mapping/mil_district/total_registered.reg_mil_cat(m_d).hpl b/v1_apache-hop dash mapping/mil_district/total_registered.reg_mil_cat(m_d).hpl index 045799d..c93c29e 100644 --- a/v1_apache-hop dash mapping/mil_district/total_registered.reg_mil_cat(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/total_registered.reg_mil_cat(m_d).hpl @@ -156,19 +156,16 @@ WHERE recording_date = current_date = recruitment_id MD_ID - = schema schema - = mil_reg mil_reg - total_registered reg_mil_cat
@@ -324,93 +321,65 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE COALESCE(SUM(first_reg_17), 0) END AS first_reg_17, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE COALESCE(SUM(first_reg_18), 0) END AS first_reg_18, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE COALESCE(SUM("mil_spec_W"), 0) END AS mil_spec_w, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE COALESCE(SUM(returned_dep_liberty), 0) END AS returned_dep_liberty, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE COALESCE(SUM(punished), 0) END AS punished, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE COALESCE(SUM(received_citizenship), 0) END AS received_citizenship, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(COALESCE(SUM(first_reg_17), 0), 0) first_reg_17, + COALESCE(COALESCE(SUM(first_reg_18), 0), 0) first_reg_18, + COALESCE(COALESCE(SUM("mil_spec_W"), 0), 0) mil_spec_w, + COALESCE(COALESCE(SUM(returned_dep_liberty), 0), 0) returned_dep_liberty, + COALESCE(COALESCE(SUM(punished), 0), 0) punished, + COALESCE(COALESCE(SUM(received_citizenship), 0), 0) received_citizenship, + COALESCE( CASE WHEN (SUM(first_reg_17) + SUM(first_reg_18)) > 0 THEN ROUND((SUM(first_reg_17) / (SUM(first_reg_17) + SUM(first_reg_18)) * 100), 2) ELSE 0 END, 0 - ) - END AS first_reg_17_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) first_reg_17_percent, + COALESCE( CASE WHEN (SUM(first_reg_17) + SUM(first_reg_18)) > 0 THEN ROUND((SUM(first_reg_18) / (SUM(first_reg_17) + SUM(first_reg_18)) * 100), 2) ELSE 0 END, 0 - ) - END AS first_reg_18_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) first_reg_18_percent, + COALESCE( CASE WHEN (SUM(first_reg_17) + SUM(first_reg_18)) > 0 THEN ROUND((SUM(returned_dep_liberty) / (SUM(first_reg_17) + SUM(first_reg_18)) * 100), 2) ELSE 0 END, 0 - ) - END AS returned_dep_liberty_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) returned_dep_liberty_percent, + COALESCE( CASE WHEN (SUM(first_reg_17) + SUM(first_reg_18)) > 0 THEN ROUND((SUM("mil_spec_W") / (SUM(first_reg_17) + SUM(first_reg_18)) * 100), 2) ELSE 0 END, 0 - ) - END AS mil_spec_w_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) mil_spec_w_percent, + COALESCE( CASE WHEN (SUM(first_reg_17) + SUM(first_reg_18)) > 0 THEN ROUND((SUM(punished) / (SUM(first_reg_17) + SUM(first_reg_18)) * 100), 2) ELSE 0 END, 0 - ) - END AS punished_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) punished_percent, + COALESCE( CASE WHEN (SUM(first_reg_17) + SUM(first_reg_18)) > 0 THEN ROUND((SUM(received_citizenship) / (SUM(first_reg_17) + SUM(first_reg_18)) * 100), 2) ELSE 0 END, 0 - ) - END AS received_citizenship_percent, + ) received_citizenship_percent, '${MD_ID}'::uuid AS recruitment_id, mil_reg, 'Region' AS schema FROM total_registered.reg_mil_cat -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE GROUP BY mil_reg; diff --git a/v1_apache-hop dash mapping/mil_district/total_registered.removed_registry(m_d).hpl b/v1_apache-hop dash mapping/mil_district/total_registered.removed_registry(m_d).hpl index 4e0fd64..d005ac1 100644 --- a/v1_apache-hop dash mapping/mil_district/total_registered.removed_registry(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/total_registered.removed_registry(m_d).hpl @@ -47,6 +47,64 @@ Y + + Execute SQL script + ExecSql + + N + + 1 + + none + + + + + ervu-dashboard + N + N + Y + N + N + DELETE FROM total_registered.removed_registry +WHERE recording_date = current_date + AND schema = 'Region' + AND recruitment_id = '${MD_ID}' + + + 224 + 336 + + + + Execute SQL script 2 + ExecSql + + N + + 1 + + none + + + + + ervu-dashboard + N + N + Y + N + N + DELETE FROM total_registered.removed_registry +WHERE recording_date = current_date + AND schema = 'MD_LVL' + AND recruitment_id = '${MD_ID}' + + + 1392 + 336 + + Get variables 2 2 GetVariable @@ -258,93 +316,65 @@ N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(age_limit) END AS age_limit, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(death) END AS death, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(removed_registry) END AS removed_registry, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(deprivation_citizenship) END AS deprivation_citizenship, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(travel_abroad) END AS travel_abroad, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(living_abroad) END AS living_abroad, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(other) END AS other, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(age_limit), 0) age_limit, + COALESCE(SUM(death), 0) death, + COALESCE(SUM(removed_registry), 0) removed_registry, + COALESCE(SUM(deprivation_citizenship), 0) deprivation_citizenship, + COALESCE(SUM(travel_abroad), 0) travel_abroad, + COALESCE(SUM(living_abroad), 0) living_abroad, + COALESCE(SUM(other), 0) other, + COALESCE( CASE WHEN SUM(removed_registry) > 0 THEN ROUND((SUM(deprivation_citizenship) / SUM(removed_registry) * 100), 2) ELSE 0 END, 0 - ) - END AS deprivation_citizen_percents, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) deprivation_citizen_percents, + COALESCE( CASE WHEN SUM(removed_registry) > 0 THEN ROUND((SUM(age_limit) / SUM(removed_registry) * 100), 2) ELSE 0 END, 0 - ) - END AS age_limit_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) age_limit_percent, + COALESCE( CASE WHEN SUM(removed_registry) > 0 THEN ROUND((SUM(death) / SUM(removed_registry) * 100), 2) ELSE 0 END, 0 - ) - END AS death_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) death_percent, + COALESCE( CASE WHEN SUM(removed_registry) > 0 THEN ROUND((SUM(travel_abroad) / SUM(removed_registry) * 100), 2) ELSE 0 END, 0 - ) - END AS travel_abroad_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) travel_abroad_percent, + COALESCE( CASE WHEN SUM(removed_registry) > 0 THEN ROUND((SUM(living_abroad) / SUM(removed_registry) * 100), 2) ELSE 0 END, 0 - ) - END AS living_abroad_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) living_abroad_percent, + COALESCE( CASE WHEN SUM(removed_registry) > 0 THEN ROUND((SUM(other) / SUM(removed_registry) * 100), 2) ELSE 0 END, 0 - ) - END AS other_percent, + ) other_percent, '${MD_ID}' AS recruitment_id, 'Region' AS schema FROM total_registered.removed_registry -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE; Y @@ -354,72 +384,6 @@ AND recording_date = CURRENT_DATE; 336 - - Execute SQL script - ExecSql - - N - - 1 - - none - - - - - ervu-dashboard - - N - - N - - Y - N - N - DELETE FROM total_registered.removed_registry -WHERE recording_date = current_date - AND schema = 'Region' - AND recruitment_id = '${MD_ID}' - - - - 224 - 336 - - - - Execute SQL script 2 - ExecSql - - N - - 1 - - none - - - - - ervu-dashboard - - N - - N - - Y - N - N - DELETE FROM total_registered.removed_registry -WHERE recording_date = current_date - AND schema = 'MD_LVL' - AND recruitment_id = '${MD_ID}' - - - - 1392 - 336 - - diff --git a/v1_apache-hop dash mapping/mil_district/total_registered.subpoenas(m_d).hpl b/v1_apache-hop dash mapping/mil_district/total_registered.subpoenas(m_d).hpl index 76203ba..0bb2dd4 100644 --- a/v1_apache-hop dash mapping/mil_district/total_registered.subpoenas(m_d).hpl +++ b/v1_apache-hop dash mapping/mil_district/total_registered.subpoenas(m_d).hpl @@ -156,19 +156,16 @@ WHERE recording_date = current_date = recruitment_id MD_ID - = schema schema - = mil_reg mil_reg - total_registered subpoenas
@@ -374,149 +371,105 @@ WHERE recording_date = current_date N 0 SELECT - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(subpoena) END AS count_subpoena, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(appeared) END AS count_appeared, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(average_appeared) END AS average_appeared, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(not_appeared) END AS count_not_appeared, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(not_ap_good_reason) END AS count_not_ap_good_reason, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(introduced_measures) END AS count_introduced_measures, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(ap_not_required) END AS count_ap_not_required, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(electron) END AS count_electron, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(paper) END AS count_paper, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(restrictions_applied) END AS count_restrictions_applied, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE(SUM(subpoena), 0) count_subpoena, + COALESCE(SUM(appeared), 0) count_appeared, + COALESCE(SUM(average_appeared), 0) average_appeared, + COALESCE(SUM(not_appeared), 0) count_not_appeared, + COALESCE(SUM(not_ap_good_reason), 0) count_not_ap_good_reason, + COALESCE(SUM(introduced_measures), 0) count_introduced_measures, + COALESCE(SUM(ap_not_required), 0) count_ap_not_required, + COALESCE(SUM(electron), 0) count_electron, + COALESCE(SUM(paper), 0) count_paper, + COALESCE(SUM(restrictions_applied), 0) count_restrictions_applied, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(appeared) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS appeared_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) appeared_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(not_appeared) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS not_appeared_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_appeared_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(not_ap_good_reason) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS not_ap_good_reason_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_ap_good_reason_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(ap_not_required) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS ap_not_required_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) ap_not_required_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(electron) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS electron_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) electron_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(paper) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS paper_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) paper_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(restrictions_applied) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS restrictions_applied_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) restrictions_applied_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(introduced_measures) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS introduced_measures_percent, + ) introduced_measures_percent, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(count_not_delivery) END AS count_not_delivery, - CASE WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' THEN 0 ELSE SUM(appear_date_is_good) END AS appear_date_is_good, + COALESCE(SUM(count_not_delivery), 0) count_not_delivery, + COALESCE(SUM(appear_date_is_good), 0) appear_date_is_good, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(count_not_delivery) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS not_delivery_percent, - CASE - WHEN '${MD_ARRAY}' IS NULL OR '${MD_ARRAY}' = '' - THEN 0 - ELSE COALESCE( + ) not_delivery_percent, + COALESCE( CASE WHEN SUM(subpoena) > 0 THEN ROUND((SUM(appear_date_is_good) / SUM(subpoena) * 100), 2) ELSE 0 END, 0 - ) - END AS appear_date_is_good_percent, + ) appear_date_is_good_percent, '${MD_ID}' AS recruitment_id, mil_reg, 'Region' AS schema FROM total_registered.subpoenas -WHERE recruitment_id = ANY ( - string_to_array( - trim(both '{}' FROM replace('${MD_ARRAY}', ' ', '')), ',' - )::uuid[] -) +WHERE recruitment_id = ANY ('${MD_ARRAY}') AND schema = 'Organization' AND recording_date = CURRENT_DATE GROUP BY mil_reg;