Browse Source

update plot model

master
daivph 5 years ago
parent
commit
ac5579b9e4
5 changed files with 44 additions and 20 deletions
  1. +11
    -19
      lib/models/Plot.dart
  2. +22
    -0
      lib/models/Plot.g.dart
  3. +3
    -1
      lib/presentation/screens/plot/sc_plot.dart
  4. +7
    -0
      pubspec.lock
  5. +1
    -0
      pubspec.yaml

+ 11
- 19
lib/models/Plot.dart View File

@@ -1,24 +1,16 @@
import 'package:json_annotation/json_annotation.dart';

part 'Plot.g.dart';

@JsonSerializable()
class Plot {
int id;
int times;
Plot();

num id;
num times;
String activityExecuteDate;
bool isExceedLimit;

Plot({this.id, this.times, this.activityExecuteDate, this.isExceedLimit});

Plot fromJson(Map<String, dynamic> json) {
id = json['id'];
times = json['times'];
activityExecuteDate = json['activityExecuteDate'];
isExceedLimit = json['isExceedLimit'];
}

Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['times'] = this.times;
data['activityExecuteDate'] = this.activityExecuteDate;
data['isExceedLimit'] = this.isExceedLimit;
return data;
}
Plot fromJson(Map<String, dynamic> json) => _$PlotFromJson(json);
Map<String, dynamic> toJson() => _$PlotToJson(this);
}

+ 22
- 0
lib/models/Plot.g.dart View File

@@ -0,0 +1,22 @@
// GENERATED CODE - DO NOT MODIFY BY HAND

part of 'Plot.dart';

// **************************************************************************
// JsonSerializableGenerator
// **************************************************************************

Plot _$PlotFromJson(Map<String, dynamic> json) {
return Plot()
..id = json['id'] as num
..times = json['times'] as num
..activityExecuteDate = json['activityExecuteDate'] as String
..isExceedLimit = json['isExceedLimit'] as bool;
}

Map<String, dynamic> _$PlotToJson(Plot instance) => <String, dynamic>{
'id': instance.id,
'times': instance.times,
'activityExecuteDate': instance.activityExecuteDate,
'isExceedLimit': instance.isExceedLimit
};

+ 3
- 1
lib/presentation/screens/plot/sc_plot.dart View File

@@ -7,6 +7,7 @@ import 'package:farm_tpf/utils/bloc/infinity_scroll_bloc.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:farm_tpf/utils/const_string.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';

class PlotListScreen extends StatefulWidget {
@override
@@ -34,7 +35,7 @@ class HoldInfinityWidget extends StatelessWidget {
centerTitle: true,
title: Text("Danh sách lô"),
actions: <Widget>[
IconButton(icon: Icon(Icons.add), onPressed: () {})
IconButton(icon: Icon(FontAwesomeIcons.qrcode), onPressed: () {})
],
),
body: InfinityView());
@@ -114,6 +115,7 @@ class ItemInfinityWidget extends StatelessWidget {
Widget build(BuildContext context) {
return GestureDetector(
child: Card(
color: item.id % 3 == 0 ? Colors.white : Colors.greenAccent[100],
child: Container(
padding: EdgeInsets.all(8.0),
child: Column(

+ 7
- 0
pubspec.lock View File

@@ -247,6 +247,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.1"
font_awesome_flutter:
dependency: "direct main"
description:
name: font_awesome_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "8.8.1"
formz:
dependency: "direct main"
description:

+ 1
- 0
pubspec.yaml View File

@@ -30,6 +30,7 @@ dependencies:
video_player: ^0.10.11+2
flutter_plugin_android_lifecycle: ^1.0.4
shimmer: ^1.1.1
font_awesome_flutter: ^8.8.1

dev_dependencies:
flutter_test:

Loading…
Cancel
Save