Skip to content
Snippets Groups Projects
Commit 856a6919 authored by alex_a's avatar alex_a
Browse files

dev #13579 [Follow-up]: Add 'whole day' option for calendar event.

parent 8627a28d
Branches
Tags
3 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!180Master,!129Sprint4 Story #13579 Cms Agenda
......@@ -107,7 +107,9 @@ echo $this->article->getRefusMessage(); ?></textarea>
<?php
echo $this->datePicker(
'events_debut',
$this->article->getEventsDebut(),false);
$this->article->getEventsDebut(),
$this->article->getAllDay()
);
?>
</span>
<span><?php echo $this->traduire('au'); ?></span>
......@@ -115,7 +117,9 @@ echo $this->article->getRefusMessage(); ?></textarea>
<?php
echo $this->datePicker(
'events_fin',
$this->article->getEventsFin(),false);
$this->article->getEventsFin(),
$this->article->getAllDay()
);
?>
</span>
</td>
......
......@@ -40,9 +40,24 @@ class ZendAfi_View_Helper_DatePicker extends ZendAfi_View_Helper_BaseHelper {
'minTime' => '08:00',
'maxTime' => '23:00'];
$optionsdateonly = $options;
$optionsdateonly['dateOnly'] = true;
$optionsdateonly['dateFormat'] = 'DD/MM/YYYY';
$optionsdateonly = ['dateFormat' => 'DD/MM/YYYY',
'locale' => substr($locale,0,2),
'firstDayOfWeek' => 1,
'minuteInterval' => 15,
'closeOnSelected' => 'true',
'autodateOnStart' => false,
'dateOnly' => true];
$optionswithhours = ['dateFormat' => 'DD/MM/YYYY hh:mm',
'locale' => substr($locale,0,2),
'firstDayOfWeek' => 1,
'minuteInterval' => 15,
'closeOnSelected' => 'true',
'autodateOnStart' => false,
'dateOnly' => false,
'minTime' => '08:00',
'maxTime' => '23:00'];
Class_ScriptLoader::getInstance()
->addOpacScript('mugifly-jquery-simple-datetimepicker/jquery.simple-dtpicker')
......@@ -53,17 +68,21 @@ class ZendAfi_View_Helper_DatePicker extends ZendAfi_View_Helper_BaseHelper {
->addJQueryReady('$("#date'.$name.'").appendDtpicker('.json_encode($options).');')
->addJQueryReady('
$("#all_day").click(function() {
if ($("#all_day").is(":checked")) {
$("#date' . $name .'").handleDtpicker("destroy");
$("#date' . $name .'").appendDtpicker('.json_encode($optionsdateonly).');
$("#dateevents_debut").val("");
$("#dateevents_fin").val("");
var datedebut = $("#dateevents_debut").handleDtpicker("getDate");
var datefin = $("#dateevents_fin").handleDtpicker("getDate");
$("#dateevents_debut").handleDtpicker("destroy");
$("#dateevents_fin").handleDtpicker("destroy");
if ($("#all_day").is(":checked")) {
$("#dateevents_debut").appendDtpicker('.json_encode($optionsdateonly).');
$("#dateevents_fin").appendDtpicker('.json_encode($optionsdateonly).');
} else {
$("#date' . $name .'").handleDtpicker("destroy");
$("#date' . $name .'").appendDtpicker('.json_encode($options).');
$("#dateevents_debut").appendDtpicker('.json_encode($optionswithhours).');
$("#dateevents_fin").appendDtpicker('.json_encode($optionswithhours).');
}
$("#dateevents_debut").handleDtpicker("setDate", datedebut);
$("#dateevents_fin").handleDtpicker("setDate", datefin);
});
');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment