Skip to content

Feature/clear button for calendar drawers #4572

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

Open
xkello wants to merge 7 commits into
base: master
Choose a base branch
from
+29 −12
Open

Feature/clear button for calendar drawers #4572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8145924
Add clear button to calendar drawer
Jun 30, 2026
d76002c
Fix clearing calendar field causing runtime error
Jun 30, 2026
a5552f8
Add hide calendar clear button for empty values feature
Jun 30, 2026
5a77532
Update code to be more consistent and easier to read
Jul 14, 2026
4285fca
Refactor calendar clear code
Jul 21, 2026
af9addf
Merge remote-tracking branch 'origin/master' into feature/clear-butto…
Jul 21, 2026
241f97d
Update some logic to be easier to understand
Jul 21, 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
15 changes: 15 additions & 0 deletions app/qml/form/components/MMCalendarDrawer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,27 @@ MMComponents.MMDrawer {
property alias hasDatePicker: dateTimePicker.hasDatePicker
property alias hasTimePicker: dateTimePicker.hasTimePicker
property bool showSeconds: false
property bool showClearButton: false

signal primaryButtonClicked
signal clearButtonClicked
Comment thread
xkello marked this conversation as resolved.

dim: true

drawerHeader.title: root.title
drawerHeader.topLeftItem.visible: root.showClearButton
drawerHeader.topLeftItemContent:
MMComponents.MMButton {
text: qsTr("Clear")
type: MMButton.Types.Tertiary
fontColor: __style.darkGreyColor
fontColorHover: __style.nightColor

onClicked: {
Comment thread
xkello marked this conversation as resolved.
root.clearButtonClicked()
root.close()
}
}

drawerContent: Item {
width: parent.width
Expand Down
26 changes: 14 additions & 12 deletions app/qml/form/editors/MMFormCalendarEditor.qml
View file
Open in desktop
Comment thread
xkello marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,20 @@ MMPrivateComponents.MMBaseSingleLineInput {
id: dateTimeDrawer

title: root._fieldTitle
dateTime: root._fieldValueIsNull || root._fieldHasMixedValues ? new Date() : dateTransformer.toJsDate( root._fieldValue )
dateTime: root.hasInvalidFieldValue() ? new Date() : dateTransformer.toJsDate( root._fieldValue )
hasDatePicker: root.includesDate
hasTimePicker: root.includesTime
showSeconds: root.showSeconds
showClearButton: !root._fieldValueIsNull

onPrimaryButtonClicked: {
root.newDateSelected( dateTime )
}

onClearButtonClicked: {
root.editorValueChanged( null, true )
}

onClosed: dateTimeDrawerLoader.active = false

Component.onCompleted: open()
Expand All @@ -114,12 +119,14 @@ MMPrivateComponents.MMBaseSingleLineInput {
function openCalendar() {
forceActiveFocus()

if (root._fieldValueIsNull || _fieldHasMixedValues) {
root.openPicker( new Date() )
}
else {
root.openPicker( dateTransformer.toJsDate(root._fieldValue) )
}
dateTimeDrawerLoader.active = true
dateTimeDrawerLoader.focus = true
}

function hasInvalidFieldValue() {
return root._fieldValueIsNull
|| root._fieldHasMixedValues
|| (root._fieldValue ?? true)
}

QtObject {
Expand Down Expand Up @@ -186,9 +193,4 @@ MMPrivateComponents.MMBaseSingleLineInput {
return Qt.formatDateTime(jsDate, root._fieldConfig['display_format'])
}
}

function openPicker(requestedDate) {
dateTimeDrawerLoader.active = true
dateTimeDrawerLoader.focus = true
}
}
Loading