Skip to content

Commit a875c25

Browse files
feat: default full / part day alarm
Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>
1 parent 4a9af5c commit a875c25

4 files changed

Lines changed: 21 additions & 9 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nextcloud/cdav-library",
3-
"version": "2.2.0",
3+
"version": "2.3.0",
44
"description": "CalDAV and CardDAV client library for Nextcloud",
55
"type": "module",
66
"main": "dist/index.cjs",

src/models/calendar.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ const debug = debugFactory('Calendar')
3030
* - enabled
3131
* - order
3232
* - timezone
33-
* - defaultAlarm
33+
* - defaultAlarmPartDay
34+
* - defaultAlarmFullDay
35+
* - transparency
3436
* - components
3537
*
36-
* The first five allowing read-write access
38+
* The first seven allowing read-write access
3739
*
3840
* @augments DavCollection
3941
*/
@@ -54,7 +56,8 @@ export class Calendar extends davCollectionPublishable(davCollectionShareable(Da
5456
super._exposeProperty('timezone', NS.IETF_CALDAV, 'calendar-timezone', true)
5557
super._exposeProperty('components', NS.IETF_CALDAV, 'supported-calendar-component-set')
5658
super._exposeProperty('transparency', NS.IETF_CALDAV, 'schedule-calendar-transp', true)
57-
super._exposeProperty('defaultAlarm', NS.NEXTCLOUD, 'default-alarm', true)
59+
super._exposeProperty('defaultAlarmPartDay', NS.NEXTCLOUD, 'default-alarm-part-day', true)
60+
super._exposeProperty('defaultAlarmFullDay', NS.NEXTCLOUD, 'default-alarm-full-day', true)
5861
}
5962

6063
/**
@@ -283,7 +286,8 @@ export class Calendar extends davCollectionPublishable(davCollectionShareable(Da
283286
[NS.IETF_CALDAV, 'schedule-calendar-transp'],
284287
[NS.IETF_CALDAV, 'schedule-default-calendar-URL'],
285288
[NS.OWNCLOUD, 'calendar-enabled'],
286-
[NS.NEXTCLOUD, 'default-alarm'],
289+
[NS.NEXTCLOUD, 'default-alarm-part-day'],
290+
[NS.NEXTCLOUD, 'default-alarm-full-day'],
287291
[NS.NEXTCLOUD, 'owner-displayname'],
288292
[NS.NEXTCLOUD, 'trash-bin-retention-duration'],
289293
[NS.NEXTCLOUD, 'deleted-at'],

src/parser.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@ export default class Parser {
178178
this.registerParser('{http://owncloud.org/ns}calendar-enabled', Parser.bool)
179179
this.registerParser('{http://owncloud.org/ns}enabled', Parser.bool)
180180
this.registerParser('{http://owncloud.org/ns}read-only', Parser.bool)
181-
this.registerParser('{http://nextcloud.com/ns}default-alarm', Parser.decInt)
181+
this.registerParser('{http://nextcloud.com/ns}default-alarm-part-day', Parser.decInt)
182+
this.registerParser('{http://nextcloud.com/ns}default-alarm-full-day', Parser.decInt)
182183
this.registerParser('{http://nextcloud.com/ns}owner-displayname', Parser.text)
183184
this.registerParser('{http://nextcloud.com/ns}deleted-at', Parser.iso8601DateTime)
184185
this.registerParser('{http://nextcloud.com/ns}calendar-uri', Parser.text)

src/propset/calendarPropSet.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ import * as NS from '../utility/namespaceUtility.js'
1818
* - {urn:ietf:params:xml:ns:caldav}calendar-description
1919
* - {urn:ietf:params:xml:ns:caldav}calendar-timezone
2020
* - {http://owncloud.org/ns}calendar-enabled
21-
* - {http://nextcloud.com/ns}default-alarm
21+
* - {http://nextcloud.com/ns}default-alarm-part-day
22+
* - {http://nextcloud.com/ns}default-alarm-full-day
2223
*
2324
* @param {object} props
2425
* @return {object}
@@ -72,9 +73,15 @@ export default function calendarPropSet(props) {
7273
value: value ? '1' : '0',
7374
})
7475
break
75-
case '{http://nextcloud.com/ns}default-alarm':
76+
case '{http://nextcloud.com/ns}default-alarm-part-day':
7677
xmlified.push({
77-
name: [NS.NEXTCLOUD, 'default-alarm'],
78+
name: [NS.NEXTCLOUD, 'default-alarm-part-day'],
79+
value,
80+
})
81+
break
82+
case '{http://nextcloud.com/ns}default-alarm-full-day':
83+
xmlified.push({
84+
name: [NS.NEXTCLOUD, 'default-alarm-full-day'],
7885
value,
7986
})
8087
break

0 commit comments

Comments
 (0)