| @@ -154,14 +154,20 @@ class _ActionScreenState extends State<ActionScreen> { | |||
| // Edit | |||
| if (_requestActivity.tbObjectUpdateDTOList != null) { | |||
| _requestActivity.tbObjectUpdateDTOList.forEach((element) { | |||
| if (valueObjects.keys.contains(element.tbObjectParameterId)) { | |||
| var objectUpdate = TbObjectUpdateDTO() | |||
| ..id = element.id | |||
| ..tbObjectParameterId = element.tbObjectParameterId | |||
| ..index = | |||
| valueObjects[element.tbObjectParameterId.toString()]; | |||
| _objectPrameters.add(objectUpdate); | |||
| print(valueObjects[element.tbObjectParameterId.toString()]); | |||
| var updateValue = ''; | |||
| if (Validators.stringNotNullOrEmpty( | |||
| valueObjects[element.tbObjectParameterId.toString()])) { | |||
| updateValue = | |||
| valueObjects[element.tbObjectParameterId.toString()]; | |||
| } else { | |||
| updateValue = element.index; | |||
| } | |||
| var objectUpdate = TbObjectUpdateDTO() | |||
| ..id = element.id | |||
| ..tbObjectParameterId = element.tbObjectParameterId | |||
| ..index = updateValue; | |||
| _objectPrameters.add(objectUpdate); | |||
| }); | |||
| _requestActivity.tbObjectUpdateDTOList = _objectPrameters; | |||
| } | |||
| @@ -260,39 +266,22 @@ class _ActionScreenState extends State<ActionScreen> { | |||
| !Validators.stringNotNullOrEmpty(name)) { | |||
| return SizedBox(); | |||
| } else { | |||
| var isShowEndline = false; | |||
| if (Validators.stringNotNullOrEmpty(_previousGroupFieldName)) { | |||
| isShowEndline = true; | |||
| } else { | |||
| //isShowEndline = false; | |||
| } | |||
| _previousGroupFieldName = name ?? ''; | |||
| return Container( | |||
| child: Column( | |||
| child: Row( | |||
| 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], | |||
| ), | |||
| ), | |||
| ], | |||
| Container( | |||
| width: 24, | |||
| height: 0.5, | |||
| color: Colors.green, | |||
| ), | |||
| Text(' ${name ?? ''} '), | |||
| Expanded( | |||
| child: Container( | |||
| width: 5, | |||
| height: 0.5, | |||
| color: Colors.green, | |||
| ), | |||
| ), | |||
| ], | |||
| ), | |||