Browse Source

fix Bug #8102

master
daivph 5 years ago
parent
commit
f3d347d4d0
2 changed files with 20 additions and 9 deletions
  1. +1
    -1
      ios/Flutter/.last_build_id
  2. +19
    -8
      lib/presentation/screens/plot_detail/sc_plot_information.dart

+ 1
- 1
ios/Flutter/.last_build_id View File

@@ -1 +1 @@
7c3be5aca7ff709c59cdc638def905a4
7c3be5aca7ff709c59cdc638def905a4

+ 19
- 8
lib/presentation/screens/plot_detail/sc_plot_information.dart View File

@@ -35,7 +35,7 @@ class _PlotInformationScreenState extends State<PlotInformationScreen>
final controller = Get.put(DescriptionChangeControler());
Repository _repository = Repository();
String statusCrop = plot_status_unknown;
String technicians = '--';
String technicians = '';

@override
void initState() {
@@ -56,6 +56,15 @@ class _PlotInformationScreenState extends State<PlotInformationScreen>
}
_descriptionController.text =
_crop.description == null ? "" : _crop.description.toString();
if (_crop.tbDetailUsers != null) {
for (var i = 0; i < _crop.tbDetailUsers.length; i++) {
if (i == 0) {
technicians += _crop.tbDetailUsers[i].fullName ?? '';
} else {
technicians += ', ${_crop.tbDetailUsers[i].fullName ?? ''}';
}
}
}
}, (err) {});
}

@@ -154,20 +163,22 @@ class _PlotInformationScreenState extends State<PlotInformationScreen>
color: AppColors.DEFAULT
.withOpacity(0.1),
name: 'Ngày gieo trồng',
value:
'${cropPlot.sowingDate.format_DDMMYY_HHmm() ?? '--'}'),
value: cropPlot.tbCropDTO.type == 0
? '${cropPlot.tbCropDTO?.startDate?.format_DDMMYY_HHmm() ?? '--'}'
: '--'),
WidgetRowPlotInfo(
color: AppColors.DEFAULT
.withOpacity(0.3),
name: 'Thời gian ngâm hạt',
value:
'${cropPlot.soakSeedsTime ?? '--'}'),
name: 'Ngày vô khây ươm',
value: cropPlot.tbCropDTO.type == 1
? '${cropPlot.tbCropDTO?.startDate?.format_DDMMYY_HHmm() ?? '--'}'
: '--'),
WidgetRowPlotInfo(
color: AppColors.DEFAULT
.withOpacity(0.1),
name: 'Ngày vô khây ươm',
name: 'Thời gian ngâm hạt',
value:
'${cropPlot.seedIncubationTime ?? '--'}'),
'${cropPlot.seedIncubationTime ?? '--'} ngày'),
WidgetRowPlotInfo(
color: AppColors.DEFAULT
.withOpacity(0.3),

Loading…
Cancel
Save