Skip to content

Commit

Permalink
Merge pull request #17 from djsir-data/dev
Browse files Browse the repository at this point in the history
fix missing data on summary tables
  • Loading branch information
mrjoh3 authored Aug 6, 2024
2 parents 3677d71 + 6f01acb commit 2e9bd28
Show file tree
Hide file tree
Showing 21 changed files with 83 additions and 83 deletions.
2 changes: 1 addition & 1 deletion business01_banner.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/adminlte.min.css" rel="stylesheet" />
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/adminlte.min.js" crossorigin="anonymous"></script>
<title>Current creative businesses</title>
<meta property="article:published_time" content="2024-07-22T15:10:10"/>
<meta property="article:published_time" content="2024-08-06T17:52:03"/>
<link rel="stylesheet" href="style.css"/>
<script>window.addEventListener('DOMContentLoaded', (event) => {
var charts = Highcharts.charts;
Expand Down
10 changes: 5 additions & 5 deletions business02_totshare.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions business03_summary.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/adminlte.min.css" rel="stylesheet" />
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/adminlte.min.js" crossorigin="anonymous"></script>
<title>Creative business overview</title>
<meta property="article:published_time" content="2024-07-22T15:10:13"/>
<meta property="article:published_time" content="2024-08-06T17:52:06"/>
<link rel="stylesheet" href="style.css"/>
<script>window.addEventListener('DOMContentLoaded', (event) => {
var charts = Highcharts.charts;
Expand Down Expand Up @@ -52,7 +52,7 @@
<th scope="row">Creative businesses</th>
<td>47,993</td>
<td>-1.3% pa</td>
<td>NA% pa</td>
<td>3% pa</td>
</tr>
<tr>
<th scope="row">Total Victorian businesses</th>
Expand Down
10 changes: 5 additions & 5 deletions business04_ccvicsize.html

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions business05_sizeind.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion employment01_banner.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/adminlte.min.css" rel="stylesheet" />
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/adminlte.min.js" crossorigin="anonymous"></script>
<title>Current creative employment</title>
<meta property="article:published_time" content="2024-07-22T15:09:19"/>
<meta property="article:published_time" content="2024-08-06T17:51:05"/>
<link rel="stylesheet" href="style.css"/>
<script>window.addEventListener('DOMContentLoaded', (event) => {
var charts = Highcharts.charts;
Expand Down
6 changes: 3 additions & 3 deletions employment02_total.html

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions employment03-1_growthshare.html

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions employment03-2_growthshare.html

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions employment04_summary.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/adminlte.min.css" rel="stylesheet" />
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/adminlte.min.js" crossorigin="anonymous"></script>
<title>Creative Employment Overview</title>
<meta property="article:published_time" content="2024-07-22T15:09:35"/>
<meta property="article:published_time" content="2024-08-06T17:51:16"/>
<link rel="stylesheet" href="style.css"/>
<script>window.addEventListener('DOMContentLoaded', (event) => {
var charts = Highcharts.charts;
Expand Down Expand Up @@ -52,19 +52,19 @@
<th scope="row">Victorian creative employment</th>
<td>318,244</td>
<td>0.6% pa</td>
<td>NA% pa</td>
<td>2.1% pa</td>
</tr>
<tr>
<th scope="row">Victorian total employment</th>
<td>3,706,061</td>
<td>3.5% pa</td>
<td>NA% pa</td>
<td>2.2% pa</td>
</tr>
<tr>
<th scope="row">Creative share of Victorian employment</th>
<td>8.6%</td>
<td>-0.2 pp</td>
<td>NA pp</td>
<td>0 pp</td>
</tr>
</tbody>
</table>
Expand Down
6 changes: 3 additions & 3 deletions employment05_top5.html

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions employment06_embed.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gva01_banner.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/adminlte.min.css" rel="stylesheet" />
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/adminlte.min.js" crossorigin="anonymous"></script>
<title>Current Creative GVA</title>
<meta property="article:published_time" content="2024-07-22T15:09:52"/>
<meta property="article:published_time" content="2024-08-06T17:51:34"/>
<link rel="stylesheet" href="style.css"/>
<script>window.addEventListener('DOMContentLoaded', (event) => {
var charts = Highcharts.charts;
Expand Down
6 changes: 3 additions & 3 deletions gva02_total.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/adminlte.min.css" rel="stylesheet" />
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/adminlte.min.js" crossorigin="anonymous"></script>
<title>Creative GVA trend</title>
<meta property="article:published_time" content="2024-07-22T15:09:52"/>
<meta property="article:published_time" content="2024-08-06T17:51:34"/>
<link rel="stylesheet" href="style.css"/>
<script>window.addEventListener('DOMContentLoaded', (event) => {
var charts = Highcharts.charts;
Expand Down Expand Up @@ -82,8 +82,8 @@
<div class="margin-mimic">
<div class="row">
<div class="col-12 my-3" style="background-color:#61C2EE;color:black;border-radius:24px;padding:1em;">
<div id="htmlwidget-d78e265e816567d770e5" style="width:100%;height:350px;" class="highchart html-widget "></div>
<script type="application/json" data-for="htmlwidget-d78e265e816567d770e5">{"x":{"hc_opts":{"chart":{"reflow":true,"height":350},"title":{"text":"Creative economic contribution to Victoria","widthAdjust":-100,"style":{"font-size":"1.5rem"}},"yAxis":{"title":{"text":["round","gva_total/1000","1"],"enabled":false},"type":"linear","labels":{"format":"${text}B"},"min":25,"accessibility":{"enabled":true,"description":"creative industry economic contribution"}},"credits":{"enabled":false},"exporting":{"enabled":true,"allowHTML":true,"allowTableSorting":false,"accessibility":{"enabled":true,"keyboardNavigation":{"enabled":true}},"buttons":{"contextButton":{"menuItems":["viewFullscreen","viewData","separator","downloadPNG","downloadSVG","downloadCSV"]}},"csv":{"dateFormat":"%B %Y"},"chartOptions":{"title":{"style":{"fontFamily":"Arial"}},"subtitle":{"style":{"fontFamily":"Arial"}},"legend":{"enabled":true,"itemStyle":{"fontFamily":"Arial"}},"xAxis":{"labels":{"style":{"fontFamily":"Arial"}}},"yAxis":{"labels":{"style":{"fontFamily":"Arial"}}},"caption":{"style":{"fontFamily":"Arial"}},"chart":{"style":{"fontFamily":"Arial"}}}},"boost":{"enabled":false},"plotOptions":{"series":{"label":{"enabled":false},"turboThreshold":0,"showInLegend":true,"pointPlacement":"on"},"treemap":{"layoutAlgorithm":"squarified"},"scatter":{"marker":{"symbol":"circle"}},"area":{"stacking":"normal"}},"series":[{"name":"Creative industry economic contribution","data":[{"fy_start":2016,"date":"2016-01-01","gva_cc":19684,"gva_embed":10612,"gva_total":30296.0099444862,"gva_cc_growth_1yr":7.6,"fy":"2016-17","y":30.3,"name":"2016-17"},{"fy_start":2017,"date":"2017-01-01","gva_cc":21116,"gva_embed":10841,"gva_total":31956.1838137295,"gva_cc_growth_1yr":5.5,"fy":"2017-18","y":32,"name":"2017-18"},{"fy_start":2018,"date":"2018-01-01","gva_cc":22908,"gva_embed":11739,"gva_total":34646.9193618445,"gva_cc_growth_1yr":8.4,"fy":"2018-19","y":34.6,"name":"2018-19"},{"fy_start":2019,"date":"2019-01-01","gva_cc":22827,"gva_embed":11891,"gva_total":34718.2153229501,"gva_cc_growth_1yr":0.2,"fy":"2019-20","y":34.7,"name":"2019-20"},{"fy_start":2020,"date":"2020-01-01","gva_cc":24299,"gva_embed":12328,"gva_total":36626.9285267552,"gva_cc_growth_1yr":5.5,"fy":"2020-21","y":36.6,"name":"2020-21"},{"fy_start":2021,"date":"2021-01-01","gva_cc":25684,"gva_embed":13930,"gva_total":39613.9145087403,"gva_cc_growth_1yr":8.2,"fy":"2021-22","y":39.6,"name":"2021-22"},{"fy_start":2022,"date":"2022-01-01","gva_cc":26530,"gva_embed":13795,"gva_total":40325.4108076105,"gva_cc_growth_1yr":1.8,"fy":"2022-23","y":40.3,"name":"2022-23"}],"type":"area","accessibility":{"enabled":true,"description":"this chart shows creative GVA over previous financial years"}}],"xAxis":{"type":"category","title":{},"tickmarkPlacement":"on","accessibility":{"enabled":true,"description":"financial year"}},"tooltip":{"valuePrefix":"$","valueSuffix":"B"},"caption":{"text":"Economic contribution is measured in gross value add in billions of dollars."},"legend":{"enabled":false},"colors":["#92278F"]},"theme":{"chart":{"backgroundColor":"#61C2EE"},"title":{"align":"left","style":{"color":"#1D184B","fontFamily":"VIC-Regular","font-weight":"bold","font-size":"2rem","background-color":"#1D184B"}},"subtitle":{"align":"left","style":{"color":"#1D184B","fontFamily":"VIC-Regular","font-size":"var(--bs-body-font-size)"}},"legend":{"itemStyle":{"fontFamily":"VIC-Regular","color":"#1D184B"},"itemHoverStyle":{"color":"gray"}},"xAxis":{"labels":{"style":{"color":"#1D184B","fontFamily":"VIC-Light","font-size":"11px"}},"title":{"align":"high","style":{"color":"#1D184B","font-size":"11px"}},"lineWidth":1,"lineColor":"#1D184B","tickPosition":"outside","tickColor":"#1D184B","tickWidth":1,"tickLength":4},"yAxis":{"labels":{"useHTML":true,"style":{"color":"#1D184B","fontFamily":"VIC-Light","font-size":"11px"},"y":5},"title":{"align":"high","style":{"color":"#1D184B","font-size":"11px"}},"minorGridLineWidth":0,"majorGridLineWidth":1,"lineWidth":0,"lineColor":"transparent","opposite":false},"caption":{"style":{"color":"#1D184B"}},"series":{"line":{"lineWidth":4},"spline":{"lineWidth":4},"area":{"lineWidth":4,"fillOpacity":0.4,"marker":{"enabled":false,"symbol":"circle","radius":2,"states":{"hover":{"enabled":true}}}}}},"conf_opts":{"global":{"Date":null,"VMLRadialGradientURL":"http =//code.highcharts.com/list(version)/gfx/vml-radial-gradient.png","canvasToolsURL":"http =//code.highcharts.com/list(version)/modules/canvas-tools.js","getTimezoneOffset":null,"timezoneOffset":0,"useUTC":true},"lang":{"contextButtonTitle":"Chart context menu","decimalPoint":".","downloadCSV":"Download CSV","downloadJPEG":"Download JPEG image","downloadPDF":"Download PDF document","downloadPNG":"Download PNG image","downloadSVG":"Download SVG vector image","downloadXLS":"Download XLS","drillUpText":"◁ Back to {series.name}","exitFullscreen":"Exit from full screen","exportData":{"annotationHeader":"Annotations","categoryDatetimeHeader":"DateTime","categoryHeader":"Category"},"hideData":"Hide data table","invalidDate":null,"loading":"Loading...","months":["January","February","March","April","May","June","July","August","September","October","November","December"],"noData":"No data to display","numericSymbolMagnitude":1000,"numericSymbols":["k","M","G","T","P","E"],"printChart":"Print chart","resetZoom":"Reset zoom","resetZoomTitle":"Reset zoom level 1:1","shortMonths":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"shortWeekdays":["Sat","Sun","Mon","Tue","Wed","Thu","Fri"],"thousandsSep":" ","viewData":"View data table","viewFullscreen":"View in full screen","weekdays":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]}},"type":"chart","fonts":["Arial","VIC-Regular","VIC-Light"],"google_fonts":false,"debug":false},"evals":[],"jsHooks":[]}</script>
<div id="htmlwidget-5726e88cb206d430d9a9" style="width:100%;height:350px;" class="highchart html-widget "></div>
<script type="application/json" data-for="htmlwidget-5726e88cb206d430d9a9">{"x":{"hc_opts":{"chart":{"reflow":true,"height":350},"title":{"text":"Creative economic contribution to Victoria","widthAdjust":-100,"style":{"font-size":"1.5rem"}},"yAxis":{"title":{"text":["round","gva_total/1000","1"],"enabled":false},"type":"linear","labels":{"format":"${text}B"},"min":25,"accessibility":{"enabled":true,"description":"creative industry economic contribution"}},"credits":{"enabled":false},"exporting":{"enabled":true,"allowHTML":true,"allowTableSorting":false,"accessibility":{"enabled":true,"keyboardNavigation":{"enabled":true}},"buttons":{"contextButton":{"menuItems":["viewFullscreen","viewData","separator","downloadPNG","downloadSVG","downloadCSV"]}},"csv":{"dateFormat":"%B %Y"},"chartOptions":{"title":{"style":{"fontFamily":"Arial"}},"subtitle":{"style":{"fontFamily":"Arial"}},"legend":{"enabled":true,"itemStyle":{"fontFamily":"Arial"}},"xAxis":{"labels":{"style":{"fontFamily":"Arial"}}},"yAxis":{"labels":{"style":{"fontFamily":"Arial"}}},"caption":{"style":{"fontFamily":"Arial"}},"chart":{"style":{"fontFamily":"Arial"}}}},"boost":{"enabled":false},"plotOptions":{"series":{"label":{"enabled":false},"turboThreshold":0,"showInLegend":true,"pointPlacement":"on"},"treemap":{"layoutAlgorithm":"squarified"},"scatter":{"marker":{"symbol":"circle"}},"area":{"stacking":"normal"}},"series":[{"name":"Creative industry economic contribution","data":[{"fy_start":2016,"date":"2016-01-01","gva_cc":19684,"gva_embed":10612,"gva_total":30296.00994448622,"gva_cc_growth_1yr":7.6,"fy":"2016-17","y":30.3,"name":"2016-17"},{"fy_start":2017,"date":"2017-01-01","gva_cc":21116,"gva_embed":10841,"gva_total":31956.18381372947,"gva_cc_growth_1yr":5.5,"fy":"2017-18","y":32,"name":"2017-18"},{"fy_start":2018,"date":"2018-01-01","gva_cc":22908,"gva_embed":11739,"gva_total":34646.91936184453,"gva_cc_growth_1yr":8.4,"fy":"2018-19","y":34.6,"name":"2018-19"},{"fy_start":2019,"date":"2019-01-01","gva_cc":22827,"gva_embed":11891,"gva_total":34718.21532295008,"gva_cc_growth_1yr":0.2,"fy":"2019-20","y":34.7,"name":"2019-20"},{"fy_start":2020,"date":"2020-01-01","gva_cc":24299,"gva_embed":12328,"gva_total":36626.9285267552,"gva_cc_growth_1yr":5.5,"fy":"2020-21","y":36.6,"name":"2020-21"},{"fy_start":2021,"date":"2021-01-01","gva_cc":25684,"gva_embed":13930,"gva_total":39613.91450874028,"gva_cc_growth_1yr":8.199999999999999,"fy":"2021-22","y":39.6,"name":"2021-22"},{"fy_start":2022,"date":"2022-01-01","gva_cc":26530,"gva_embed":13795,"gva_total":40325.41080761055,"gva_cc_growth_1yr":1.8,"fy":"2022-23","y":40.3,"name":"2022-23"}],"type":"area","accessibility":{"enabled":true,"description":"this chart shows creative GVA over previous financial years"}}],"xAxis":{"type":"category","title":{},"tickmarkPlacement":"on","accessibility":{"enabled":true,"description":"financial year"}},"tooltip":{"valuePrefix":"$","valueSuffix":"B"},"caption":{"text":"Economic contribution is measured in gross value add in billions of dollars."},"legend":{"enabled":false},"colors":["#92278F"]},"theme":{"chart":{"backgroundColor":"#61C2EE"},"title":{"align":"left","style":{"color":"#1D184B","fontFamily":"VIC-Regular","font-weight":"bold","font-size":"2rem","background-color":"#1D184B"}},"subtitle":{"align":"left","style":{"color":"#1D184B","fontFamily":"VIC-Regular","font-size":"var(--bs-body-font-size)"}},"legend":{"itemStyle":{"fontFamily":"VIC-Regular","color":"#1D184B"},"itemHoverStyle":{"color":"gray"}},"xAxis":{"labels":{"style":{"color":"#1D184B","fontFamily":"VIC-Light","font-size":"11px"}},"title":{"align":"high","style":{"color":"#1D184B","font-size":"11px"}},"lineWidth":1,"lineColor":"#1D184B","tickPosition":"outside","tickColor":"#1D184B","tickWidth":1,"tickLength":4},"yAxis":{"labels":{"useHTML":true,"style":{"color":"#1D184B","fontFamily":"VIC-Light","font-size":"11px"},"y":5},"title":{"align":"high","style":{"color":"#1D184B","font-size":"11px"}},"minorGridLineWidth":0,"majorGridLineWidth":1,"lineWidth":0,"lineColor":"transparent","opposite":false},"caption":{"style":{"color":"#1D184B"}},"series":{"line":{"lineWidth":4},"spline":{"lineWidth":4},"area":{"lineWidth":4,"fillOpacity":0.4,"marker":{"enabled":false,"symbol":"circle","radius":2,"states":{"hover":{"enabled":true}}}}}},"conf_opts":{"global":{"Date":null,"VMLRadialGradientURL":"http =//code.highcharts.com/list(version)/gfx/vml-radial-gradient.png","canvasToolsURL":"http =//code.highcharts.com/list(version)/modules/canvas-tools.js","getTimezoneOffset":null,"timezoneOffset":0,"useUTC":true},"lang":{"contextButtonTitle":"Chart context menu","decimalPoint":".","downloadCSV":"Download CSV","downloadJPEG":"Download JPEG image","downloadPDF":"Download PDF document","downloadPNG":"Download PNG image","downloadSVG":"Download SVG vector image","downloadXLS":"Download XLS","drillUpText":"◁ Back to {series.name}","exitFullscreen":"Exit from full screen","exportData":{"annotationHeader":"Annotations","categoryDatetimeHeader":"DateTime","categoryHeader":"Category"},"hideData":"Hide data table","invalidDate":null,"loading":"Loading...","months":["January","February","March","April","May","June","July","August","September","October","November","December"],"noData":"No data to display","numericSymbolMagnitude":1000,"numericSymbols":["k","M","G","T","P","E"],"printChart":"Print chart","resetZoom":"Reset zoom","resetZoomTitle":"Reset zoom level 1:1","shortMonths":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"shortWeekdays":["Sat","Sun","Mon","Tue","Wed","Thu","Fri"],"thousandsSep":" ","viewData":"View data table","viewFullscreen":"View in full screen","weekdays":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]}},"type":"chart","fonts":["Arial","VIC-Regular","VIC-Light"],"google_fonts":false,"debug":false},"evals":[],"jsHooks":[]}</script>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit 2e9bd28

Please sign in to comment.