diff --git a/src/charts/areachart-original.vl.json b/src/charts/areachart-original.vl.json index e88d323..db7c6c4 100644 --- a/src/charts/areachart-original.vl.json +++ b/src/charts/areachart-original.vl.json @@ -5,8 +5,8 @@ "fontSize": 16, "fontWeight": "bold" }, - "width": 500, - "height": 300, + "width": "container", + "height": 400, "data": { "values": [ { @@ -120,7 +120,9 @@ "type": "temporal", "title": null, "axis": { - "grid": true + "grid": true, + "tickCount": 4, + "labelExpr": "timeFormat(datum.value, '%b %Y')" } }, "y": { diff --git a/src/charts/areachart-ukrainian.vl.json b/src/charts/areachart-ukrainian.vl.json index 0b2c6ac..5c2856a 100644 --- a/src/charts/areachart-ukrainian.vl.json +++ b/src/charts/areachart-ukrainian.vl.json @@ -5,8 +5,8 @@ "fontSize": 16, "fontWeight": "bold" }, - "width": 500, - "height": 300, + "width": "container", + "height": 400, "data": { "values": [ { @@ -120,7 +120,9 @@ "type": "temporal", "title": null, "axis": { - "grid": true + "grid": true, + "tickCount": 4, + "labelExpr": "timeFormat(datum.value, '%b %Y')" } }, "y": { @@ -130,6 +132,11 @@ "axis": { "titleFontWeight": "bold", "grid": true + }, + "stack": null, + "scale": { + "zero": false, + "domainMin": 0.5 } }, "tooltip": [ diff --git a/src/charts/barchart-ukrainian.vl.json b/src/charts/barchart-ukrainian.vl.json index 7a43dde..a7e2767 100644 --- a/src/charts/barchart-ukrainian.vl.json +++ b/src/charts/barchart-ukrainian.vl.json @@ -9,7 +9,7 @@ "url": "data/barchart.csv", "format": {"type": "csv"} }, "width": "container", - "height": "container", + "height": 400, "mark": { "type": "bar" }, @@ -32,6 +32,9 @@ "title": "Швидкість інтернету (МБіт/с)", "titleFontWeight": "bold", "grid": true + }, + "scale": { + "zero": true } } } diff --git a/src/charts/bubblechart-original.vl.json b/src/charts/bubblechart-original.vl.json index 5d74063..6927623 100644 --- a/src/charts/bubblechart-original.vl.json +++ b/src/charts/bubblechart-original.vl.json @@ -5,7 +5,7 @@ "fontSize": 16, "fontWeight": "bold" }, - "width": 400, + "width": "container", "height": 400, "data": { "url": "data/bubblechart.csv" diff --git a/src/charts/bubblechart-ukrainian.vl.json b/src/charts/bubblechart-ukrainian.vl.json index 2223749..a111fd2 100644 --- a/src/charts/bubblechart-ukrainian.vl.json +++ b/src/charts/bubblechart-ukrainian.vl.json @@ -5,7 +5,7 @@ "fontSize": 16, "fontWeight": "bold" }, - "width": 400, + "width": "container", "height": 400, "data": { "url": "data/bubblechart.csv" diff --git a/src/charts/choropleth-ukrainian.vl.json b/src/charts/choropleth-ukrainian.vl.json index 6e3d3d9..102101a 100644 --- a/src/charts/choropleth-ukrainian.vl.json +++ b/src/charts/choropleth-ukrainian.vl.json @@ -1,7 +1,7 @@ { "$schema": "https://vega.github.io/schema/vega-lite/v5.json", - "height": 300, - "width": 600, + "height": 500, + "width": "container", "title": "Кількість шлюбів в першому півріччі 2024 р.", "config": { "padding": 0, diff --git a/src/charts/histogram-original.vl.json b/src/charts/histogram-original.vl.json index 18328ee..7e2c594 100644 --- a/src/charts/histogram-original.vl.json +++ b/src/charts/histogram-original.vl.json @@ -6,7 +6,7 @@ "fontWeight": "bold" }, "width": "container", - "height": 300, + "height": 400, "data": { "url": "data/histogram.csv" }, diff --git a/src/charts/histogram-ukrainian.vl.json b/src/charts/histogram-ukrainian.vl.json index 7351d11..7428480 100644 --- a/src/charts/histogram-ukrainian.vl.json +++ b/src/charts/histogram-ukrainian.vl.json @@ -5,8 +5,8 @@ "fontSize": 16, "fontWeight": "bold" }, - "width": 500, - "height": 300, + "width": "container", + "height": 400, "data": { "url": "data/histogram.csv" }, diff --git a/src/charts/linechart-ukrainian.vl.json b/src/charts/linechart-ukrainian.vl.json index 709a571..a899d74 100644 --- a/src/charts/linechart-ukrainian.vl.json +++ b/src/charts/linechart-ukrainian.vl.json @@ -1,6 +1,6 @@ { "$schema": "https://vega.github.io/schema/vega-lite/v5.json", - "width": 600, + "width": "container", "height": 400, "title": "Ціни на нафту", "data": { diff --git a/src/charts/piechart-original.vl.json b/src/charts/piechart-original.vl.json index e743da3..85d8ec8 100644 --- a/src/charts/piechart-original.vl.json +++ b/src/charts/piechart-original.vl.json @@ -12,7 +12,7 @@ "titleFontWeight": "bold" } }, - "width": "container", "height": 300, + "width": "container", "height": 400, "data": { "values": [ {"brand": "Samsung", "share": 17.6}, diff --git a/src/charts/piechart-ukrainian.vl.json b/src/charts/piechart-ukrainian.vl.json index 120897d..6bf49c4 100644 --- a/src/charts/piechart-ukrainian.vl.json +++ b/src/charts/piechart-ukrainian.vl.json @@ -12,7 +12,7 @@ "titleFontWeight": "bold" } }, - "width": 500, "height": 300, + "width": "container", "height": 400, "data": { "values": [ {"brand": "Samsung", "share": 17.6}, diff --git a/src/charts/scatterplot-ukrainian.vl.json b/src/charts/scatterplot-ukrainian.vl.json index d96039b..4adb613 100644 --- a/src/charts/scatterplot-ukrainian.vl.json +++ b/src/charts/scatterplot-ukrainian.vl.json @@ -5,7 +5,7 @@ "fontSize": 16, "fontWeight": "bold" }, - "width": 400, + "width": "container", "height": 400, "data": { "url": "data/scatterplot.csv" diff --git a/src/charts/stacked100-ukrainian.vl.json b/src/charts/stacked100-ukrainian.vl.json index 173870d..497a22d 100644 --- a/src/charts/stacked100-ukrainian.vl.json +++ b/src/charts/stacked100-ukrainian.vl.json @@ -8,8 +8,8 @@ "data": { "url": "data/stacked100.csv" }, - "width": 500, - "height": 300, + "width": "container", + "height": 400, "encoding": { "y": { "field": "value", @@ -49,6 +49,11 @@ "title": "Медалі", "orient": "right" } + }, + "order": { + "field": "order", + "type": "quantitative", + "sort": "ascending" } }, "mark": "bar", @@ -69,9 +74,8 @@ "as": "category" }, { - "sort": [ - {"field": "category", "order": "descending"} - ] + "calculate": "datum.category === 'Gold' ? 1 : datum.category === 'Silver' ? 2 : 3", + "as": "order" } ], "config": { diff --git a/src/charts/stackedareachart-original.vl.json b/src/charts/stackedareachart-original.vl.json index 4d79b80..a5acd55 100644 --- a/src/charts/stackedareachart-original.vl.json +++ b/src/charts/stackedareachart-original.vl.json @@ -6,7 +6,7 @@ "fontWeight": "bold" }, "width": "container", - "height": 500, + "height": 400, "data": { "values": [ { diff --git a/src/charts/stackedareachart-ukrainian.vl.json b/src/charts/stackedareachart-ukrainian.vl.json index 11b492c..dff2bc5 100644 --- a/src/charts/stackedareachart-ukrainian.vl.json +++ b/src/charts/stackedareachart-ukrainian.vl.json @@ -5,7 +5,7 @@ "fontSize": 16, "fontWeight": "bold" }, - "width": 400, + "width": "container", "height": 400, "data": { "values": [ diff --git a/src/charts/stackedbarchart-ukrainian.vl.json b/src/charts/stackedbarchart-ukrainian.vl.json index 9754db1..f9b5c50 100644 --- a/src/charts/stackedbarchart-ukrainian.vl.json +++ b/src/charts/stackedbarchart-ukrainian.vl.json @@ -6,8 +6,8 @@ "data": { "url": "data/stackedbarchart.csv" }, - "width": 500, - "height": 300, + "width": "container", + "height": 400, "encoding": { "x": { "field": "CityUK", @@ -24,7 +24,9 @@ "axis": { "title": "Ціна ($)", "titleFontWeight": "bold", - "grid": true + "grid": true, + "gridDash": [1, 0], + "tickCount": 15 }, "scale": { "domain": [ @@ -38,18 +40,18 @@ "type": "nominal", "scale": { "domain": [ - "Sandwich", - "Water", - "Peanut", + "Vodka", "Soda", - "Vodka" + "Peanut", + "Water", + "Sandwich" ], "range": [ + "#386cb0", "#7fc97f", "#beaed4", "#fdc086", - "#fb9a99", - "#386cb0" + "#fb9a99" ] }, "legend": { @@ -57,6 +59,11 @@ "orient": "right", "labelExpr": "datum.label == 'Sandwich' ? 'Сендвіч' : datum.label == 'Water' ? 'Вода' : datum.label == 'Peanut' ? 'Арахіс' : datum.label == 'Soda' ? 'Газована вода' : 'Горілка'" } + }, + "order": { + "field": "order", + "type": "quantitative", + "sort": "descending" } }, "mark": "bar", @@ -73,6 +80,10 @@ "category", "value" ] + }, + { + "calculate": "datum.category === 'Vodka' ? 1 : datum.category === 'Soda' ? 2 : datum.category === 'Peanut' ? 3 : datum.category === 'Water' ? 4 : 5", + "as": "order" } ], "config": { diff --git a/src/js/quiz.js b/src/js/quiz.js index 493585c..04e5801 100644 --- a/src/js/quiz.js +++ b/src/js/quiz.js @@ -44,7 +44,7 @@ document.addEventListener('DOMContentLoaded', function () { // Check if there is a completed quiz const allQuizzes = JSON.parse(localStorage.getItem('allQuizzes') || '{}'); if (allQuizzes[quizId] && allQuizzes[quizId].completed) { - alert("You have already completed the quiz. Redirecting to the questionnaire."); + alert("Ви вже пройшли дослідження. Дякуємо! Перенаправлення на головну сторінку тесту."); window.location.href = 'index.html'; return; }