Skip to content

Commit 3ee9558

Browse files
Release 3.0
- Adapted cookie system to save the last query made by the user. - Sharing the URL has more preference than the cookie. - Creating a global summary table (removing the regional summary table). - Replacement of the regional graph by a box plot (data from the temporal and regional dataitems are mapped). - Creation of a dynamic map by region/province/Spain, using the values of the analysis. Possibility of plotting data as average,max,min,median,q1,q3. - Possibility to show/hide panels by the user. - Dropdown to choose the sub-data of each INE dataitem and represent it on the map. - Default representation: daily cases in Spain, showing each region on the map with the cases of each one. It is only applied when it has not been accessed from a shared URL and when there is no associated cookie. - UI optimization.
1 parent 569ae62 commit 3ee9558

14 files changed

+1223
-212
lines changed

assets/convida_dict.json

Lines changed: 56 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,49 @@
3636
"EN": "Add Spain"
3737
},
3838
"regions_label": {
39-
"ES": "Regiones",
40-
"EN": "Regions"
39+
"ES": "Comunidades Autónomas",
40+
"EN": "Autonomous Communities"
4141
},
4242
"provinces_label": {
4343
"ES": "Provincias",
4444
"EN": "Provinces"
4545
},
46+
"filter_label": {
47+
"ES": "Mostrar por:",
48+
"EN": "Show by:"
49+
},
50+
"measure_label": {
51+
"ES": "Medida:",
52+
"EN": "Measure:"
53+
},
54+
"mean_label": {
55+
"ES": "media",
56+
"EN": "mean"
57+
},
58+
"max_label": {
59+
"ES": "límite superior",
60+
"EN": "upper limit"
61+
},
62+
"min_label": {
63+
"ES": "límite inferior",
64+
"EN": "lower limit"
65+
},
66+
"q1_label": {
67+
"ES": "percentil 25",
68+
"EN": "percentile 25"
69+
},
70+
"median_label": {
71+
"ES": "mediana",
72+
"EN": "median"
73+
},
74+
"q3_label": {
75+
"ES": "percentil 75",
76+
"EN": "percentile 75"
77+
},
78+
"spain_label": {
79+
"ES": "España",
80+
"EN": "Spain"
81+
},
4682
"covid19_data_label": {
4783
"ES": "Datos de COVID19",
4884
"EN": "COVID19 data"
@@ -123,6 +159,10 @@
123159
"ES": "Compartir",
124160
"EN": "Share"
125161
},
162+
"eye": {
163+
"ES": "Mostrar/Ocultar",
164+
"EN": "Show/Hide"
165+
},
126166
"temporal_visualization_label": {
127167
"ES": "Visualización temporal",
128168
"EN": "Temporal visualization"
@@ -191,6 +231,14 @@
191231
"ES": "Tabla resumen",
192232
"EN": "Summary table"
193233
},
234+
"map_dataitems_label": {
235+
"ES": "Datos seleccionados",
236+
"EN": "Selected data"
237+
},
238+
"select_type_dataitem": {
239+
"ES": "Selecciona el dataitem a mostrar",
240+
"EN": "Select the dataitem to display"
241+
},
194242
"legend": {
195243
"ES": "Leyenda",
196244
"EN": "Legend"
@@ -240,8 +288,12 @@
240288
"EN": "https://en.wikipedia.org/wiki/Median"
241289
},
242290
"footer_1": {
243-
"ES": "Proyecto desarrollado por el CyberDataLab de la Universidad de Murcia",
244-
"EN": "Project developed by the CyberDataLab at the University of Murcia (Spain)"
291+
"ES": "Proyecto desarrollado por el ",
292+
"EN": "Project developed by the "
293+
},
294+
"footer_1_1": {
295+
"ES": " de la Universidad de Murcia",
296+
"EN": " at the University of Murcia (Spain)"
245297
},
246298
"footer_2": {
247299
"ES": "Contacte con nosotros a través de ",

assets/css/s1.css

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
}
5959

6060
/* For devices larger than 550px --- 780px */
61-
@media (min-width: 1000px) {
61+
@media (min-width: 1350px) {
6262
.container {
6363
width: 80%;
6464
}
@@ -107,10 +107,14 @@
107107
}
108108

109109
.one-third.column {
110-
width: 30.6666666667%;
110+
width: 36.6666666667%;
111111
text-align: center;
112112
padding: 10px;
113113
}
114+
#cyber-umu-logos{
115+
width: 50%;
116+
}
117+
114118
.two-thirds.column {
115119
width: 65.3333333333%;
116120
}
@@ -550,7 +554,7 @@ there.
550554
}
551555

552556
/* Larger than phablet (also point when grid becomes active), screen larger than 550px */
553-
@media (min-width: 1000px) {
557+
@media (min-width: 1350px) {
554558
/* 8% default */
555559
.one.column,
556560
.one.columns {
@@ -578,7 +582,7 @@ there.
578582
}
579583

580584
/* Larger than tablet, for screens smaller than 768px */
581-
@media (max-width: 1000px) {
585+
@media (max-width: 1350px) {
582586
.flex-display {
583587
display: block !important;
584588
}
@@ -589,6 +593,12 @@ there.
589593
margin: 0 !important;
590594
margin-bottom: 25px !important;
591595
}
596+
#cyberdatalab-a {
597+
margin-right: 20px;
598+
}
599+
#umu-a {
600+
margin-left: 20px;
601+
}
592602
.container-display {
593603
display: flex;
594604
}
@@ -633,6 +643,22 @@ there.
633643
margin-bottom: 20px;
634644
}
635645

646+
#regional-wrap-container {
647+
display: block !important;
648+
}
649+
.pretty_container.graph {
650+
width: 100% !important;
651+
}
652+
.pretty_container.map {
653+
width: 100% !important;
654+
}
655+
#graph-settings-container-regional-left {
656+
display: none !important;
657+
}
658+
#graph-settings-container-regional-right {
659+
width: 100% !important;
660+
}
661+
636662
}
637663

638664
@media (max-width: 810px) {
@@ -643,7 +669,7 @@ there.
643669
}
644670

645671
/* Larger than desktop */
646-
@media (min-width: 1000px) {
672+
@media (min-width: 1350px) {
647673
}
648674

649675
/* Larger than Desktop HD */

assets/css/styles.css

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ body {
1818
#last_update {
1919
float:right;
2020
margin-right: 20px;
21-
margin-top: 8px;
21+
margin-top: 13px;
2222
}
2323
#last_update h6 {
2424
font-size: small;
2525
margin-bottom: 0;
2626
}
2727
.lang_button, .help_button {
2828
float: right;
29-
height: 25px;
29+
height: 30px;
3030
margin: 5px 10px 10px 0px;
3131
cursor: pointer;
3232
}
@@ -40,6 +40,21 @@ body {
4040
box-shadow: 2px 2px 2px lightgrey;
4141
}
4242

43+
.pretty_container.graph {
44+
width: 48%;
45+
}
46+
.pretty_container.map {
47+
width: 48%;
48+
}
49+
50+
.pretty_container_regional {
51+
border-radius: 5px;
52+
background-color: #f9f9f9;
53+
margin: 3px 10px 10px 10px;
54+
padding: 15px;
55+
position: relative;
56+
}
57+
4358
.bare_container {
4459
margin: 0 0 0 0;
4560
padding: 0 0 0 0;
@@ -57,10 +72,16 @@ body {
5772

5873
.control_label {
5974
padding: 10px 10px 0px 10px;
60-
width: calc(100% - 40px);
75+
/*width: calc(100% - 40px);*/
6176
font-weight: bold;
6277
}
6378

79+
.eye-icon {
80+
height: 15px;
81+
margin-left: 10px;
82+
cursor: pointer;
83+
}
84+
6485
.rc-slider {
6586
margin-left: 0px;
6687
padding-left: 0px;
@@ -257,6 +278,10 @@ body {
257278
.dash-table-container .dash-spreadsheet-container .dash-spreadsheet-inner td.focused {
258279
}
259280

281+
.dash-dropdown {
282+
line-height: 1;
283+
}
284+
260285
#button_show_more {
261286
float: right;
262287
text-transform: none;
@@ -283,4 +308,12 @@ body {
283308
/*text-align: left !important;*/
284309
border: 1px solid #e4e4e4;
285310
border-radius: 5px;
311+
}
312+
313+
#map {
314+
margin-left: 10px;
315+
}
316+
317+
#regional_graph {
318+
margin-right: 10px;
286319
}

assets/img/convida-frontend-es.png

800 KB
Loading

assets/img/cyberdatalab-logo.png

27.5 KB
Loading

assets/img/eye-dis.svg

Lines changed: 1 addition & 0 deletions
Loading

assets/img/eye-ena.svg

Lines changed: 1 addition & 0 deletions
Loading

assets/img/share.png

0 Bytes
Loading

assets/maps/europe.json

Lines changed: 57 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)