From 2fce02802d4753b86a08315bad8d8b565e272280 Mon Sep 17 00:00:00 2001 From: braisab Date: Wed, 27 Apr 2022 11:38:36 +0200 Subject: [PATCH] [REF]pms_api_rest: changed property colors from module pms to module pms_api_rest --- pms/models/pms_property.py | 79 --------------------- pms/views/pms_property_views.xml | 67 ------------------ pms_api_rest/__init__.py | 1 + pms_api_rest/__manifest__.py | 5 +- pms_api_rest/models/__init__.py | 1 + pms_api_rest/models/pms_property.py | 84 +++++++++++++++++++++++ pms_api_rest/views/pms_property_views.xml | 78 +++++++++++++++++++++ 7 files changed, 168 insertions(+), 147 deletions(-) create mode 100644 pms_api_rest/models/__init__.py create mode 100644 pms_api_rest/models/pms_property.py create mode 100644 pms_api_rest/views/pms_property_views.xml diff --git a/pms/models/pms_property.py b/pms/models/pms_property.py index fa27c99be..1b0c055cb 100644 --- a/pms/models/pms_property.py +++ b/pms/models/pms_property.py @@ -238,85 +238,6 @@ class PmsProperty(models.Model): default=get_default_logo(), ) - color_option_config = fields.Selection( - string="Color Option Configuration", - help="Configuration of the color code for the planning.", - selection=[("simple", "Simple"), ("advanced", "Advanced")], - default="simple", - ) - - simple_out_color = fields.Char( - string="Reservations Outside", - help="Color for done reservations in the planning.", - default="rgba(94,208,236)", - ) - - simple_in_color = fields.Char( - string="Reservations Inside", - help="Color for onboard and departure_delayed reservations in the planning.", - default="rgba(0,146,183)", - ) - - simple_future_color = fields.Char( - string="Future Reservations", - help="Color for confirm, arrival_delayed and draft reservations in the planning.", - default="rgba(1,182,227)", - ) - - pre_reservation_color = fields.Char( - string="Pre-Reservation", - help="Color for draft reservations in the planning.", - default="rgba(162,70,128)", - ) - - confirmed_reservation_color = fields.Char( - string="Confirmed Reservation", - default="rgba(1,182,227)", - help="Color for confirm reservations in the planning.", - ) - - paid_reservation_color = fields.Char( - string="Paid Reservation", - help="Color for done paid reservations in the planning.", - default="rgba(126,126,126)", - ) - - on_board_reservation_color = fields.Char( - string="Checkin", - help="Color for onboard not paid reservations in the planning.", - default="rgba(255,64,64)", - ) - - paid_checkin_reservation_color = fields.Char( - string="Paid Checkin", - help="Color for onboard paid reservations in the planning.", - default="rgba(130,191,7)", - ) - - out_reservation_color = fields.Char( - string="Checkout", - help="Color for done not paid reservations in the planning.", - default="rgba(88,77,118)", - ) - - staff_reservation_color = fields.Char( - string="Staff", - help="Color for staff reservations in the planning.", - default="rgba(192,134,134)", - ) - - to_assign_reservation_color = fields.Char( - string="OTA Reservation To Assign", - help="Color for to_assign reservations in the planning.", - default="rgba(237,114,46,)", - ) - - pending_payment_reservation_color = fields.Char( - string="Payment Pending", - help="Color for pending payment reservations in the planning.", - default="rgba(162,70,137)", - ) - @api.depends_context( "checkin", "checkout", diff --git a/pms/views/pms_property_views.xml b/pms/views/pms_property_views.xml index d6dcefd0d..b70761089 100644 --- a/pms/views/pms_property_views.xml +++ b/pms/views/pms_property_views.xml @@ -85,73 +85,6 @@ - - - - - - - - - - - - - - - - - - - diff --git a/pms_api_rest/__init__.py b/pms_api_rest/__init__.py index 5b9cd7bd0..420420767 100644 --- a/pms_api_rest/__init__.py +++ b/pms_api_rest/__init__.py @@ -1,3 +1,4 @@ from . import controllers from . import datamodels from . import services +from . import models diff --git a/pms_api_rest/__manifest__.py b/pms_api_rest/__manifest__.py index 7bf98aa07..f7af4d0ef 100644 --- a/pms_api_rest/__manifest__.py +++ b/pms_api_rest/__manifest__.py @@ -16,6 +16,9 @@ "external_dependencies": { "python": ["jwt", "simplejson", "marshmallow", "jose"], }, - "data": ["data/auth_jwt_validator.xml"], + "data": [ + "data/auth_jwt_validator.xml", + "views/pms_property_views.xml", + ], "installable": True, } diff --git a/pms_api_rest/models/__init__.py b/pms_api_rest/models/__init__.py new file mode 100644 index 000000000..9216f6ffd --- /dev/null +++ b/pms_api_rest/models/__init__.py @@ -0,0 +1 @@ +from . import pms_property diff --git a/pms_api_rest/models/pms_property.py b/pms_api_rest/models/pms_property.py new file mode 100644 index 000000000..a9c224253 --- /dev/null +++ b/pms_api_rest/models/pms_property.py @@ -0,0 +1,84 @@ +from odoo import fields, models + + +class PmsProperty(models.Model): + _inherit = "pms.property" + + color_option_config = fields.Selection( + string="Color Option Configuration", + help="Configuration of the color code for the planning.", + selection=[("simple", "Simple"), ("advanced", "Advanced")], + default="simple", + ) + + simple_out_color = fields.Char( + string="Reservations Outside", + help="Color for done reservations in the planning.", + default="rgba(94,208,236)", + ) + + simple_in_color = fields.Char( + string="Reservations Inside", + help="Color for onboard and departure_delayed reservations in the planning.", + default="rgba(0,146,183)", + ) + + simple_future_color = fields.Char( + string="Future Reservations", + help="Color for confirm, arrival_delayed and draft reservations in the planning.", + default="rgba(1,182,227)", + ) + + pre_reservation_color = fields.Char( + string="Pre-Reservation", + help="Color for draft reservations in the planning.", + default="rgba(162,70,128)", + ) + + confirmed_reservation_color = fields.Char( + string="Confirmed Reservation", + default="rgba(1,182,227)", + help="Color for confirm reservations in the planning.", + ) + + paid_reservation_color = fields.Char( + string="Paid Reservation", + help="Color for done paid reservations in the planning.", + default="rgba(126,126,126)", + ) + + on_board_reservation_color = fields.Char( + string="Checkin", + help="Color for onboard not paid reservations in the planning.", + default="rgba(255,64,64)", + ) + + paid_checkin_reservation_color = fields.Char( + string="Paid Checkin", + help="Color for onboard paid reservations in the planning.", + default="rgba(130,191,7)", + ) + + out_reservation_color = fields.Char( + string="Checkout", + help="Color for done not paid reservations in the planning.", + default="rgba(88,77,118)", + ) + + staff_reservation_color = fields.Char( + string="Staff", + help="Color for staff reservations in the planning.", + default="rgba(192,134,134)", + ) + + to_assign_reservation_color = fields.Char( + string="OTA Reservation To Assign", + help="Color for to_assign reservations in the planning.", + default="rgba(237,114,46,)", + ) + + pending_payment_reservation_color = fields.Char( + string="Payment Pending", + help="Color for pending payment reservations in the planning.", + default="rgba(162,70,137)", + ) diff --git a/pms_api_rest/views/pms_property_views.xml b/pms_api_rest/views/pms_property_views.xml new file mode 100644 index 000000000..cc3afd76e --- /dev/null +++ b/pms_api_rest/views/pms_property_views.xml @@ -0,0 +1,78 @@ + + + + pms.property + + + + + + + + + + + + + + + + + + + + + + + + + +