Skip to content

Commit

Permalink
Merge branch 'develop' into dependency_updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@arnfinn
arnfinn committed Aug 13, 2024
2 parents fffb8f4 + 824dc34 commit edb193f
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 188 deletions.
68 changes: 22 additions & 46 deletions apps/skde/public/helseatlas/data/radiology/mr_hand_rb1_en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
{
"type": "barchart",
"data": "datasett_1",
"x": [
"totAverage"
],
"x": ["totAverage"],
"y": "bohf",
"xLabel": {
"nb": "Antall (rate) MR hånd pr. 10 000 innbyggere",
Expand All @@ -15,38 +13,18 @@
"nb": "Opptaksområder",
"en": "Referral areas"
},
"annualVar": [
"tot2018",
"tot2019",
"tot2020",
"tot2021",
"tot2022"
],
"annualVar": ["tot2018", "tot2019", "tot2020", "tot2021", "tot2022"],
"annualVarLabels": {
"nb": [
"2018",
"2019",
"2020",
"2021",
"2022"
],
"en": [
"2018",
"2019",
"2020",
"2021",
"2022"
]
"nb": ["2018", "2019", "2020", "2021", "2022"],
"en": ["2018", "2019", "2020", "2021", "2022"]
},
"format": ",.0f"
},
{
"type": "linechart",
"data": "datasett_2",
"label": "gender",
"x": [
"alder"
],
"x": ["alder"],
"y": "pctandel",
"xLabel": {
"nb": "Alder",
Expand All @@ -62,9 +40,7 @@
"type": "linechart",
"data": "datasett_3",
"label": "tid",
"x": [
"mnd"
],
"x": ["mnd"],
"y": "antall",
"xLabel": {
"nb": "Måned",
Expand Down Expand Up @@ -165,7 +141,7 @@
{
"type": "data",
"label": "datasett_1",
"national": "Norge",
"national": "Norway",
"description": "Hoveddatasettet for gitt resultatboks",
"data": [
{
Expand Down Expand Up @@ -442,7 +418,7 @@
"tot_pr_pas": 1.05774165954
},
{
"bohf": "Norge",
"bohf": "Norway",
"tot2018": 35.6805162026,
"tot2019": 35.8056323585,
"tot2020": 34.6002573682,
Expand All @@ -464,14 +440,14 @@
{
"alder": 0,
"ermann": "Kvinner",
"pctandel": 7.426165351e-06,
"pctandel": 7.426165351e-6,
"gender": "Women",
"bohf": null
},
{
"alder": 0,
"ermann": "Menn",
"pctandel": 7.03650538996e-06,
"pctandel": 7.03650538996e-6,
"gender": "Men",
"bohf": null
},
Expand All @@ -485,77 +461,77 @@
{
"alder": 1,
"ermann": "Menn",
"pctandel": 6.88112850507e-06,
"pctandel": 6.88112850507e-6,
"gender": "Men",
"bohf": null
},
{
"alder": 2,
"ermann": "Kvinner",
"pctandel": 7.10378631811e-06,
"pctandel": 7.10378631811e-6,
"gender": "Women",
"bohf": null
},
{
"alder": 2,
"ermann": "Menn",
"pctandel": 1.33661248931e-05,
"pctandel": 1.33661248931e-5,
"gender": "Men",
"bohf": null
},
{
"alder": 3,
"ermann": "Kvinner",
"pctandel": 6.95739292572e-06,
"pctandel": 6.95739292572e-6,
"gender": "Women",
"bohf": null
},
{
"alder": 3,
"ermann": "Menn",
"pctandel": 1.31116588871e-05,
"pctandel": 1.31116588871e-5,
"gender": "Men",
"bohf": null
},
{
"alder": 4,
"ermann": "Kvinner",
"pctandel": 1.364526407e-05,
"pctandel": 1.364526407e-5,
"gender": "Women",
"bohf": null
},
{
"alder": 4,
"ermann": "Menn",
"pctandel": 6.45323662083e-06,
"pctandel": 6.45323662083e-6,
"gender": "Men",
"bohf": null
},
{
"alder": 5,
"ermann": "Kvinner",
"pctandel": 6.69891075711e-05,
"pctandel": 6.69891075711e-5,
"gender": "Women",
"bohf": null
},
{
"alder": 5,
"ermann": "Menn",
"pctandel": 3.17313245289e-05,
"pctandel": 3.17313245289e-5,
"gender": "Men",
"bohf": null
},
{
"alder": 6,
"ermann": "Kvinner",
"pctandel": 8.61280790788e-05,
"pctandel": 8.61280790788e-5,
"gender": "Women",
"bohf": null
},
{
"alder": 6,
"ermann": "Menn",
"pctandel": 5.66322678077e-05,
"pctandel": 5.66322678077e-5,
"gender": "Men",
"bohf": null
},
Expand All @@ -569,7 +545,7 @@
{
"alder": 7,
"ermann": "Menn",
"pctandel": 9.91682265002e-05,
"pctandel": 9.91682265002e-5,
"gender": "Men",
"bohf": null
},
Expand Down
38 changes: 9 additions & 29 deletions apps/skde/public/helseatlas/data/radiology/mr_hand_rb2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
{
"type": "barchart",
"data": "datasett_1",
"x": [
"andel_priv"
],
"x": ["andel_priv"],
"y": "bohf",
"xLabel": {
"nb": "Andel av undersøkelsene utført ved private røntgeninstitutt",
Expand All @@ -20,19 +18,10 @@
{
"type": "barchart",
"data": "datasett_1",
"x": [
"privsnitt",
"offsnitt"
],
"x": ["privsnitt", "offsnitt"],
"xLegend": {
"nb": [
"Private røntgeninstitutt",
"Offentlig"
],
"en": [
"Private clinics",
"Public"
]
"nb": ["Private røntgeninstitutt", "Offentlig"],
"en": ["Private clinics", "Public"]
},
"y": "bohf",
"xLabel": {
Expand All @@ -48,20 +37,11 @@
{
"type": "barchart",
"data": "datasett_1",
"x": [
"hand_bltsnitt",
"hand_iblt"
],
"x": ["hand_bltsnitt", "hand_iblt"],
"y": "bohf",
"xLegend": {
"nb": [
"Bilateralt",
"Unilateralt"
],
"en": [
"Bilateral",
"Unilateral"
]
"nb": ["Bilateralt", "Unilateralt"],
"en": ["Bilateral", "Unilateral"]
},
"xLabel": {
"nb": "Antall (rate) bilateralt/unilateralt, pr. 10 000 innbyggere",
Expand Down Expand Up @@ -161,7 +141,7 @@
{
"type": "data",
"label": "datasett_1",
"national": "Norge",
"national": "Norway",
"description": "Hoveddatasettet for gitt resultatboks",
"data": [
{
Expand Down Expand Up @@ -396,7 +376,7 @@
"andel_priv": 0.836190644201
},
{
"bohf": "Norge",
"bohf": "Norway",
"hand_bltsnitt": 3.4218178247,
"mr_hand_rate": 37.7873741978,
"andel_blt": 0.0905545277317,
Expand Down
38 changes: 7 additions & 31 deletions apps/skde/public/helseatlas/data/radiology/mr_prosbdk_rb1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
{
"type": "barchart",
"data": "datasett_1",
"x": [
"totsnitt"
],
"x": ["totsnitt"],
"y": "bohf",
"xLabel": {
"nb": "Antall (rate) MR prostata pr. 10 000 menn",
Expand All @@ -15,38 +13,18 @@
"nb": "Opptaksområder",
"en": "Referral areas"
},
"annualVar": [
"tot2018",
"tot2019",
"tot2020",
"tot2021",
"tot2022"
],
"annualVar": ["tot2018", "tot2019", "tot2020", "tot2021", "tot2022"],
"annualVarLabels": {
"nb": [
"2018",
"2019",
"2020",
"2021",
"2022"
],
"en": [
"2018",
"2019",
"2020",
"2021",
"2022"
]
"nb": ["2018", "2019", "2020", "2021", "2022"],
"en": ["2018", "2019", "2020", "2021", "2022"]
},
"format": ",.0f"
},
{
"type": "linechart",
"data": "datasett_2",
"label": "gender",
"x": [
"alder"
],
"x": ["alder"],
"y": "pctandel",
"xLabel": {
"nb": "Alder",
Expand All @@ -62,9 +40,7 @@
"type": "linechart",
"data": "datasett_3",
"label": "tid",
"x": [
"mnd"
],
"x": ["mnd"],
"y": "antall",
"xLabel": {
"nb": "Måned",
Expand Down Expand Up @@ -165,7 +141,7 @@
{
"type": "data",
"label": "datasett_1",
"national": "Norge",
"national": "Norway",
"description": "Hoveddatasettet for gitt resultatboks",
"data": [
{
Expand Down
21 changes: 5 additions & 16 deletions apps/skde/public/helseatlas/data/radiology/mr_prosbdk_rb2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
{
"type": "barchart",
"data": "datasett_1",
"x": [
"andel_priv"
],
"x": ["andel_priv"],
"y": "bohf",
"xLabel": {
"nb": "Andel av undersøkelsene utført ved private røntgeninstitutt",
Expand All @@ -20,19 +18,10 @@
{
"type": "barchart",
"data": "datasett_1",
"x": [
"privsnitt",
"offsnitt"
],
"x": ["privsnitt", "offsnitt"],
"xLegend": {
"nb": [
"Private røntgeninstitutt",
"Offentlig"
],
"en": [
"Private clinics",
"Public"
]
"nb": ["Private røntgeninstitutt", "Offentlig"],
"en": ["Private clinics", "Public"]
},
"y": "bohf",
"xLabel": {
Expand Down Expand Up @@ -126,7 +115,7 @@
{
"type": "data",
"label": "datasett_1",
"national": "Norge",
"national": "Norway",
"description": "Hoveddatasettet for gitt resultatboks",
"data": [
{
Expand Down
Loading

0 comments on commit edb193f

Please sign in to comment.