Fix sorting for forms (#227)

lukstbit · web-flow · commit 675fcef8ef4c · 2020-10-28T20:16:09.000+02:00
diff --git a/app/src/main/java/ro/code4/monitorizarevot/ui/forms/FormsViewModel.kt b/app/src/main/java/ro/code4/monitorizarevot/ui/forms/FormsViewModel.kt
@@ -116,13 +116,13 @@ class FormsViewModel : BaseFormViewModel() {
         } catch (e: Exception) {
             false
         }
-        val formsList = when {
+        var formsList = when {
             !filterDiasporaForms || pollingStationLiveData.value?.isDiaspora == true -> forms.map {
                 FormListItem(it)
             }
             else -> forms.filter { it.form.diaspora == false }.map { FormListItem(it) }
         }
-        formsList.sortedBy { it.formWithSections.form.order }
+        formsList = formsList.sortedBy { it.formWithSections.form.order }
         items.addAll(formsList)
         items.add(AddNoteListItem())
         formsLiveData.postValue(items)

Original file line number	Diff line number	Diff line change
`@@ -116,13 +116,13 @@ class FormsViewModel : BaseFormViewModel() {`
`116`	`116`	`} catch (e: Exception) {`
`117`	`117`	`false`
`118`	`118`	`}`
`119`		`- val formsList = when {`
	`119`	`+ var formsList = when {`
`120`	`120`	`!filterDiasporaForms \|\| pollingStationLiveData.value?.isDiaspora == true -> forms.map {`
`121`	`121`	`FormListItem(it)`
`122`	`122`	`}`
`123`	`123`	`else -> forms.filter { it.form.diaspora == false }.map { FormListItem(it) }`
`124`	`124`	`}`
`125`		`- formsList.sortedBy { it.formWithSections.form.order }`
	`125`	`+ formsList = formsList.sortedBy { it.formWithSections.form.order }`
`126`	`126`	`items.addAll(formsList)`
`127`	`127`	`items.add(AddNoteListItem())`
`128`	`128`	`formsLiveData.postValue(items)`