diff --git a/multiple_datepicker_widget/__manifest__.py b/multiple_datepicker_widget/__manifest__.py index 1159dc498..e7d027e81 100644 --- a/multiple_datepicker_widget/__manifest__.py +++ b/multiple_datepicker_widget/__manifest__.py @@ -21,7 +21,7 @@ { 'name': 'Multiple DatePicker Widget', - 'version': '15.0.1.0.0', + 'version': '15.0.1.0.1', 'summary': 'Widget for picking multiple dates', 'description': 'Widget for picking multiple dates', 'category': 'Tools', @@ -45,4 +45,4 @@ 'installable': True, 'application': False, 'auto_install': False, -} \ No newline at end of file +} diff --git a/multiple_datepicker_widget/static/src/js/datepicker_widget.js b/multiple_datepicker_widget/static/src/js/datepicker_widget.js index c9f97be9e..2c370bfcc 100644 --- a/multiple_datepicker_widget/static/src/js/datepicker_widget.js +++ b/multiple_datepicker_widget/static/src/js/datepicker_widget.js @@ -1,6 +1,10 @@ /** @odoo-module **/ import basicFields from 'web.basic_fields'; import fieldRegistry from 'web.field_registry'; + const field_utils = require('web.field_utils'); + var time = require('web.time'); + var translation = require('web.translation'); + var _t = translation._t; var FieldDateMultipleDate = basicFields.InputField.extend({ template: 'FieldDateMultipleDate', @@ -8,15 +12,44 @@ var FieldDateMultipleDate = basicFields.InputField.extend({ 'click': '_onSelectDateField', }), + _onSelectDateField: function(ev) { + var dateFormat = time.getLangDateFormat(); + console.log("dateFormat....",dateFormat); + if (dateFormat.includes('MMMM')){ + var dates = dateFormat.toLowerCase() + var result = dates.replace(/mmmm/g, 'MM'); + dateFormat = result + + + } + else if (dateFormat.includes('MMM')) { + var dates = dateFormat.toLowerCase() + var result = dates.replace(/mmm/g, 'M'); + dateFormat = result + + } + else if(dateFormat.includes('ddd')){ + + var dates = dateFormat.toLowerCase() + var result = dates.replace(/ddd/g, 'DD'); + dateFormat = result + + } + + else{ + dateFormat = dateFormat.toLowerCase() + } if (this.$input){ this.$input.datepicker({ multidate: true, + format: dateFormat, }).trigger('focus'); } + }, }); - +console.log("FieldDateMultipleDate",FieldDateMultipleDate) fieldRegistry.add('multiple_datepicker', FieldDateMultipleDate); return { FieldDateMultipleDate: FieldDateMultipleDate