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

[FIX] Longpolling messages

Browse Source
This commit is contained in:
Alexandre Díaz
2019-01-30 20:13:14 +01:00
parent 536a9f6cac
commit 36a0117840
3 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -827,9 +827,9 @@ var PMSCalendarController = AbstractController.extend({
var active_calendar = this._multi_calendar.get_active_calendar();
var filterDates = active_calendar.getDates();
var dfrom_fmt = filterDates[0].format(HotelConstants.ODOO_DATETIME_MOMENT_FORMAT),
dto_fmt = filterDates[1].format(HotelConstants.ODOO_DATETIME_MOMENT_FORMAT),
now_fmt = moment().format(HotelConstants.ODOO_DATETIME_MOMENT_FORMAT);
var dfrom_fmt = filterDates[0].format(HotelConstants.ODOO_DATE_MOMENT_FORMAT),
dto_fmt = filterDates[1].format(HotelConstants.ODOO_DATE_MOMENT_FORMAT),
now_fmt = moment().format(HotelConstants.ODOO_DATE_MOMENT_FORMAT);
var domain_checkouts = [
['checkout', '=', now_fmt],

54
hotel_calendar/static/src/js/views/calendar/hotel_calendar_renderer.js
View File

@@ -59,9 +59,16 @@ var HotelCalendarView = AbstractRenderer.extend({
update_buttons_counter: function(ncheckouts, ncheckins, noverbookings, ncancelled) {
var self = this;
// Checkouts Button
var $ninfo = self.$el.find('#pms-menu #btn_action_checkout span.ninfo');
$ninfo.text(ncheckouts);
// Checkins Button
$ninfo = self.$el.find('#pms-menu #btn_action_checkin span.ninfo');
$ninfo.text(ncheckins);
// OverBookings
var $ninfo = self.$el.find('#pms-menu #btn_action_overbooking span.ninfo');
$ninfo = self.$el.find('#pms-menu #btn_action_overbooking span.ninfo');
$ninfo.text(noverbookings);
if (noverbookings) {
$ninfo.parent().parent().addClass('overbooking-highlight');
@@ -69,14 +76,14 @@ var HotelCalendarView = AbstractRenderer.extend({
$ninfo.parent().parent().removeClass('overbooking-highlight');
}
// // Cancelled
// $ninfo = self.$el.find('#pms-menu #btn_action_cancelled span.ninfo');
// $ninfo.text(ncancelled);
// if (ncancelled) {
// $ninfo.parent().parent().addClass('cancelled-highlight');
// } else {
// $ninfo.parent().parent().removeClass('cancelled-highlight');
// }
// Cancelled
$ninfo = self.$el.find('#pms-menu #btn_action_cancelled span.ninfo');
$ninfo.text(ncancelled);
if (ncancelled) {
$ninfo.parent().parent().addClass('cancelled-highlight');
} else {
$ninfo.parent().parent().removeClass('cancelled-highlight');
}
},
init_calendar_view: function(){
@@ -85,20 +92,20 @@ var HotelCalendarView = AbstractRenderer.extend({
/** VIEW CONTROLS INITIALIZATION **/
// DATE TIME PICKERS
var DTPickerOptions = {
viewMode: 'months',
icons : {
time: 'fa fa-clock-o',
date: 'fa fa-calendar',
up: 'fa fa-chevron-up',
down: 'fa fa-chevron-down'
},
//language : moment.locale(),
locale : moment.locale(),
format : HotelConstants.L10N_DATE_MOMENT_FORMAT,
widgetPositioning:{
horizontal: 'auto',
vertical: 'bottom'
}
viewMode: 'months',
icons : {
time: 'fa fa-clock-o',
date: 'fa fa-calendar',
up: 'fa fa-chevron-up',
down: 'fa fa-chevron-down'
},
//language : moment.locale(),
locale : moment.locale(),
format : HotelConstants.L10N_DATE_MOMENT_FORMAT,
widgetPositioning:{
horizontal: 'auto',
vertical: 'bottom'
}
};
var $dateTimePickerBegin = this.$el.find('#pms-menu #date_begin');
var $dateEndDays = this.$el.find('#pms-menu #date_end_days');
@@ -162,6 +169,7 @@ var HotelCalendarView = AbstractRenderer.extend({
});
return $.when(
this.trigger_up('onUpdateButtonsCounter'),
this.trigger_up('onLoadViewFilters'),
);
},