Merge pull request #90 from covid19cuba/release/v0.3.1

Release v0.3.1
covid19cuba · Apr 4, 2020 · 22a57f9 · 22a57f9
2 parents 16c69a4 + 29bb70c
commit 22a57f9
Show file tree

Hide file tree

Showing 20 changed files with 152 additions and 146 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Covid19 Cuba Data Mobile Application Changelog
 
+## [0.3.1] - April 4, 2020 
+
+### Changed
+
+* Default comparison entity
+* Size of samples images of Gallery
+
+### Fixed
+
+* Bug in top tables
+
 ## [0.3.0] - April 2, 2020 
 
 ### Added

diff --git a/GALLERY.md b/GALLERY.md
@@ -1,25 +1,9 @@
 # Covid19 Cuba Data Mobile Application Gallery
 
-![Image 1](gallery/image_1.jpg)
+![Image 1](gallery/image_1.jpg) ![Image 2](gallery/image_2.jpg) ![Image 3](gallery/image_3.jpg)
 
-![Image 2](gallery/image_2.jpg)
+![Image 4](gallery/image_4.jpg) ![Image 5](gallery/image_5.jpg) ![Image 6](gallery/image_6.jpg)
 
-![Image 3](gallery/image_3.jpg)
+![Image 7](gallery/image_7.jpg) ![Image 8](gallery/image_8.jpg) ![Image 9](gallery/image_9.jpg)
 
-![Image 4](gallery/image_4.jpg)
-
-![Image 5](gallery/image_5.jpg)
-
-![Image 6](gallery/image_6.jpg)
-
-![Image 7](gallery/image_7.jpg)
-
-![Image 8](gallery/image_8.jpg)
-
-![Image 9](gallery/image_9.jpg)
-
-![Image 10](gallery/image_10.jpg)
-
-![Image 11](gallery/image_11.jpg)
-
-![Image 12](gallery/image_12.jpg)
+![Image 10](gallery/image_10.jpg) ![Image 11](gallery/image_11.jpg) ![Image 12](gallery/image_12.jpg)
diff --git a/gallery/image_1.jpg b/gallery/image_1.jpg
diff --git a/gallery/image_10.jpg b/gallery/image_10.jpg
diff --git a/gallery/image_11.jpg b/gallery/image_11.jpg
diff --git a/gallery/image_12.jpg b/gallery/image_12.jpg
diff --git a/gallery/image_2.jpg b/gallery/image_2.jpg
diff --git a/gallery/image_3.jpg b/gallery/image_3.jpg
diff --git a/gallery/image_4.jpg b/gallery/image_4.jpg
diff --git a/gallery/image_5.jpg b/gallery/image_5.jpg
diff --git a/gallery/image_6.jpg b/gallery/image_6.jpg
diff --git a/gallery/image_7.jpg b/gallery/image_7.jpg
diff --git a/gallery/image_8.jpg b/gallery/image_8.jpg
diff --git a/gallery/image_9.jpg b/gallery/image_9.jpg
diff --git a/lib/src/models/data_model.dart b/lib/src/models/data_model.dart
@@ -272,62 +272,68 @@ class DataModel {
   }
 
   List<Map<String, dynamic>> get top10Province {
-    var provs = Map<String, int>();
-    int total = 0;
+    var provinces = Map<String, int>();
     days
         .where((x) => x.diagnosed != null)
         .map((x) => x.diagnosed)
         .forEach((diagnosed) {
       diagnosed.forEach((item) {
-        if (provs.containsKey(item.detectionProvince)) {
-          ++provs[item.detectionProvince];
+        if (provinces.containsKey(item.detectionProvince)) {
+          ++provinces[item.detectionProvince];
         } else {
-          provs[item.detectionProvince] = 1;
+          provinces[item.detectionProvince] = 1;
         }
-        total+=1;
       });
     });
+    var total = provinces.values.reduce((a, b) => a + b);
     var result = List<Map<String, dynamic>>();
-    provs.forEach((k, v) { result.add({'Provincia': k, 'casos': v, 'total': total});});
-    result.sort((a,b)=> -(a['casos'].compareTo(b['casos'])));
-    var res =result.sublist(0,10);
-    int cont=1;
-    for(var item in res){
-      item.addEntries([MapEntry('index',cont)]);
-      cont+=1;
+    provinces.forEach((k, v) {
+      if (k != null) {
+        result.add({'province': k, 'cases': v, 'total': total});
+      }
+    });
+    result.sort((a, b) => b['cases'].compareTo(a['cases']));
+    result = result.take(10).toList();
+    var cont = 1;
+    for (var item in result) {
+      item.addEntries([MapEntry('index', cont)]);
+      cont += 1;
     }
-    return res;
+    return result;
   }
 
   List<Map<String, dynamic>> get top10Municipality {
-    var mun = Map<String, int>();
-    var mun2 = Map<String, String>();
-    int total = 0;
+    var municipalities = Map<String, int>();
+    var provinces = Map<String, String>();
     days
         .where((x) => x.diagnosed != null)
         .map((x) => x.diagnosed)
         .forEach((diagnosed) {
       diagnosed.forEach((item) {
-        if (mun.containsKey(item.detectionMunicipality)) {
-          ++mun[item.detectionMunicipality];
+        if (municipalities.containsKey(item.detectionMunicipality)) {
+          ++municipalities[item.detectionMunicipality];
         } else {
-          mun2[item.detectionMunicipality]=item.detectionProvince;
-          mun[item.detectionMunicipality] = 1;
+          provinces[item.detectionMunicipality] = item.detectionProvince;
+          municipalities[item.detectionMunicipality] = 1;
         }
-        total+=1;
       });
     });
+    var total = municipalities.values.reduce((a, b) => a + b);
     var result = List<Map<String, dynamic>>();
-    mun.forEach((k, v) { result.add({'Municipio': k, 'casos': v, 'total': total});});
-    result.sort((a,b)=> -(a['casos'].compareTo(b['casos'])));
-    var res =result.sublist(0,10);
-    int cont=1;
-    for(var item in res){
-      item.addEntries([MapEntry('index',cont)]);
-      item.addEntries([MapEntry('Provincia',mun2[item['Municipio']])]);
-      cont+=1;
+    municipalities.forEach((k, v) {
+      if (k != null) {
+        result.add({'municipality': k, 'cases': v, 'total': total});
+      }
+    });
+    result.sort((a, b) => b['cases'].compareTo(a['cases']));
+    result = result.take(10).toList();
+    var cont = 1;
+    for (var item in result) {
+      item.addEntries([MapEntry('index', cont)]);
+      item.addEntries([MapEntry('province', provinces[item['municipality']])]);
+      cont += 1;
     }
-    return res;
+    return result;
   }
 
   factory DataModel.fromJson(Map<String, dynamic> json) =>

diff --git a/lib/src/widgets/comparison_widget.dart b/lib/src/widgets/comparison_widget.dart
@@ -20,7 +20,7 @@ class ComparisonWidget extends StatefulWidget {
 }
 
 class ComparisonWidgetState extends State<ComparisonWidget> {
-  String selectedCountry = 'Greece';
+  String selectedCountry = 'Hungary';
   final DataModel data;
   final WorldTotalsModel countries;
 

diff --git a/lib/src/widgets/home_widget.dart b/lib/src/widgets/home_widget.dart
@@ -89,15 +89,15 @@ class HomeWidget extends StatelessWidget {
           margin: EdgeInsets.only(left: 5, right: 5, top: 5),
           child: Card(
             child: Container(
-              child: TableData(data: data, infoToShow: 'Provincia'),
+              child: TableData(data: data, infoToShow: 'province'),
             ),
           ),
         ),
         Container(
           margin: EdgeInsets.only(left: 5, right: 5, top: 5),
           child: Card(
             child: Container(
-              child: TableData(data: data, infoToShow: 'Municipio'),
+              child: TableData(data: data, infoToShow: 'municipality'),
             ),
           ),
         ),

diff --git a/lib/src/widgets/tables_widget.dart b/lib/src/widgets/tables_widget.dart
@@ -17,15 +17,12 @@ class TableData extends StatelessWidget {
       color: Constants.primaryColor,
       width: 1,
     );
-    List<Map<String, dynamic>> topData = List<Map<String, dynamic>>();
-    String title = '';
-    if (infoToShow == 'Provincia') {
-      topData = data.top10Province;
-      title = 'Provincias';
-    }
-    if (infoToShow == 'Municipio') {
-      topData = data.top10Municipality;
-      title = 'Municipios';
+    var title = infoToShow == 'municipality' ? 'Municipios' : 'Provincias';
+    var topData = infoToShow == 'municipality'
+        ? data.top10Municipality
+        : data.top10Province;
+    if (topData == null || topData.length == 0) {
+      return Container();
     }
     Map<int, TableColumnWidth> col = {
       0: FlexColumnWidth(0.3),
@@ -43,7 +40,7 @@ class TableData extends StatelessWidget {
                     margin: EdgeInsets.all(15),
                     child: Center(
                       child: Text(
-                        'TOP10 $title ${infoToShow == 'Municipio' ? "Afectados" : "Afectadas"}',
+                        'TOP${topData.length} $title ${infoToShow == 'municipality' ? "Afectados" : "Afectadas"}',
                         style: TextStyle(
                           color: Constants.primaryColor,
                           fontWeight: FontWeight.bold,
@@ -60,93 +57,101 @@ class TableData extends StatelessWidget {
         Table(
           columnWidths: col,
           border: TableBorder(horizontalInside: borderSide),
-          children: [TableRow(
-            children: [
-              TableCell(
-                child: Container(
-                  margin: EdgeInsets.all(10),
-                  child: Text(
-                    '#',
-                    style: TextStyle(
-                      color: Constants.primaryColor,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-              ),
-              TableCell(
-                child: Container(
-                  alignment: Alignment.centerLeft,
-                  margin: EdgeInsets.all(10),
-                  child: Text(
-                    infoToShow,
-                    style: TextStyle(
-                      color: Constants.primaryColor,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-              ),
-              TableCell(
-                child: Container(
-                  margin: EdgeInsets.all(10),
-                  child: Center(
-                    child: Text(
-                      '% del total',
-                      style: TextStyle(
-                        color: Constants.primaryColor,
-                        fontWeight: FontWeight.bold,
+          children: [
+                TableRow(
+                  children: [
+                    TableCell(
+                      child: Container(
+                        margin: EdgeInsets.all(10),
+                        child: Text(
+                          '#',
+                          style: TextStyle(
+                            color: Constants.primaryColor,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
                       ),
                     ),
-                  ),
-                ),
-              ),
-            ],
-          )] + topData.map((key) {
-            return TableRow(
-              children: [
-                TableCell(
-                  child: Container(
-                    margin: EdgeInsets.all(10),
-                    child: Text(
-                      '${key['index']}',
-                      style: TextStyle(
-                        color: Constants.primaryColor,
-                        fontWeight: FontWeight.normal,
+                    TableCell(
+                      child: Container(
+                        alignment: Alignment.centerLeft,
+                        margin: EdgeInsets.all(10),
+                        child: Text(
+                          title,
+                          style: TextStyle(
+                            color: Constants.primaryColor,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
                       ),
                     ),
-                  ),
-                ),
-                TableCell(
-                  child: Container(
-                    alignment: Alignment.centerLeft,
-                    margin: EdgeInsets.all(10),
-                    child: Text(
-                      '${key[infoToShow]} ${infoToShow == 'Municipio' ? "(" + key['Provincia'] + ")" : ""}',
-                      style: TextStyle(
-                        color: Constants.primaryColor,
-                        fontWeight: FontWeight.normal,
+                    TableCell(
+                      child: Container(
+                        margin: EdgeInsets.all(10),
+                        child: Center(
+                          child: Text(
+                            '% del total de casos',
+                            style: TextStyle(
+                              color: Constants.primaryColor,
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                        ),
                       ),
                     ),
-                  ),
-                ),
-                TableCell(
-                  child: Container(
-                    margin: EdgeInsets.all(10),
-                    child: Center(
-                      child: Text(
-                        '${(key['casos'] / key['total'] * 100).toStringAsFixed(2)}%',
-                        style: TextStyle(
-                          color: Constants.primaryColor,
-                          fontWeight: FontWeight.normal,
+                  ],
+                )
+              ] +
+              topData.map(
+                (key) {
+                  return TableRow(
+                    children: [
+                      TableCell(
+                        child: Container(
+                          margin: EdgeInsets.all(10),
+                          child: Text(
+                            '${key['index']}',
+                            style: TextStyle(
+                              color: Constants.primaryColor,
+                              fontWeight: FontWeight.normal,
+                            ),
+                          ),
                         ),
                       ),
-                    ),
-                  ),
-                ),
-              ],
-            );
-          }).toList(),
+                      TableCell(
+                        child: Container(
+                          alignment: Alignment.centerLeft,
+                          margin: EdgeInsets.all(10),
+                          child: Text(
+                            '${key[infoToShow]} '
+                            '${infoToShow == 'municipality' ? '(${key['province']})' : ''}',
+                            style: TextStyle(
+                              color: Constants.primaryColor,
+                              fontWeight: FontWeight.normal,
+                            ),
+                          ),
+                        ),
+                      ),
+                      TableCell(
+                        child: Container(
+                          margin: EdgeInsets.all(10),
+                          child: Center(
+                            child: Text(
+                              (key['cases'] * 100 / key['total'])
+                                      .toStringAsFixed(2) +
+                                  '%',
+                              style: TextStyle(
+                                color: Constants.primaryColor,
+                                fontWeight: FontWeight.normal,
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ],
+                  );
+                },
+              ).toList(),
         ),
       ],
     );

diff --git a/lib/src/widgets/test_evolution_widget.dart b/lib/src/widgets/test_evolution_widget.dart
@@ -76,7 +76,7 @@ class TestEvolutionWidget extends StatelessWidget {
                     charts.OutsideJustification.middleDrawArea,
               ),
               charts.ChartTitle(
-                'Tests acumulados',
+                'Tests por días',
                 behaviorPosition: charts.BehaviorPosition.start,
                 titleStyleSpec: charts.TextStyleSpec(fontSize: 11),
                 titleOutsideJustification: