[16.0][MIG] resource_booking: Migration to 16.0 #101

norlinhenrik · 2023-08-30T12:17:56Z

Improvements in this migration:

Booking: Refactored _get_available_slots() works also when each slot is multiple days
Booking Type: new field slot_duration
Contact: button -> Bookings
Combination -> Bookings -> Create booking: Set the default combination from the navigation
Booking: may have multiple contacts
Booking: When type_id is missing (booking from Timeline view), get empty Intervals (instead of error)
Booking: Search on combination
Booking: Refactored _availability_is_fitting()
Booking: List view with hidden contacts (the new field)
Work intervals (with migration): To span multiple days, set hour_to = 24 instead of 23:59
XML renaming (with migration)
[15.0][IMP] resource_booking: Allow a booking to span more than one calendar day #100

Later PRs for version 15.0 of resource_booking (104, 106, 110, 111) are not included in this PR.

norlinhenrik · 2023-09-12T19:21:10Z

The partner calendar dropdown menu does not work in version 16.0.
I am not a frontend developer. Is there anyone else who could troubleshoot this?

norlinhenrik · 2023-09-13T15:30:49Z

I had to rename data-toggle to data-bs-toggle. I did the same with some other data attributes, in a separate commit.

pedrobaeza · 2023-09-13T15:36:08Z

Check OCA/openupgradelib#338

norlinhenrik · 2023-09-13T16:28:24Z

Thank you for the link, @pedrobaeza
How do I use the BS4 to BS5 tool to update a module?

data-target should change to data-bs-target.
Should t-attf-data-target change to t-attf-data-bs-target ?

pedrobaeza · 2023-09-13T17:19:45Z

How do I use the BS4 to BS5 tool to update a module?

It's more like a mapping reference than a direct tool

Should t-attf-data-target change to t-attf-data-bs-target ?

Yes, as the prefix t-attf- means that the rest of the attribute is parametric.

norlinhenrik · 2023-09-19T18:10:10Z

I have included Allow a booking to span more than one calendar day #100

@yajo @pedrobaeza Would you like to review?

victoralmau · 2023-09-27T06:27:50Z

Please, cherry-pick #104 (resolves the comment in #101 (comment))

stefan-tecnativa

Please, solve the web_calendar_slot_duration dependency and attend the comments.

@Tecnativa TT45649

stefan-tecnativa · 2023-10-27T08:53:51Z

resource_booking/models/resource_booking_type.py

+                default_type_id=self.id,
+                # Context used by web_calendar_slot_duration module
+                calendar_slot_duration=FloatTimeParser.value_to_html(
+                    self.duration, False


Suggested change

self.duration, False

self.slot_duration, False

You added a slot_duration field intentionally to separe the duration of the booking and the slot in calendar, so this change is consequent. But anyway this change is uselles because without the dependency of web_calendar_slot_duration this doesn't work.
If you look at my PR: OCA/web#2646 , you must notice that the slot_duration that expects is in this format: (00:00:00), but this FloatTimeParser function returns it in this one: (00:00). So you will have to make a conversion from the Float to this first format.

Is (00:00:00) new for v16?
If yes, can you help me with this conversion?
If no, can you show me where the conversion is done for self.duration?

stefan-tecnativa · 2023-10-27T08:59:03Z

resource_booking/__manifest__.py

@@ -25,7 +25,6 @@
        "mail",
        "portal",
        "resource",
-        "web_calendar_slot_duration",


You can't remove this dependency, it is necessary to maintain the functionallity of the module. Here I post a PR that i made migrating correctly the module: OCA/web#2646

carolinafernandez-tecnativa · 2023-10-30T14:16:38Z

Hi how are you? There is one commit missing from 15.0
a4548a1

flotho

Thanks for this migration.
Functional tests in progress
ACL issue for admin :

IMHO, admin user should be able to setup thoses exceptions

flotho · 2023-10-30T22:36:51Z

Question regarding the process,
Does this module could also replace something like calendly ?
In this case, how to share available slot to be booked on the portal and/or on public website ?
Regards

pedrobaeza · 2023-10-31T07:19:40Z

Yes, it can act like Calendly. Just click on the Share button of the resource booking.

norlinhenrik · 2023-11-01T09:42:58Z

Thank you for all the feedback. I will work on this one of the next days.

norlinhenrik · 2023-11-05T14:17:15Z

Thanks for this migration. Functional tests in progress ACL issue for admin :

IMHO, admin user should be able to setup thoses exceptions

Security for Resource Time Off is defined in resource. Admin may create global leaves, but not leaves for specific human resources.

norlinhenrik · 2023-11-05T14:52:46Z

Should I squash together all my commits, or just those who are highly related?

Improvements in this migration:

Booking: Refactored _get_available_slots() works also when each slot is multiple days
Booking Type: new field slot_duration
Contact: button -> Bookings
Combination -> Bookings -> Create booking: Set the default combination from the navigation
Booking: may have multiple contacts
Booking: When type_id is missing (booking from Timeline view), get empty Intervals (instead of error)
Booking: Search on combination
Booking: Refactored _availability_is_fitting()
Booking: List view with hidden contacts (the new field)
Work intervals (with migration): To span multiple days, set hour_to = 24 instead of 23:59
XML renaming (with migration)

JavierIniesta · 2023-11-23T12:05:16Z

Hi @norlinhenrik

Thank you for your efforts.

Could you push again to see if the problem with the pre-commit is resolved? It looks like there was some problem during the process with the nodejs environment.

This module adds a new app to allow you to book resource combinations in given schedules. Example use cases: * Management of consultations in a clinic. * Salesman appointments. * Classroom and projector reservations. * Hotel room booking. Among the things you can do: * Specify the type of booking, which includes a calendar of availability. * Specify which resources can be booked together. All of them must be free to be booked. * Place pending bookings, effectively giving permissions to someone to see the availability calendar and choose one slot. * Partners can do that from their portals. * If a partner has no user, he can still do the same via a tokenized URL. * Backend users can also do that from the backend. * Booking lifecycle with computed states. * Automatic meeting creation and deletion. * Automatic conflict detection. * Deadline to block modifications. @Tecnativa TT28201

Currently translated at 100.0% (190 of 190 strings) Translation: calendar-12.0/calendar-12.0-resource_booking Translate-URL: https://translation.odoo-community.org/projects/calendar-12-0/calendar-12-0-resource_booking/es/

TT29508

…ating calendars Without this patch, users couldn't change a calendar schedule if there were past or unconfirmed bookings that wouldn't fit in it. Excluding those bookings from the check fixes the situation. We also check that, to confirm a booking, it must fit in the calendar (because now it can happen that, in the time that has passed since the booking was scheduled until it is confirmed, the calendar changes). @Tecnativa TT29509

The notifications emitted to the resource booking requester must always be in the same TZ as the resource booking itself. For example, if you book one hotel room in the other side of the world, a notification in your own TZ is confusing. Besides, res.partner created from website_sale are created with `tz=False`, making it even more confusing. @Tecnativa TT30331

The constraint that checks the schedule of a resource booking is currently being applied to all the bookings, including past ones. As the resource combination or associated calendars might change regularly and trigger a recomputation of this, such change might take a very long time. Plus, the calendar restrictions might change, trigger a recompute of the constraint and detect bookings that can't be assigned, which makes no sense when they already happened. This applies it only to future bookings, ignoring past ones. TT30478

norlinhenrik · 2024-01-28T13:44:19Z

@pedrobaeza CONTRIBUTING mentions oca_dependencies.txt which seems apropiate in this case too because web_calendar_slot_duration dependency. Is it an outdated convention???

I would like to update the documentation about oca_dependencies.txt. Please join the discussion here.

rrebollo · 2024-01-31T19:10:36Z

@norlinhenrik I was doing some testing using runboat build on the last commit to this PR. Something bizarre it's happening using a tokenized url to portal to schedule the book: It gets stuck on December 2023. See what I mean. First I'm showing the settings (Basically everyone is in the same TZ), later the "problem". I'm using a negative timezone (-5 I think):

Surely the core of the issue is:
here

    def _get_calendar_context(self, year=None, month=None, now=None):
        """Get the required context for the calendar view in the portal.


        See the `resource_booking.scheduling_calendar` view.


        :param int year: Year of the calendar to be displayed.
        :param int month: Month of the calendar to be displayed.
        :param datetime now: Represents the current datetime.
        """
        month1 = relativedelta(months=1)
        now = now or fields.Datetime.now()
        year = year or now.year
        month = month or now.month
        start = datetime(year, month, 1)
        start, now = (
            fields.Datetime.context_timestamp(self, dt) for dt in (start, now)
        )
        start = start.replace(hour=0, minute=0, second=0, microsecond=0)
        lang = self.env["res.lang"]._lang_get(self.env.lang or self.env.user.lang)
        weekday_names = dict(lang.fields_get(["week_start"])["week_start"]["selection"])
        booking_duration = timedelta(hours=self.duration)
        slots = self._get_available_slots(start, start + month1 + booking_duration)
        return {
            "booking": self,
            "calendar": calendar.Calendar(int(lang.week_start) - 1),
            "now": now,
            "res_lang": lang,
            "slots": slots,
            "start": start,
            "weekday_names": weekday_names,
        }

It isn't clear to me why:

start, now = (
            fields.Datetime.context_timestamp(self, dt) for dt in (start, now)
        )

should'nt the target here be January 1st, 2024 no matter TZ? @pedrobaeza Am I getting things wrong?
The "issue" happens to be "solved" with

❯ git diff
diff --git a/resource_booking/models/resource_booking.py b/resource_booking/models/resource_booking.py
index effe7d9..ccea10d 100644
--- a/resource_booking/models/resource_booking.py
+++ b/resource_booking/models/resource_booking.py
@@ -508,7 +508,7 @@ class ResourceBooking(models.Model):
             "now": now,
             "res_lang": lang,
             "slots": slots,
-            "start": start,
+            "start": fields.Date.from_string(f'{year}-{month}-01'),
             "weekday_names": weekday_names,
         }
 
diff --git a/resource_booking/templates/portal.xml b/resource_booking/templates/portal.xml
index 8931d7e..54b82fd 100644
--- a/resource_booking/templates/portal.xml
+++ b/resource_booking/templates/portal.xml
@@ -44,7 +44,7 @@
                     <tr>
                         <th class="text-left">
                             <a
-                                t-if="start > now"
+                                t-if="start > now.date()"
                                 t-att-href="booking.get_portal_url(suffix='/schedule/%d/%d' % (start_previous.year, start_previous.month))"
                                 class="btn btn-secondary"
                                 title="Previous month"

norlinhenrik · 2024-02-01T10:41:09Z

start should be the very beginning of the month, in the timezone of self.env["tz"].
This is fixed in the latest commit.

rrebollo · 2024-02-01T11:19:56Z

@norlinhenrik partner auto-subcription to bookings looks like isn't working either here. I'm taking this.
Edited: auto subscription doesn't work on booking creation. It's fine at update.

rrebollo · 2024-02-01T13:51:35Z

@norlinhenrik partner auto-subcription to bookings looks like isn't working either here. I'm taking this. Edited: auto subscription doesn't work on booking creation. It's fine at update.

@norlinhenrik I think it is intended because in related calendar events followers are rigthtly settled. So I think no work is required here.

rrebollo · 2024-02-01T15:35:04Z

@norlinhenrik I made an small fix. When trying to schedule a booking from booking form view but no name has been given to the booking it raises an OWl error when clicking on the calendar view. I created a PR to your branch. Please check it out.

ayushin · 2024-02-03T12:37:01Z

not to rush anybody, but lets keep the momentum!

i'm willing to help in any way i can to get this merged asap

norlinhenrik · 2024-02-03T19:29:18Z

@ayushin If you have tested and think it is ready to merge, then click on Files changed -> Review changes -> Approve.

jelenapoblet

It's working just fine, i've been testing it out on runboat. The only thing that bugs me a little it's on the smartphone view.

rrebollo · 2024-02-06T09:19:20Z

It's working just fine, i've been testing it out on runboat. The only thing that bugs me a little it's on the smartphone view.

It's happening here too. Any known frontend dev to assit us???

rrebollo · 2024-02-06T10:51:54Z

@jelenapoblet I think I "fixed" the calendar going wider. According to Bootstrap 5.1 doc .table-responsive-md should be in a div as parent for the table element with .table. @norlinhenrik PR loymcom#1.

pedrobaeza · 2024-02-07T11:17:16Z

/ocabot migration resource_booking

Please finish your reviews.

norlinhenrik · 2024-02-08T08:32:51Z

@rrebollo I have included your latest commit.

pedrobaeza · 2024-02-09T19:09:18Z

Great, please squash all the commits by author into their migration one for being mergeable.

norlinhenrik · 2024-02-21T20:26:31Z

Done

pedrobaeza · 2024-02-24T11:18:46Z

resource_booking/__manifest__.py

+        "python": [
+            # Used implicitly
+            "cssselect",
+            "freezegun",


This is not correct. This dependency is not for the module, but for tests. You must remove it from here and put it in test_requirements.txt file in root.

@norlinhenrik I have pushed to loymcom#1 a commit fixing this

cssselect may be needed for the module itself. I was talking about freezegun. Anyway, the CI is still red.

[IMP] resource_booking: new field slot_duration [IMP] resource_booking: Button (partner -> booking) [IMP] resource_booking: combination -> bookings -> create: default combination [IMP] resource_booking: A booking may have multiple contacts, e.g. people in a room [FIX] resource_booking: _get_intervals() when type_id is missing [IMP] resource_booking: booking: search on combination [FIX] resource_booking: _availability_is_fitting() [IMP] resource_booking: booking list view with hidden partner_ids [FIX] resource_booking: migration: attendance hour_to 23:59 -> 24:00 [IMP] resource_booking: rename_xmlids [FIX] resource_booking: pre-commit [FIX] resource_booking: calendar_slot_duration format [FIX] resource_booking: _get_calendar_context() with correct start / timezone

[IMP] resource_booking: fix failling BackendCase. test_booking_from_calendar_view [IMP] resource_booking: fix typo in help parameter for combination_assignment field from resource_booking_type [IMP] resource_booking: fix failing PortalCase.test_portal_no_bookings Test was failling cause there was no bookings link on portal home for external users, then no trigger. Also I had to tweak eslintrc config cause precommit was failling due to ECMA version. [IMP] resource_booking: No create/unlink call if nothing to do [FIX] resource_booking: error CalendarQuickCreate title is not a string when scheduling a booking [FIX] resource_booking: portal responsive booking calendar table going wider and no x scroll

norlinhenrik · 2024-02-28T19:50:55Z

All checks have passed now.

pedrobaeza · 2024-02-29T00:03:12Z

resource_booking/models/resource_booking.py

+    )
+    name = fields.Char(index=True, help="Leave empty to autogenerate a booking name.")
+    description = fields.Html()
+    partner_id = fields.Many2one(


This is not correct according v15:

https://github.com/OCA/calendar/blob/15.0/resource_booking/models/resource_booking.py#L126

The compute/inverse is in this field, not in partner_ids.

partner_ids was added to 15.0 after I suggested it for 16.0. Probably I don't need this field after all.

@pedrobaeza Feel free to propose a new commit to do the correction. You may remove partner_ids if you want.

But I think the field may be practcal in some scenarios, even though I don't need it right now.

@victoralmau please resume this migration including all the 15.0 stuff. Please complete and include #114 as well.

victoralmau · 2024-03-11T15:36:11Z

Superseed by #120

pedrobaeza · 2024-03-11T15:44:37Z

As the other has preserved attribution, closing in favor of it.

norlinhenrik force-pushed the 16.0-mig-resource_booking branch from 526c899 to c480d0f Compare August 30, 2023 14:19

norlinhenrik force-pushed the 16.0-mig-resource_booking branch 2 times, most recently from 8f63084 to 1606216 Compare September 19, 2023 18:08

norlinhenrik mentioned this pull request Sep 22, 2023

[16.0][IMP] resource_booking: partner button #102

Closed

loymcom force-pushed the 16.0-mig-resource_booking branch 3 times, most recently from c225a57 to 7921fe3 Compare October 5, 2023 07:02

stefan-tecnativa suggested changes Oct 27, 2023

View reviewed changes

stefan-tecnativa reviewed Oct 27, 2023

View reviewed changes

flotho reviewed Oct 30, 2023

View reviewed changes

Jairo Llopis and others added 6 commits November 27, 2023 21:06

Translated using Weblate (Spanish)

f9a07cc

Currently translated at 100.0% (190 of 190 strings) Translation: calendar-12.0/calendar-12.0-resource_booking Translate-URL: https://translation.odoo-community.org/projects/calendar-12-0/calendar-12-0-resource_booking/es/

[IMP] resource_booking: filter/group by date

9d3ff11

TT29508

norlinhenrik force-pushed the 16.0-mig-resource_booking branch from 0b29fe7 to 16abc45 Compare February 1, 2024 10:47

jelenapoblet reviewed Feb 5, 2024

View reviewed changes

OCA-git-bot added this to the 16.0 milestone Feb 7, 2024

OCA-git-bot mentioned this pull request Feb 7, 2024

Migration to version 16.0 #71

Open

2 tasks

jelenapoblet approved these changes Feb 8, 2024

View reviewed changes

norlinhenrik force-pushed the 16.0-mig-resource_booking branch from 4d678fb to b9a6c0d Compare February 13, 2024 07:13

pedrobaeza requested changes Feb 24, 2024

View reviewed changes

norlinhenrik and others added 2 commits February 28, 2024 20:46

norlinhenrik force-pushed the 16.0-mig-resource_booking branch from 57b9e35 to 819b914 Compare February 28, 2024 19:47

pedrobaeza reviewed Feb 29, 2024

View reviewed changes

victoralmau mentioned this pull request Mar 11, 2024

[16.0][MIG] resource_booking: Migration to 16.0 #120

Merged

3 tasks

pedrobaeza closed this Mar 11, 2024

[16.0][MIG] resource_booking: Migration to 16.0 #101

[16.0][MIG] resource_booking: Migration to 16.0 #101

Conversation

norlinhenrik commented Aug 30, 2023 • edited Loading

norlinhenrik commented Sep 12, 2023

norlinhenrik commented Sep 13, 2023

pedrobaeza commented Sep 13, 2023

norlinhenrik commented Sep 13, 2023

pedrobaeza commented Sep 13, 2023

norlinhenrik commented Sep 19, 2023

victoralmau commented Sep 27, 2023

stefan-tecnativa left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

carolinafernandez-tecnativa commented Oct 30, 2023

flotho left a comment

Choose a reason for hiding this comment

flotho commented Oct 30, 2023

pedrobaeza commented Oct 31, 2023

norlinhenrik commented Nov 1, 2023

norlinhenrik commented Nov 5, 2023

norlinhenrik commented Nov 5, 2023

JavierIniesta commented Nov 23, 2023

norlinhenrik commented Jan 28, 2024

rrebollo commented Jan 31, 2024 • edited Loading

norlinhenrik commented Feb 1, 2024

rrebollo commented Feb 1, 2024 • edited Loading

rrebollo commented Feb 1, 2024 • edited Loading

rrebollo commented Feb 1, 2024

ayushin commented Feb 3, 2024

norlinhenrik commented Feb 3, 2024

jelenapoblet left a comment

Choose a reason for hiding this comment

rrebollo commented Feb 6, 2024

rrebollo commented Feb 6, 2024

pedrobaeza commented Feb 7, 2024

norlinhenrik commented Feb 8, 2024

pedrobaeza commented Feb 9, 2024

norlinhenrik commented Feb 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

norlinhenrik commented Feb 28, 2024

Choose a reason for hiding this comment

norlinhenrik Mar 3, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

victoralmau commented Mar 11, 2024

pedrobaeza commented Mar 11, 2024

norlinhenrik commented Aug 30, 2023 •

edited

Loading

rrebollo commented Jan 31, 2024 •

edited

Loading

rrebollo commented Feb 1, 2024 •

edited

Loading

rrebollo commented Feb 1, 2024 •

edited

Loading

norlinhenrik Mar 3, 2024 •

edited

Loading