TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support firstDay in date & date range filters 

Ref: 962aa32a60 (commitcomment-23597564)
This commit is contained in:
Luke Towers 2017-08-11 08:59:06 -06:00
parent 928a123791
commit 7c3d4705fc
6 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/backend/widgets/Filter.php
View File

@ -522,6 +522,7 @@ class Filter extends WidgetBase
$scopeProperties = [ $scopeProperties = [
'minDate' => '2000-01-01', 'minDate' => '2000-01-01',
'maxDate' => '2099-12-31', 'maxDate' => '2099-12-31',
'firstDay' => 0,
'yearRange' => 10, 'yearRange' => 10,
]; ];

1
modules/backend/widgets/filter/partials/_scope_date.htm
View File

@ -7,6 +7,7 @@
'date' => isset($date) ? $date : null, 'date' => isset($date) ? $date : null,
'minDate' => $scope->minDate, 'minDate' => $scope->minDate,
'maxDate' => $scope->maxDate, 'maxDate' => $scope->maxDate,
'firstDay' => $scope->firstDay,
'yearRange' => $scope->yearRange, 'yearRange' => $scope->yearRange,
])) ]))
?>"> ?>">

1
modules/backend/widgets/filter/partials/_scope_daterange.htm
View File

@ -7,6 +7,7 @@
'dates' => [isset($after) ? $after : null, isset($before) ? $before : null], 'dates' => [isset($after) ? $after : null, isset($before) ? $before : null],
'minDate' => $scope->minDate, 'minDate' => $scope->minDate,
'maxDate' => $scope->maxDate, 'maxDate' => $scope->maxDate,
'firstDay' => $scope->firstDay,
'yearRange' => $scope->yearRange, 'yearRange' => $scope->yearRange,
])) ]))
?>"> ?>">

2
modules/system/assets/js/lang/lang.kr.js
View File

@ -5,5 +5,5 @@ if ($.oc === undefined) $.oc = {}
if ($.oc.langMessages === undefined) $.oc.langMessages = {} if ($.oc.langMessages === undefined) $.oc.langMessages = {}
$.oc.langMessages['kr'] = $.extend( $.oc.langMessages['kr'] = $.extend(
$.oc.langMessages['kr'] || {}, $.oc.langMessages['kr'] || {},
{"markdowneditor":{"formatting":"\uc11c\uc2dd","quote":"\uc778\uc6a9","code":"\ucf54\ub3c4","header1":"\ud5e4\ub354 1","header2":"\ud5e4\ub354 2","header3":"\ud5e4\ub354 3","header4":"\ud5e4\ub354 4","header5":"\ud5e4\ub354 5","header6":"\ud5e4\ub354 6","bold":"\uc9c4\ud558\uac8c","italic":"\uc774\ud0e4\ub9ad","unorderedlist":"\ube44\uc21c\ucc28 \ubaa9\ub85d","orderedlist":"\uc21c\ucc28 \ubaa9\ub85d","video":"\ub3d9\uc601\uc0c1","image":"\uc774\ubbf8\uc9c0","link":"\ub9c1\ud06c","horizontalrule":"\uac00\ub85c\uc120 \uc0bd\uc785","fullscreen":"\uc804\uccb4\ud654\uba74","preview":"\ubbf8\ub9ac\ubcf4\uae30"},"mediamanager":{"insert_link":"\ubbf8\ub514\uc5b4 \ub9c1\ud06c \uc0bd\uc785","insert_image":"\uadf8\ub9bc \uc0bd\uc785","insert_video":"\ub3d9\uc601\uc0c1 \uc0bd\uc785","insert_audio":"\uc18c\ub9ac \uc0bd\uc785","invalid_file_empty_insert":"\ub9c1\ud06c\ub97c \uc0bd\uc785\ud560 \ud30c\uc77c\uc744 \uc120\ud0dd\ud574\uc8fc\uc138\uc694.","invalid_file_single_insert":"\ud55c\uac1c\uc758 \ud30c\uc77c\uc744 \uc120\ud0dd\ud574\uc8fc\uc138\uc694.","invalid_image_empty_insert":"\uc0bd\uc785\ud560 \uadf8\ub9bc\uc744 \uc120\ud0dd\ud574 \uc8fc\uc138\uc694.","invalid_video_empty_insert":"\uc0bd\uc785\ud560 \ub3d9\uc601\uc0c1\uc744 \uc120\ud0dd\ud574 \uc8fc\uc138\uc694.","invalid_audio_empty_insert":"\uc0bd\uc785\ud560 \uc18c\ub9ac\ud30c\uc77c\uc744 \uc120\ud0dd\ud574 \uc8fc\uc138\uc694."},"alert":{"confirm_button_text":"\ud655\uc778","cancel_button_text":"\ucde8\uc18c","widget_remove_confirm":"\uc774 \uc704\uc82f\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?"},"datepicker":{"previousMonth":"\uc9c0\ub09c \ub2ec","nextMonth":"\ub2e4\uc74c \ub2ec","months":["1\uc6d4","2\uc6d4","3\uc6d4","4\uc6d4","5\uc6d4","6\uc6d4","7\uc6d4","8\uc6d4","9\uc6d4","10\uc6d4","11\uc6d4","12\uc6d4"],"weekdays":["\uc77c\uc694\uc77c","\uc6d4\uc694\uc77c","\ud654\uc694\uc77c","\uc218\uc694\uc77c","\ubaa9\uc694\uc77c","\uae08\uc694\uc77c","\ud1a0\uc694\uc77c"],"weekdaysShort":["\uc77c","\uc6d4","\ud654","\uc218","\ubaa9","\uae08","\ud1a0"]},"colorpicker":{"choose":"Ok"},"filter":{"group":{"all":"\uc804\uccb4"},"dates":{"all":"\uc804\uccb4","filter_button_text":"\ud544\ud130","reset_button_text":"\uc7ac\uc124\uc815","date_placeholder":"\ub0a0\uc9dc","after_placeholder":"\uc774\ud6c4","before_placeholder":"\uc774\uc804"}},"eventlog":{"show_stacktrace":"\uc2a4\ud0dd \ucd94\uc801 \ubcf4\uae30","hide_stacktrace":"\uc2a4\ud0dd \ucd94\uc801 \uac10\ucd94\uae30","tabs":{"formatted":"\uc815\ub9ac\ub41c\ub85c\uadf8","raw":"\ubcf8\ub798\ub85c\uadf8"},"editor":{"title":"\uc18c\uc2a4\ucf54\ub4dc \ud3b8\uc9d1\uae30","description":"\uc774\ub7f0 URL \uc2a4\ud0a4\ub9c8\ub97c \ubc1b\uc744 \uc218 \uc788\ub3c4\ub85d \ub2f9\uc2e0\uc758 \uc6b4\uc601\uccb4\uc81c\uac00 \uc124\uc815\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4.","openWith":"\uac19\uc774 \uc5f4\uae30","remember_choice":"\uc774 \uc138\uc158\uc758 \uc635\uc158\uc744 \uae30\uc5b5","open":"\uc5f4\uae30","cancel":"\ucde8\uc18c"}}} {"markdowneditor":{"formatting":"\uc11c\uc2dd","quote":"\uc778\uc6a9","code":"\ucf54\ub3c4","header1":"\ud5e4\ub354 1","header2":"\ud5e4\ub354 2","header3":"\ud5e4\ub354 3","header4":"\ud5e4\ub354 4","header5":"\ud5e4\ub354 5","header6":"\ud5e4\ub354 6","bold":"\uc9c4\ud558\uac8c","italic":"\uc774\ud0e4\ub9ad","unorderedlist":"\ube44\uc21c\ucc28 \ubaa9\ub85d","orderedlist":"\uc21c\ucc28 \ubaa9\ub85d","video":"\ub3d9\uc601\uc0c1","image":"\uc774\ubbf8\uc9c0","link":"\ub9c1\ud06c","horizontalrule":"\uac00\ub85c\uc120 \uc0bd\uc785","fullscreen":"\uc804\uccb4\ud654\uba74","preview":"\ubbf8\ub9ac\ubcf4\uae30"},"mediamanager":{"insert_link":"\ubbf8\ub514\uc5b4 \ub9c1\ud06c \uc0bd\uc785","insert_image":"\uadf8\ub9bc \uc0bd\uc785","insert_video":"\ub3d9\uc601\uc0c1 \uc0bd\uc785","insert_audio":"\uc18c\ub9ac \uc0bd\uc785","invalid_file_empty_insert":"\ub9c1\ud06c\ub97c \uc0bd\uc785\ud560 \ud30c\uc77c\uc744 \uc120\ud0dd\ud574\uc8fc\uc138\uc694.","invalid_file_single_insert":"\ud55c\uac1c\uc758 \ud30c\uc77c\uc744 \uc120\ud0dd\ud574\uc8fc\uc138\uc694.","invalid_image_empty_insert":"\uc0bd\uc785\ud560 \uadf8\ub9bc\uc744 \uc120\ud0dd\ud574 \uc8fc\uc138\uc694.","invalid_video_empty_insert":"\uc0bd\uc785\ud560 \ub3d9\uc601\uc0c1\uc744 \uc120\ud0dd\ud574 \uc8fc\uc138\uc694.","invalid_audio_empty_insert":"\uc0bd\uc785\ud560 \uc18c\ub9ac\ud30c\uc77c\uc744 \uc120\ud0dd\ud574 \uc8fc\uc138\uc694."},"alert":{"confirm_button_text":"\ud655\uc778","cancel_button_text":"\ucde8\uc18c","widget_remove_confirm":"\uc774 \uc704\uc82f\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?"},"datepicker":{"previousMonth":"\uc9c0\ub09c \ub2ec","nextMonth":"\ub2e4\uc74c \ub2ec","months":["1\uc6d4","2\uc6d4","3\uc6d4","4\uc6d4","5\uc6d4","6\uc6d4","7\uc6d4","8\uc6d4","9\uc6d4","10\uc6d4","11\uc6d4","12\uc6d4"],"weekdays":["\uc77c\uc694\uc77c","\uc6d4\uc694\uc77c","\ud654\uc694\uc77c","\uc218\uc694\uc77c","\ubaa9\uc694\uc77c","\uae08\uc694\uc77c","\ud1a0\uc694\uc77c"],"weekdaysShort":["\uc77c","\uc6d4","\ud654","\uc218","\ubaa9","\uae08","\ud1a0"]},"colorpicker":{"choose":"Ok"},"filter":{"group":{"all":"\uc804\uccb4"},"dates":{"all":"\uc804\uccb4","filter_button_text":"\ud544\ud130","reset_button_text":"\uc7ac\uc124\uc815","date_placeholder":"\ub0a0\uc9dc","after_placeholder":"\uc774\ud6c4","before_placeholder":"\uc774\uc804"},"numbers":{"all":"all","filter_button_text":"Filter","reset_button_text":"Reset","min_placeholder":"Min","max_placeholder":"Max"}},"eventlog":{"show_stacktrace":"\uc2a4\ud0dd \ucd94\uc801 \ubcf4\uae30","hide_stacktrace":"\uc2a4\ud0dd \ucd94\uc801 \uac10\ucd94\uae30","tabs":{"formatted":"\uc815\ub9ac\ub41c\ub85c\uadf8","raw":"\ubcf8\ub798\ub85c\uadf8"},"editor":{"title":"\uc18c\uc2a4\ucf54\ub4dc \ud3b8\uc9d1\uae30","description":"\uc774\ub7f0 URL \uc2a4\ud0a4\ub9c8\ub97c \ubc1b\uc744 \uc218 \uc788\ub3c4\ub85d \ub2f9\uc2e0\uc758 \uc6b4\uc601\uccb4\uc81c\uac00 \uc124\uc815\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4.","openWith":"\uac19\uc774 \uc5f4\uae30","remember_choice":"\uc774 \uc138\uc158\uc758 \uc635\uc158\uc744 \uae30\uc5b5","open":"\uc5f4\uae30","cancel":"\ucde8\uc18c"}}}
); );

1
modules/system/assets/ui/js/filter.dates.js
View File

@ -253,6 +253,7 @@
defaults = { defaults = {
minDate: new Date(scopeData.minDate), minDate: new Date(scopeData.minDate),
maxDate: new Date(scopeData.maxDate), maxDate: new Date(scopeData.maxDate),
firstDay: scopeData.firstDay,
yearRange: scopeData.yearRange, yearRange: scopeData.yearRange,
setDefaultDate: '' !== defaultValue ? defaultValue.toDate() : '', setDefaultDate: '' !== defaultValue ? defaultValue.toDate() : '',
format: self.getDateFormat(), format: self.getDateFormat(),

6
modules/system/assets/ui/storm-min.js vendored
View File

@ -3159,7 +3159,7 @@ self.filterByDate(true)})}
FilterWidget.prototype.getPopoverDateTemplate=function(){return' \ FilterWidget.prototype.getPopoverDateTemplate=function(){return' \
<form> \ <form> \
<input type="hidden" name="scopeName" value="{{ scopeName }}" /> \ <input type="hidden" name="scopeName" value="{{ scopeName }}" /> \
<div id="controlFilterPopover" class="control-filter-popover control-filter-box-popover"> \ <div id="controlFilterPopover" class="control-filter-popover control-filter-box-popover"> \
<div class="filter-search loading-indicator-container size-input-text"> \ <div class="filter-search loading-indicator-container size-input-text"> \
<div class="field-datepicker"> \ <div class="field-datepicker"> \
<div class="input-with-icon right-align"> \ <div class="input-with-icon right-align"> \
@ -3185,7 +3185,7 @@ FilterWidget.prototype.getPopoverDateTemplate=function(){return'
FilterWidget.prototype.getPopoverRangeTemplate=function(){return' \ FilterWidget.prototype.getPopoverRangeTemplate=function(){return' \
<form> \ <form> \
<input type="hidden" name="scopeName" value="{{ scopeName }}" /> \ <input type="hidden" name="scopeName" value="{{ scopeName }}" /> \
<div id="controlFilterPopover" class="control-filter-popover control-filter-box-popover --range"> \ <div id="controlFilterPopover" class="control-filter-popover control-filter-box-popover --range"> \
<div class="filter-search loading-indicator-container size-input-text"> \ <div class="filter-search loading-indicator-container size-input-text"> \
<div class="field-datepicker"> \ <div class="field-datepicker"> \
<div class="input-with-icon right-align"> \ <div class="input-with-icon right-align"> \
@ -3235,7 +3235,7 @@ $scope.data('oc.popover',null)
$scope.ocPopover({content:Mustache.render(this.getPopoverRangeTemplate(),data),modal:false,highlightModalTarget:true,closeOnPageClick:true,placement:'bottom',onCheckDocumentClickTarget:function(target){return self.onCheckDocumentClickTargetDatePicker(target)}})} $scope.ocPopover({content:Mustache.render(this.getPopoverRangeTemplate(),data),modal:false,highlightModalTarget:true,closeOnPageClick:true,placement:'bottom',onCheckDocumentClickTarget:function(target){return self.onCheckDocumentClickTargetDatePicker(target)}})}
FilterWidget.prototype.initDatePickers=function(isRange){var self=this,scopeData=this.$activeScope.data('scope-data'),$inputs=$('.field-datepicker input','#controlFilterPopover'),data=this.scopeValues[this.activeScopeName] FilterWidget.prototype.initDatePickers=function(isRange){var self=this,scopeData=this.$activeScope.data('scope-data'),$inputs=$('.field-datepicker input','#controlFilterPopover'),data=this.scopeValues[this.activeScopeName]
if(!data){data={dates:isRange?(scopeData.dates?scopeData.dates:[]):(scopeData.date?[scopeData.date]:[])}} if(!data){data={dates:isRange?(scopeData.dates?scopeData.dates:[]):(scopeData.date?[scopeData.date]:[])}}
$inputs.each(function(index,datepicker){var defaultValue='',$datepicker=$(datepicker),defaults={minDate:new Date(scopeData.minDate),maxDate:new Date(scopeData.maxDate),yearRange:scopeData.yearRange,setDefaultDate:''!==defaultValue?defaultValue.toDate():'',format:self.getDateFormat(),i18n:self.getLang('datepicker')} $inputs.each(function(index,datepicker){var defaultValue='',$datepicker=$(datepicker),defaults={minDate:new Date(scopeData.minDate),maxDate:new Date(scopeData.maxDate),firstDay:scopeData.firstDay,yearRange:scopeData.yearRange,setDefaultDate:''!==defaultValue?defaultValue.toDate():'',format:self.getDateFormat(),i18n:self.getLang('datepicker')}
if(0<=index&&index<data.dates.length){defaultValue=data.dates[index]?moment.tz(data.dates[index],self.appTimezone).tz(self.timezone):''} if(0<=index&&index<data.dates.length){defaultValue=data.dates[index]?moment.tz(data.dates[index],self.appTimezone).tz(self.timezone):''}
if(!isRange){defaults.onSelect=function(){self.filterByDate()}} if(!isRange){defaults.onSelect=function(){self.filterByDate()}}
datepicker.value=''!==defaultValue?defaultValue.format(self.getDateFormat()):'';$datepicker.pikaday(defaults)})} datepicker.value=''!==defaultValue?defaultValue.format(self.getDateFormat()):'';$datepicker.pikaday(defaults)})}