Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

[66050] Re-add the mini calendar in the date picker of mobile web (#20534)

Henriette Dargeba1b4258b17e
diff --git a/app/components/work_packages/date_picker/date_form_component.html.erb b/app/components/work_packages/date_picker/date_form_component.html.erb
index 7390a544aa3..2c799d674e2 100644
--- a/app/components/work_packages/date_picker/date_form_component.html.erb
+++ b/app/components/work_packages/date_picker/date_form_component.html.erb
@@ -53,8 +53,18 @@
end
end
- body.with_column(classes: "wp-datepicker-dialog-date-form--duration") do
- render(Primer::Alpha::TextField.new(**text_field_options(name: :duration, label: WorkPackage.human_attribute_name("duration"))))
+ body.with_column(
+ classes: "wp-datepicker-dialog-date-form--duration",
+ hidden: show_duration?
+ ) do
+ render(
+ Primer::Alpha::TextField.new(
+ **text_field_options(
+ name: :duration,
+ label: WorkPackage.human_attribute_name("duration")
+ )
+ )
+ )
end
end
end
diff --git a/app/components/work_packages/date_picker/date_form_component.rb b/app/components/work_packages/date_picker/date_form_component.rb
index df76ea08a39..1f086ebfa3d 100644
--- a/app/components/work_packages/date_picker/date_form_component.rb
+++ b/app/components/work_packages/date_picker/date_form_component.rb
@@ -84,7 +84,7 @@ module WorkPackages
classes: "op-datepicker-modal--date-field #{FOCUSED_CLASS if focused?(name)}",
validation_message: validation_message(name),
type: field_type(name),
- placeholder: placeholder(name)
+ readonly: readonly?
)
if duration_field?(name)
@@ -120,6 +120,11 @@ module WorkPackages
name == :duration
end
+ def show_duration?
+ # On mobile, we want to hide the duration field to gain some space
+ !!helpers.browser.device.mobile?
+ end
+
def start_date_label
if @is_milestone
I18n.t("attributes.date")
@@ -182,22 +187,7 @@ module WorkPackages
end
def field_type(name)
- return :number if duration_field?(name)
-
- # Do not show the native datepicker on iOS safari because it
- # behaves totally different than all other browsers and destroys the behavior of the datepicker
- # Given a date field with no value: When Safari opens its native datepicker, the first thing it does is to
- # set the date to Today. And not only in the datepicker but directly in the field.
- # This behaviour has however consequences:
- # * The "reset" button in the datepicker does not clear the input (as the other browsers do it) but it resets
- # it to the original value it had when you opened it. So if the value was empty, it sets it back to empty.
- # If the value was set before, you cannot clear it, but only set it back to that value.
- # * Since the input changes, the whole datepicker updates without the user even knowing about it,
- # since the form is hidden behind the datepicker. That leads to this:
- # when you enter a start date after today, and then open the datepicker for finish date,
- # it will reset the start date because the finish date is set automatically to today,
- # but the finish date can't be before the start date.
- helpers.browser.device.mobile? && !helpers.browser.safari? ? :date : :text
+ duration_field?(name) ? :number : :text
end
def validation_message(name)
@@ -270,8 +260,22 @@ module WorkPackages
!disabled?(name) && !duration_field?(name)
end
- def placeholder(name)
- helpers.browser.device.mobile? && !duration_field?(name) ? "yyyy-mm-dd" : nil
+ def readonly?
+ # On mobile, the fields are readonly because of iOS Safari
+ # Do not show the native datepicker on iOS safari because it
+ # behaves totally different than all other browsers and destroys the behavior of the datepicker
+ # Given a date field with no value: When Safari opens its native datepicker, the first thing it does is to
+ # set the date to Today. And not only in the datepicker but directly in the field.
+ # This behaviour has however consequences:
+ # * The "reset" button in the datepicker does not clear the input (as the other browsers do it) but it resets
+ # it to the original value it had when you opened it. So if the value was empty, it sets it back to empty.
+ # If the value was set before, you cannot clear it, but only set it back to that value.
+ # * Since the input changes, the whole datepicker updates without the user even knowing about it,
+ # since the form is hidden behind the datepicker. That leads to this:
+ # - when you enter a start date after today, and then open the datepicker for finish date,
+ # it will reset the start date because the finish date is set automatically to today,
+ # but the finish date can't be before the start date.
+ helpers.browser.device.mobile?
end
end
end
diff --git a/app/components/work_packages/date_picker/date_form_component.sass b/app/components/work_packages/date_picker/date_form_component.sass
index 0cd9a515bb5..6434f8bf35f 100644
--- a/app/components/work_packages/date_picker/date_form_component.sass
+++ b/app/components/work_packages/date_picker/date_form_component.sass
@@ -25,10 +25,5 @@
@media screen and (max-width: $breakpoint-sm)
.wp-datepicker-dialog-date-form
- flex-direction: column !important
-
- &--duration
- flex-basis: auto
-
&--add-button
margin-top: 0
diff --git a/app/components/work_packages/date_picker/dialog_content_component.sass b/app/components/work_packages/date_picker/dialog_content_component.sass
index 3f2370e71c4..54e0f41abc3 100644
--- a/app/components/work_packages/date_picker/dialog_content_component.sass
+++ b/app/components/work_packages/date_picker/dialog_content_component.sass
@@ -22,8 +22,7 @@ $body-height: 460px
@media screen and (max-width: $breakpoint-sm)
.wp-datepicker-dialog
- &--UnderlineNav,
- &--date-picker-instance
+ &--UnderlineNav
display: none !important
&--body