forked from ices-eg/wg_WGEEL
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:ices-eg/wg_WGEEL
# Conflicts: # R/shiny_data_integration/shiny_di/loading_functions.R
- Loading branch information
Showing
19 changed files
with
666 additions
and
651 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
----------------------------------------------------------- | ||
# 00 (put the code of the country there) | ||
----------------------------------------------------------- | ||
|
||
## Annex 1 | ||
|
||
### series | ||
|
||
### dataseries | ||
|
||
|
||
### group metrics | ||
|
||
|
||
### individual metrics | ||
|
||
## Annex 2 | ||
|
||
### series | ||
|
||
### dataseries | ||
|
||
|
||
### group metrics | ||
|
||
|
||
### individual metrics | ||
|
||
|
||
|
||
## Annex 3 | ||
|
||
### series | ||
|
||
### dataseries | ||
|
||
|
||
### group metrics | ||
|
||
|
||
### individual metrics | ||
|
||
|
||
|
||
## Annex 4 | ||
|
||
|
||
|
||
## Annex 5 | ||
|
||
|
||
|
||
## Annex 6 | ||
|
||
|
||
|
||
## Annex 7 | ||
|
||
|
||
|
||
## Annex 8 | ||
|
||
|
||
|
||
## Annex 10 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
----------------------------------------------------------- | ||
# AL | ||
----------------------------------------------------------- | ||
## Annex 1 | ||
|
||
|
||
## Annex 2 | ||
|
||
## Annex 3 | ||
|
||
|
||
## Annex 4 | ||
|
||
|
||
|
||
## Annex 5 | ||
|
||
|
||
## Annex 6 | ||
|
||
|
||
## Annex 7 | ||
|
||
## Annex 8 | ||
|
||
|
||
|
||
## Annex 10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
----------------------------------------------------------- | ||
# BE | ||
----------------------------------------------------------- | ||
|
||
## Annex 1 | ||
### done | ||
* 4 values updated (modified series) | ||
* 81 values integrated (new dataseries) | ||
* 1 and 2 new values integrated (new group metrics) | ||
|
||
## Annex 2 | ||
no data | ||
|
||
## Annex 3 | ||
no data | ||
|
||
## Annex 4 | ||
no data | ||
|
||
## Annex 5 | ||
### done | ||
* replaced two values (duplicates) | ||
* 1 new value integrated (new rows) | ||
|
||
## Annex 6 | ||
no data | ||
|
||
## Annex 7 | ||
### notes | ||
* there was a window with duplicates but there were none and the created excel file was empty (in the shiny in eel_missvalueequal.base it says "No data available in table") | ||
|
||
### done | ||
* 4 new values inserted (new rows) | ||
|
||
## Annex 8 | ||
no data | ||
|
||
|
||
## Annex 10 | ||
no data |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
----------------------------------------------------------- | ||
# CZ | ||
----------------------------------------------------------- | ||
|
||
## Annex 1 | ||
|
||
|
||
## Annex 2 | ||
|
||
## Annex 3 | ||
|
||
|
||
## Annex 4 | ||
|
||
|
||
|
||
## Annex 5 | ||
|
||
|
||
## Annex 6 | ||
|
||
|
||
## Annex 7 | ||
|
||
## Annex 8 | ||
|
||
|
||
|
||
## Annex 10 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
----------------------------------------------------------- | ||
# DE | ||
----------------------------------------------------------- | ||
## Annex 1 | ||
### to do | ||
* need to provide ser_restocking etc. in series info | ||
|
||
### done | ||
* modified 2 series (ser_methods) | ||
* integrated 11 values in dataseries (removed empty rows in templates) | ||
|
||
## Annex 2 | ||
|
||
### done | ||
* integrated 1 new value (new dataseries) | ||
|
||
## Annex 3 | ||
### done | ||
* integrated 1 new value (new dataseries) | ||
|
||
## Annex 4 | ||
### to do | ||
* not integrated (no data) but there is an update to metadata since one of the data providers has changed. Not sure how to do approach this... | ||
|
||
|
||
## Annex 5 | ||
### to do | ||
* not integrated (no data) but there is an update to metadata since one of the data providers has changed. Not sure how to do approach this... | ||
|
||
## Annex 6 | ||
* not provided by DE / empty sheet. Nothing to report from Germany, so this should be fine. | ||
|
||
## Annex 7 | ||
### to do | ||
* not integrated (no data) but there is an update to metadata since one of the data providers has changed. Not sure how to do approach this... | ||
|
||
## Annex 8 | ||
### to do | ||
* not integrated due to a bug being stuck in the loading screen (added to issues); but needs to be integrated, DE provided an update to data! | ||
|
||
|
||
## Annex 10 | ||
### notes | ||
* In the database there was a wron name for a series in sai_info (DE_Elbe_Eider should have been DE_Eide_Eider). This was changed in the database and also for the related group metrics the series was changed to DE_Eide_Eider. Accordingly, the spreadsheet, as provided by DE, was edited (i.e. the existing series info was changed accordingly and the existing group metrics was changed accordingly). | ||
|
||
### to do | ||
* pre-filled series ending with "HIST" and related group metrics should be deleted. It's not clear to the data provider how these are generated and if they are reliable. | ||
* integrate individual metrics, there was a bug... | ||
|
||
### done | ||
* group metrics: 137 and 1509 new values inserted in the group and metric tables | ||
* deleted groups metrics: done using an sql query (see database_edition_2022.sql): 34 groups metrics with qal_id 22 and 10 gr_comment updated for gr_id in (2323,2334,2167,2222,2189,2200,2211,2178,2233,2244); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
----------------------------------------------------------- | ||
# DZ | ||
----------------------------------------------------------- | ||
## Annex 1 | ||
|
||
|
||
## Annex 2 | ||
|
||
## Annex 3 | ||
|
||
|
||
## Annex 4 | ||
|
||
|
||
|
||
## Annex 5 | ||
|
||
|
||
## Annex 6 | ||
|
||
|
||
## Annex 7 | ||
|
||
## Annex 8 | ||
|
||
|
||
|
||
## Annex 10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
----------------------------------------------------------- | ||
# EE | ||
----------------------------------------------------------- | ||
|
||
## Annex 1 | ||
|
||
|
||
## Annex 2 | ||
|
||
## Annex 3 | ||
|
||
|
||
## Annex 4 | ||
|
||
|
||
|
||
## Annex 5 | ||
|
||
|
||
## Annex 6 | ||
|
||
|
||
## Annex 7 | ||
|
||
## Annex 8 | ||
|
||
|
||
|
||
## Annex 10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
----------------------------------------------------------- | ||
# EG | ||
----------------------------------------------------------- | ||
## Annex 1 | ||
|
||
|
||
## Annex 2 | ||
|
||
## Annex 3 | ||
|
||
|
||
## Annex 4 | ||
|
||
|
||
|
||
## Annex 5 | ||
|
||
|
||
## Annex 6 | ||
|
||
|
||
## Annex 7 | ||
|
||
## Annex 8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
----------------------------------------------------------- | ||
# ES | ||
----------------------------------------------------------- | ||
## Annex 1 | ||
|
||
|
||
## Annex 2 | ||
|
||
## Annex 3 | ||
|
||
|
||
## Annex 4 | ||
|
||
|
||
|
||
## Annex 5 | ||
|
||
|
||
## Annex 6 | ||
|
||
|
||
## Annex 7 | ||
|
||
## Annex 8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
----------------------------------------------------------- | ||
# FI | ||
----------------------------------------------------------- | ||
## Annex 1 | ||
|
||
|
||
## Annex 2 | ||
|
||
## Annex 3 | ||
|
||
|
||
## Annex 4 | ||
|
||
|
||
|
||
## Annex 5 | ||
|
||
|
||
## Annex 6 | ||
|
||
|
||
## Annex 7 | ||
|
||
## Annex 8 | ||
|
||
|
||
|
||
## Annex 10 |
Oops, something went wrong.