Merge branch 'EAnalyzer_KarunaratneGP' of http://gitlab.sliit.lk/2021-035/2021-035-covidefender

lib/EAnalyzer/AddLocation.dart

@@ -259,18 +259,18 @@ Widget _buildTime(){
              } ,
              ),
 
-            RaisedButton(
-            color: Colors.blue,
-             child: Text(
-               'View',
-               style: TextStyle(color: Colors.white, fontSize: 18),
-               ),
-             onPressed: () {
-
-              readData();
-
-             } ,
-             ),
+            // RaisedButton(
+            // color: Colors.blue,
+            //  child: Text(
+            //    'View',
+            //    style: TextStyle(color: Colors.white, fontSize: 18),
+            //    ),
+            //  onPressed: () {
+
+            //   readData();
+
+            //  } ,
+            //  ),
 
             RaisedButton(
             color: Colors.yellowAccent[700],

lib/EAnalyzer/EAnalyzerDash.dart

 import 'package:covidefender/EAnalyzer/HospitalDetails.dart';
+import 'package:covidefender/EAnalyzer/SearchEvent.dart';
 import 'package:flutter/material.dart';
 import 'AddLocation.dart';
 
@@ -126,7 +127,7 @@ class EAnalyzerDash extends StatelessWidget {
                                 onPressed: () {
                                   Navigator.push(
                                   context,
-                                  MaterialPageRoute(builder: (context) => EAnalyzerDash()),
+                                  MaterialPageRoute(builder: (context) => SearchEvent()),
                                 );
                                 },
                                 child: Image.asset('lib/assets/images/search80.png'),

lib/EAnalyzer/HospitalDetails.dart

@@ -63,13 +63,15 @@ class _HospitalDetailsState extends State<HospitalDetails> {
         itemCount: userData == null ? 0 : userData.length,
         itemBuilder: (BuildContext context, int index) {
           return Card(
+            elevation: 8,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(20.0),
+            ),
+            color: Colors.lightGreen[50],
             child: Padding(
               padding: const EdgeInsets.all(12.0),
               child: Row(
                 children: <Widget>[
-                  CircleAvatar(
-                    //backgroundImage: NetworkImage(userData[index]["hospital_id"]) ,
-                  ),
                   Padding(
                     padding: const EdgeInsets.all(12.0),
                     child: Text("Hospital ID:  ${userData[index]["hospital_id"]}\n${userData[index]["hospital"]["name"]}\n${userData[index]["hospital"]["name_si"]}\n\nTotal Patients: ${userData[index]["cumulative_total"]}\nDate/Time: ${userData[index]["created_at"]}",

lib/EAnalyzer/Loading.dart

@@ -21,13 +21,13 @@ class _LoadingScreenState extends State<LoadingScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: Colors.green.shade300,
+      backgroundColor: Colors.lightGreen[400],
       body: Stack(
         children: <Widget>[
         Container(
             decoration: BoxDecoration(
                 image: DecorationImage(
-                    alignment: Alignment.topCenter,
+                    alignment: Alignment.center,
                     image: AssetImage('lib/assets/images/eana.png'),
                     ))),
         ]

lib/EAnalyzer/SearchEvent.dart

+import 'package:flutter/material.dart';
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:flutter_spinkit/flutter_spinkit.dart';
+
+class SearchEvent extends StatefulWidget {
+  const SearchEvent({ Key key }) : super(key: key);
+
+  @override
+  _SearchEventState createState() => _SearchEventState();
+}
+
+class _SearchEventState extends State<SearchEvent> {
+  @override
+  Widget build(BuildContext context) {
+    return new Scaffold(
+      appBar: AppBar(
+        backwardsCompatibility: false,
+        backgroundColor: Color(0xFF1B5E20),
+        title: Text("Search an Event"),
+      ),
+      body: ListPage(),
+    );
+  }
+}
+
+class ListPage extends StatefulWidget {
+  
+  @override
+  _ListPageState createState() => _ListPageState();
+}
+
+class _ListPageState extends State<ListPage> {
+
+  Future _data;
+
+  Future getRiskLocation() async {
+    var firestore = Firestore.instance;
+    QuerySnapshot qn = await firestore.collection("RiskLocation").getDocuments();
+
+    return qn.documents;
+  }
+
+  navigateToDetail(DocumentSnapshot riskLocation){
+    Navigator.push(context, MaterialPageRoute(builder: (context) => DetailPage(riskLocation: riskLocation,)));
+  }
+  @override
+  void initState() {
+    // TODO: implement initState
+    super.initState();
+    _data = getRiskLocation();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      child: FutureBuilder(
+        
+        future: _data,
+          // ignore: missing_return
+          builder:(_, snapshot){
+            
+        if (snapshot.connectionState == ConnectionState.waiting) {
+          return Center(
+            child: SpinKitFadingCircle(
+            color: Colors.green,
+            size: 80.0,
+          ),
+          );
+        }else{
+          return ListView.builder(
+            itemCount: snapshot.data.length,
+            itemBuilder: (_, index){
+              return Card(
+                elevation: 8,
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(15.0),
+                ),
+                
+                color: Colors.lightGreen[100],
+                child: ListTile(
+                  leading: Icon(Icons.location_city, size: 40),
+                  title: Text(snapshot.data[index].data()["hotelName"],style: TextStyle(fontSize: 20.0,fontWeight: FontWeight.bold),),
+                  subtitle: Text(snapshot.data[index].data()["riskLocation"],style: TextStyle(fontSize: 16.0),),
+                  onTap: () => navigateToDetail(snapshot.data[index]),
+                ),
+              );
+          });
+        }
+      } ),
+    );
+  }
+}
+
+class DetailPage extends StatefulWidget {
+
+  final DocumentSnapshot riskLocation;
+  DetailPage({this.riskLocation});
+
+  @override
+  _DetailPageState createState() => _DetailPageState();
+}
+
+class _DetailPageState extends State<DetailPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        backwardsCompatibility: false,
+        backgroundColor: Color(0xFF1B5E20),
+        title: Text(widget.riskLocation.data()["hotelName"]),
+      ),
+      body: Container(
+        width: 410,
+        height: 100,
+        child: Card(
+          elevation: 8,
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(20.0),
+          ),
+          color: Colors.lightGreen[50],
+
+          child: ListTile(
+          leading: Icon(Icons.timelapse, size: 40),
+          title: Text("Date : ${widget.riskLocation.data()["date"]}" ,style: TextStyle(fontSize: 20.0,fontWeight: FontWeight.bold),),
+          subtitle: Text("Time : ${widget.riskLocation.data()["time"]}",style: TextStyle(fontSize: 20.0,fontWeight: FontWeight.bold),),
+          
+        ),
+      ),
+      ),
+    );
+  }
+}

pubspec.lock

@@ -141,6 +141,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_spinkit:
+    dependency: "direct main"
+    description:
+      name: flutter_spinkit
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.1.2+1"
   flutter_svg:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -32,6 +32,7 @@ dependencies:
   quiver: ^2.0.0
   wakelock: ^0.1.4+1
   charts_flutter: ^0.9.0
+  flutter_spinkit: "^4.1.2"