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 5e8e3a6..33925a8 100644
--- a/v1_apache-hop dash mapping/country/recruitment_campaign.appeals.hpl
+++ b/v1_apache-hop dash mapping/country/recruitment_campaign.appeals.hpl
@@ -262,10 +262,10 @@ WHERE recording_date = current_date
N
0
SELECT
- SUM(total_appeals), 0) total_appeals,
- SUM(average_consideration), 0) average_consideration,
- SUM(resolved), 0) resolved,
- SUM(not_resolved), 0) 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,
COALESCE(
CASE
WHEN SUM(total_appeals) > 0
@@ -275,7 +275,7 @@ WHERE recording_date = current_date
0
) not_resolved_percent,
- SUM(average_rating) END AS average_rating,
+ COALESCE(SUM(average_rating), 0) average_rating,
COALESCE(
CASE
WHEN SUM(total_appeals) > 0
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 add871f..9bd5d4e 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
@@ -309,10 +309,7 @@ WHERE recording_date = current_date
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
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_count) > 0
THEN ROUND((SUM("A") / SUM(total_count) * 100), 2)
@@ -320,10 +317,7 @@ WHERE recording_date = current_date
END,
0
) a_percent,
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_count) > 0
THEN ROUND((SUM("B") / SUM(total_count) * 100), 2)
@@ -331,10 +325,7 @@ WHERE recording_date = current_date
END,
0
) b_percent,
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_count) > 0
THEN ROUND((SUM("C") / SUM(total_count) * 100), 2)
@@ -342,10 +333,7 @@ WHERE recording_date = current_date
END,
0
) c_percent,
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_count) > 0
THEN ROUND((SUM("D") / SUM(total_count) * 100), 2)
@@ -353,10 +341,7 @@ WHERE recording_date = current_date
END,
0
) d_percent,
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_count) > 0
THEN ROUND((SUM("E") / SUM(total_count) * 100), 2)
@@ -364,10 +349,7 @@ WHERE recording_date = current_date
END,
0
) e_percent, -- нет такой категории
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_count) > 0
THEN ROUND((SUM(nope) / SUM(total_count) * 100), 2)
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 cb72c0c..1b075c5 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
@@ -286,10 +286,7 @@ WHERE recording_date = current_date
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
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(education_level) > 0
THEN ROUND((SUM(higher) / SUM(education_level) * 100), 2)
@@ -297,10 +294,7 @@ WHERE recording_date = current_date
END,
0
) higher_percentage,
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(education_level) > 0
THEN ROUND((SUM(average) / SUM(education_level) * 100), 2)
@@ -308,10 +302,7 @@ WHERE recording_date = current_date
END,
0
) average_prof_percentage,
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(education_level) > 0
THEN ROUND((SUM(only_general) / SUM(education_level) * 100), 2)
@@ -319,10 +310,7 @@ WHERE recording_date = current_date
END,
0
) only_general_percentage,
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(education_level) > 0
THEN ROUND((SUM(no_data) / SUM(education_level) * 100), 2)
@@ -331,7 +319,7 @@ WHERE recording_date = current_date
0
) count_nodata_percentage,
- COALESCE(SUM(education_level)) total,
+ COALESCE(SUM(education_level), 0) total,
'${REG_ID}' AS recruitment_id,
"all_M_W" AS gender,
convicts,
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 b549f68..23e99f5 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
@@ -275,10 +275,7 @@ WHERE recording_date = current_date
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
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(marital_status) > 0
THEN ROUND((SUM(married) / SUM(marital_status) * 100), 2)
@@ -286,10 +283,7 @@ WHERE recording_date = current_date
END,
0
) married_percent,
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(marital_status) > 0
THEN ROUND((SUM(not_married) / SUM(marital_status) * 100), 2)
@@ -297,10 +291,7 @@ WHERE recording_date = current_date
END,
0
) not_married_percent,
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(marital_status) > 0
THEN ROUND((SUM(other) / SUM(marital_status) * 100), 2)
@@ -308,7 +299,7 @@ WHERE recording_date = current_date
END,
0
) other_percent,
- COALESCE(SUM(marital_status) END AS total,
+ COALESCE(SUM(marital_status), 0) total,
'${REG_ID}' AS recruitment_id,
"all_M_W" AS gender,
convicts,
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 b7f0711..18c9336 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
@@ -282,13 +282,13 @@ WHERE recording_date = current_date
N
0
SELECT
- 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(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
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 30bcf9d..74c2520 100644
--- a/v1_apache-hop dash mapping/country/total_registered.subpoenas.hpl
+++ b/v1_apache-hop dash mapping/country/total_registered.subpoenas.hpl
@@ -412,8 +412,8 @@ WHERE recording_date = current_date
0
) introduced_measures_percent,
- COALESCE(SUM(count_not_delivery) END AS count_not_delivery,
- COALESCE(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,
COALESCE(
CASE
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 c6a602a..83b7396 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
@@ -317,10 +317,7 @@ WHERE recording_date = current_date
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
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(subpoenas_sent) > 0
THEN ROUND((SUM(appeared_on_subpoenas) / SUM(subpoenas_sent) * 100), 2)
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 039aa69..923f697 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
@@ -295,10 +295,7 @@ WHERE recording_date = current_date
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
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_appeals) > 0
THEN ROUND((SUM(not_resolved) / SUM(total_appeals) * 100), 2)
diff --git a/v1_apache-hop dash mapping/region/total_registered.age(reg).hpl b/v1_apache-hop dash mapping/region/total_registered.age(reg).hpl
index cb141ab..3a74385 100644
--- a/v1_apache-hop dash mapping/region/total_registered.age(reg).hpl
+++ b/v1_apache-hop dash mapping/region/total_registered.age(reg).hpl
@@ -307,10 +307,7 @@
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",
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_count) > 0
THEN ROUND((SUM("17_years") / SUM(total_count) * 100), 2)
@@ -318,10 +315,7 @@
END,
0
) "17_year_percent",
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_count) > 0
THEN ROUND((SUM("18-26_years") / SUM(total_count) * 100), 2)
@@ -329,10 +323,7 @@
END,
0
) "18-26_year_percent",
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_count) > 0
THEN ROUND((SUM("27-30_years") / SUM(total_count) * 100), 2)
@@ -340,10 +331,7 @@
END,
0
) "27-30_year_percent",
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_count) > 0
THEN ROUND((SUM("31-35_years") / SUM(total_count) * 100), 2)
@@ -351,10 +339,7 @@
END,
0
) "31-35_year_percent",
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_count) > 0
THEN ROUND((SUM("36-40_years") / SUM(total_count) * 100), 2)
@@ -362,10 +347,7 @@
END,
0
) "36-40_year_percent",
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_count) > 0
THEN ROUND((SUM("41-45_years") / SUM(total_count) * 100), 2)
@@ -373,10 +355,7 @@
END,
0
) "41-45_year_percent",
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_count) > 0
THEN ROUND((SUM("46-50_years") / SUM(total_count) * 100), 2)
@@ -384,10 +363,7 @@
END,
0
) "46-50_year_percent",
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(total_count) > 0
THEN ROUND((SUM("51+_years") / SUM(total_count) * 100), 2)
diff --git a/v1_apache-hop dash mapping/region/total_registered.busyness(reg).hpl b/v1_apache-hop dash mapping/region/total_registered.busyness(reg).hpl
index 6d4e7e5..a7f97c9 100644
--- a/v1_apache-hop dash mapping/region/total_registered.busyness(reg).hpl
+++ b/v1_apache-hop dash mapping/region/total_registered.busyness(reg).hpl
@@ -270,8 +270,7 @@
ELSE 0
END,
0
- )
- END AS no_info_percent,
+ ) no_info_percent,
COALESCE(SUM(busyness), 0) total_people,
'${REG_ID}' AS recruitment_id,
diff --git a/v1_apache-hop dash mapping/region/total_registered.education_level(reg).hpl b/v1_apache-hop dash mapping/region/total_registered.education_level(reg).hpl
index a30850d..5c923c8 100644
--- a/v1_apache-hop dash mapping/region/total_registered.education_level(reg).hpl
+++ b/v1_apache-hop dash mapping/region/total_registered.education_level(reg).hpl
@@ -88,25 +88,21 @@
=
recruitment_id
REG_ID
-
=
schema
schema
-
=
"all_M_W"
gender
-
=
convicts
convicts
-
total_registered
@@ -256,10 +252,7 @@
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
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(education_level) > 0
THEN ROUND((SUM(higher) / SUM(education_level) * 100), 2)
@@ -267,10 +260,7 @@
END,
0
) higher_percentage,
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(education_level) > 0
THEN ROUND((SUM(average) / SUM(education_level) * 100), 2)
@@ -278,10 +268,7 @@
END,
0
) average_prof_percentage,
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(education_level) > 0
THEN ROUND((SUM(only_general) / SUM(education_level) * 100), 2)
@@ -289,10 +276,7 @@
END,
0
) only_general_percentage,
- CASE
- WHEN '${VK_ARRAY}' IS NULL OR '${VK_ARRAY}' = ''
- THEN 0
- ELSE COALESCE(
+ COALESCE(
CASE
WHEN SUM(education_level) > 0
THEN ROUND((SUM(no_data) / SUM(education_level) * 100), 2)
@@ -301,7 +285,7 @@
0
) count_nodata_percentage,
- COALESCE(SUM(education_level) END AS total,
+ COALESCE(SUM(education_level), 0) total,
'${REG_ID}' AS recruitment_id,
"all_M_W" AS gender,
convicts,
diff --git a/v1_apache-hop dash mapping/region/total_registered.marital_status(reg).hpl b/v1_apache-hop dash mapping/region/total_registered.marital_status(reg).hpl
index 8a6b896..10fd7a7 100644
--- a/v1_apache-hop dash mapping/region/total_registered.marital_status(reg).hpl
+++ b/v1_apache-hop dash mapping/region/total_registered.marital_status(reg).hpl
@@ -256,8 +256,7 @@
ELSE 0
END,
0
- )
- END AS not_married_percent,
+ ) not_married_percent,
COALESCE(
CASE
WHEN SUM(marital_status) > 0