micord/ervu-dashboard-etl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
Ruslan 2025-03-25 11:01:58 +03:00
parent 40a05b24fc
commit a113e854b4
4 changed files with 10 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
v1_apache-hop dash mapping/country/main_dashboard.waiting_registration.hpl
View file

@ -122,11 +122,13 @@ WHERE recording_date = current_date
<condition>=</condition>
<field>recruitment_id</field>
<name>REG_ID</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>schema</field>
<name>schema</name>
<name2/>
</key>
<schema>main_dashboard</schema>
<table>waiting_registration</table>
@ -175,11 +177,6 @@ WHERE recording_date = current_date
<rename>contract_criterion_percent</rename>
<update>Y</update>
</value>
<value>
<name>waiting_registration_percent</name>
<rename>waiting_percent</rename>
<update>Y</update>
</value>
<value>
<name>recruitment_id</name>
<rename>recruitment_id</rename>
@ -297,7 +294,6 @@ WHERE recording_date = current_date
END,
0
) contract_criterion_percent,
0 AS waiting_percent, -- waiting_registration_percent
'${REG_ID}' AS recruitment_id,
'Ministry' AS schema
FROM main_dashboard.waiting_registration

25
v1_apache-hop dash mapping/mil_com/main_dashboard.waiting_registration(m_c).hpl
View file

@ -93,11 +93,13 @@
<condition>=</condition>
<field>recruitment_id</field>
<name>recruitment_id</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>recording_date</field>
<name>recording_date</name>
<name2/>
</key>
<schema>main_dashboard</schema>
<table>waiting_registration</table>
@ -151,11 +153,6 @@
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>waiting_registration_percent</name>
<rename>waiting_percent</rename>
<update>Y</update>
</value>
</lookup>
<update_bypassed>N</update_bypassed>
<attributes/>
@ -250,18 +247,6 @@ notregistered as (
where rh.status in ('1', '12.7', '8.2', '8.3')
--and rh.source is not null
),
total_recruits AS (
SELECT COUNT(distinct ri.recruit_id) AS total_count
FROM public.recruits AS r
join public.recruits_history rh on rh.recruit_id=r.id
JOIN public.recruits_info AS ri
ON ri.recruit_id = r.id
WHERE
r.id in (SELECT recruit_id FROM notregistered) and
rh.id in (SELECT recruit_history_id FROM notregistered) and
coalesce(r.target_recruitment_id,rh.target_recruitment_id) ::uuid IN (SELECT recruitment_id FROM ids)
AND r.current_recruitment_id is null
),
vse AS (
SELECT
r.id AS r_id,
@ -369,10 +354,8 @@ SELECT
CASE
WHEN rd.waiting_count > 0 THEN ROUND(rd.contract_criterion::NUMERIC / rd.waiting_count * 100, 2)
ELSE 0
END AS contract_criterion_percent,
ROUND(COALESCE((rd.waiting_count::DECIMAL / NULLIF(total_recruits.total_count, 0) * 100), 0), 2) AS waiting_percent
FROM recruit_data AS rd
CROSS JOIN total_recruits</sql>
END AS contract_criterion_percent
FROM recruit_data AS rd</sql>
<variables_active>Y</variables_active>
<attributes/>
<GUI>

8
v1_apache-hop dash mapping/mil_district/main_dashboard.waiting_registration(m_d).hpl
View file

@ -156,11 +156,13 @@ WHERE recording_date = current_date
<condition>=</condition>
<field>recruitment_id</field>
<name>MD_ID</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>schema</field>
<name>schema</name>
<name2/>
</key>
<schema>main_dashboard</schema>
<table>waiting_registration</table>
@ -214,11 +216,6 @@ WHERE recording_date = current_date
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>waiting_registration_percent</name>
<rename>waiting_percent</rename>
<update>Y</update>
</value>
<value>
<name>schema</name>
<rename>schema</rename>
@ -331,7 +328,6 @@ WHERE recording_date = current_date
END,
0
) contract_criterion_percent,
0 AS waiting_percent, -- waiting_registration_percent
'${MD_ID}' AS recruitment_id,
'Region' AS schema
FROM main_dashboard.waiting_registration

8
v1_apache-hop dash mapping/region/main_dashboard.waiting_registration(reg).hpl
View file

@ -88,11 +88,13 @@
<condition>=</condition>
<field>recruitment_id</field>
<name>REG_ID</name>
<name2/>
</key>
<key>
<condition>=</condition>
<field>schema</field>
<name>schema</name>
<name2/>
</key>
<schema>main_dashboard</schema>
<table>waiting_registration</table>
@ -146,11 +148,6 @@
<rename>recruitment_id</rename>
<update>N</update>
</value>
<value>
<name>waiting_registration_percent</name>
<rename>waiting_percent</rename>
<update>Y</update>
</value>
<value>
<name>schema</name>
<rename>schema</rename>
@ -263,7 +260,6 @@
END,
0
) contract_criterion_percent,
0 AS waiting_percent, -- waiting_registration_percent
'${REG_ID}' AS recruitment_id,
'Organization' AS schema
FROM main_dashboard.waiting_registration