Commit 94f2bed8 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch '208401-value-stream-analytics-select-date-range-of-1-day' into 'master'

Resolve "Value stream analytics - select date range of 1 day"

See merge request gitlab-org/gitlab!28103
parents ca375d43 4d5d4317
...@@ -72,9 +72,6 @@ export default { ...@@ -72,9 +72,6 @@ export default {
const dayDifference = getDayDifference(this.startDate, this.endDate); const dayDifference = getDayDifference(this.startDate, this.endDate);
return this.includeSelectedDate ? dayDifference + OFFSET_DATE_BY_ONE : dayDifference; return this.includeSelectedDate ? dayDifference + OFFSET_DATE_BY_ONE : dayDifference;
}, },
effectiveMaxDateRange() {
return this.includeSelectedDate ? this.maxDateRange - OFFSET_DATE_BY_ONE : this.maxDateRange;
},
}, },
}; };
</script> </script>
...@@ -89,8 +86,9 @@ export default { ...@@ -89,8 +86,9 @@ export default {
:default-start-date="startDate" :default-start-date="startDate"
:default-end-date="endDate" :default-end-date="endDate"
:default-min-date="minDate" :default-min-date="minDate"
:max-date-range="effectiveMaxDateRange" :max-date-range="maxDateRange"
:default-max-date="maxDate" :default-max-date="maxDate"
:same-day-selection="includeSelectedDate"
theme="animate-picker" theme="animate-picker"
start-picker-class="js-daterange-picker-from d-flex flex-column flex-lg-row align-items-lg-center mr-lg-2 mb-2 mb-md-0" start-picker-class="js-daterange-picker-from d-flex flex-column flex-lg-row align-items-lg-center mr-lg-2 mb-2 mb-md-0"
end-picker-class="js-daterange-picker-to d-flex flex-column flex-lg-row align-items-lg-center" end-picker-class="js-daterange-picker-to d-flex flex-column flex-lg-row align-items-lg-center"
...@@ -100,7 +98,7 @@ export default { ...@@ -100,7 +98,7 @@ export default {
class="daterange-indicator d-flex flex-row flex-lg-row align-items-flex-start align-items-lg-center" class="daterange-indicator d-flex flex-row flex-lg-row align-items-flex-start align-items-lg-center"
> >
<span class="number-of-days pl-2 pr-1"> <span class="number-of-days pl-2 pr-1">
<gl-sprintf :message="__('%{numberOfDays} days')"> <gl-sprintf :message="n__('1 day', '%d days', numberOfDays)">
<template #numberOfDays>{{ numberOfDays }}</template> <template #numberOfDays>{{ numberOfDays }}</template>
</gl-sprintf> </gl-sprintf>
</span> </span>
......
...@@ -380,9 +380,6 @@ msgstr "" ...@@ -380,9 +380,6 @@ msgstr ""
msgid "%{name}'s avatar" msgid "%{name}'s avatar"
msgstr "" msgstr ""
msgid "%{numberOfDays} days"
msgstr ""
msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead" msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment