Skip to content

Refactor filter inputs #4454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Withalion wants to merge 5 commits into
base: dev/filtering
Choose a base branch
from
Draft

Refactor filter inputs #4454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3dce7c
Refactor MMFilterTextInput to MMFilterBaseInput
Withalion Apr 15, 2026
6f17954
Refactor MMFilterTextInput
Withalion Apr 15, 2026
93daacd
Refactor MMFilterNumberRangeInput
Withalion Apr 15, 2026
a96a9c1
Refactor MMFilterDateRangeInput
Withalion Apr 15, 2026
bcde084
Fix access in MMFilterBoolInput
Withalion Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/qml/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ set(MM_QML
filters/MMFiltersPanel.qml
filters/components/MMFilterBanner.qml
filters/components/MMFilterBoolInput.qml
filters/components/MMFilterDateRange.qml
filters/components/MMFilterDateRangeInput.qml
filters/components/MMFilterDropdownValueMapInput.qml
filters/components/MMFilterDropdownValueRelationInput.qml
filters/components/MMFilterDropdownUniqueValuesInput.qml
filters/components/MMFilterRangeInput.qml
filters/components/MMFilterTextEditor.qml
filters/components/MMFilterNumberRangeInput.qml
filters/components/MMFilterTextInput.qml
filters/components/private/MMFilterBaseInput.qml
dialogs/MMCloseAccountDialog.qml
dialogs/MMDownloadProjectDialog.qml
dialogs/MMMigrateToMerginDialog.qml
Expand Down
6 changes: 3 additions & 3 deletions app/qml/filters/MMFiltersPanel.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,16 @@ MMComponents.MMDrawer {

if ( filterType === FieldFilter.TextFilter )
{
setSource( "components/MMFilterTextEditor.qml", props )
setSource( "components/MMFilterTextInput.qml", props )
}
else if ( filterType === FieldFilter.NumberFilter )
{
setSource( "components/MMFilterRangeInput.qml", props )
setSource( "components/MMFilterNumberRangeInput.qml", props )
}
else if ( filterType === FieldFilter.DateFilter )
{
props['hasTime'] = __activeProject.filterController.isDateFilterDateTime(modelData.filterId)
setSource( "components/MMFilterDateRange.qml", props )
setSource( "components/MMFilterDateRangeInput.qml", props )
}
else if ( filterType === FieldFilter.CheckboxFilter )
{
Expand Down
4 changes: 2 additions & 2 deletions app/qml/filters/components/MMFilterBoolInput.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ Column {
width: parent.width
backgroundColor: __style.lightGreenColor

trueText: customLabelForTrue ? customLabelForTrue : qsTr( "True" )
falseText: customLabelForFalse ? customLabelForFalse : qsTr( "False" )
trueText: root.customLabelForTrue ? root.customLabelForTrue : qsTr( "True" )
falseText: root.customLabelForFalse ? root.customLabelForFalse : qsTr( "False" )

Component.onCompleted: {
if ( root.currentValue && root.currentValue.length === 1 )
Expand Down
213 changes: 0 additions & 213 deletions app/qml/filters/components/MMFilterDateRange.qml
View file
Open in desktop

This file was deleted.

Loading
Loading