Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resource booking #9773

Merged
merged 9 commits into from
Jun 29, 2018
Merged

resource booking #9773

merged 9 commits into from
Jun 29, 2018

Conversation

georgehrke
Copy link
Member

@georgehrke georgehrke commented Jun 6, 2018

ToDo:

  • add proper testing instructions
  • unit test for Managers / TimedJob

@georgehrke georgehrke added the 2. developing Work in progress label Jun 6, 2018
@georgehrke georgehrke added this to the Nextcloud 14 milestone Jun 6, 2018
@georgehrke georgehrke force-pushed the feature/noid/resource_booking branch from 0ae774f to b7a5f72 Compare June 19, 2018 00:09
@codecov
Copy link

codecov bot commented Jun 19, 2018

Codecov Report

Merging #9773 into master will increase coverage by <.01%.
The diff coverage is 72.07%.

@@             Coverage Diff              @@
##             master    #9773      +/-   ##
============================================
+ Coverage     52.07%   52.08%   +<.01%     
- Complexity    25946    26115     +169     
============================================
  Files          1645     1668      +23     
  Lines         95839    96563     +724     
  Branches       1290     1290              
============================================
+ Hits          49907    50291     +384     
- Misses        45932    46272     +340
Impacted Files Coverage Δ Complexity Δ
apps/dav/composer/composer/autoload_static.php 0% <ø> (ø) 1 <0> (ø) ⬇️
apps/dav/lib/CalDAV/CalDavBackend.php 83.68% <ø> (ø) 256 <0> (ø) ⬇️
...av/lib/Migration/Version1005Date20180530124431.php 0% <0%> (ø) 3 <3> (?)
apps/dav/appinfo/app.php 0% <0%> (ø) 0 <0> (ø) ⬇️
apps/dav/composer/composer/autoload_classmap.php 0% <0%> (ø) 0 <0> (ø) ⬇️
apps/dav/lib/CalDAV/Schedule/Plugin.php 16.32% <0%> (-4.19%) 23 <0> (+6)
apps/dav/lib/CalDAV/Plugin.php 100% <100%> (ø) 4 <4> (+2) ⬆️
apps/dav/lib/CalDAV/CalendarRoot.php 75% <100%> (+75%) 4 <3> (+3) ⬆️
apps/dav/lib/Server.php 47.2% <25%> (-0.6%) 22 <0> (ø)
...alDAV/ResourceBooking/ResourcePrincipalBackend.php 50% <50%> (ø) 1 <1> (?)
... and 54 more

@georgehrke georgehrke force-pushed the feature/noid/resource_booking branch 4 times, most recently from c1ba1f6 to a476550 Compare June 19, 2018 00:23
@georgehrke georgehrke changed the title [WIP] resource booking resource booking Jun 19, 2018
@georgehrke georgehrke force-pushed the feature/noid/resource_booking branch from a476550 to 789c29f Compare June 19, 2018 09:55
@georgehrke georgehrke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 19, 2018
@MorrisJobke
Copy link
Member

add proper testing instructions

🏓

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
…urce / room information

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke georgehrke force-pushed the feature/noid/resource_booking branch from 7bf454f to cba783f Compare June 25, 2018 05:45
@georgehrke
Copy link
Member Author

georgehrke commented Jun 25, 2018

To review this:

  • install a resource booking backend like https://github.com/georgehrke/admin_resource_booking_database
    (that backend is still in development, you can already use it to add / remove resources. You have to enter valid json into the group_restrictions field for now. I checked in all the compiled javascript files, so no need to run any build command)
  • add resources / rooms:
    5e9dff26-1368-4324-bb4a-a3bd79e77fc8
    (all fields are mandatory!)
  • open thunderbird
  • schedule an event with one of the rooms / resources as attendee
  • schedule another event on the same day and check if the time slot you previously selected is blocked in the Invite attendees dialog
  • move events around to see that Free/Busy data for resources / rooms updates properly
  • delete events to see that time slots are freed again.

@rullzer
Copy link
Member

rullzer commented Jun 26, 2018

Gave it a quick try and seems to do its job. Awesome.
I'll have a closer look at the code later.

@MorrisJobke
Copy link
Member

@juliusknorr
Copy link
Member

I'm getting the following error when I try to add a resource:

Too few arguments to function OCA\DAV\BackgroundJob\UpdateCalendarResourcesRoomsBackgroundJob::run(), 0 passed in /var/www/html/apps/dav/appinfo/app.php on line 54 and exactly 1 expected

{"reqId":"wKQZfztGtnE0JcDGm9Ok","level":3,"time":"2018-06-27T17:02:07+00:00","remoteAddr":"192.170.0.1","user":"admin","app":"index","method":"POST","url":"\/index.php\/apps\/admin_resource_booking_database\/api\/resources","message":{"Exception":"ArgumentCountError","Message":"Too few arguments to function OCA\\DAV\\BackgroundJob\\UpdateCalendarResourcesRoomsBackgroundJob::run(), 0 passed in \/var\/www\/html\/apps\/dav\/appinfo\/app.php on line 54 and exactly 1 expected","Code":0,"Trace":[{"file":"\/var\/www\/html\/apps\/dav\/appinfo\/app.php","line":54,"function":"run","class":"OCA\\DAV\\BackgroundJob\\UpdateCalendarResourcesRoomsBackgroundJob","type":"->","args":[]},{"file":"\/var\/www\/html\/3rdparty\/symfony\/event-dispatcher\/EventDispatcher.php","line":212,"function":"{closure}","class":"OC_App","type":"::","args":["*** sensitive parameters replaced ***"]},{"file":"\/var\/www\/html\/3rdparty\/symfony\/event-dispatcher\/EventDispatcher.php","line":44,"function":"doDispatch","class":"Symfony\\Component\\EventDispatcher\\EventDispatcher","type":"->","args":[[{"__class__":"Closure"}],"*** sensitive parameter replaced ***","*** sensitive parameter replaced ***"]},{"file":"\/var\/www\/html\/apps-extra\/admin_resource_booking_database\/lib\/Controller\/ResourceBookingController.php","line":149,"function":"dispatch","class":"Symfony\\Component\\EventDispatcher\\EventDispatcher","type":"->","args":["*** sensitive parameter replaced ***"]},{"file":"\/var\/www\/html\/lib\/private\/AppFramework\/Http\/Dispatcher.php","line":166,"function":"createResource","class":"OCA\\AdminResourceBookingDatabase\\Controller\\ResourceBookingController","type":"->","args":[]},{"file":"\/var\/www\/html\/lib\/private\/AppFramework\/Http\/Dispatcher.php","line":99,"function":"executeController","class":"OC\\AppFramework\\Http\\Dispatcher","type":"->","args":[{"__class__":"OCA\\AdminResourceBookingDatabase\\Controller\\ResourceBookingController"},"createResource"]},{"file":"\/var\/www\/html\/lib\/private\/AppFramework\/App.php","line":118,"function":"dispatch","class":"OC\\AppFramework\\Http\\Dispatcher","type":"->","args":[{"__class__":"OCA\\AdminResourceBookingDatabase\\Controller\\ResourceBookingController"},"createResource"]},{"file":"\/var\/www\/html\/lib\/private\/AppFramework\/Routing\/RouteActionHandler.php","line":47,"function":"main","class":"OC\\AppFramework\\App","type":"::","args":["OCA\\AdminResourceBookingDatabase\\Controller\\ResourceBookingController","createResource",{"__class__":"OC\\AppFramework\\DependencyInjection\\DIContainer"},{"_route":"admin_resource_booking_database.resource_booking.createResource"}]},{"function":"__invoke","class":"OC\\AppFramework\\Routing\\RouteActionHandler","type":"->","args":[{"_route":"admin_resource_booking_database.resource_booking.createResource"}]},{"file":"\/var\/www\/html\/lib\/private\/Route\/Router.php","line":297,"function":"call_user_func","args":[{"__class__":"OC\\AppFramework\\Routing\\RouteActionHandler"},{"_route":"admin_resource_booking_database.resource_booking.createResource"}]},{"file":"\/var\/www\/html\/lib\/base.php","line":992,"function":"match","class":"OC\\Route\\Router","type":"->","args":["\/apps\/admin_resource_booking_database\/api\/resources"]},{"file":"\/var\/www\/html\/index.php","line":42,"function":"handleRequest","class":"OC","type":"::","args":[]}],"File":"\/var\/www\/html\/apps\/dav\/lib\/BackgroundJob\/UpdateCalendarResourcesRoomsBackgroundJob.php","Line":87,"CustomMessage":"--"},"userAgent":"Mozilla\/5.0 (X11; Linux x86_64) AppleWebKit\/537.36 (KHTML, like Gecko) Chrome\/67.0.3396.87 Safari\/537.36","version":"14.0.0.5"}

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke
Copy link
Member Author

@juliushaertl Not sure why i didnt receive that error message, but it should be fixed now

Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Code looks good and I gave it a rough smoke test 👍

Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

Also my quick smoke test worked.

@MorrisJobke MorrisJobke merged commit 89b6ee1 into master Jun 29, 2018
@MorrisJobke MorrisJobke deleted the feature/noid/resource_booking branch June 29, 2018 04:51
@almet
Copy link

almet commented Feb 14, 2019

Hey, I believe this has been merged, but I cannot find how to use this from my nextcloud server. Is there any documentation anywhere? Thanks!

@greenvespa
Copy link

I'm looking for this feature too, I thought it was added in Nextcloud 14 as described in this official announcement https://nextcloud.com/blog/nextcloud-14-now-available-with-video-verification-signaltelegram-2fa-support-improved-collaboration-and-gdpr-compliance/ but I can't find it in my nextcloud server. Am I missing something? Thanks!

@almet
Copy link

almet commented Mar 4, 2019

@greenvespa haven't found myself, it doesn't seem to be working ATM. Let me know if you find something!

@Shen
Copy link

Shen commented Dec 27, 2019

What happened to this great feature? Still in development?

@fwolfst
Copy link

fwolfst commented Jan 17, 2020

What happened to this great feature? Still in development?
Calender 2.0 just released. I think now it will slowly become time to revive this (if it was actually sleeping).

@georgehrke
Copy link
Member Author

I think now it will slowly become time to revive this (if it was actually sleeping).

Please see #17961 (comment)

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants