audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] design calendar

Browse Source
This commit is contained in:
Dario Lodeiros
2019-02-02 10:09:03 +01:00
parent 26de115941
commit 432a45042b
3 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
hotel_calendar/static/src/css/view.css
View File

@@ -75,36 +75,30 @@
.unify-enabled {
background-color: #43A200;
box-shadow: 0 0 8px 0px #43A200;
color: white;
}
.divide-enabled {
background-color: #43A200;
box-shadow: 0 0 8px 0px #43A200;
color: white;
}
.overbooking-enabled {
background-color: #43A200;
box-shadow: 0 0 8px 0px #43A200;
color: white;
}
.cancelled-enabled {
background-color: #43A200;
box-shadow: 0 0 8px 0px #43A200;
}
.swap-from {
background-color: #E7CF1D;
box-shadow: 0 0 8px 0px #E7CF1D;
color: #7C7BAD;
}
.swap-to {
background-color: #43A200;
box-shadow: 0 0 8px 0px #43A200;
color: white;
}
@@ -156,12 +150,7 @@ input#bookings_search {
background-color: #FFA500;
}
.cancelled-highlight {
color: white;
background-color: #FFA500;
}
.overbooking-highlight i, .cancelled-highlight i {
.overbooking-highlight i {
color: white;
}
@@ -388,4 +377,4 @@ div.pull-right-custom {
margin-right: 15px;
color: #777;
text-align: right;
}
}

8
hotel_calendar/static/src/js/views/calendar/hotel_calendar_controller.js
View File

@@ -824,11 +824,13 @@ var PMSCalendarController = AbstractController.extend({
var domain_checkouts = [
['checkout', '=', now_fmt],
['state', 'not in', ['cancelled']]
['state', 'in', ['booking']],
['reservation_type', 'not in', ['out']]
];
var domain_checkins = [
['checkin', '=', now_fmt],
['state', 'not in', ['cancelled']]
['state', 'in', ['confirm']],
['reservation_type', 'not in', ['out']]
];
var domain_overbookings = [
['checkin', '>=', dfrom_fmt],
@@ -843,7 +845,7 @@ var PMSCalendarController = AbstractController.extend({
['state', '=', 'cancelled']
];
$.when(
$.when(
this.model.search_count(domain_checkouts),
this.model.search_count(domain_checkins),
this.model.search_count(domain_overbookings),

8
hotel_calendar/views/actions.xml
View File

@@ -6,7 +6,9 @@
<field name="res_model">hotel.reservation</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('checkin','=', datetime.datetime.now().strftime('%Y-%m-%d'))]</field>
<field name="domain">[('checkin','=', datetime.datetime.now().strftime('%Y-%m-%d'),
('state', 'in', ('confirm')),
('reservation_type', 'not in', ('out')))]</field>
</record>
<record model="ir.actions.act_window" id="hotel_reservation_action_checkout">
@@ -14,7 +16,9 @@
<field name="res_model">hotel.reservation</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('checkout','=', datetime.datetime.now().strftime('%Y-%m-%d'))]</field>
<field name="domain">[('checkout','=', datetime.datetime.now().strftime('%Y-%m-%d'),
('state', 'in', ('booking')),
('reservation_type', 'not in', ('out')))]</field>
</record>
<record model="ir.actions.act_window" id="hotel_calendar_action_form_tree">