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

[ADD] Refresh Filters Button [IMP] Hotel Calendar UTC usage

Browse Source
This commit is contained in:
QS5ELkMu
2018-12-22 17:25:47 +01:00
parent 1a2929ea84
commit 9461d4b4fa
2 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -323,7 +323,6 @@ var PMSCalendarController = AbstractController.extend({
this.renderer.$el.find('#pms-menu #btn_save_calendar_record').on('click', function(ev){ this.renderer.$el.find('#pms-menu #btn_save_calendar_record').on('click', function(ev){
var active_calendar_record = self._multi_calendar.get_calendar_record(self._multi_calendar.get_active_index()); var active_calendar_record = self._multi_calendar.get_calendar_record(self._multi_calendar.get_active_index());
active_calendar_record.name = "LOLO";
var name = self.renderer.$el.find('#pms-menu #calendar_name').val(); var name = self.renderer.$el.find('#pms-menu #calendar_name').val();
var category = _.map(self.renderer.$el.find('#pms-menu #type_list').val(), function(item){ return +item; }); var category = _.map(self.renderer.$el.find('#pms-menu #type_list').val(), function(item){ return +item; });
@@ -350,9 +349,22 @@ var PMSCalendarController = AbstractController.extend({
}); });
}); });
this.renderer.$el.find('#pms-menu #btn_reload_calendar_filters').on('click', function(ev){
var active_calendar_record = self._multi_calendar.get_calendar_record(self._multi_calendar.get_active_index());
self._multi_calendar.update_active_tab_name(active_calendar_record.name);
var $calendar_name = this.renderer.$el.find('#pms-menu .menu-filter-box #calendar_name');
$calendar_name.val(active_calendar_record.name);
self._refresh_filters({
'class_id': active_calendar_record['segmentation_ids'],
'floor_id': active_calendar_record['location_ids'],
'amenities': active_calendar_record['amenity_ids'],
'room_type_id': active_calendar_record['room_type_ids'],
});
});
this._multi_calendar.on('tab_changed', function(ev, active_index){ this._multi_calendar.on('tab_changed', function(ev, active_index){
if (active_index) { if (active_index) {
self._refresh_filters(active_index); self._refresh_view_options(active_index);
} }
}); });
}, },
@@ -800,7 +812,7 @@ var PMSCalendarController = AbstractController.extend({
} }
}, },
_refresh_filters: function(active_index) { _refresh_view_options: function(active_index) {
var active_calendar = this._multi_calendar.get_calendar(active_index); var active_calendar = this._multi_calendar.get_calendar(active_index);
/* Dates */ /* Dates */
@@ -854,19 +866,22 @@ var PMSCalendarController = AbstractController.extend({
$calendar_name.val(active_calendar_record['name']); $calendar_name.val(active_calendar_record['name']);
/* Calendar Filters */ /* Calendar Filters */
var active_filters = this._multi_calendar.get_active_filters(); this._refresh_filters(this._multi_calendar.get_active_filters());
var $segmentation = this.renderer.$el.find('#pms-menu #type_list'); },
var $location = this.renderer.$el.find('#pms-menu #floor_list');
var $amenities = this.renderer.$el.find('#pms-menu #amenities_list'); _refresh_filters: function(calendar_filters) {
var $types = this.renderer.$el.find('#pms-menu #virtual_list'); var $segmentation = this.renderer.$el.find('#pms-menu #type_list');
$segmentation.val(active_filters['class_id']); var $location = this.renderer.$el.find('#pms-menu #floor_list');
$segmentation.trigger('change'); var $amenities = this.renderer.$el.find('#pms-menu #amenities_list');
$location.val(active_filters['floor_id']); var $types = this.renderer.$el.find('#pms-menu #virtual_list');
$location.trigger('change'); $segmentation.val(calendar_filters['class_id']);
$amenities.val(active_filters['amenities']); $segmentation.trigger('change');
$amenities.trigger('change'); $location.val(calendar_filters['floor_id']);
$types.val(active_filters['room_type_id']); $location.trigger('change');
$types.trigger('change'); $amenities.val(calendar_filters['amenities']);
$amenities.trigger('change');
$types.val(calendar_filters['room_type_id']);
$types.trigger('change');
}, },
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------

12
hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js
View File

@@ -65,7 +65,7 @@ function HotelCalendar(/*String*/querySelector, /*Dictionary*/options, /*List*/p
this.options.startDate = this.options.startDate.clone(); this.options.startDate = this.options.startDate.clone();
this.options.startDate.subtract('1', 'd'); this.options.startDate.subtract('1', 'd');
this.options.orig_days = this.options.days; this.options.orig_days = this.options.days;
this.options.days = this.parseDays(this.options.days); this.options.days = this.parseDays(this.options.days) + 1;
this.options.rooms = _.map(this.options.rooms, function(item){ return item.clone(); }); this.options.rooms = _.map(this.options.rooms, function(item){ return item.clone(); });
// Check correct values // Check correct values
@@ -117,7 +117,7 @@ HotelCalendar.prototype = {
if (moment.isMoment(date)) { if (moment.isMoment(date)) {
this.options.startDate = date; this.options.startDate = date;
} else if (typeof date === 'string'){ } else if (typeof date === 'string'){
this.options.startDate = HotelCalendar.toMomentUTC(date); this.options.startDate = HotelCalendar.toMoment(date);
} else { } else {
console.warn("[Hotel Calendar][setStartDate] Invalid date format!"); console.warn("[Hotel Calendar][setStartDate] Invalid date format!");
return; return;
@@ -126,7 +126,7 @@ HotelCalendar.prototype = {
this.options.startDate.subtract('1','d'); this.options.startDate.subtract('1','d');
if (typeof days !== 'undefined') { if (typeof days !== 'undefined') {
this.options.orig_days = days; this.options.orig_days = days;
this.options.days = this.parseDays(days); this.options.days = this.parseDays(days) + 1;
} }
this._endDate = this.options.startDate.clone().add(this.options.days, 'd'); this._endDate = this.options.startDate.clone().add(this.options.days, 'd');
@@ -147,7 +147,7 @@ HotelCalendar.prototype = {
if (days === 'month') { if (days === 'month') {
return moment().daysInMonth(); return moment().daysInMonth();
} }
return days; return +days;
}, },
toggleOverbookingsVisibility: function(/*Bool*/show) { toggleOverbookingsVisibility: function(/*Bool*/show) {
@@ -2907,8 +2907,8 @@ function HReservation(/*Dictionary*/rValues) {
} }
HReservation.prototype = { HReservation.prototype = {
setRoom: function(/*HRoomObject*/room) { this.room = room; }, setRoom: function(/*HRoomObject*/room) { this.room = room; },
setStartDate: function(/*String,MomentObject*/date) { this.startDate = HotelCalendar.toMomentUTC(date); }, setStartDate: function(/*String,MomentObject*/date) { this.startDate = HotelCalendar.toMoment(date); },
setEndDate: function(/*String,MomentObject*/date) { this.endDate = HotelCalendar.toMomentUTC(date); }, setEndDate: function(/*String,MomentObject*/date) { this.endDate = HotelCalendar.toMoment(date); },
clearUserData: function() { this._userData = {}; }, clearUserData: function() { this._userData = {}; },
getUserData: function(/*String?*/key) { getUserData: function(/*String?*/key) {