update action

lib/custom_model/action_form/RequestActivity.dart

@@ -2,6 +2,7 @@ import 'package:farm_tpf/custom_model/SuppliesUsing.dart';
 import 'package:farm_tpf/custom_model/action_form/ActionUIField.dart';
 
 class RequestActivity {
+  int id;
   int tbActivityTypeId;
   int tbCropId;
   num totalCost;
@@ -15,7 +16,8 @@ class RequestActivity {
   List<String> deletedImages;
 
   RequestActivity(
-      {this.tbActivityTypeId,
+      {this.id,
+      this.tbActivityTypeId,
       this.tbCropId,
       this.totalCost,
       this.executeDate,
@@ -28,6 +30,7 @@ class RequestActivity {
       this.deletedImages});
 
   RequestActivity.fromJson(Map<String, dynamic> json) {
+    id = json['id'];
     tbActivityTypeId = json['tbActivityTypeId'];
     tbCropId = json['tbCropId'];
     totalCost = json['totalCost'];
@@ -57,6 +60,7 @@ class RequestActivity {
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['id'] = this.id;
     data['tbActivityTypeId'] = this.tbActivityTypeId;
     data['tbCropId'] = this.tbCropId;
     data['totalCost'] = this.totalCost;

lib/data/repository/repository.dart

@@ -273,7 +273,6 @@ class Repository {
   Future<void> updateActionCommon(
       Function(dynamic) onSuccess, Function(dynamic) onError,
       {@required String activityType,
-      @required int activityId,
       @required String activityData,
       List<String> filePaths}) async {
     var formData = FormData();
@@ -283,8 +282,8 @@ class Repository {
     formData.fields.add(MapEntry('tbCommonActivityDTO', activityData));
     try {
       await dio
-          .put(
-              "${ConstCommon.baseUrl}/api/update-common-activity/$activityType/$activityId",
+          .post(
+              "${ConstCommon.baseUrl}/api/update-common-activity/$activityType",
               data: formData)
           .then((value) {
         onSuccess(value.data);

lib/presentation/screens/actions/sc_action.dart

@@ -75,6 +75,8 @@ class _ActionScreenState extends State<ActionScreen> {
   var _nurseryDetails = <TbNurseryDetailsDTO>[];
   var _supplyUsings = <SuppliesUsing>[];
 
+  var _previousGroupFieldName = '';
+
   Future<Null> getSharedPrefs() async {
     var currentFullName = await pref.getString(DATA_CONST.CURRENT_FULL_NAME);
     _executeByController.text = currentFullName ?? "";
@@ -162,6 +164,9 @@ class _ActionScreenState extends State<ActionScreen> {
             widget.activityType == 'ACTIVE_TYPE_SPRAYING_PESTICIDES') {
           _requestActivity.tbSuppliesUsingDetailsDTOs = _supplyUsings;
         }
+        //delete images
+        _requestActivity.deletedImages =
+            Get.find<ChangeFileController>().deleteFiles;
         //convert data to json
         var activityCommonData =
             jsonEncode(_requestActivity.toJson()).toString();
@@ -192,7 +197,6 @@ class _ActionScreenState extends State<ActionScreen> {
           },
               activityType: widget.activityType,
               activityData: activityCommonData,
-              activityId: widget.activityId,
               filePaths: filePaths);
         }
 
@@ -230,8 +234,52 @@ class _ActionScreenState extends State<ActionScreen> {
   //
   // GENERATE DYNAMIC FORM
   //
+  Widget groupName(String name) {
+    if (_previousGroupFieldName == name ||
+        !Validators.stringNotNullOrEmpty(name)) {
+      return SizedBox();
+    } else {
+      var isShowEndline = false;
+      if (Validators.stringNotNullOrEmpty(_previousGroupFieldName)) {
+        isShowEndline = true;
+      } else {
+        //isShowEndline = false;
+      }
+      _previousGroupFieldName = name ?? '';
+      return Container(
+        child: Column(
+          children: [
+            isShowEndline
+                ? Container(
+                    width: double.infinity,
+                    height: 0.35,
+                    color: Colors.grey[300],
+                  )
+                : SizedBox(),
+            Row(
+              children: [
+                Container(
+                  width: 24,
+                  height: 0.35,
+                  color: Colors.grey[300],
+                ),
+                Text(' ${name ?? ''} '),
+                Expanded(
+                  child: Container(
+                    width: 5,
+                    height: 0.35,
+                    color: Colors.grey[300],
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      );
+    }
+  }
 
-  Widget generateTextField(List<ActionUIField> fields) {
+  Widget generateField(List<ActionUIField> fields) {
     return Wrap(
       children: [
         ListView.separated(
@@ -246,61 +294,86 @@ class _ActionScreenState extends State<ActionScreen> {
             itemBuilder: (context, index) {
               var field = fields[index];
               if (field.tbControlTypeName == 'text') {
-                return TextFormField(
-                  keyboardType: TextInputType.text,
-                  decoration: InputDecoration(labelText: field.description),
-                  controller: textFieldControllers[field.id.toString()],
-                  onSaved: (newValue) {},
-                  validator: field.isMandatory
-                      ? (String value) {
-                          return Validators.validateNotNullOrEmpty(
-                              value, 'Vui lòng nhập ${field.description}');
-                        }
-                      : null,
+                return Column(
+                  children: [
+                    groupName(field.groupName),
+                    TextFormField(
+                      keyboardType: TextInputType.text,
+                      decoration: InputDecoration(labelText: field.description),
+                      controller: textFieldControllers[field.id.toString()],
+                      onSaved: (newValue) {},
+                      validator: field.isMandatory
+                          ? (String value) {
+                              return Validators.validateNotNullOrEmpty(
+                                  value, 'Vui lòng nhập ${field.description}');
+                            }
+                          : null,
+                    ),
+                  ],
                 );
               } else if (field.tbControlTypeName == 'number') {
-                return WidgetTextFormFieldNumber(
-                  hintValue: field.description,
-                  textController: textFieldControllers[field.id.toString()],
-                  onSaved: (newValue) {},
-                  validator: field.isMandatory
-                      ? (String value) {
-                          return Validators.validNumberOrEmpty(
-                              value, 'Vui lòng nhập ${field.description}');
-                        }
-                      : null,
+                return Column(
+                  children: [
+                    groupName(field.groupName),
+                    WidgetTextFormFieldNumber(
+                      hintValue: field.description,
+                      textController: textFieldControllers[field.id.toString()],
+                      onSaved: (newValue) {},
+                      validator: field.isMandatory
+                          ? (String value) {
+                              return Validators.validNumberOrEmpty(
+                                  value, 'Vui lòng nhập ${field.description}');
+                            }
+                          : null,
+                    ),
+                  ],
                 );
               } else if (field.tbControlTypeName == 'textarea') {
-                return TextFieldAreaWidget(
-                    hint: field.description,
-                    controller: textFieldControllers[field.id.toString()],
-                    onSaved: (newValue) {});
+                return Column(
+                  children: [
+                    groupName(field.groupName),
+                    TextFieldAreaWidget(
+                        hint: field.description,
+                        controller: textFieldControllers[field.id.toString()],
+                        onSaved: (newValue) {}),
+                  ],
+                );
               } else if (field.tbControlTypeName == 'dropdown' ||
                   field.tbControlTypeName == 'radiobutton') {
-                return DropdownSupplyWidget(
-                    titleName: field.description ?? '',
-                    tbSupply: field.tbActivityExtendTypeExternalTable ?? '',
-                    tag: field.name,
-                    value: field.description,
-                    hint:
-                        '${field.description} ${field.isMandatory ? '*' : ''}',
-                    condition: field.tbActivityExtendTypeCondition,
-                    invalidMessage: '',
-                    onPressed: (commonData) {
-                      valueObjects[field.id.toString()] =
-                          commonData.id.toString();
-                    });
+                return Column(
+                  children: [
+                    groupName(field.groupName),
+                    DropdownSupplyWidget(
+                        titleName: field.description ?? '',
+                        tbSupply: field.tbActivityExtendTypeExternalTable ?? '',
+                        tag: field.name,
+                        value: field.description,
+                        hint:
+                            '${field.description} ${field.isMandatory ? '*' : ''}',
+                        condition: field.tbActivityExtendTypeCondition,
+                        invalidMessage: '',
+                        onPressed: (commonData) {
+                          valueObjects[field.id.toString()] =
+                              commonData.id.toString();
+                        }),
+                  ],
+                );
               } else if (field.tbControlTypeName == 'date') {
-                return FieldDateWidget(
-                    tag: field.name,
-                    value: field.description,
-                    hint:
-                        '${field.description} ${field.isMandatory ? '*' : ''}',
-                    invalidMessage: '',
-                    onPressed: (selectedDate) {
-                      valueObjects[field.id.toString()] = selectedDate
-                          .convertLocalDateTimeToStringUtcDateTime();
-                    });
+                return Column(
+                  children: [
+                    groupName(field.groupName),
+                    FieldDateWidget(
+                        tag: field.name,
+                        value: field.description,
+                        hint:
+                            '${field.description} ${field.isMandatory ? '*' : ''}',
+                        invalidMessage: '',
+                        onPressed: (selectedDate) {
+                          valueObjects[field.id.toString()] = selectedDate
+                              .convertLocalDateTimeToStringUtcDateTime();
+                        }),
+                  ],
+                );
               } else {
                 return Container();
               }
@@ -398,29 +471,30 @@ class _ActionScreenState extends State<ActionScreen> {
     if (_requestActivity.tbObjectUpdateDTOList != null) {
       print(textFieldControllers.keys.toList());
       _requestActivity.tbObjectUpdateDTOList.forEach((element) {
-        if (element.tbObjectParameterDTO.tbControlTypeName == 'text' ||
-            element.tbObjectParameterDTO.tbControlTypeName == 'textarea') {
+        if (element.tbObjectParameterDTO?.tbControlTypeName == 'text' ||
+            element.tbObjectParameterDTO?.tbControlTypeName == 'textarea') {
           SchedulerBinding.instance.addPostFrameCallback((_) {
             textFieldControllers[element.tbObjectParameterId.toString()].text =
                 element.index;
           });
-        } else if (element.tbObjectParameterDTO.tbControlTypeName == 'number') {
+        } else if (element.tbObjectParameterDTO?.tbControlTypeName ==
+            'number') {
           SchedulerBinding.instance.addPostFrameCallback((_) {
             textFieldControllers[element.tbObjectParameterId.toString()].text =
                 element.index.formatStringToStringDecimal();
           });
         } else {
           SchedulerBinding.instance.addPostFrameCallback((_) {
-            print("SchedulerBinding");
-            if (element.tbObjectParameterDTO.tbControlTypeName == 'dropdown' ||
-                element.tbObjectParameterDTO.tbControlTypeName == 'radio') {
+            if (element.tbObjectParameterDTO?.tbControlTypeName == 'dropdown' ||
+                element.tbObjectParameterDTO?.tbControlTypeName == 'radio') {
               var dropdownValueName = '';
               if (element.tbObjectParameterDTO
-                      .tbActivityExtendTypeDropDownDTOList.isNotEmpty ||
+                      ?.tbActivityExtendTypeDropDownDTOList?.isNotEmpty ||
                   element.tbObjectParameterDTO
-                          .tbActivityExtendTypeDropDownDTOList !=
+                          ?.tbActivityExtendTypeDropDownDTOList !=
                       null) {
-                element.tbObjectParameterDTO.tbActivityExtendTypeDropDownDTOList
+                element
+                    .tbObjectParameterDTO?.tbActivityExtendTypeDropDownDTOList
                     .forEach((dropdownData) {
                   if (dropdownData.id == int.tryParse(element.index)) {
                     dropdownValueName = dropdownData.name;
@@ -431,12 +505,12 @@ class _ActionScreenState extends State<ActionScreen> {
                 ..id = int.tryParse(element.index)
                 ..name = dropdownValueName;
               Get.find<ChangeDropdownController>(
-                      tag: element.tbObjectParameterDTO.name)
+                      tag: element.tbObjectParameterDTO?.name)
                   .change(commonData);
-            } else if (element.tbObjectParameterDTO.tbControlTypeName ==
+            } else if (element.tbObjectParameterDTO?.tbControlTypeName ==
                 'date') {
               Get.find<ChangeDateTimePicker>(
-                      tag: element.tbObjectParameterDTO.name)
+                      tag: element.tbObjectParameterDTO?.name)
                   .change(element.index
                       .convertStringServerDateTimeToLocalDateTime());
             }
@@ -456,7 +530,6 @@ class _ActionScreenState extends State<ActionScreen> {
           ],
           child: Scaffold(
               backgroundColor: Colors.white,
-              // key: _scaffoldKey,
               appBar: AppBarWidget(
                 isBack: true,
                 action: InkWell(
@@ -543,7 +616,7 @@ class _ActionScreenState extends State<ActionScreen> {
                                         SizedBox(
                                           height: 8.0,
                                         ),
-                                        generateTextField(_actionUIForm
+                                        generateField(_actionUIForm
                                             .objectParameterDTOList),
                                         _executeByField(),
                                         SizedBox(

lib/presentation/screens/splash/view/splash_page.dart

@@ -1,6 +1,4 @@
-import 'package:farm_tpf/utils/const_assets.dart';
 import 'package:flutter/material.dart';
-import 'package:get/get.dart';
 
 class SplashPage extends StatelessWidget {
   static Route route() {