DONE

farmassistX · Jan 13, 2021 · 57ab495 · 57ab495
1 parent 199e236
commit 57ab495
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 31 deletions.
diff --git a/lib/data/farm/repositories/harvest_storeData.dart b/lib/data/farm/repositories/harvest_storeData.dart
@@ -5,10 +5,9 @@ import 'package:intl/intl.dart';
 final FirebaseAuth auth = FirebaseAuth.instance;
 final FirebaseFirestore db = FirebaseFirestore.instance;
 
-User user = auth.currentUser;
-final uid = user.uid;
-
 void harvestData(Map<String, dynamic> obj){
+ User user = auth.currentUser;
+ final uid = user.uid;
 
  DateTime harvestDt = obj['harvestDate'];
 
@@ -36,6 +35,8 @@ void harvestData(Map<String, dynamic> obj){
 }
 
 void updatePlanting(String id){
+ User user = auth.currentUser;
+ final uid = user.uid;
 
  CollectionReference cr =
  db.collection("planting").doc(uid).collection('month');

diff --git a/lib/data/farm/repositories/storeData.dart b/lib/data/farm/repositories/storeData.dart
@@ -28,8 +28,11 @@ void addData(Map<String, dynamic> obj) {
  CollectionReference cr =
  db.collection('planting').doc(uid).collection('month');
 
+ String name = obj['plantName'];
+ name = name.toLowerCase();
+
  Map<String, dynamic> data = {
- "name": obj['plantName'],
+ "name": name,
  "noOfPlants": obj['plantNumber'],
  "date": formatted,
  "estimatedHarvest": obj['plantEstimated'],

diff --git a/lib/ui/farm/planting/display_planting.dart b/lib/ui/farm/planting/display_planting.dart
@@ -4,6 +4,7 @@ import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:getwidget/components/appbar/gf_appbar.dart';
 import 'package:getwidget/components/button/gf_icon_button.dart';
 import 'package:getwidget/types/gf_button_type.dart';
+import 'package:farmassist/data/farm/utils/weather_strings.dart';
 
 class DisplayPlanting extends StatefulWidget {
  final String plantName;

diff --git a/lib/ui/farm/statistics/utils/getEvents.dart b/lib/ui/farm/statistics/utils/getEvents.dart
@@ -4,10 +4,11 @@ import 'package:firebase_auth/firebase_auth.dart';
 final FirebaseAuth auth = FirebaseAuth.instance;
 final FirebaseFirestore db = FirebaseFirestore.instance;
 
-User user = auth.currentUser;
-final uid = user.uid;
+
 
 Map<DateTime, List> getHarvestEvents(){
+ User user = auth.currentUser;
+ final uid = user.uid;
  Map<DateTime, List> _events = new Map();
 
  db.collection('planting').doc(uid).collection('month')

diff --git a/lib/ui/farm/statistics/utils/getHarvestingInfo.dart b/lib/ui/farm/statistics/utils/getHarvestingInfo.dart
@@ -4,13 +4,13 @@ import 'package:firebase_auth/firebase_auth.dart';
 final FirebaseAuth auth = FirebaseAuth.instance;
 final FirebaseFirestore db = FirebaseFirestore.instance;
 
-User user = auth.currentUser;
-final uid = user.uid;
-
 Map<int, String> _keys;
 Map<String, int> _keys2;
 
 Map<int, List> getHarvesting() {
+ User user = auth.currentUser;
+ final uid = user.uid;
+
  Map<int, List> _harvesting = new Map();
  _keys = new Map();
  _keys2 = new Map();

diff --git a/lib/ui/farm/weather/weatherHome.dart b/lib/ui/farm/weather/weatherHome.dart
@@ -1,4 +1,5 @@
 import 'package:farmassist/data/farm/models/Weather.dart';
+import 'package:farmassist/data/farm/view_model/cityEntryViewModel.dart';
 import 'package:farmassist/data/farm/view_model/weather_app_forecast_viewmodel.dart';
 import 'package:farmassist/ui/farm/weather/weatherSummaryView.dart';
 import 'package:flutter/material.dart';
@@ -28,28 +29,35 @@ class _WeatherHomeState extends State<WeatherHome> {
  return Consumer<ForecastViewModel>(
  builder: (context, weatherViewModel, child) => Container(
  height: 225,
- child: ListView(
- children: <Widget>[
- CityEntryView(),
- weatherViewModel.isRequestPending
- ? buildBusyIndicator()
- : weatherViewModel.isRequestError
- ? Center(
- child: Text('Ooops...something went wrong',
- style: TextStyle(
- fontSize: 21, color: Colors.white)))
- : Column(children: [
- WeatherSummary(
- condition: weatherViewModel.condition,
- temp: weatherViewModel.temp,
- feelsLike: weatherViewModel.feelsLike,
- isdayTime: weatherViewModel.isDaytime,
- iconData: weatherViewModel.iconData,
- // weatherModel: model,
- ),
- ]),
- ],
- )));
+ child: RefreshIndicator(
+ color: Colors.transparent,
+ backgroundColor: Colors.transparent,
+ onRefresh: () => refreshWeather(weatherViewModel, context),
+ child: ListView(
+ children: <Widget>[
+ CityEntryView(),
+ weatherViewModel.isRequestPending
+ ? buildBusyIndicator()
+ : weatherViewModel.isRequestError
+ ? Center(
+ child: Text('Ooops...something went wrong',
+ style: TextStyle(
+ fontSize: 21, color: Colors.white)))
+ : Column(children: [
+ WeatherSummary(
+ condition: weatherViewModel.condition,
+ temp: weatherViewModel.temp,
+ feelsLike: weatherViewModel.feelsLike,
+ isdayTime: weatherViewModel.isDaytime,
+ iconData: weatherViewModel.iconData,
+ // weatherModel: model,
+ ),
+ ]),
+ ],
+ ),
+ )
+ )
+ );
  }
 
  Widget buildBusyIndicator() {
@@ -68,6 +76,13 @@ class _WeatherHomeState extends State<WeatherHome> {
  ]);
  }
 
+ Future<void> refreshWeather(
+ ForecastViewModel weatherVM, BuildContext context) {
+ // get the current city
+ String city = Provider.of<CityEntryViewModel>(context, listen: false).city;
+ return weatherVM.getLatestWeather(city);
+ }
+
  GradientContainer _buildGradientContainer(
  WeatherCondition condition, bool isDayTime, Widget child) {
  GradientContainer container;