Skip to content

Commit

Permalink
Release 3.0
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
enriquetomasmb authored Jan 18, 2021
1 parent 569ae62 commit 3ee9558
Show file tree
Hide file tree
Showing 14 changed files with 1,223 additions and 212 deletions.
60 changes: 56 additions & 4 deletions assets/convida_dict.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,49 @@
"EN": "Add Spain"
},
"regions_label": {
"ES": "Regiones",
"EN": "Regions"
"ES": "Comunidades Autónomas",
"EN": "Autonomous Communities"
},
"provinces_label": {
"ES": "Provincias",
"EN": "Provinces"
},
"filter_label": {
"ES": "Mostrar por:",
"EN": "Show by:"
},
"measure_label": {
"ES": "Medida:",
"EN": "Measure:"
},
"mean_label": {
"ES": "media",
"EN": "mean"
},
"max_label": {
"ES": "límite superior",
"EN": "upper limit"
},
"min_label": {
"ES": "límite inferior",
"EN": "lower limit"
},
"q1_label": {
"ES": "percentil 25",
"EN": "percentile 25"
},
"median_label": {
"ES": "mediana",
"EN": "median"
},
"q3_label": {
"ES": "percentil 75",
"EN": "percentile 75"
},
"spain_label": {
"ES": "España",
"EN": "Spain"
},
"covid19_data_label": {
"ES": "Datos de COVID19",
"EN": "COVID19 data"
Expand Down Expand Up @@ -123,6 +159,10 @@
"ES": "Compartir",
"EN": "Share"
},
"eye": {
"ES": "Mostrar/Ocultar",
"EN": "Show/Hide"
},
"temporal_visualization_label": {
"ES": "Visualización temporal",
"EN": "Temporal visualization"
Expand Down Expand Up @@ -191,6 +231,14 @@
"ES": "Tabla resumen",
"EN": "Summary table"
},
"map_dataitems_label": {
"ES": "Datos seleccionados",
"EN": "Selected data"
},
"select_type_dataitem": {
"ES": "Selecciona el dataitem a mostrar",
"EN": "Select the dataitem to display"
},
"legend": {
"ES": "Leyenda",
"EN": "Legend"
Expand Down Expand Up @@ -240,8 +288,12 @@
"EN": "https://en.wikipedia.org/wiki/Median"
},
"footer_1": {
"ES": "Proyecto desarrollado por el CyberDataLab de la Universidad de Murcia",
"EN": "Project developed by the CyberDataLab at the University of Murcia (Spain)"
"ES": "Proyecto desarrollado por el ",
"EN": "Project developed by the "
},
"footer_1_1": {
"ES": " de la Universidad de Murcia",
"EN": " at the University of Murcia (Spain)"
},
"footer_2": {
"ES": "Contacte con nosotros a través de ",
Expand Down
36 changes: 31 additions & 5 deletions assets/css/s1.css
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}

/* For devices larger than 550px --- 780px */
@media (min-width: 1000px) {
@media (min-width: 1350px) {
.container {
width: 80%;
}
Expand Down Expand Up @@ -107,10 +107,14 @@
}

.one-third.column {
width: 30.6666666667%;
width: 36.6666666667%;
text-align: center;
padding: 10px;
}
#cyber-umu-logos{
width: 50%;
}

.two-thirds.column {
width: 65.3333333333%;
}
Expand Down Expand Up @@ -550,7 +554,7 @@ there.
}

/* Larger than phablet (also point when grid becomes active), screen larger than 550px */
@media (min-width: 1000px) {
@media (min-width: 1350px) {
/* 8% default */
.one.column,
.one.columns {
Expand Down Expand Up @@ -578,7 +582,7 @@ there.
}

/* Larger than tablet, for screens smaller than 768px */
@media (max-width: 1000px) {
@media (max-width: 1350px) {
.flex-display {
display: block !important;
}
Expand All @@ -589,6 +593,12 @@ there.
margin: 0 !important;
margin-bottom: 25px !important;
}
#cyberdatalab-a {
margin-right: 20px;
}
#umu-a {
margin-left: 20px;
}
.container-display {
display: flex;
}
Expand Down Expand Up @@ -633,6 +643,22 @@ there.
margin-bottom: 20px;
}

#regional-wrap-container {
display: block !important;
}
.pretty_container.graph {
width: 100% !important;
}
.pretty_container.map {
width: 100% !important;
}
#graph-settings-container-regional-left {
display: none !important;
}
#graph-settings-container-regional-right {
width: 100% !important;
}

}

@media (max-width: 810px) {
Expand All @@ -643,7 +669,7 @@ there.
}

/* Larger than desktop */
@media (min-width: 1000px) {
@media (min-width: 1350px) {
}

/* Larger than Desktop HD */
Expand Down
39 changes: 36 additions & 3 deletions assets/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ body {
#last_update {
float:right;
margin-right: 20px;
margin-top: 8px;
margin-top: 13px;
}
#last_update h6 {
font-size: small;
margin-bottom: 0;
}
.lang_button, .help_button {
float: right;
height: 25px;
height: 30px;
margin: 5px 10px 10px 0px;
cursor: pointer;
}
Expand All @@ -40,6 +40,21 @@ body {
box-shadow: 2px 2px 2px lightgrey;
}

.pretty_container.graph {
width: 48%;
}
.pretty_container.map {
width: 48%;
}

.pretty_container_regional {
border-radius: 5px;
background-color: #f9f9f9;
margin: 3px 10px 10px 10px;
padding: 15px;
position: relative;
}

.bare_container {
margin: 0 0 0 0;
padding: 0 0 0 0;
Expand All @@ -57,10 +72,16 @@ body {

.control_label {
padding: 10px 10px 0px 10px;
width: calc(100% - 40px);
/*width: calc(100% - 40px);*/
font-weight: bold;
}

.eye-icon {
height: 15px;
margin-left: 10px;
cursor: pointer;
}

.rc-slider {
margin-left: 0px;
padding-left: 0px;
Expand Down Expand Up @@ -257,6 +278,10 @@ body {
.dash-table-container .dash-spreadsheet-container .dash-spreadsheet-inner td.focused {
}

.dash-dropdown {
line-height: 1;
}

#button_show_more {
float: right;
text-transform: none;
Expand All @@ -283,4 +308,12 @@ body {
/*text-align: left !important;*/
border: 1px solid #e4e4e4;
border-radius: 5px;
}

#map {
margin-left: 10px;
}

#regional_graph {
margin-right: 10px;
}
Binary file added assets/img/convida-frontend-es.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/cyberdatalab-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/img/eye-dis.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/img/eye-ena.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/img/share.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions assets/maps/europe.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/maps/spain-communities.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/maps/spain-provinces.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion log/update.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
05-08-2020, 04:02 (GMT+1)
18-01-2021, 04:02 (GMT+1)
Loading

0 comments on commit 3ee9558

Please sign in to comment.