Skip to content

Appointments Slot Support - #3470

Merged
miaulalala merged 55 commits into
masterfrom
enhancement/appointments
Nov 25, 2021
Merged

Appointments Slot Support#3470
miaulalala merged 55 commits into
masterfrom
enhancement/appointments

Conversation

@miaulalala

@miaulalala miaulalala commented Sep 13, 2021

Copy link
Copy Markdown
Contributor

This brings all the basics of #1023

Fixes #3482
Fixes #3478
Fixes #3481
Fixes #3477

Todo

  • Add a unique index on the appointment config token
  • Add start and end date
  • rename buffer field to be more self explanatory
  • change from minutes to seconds for interval, length, ...

@miaulalala miaulalala added 2. developing Work in progress enhancement New feature request labels Sep 13, 2021
@miaulalala miaulalala self-assigned this Sep 13, 2021
Comment thread tests/php/unit/Controller/AppointmentsControllerTest.php Outdated
Comment thread lib/Db/Appointment.php Outdated
Comment thread composer.json Outdated

@st3iny st3iny left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the date range field is missing from the API (ref #1023 (comment)).

@ChristophWurst
ChristophWurst marked this pull request as draft October 27, 2021 12:17
Comment thread composer.json Outdated
Comment thread lib/Profile/AppointmentsAction.php Outdated
Comment thread lib/Profile/AppointmentsAction.php Outdated
Comment thread lib/Db/AppointmentConfig.php
Comment thread lib/Migration/Version2040Date20210908101001.php
Comment thread lib/Db/AppointmentConfig.php
@st3iny

st3iny commented Nov 5, 2021

Copy link
Copy Markdown
Member

CRUD UI for configs is live for testing.

@ChristophWurst ChristophWurst added this to the v3.0.0 milestone Nov 9, 2021
Comment thread lib/Controller/AppointmentConfigController.php Outdated
@ChristophWurst
ChristophWurst force-pushed the enhancement/appointments branch 2 times, most recently from b910721 to a2d6467 Compare November 24, 2021 13:15
@nextcloud nextcloud deleted a comment from codecov Bot Nov 24, 2021
@codecov

codecov Bot commented Nov 24, 2021

Copy link
Copy Markdown

Codecov Report

Merging #3470 (571b093) into master (84d7011) will increase coverage by 2.10%.
The diff coverage is 0.50%.

❗ Current head 571b093 differs from pull request most recent head 87e8586. Consider uploading reports for the commit 87e8586 to get more accurate results
Impacted file tree graph

@@             Coverage Diff              @@
##             master    #3470      +/-   ##
============================================
+ Coverage     27.70%   29.80%   +2.10%     
- Complexity      123      309     +186     
============================================
  Files           165      219      +54     
  Lines          6018     7278    +1260     
  Branches        877      907      +30     
============================================
+ Hits           1667     2169     +502     
- Misses         4351     5109     +758     
Flag Coverage Δ
javascript 20.90% <0.50%> (-1.44%) ⬇️
php 70.22% <ø> (-24.40%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
src/appointments/main-booking.js 0.00% <0.00%> (ø)
src/appointments/main-confirmation.js 0.00% <0.00%> (ø)
src/appointments/main-conflict.js 0.00% <0.00%> (ø)
src/appointments/main-overview.js 0.00% <0.00%> (ø)
...components/AppNavigation/AppointmentConfigList.vue 0.00% <0.00%> (ø)
...ppointmentConfigList/AppointmentConfigListItem.vue 0.00% <0.00%> (ø)
...onents/AppNavigation/Settings/ShortcutOverview.vue 0.00% <ø> (ø)
src/components/AppointmentConfigModal.vue 0.00% <0.00%> (ø)
...s/AppointmentConfigModal/CheckedDurationSelect.vue 0.00% <0.00%> (ø)
...components/AppointmentConfigModal/Confirmation.vue 0.00% <0.00%> (ø)
... and 52 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 84d7011...87e8586. Read the comment docs.

@ChristophWurst
ChristophWurst marked this pull request as ready for review November 24, 2021 14:21
@ChristophWurst ChristophWurst added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Nov 24, 2021
miaulalala and others added 25 commits November 25, 2021 16:06
Signed-off-by: Anna Larch <anna@nextcloud.com>
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
Signed-off-by: Anna Larch <anna@nextcloud.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Anna Larch <anna@nextcloud.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@ChristophWurst
ChristophWurst force-pushed the enhancement/appointments branch from 571b093 to 87e8586 Compare November 25, 2021 15:06

@ChristophWurst ChristophWurst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works as expected 👍 🎊 :shipit:

@miaulalala

Copy link
Copy Markdown
Contributor Author

For me too.

@miaulalala
miaulalala merged commit 0b667ea into master Nov 25, 2021
@delete-merged-branch
delete-merged-branch Bot deleted the enhancement/appointments branch November 25, 2021 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews enhancement New feature request

Projects

None yet

5 participants