-
+
{{ formattedStart }}
@@ -55,28 +56,26 @@
:class="{ 'highlighted-timezone-icon': highlightStartTimezone }"
:size="20" />
-
-
- {{ formattedEnd }}
+
+ -
+
+
+ {{ formattedEnd }}
+
+
+
-
-
+
@@ -86,12 +85,14 @@ import moment from '@nextcloud/moment'
import DatePicker from '../../Shared/DatePicker.vue'
import IconTimezone from 'vue-material-design-icons/Web.vue'
import { mapState } from 'vuex'
+import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
export default {
name: 'PropertyTitleTimePicker',
components: {
DatePicker,
IconTimezone,
+ NcCheckboxRadioSwitch,
},
props: {
/**
@@ -195,16 +196,10 @@ export default {
*/
formattedStart() {
if (this.isAllDay) {
- return this.$t('calendar', 'from {startDate}', {
- startDate: moment(this.startDate).locale(this.locale).format('L'),
- endDate: moment(this.endDate).locale(this.locale).format('L'),
- })
+ return moment(this.startDate).locale(this.locale).format('ll')
}
- return this.$t('calendar', 'from {startDate} at {startTime}', {
- startDate: moment(this.startDate).locale(this.locale).format('L'),
- startTime: moment(this.startDate).locale(this.locale).format('LT'),
- })
+ return moment(this.startDate).locale(this.locale).format('lll')
},
/**
*
@@ -212,15 +207,10 @@ export default {
*/
formattedEnd() {
if (this.isAllDay) {
- return this.$t('calendar', 'to {endDate}', {
- endDate: moment(this.endDate).locale(this.locale).format('L'),
- })
+ return moment(this.endDate).locale(this.locale).format('ll')
}
- return this.$t('calendar', 'to {endDate} at {endTime}', {
- endDate: moment(this.endDate).locale(this.locale).format('L'),
- endTime: moment(this.endDate).locale(this.locale).format('LT'),
- })
+ return moment(this.endDate).locale(this.locale).format('lll')
},
/**
* @return {boolean}
@@ -234,6 +224,17 @@ export default {
highlightEndTimezone() {
return this.endTimezone !== this.userTimezone
},
+ /**
+ * True if the event is an all day event, starts and ends on the same date
+ *
+ * @return {boolean}
+ */
+ isAllDayOneDayEvent() {
+ return this.isAllDay
+ && this.startDate.getDate() === this.endDate.getDate()
+ && this.startDate.getMonth() === this.endDate.getMonth()
+ && this.startDate.getFullYear() === this.endDate.getFullYear()
+ },
},
methods: {
/**
diff --git a/src/components/Editor/Repeat/Repeat.vue b/src/components/Editor/Repeat/Repeat.vue
index 8d8458d80e..8052289653 100644
--- a/src/components/Editor/Repeat/Repeat.vue
+++ b/src/components/Editor/Repeat/Repeat.vue
@@ -22,7 +22,7 @@
-->
-
+
-
+
- {{ $t('calendar', 'More') }}
+ {{ $t('calendar', 'More details') }}
{{ $t('calendar', 'Save') }}
{{ $t('calendar', 'Update') }}
{{ $t('calendar', 'Update this occurrence') }}
{{ $t('calendar', 'Update this and all future') }}
+
+
+
@@ -67,6 +76,10 @@ export default {
type: Boolean,
required: true,
},
+ isReadOnly: {
+ type: Boolean,
+ required: true,
+ },
forceThisAndAllFuture: {
type: Boolean,
required: true,
@@ -75,19 +88,31 @@ export default {
type: Boolean,
default: false,
},
+ moreButtonType: {
+ type: String,
+ default: undefined,
+ },
+ growHorizontally: {
+ type: Boolean,
+ default: true,
+ },
+ disabled: {
+ type: Boolean,
+ default: false,
+ },
},
computed: {
showSaveButton() {
- return this.isNew && !this.canCreateRecurrenceException
+ return !this.isReadOnly && this.isNew && !this.canCreateRecurrenceException
},
showUpdateButton() {
- return !this.isNew && !this.canCreateRecurrenceException
+ return !this.isReadOnly && !this.isNew && !this.canCreateRecurrenceException
},
showUpdateOnlyThisButton() {
return this.canCreateRecurrenceException && !this.forceThisAndAllFuture
},
showUpdateThisAndFutureButton() {
- return this.canCreateRecurrenceException
+ return !this.isReadOnly && this.canCreateRecurrenceException
},
},
methods: {
@@ -108,10 +133,13 @@ export default {
.save-buttons {
display: flex;
flex-wrap: wrap;
+ justify-content: end;
gap: 5px;
- button {
- flex: 1 fit-content;
+ &--grow {
+ button {
+ flex: 1 fit-content;
+ }
}
}
diff --git a/src/components/Shared/CalendarPicker.vue b/src/components/Shared/CalendarPicker.vue
index 65d8918d7f..9f8dacbcde 100644
--- a/src/components/Shared/CalendarPicker.vue
+++ b/src/components/Shared/CalendarPicker.vue
@@ -20,6 +20,7 @@
+