Browse Source

change api link

master
daivph 5 years ago
parent
commit
1b32d00c41
10 changed files with 19 additions and 117 deletions
  1. +0
    -11
      jsons/nursery.json
  2. +0
    -5
      jsons/nurseryDetail.json
  3. +1
    -1
      lib/data/api/rest_client.g.dart
  4. +4
    -6
      lib/models/index.dart
  5. +0
    -21
      lib/models/nursery.dart
  6. +0
    -36
      lib/models/nursery.g.dart
  7. +0
    -15
      lib/models/nurseryDetail.dart
  8. +0
    -21
      lib/models/nurseryDetail.g.dart
  9. +13
    -0
      lib/presentation/screens/actions/other/sc_edit_action_other.dart
  10. +1
    -1
      lib/utils/const_common.dart

+ 0
- 11
jsons/nursery.json View File

@@ -1,11 +0,0 @@
{
"id": 1,
"cropId": 1,
"executeDate": "2020-08-20T02:34:18.049Z",
"description": "test",
"substrates": "",
"quantity": 100,
"seedLength": 11,
"seedIncubationTime": 11,
"nurseryDetail": "$[]NurseryDetail"
}

+ 0
- 5
jsons/nurseryDetail.json View File

@@ -1,5 +0,0 @@
{
"id": 1,
"workerName": "aaa",
"trayNumber": "bbbb"
}

+ 1
- 1
lib/data/api/rest_client.g.dart View File

@@ -9,7 +9,7 @@ part of 'rest_client.dart';
class _RestClient implements RestClient {
_RestClient(this._dio, {this.baseUrl}) {
ArgumentError.checkNotNull(_dio, '_dio');
this.baseUrl ??= 'https://ironman.aztrace.vn';
this.baseUrl ??= 'https://tpf.aztrace.vn';
}

final Dio _dio;

+ 4
- 6
lib/models/index.dart View File

@@ -1,6 +1,4 @@
export 'Supply.dart' ;
export 'Plot.dart' ;
export 'ResourceHelper.dart' ;
export 'nursery.dart' ;
export 'nurseryDetail.dart' ;
export 'OtherAction.dart' ;
export 'Supply.dart';
export 'Plot.dart';
export 'ResourceHelper.dart';
export 'OtherAction.dart';

+ 0
- 21
lib/models/nursery.dart View File

@@ -1,21 +0,0 @@
import 'package:json_annotation/json_annotation.dart';
import "nurseryDetail.dart";
part 'nursery.g.dart';

@JsonSerializable()
class Nursery {
Nursery();

num id;
num cropId;
String executeDate;
String description;
String substrates;
num quantity;
num seedLength;
num seedIncubationTime;
List<NurseryDetail> nurseryDetail;
factory Nursery.fromJson(Map<String,dynamic> json) => _$NurseryFromJson(json);
Map<String, dynamic> toJson() => _$NurseryToJson(this);
}

+ 0
- 36
lib/models/nursery.g.dart View File

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

part of 'nursery.dart';

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

Nursery _$NurseryFromJson(Map<String, dynamic> json) {
return Nursery()
..id = json['id'] as num
..cropId = json['cropId'] as num
..executeDate = json['executeDate'] as String
..description = json['description'] as String
..substrates = json['substrates'] as String
..quantity = json['quantity'] as num
..seedLength = json['seedLength'] as num
..seedIncubationTime = json['seedIncubationTime'] as num
..nurseryDetail = (json['nurseryDetail'] as List)
?.map((e) => e == null
? null
: NurseryDetail.fromJson(e as Map<String, dynamic>))
?.toList();
}

Map<String, dynamic> _$NurseryToJson(Nursery instance) => <String, dynamic>{
'id': instance.id,
'cropId': instance.cropId,
'executeDate': instance.executeDate,
'description': instance.description,
'substrates': instance.substrates,
'quantity': instance.quantity,
'seedLength': instance.seedLength,
'seedIncubationTime': instance.seedIncubationTime,
'nurseryDetail': instance.nurseryDetail
};

+ 0
- 15
lib/models/nurseryDetail.dart View File

@@ -1,15 +0,0 @@
import 'package:json_annotation/json_annotation.dart';

part 'nurseryDetail.g.dart';

@JsonSerializable()
class NurseryDetail {
NurseryDetail();

num id;
String workerName;
String trayNumber;
factory NurseryDetail.fromJson(Map<String,dynamic> json) => _$NurseryDetailFromJson(json);
Map<String, dynamic> toJson() => _$NurseryDetailToJson(this);
}

+ 0
- 21
lib/models/nurseryDetail.g.dart View File

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

part of 'nurseryDetail.dart';

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

NurseryDetail _$NurseryDetailFromJson(Map<String, dynamic> json) {
return NurseryDetail()
..id = json['id'] as num
..workerName = json['workerName'] as String
..trayNumber = json['trayNumber'] as String;
}

Map<String, dynamic> _$NurseryDetailToJson(NurseryDetail instance) =>
<String, dynamic>{
'id': instance.id,
'workerName': instance.workerName,
'trayNumber': instance.trayNumber
};

+ 13
- 0
lib/presentation/screens/actions/other/sc_edit_action_other.dart View File

@@ -0,0 +1,13 @@
import 'package:flutter/material.dart';

class EditActionOtherScreen extends StatefulWidget {
@override
_EditActionOtherScreenState createState() => _EditActionOtherScreenState();
}

class _EditActionOtherScreenState extends State<EditActionOtherScreen> {
@override
Widget build(BuildContext context) {
return Container();
}
}

+ 1
- 1
lib/utils/const_common.dart View File

@@ -1,6 +1,6 @@
class ConstCommon {
static int kExpiredTime = 12 * 60 * 60 * 1000; //24h
static const String baseUrl = "https://ironman.aztrace.vn";
static const String baseUrl = "http://tpf.aztrace.vn";

static const String supplyTypeSeed = "GIONG";
static const String supplyTypeDung = "PHANBON";

Loading…
Cancel
Save