Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 0b667ead authored by Anna Larch's avatar Anna Larch Committed by GitHub
Browse files

Merge pull request #3470 from nextcloud/enhancement/appointments 

Appointments Slot Support
parents 84d70110 87e85869

.github/workflows/lint.yml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ jobs: 
    runs-on: ubuntu-latest

    strategy:

      matrix:

        php-versions: ['7.2', '7.3', '7.4', '8.0']

        php-versions: ['7.3', '7.4', '8.0']

    name: php${{ matrix.php-versions }} lint

    steps:

      - name: Checkout

.github/workflows/php-test.yml

+1 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ jobs: 
        php-versions: ['7.3', '7.4']

        nextcloud-versions: ['stable20', 'stable21', 'stable22', 'stable23', 'master']

        include:

          - php-versions: '7.2'

          - php-versions: '7.3'

            nextcloud-versions: 'stable20'

          - php-versions: '8.0'

            nextcloud-versions: 'master'
@@ -41,10 +41,6 @@ jobs: 
      if: ${{ matrix.nextcloud-versions == 'stable20' }}

      working-directory: nextcloud/3rdparty

      run: composer require nikic/php-parser:4.10

    - name: Downgrade phpunit for php7.2

      if: ${{ matrix.php-versions == '7.2' }}

      working-directory: nextcloud/apps/calendar

      run: composer update christophwurst/nextcloud_testing -W

    - name: Install dependencies

      working-directory: nextcloud/apps/calendar

      run: composer install

appinfo/info.xml

+4 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
* ☑️ Tasks! See tasks with a due date directly in the calendar

* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.

	]]></description>

	<version>2.4.0-RC.2</version>

	<version>3.0.0-alpha.1</version>

	<licence>agpl</licence>

	<author homepage="https://georg.coffee">Georg Ehrke</author>

	<author homepage="https://tcit.fr">Thomas Citharel</author>
@@ -36,6 +36,9 @@ 
	<dependencies>

		<nextcloud min-version="20" max-version="24" />

	</dependencies>

	<background-jobs>

		<job>OCA\Calendar\BackgroundJob\CleanUpOutdatedBookingsJob</job>

	</background-jobs>

	<repair-steps>

		<post-migration>

			<step>OCA\Calendar\RepairSteps\CurrentViewNameRepairStep</step>

appinfo/routes.php

+9 −0
Original line number Diff line number Diff line
@@ -34,6 +34,12 @@ return [ 
		['name' => 'view#index', 'url' => '/{view}/{timeRange}', 'verb' => 'GET', 'requirements' => ['view' => 'timeGridDay|timeGridWeek|dayGridMonth|listMonth'], 'postfix' => 'view.timerange'],

		['name' => 'view#index', 'url' => '/{view}/{timeRange}/new/{mode}/{isAllDay}/{dtStart}/{dtEnd}', 'verb' => 'GET', 'requirements' => ['view' => 'timeGridDay|timeGridWeek|dayGridMonth|listMonth'], 'postfix' => 'view.timerange.new'],

		['name' => 'view#index', 'url' => '/{view}/{timeRange}/edit/{mode}/{objectId}/{recurrenceId}', 'verb' => 'GET', 'requirements' => ['view' => 'timeGridDay|timeGridWeek|dayGridMonth|listMonth'], 'postfix' => 'view.timerange.edit'],

		// Appointments

		['name' => 'appointment#index', 'url' => '/appointments/{userId}', 'verb' => 'GET'],

		['name' => 'appointment#show', 'url' => '/appointment/{token}', 'verb' => 'GET'],

		['name' => 'booking#getBookableSlots', 'url' => '/appointment/{appointmentConfigId}/slots', 'verb' => 'GET'],

		['name' => 'booking#bookSlot', 'url' => '/appointment/{appointmentConfigId}/book', 'verb' => 'POST'],

		['name' => 'booking#confirmBooking', 'url' => '/appointment/confirm/{token}', 'verb' => 'GET'],

		// Public views

		['name' => 'publicView#public_index_with_branding', 'url' => '/p/{token}', 'verb' => 'GET'],

		['name' => 'publicView#public_index_with_branding', 'url' => '/p/{token}/{view}/{timeRange}', 'verb' => 'GET', 'postfix' => 'publicview.timerange'],
@@ -51,5 +57,8 @@ return [ 
		['name' => 'settings#setConfig', 'url' => '/v1/config/{key}', 'verb' => 'POST'],

		// Tools

		['name' => 'email#sendEmailPublicLink', 'url' => '/v1/public/sendmail', 'verb' => 'POST'],

	],

	'resources' => [

		'appointmentConfig' => ['url' => '/v1/appointment_configs']

	]

];

composer.json

+8 −1
Original line number Diff line number Diff line 
{

    "config": {

        "platform": {

            "php": "7.3"

        },

        "sort-packages": true

    },

    "require": {

        "php": "^7.2|^8.0"

    },
@@ -10,6 +16,7 @@ 
        "cs:fix": "php-cs-fixer fix",

        "cs:check": "php-cs-fixer fix --dry-run --diff",

        "lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",

        "test": "phpunit --configuration phpunit.unit.xml --fail-on-warning"

        "test": "phpunit --configuration phpunit.unit.xml --fail-on-warning",

        "test:dev": "phpunit --configuration phpunit.unit.xml --fail-on-warning --stop-on-error --stop-on-failure"

    }

}