Reservations now show on calendar

This commit is contained in:
Senad Uka
2024-09-08 14:00:15 +02:00
parent b258de57fb
commit ef4243ee2a
4 changed files with 11 additions and 10 deletions

10
.idea/workspace.xml generated
View File

@@ -5,12 +5,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="4396ea83-1b77-4c6e-9398-0afe5751bc17" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/terminator.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/terminator.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/assets/stylesheets/application.tailwind.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/assets/stylesheets/application.tailwind.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/views/layouts/calendar.html.erb" beforeDir="false" afterPath="$PROJECT_DIR$/app/views/layouts/calendar.html.erb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/controllers/reservations_controller.rb" beforeDir="false" afterPath="$PROJECT_DIR$/app/controllers/reservations_controller.rb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/javascript/controllers/main_calendar_controller.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/javascript/controllers/main_calendar_controller.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/models/reservation.rb" beforeDir="false" afterPath="$PROJECT_DIR$/app/models/reservation.rb" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -300,7 +298,7 @@
<workItem from="1723563784398" duration="15000" />
<workItem from="1723887734623" duration="12035000" />
<workItem from="1725691855747" duration="173000" />
<workItem from="1725692047994" duration="973000" />
<workItem from="1725692047994" duration="3679000" />
</task>
<servers />
</component>