Skip to content

Commit b6a633f

Browse files
committed
Fix default user selection bug
- fixed error which was midisplaying possible productivity to assign at default value.
1 parent 6186e3b commit b6a633f

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

kanbansim/lib/features/main_page/widgets/kanban_board/task_card/task_card_window/assign_productivity_popup.dart

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,21 @@ class _AssignProductivityWindowState extends State<_AssignProductivityWindow> {
153153
void _assignInitialValues() {
154154
this._isReadyToAssign = false;
155155
this._assignedProductivity = 0;
156-
this._assignedUsername = _getAvailableUsersNames()[0];
156+
157+
List<String> names = _getAvailableUsersNames();
158+
159+
if (this.widget.task.owner != null) {
160+
String ownerName = this.widget.task.owner.getName();
161+
162+
if (names.contains(ownerName)) {
163+
this._assignedUsername = ownerName;
164+
} else {
165+
this._assignedUsername = names[0];
166+
}
167+
} else {
168+
this._assignedUsername = names[0];
169+
}
170+
157171
this._max = _getMaxProductivityValuePossibleToAssign().toDouble();
158172
}
159173

kanbansim/lib/features/main_page/widgets/kanban_board/task_card/task_card_window/lock_status_popup.dart

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,13 @@ class _LockStatusState extends State<_LockStatus> {
127127
if (names.length != 0) {
128128
if (_selectedValue == null) {
129129
if (this.widget.task.owner != null) {
130-
_selectedValue = this.widget.task.owner.getName();
130+
String ownerName = this.widget.task.owner.getName();
131+
132+
if (names.contains(ownerName)) {
133+
_selectedValue = this.widget.task.owner.getName();
134+
} else {
135+
_selectedValue = names[0];
136+
}
131137
} else {
132138
_selectedValue = names[0];
133139
}

0 commit comments

Comments
 (0)