Skip to content

fix: correct datepicker issue introduced in e0cfcbc #658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnVillalovos merged 1 commit into from
Jul 6, 2025
Merged

fix: correct datepicker issue introduced in e0cfcbc #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Controls/DatePickerSetupControl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ public function PageLoad()
$this->SetDefault('MinDate', null);
$this->SetDefault('MaxDate', null);

$this->Display('Controls/DateSetup.tpl');
if ($controlId == 'datepicker') {
$this->Display('Controls/DatePickerSetup.tpl');
} else {
$this->Display('Controls/DateSetup.tpl');
}
}

private function SetDefault($key, $value)
Expand Down
60 changes: 60 additions & 0 deletions tpl/Controls/DatePickerSetup.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{function name=datePickerDateFormat}
new Date({$date->Year()}, {$date->Month()-1}, {$date->Day()})
{/function}
<script type="text/javascript">
$(function () {
$("#{$ControlId}").{if $HasTimepicker}datetimepicker{else}datepicker{/if}({ldelim}
numberOfMonths: {$NumberOfMonths},
showButtonPanel: {$ShowButtonPanel},
onSelect: {$OnSelect},
dayNames: {$DayNames},
dayNamesShort: {$DayNamesShort},
dayNamesMin: {$DayNamesMin},
dateFormat: '{$DateFormat}',
{if $FirstDay >=0 && $FirstDay <= 6}
firstDay: {$FirstDay},
{/if}
monthNames: {$MonthNames},
monthNamesShort: {$MonthNamesShort},
currentText: "{{translate key='Today'}|escape:'javascript'}",
timeFormat: "{$TimeFormat}",
altFieldTimeOnly: false,
showWeek: {if $ShowWeekNumbers}true{else}false{/if},
controlType: 'select'
{if $AltId neq ''}
,
altField: "#{$AltId}",
altFormat: '{$AltFormat}'
{/if}
{if $DefaultDate}
,
defaultDate: {datePickerDateFormat date=$DefaultDate}
{/if}
{if $MinDate}
,
minDate: {datePickerDateFormat date=$MinDate}
{/if}
{if $MaxDate}
,
maxDate: {datePickerDateFormat date=$MaxDate->AddDays(1)}
{/if}
{rdelim});

{if $AltId neq ''}
$("#{$ControlId}").change(function () {
if ($(this).val() == '') {
$("#{$AltId}").val('');
}
else {
var dateVal = $("#{$ControlId}").{if $HasTimepicker}datetimepicker{else}datepicker{/if}('getDate');
var dateString = dateVal.getFullYear() + '-' + ('0' + (dateVal.getMonth() + 1)).slice(-2) + '-' + ('0' + dateVal.getDate()).slice(-2);
{if $HasTimepicker}
dateString = dateString + ' ' + dateVal.getHours() + ':' + dateVal.getMinutes();
{/if}
$("#{$AltId}").val(dateString);
}
});
{/if}

});
</script>