mirror of
https://github.com/nextcloud/server.git
synced 2026-05-28 04:32:30 -04:00
Add scheduling availability settings
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
parent
643e85cfe8
commit
f432dd2e2e
21 changed files with 2714 additions and 3 deletions
|
|
@ -60,6 +60,7 @@
|
||||||
|
|
||||||
<settings>
|
<settings>
|
||||||
<admin>OCA\DAV\Settings\CalDAVSettings</admin>
|
<admin>OCA\DAV\Settings\CalDAVSettings</admin>
|
||||||
|
<personal>OCA\DAV\Settings\AvailabilitySettings</personal>
|
||||||
</settings>
|
</settings>
|
||||||
|
|
||||||
<activity>
|
<activity>
|
||||||
|
|
|
||||||
|
|
@ -277,6 +277,7 @@ return array(
|
||||||
'OCA\\DAV\\Search\\EventsSearchProvider' => $baseDir . '/../lib/Search/EventsSearchProvider.php',
|
'OCA\\DAV\\Search\\EventsSearchProvider' => $baseDir . '/../lib/Search/EventsSearchProvider.php',
|
||||||
'OCA\\DAV\\Search\\TasksSearchProvider' => $baseDir . '/../lib/Search/TasksSearchProvider.php',
|
'OCA\\DAV\\Search\\TasksSearchProvider' => $baseDir . '/../lib/Search/TasksSearchProvider.php',
|
||||||
'OCA\\DAV\\Server' => $baseDir . '/../lib/Server.php',
|
'OCA\\DAV\\Server' => $baseDir . '/../lib/Server.php',
|
||||||
|
'OCA\\DAV\\Settings\\AvailabilitySettings' => $baseDir . '/../lib/Settings/AvailabilitySettings.php',
|
||||||
'OCA\\DAV\\Settings\\CalDAVSettings' => $baseDir . '/../lib/Settings/CalDAVSettings.php',
|
'OCA\\DAV\\Settings\\CalDAVSettings' => $baseDir . '/../lib/Settings/CalDAVSettings.php',
|
||||||
'OCA\\DAV\\Storage\\PublicOwnerWrapper' => $baseDir . '/../lib/Storage/PublicOwnerWrapper.php',
|
'OCA\\DAV\\Storage\\PublicOwnerWrapper' => $baseDir . '/../lib/Storage/PublicOwnerWrapper.php',
|
||||||
'OCA\\DAV\\SystemTag\\SystemTagMappingNode' => $baseDir . '/../lib/SystemTag/SystemTagMappingNode.php',
|
'OCA\\DAV\\SystemTag\\SystemTagMappingNode' => $baseDir . '/../lib/SystemTag/SystemTagMappingNode.php',
|
||||||
|
|
|
||||||
|
|
@ -292,6 +292,7 @@ class ComposerStaticInitDAV
|
||||||
'OCA\\DAV\\Search\\EventsSearchProvider' => __DIR__ . '/..' . '/../lib/Search/EventsSearchProvider.php',
|
'OCA\\DAV\\Search\\EventsSearchProvider' => __DIR__ . '/..' . '/../lib/Search/EventsSearchProvider.php',
|
||||||
'OCA\\DAV\\Search\\TasksSearchProvider' => __DIR__ . '/..' . '/../lib/Search/TasksSearchProvider.php',
|
'OCA\\DAV\\Search\\TasksSearchProvider' => __DIR__ . '/..' . '/../lib/Search/TasksSearchProvider.php',
|
||||||
'OCA\\DAV\\Server' => __DIR__ . '/..' . '/../lib/Server.php',
|
'OCA\\DAV\\Server' => __DIR__ . '/..' . '/../lib/Server.php',
|
||||||
|
'OCA\\DAV\\Settings\\AvailabilitySettings' => __DIR__ . '/..' . '/../lib/Settings/AvailabilitySettings.php',
|
||||||
'OCA\\DAV\\Settings\\CalDAVSettings' => __DIR__ . '/..' . '/../lib/Settings/CalDAVSettings.php',
|
'OCA\\DAV\\Settings\\CalDAVSettings' => __DIR__ . '/..' . '/../lib/Settings/CalDAVSettings.php',
|
||||||
'OCA\\DAV\\Storage\\PublicOwnerWrapper' => __DIR__ . '/..' . '/../lib/Storage/PublicOwnerWrapper.php',
|
'OCA\\DAV\\Storage\\PublicOwnerWrapper' => __DIR__ . '/..' . '/../lib/Storage/PublicOwnerWrapper.php',
|
||||||
'OCA\\DAV\\SystemTag\\SystemTagMappingNode' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagMappingNode.php',
|
'OCA\\DAV\\SystemTag\\SystemTagMappingNode' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagMappingNode.php',
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2122
apps/dav/js/settings-personal-availability.js
Normal file
2122
apps/dav/js/settings-personal-availability.js
Normal file
File diff suppressed because one or more lines are too long
1
apps/dav/js/settings-personal-availability.js.map
Normal file
1
apps/dav/js/settings-personal-availability.js.map
Normal file
File diff suppressed because one or more lines are too long
44
apps/dav/lib/Settings/AvailabilitySettings.php
Normal file
44
apps/dav/lib/Settings/AvailabilitySettings.php
Normal file
|
|
@ -0,0 +1,44 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @copyright 2021 Christoph Wurst <christoph@winzerhof-wurst.at>
|
||||||
|
*
|
||||||
|
* @author 2021 Christoph Wurst <christoph@winzerhof-wurst.at>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCA\DAV\Settings;
|
||||||
|
|
||||||
|
use OCA\DAV\AppInfo\Application;
|
||||||
|
use OCP\AppFramework\Http\TemplateResponse;
|
||||||
|
use OCP\Settings\ISettings;
|
||||||
|
|
||||||
|
class AvailabilitySettings implements ISettings {
|
||||||
|
public function getForm(): TemplateResponse {
|
||||||
|
return new TemplateResponse(Application::APP_ID, 'settings-personal-availability');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getSection(): string {
|
||||||
|
return 'groupware';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getPriority(): int {
|
||||||
|
return 10;
|
||||||
|
}
|
||||||
|
}
|
||||||
39
apps/dav/src/dav/client.js
Normal file
39
apps/dav/src/dav/client.js
Normal file
|
|
@ -0,0 +1,39 @@
|
||||||
|
/*
|
||||||
|
* @copyright 2021 Christoph Wurst <christoph@winzerhof-wurst.at>
|
||||||
|
*
|
||||||
|
* @author 2021 Christoph Wurst <christoph@winzerhof-wurst.at>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import * as webdav from 'webdav'
|
||||||
|
import axios from '@nextcloud/axios'
|
||||||
|
import memoize from 'lodash/fp/memoize'
|
||||||
|
import { generateRemoteUrl } from '@nextcloud/router'
|
||||||
|
import { getCurrentUser } from '@nextcloud/auth'
|
||||||
|
|
||||||
|
export const getClient = memoize((service) => {
|
||||||
|
// Add this so the server knows it is an request from the browser
|
||||||
|
axios.defaults.headers['X-Requested-With'] = 'XMLHttpRequest'
|
||||||
|
|
||||||
|
// force our axios
|
||||||
|
const patcher = webdav.getPatcher()
|
||||||
|
patcher.patch('request', axios)
|
||||||
|
|
||||||
|
return webdav.createClient(
|
||||||
|
generateRemoteUrl(`dav/${service}/${getCurrentUser().uid}`)
|
||||||
|
)
|
||||||
|
})
|
||||||
147
apps/dav/src/service/CalendarService.js
Normal file
147
apps/dav/src/service/CalendarService.js
Normal file
|
|
@ -0,0 +1,147 @@
|
||||||
|
/**
|
||||||
|
* @copyright 2021 Christoph Wurst <christoph@winzerhof-wurst.at>
|
||||||
|
*
|
||||||
|
* @author 2021 Christoph Wurst <christoph@winzerhof-wurst.at>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
import { getClient } from '../dav/client'
|
||||||
|
import ICAL from 'ical.js'
|
||||||
|
import logger from './logger'
|
||||||
|
import { parseXML } from 'webdav/dist/node/tools/dav'
|
||||||
|
import { v4 as uuidv4 } from 'uuid'
|
||||||
|
|
||||||
|
export function getEmptySlots() {
|
||||||
|
return {
|
||||||
|
MO: [],
|
||||||
|
TU: [],
|
||||||
|
WE: [],
|
||||||
|
TH: [],
|
||||||
|
FR: [],
|
||||||
|
SA: [],
|
||||||
|
SU: [],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function findScheduleInboxAvailability() {
|
||||||
|
const client = getClient('calendars')
|
||||||
|
|
||||||
|
const response = await client.customRequest('inbox', {
|
||||||
|
method: 'PROPFIND',
|
||||||
|
data: `<?xml version="1.0"?>
|
||||||
|
<x0:propfind xmlns:x0="DAV:">
|
||||||
|
<x0:prop>
|
||||||
|
<x1:calendar-availability xmlns:x1="urn:ietf:params:xml:ns:caldav"/>
|
||||||
|
</x0:prop>
|
||||||
|
</x0:propfind>`
|
||||||
|
})
|
||||||
|
|
||||||
|
const xml = await parseXML(response.data)
|
||||||
|
|
||||||
|
if (!xml) {
|
||||||
|
return undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
const availability = xml?.multistatus?.response[0]?.propstat?.prop['calendar-availability']
|
||||||
|
if (!availability) {
|
||||||
|
return undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
const parsedIcal = ICAL.parse(availability)
|
||||||
|
|
||||||
|
const vcalendarComp = new ICAL.Component(parsedIcal)
|
||||||
|
const vavailabilityComp = vcalendarComp.getFirstSubcomponent('vavailability')
|
||||||
|
const availableComps = vavailabilityComp.getAllSubcomponents('available')
|
||||||
|
|
||||||
|
// Combine all AVAILABLE blocks into a week of slots
|
||||||
|
const slots = getEmptySlots()
|
||||||
|
availableComps.forEach((availableComp) => {
|
||||||
|
const start = availableComp.getFirstProperty('dtstart').getFirstValue().toJSDate()
|
||||||
|
const end = availableComp.getFirstProperty('dtend').getFirstValue().toJSDate()
|
||||||
|
const rrule = availableComp.getFirstProperty('rrule')
|
||||||
|
|
||||||
|
if (rrule.getFirstValue().freq !== 'WEEKLY') {
|
||||||
|
logger.warn('rrule not supported', {
|
||||||
|
rrule: rrule.toICALString(),
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
rrule.getFirstValue().getComponent('BYDAY').forEach(day => {
|
||||||
|
slots[day].push({
|
||||||
|
start,
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
return {
|
||||||
|
slots,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function saveScheduleInboxAvailability(slots, timezoneId) {
|
||||||
|
const all = [...Object.keys(slots).flatMap(dayId => slots[dayId].map(slot => ({
|
||||||
|
...slot,
|
||||||
|
day: dayId,
|
||||||
|
})))]
|
||||||
|
|
||||||
|
const vavailabilityComp = new ICAL.Component('vavailability')
|
||||||
|
// TODO: deduplicate slots that occur on more than one day
|
||||||
|
all.map(slot => {
|
||||||
|
const availableComp = new ICAL.Component('available')
|
||||||
|
|
||||||
|
// Define DTSTART and DTEND
|
||||||
|
// TODO: tz? moment.tz(dateTime, timezone).toDate()
|
||||||
|
const startTimeProp = availableComp.addPropertyWithValue('dtstart', ICAL.Time.fromJSDate(slot.start, false))
|
||||||
|
startTimeProp.setParameter('tzid', timezoneId)
|
||||||
|
const endTimeProp = availableComp.addPropertyWithValue('dtend', ICAL.Time.fromJSDate(slot.end, false))
|
||||||
|
endTimeProp.setParameter('tzid', timezoneId)
|
||||||
|
|
||||||
|
// Add mandatory UID
|
||||||
|
availableComp.addPropertyWithValue('uid', uuidv4())
|
||||||
|
|
||||||
|
// TODO: add optional summary
|
||||||
|
|
||||||
|
// Define RRULE
|
||||||
|
availableComp.addPropertyWithValue('rrule', {
|
||||||
|
freq: 'WEEKLY',
|
||||||
|
byday: slot.day,
|
||||||
|
})
|
||||||
|
|
||||||
|
return availableComp
|
||||||
|
}).map(vavailabilityComp.addSubcomponent.bind(vavailabilityComp))
|
||||||
|
|
||||||
|
const vcalendarComp = new ICAL.Component('vcalendar')
|
||||||
|
vcalendarComp.addSubcomponent(vavailabilityComp)
|
||||||
|
logger.debug('New availability ical created', {
|
||||||
|
asObject: vcalendarComp,
|
||||||
|
asString: vcalendarComp.toString(),
|
||||||
|
})
|
||||||
|
|
||||||
|
const client = getClient('calendars')
|
||||||
|
await client.customRequest('inbox', {
|
||||||
|
method: 'PROPPATCH',
|
||||||
|
data: `<?xml version="1.0"?>
|
||||||
|
<x0:propertyupdate xmlns:x0="DAV:">
|
||||||
|
<x0:set>
|
||||||
|
<x0:prop>
|
||||||
|
<x1:calendar-availability xmlns:x1="urn:ietf:params:xml:ns:caldav">${vcalendarComp.toString()}</x1:calendar-availability>
|
||||||
|
</x0:prop>
|
||||||
|
</x0:set>
|
||||||
|
</x0:propertyupdate>`
|
||||||
|
})
|
||||||
|
}
|
||||||
28
apps/dav/src/service/logger.js
Normal file
28
apps/dav/src/service/logger.js
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
/*
|
||||||
|
* @copyright 2021 Christoph Wurst <christoph@winzerhof-wurst.at>
|
||||||
|
*
|
||||||
|
* @author 2021 Christoph Wurst <christoph@winzerhof-wurst.at>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
import { getLoggerBuilder } from '@nextcloud/logger'
|
||||||
|
|
||||||
|
const logger = getLoggerBuilder()
|
||||||
|
.setApp('dav')
|
||||||
|
.detectUser()
|
||||||
|
.build()
|
||||||
|
|
||||||
|
export default logger
|
||||||
9
apps/dav/src/settings-personal-availability.js
Normal file
9
apps/dav/src/settings-personal-availability.js
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
import Vue from 'vue'
|
||||||
|
import { translate } from '@nextcloud/l10n'
|
||||||
|
import Availability from './views/Availability'
|
||||||
|
|
||||||
|
Vue.prototype.$t = translate
|
||||||
|
|
||||||
|
const View = Vue.extend(Availability);
|
||||||
|
|
||||||
|
(new View({})).$mount('#settings-personal-availability')
|
||||||
223
apps/dav/src/views/Availability.vue
Normal file
223
apps/dav/src/views/Availability.vue
Normal file
|
|
@ -0,0 +1,223 @@
|
||||||
|
<template>
|
||||||
|
<div class="section">
|
||||||
|
<h2>{{ $t('dav', 'Availability') }}</h2>
|
||||||
|
<p>
|
||||||
|
{{ $t('dav', 'If you configure your working hours, other users will see when you are out of office when they book a meeting.') }}
|
||||||
|
</p>
|
||||||
|
<div class="time-zone">
|
||||||
|
<strong>
|
||||||
|
{{ $t('calendar', 'Please select a time zone:') }}
|
||||||
|
</strong>
|
||||||
|
<TimezonePicker v-model="timezone" />
|
||||||
|
</div>
|
||||||
|
<div class="grid-table">
|
||||||
|
<template v-for="day in daysOfTheWeek">
|
||||||
|
<div :key="`day-label-${day.id}`" class="label-weekday">
|
||||||
|
{{ day.displayName }}
|
||||||
|
</div>
|
||||||
|
<div :key="`day-slots-${day.id}`" class="availability-slots">
|
||||||
|
<div class="availability-slot">
|
||||||
|
<template v-for="(slot, idx) in day.slots">
|
||||||
|
<div :key="`slot-${day.id}-${idx}`">
|
||||||
|
<DatetimePicker
|
||||||
|
v-model="slot.start"
|
||||||
|
type="time"
|
||||||
|
class="start-date"
|
||||||
|
format="H:mm" />
|
||||||
|
{{ $t('dav', 'to') }}
|
||||||
|
<DatetimePicker
|
||||||
|
v-model="slot.end"
|
||||||
|
type="time"
|
||||||
|
class="end-date"
|
||||||
|
format="H:mm" />
|
||||||
|
<button :key="`slot-${day.id}-${idx}-btn`"
|
||||||
|
class="icon-delete delete-slot button"
|
||||||
|
:title="$t('dav', 'Delete slot')"
|
||||||
|
@click="deleteSlot(day, idx)" />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
<button :disabled="loading"
|
||||||
|
class="add-another button"
|
||||||
|
@click="addSlot(day)">
|
||||||
|
{{ $t('dav', 'Add slot') }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
<button :disabled="loading || saving"
|
||||||
|
class="button"
|
||||||
|
@click="save">
|
||||||
|
{{ $t('dav', 'Save') }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import DatetimePicker from '@nextcloud/vue/dist/Components/DatetimePicker'
|
||||||
|
import {
|
||||||
|
findScheduleInboxAvailability,
|
||||||
|
getEmptySlots,
|
||||||
|
saveScheduleInboxAvailability,
|
||||||
|
} from '../service/CalendarService'
|
||||||
|
import { getFirstDay } from '@nextcloud/l10n'
|
||||||
|
import jstz from 'jstimezonedetect'
|
||||||
|
import TimezonePicker from '@nextcloud/vue/dist/Components/TimezonePicker'
|
||||||
|
export default {
|
||||||
|
name: 'Availability',
|
||||||
|
components: {
|
||||||
|
DatetimePicker,
|
||||||
|
TimezonePicker,
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
// Try to determine the current timezone, and fall back to UTC otherwise
|
||||||
|
const defaultTimezone = jstz.determine()
|
||||||
|
const defaultTimezoneId = defaultTimezone ? defaultTimezone.name() : 'UTC'
|
||||||
|
|
||||||
|
const moToSa = [
|
||||||
|
{
|
||||||
|
id: 'MO',
|
||||||
|
displayName: this.$t('dav', 'Monday'),
|
||||||
|
slots: [],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'TU',
|
||||||
|
displayName: this.$t('dav', 'Tuesday'),
|
||||||
|
slots: [],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'WE',
|
||||||
|
displayName: this.$t('dav', 'Wednesday'),
|
||||||
|
slots: [],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'TH',
|
||||||
|
displayName: this.$t('dav', 'Thursday'),
|
||||||
|
slots: [],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'FR',
|
||||||
|
displayName: this.$t('dav', 'Friday'),
|
||||||
|
slots: [],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'SA',
|
||||||
|
displayName: this.$t('dav', 'Saturday'),
|
||||||
|
slots: [],
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const sunday = {
|
||||||
|
id: 'SU',
|
||||||
|
displayName: this.$t('dav', 'Sunday'),
|
||||||
|
slots: [],
|
||||||
|
}
|
||||||
|
const daysOfTheWeek = getFirstDay() === 1 ? [...moToSa, sunday] : [sunday, ...moToSa]
|
||||||
|
return {
|
||||||
|
loading: true,
|
||||||
|
saving: false,
|
||||||
|
timezone: defaultTimezoneId,
|
||||||
|
daysOfTheWeek,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async mounted() {
|
||||||
|
try {
|
||||||
|
const { slots } = await findScheduleInboxAvailability()
|
||||||
|
if (slots) {
|
||||||
|
this.daysOfTheWeek.forEach(day => {
|
||||||
|
day.slots.push(...slots[day.id])
|
||||||
|
})
|
||||||
|
}
|
||||||
|
console.info('availability loaded', this.daysOfTheWeek)
|
||||||
|
} catch (e) {
|
||||||
|
console.error('could not load existing availability', e)
|
||||||
|
|
||||||
|
// TODO: show a nice toast
|
||||||
|
} finally {
|
||||||
|
this.loading = false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
addSlot(day) {
|
||||||
|
const start = new Date()
|
||||||
|
start.setHours(9)
|
||||||
|
start.setMinutes(0)
|
||||||
|
start.setSeconds(0)
|
||||||
|
const end = new Date()
|
||||||
|
end.setHours(17)
|
||||||
|
end.setMinutes(0)
|
||||||
|
end.setSeconds(0)
|
||||||
|
day.slots.push({
|
||||||
|
start,
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
},
|
||||||
|
deleteSlot(day, idx) {
|
||||||
|
day.slots.splice(idx, 1)
|
||||||
|
},
|
||||||
|
async save() {
|
||||||
|
try {
|
||||||
|
this.saving = true
|
||||||
|
|
||||||
|
const slots = getEmptySlots()
|
||||||
|
this.daysOfTheWeek.forEach(day => {
|
||||||
|
day.slots.forEach(slot => slots[day.id].push(slot))
|
||||||
|
})
|
||||||
|
await saveScheduleInboxAvailability(slots, this.timezone)
|
||||||
|
|
||||||
|
// TODO: show a nice toast
|
||||||
|
} catch (e) {
|
||||||
|
console.error('could not save availability', e)
|
||||||
|
|
||||||
|
// TODO: show a nice toast
|
||||||
|
} finally {
|
||||||
|
this.saving = false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.availability-day {
|
||||||
|
padding: 0 10px 10px 10px;
|
||||||
|
position: absolute;
|
||||||
|
}
|
||||||
|
.availability-slots {
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
.availability-slot {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
::v-deep .mx-input-wrapper {
|
||||||
|
width: 85px;
|
||||||
|
}
|
||||||
|
::v-deep .mx-datepicker {
|
||||||
|
width: 110px;
|
||||||
|
}
|
||||||
|
::v-deep .multiselect {
|
||||||
|
border: 1px solid var(--color-border-dark);
|
||||||
|
width: 120px;
|
||||||
|
}
|
||||||
|
.time-zone {
|
||||||
|
padding: 12px 12px 12px 0;
|
||||||
|
}
|
||||||
|
.grid-table {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: min-content auto;
|
||||||
|
}
|
||||||
|
.button {
|
||||||
|
align-self: flex-end;
|
||||||
|
}
|
||||||
|
.label-weekday {
|
||||||
|
padding: 8px 23px 14px 0;
|
||||||
|
position: relative;
|
||||||
|
display: inline-flex;
|
||||||
|
}
|
||||||
|
.delete-slot {
|
||||||
|
background-color: transparent;
|
||||||
|
border: none;
|
||||||
|
padding: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
</style>
|
||||||
29
apps/dav/templates/settings-personal-availability.php
Normal file
29
apps/dav/templates/settings-personal-availability.php
Normal file
|
|
@ -0,0 +1,29 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright 2017, Georg Ehrke <oc.list@georgehrke.com>
|
||||||
|
*
|
||||||
|
* @author Georg Ehrke <oc.list@georgehrke.com>
|
||||||
|
* @author François Freitag <mail@franek.fr>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
script('dav', 'settings-personal-availability');
|
||||||
|
|
||||||
|
?>
|
||||||
|
|
||||||
|
<div id="settings-personal-availability"></div>
|
||||||
|
|
@ -25,6 +25,7 @@ const path = require('path')
|
||||||
module.exports = {
|
module.exports = {
|
||||||
entry: {
|
entry: {
|
||||||
'settings-admin-caldav': path.join(__dirname, 'src', 'settings.js'),
|
'settings-admin-caldav': path.join(__dirname, 'src', 'settings.js'),
|
||||||
|
'settings-personal-availability': path.join(__dirname, 'src', 'settings-personal-availability.js'),
|
||||||
},
|
},
|
||||||
output: {
|
output: {
|
||||||
path: path.resolve(__dirname, './js'),
|
path: path.resolve(__dirname, './js'),
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,7 @@
|
||||||
<personal>OCA\Settings\Settings\Personal\Security\Password</personal>
|
<personal>OCA\Settings\Settings\Personal\Security\Password</personal>
|
||||||
<personal>OCA\Settings\Settings\Personal\Security\TwoFactor</personal>
|
<personal>OCA\Settings\Settings\Personal\Security\TwoFactor</personal>
|
||||||
<personal>OCA\Settings\Settings\Personal\Security\WebAuthn</personal>
|
<personal>OCA\Settings\Settings\Personal\Security\WebAuthn</personal>
|
||||||
|
<personal-section>OCA\Settings\Sections\Personal\Groupware</personal-section>
|
||||||
<personal-section>OCA\Settings\Sections\Personal\PersonalInfo</personal-section>
|
<personal-section>OCA\Settings\Sections\Personal\PersonalInfo</personal-section>
|
||||||
<personal-section>OCA\Settings\Sections\Personal\Security</personal-section>
|
<personal-section>OCA\Settings\Sections\Personal\Security</personal-section>
|
||||||
<personal-section>OCA\Settings\Sections\Personal\SyncClients</personal-section>
|
<personal-section>OCA\Settings\Sections\Personal\SyncClients</personal-section>
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,7 @@ return array(
|
||||||
'OCA\\Settings\\Sections\\Admin\\Security' => $baseDir . '/../lib/Sections/Admin/Security.php',
|
'OCA\\Settings\\Sections\\Admin\\Security' => $baseDir . '/../lib/Sections/Admin/Security.php',
|
||||||
'OCA\\Settings\\Sections\\Admin\\Server' => $baseDir . '/../lib/Sections/Admin/Server.php',
|
'OCA\\Settings\\Sections\\Admin\\Server' => $baseDir . '/../lib/Sections/Admin/Server.php',
|
||||||
'OCA\\Settings\\Sections\\Admin\\Sharing' => $baseDir . '/../lib/Sections/Admin/Sharing.php',
|
'OCA\\Settings\\Sections\\Admin\\Sharing' => $baseDir . '/../lib/Sections/Admin/Sharing.php',
|
||||||
|
'OCA\\Settings\\Sections\\Personal\\Groupware' => $baseDir . '/../lib/Sections/Personal/Groupware.php',
|
||||||
'OCA\\Settings\\Sections\\Personal\\PersonalInfo' => $baseDir . '/../lib/Sections/Personal/PersonalInfo.php',
|
'OCA\\Settings\\Sections\\Personal\\PersonalInfo' => $baseDir . '/../lib/Sections/Personal/PersonalInfo.php',
|
||||||
'OCA\\Settings\\Sections\\Personal\\Security' => $baseDir . '/../lib/Sections/Personal/Security.php',
|
'OCA\\Settings\\Sections\\Personal\\Security' => $baseDir . '/../lib/Sections/Personal/Security.php',
|
||||||
'OCA\\Settings\\Sections\\Personal\\SyncClients' => $baseDir . '/../lib/Sections/Personal/SyncClients.php',
|
'OCA\\Settings\\Sections\\Personal\\SyncClients' => $baseDir . '/../lib/Sections/Personal/SyncClients.php',
|
||||||
|
|
|
||||||
|
|
@ -63,6 +63,7 @@ class ComposerStaticInitSettings
|
||||||
'OCA\\Settings\\Sections\\Admin\\Security' => __DIR__ . '/..' . '/../lib/Sections/Admin/Security.php',
|
'OCA\\Settings\\Sections\\Admin\\Security' => __DIR__ . '/..' . '/../lib/Sections/Admin/Security.php',
|
||||||
'OCA\\Settings\\Sections\\Admin\\Server' => __DIR__ . '/..' . '/../lib/Sections/Admin/Server.php',
|
'OCA\\Settings\\Sections\\Admin\\Server' => __DIR__ . '/..' . '/../lib/Sections/Admin/Server.php',
|
||||||
'OCA\\Settings\\Sections\\Admin\\Sharing' => __DIR__ . '/..' . '/../lib/Sections/Admin/Sharing.php',
|
'OCA\\Settings\\Sections\\Admin\\Sharing' => __DIR__ . '/..' . '/../lib/Sections/Admin/Sharing.php',
|
||||||
|
'OCA\\Settings\\Sections\\Personal\\Groupware' => __DIR__ . '/..' . '/../lib/Sections/Personal/Groupware.php',
|
||||||
'OCA\\Settings\\Sections\\Personal\\PersonalInfo' => __DIR__ . '/..' . '/../lib/Sections/Personal/PersonalInfo.php',
|
'OCA\\Settings\\Sections\\Personal\\PersonalInfo' => __DIR__ . '/..' . '/../lib/Sections/Personal/PersonalInfo.php',
|
||||||
'OCA\\Settings\\Sections\\Personal\\Security' => __DIR__ . '/..' . '/../lib/Sections/Personal/Security.php',
|
'OCA\\Settings\\Sections\\Personal\\Security' => __DIR__ . '/..' . '/../lib/Sections/Personal/Security.php',
|
||||||
'OCA\\Settings\\Sections\\Personal\\SyncClients' => __DIR__ . '/..' . '/../lib/Sections/Personal/SyncClients.php',
|
'OCA\\Settings\\Sections\\Personal\\SyncClients' => __DIR__ . '/..' . '/../lib/Sections/Personal/SyncClients.php',
|
||||||
|
|
|
||||||
58
apps/settings/lib/Sections/Personal/Groupware.php
Normal file
58
apps/settings/lib/Sections/Personal/Groupware.php
Normal file
|
|
@ -0,0 +1,58 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
|
||||||
|
*
|
||||||
|
* Mail
|
||||||
|
*
|
||||||
|
* This code is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License, version 3,
|
||||||
|
* as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCA\Settings\Sections\Personal;
|
||||||
|
|
||||||
|
use OCP\IL10N;
|
||||||
|
use OCP\IURLGenerator;
|
||||||
|
use OCP\Settings\IIconSection;
|
||||||
|
|
||||||
|
class Groupware implements IIconSection {
|
||||||
|
|
||||||
|
/** @var IL10N */
|
||||||
|
private $l;
|
||||||
|
|
||||||
|
/** @var IURLGenerator */
|
||||||
|
private $urlGenerator;
|
||||||
|
|
||||||
|
public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
|
||||||
|
$this->l = $l;
|
||||||
|
$this->urlGenerator = $urlGenerator;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getIcon(): string {
|
||||||
|
return $this->urlGenerator->imagePath('core', 'places/contacts.svg');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getID(): string {
|
||||||
|
return 'groupware';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getName(): string {
|
||||||
|
return $this->l->t('Groupware');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getPriority(): int {
|
||||||
|
return 50;
|
||||||
|
}
|
||||||
|
}
|
||||||
2
package-lock.json
generated
2
package-lock.json
generated
|
|
@ -39,6 +39,7 @@
|
||||||
"dompurify": "^2.3.3",
|
"dompurify": "^2.3.3",
|
||||||
"escape-html": "^1.0.3",
|
"escape-html": "^1.0.3",
|
||||||
"handlebars": "^4.7.7",
|
"handlebars": "^4.7.7",
|
||||||
|
"ical.js": "^1.4.0",
|
||||||
"jquery": "~3.3",
|
"jquery": "~3.3",
|
||||||
"jquery-migrate": "~3.3",
|
"jquery-migrate": "~3.3",
|
||||||
"jquery-ui": "^1.13.0",
|
"jquery-ui": "^1.13.0",
|
||||||
|
|
@ -58,6 +59,7 @@
|
||||||
"strengthify": "git+https://github.com/MorrisJobke/strengthify.git#0.5.9",
|
"strengthify": "git+https://github.com/MorrisJobke/strengthify.git#0.5.9",
|
||||||
"underscore": "^1.12.0",
|
"underscore": "^1.12.0",
|
||||||
"url-search-params-polyfill": "^8.1.1",
|
"url-search-params-polyfill": "^8.1.1",
|
||||||
|
"uuid": "^8.3.2",
|
||||||
"v-click-outside": "^3.1.2",
|
"v-click-outside": "^3.1.2",
|
||||||
"v-tooltip": "^2.1.3",
|
"v-tooltip": "^2.1.3",
|
||||||
"vue": "^2.6.14",
|
"vue": "^2.6.14",
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,7 @@
|
||||||
"dompurify": "^2.3.3",
|
"dompurify": "^2.3.3",
|
||||||
"escape-html": "^1.0.3",
|
"escape-html": "^1.0.3",
|
||||||
"handlebars": "^4.7.7",
|
"handlebars": "^4.7.7",
|
||||||
|
"ical.js": "^1.4.0",
|
||||||
"jquery": "~3.3",
|
"jquery": "~3.3",
|
||||||
"jquery-migrate": "~3.3",
|
"jquery-migrate": "~3.3",
|
||||||
"jquery-ui": "^1.13.0",
|
"jquery-ui": "^1.13.0",
|
||||||
|
|
@ -74,6 +75,7 @@
|
||||||
"strengthify": "git+https://github.com/MorrisJobke/strengthify.git#0.5.9",
|
"strengthify": "git+https://github.com/MorrisJobke/strengthify.git#0.5.9",
|
||||||
"underscore": "^1.12.0",
|
"underscore": "^1.12.0",
|
||||||
"url-search-params-polyfill": "^8.1.1",
|
"url-search-params-polyfill": "^8.1.1",
|
||||||
|
"uuid": "^8.3.2",
|
||||||
"v-click-outside": "^3.1.2",
|
"v-click-outside": "^3.1.2",
|
||||||
"v-tooltip": "^2.1.3",
|
"v-tooltip": "^2.1.3",
|
||||||
"vue": "^2.6.14",
|
"vue": "^2.6.14",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue