diff --git a/mappings/country/total_registered.busyness.ktr b/mappings/country/total_registered.busyness.ktr
index 32abe6a..c0aaeb3 100644
--- a/mappings/country/total_registered.busyness.ktr
+++ b/mappings/country/total_registered.busyness.ktr
@@ -648,6 +648,11 @@
not_work_percent
Y
+
+ busyness
+ total_people
+ Y
+
@@ -743,6 +748,11 @@
not_work_percent
Y
+
+ busyness
+ total_people
+ Y
+
@@ -838,6 +848,11 @@
not_work_percent
Y
+
+ busyness
+ total_people
+ Y
+
diff --git a/mappings/country/total_registered.education_level.ktr b/mappings/country/total_registered.education_level.ktr
index 5c8f904..5890e75 100644
--- a/mappings/country/total_registered.education_level.ktr
+++ b/mappings/country/total_registered.education_level.ktr
@@ -647,6 +647,11 @@
recruitment_id
N
+
+ education_level
+ total
+ Y
+
@@ -741,6 +746,11 @@
recruitment_id
N
+
+ education_level
+ total
+ Y
+
@@ -835,6 +845,11 @@
recruitment_id
N
+
+ education_level
+ total
+ Y
+
@@ -933,6 +948,7 @@ SELECT
average_prof,
only_general,
count_nodata,
+ total_count.total,
ROUND(higher * 100.0 / NULLIF(total_count.total, 0), 2) AS higher_percentage,
ROUND(average_prof * 100.0 / NULLIF(total_count.total, 0), 2) AS average_prof_percentage,
ROUND(only_general * 100.0 / NULLIF(total_count.total, 0), 2) AS only_general_percentage,
@@ -1038,6 +1054,7 @@ SELECT
average_prof,
only_general,
count_nodata,
+ total_count.total,
ROUND(higher * 100.0 / NULLIF(total_count.total, 0), 2) AS higher_percentage,
ROUND(average_prof * 100.0 / NULLIF(total_count.total, 0), 2) AS average_prof_percentage,
ROUND(only_general * 100.0 / NULLIF(total_count.total, 0), 2) AS only_general_percentage,
@@ -1143,6 +1160,7 @@ SELECT
average_prof,
only_general,
count_nodata,
+ total_count.total,
ROUND(higher * 100.0 / NULLIF(total_count.total, 0), 2) AS higher_percentage,
ROUND(average_prof * 100.0 / NULLIF(total_count.total, 0), 2) AS average_prof_percentage,
ROUND(only_general * 100.0 / NULLIF(total_count.total, 0), 2) AS only_general_percentage,
diff --git a/mappings/country/total_registered.marital_status.ktr b/mappings/country/total_registered.marital_status.ktr
index 003117d..4097441 100644
--- a/mappings/country/total_registered.marital_status.ktr
+++ b/mappings/country/total_registered.marital_status.ktr
@@ -501,7 +501,7 @@
- postgres.person_registry
+ ervu_person_registry
person-dbhost
POSTGRESQL
Native
@@ -627,6 +627,11 @@
recruitment_id
N
+
+ marital_status
+ total
+ Y
+
@@ -701,6 +706,11 @@
recruitment_id
N
+
+ marital_status
+ total
+ Y
+
@@ -775,6 +785,11 @@
recruitment_id
N
+
+ marital_status
+ total
+ Y
+
@@ -801,7 +816,7 @@
none
- postgres.person_registry
+ ervu_person_registry
SELECT
COUNT(*) FILTER (
WHERE
@@ -874,7 +889,7 @@ WHERE
none
- postgres.person_registry
+ ervu_person_registry
SELECT
COUNT(*) FILTER (
WHERE
@@ -949,7 +964,7 @@ WHERE
none
- postgres.person_registry
+ ervu_person_registry
SELECT
COUNT(*) FILTER (
WHERE
diff --git a/mappings/info_recruits/info_recruits.ktr b/mappings/info_recruits/info_recruits.ktr
index e6aad41..2bbb458 100644
--- a/mappings/info_recruits/info_recruits.ktr
+++ b/mappings/info_recruits/info_recruits.ktr
@@ -557,7 +557,7 @@
ervu_person_registry
SELECT
-full_name,
+full_name as fio,
last_name,
first_name,
middle_name,
@@ -575,7 +575,7 @@ CASE WHEN (EXISTS (
AND education->>'kodUrObr' IN ('1', '2', '3', '4', '5'))
OR EXISTS (
SELECT 1
- FROM jsonb_array_elements(ri.info->'svedInObr'->'inObr') AS education
+ FROM jsonb_array_elements(ri.info->'svedInObr'->'inObr') AS education
WHERE jsonb_typeof(ri.info->'svedInObr'->'inObr') = 'array'
AND education->>'kodUrObr' IN ('1', '2', '3', '4', '5')
)) THEN 'Высшее'
@@ -621,7 +621,8 @@ ri.info->'svedSemPolozh'->>'semPolozhNaim' marital_status,
ri.info->'pasportRF'->'aktPasportRF'->>'nomDok' passport_number,
ri.info->'pasportRF'->'aktPasportRF'->>'serDok' passport_series,
ri.info->'svedVoin'->'voin'->>'dataReg' issue_date,
-ri.recruit_id as citizen_id
+ri.recruit_id as citizen_id,
+r.target_recruitment_id as recruitment_id
FROM public.recruits_info ri
JOIN public.recruits r ON ri.recruit_id = r.id
0
@@ -655,7 +656,7 @@ JOIN public.recruits r ON ri.recruit_id = r.id
ervu-dashboard
- ervu_dashboard
+ public
1000
N
@@ -682,7 +683,7 @@ JOIN public.recruits r ON ri.recruit_id = r.id
- 480
+ 464
208
Y
diff --git a/mappings/info_recruits/job_info_recruits.kjb b/mappings/info_recruits/job_info_recruits.kjb
index 452dc50..fe73b9d 100644
--- a/mappings/info_recruits/job_info_recruits.kjb
+++ b/mappings/info_recruits/job_info_recruits.kjb
@@ -415,7 +415,7 @@
SQL
- delete from ervu_dashboard.citizen
+ delete from public.citizen
F
F
diff --git a/mappings/pack.pub_recruitment.ktr b/mappings/pack.pub_recruitment.ktr
index 459a8c2..7e78625 100644
--- a/mappings/pack.pub_recruitment.ktr
+++ b/mappings/pack.pub_recruitment.ktr
@@ -561,7 +561,7 @@ rt2.id, rt2.shortname, rt2.parent_id, rt2.idm_id, r.code
from region r
left join recruitment rt on rt.region_id=r.idm_id::text
left join recruitment rt2 on rt2.parent_id=rt.idm_id::text
-where r.code in ('48', '62','65') and rt2.idm_id is not null
+where r.code in ('12', '62','65') and rt2.idm_id is not null
0
diff --git a/mappings/region/job_recruitments_region.kjb b/mappings/region/job_recruitments_region.kjb
index afc9fad..0a94688 100644
--- a/mappings/region/job_recruitments_region.kjb
+++ b/mappings/region/job_recruitments_region.kjb
@@ -893,7 +893,7 @@
SQL
- DELETE FROM main_dashboard.appeals where recruitment_id in ('48', '62', '65') and recording_date = current_date
+ DELETE FROM main_dashboard.appeals where recruitment_id in ('12', '62', '65') and recording_date = current_date
F
F
@@ -911,7 +911,7 @@
SQL
- DELETE FROM main_dashboard.recruitment_campaign where recruitment_id in ('48', '62', '65') and recording_date = current_date
+ DELETE FROM main_dashboard.recruitment_campaign where recruitment_id in ('12', '62', '65') and recording_date = current_date
F
F
@@ -929,7 +929,7 @@
SQL
- DELETE FROM main_dashboard.total_registered where recruitment_id in ('48', '62', '65') and recording_date = current_date
+ DELETE FROM main_dashboard.total_registered where recruitment_id in ('12', '62', '65') and recording_date = current_date
F
F
@@ -947,7 +947,7 @@
SQL
- DELETE FROM main_dashboard.waiting_registration where recruitment_id in ('48', '62', '65') and recording_date = current_date
+ DELETE FROM main_dashboard.waiting_registration where recruitment_id in ('12', '62', '65') and recording_date = current_date
F
F
@@ -965,7 +965,7 @@
SQL
- DELETE FROM recruitment_campaign.subpoenas where recruitment_id in ('48', '62', '65') and recording_date = current_date
+ DELETE FROM recruitment_campaign.subpoenas where recruitment_id in ('12', '62', '65') and recording_date = current_date
F
F
@@ -983,7 +983,7 @@
SQL
- DELETE FROM total_registered.reg_mil_cat where recruitment_id in ('48', '62', '65') and recording_date = current_date
+ DELETE FROM total_registered.reg_mil_cat where recruitment_id in ('12', '62', '65') and recording_date = current_date
F
F
@@ -1001,7 +1001,7 @@
SQL
- DELETE FROM total_registered.removed_registry where recruitment_id in ('48', '62', '65') and recording_date = current_date
+ DELETE FROM total_registered.removed_registry where recruitment_id in ('12', '62', '65') and recording_date = current_date
F
F
@@ -1019,7 +1019,7 @@
SQL
- DELETE FROM total_registered.subpoenas where recruitment_id in ('48', '62', '65') and recording_date = current_date
+ DELETE FROM total_registered.subpoenas where recruitment_id in ('12', '62', '65') and recording_date = current_date
F
F
@@ -1097,7 +1097,7 @@
SQL
- DELETE FROM total_registered.driver_license where recruitment_id in ('48', '62', '65') and recording_date = current_date
+ DELETE FROM total_registered.driver_license where recruitment_id in ('12', '62', '65') and recording_date = current_date
F
F
@@ -1175,7 +1175,7 @@
SQL
- DELETE FROM total_registered.child_minor where recruitment_id in ('48', '62', '65') and recording_date = current_date
+ DELETE FROM total_registered.child_minor where recruitment_id in ('12', '62', '65') and recording_date = current_date
F
F
@@ -1253,7 +1253,7 @@
SQL
- DELETE FROM total_registered.age where recruitment_id in ('48', '62', '65') and recording_date = current_date
+ DELETE FROM total_registered.age where recruitment_id in ('12', '62', '65') and recording_date = current_date
F
F
@@ -1331,7 +1331,7 @@
SQL
- DELETE FROM total_registered.marital_status where recruitment_id in ('48', '62', '65') and recording_date = current_date
+ DELETE FROM total_registered.marital_status where recruitment_id in ('12', '62', '65') and recording_date = current_date
F
F
@@ -1409,7 +1409,7 @@
SQL
- DELETE FROM total_registered.education_level where recruitment_id in ('48', '62', '65') and recording_date = current_date
+ DELETE FROM total_registered.education_level where recruitment_id in ('12', '62', '65') and recording_date = current_date
F
F
@@ -1487,7 +1487,7 @@
SQL
- DELETE FROM total_registered.busyness where recruitment_id in ('48', '62', '65') and recording_date = current_date
+ DELETE FROM total_registered.busyness where recruitment_id in ('12', '62', '65') and recording_date = current_date
F
F
diff --git a/mappings/region/select_recruitments_region(reg).ktr b/mappings/region/select_recruitments_region(reg).ktr
index 3f8c4f6..c995b07 100644
--- a/mappings/region/select_recruitments_region(reg).ktr
+++ b/mappings/region/select_recruitments_region(reg).ktr
@@ -531,15 +531,24 @@
ervu-dashboard
- with
-t1 as (SELECT ARRAY_AGG(t.idm_id) as RECRUITMENT48_ID FROM space.testrecruitment AS t where t.code = '48'),
-t2 as (SELECT ARRAY_AGG(t.idm_id) as RECRUITMENT62_ID FROM space.testrecruitment AS t where t.code = '62'),
-t3 as (SELECT ARRAY_AGG(t.idm_id) as RECRUITMENT65_ID FROM space.testrecruitment AS t where t.code = '65')
-SELECT t1.RECRUITMENT48_ID AS VK_ARRAY_ID, '48' as RECRUITMENT_REG_ID FROM t1
+ WITH
+t1 AS (SELECT ARRAY_AGG(t.idm_id) AS RECRUITMENT48_ID FROM space.testrecruitment AS t WHERE t.code = '12'),
+t2 AS (SELECT ARRAY_AGG(t.idm_id) AS RECRUITMENT62_ID FROM space.testrecruitment AS t WHERE t.code = '62'),
+t3 AS (SELECT ARRAY_AGG(t.idm_id) AS RECRUITMENT65_ID FROM space.testrecruitment AS t WHERE t.code = '65')
+SELECT
+ COALESCE(t1.RECRUITMENT48_ID, ARRAY['00']) AS VK_ARRAY_ID,
+ '12' AS RECRUITMENT_REG_ID
+FROM t1
UNION ALL
-SELECT t2.RECRUITMENT62_ID, '62' FROM t2
+SELECT
+ COALESCE(t2.RECRUITMENT62_ID, ARRAY['00']),
+ '62'
+FROM t2
UNION ALL
-SELECT t3.RECRUITMENT65_ID, '65' FROM t3
+SELECT
+ COALESCE(t3.RECRUITMENT65_ID, ARRAY['00']),
+ '65'
+FROM t3;
10
N
diff --git a/mappings/region/total_registered.busyness(reg).ktr b/mappings/region/total_registered.busyness(reg).ktr
index 9622012..abac27c 100644
--- a/mappings/region/total_registered.busyness(reg).ktr
+++ b/mappings/region/total_registered.busyness(reg).ktr
@@ -819,6 +819,11 @@
not_work_percent
Y
+
+ busyness
+ total_people
+ Y
+
@@ -902,6 +907,11 @@
not_work_percent
Y
+
+ busyness
+ total_people
+ Y
+
@@ -985,6 +995,11 @@
not_work_percent
Y
+
+ busyness
+ total_people
+ Y
+
diff --git a/mappings/region/total_registered.education_level(reg).ktr b/mappings/region/total_registered.education_level(reg).ktr
index 292158b..3d81bc9 100644
--- a/mappings/region/total_registered.education_level(reg).ktr
+++ b/mappings/region/total_registered.education_level(reg).ktr
@@ -824,6 +824,11 @@
recruitment_id
N
+
+ education_level
+ total
+ Y
+
@@ -912,6 +917,11 @@
recruitment_id
N
+
+ education_level
+ total
+ Y
+
@@ -1000,6 +1010,11 @@
recruitment_id
N
+
+ education_level
+ total
+ Y
+
@@ -1284,6 +1299,7 @@ SELECT
average_prof,
only_general,
count_nodata,
+ total_count.total,
ROUND(higher * 100.0 / NULLIF(total_count.total, 0), 2) AS higher_percentage,
ROUND(average_prof * 100.0 / NULLIF(total_count.total, 0), 2) AS average_prof_percentage,
ROUND(only_general * 100.0 / NULLIF(total_count.total, 0), 2) AS only_general_percentage,
@@ -1389,6 +1405,7 @@ SELECT
average_prof,
only_general,
count_nodata,
+ total_count.total,
ROUND(higher * 100.0 / NULLIF(total_count.total, 0), 2) AS higher_percentage,
ROUND(average_prof * 100.0 / NULLIF(total_count.total, 0), 2) AS average_prof_percentage,
ROUND(only_general * 100.0 / NULLIF(total_count.total, 0), 2) AS only_general_percentage,
@@ -1494,6 +1511,7 @@ SELECT
average_prof,
only_general,
count_nodata,
+ total_count.total,
ROUND(higher * 100.0 / NULLIF(total_count.total, 0), 2) AS higher_percentage,
ROUND(average_prof * 100.0 / NULLIF(total_count.total, 0), 2) AS average_prof_percentage,
ROUND(only_general * 100.0 / NULLIF(total_count.total, 0), 2) AS only_general_percentage,
diff --git a/mappings/region/total_registered.marital_status(reg).ktr b/mappings/region/total_registered.marital_status(reg).ktr
index ff12801..5fb70db 100644
--- a/mappings/region/total_registered.marital_status(reg).ktr
+++ b/mappings/region/total_registered.marital_status(reg).ktr
@@ -804,6 +804,11 @@
recruitment_id
N
+
+ marital_status
+ total
+ Y
+
@@ -872,6 +877,11 @@
recruitment_id
N
+
+ marital_status
+ total
+ Y
+
@@ -940,6 +950,11 @@
recruitment_id
N
+
+ marital_status
+ total
+ Y
+