diff --git a/modules/backend/formwidgets/DatePicker.php b/modules/backend/formwidgets/DatePicker.php index c705f8fb4..2259174a6 100644 --- a/modules/backend/formwidgets/DatePicker.php +++ b/modules/backend/formwidgets/DatePicker.php @@ -52,6 +52,11 @@ class DatePicker extends FormWidgetBase */ public $firstDay = 0; + /** + * @var bool show week numbers at head of row + */ + public $showWeekNumber = false; + /** * @var bool change datetime exactly as is in database */ @@ -78,6 +83,7 @@ class DatePicker extends FormWidgetBase 'maxDate', 'yearRange', 'firstDay', + 'showWeekNumber', 'ignoreTimezone', ]); @@ -126,6 +132,7 @@ class DatePicker extends FormWidgetBase $this->vars['maxDate'] = $this->maxDate; $this->vars['yearRange'] = $this->yearRange; $this->vars['firstDay'] = $this->firstDay; + $this->vars['showWeekNumber'] = $this->showWeekNumber; $this->vars['ignoreTimezone'] = $this->ignoreTimezone; $this->vars['format'] = $this->format; $this->vars['formatMoment'] = $this->getDateFormatMoment(); diff --git a/modules/backend/formwidgets/datepicker/partials/_datepicker.htm b/modules/backend/formwidgets/datepicker/partials/_datepicker.htm index d131814a2..cce11b1b3 100644 --- a/modules/backend/formwidgets/datepicker/partials/_datepicker.htm +++ b/modules/backend/formwidgets/datepicker/partials/_datepicker.htm @@ -15,6 +15,7 @@ data-max-date="" data-year-range="" data-first-day="" + data-show-week-number="" data-ignore-timezone > diff --git a/modules/system/assets/ui/js/datepicker.js b/modules/system/assets/ui/js/datepicker.js index a1d84cd10..83993abbb 100644 --- a/modules/system/assets/ui/js/datepicker.js +++ b/modules/system/assets/ui/js/datepicker.js @@ -104,6 +104,7 @@ var pikadayOptions = { yearRange: this.options.yearRange, firstDay: this.options.firstDay, + showWeekNumber: this.options.showWeekNumber, format: dateFormat, setDefaultDate: now, onOpen: function() { @@ -314,7 +315,8 @@ maxDate: null, format: null, yearRange: 10, - firstDay: 0 + firstDay: 0, + showWeekNumber: false } // PLUGIN DEFINITION diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js index b7c9f7258..2422845f1 100644 --- a/modules/system/assets/ui/storm-min.js +++ b/modules/system/assets/ui/storm-min.js @@ -2878,7 +2878,7 @@ this.$el=null this.options=null BaseProto.dispose.call(this)} DatePicker.prototype.initDatePicker=function(){var self=this,dateFormat=this.getDateFormat(),now=moment().tz(this.timezone).format(dateFormat) -var pikadayOptions={yearRange:this.options.yearRange,firstDay:this.options.firstDay,format:dateFormat,setDefaultDate:now,onOpen:function(){var $field=$(this._o.trigger) +var pikadayOptions={yearRange:this.options.yearRange,firstDay:this.options.firstDay,showWeekNumber:this.options.showWeekNumber,format:dateFormat,setDefaultDate:now,onOpen:function(){var $field=$(this._o.trigger) $(this.el).css({left:'auto',right:$(window).width()-$field.offset().left-$field.outerWidth()})},onSelect:function(){self.onSelectDatePicker.call(self,this.getMoment())}} var lang=this.getLang('datepicker',false) if(lang){pikadayOptions.i18n=lang} @@ -2929,7 +2929,7 @@ if(this.ignoreTimezone){this.appTimezone='UTC' this.timezone='UTC'}} DatePicker.prototype.getLang=function(name,defaultValue){if($.oc===undefined||$.oc.lang===undefined){return defaultValue} return $.oc.lang.get(name,defaultValue)} -DatePicker.DEFAULTS={minDate:null,maxDate:null,format:null,yearRange:10,firstDay:0} +DatePicker.DEFAULTS={minDate:null,maxDate:null,format:null,yearRange:10,firstDay:0,showWeekNumber:false} var old=$.fn.datePicker $.fn.datePicker=function(option){var args=Array.prototype.slice.call(arguments,1),items,result items=this.each(function(){var $this=$(this)