Skip to content

Commit 0d244bb

Browse files
Merge pull request #7790 from abhinavohri/7780
feat(EditSimple): show alarms in viewing mode
2 parents 28a01c4 + d21a389 commit 0d244bb

1 file changed

Lines changed: 21 additions & 0 deletions

File tree

src/views/EditSimple.vue

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,13 @@
188188
:attendee="userAsAttendee"
189189
:calendar-id="calendarId"
190190
@close="closeEditorAndSkipAction" />
191+
192+
<div v-if="isReadOnlyOrViewing && hasAlarms" class="property-alarm-wrapper">
193+
<Bell :size="20" class="property-alarm-icon" />
194+
<AlarmList
195+
:calendar-object-instance="calendarObjectInstance"
196+
:is-read-only="isReadOnlyOrViewing" />
197+
</div>
191198
</div>
192199

193200
<!-- Footer -->
@@ -241,13 +248,15 @@ import {
241248
NcPopover,
242249
} from '@nextcloud/vue'
243250
import { mapState, mapStores } from 'pinia'
251+
import Bell from 'vue-material-design-icons/BellOutline.vue'
244252
import CalendarBlank from 'vue-material-design-icons/CalendarBlankOutline.vue'
245253
import Close from 'vue-material-design-icons/Close.vue'
246254
import ContentDuplicate from 'vue-material-design-icons/ContentDuplicate.vue'
247255
import HelpCircleIcon from 'vue-material-design-icons/HelpCircleOutline.vue'
248256
import EditIcon from 'vue-material-design-icons/PencilOutline.vue'
249257
import Delete from 'vue-material-design-icons/TrashCanOutline.vue'
250258
import Download from 'vue-material-design-icons/TrayArrowDown.vue'
259+
import AlarmList from '../components/Editor/Alarm/AlarmList.vue'
251260
import CalendarPickerHeader from '../components/Editor/CalendarPickerHeader.vue'
252261
import InvitationResponseButtons
253262
from '../components/Editor/InvitationResponseButtons.vue'
@@ -275,6 +284,8 @@ export default {
275284
Actions,
276285
ActionButton,
277286
ActionLink,
287+
AlarmList,
288+
Bell,
278289
EmptyContent,
279290
CalendarBlank,
280291
Close,
@@ -311,6 +322,7 @@ export default {
311322
hasLocation: false,
312323
hasDescription: false,
313324
hasAttendees: false,
325+
hasAlarms: false,
314326
boundaryElement: null,
315327
isVisible: true,
316328
isViewing: true,
@@ -400,6 +412,7 @@ export default {
400412
this.hasLocation = false
401413
this.hasDescription = false
402414
this.hasAttendees = false
415+
this.hasAlarms = false
403416
404417
if (typeof this.calendarObjectInstance.location === 'string' && this.calendarObjectInstance.location.trim() !== '') {
405418
this.hasLocation = true
@@ -410,6 +423,9 @@ export default {
410423
if (Array.isArray(this.calendarObjectInstance.attendees) && this.calendarObjectInstance.attendees.length > 0) {
411424
this.hasAttendees = true
412425
}
426+
if (Array.isArray(this.calendarObjectInstance.alarms) && this.calendarObjectInstance.alarms.length > 0) {
427+
this.hasAlarms = true
428+
}
413429
414430
// Reposition after content changes
415431
this.$nextTick(() => {
@@ -867,4 +883,9 @@ export default {
867883
}
868884
}
869885
886+
.property-alarm-wrapper {
887+
display: flex;
888+
align-items: center;
889+
}
890+
870891
</style>

0 commit comments

Comments
 (0)