diff --git a/v1_apache-hop dash mapping/info_recruits/child.hpl b/v1_apache-hop dash mapping/info_recruits/child.hpl
index 568f869..e568e23 100644
--- a/v1_apache-hop dash mapping/info_recruits/child.hpl
+++ b/v1_apache-hop dash mapping/info_recruits/child.hpl
@@ -49,13 +49,11 @@
=
recruit_id
recruit_id
-
=
full_name
full_name
-
ervu_dashboard
diff --git a/v1_apache-hop dash mapping/info_recruits/prosecution.hpl b/v1_apache-hop dash mapping/info_recruits/prosecution.hpl
index 271ff0c..1f8acb4 100644
--- a/v1_apache-hop dash mapping/info_recruits/prosecution.hpl
+++ b/v1_apache-hop dash mapping/info_recruits/prosecution.hpl
@@ -49,13 +49,11 @@
=
recruit_id
recruit_id
-
=
create_date
create_date
-
ervu_dashboard
diff --git a/v1_apache-hop dash mapping/info_recruits/punishment.hpl b/v1_apache-hop dash mapping/info_recruits/punishment.hpl
index 01d94fb..cd5eab1 100644
--- a/v1_apache-hop dash mapping/info_recruits/punishment.hpl
+++ b/v1_apache-hop dash mapping/info_recruits/punishment.hpl
@@ -49,7 +49,6 @@
=
recruit_id
recruit_id
-
ervu_dashboard
diff --git a/v1_apache-hop dash mapping/info_recruits/spouse.hpl b/v1_apache-hop dash mapping/info_recruits/spouse.hpl
index b0ca55b..8c14d39 100644
--- a/v1_apache-hop dash mapping/info_recruits/spouse.hpl
+++ b/v1_apache-hop dash mapping/info_recruits/spouse.hpl
@@ -54,13 +54,11 @@
=
recruit_id
recruit_id
-
=
full_name
full_name
-
ervu_dashboard
diff --git a/v1_apache-hop dash mapping/job_general.hwf b/v1_apache-hop dash mapping/job_general.hwf
index 1bb3041..713062f 100644
--- a/v1_apache-hop dash mapping/job_general.hwf
+++ b/v1_apache-hop dash mapping/job_general.hwf
@@ -1,230 +1,230 @@
-
- job_general
- Y
-
-
-
- 0
- -
- 2024/08/21 17:23:33.592
- -
- 2024/08/21 17:23:33.592
-
-
-
-
- Start
-
- SPECIAL
-
- 1
- 12
- 60
- 0
- 0
- N
- 0
- 1
- N
- 288
- 240
-
-
-
- Success
-
- SUCCESS
-
- N
- 1296
- 240
-
-
-
- job_pack.pub_recruitment
-
- WORKFLOW
-
- N
- N
- N
- N
- ${Internal.Entry.Current.Folder}/job_pack.pub_recruitment.hwf
-
-
- Nothing
-
- Y
-
- N
- local
- N
- N
- Y
- N
- 512
- 240
-
-
-
- job_recruitments_all
-
- WORKFLOW
-
- N
- N
- N
- N
- ${Internal.Entry.Current.Folder}/job_recruitments_all.hwf
- txt
- ${PROJECT_HOME}/log_jobs/log_job_recruitments_all
- Minimal
-
- Y
-
- N
- local
- N
- N
- Y
- N
- 720
- 240
-
-
-
- job_last_recording_date
-
- WORKFLOW
-
- N
- N
- N
- N
- ${Internal.Entry.Current.Folder}/\recording_date\job_last_recording_date.hwf
- Nothing
-
- Y
-
- N
- local
- N
- N
- Y
- N
- 1120
- 240
-
-
-
- job_info_recruits.hwf
-
- WORKFLOW
-
- N
- N
- N
- N
- ${PROJECT_HOME}/info_recruits/job_info_recruits.hwf
- Nothing
-
- Y
-
- N
- local
- N
- N
- Y
- N
- 928
- 128
-
-
-
-
-
- job_pack.pub_recruitment
- job_recruitments_all
- Y
- N
- Y
-
-
- Start
- job_pack.pub_recruitment
- Y
- Y
- Y
-
-
- job_last_recording_date
- Success
- Y
- N
- Y
-
-
- job_info_recruits.hwf
- job_last_recording_date
- N
- N
- Y
-
-
- job_recruitments_all
- job_info_recruits.hwf
- N
- N
- Y
-
-
- job_recruitments_all
- job_last_recording_date
- Y
- N
- Y
-
-
-
-
-
-
- METASTORE.pentaho
-
- Default Run Configuration
- {"namespace":"pentaho","id":"Default Run Configuration","name":"Default Run Configuration","description":"Defines a default run configuration","metaStoreName":null}
-
-
-
- debug_plugin
-
- Write to log : action_log_result
- N
-
-
- Write to log : action_log_result_files
- N
-
-
- Write to log : action_log_result_rows
- Y
-
-
- Write to log : action_log_level
- Basic
-
-
- Write to log : action_log_variables
- N
-
-
-
- {"_":"Embedded MetaStore Elements","namespace":"pentaho","type":"Default Run Configuration"}
-
- Pentaho local
- {"children":[{"children":[],"id":"server","value":null},{"children":[],"id":"clustered","value":"N"},{"children":[],"id":"name","value":"Pentaho local"},{"children":[],"id":"description","value":null},{"children":[],"id":"pentaho","value":"N"},{"children":[],"id":"readOnly","value":"Y"},{"children":[],"id":"sendResources","value":"N"},{"children":[],"id":"logRemoteExecutionLocally","value":"N"},{"children":[],"id":"remote","value":"N"},{"children":[],"id":"local","value":"Y"},{"children":[],"id":"showTransformations","value":"N"}],"id":"Pentaho local","value":null,"name":"Pentaho local","owner":null,"ownerPermissionsList":[]}
-
-
-
-
+
+ job_general
+ Y
+
+
+
+ 0
+ -
+ 2024/08/21 17:23:33.592
+ -
+ 2024/08/21 17:23:33.592
+
+
+
+
+ Start
+
+ SPECIAL
+
+ 1
+ 12
+ 60
+ 0
+ 0
+ N
+ 0
+ 1
+ N
+ 288
+ 240
+
+
+
+ Success
+
+ SUCCESS
+
+ N
+ 1296
+ 240
+
+
+
+ job_pack.pub_recruitment
+
+ WORKFLOW
+
+ N
+ N
+ N
+ N
+ ${Internal.Entry.Current.Folder}/job_pack.pub_recruitment.hwf
+
+
+ Nothing
+
+ Y
+
+ N
+ local
+ N
+ N
+ Y
+ N
+ 512
+ 240
+
+
+
+ job_recruitments_all
+
+ WORKFLOW
+
+ N
+ N
+ N
+ N
+ ${Internal.Entry.Current.Folder}/job_recruitments_all.hwf
+ txt
+ ${PROJECT_HOME}/log_jobs/log_job_recruitments_all
+ Minimal
+
+ Y
+
+ N
+ local
+ N
+ N
+ Y
+ N
+ 720
+ 240
+
+
+
+ job_last_recording_date
+
+ WORKFLOW
+
+ N
+ N
+ N
+ N
+ ${Internal.Entry.Current.Folder}/\recording_date\job_last_recording_date.hwf
+ Nothing
+
+ Y
+
+ N
+ local
+ N
+ N
+ Y
+ N
+ 1120
+ 240
+
+
+
+ job_info_recruits.hwf
+
+ WORKFLOW
+
+ N
+ N
+ N
+ N
+ ${PROJECT_HOME}/info_recruits/job_info_recruits.hwf
+ Nothing
+
+ Y
+
+ N
+ local
+ N
+ N
+ Y
+ N
+ 928
+ 128
+
+
+
+
+
+ job_pack.pub_recruitment
+ job_recruitments_all
+ Y
+ N
+ Y
+
+
+ Start
+ job_pack.pub_recruitment
+ Y
+ Y
+ Y
+
+
+ job_last_recording_date
+ Success
+ Y
+ N
+ Y
+
+
+ job_info_recruits.hwf
+ job_last_recording_date
+ N
+ N
+ Y
+
+
+ job_recruitments_all
+ job_info_recruits.hwf
+ N
+ N
+ Y
+
+
+ job_recruitments_all
+ job_last_recording_date
+ Y
+ N
+ Y
+
+
+
+
+
+
+ METASTORE.pentaho
+
+ Default Run Configuration
+ {"namespace":"pentaho","id":"Default Run Configuration","name":"Default Run Configuration","description":"Defines a default run configuration","metaStoreName":null}
+
+
+
+ debug_plugin
+
+ Write to log : action_log_result
+ N
+
+
+ Write to log : action_log_result_files
+ N
+
+
+ Write to log : action_log_result_rows
+ Y
+
+
+ Write to log : action_log_level
+ Basic
+
+
+ Write to log : action_log_variables
+ N
+
+
+
+ {"_":"Embedded MetaStore Elements","namespace":"pentaho","type":"Default Run Configuration"}
+
+ Pentaho local
+ {"children":[{"children":[],"id":"server","value":null},{"children":[],"id":"clustered","value":"N"},{"children":[],"id":"name","value":"Pentaho local"},{"children":[],"id":"description","value":null},{"children":[],"id":"pentaho","value":"N"},{"children":[],"id":"readOnly","value":"Y"},{"children":[],"id":"sendResources","value":"N"},{"children":[],"id":"logRemoteExecutionLocally","value":"N"},{"children":[],"id":"remote","value":"N"},{"children":[],"id":"local","value":"Y"},{"children":[],"id":"showTransformations","value":"N"}],"id":"Pentaho local","value":null,"name":"Pentaho local","owner":null,"ownerPermissionsList":[]}
+
+
+
+
diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/citizen_diploma_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/citizen_diploma_once.hpl
new file mode 100644
index 0000000..1b5f94d
--- /dev/null
+++ b/v1_apache-hop dash mapping/jobs_once_a_day/citizen_diploma_once.hpl
@@ -0,0 +1,187 @@
+
+
+
+ citizen_diploma_once
+ Y
+
+
+
+ Normal
+
+
+ N
+ 1000
+ 100
+ -
+ 2025/04/29 15:56:35.792
+ -
+ 2025/04/29 15:56:35.792
+
+
+
+
+
+ Table input
+ Table output
+ Y
+
+
+ Table output
+ Dummy (do nothing)
+ Y
+
+
+
+ Dummy (do nothing)
+ Dummy
+
+ Y
+
+ 1
+
+ none
+
+
+
+
+ 608
+ 352
+
+
+
+ Table input
+ TableInput
+
+ Y
+
+ 1
+
+ none
+
+
+ ervu_person_registry
+ N
+ 0
+ select ri.recruit_id,
+ to_date(diploma_item->>'dataVyd', 'YYYY-MM-DD') as issue_date,
+ diploma_item->>'naimOrg' as education_institution_name,
+ diploma_item->>'kodUrObr' as education_level_code,
+ diploma_item->>'regNomer' as reg_number,
+ diploma_item->>'prVUSpecz' = '1' as vus_spec,
+ diploma_item->>'nomerBlank' as blank_number,
+ diploma_item->>'seriyaBlank' as blank_series,
+ diploma_item->'vidDokMinobr'->>'kodVidDok' as doc_type_code_minobr,
+ diploma_item->'vidDokMinprosv'->>'kodVidDok' as doc_type_code_minprosv,
+ diploma_item->'svedSpeczMinobr'->>'kodSpecz' as education_speciality_minpobr_code,
+ diploma_item->'svedSpeczMinprosv'->>'kodSpecz' as education_speciality_minprosv_code
+from recruits_info ri
+ join recruits r
+ ON ri.recruit_id = r.id
+ and '${RCRT_C}' IN (r.target_recruitment_id, r.current_recruitment_id),
+ jsonb_array_elements(info->'svedFL'->'svedRObr'->'robr') as diploma_item
+where info->'svedFL'->'svedRObr'->'robr' != 'null';
+ Y
+
+
+ 336
+ 208
+
+
+
+ Table output
+ TableOutput
+
+ Y
+
+ 1
+
+ none
+
+
+ 20000
+ ervu-dashboard
+
+
+ recruit_id
+ recruit_id
+
+
+ issue_date
+ issue_date
+
+
+ education_institution_name
+ education_institution_name
+
+
+ education_level_code
+ education_level_code
+
+
+ reg_number
+ reg_number
+
+
+ vus_spec
+ vus_spec
+
+
+ blank_number
+ blank_number
+
+
+ blank_series
+ blank_series
+
+
+ doc_type_code_minobr
+ doc_type_code_minobr
+
+
+ doc_type_code_minprosv
+ doc_type_code_minprosv
+
+
+ education_speciality_minpobr_code
+ education_speciality_minpobr_code
+
+
+ education_speciality_minprosv_code
+ education_speciality_minprosv_code
+
+
+ N
+ N
+ N
+ N
+ Y
+ N
+ ervu_dashboard
+ Y
+ citizen_education_diploma
+ N
+ Y
+ N
+ Y
+
+
+ 496
+ 208
+
+
+
+
+ Table output
+ Dummy (do nothing)
+ Y
+
+
+
+
+
+
+
+
+
+
+
diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/citizen_foreign_diploma_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/citizen_foreign_diploma_once.hpl
new file mode 100644
index 0000000..c192220
--- /dev/null
+++ b/v1_apache-hop dash mapping/jobs_once_a_day/citizen_foreign_diploma_once.hpl
@@ -0,0 +1,200 @@
+
+
+
+ citizen_foreign_diploma_once
+ Y
+
+
+
+ Normal
+
+
+ N
+ 1000
+ 100
+ -
+ 2025/04/29 16:01:18.326
+ -
+ 2025/04/29 16:01:18.326
+
+
+
+
+
+ Table input
+ Table output
+ Y
+
+
+ Table output
+ Dummy (do nothing)
+ Y
+
+
+
+ Dummy (do nothing)
+ Dummy
+
+ Y
+
+ 1
+
+ none
+
+
+
+
+ 928
+ 352
+
+
+
+ Table input
+ TableInput
+
+ Y
+
+ 1
+
+ none
+
+
+ ervu_person_registry
+ N
+ 0
+ select ri.recruit_id,
+ diploma_item->>'kvalif' as qualification,
+ diploma_item->>'kodOKSM' as oksm_code,
+ diploma_item->>'naprPod' as study_field,
+ diploma_item->>'nomSved' as education_certificate_number,
+ diploma_item->>'kodUrObr' as education_level_code,
+ to_date(diploma_item->>'dataPriz', 'YYYY-MM-DD') as recognition_date,
+ diploma_item->>'prVUSpecz' = '1' as vus_spec,
+ diploma_item->>'regNomDok' as doc_reg_num,
+ diploma_item->>'serNomDok' as doc_reg_series,
+ diploma_item->>'naimInoDok' as foreign_doc_name,
+ diploma_item->>'naimUchZaved' as education_institution_name,
+ diploma_item->'svedSpeczMinobr'->>'kodSpecz' as education_speciality_minpobr_code,
+ diploma_item->'svedSpeczMinprosv'->>'kodSpecz' as education_speciality_minprosv_code
+from recruits_info ri
+ join recruits r
+ ON ri.recruit_id = r.id
+ and '${RCRT_C}' IN (r.target_recruitment_id, r.current_recruitment_id),
+ jsonb_array_elements(info->'svedFL'->'svedInObr'->'inObr') as diploma_item
+where info->'svedFL'->'svedInObr'->'inObr' != 'null';
+ Y
+
+
+ 656
+ 208
+
+
+
+ Table output
+ TableOutput
+
+ Y
+
+ 1
+
+ none
+
+
+ 20000
+ ervu-dashboard
+
+
+ recruit_id
+ recruit_id
+
+
+ qualification
+ qualification
+
+
+ oksm_code
+ oksm_code
+
+
+ study_field
+ study_field
+
+
+ education_certificate_number
+ education_certificate_number
+
+
+ education_level_code
+ education_level_code
+
+
+ recognition_date
+ recognition_date
+
+
+ vus_spec
+ vus_spec
+
+
+ doc_reg_num
+ doc_reg_num
+
+
+ doc_reg_series
+ doc_reg_series
+
+
+ foreign_doc_name
+ foreign_doc_name
+
+
+ education_institution_name
+ education_institution_name
+
+
+ education_speciality_minpobr_code
+ education_speciality_minpobr_code
+
+
+ education_speciality_minprosv_code
+ education_speciality_minprosv_code
+
+
+ N
+ N
+ N
+ N
+
+ Y
+
+ N
+ ervu_dashboard
+ Y
+ citizen_foreign_education_diploma
+
+ N
+ Y
+ N
+ Y
+
+
+ 816
+ 208
+
+
+
+
+ Table output
+ Dummy (do nothing)
+ Y
+
+
+
+
+
+
+
+
+
+
+
diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/citizen_kolledzh_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/citizen_kolledzh_once.hpl
index 0e01f8c..38cb0d5 100644
--- a/v1_apache-hop dash mapping/jobs_once_a_day/citizen_kolledzh_once.hpl
+++ b/v1_apache-hop dash mapping/jobs_once_a_day/citizen_kolledzh_once.hpl
@@ -25,6 +25,11 @@
Table output
Y
+
+ Table output
+ Dummy (do nothing)
+ Y
+
Table input
@@ -48,35 +53,36 @@
kolledzh_item->'svedOrg'->>'adresOrg' as educational_institution_address,
kolledzh_item->'svedOrg'->>'kodTipOrg' as educational_institution_type_code,
kolledzh_item->>'kodStatus' as education_status_code,
- kolledzh_item->'svedVosst'->>'dataVosst' as recovery_date,
- kolledzh_item->'svedVosst'->>'nomPrikazVosst' as recovery_order_date,
- kolledzh_item->'svedVosst'->>'nomPrikazVosstnomPrikazVosst' recovery_order_number,
+ to_date(kolledzh_item->'svedVosst'->>'dataVosst', 'YYYY-MM-DD') as recovery_date,
+ to_date(kolledzh_item->'svedVosst'->>'nomPrikazVosstnomPrikazVosst', 'YYYY-MM-DD') as recovery_order_date,
+ kolledzh_item->'svedVosst'->>'nomPrikazVosst' recovery_order_number,
kolledzh_item->>'kodUrovObr' as education_level_code,
kolledzh_item->>'nomerKursa' as grade_number,
- kolledzh_item->'svedOtpusk'->0->>'dataNach' as leave_start_date,
- kolledzh_item->'svedOtpusk'->0->>'dataOkonch' as leave_end_date,
+ to_date(kolledzh_item->'svedOtpusk'->0->>'dataNach', 'YYYY-MM-DD') as leave_start_date,
+ to_date(kolledzh_item->'svedOtpusk'->0->>'dataOkonch', 'YYYY-MM-DD') as leave_end_date,
kolledzh_item->'svedOtpusk'->0->>'kodPrichOtpusk' as leave_reason_code,
- kolledzh_item->>'dataZachisl' as admission_date,
+ to_date(kolledzh_item->>'dataZachisl', 'YYYY-MM-DD') as admission_date,
kolledzh_item->>'prPervObuch' = '1' as first_education,
kolledzh_item->'svedObrProg'->>'prVUSpecz' = '1' as vus_spec,
- kolledzh_item->'svedObrProg'->>'dataNachObuch' as education_start_date,
+ to_date(kolledzh_item->'svedObrProg'->>'dataNachObuch', 'YYYY-MM-DD') as education_start_date,
kolledzh_item->'svedObrProg'->>'kodFormaObuch' as education_form_code,
- kolledzh_item->'svedObrProg'->>'planDataOkonch' as planned_education_end_date,
+ to_date(kolledzh_item->'svedObrProg'->>'planDataOkonch', 'YYYY-MM-DD') as planned_education_end_date,
kolledzh_item->'svedObrProg'->'svedSpeczMinobr'->>'kodSpecz' as minobr_spec_code,
kolledzh_item->'svedObrProg'->'svedSpeczMinprosv'->>'kodSpecz' as minprosv_spec_code,
- kolledzh_item->'svedObrProg'->'svedOtchisl'->>'dataOtchisl' as expulsion_date,
- kolledzh_item->'svedObrProg'->'svedOtchisl'->>'nomPrikazOtchisl' as expulsion_order_date,
- kolledzh_item->'svedObrProg'->'svedOtchisl'->>'dataPrikazOtchisl' as expulsion_order_number,
- kolledzh_item->'svedVoenObuch'->>'dataNach' as military_education_start_date,
- kolledzh_item->'svedVoenObuch'->>'dataOkonch' as military_education_end_date,
- kolledzh_item->>'nomPrikazZachisl' as admission_order_date,
- kolledzh_item->>'dataPrikazZachisl' as admission_order_number
-from recruits_info ri,
- jsonb_array_elements(info->'svedFL'->'svedKolledzh'->'kolledzh') as kolledzh_item
+ to_date(kolledzh_item->'svedObrProg'->'svedOtchisl'->>'dataOtchisl', 'YYYY-MM-DD') as expulsion_date,
+ to_date(kolledzh_item->'svedObrProg'->'svedOtchisl'->>'dataPrikazOtchisl', 'YYYY-MM-DD') as expulsion_order_date,
+ kolledzh_item->'svedObrProg'->'svedOtchisl'->>'nomPrikazOtchisl' as expulsion_order_number,
+ to_date(kolledzh_item->'svedVoenObuch'->>'dataNach', 'YYYY-MM-DD') as military_education_start_date,
+ to_date(kolledzh_item->'svedVoenObuch'->>'dataOkonch', 'YYYY-MM-DD') as military_education_end_date,
+ to_date(kolledzh_item->>'dataPrikazZachisl', 'YYYY-MM-DD') as admission_order_date,
+ kolledzh_item->>'nomPrikazZachisl' as admission_order_number
+from recruits_info ri
join recruits r
ON ri.recruit_id = r.id
- and '${RCRT_C}' IN (r.target_recruitment_id, r.current_recruitment_id)
-where info->'svedFL'->'svedKolledzh'->'kolledzh' != 'null';
+ and '${RCRT_C}' IN (r.target_recruitment_id, r.current_recruitment_id),
+ jsonb_array_elements(info->'svedFL'->'svedKolledzh'->'kolledzh') as kolledzh_item
+where info->'svedFL'->'svedKolledzh'->'kolledzh' != 'null';
+
Y
@@ -227,14 +233,11 @@ where info->'svedFL'->'svedKolledzh'->'kolledzh' != 'null';
N
N
N
-
Y
-
N
ervu_dashboard
Y
-
N
Y
N
@@ -245,7 +248,36 @@ where info->'svedFL'->'svedKolledzh'->'kolledzh' != 'null';
192
+
+ Dummy (do nothing)
+ Dummy
+
+ Y
+
+ 1
+
+ none
+
+
+
+
+ 656
+ 368
+
+
+
+ Table output
+ Dummy (do nothing)
+ Y
+
+
+
+
+
+
+
+
diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/citizen_school_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/citizen_school_once.hpl
index c7e4df6..dceb807 100644
--- a/v1_apache-hop dash mapping/jobs_once_a_day/citizen_school_once.hpl
+++ b/v1_apache-hop dash mapping/jobs_once_a_day/citizen_school_once.hpl
@@ -25,6 +25,11 @@
Table output
Y
+
+ Table output
+ Dummy (do nothing)
+ Y
+
Table input
@@ -49,16 +54,17 @@
shkola_item->>'kodStatus' as education_status_code,
'9' as education_level_code, -- костыль
shkola_item->>'klass' as grade_number,
- shkola_item->>'dataPostup' as admission_date,
- shkola_item->>'dataOkonch' as planned_education_end_date,
- shkola_item->>'nomPrikazZachisl' as admission_order_date,
- shkola_item->>'dataPrikazZachisl' as admission_order_number
-from recruits_info ri,
- jsonb_array_elements(info->'svedFL'->'svedSHkola'->'shkola') as shkola_item
+ to_date(shkola_item->>'dataPostup', 'YYYY-MM-DD') as admission_date,
+ to_date(shkola_item->>'dataOkonch', 'YYYY-MM-DD') as planned_education_end_date,
+ to_date(shkola_item->>'dataPrikazZachisl', 'YYYY-MM-DD') as admission_order_date,
+ shkola_item->>'nomPrikazZachisl' as admission_order_number
+from recruits_info ri
join recruits r
- ON ri.recruit_id = r.id
- and '${RCRT_C}' IN (r.target_recruitment_id, r.current_recruitment_id)
-where info->'svedFL'->'svedSHkola'->'shkola' != 'null';
+ ON ri.recruit_id = r.id
+ and '${RCRT_C}' IN (r.target_recruitment_id, r.current_recruitment_id),
+ jsonb_array_elements(info->'svedFL'->'svedSHkola'->'shkola') as shkola_item
+where info->'svedFL'->'svedSHkola'->'shkola' != 'null';
+
Y
@@ -137,14 +143,11 @@ where info->'svedFL'->'svedSHkola'->'shkola' != 'null';
N
N
N
-
Y
-
N
ervu_dashboard
Y
-
N
Y
N
@@ -155,7 +158,36 @@ where info->'svedFL'->'svedSHkola'->'shkola' != 'null';
208
+
+ Dummy (do nothing)
+ Dummy
+
+ Y
+
+ 1
+
+ none
+
+
+
+
+ 608
+ 352
+
+
+
+ Table output
+ Dummy (do nothing)
+ Y
+
+
+
+
+
+
+
+
diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/citizen_vuz_education_once.hpl b/v1_apache-hop dash mapping/jobs_once_a_day/citizen_vuz_education_once.hpl
index 16b9976..479aa99 100644
--- a/v1_apache-hop dash mapping/jobs_once_a_day/citizen_vuz_education_once.hpl
+++ b/v1_apache-hop dash mapping/jobs_once_a_day/citizen_vuz_education_once.hpl
@@ -25,7 +25,29 @@
Table output
Y
+
+ Table output
+ Dummy (do nothing)
+ N
+
+
+ Dummy (do nothing)
+ Dummy
+
+ Y
+
+ 1
+
+ none
+
+
+
+
+ 624
+ 416
+
+
Table output
TableOutput
@@ -169,14 +191,11 @@
N
N
N
-
Y
-
N
ervu_dashboard
Y
-
N
Y
N
@@ -209,34 +228,34 @@
vuz_item->'svedOrg'->>'adresOrg' as educational_institution_address,
vuz_item->'svedOrg'->>'kodTipOrg' as educational_institution_type_code,
vuz_item->>'kodStatus' as education_status_code,
- vuz_item->'svedVosst'->>'dataVosst' as recovery_date,
- vuz_item->'svedVosst'->>'nomPrikazVosst' as recovery_order_date,
- vuz_item->'svedVosst'->>'nomPrikazVosstnomPrikazVosst' recovery_order_number,
+ to_date(vuz_item->'svedVosst'->>'dataVosst', 'YYYY-MM-DD') as recovery_date,
+ to_date(vuz_item->'svedVosst'->>'nomPrikazVosstnomPrikazVosst', 'YYYY-MM-DD') as recovery_order_date,
+ vuz_item->'svedVosst'->>'nomPrikazVosst' recovery_order_number,
vuz_item->>'kodUrovObr' as education_level_code,
vuz_item->>'nomerKursa' as grade_number,
- vuz_item->'svedOtpusk'->0->>'dataNach' as leave_start_date,
- vuz_item->'svedOtpusk'->0->>'dataOkonch' as leave_end_date,
+ to_date(vuz_item->'svedOtpusk'->0->>'dataNach', 'YYYY-MM-DD') as leave_start_date,
+ to_date(vuz_item->'svedOtpusk'->0->>'dataOkonch', 'YYYY-MM-DD') as leave_end_date,
vuz_item->'svedOtpusk'->0->>'kodPrichOtpusk' as leave_reason_code,
- vuz_item->>'dataZachisl' as admission_date,
+ to_date(vuz_item->>'dataZachisl', 'YYYY-MM-DD') as admission_date,
vuz_item->>'prPervObuch' = '1' as first_education,
vuz_item->'svedObrProg'->>'prVUSpecz' = '1' as vus_spec,
- vuz_item->'svedObrProg'->>'dataNachObuch' as education_start_date,
+ to_date(vuz_item->'svedObrProg'->>'dataNachObuch', 'YYYY-MM-DD') as education_start_date,
vuz_item->'svedObrProg'->>'kodFormaObuch' as education_form_code,
- vuz_item->'svedObrProg'->>'planDataOkonch' as planned_education_end_date,
+ to_date(vuz_item->'svedObrProg'->>'planDataOkonch', 'YYYY-MM-DD') as planned_education_end_date,
vuz_item->'svedObrProg'->'svedSpeczMinobr'->>'kodSpecz' as minobr_spec_code,
vuz_item->'svedObrProg'->'svedSpeczMinprosv'->>'kodSpecz' as minprosv_spec_code,
- vuz_item->'svedObrProg'->'svedOtchisl'->>'dataOtchisl' as expulsion_date,
- vuz_item->'svedObrProg'->'svedOtchisl'->>'nomPrikazOtchisl' as expulsion_order_date,
- vuz_item->'svedObrProg'->'svedOtchisl'->>'dataPrikazOtchisl' as expulsion_order_number,
- vuz_item->'svedVoenObuch'->>'dataNach' as military_education_start_date,
- vuz_item->'svedVoenObuch'->>'dataOkonch' as military_education_end_date,
- vuz_item->>'nomPrikazZachisl' as admission_order_date,
- vuz_item->>'dataPrikazZachisl' as admission_order_number
-from recruits_info ri,
- jsonb_array_elements(info->'svedFL'->'svedVUZ'->'vuz') as vuz_item
+ to_date(vuz_item->'svedObrProg'->'svedOtchisl'->>'dataOtchisl', 'YYYY-MM-DD') as expulsion_date,
+ to_date(vuz_item->'svedObrProg'->'svedOtchisl'->>'dataPrikazOtchisl', 'YYYY-MM-DD') as expulsion_order_date,
+ vuz_item->'svedObrProg'->'svedOtchisl'->>'nomPrikazOtchisl' as expulsion_order_number,
+ to_date(vuz_item->'svedVoenObuch'->>'dataNach', 'YYYY-MM-DD') as military_education_start_date,
+ to_date(vuz_item->'svedVoenObuch'->>'dataOkonch', 'YYYY-MM-DD') as military_education_end_date,
+ to_date(vuz_item->>'dataPrikazZachisl', 'YYYY-MM-DD') as admission_order_date,
+ vuz_item->>'nomPrikazZachisl' as admission_order_number
+from recruits_info ri
join recruits r
ON ri.recruit_id = r.id
- and '${RCRT_C}' IN (r.target_recruitment_id, r.current_recruitment_id)
+ and '${RCRT_C}' IN (r.target_recruitment_id, r.current_recruitment_id),
+ jsonb_array_elements(info->'svedFL'->'svedVUZ'->'vuz') as vuz_item
where info->'svedFL'->'svedVUZ'->'vuz' != 'null';
Y
@@ -247,6 +266,18 @@ where info->'svedFL'->'svedVUZ'->'vuz' != 'null';
+
+ Table output
+ Dummy (do nothing)
+ N
+
+
+
+
+
+
+
+
diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/copy_punishment_and_deferment_once.hwf b/v1_apache-hop dash mapping/jobs_once_a_day/copy_punishment_and_deferment_once.hwf
index 9f861dc..b6a8812 100644
--- a/v1_apache-hop dash mapping/jobs_once_a_day/copy_punishment_and_deferment_once.hwf
+++ b/v1_apache-hop dash mapping/jobs_once_a_day/copy_punishment_and_deferment_once.hwf
@@ -270,7 +270,7 @@ delete from ervu_dashboard.citizen_deferment;
SUCCESS
N
- 1424
+ 1440
704
@@ -697,8 +697,6 @@ delete from ervu_dashboard.citizen_deferment;
N
N
${PROJECT_HOME}/jobs_once_a_day/education_constants_once.hpl
-
-
Basic
Y
@@ -725,14 +723,11 @@ delete from ervu_dashboard.citizen_deferment;
N
Y
${PROJECT_HOME}/jobs_once_a_day/citizen_vuz_education_once.hpl
-
-
Basic
RCRT_C
RECRUITMENT_CITIZEN
-
Y
@@ -742,7 +737,7 @@ delete from ervu_dashboard.citizen_deferment;
N
Y
N
- 880
+ 960
608
@@ -758,14 +753,11 @@ delete from ervu_dashboard.citizen_deferment;
N
Y
${PROJECT_HOME}/jobs_once_a_day/citizen_kolledzh_once.hpl
-
-
Basic
RCRT_C
RECRUITMENT_CITIZEN
-
Y
@@ -775,7 +767,7 @@ delete from ervu_dashboard.citizen_deferment;
N
Y
N
- 1104
+ 1168
608
@@ -791,14 +783,11 @@ delete from ervu_dashboard.citizen_deferment;
N
Y
${PROJECT_HOME}/jobs_once_a_day/citizen_school_once.hpl
-
-
Basic
RCRT_C
RECRUITMENT_CITIZEN
-
Y
@@ -808,7 +797,102 @@ delete from ervu_dashboard.citizen_deferment;
N
Y
N
- 1312
+ 1072
+ 512
+
+
+
+ SQL
+
+ SQL
+
+ ervu-dashboard
+ N
+ DELETE FROM ervu_dashboard.citizen_education;
+ N
+ N
+ N
+ 784
+ 608
+
+
+
+ Success 2
+
+ SUCCESS
+
+ N
+ 1216
+ 512
+
+
+
+ citizen_diploma_once.hpl
+
+ PIPELINE
+
+ N
+ N
+ N
+ N
+ N
+ Y
+ ${PROJECT_HOME}/jobs_once_a_day/citizen_diploma_once.hpl
+ Basic
+
+
+ RCRT_C
+ RECRUITMENT_CITIZEN
+
+ Y
+
+ N
+ local
+ N
+ N
+ Y
+ N
+ 656
+ 512
+
+
+
+ citizen_foreign_diploma_once.hpl
+
+ PIPELINE
+
+ N
+ N
+ N
+ N
+ N
+ Y
+ ${PROJECT_HOME}/jobs_once_a_day/citizen_foreign_diploma_once.hpl
+ Basic
+
+
+ RCRT_C
+ RECRUITMENT_CITIZEN
+
+ Y
+
+ N
+ local
+ N
+ N
+ Y
+ N
+ 864
+ 512
+
+
+
+ Success 2 2
+
+ SUCCESS
+
+ N
+ 1328
608
@@ -999,7 +1083,7 @@ delete from ervu_dashboard.citizen_deferment;
Start
recruitment_code_once.hpl
- N
+ Y
Y
Y
@@ -1027,7 +1111,7 @@ delete from ervu_dashboard.citizen_deferment;
Start
recruit_ervu_status_once.hpl
- N
+ Y
Y
Y
@@ -1047,10 +1131,17 @@ delete from ervu_dashboard.citizen_deferment;
education_constants_once.hpl
+ SQL
+ Y
+ Y
+ N
+
+
+ SQL
citizen_vuz_education_once.hpl
Y
- N
- Y
+ Y
+ N
citizen_vuz_education_once.hpl
@@ -1060,12 +1151,40 @@ delete from ervu_dashboard.citizen_deferment;
Y
- citizen_kolledzh_once.hpl
+ citizen_diploma_once.hpl
+ citizen_foreign_diploma_once.hpl
+ Y
+ N
+ Y
+
+
+ citizen_foreign_diploma_once.hpl
citizen_school_once.hpl
Y
N
Y
+
+ citizen_school_once.hpl
+ Success 2
+ Y
+ N
+ Y
+
+
+ citizen_kolledzh_once.hpl
+ Success 2 2
+ Y
+ N
+ Y
+
+
+ recruitment_rows.hpl
+ citizen_diploma_once.hpl
+ Y
+ Y
+ N
+
diff --git a/v1_apache-hop dash mapping/jobs_once_a_day/job_info_recruits_once.hwf b/v1_apache-hop dash mapping/jobs_once_a_day/job_info_recruits_once.hwf
index 4ae4cd7..02923ad 100644
--- a/v1_apache-hop dash mapping/jobs_once_a_day/job_info_recruits_once.hwf
+++ b/v1_apache-hop dash mapping/jobs_once_a_day/job_info_recruits_once.hwf
@@ -699,6 +699,8 @@
N
Y
${PROJECT_HOME}/jobs_once_a_day/subpoena_once.hpl
+
+
Basic
Y
@@ -740,6 +742,8 @@
N
Y
${PROJECT_HOME}/jobs_once_a_day/temporary_measure_once.hpl
+
+
Basic
Y
@@ -1153,11 +1157,14 @@
N
Y
${PROJECT_HOME}/jobs_once_a_day/citizen_sports_categories_once.hpl
+
+
Basic
RCRT_C
RECRUITMENT_CITIZEN
+
Y
@@ -1183,11 +1190,14 @@
N
Y
${PROJECT_HOME}/jobs_once_a_day/citizen_education_diplomas_received_once.hpl
+
+
Basic
RCRT_C
RECRUITMENT_CITIZEN
+
Y
@@ -1213,11 +1223,14 @@
N
Y
${PROJECT_HOME}/jobs_once_a_day/citizen_work_activity_once.hpl
+
+
Basic
RCRT_C
RECRUITMENT_CITIZEN
+
Y