loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Fix eventi allday

This commit is contained in:
Luca 2021-06-04 19:01:13 +02:00
parent 953a258836
commit 8eca11c1fc
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/dashboard/actions.php
View File

@ -132,7 +132,7 @@ switch (filter('op')) {
foreach ($alldays as $preventivo) {
if(!empty($preventivo['data_accettazione']) && $preventivo['data_accettazione']!='0000-00-00'){
$results[] = [
'id' => $preventivo['id'],
'id' => $modulo_preventivi->id.'_'.$preventivo['id'],
'idintervento' => $preventivo['id'],
'idtecnico' => "",
'title' => '<b>Accettazione prev. '.$preventivo['numero'].'</b> '.$preventivo['nome'].''.(($preventivo['have_attachments']) ? ' <i class="fa fa-paperclip" aria-hidden="true"></i>' : '').'<br><b>'.tr('Cliente').':</b> '.$preventivo['cliente'],
@ -143,12 +143,13 @@ switch (filter('op')) {
'textColor' => color_inverse("#ff7f50"),
'borderColor' => "#ff7f50",
'allDay' => true,
'eventStartEditable' => false,
];
}
if($preventivo['data_accettazione'] != $preventivo['data_conclusione'] && $preventivo['data_conclusione']!='0000-00-00' && !empty($preventivo['data_conclusione']) ){
$results[] = [
'id' => $preventivo['id'],
'id' => $modulo_preventivi->id.'_'.$preventivo['id'],
'idintervento' => $preventivo['id'],
'idtecnico' => "",
'title' => '<b>Conclusione prev. '.$preventivo['numero'].'</b> '.$preventivo['nome'].''.(($preventivo['have_attachments']) ? ' <i class="fa fa-paperclip" aria-hidden="true"></i>' : '').'<br><b>'.tr('Cliente').':</b> '.$preventivo['cliente'],
@ -159,6 +160,7 @@ switch (filter('op')) {
'textColor' => color_inverse("#ff7f50"),
'borderColor' => "#ff7f50",
'allDay' => true,
'eventStartEditable' => false,
];
}
}
@ -285,7 +287,7 @@ switch (filter('op')) {
$rs = $dbo->fetchArray($query);
$tooltip = '<b>Accettazione prev. '.$rs[0]['numero'].'</b> '.$rs[0]['nome'].''.(($rs[0]['have_attachments']) ? ' <i class="fa fa-paperclip" aria-hidden="true"></i>' : '').'<br><b>'.tr('Cliente').':</b> '.$rs[0]['cliente'];
$tooltip = '<b>Prev. '.$rs[0]['numero'].'</b> '.$rs[0]['nome'].''.(($rs[0]['have_attachments']) ? ' <i class="fa fa-paperclip" aria-hidden="true"></i>' : '').'<br><b>'.tr('Cliente').':</b> '.$rs[0]['cliente'];
}

31
modules/dashboard/edit.php
View File

@ -543,7 +543,6 @@ echo '
} else {
name = "id_intervento";
}
openModal(globals.dashboard.drop.title, globals.dashboard.drop.url + "&data=" + data + "&orario_inizio=" + ora_dal + "&orario_fine=" + ora_al + "&ref=dashboard&idcontratto=" + $(this).data("idcontratto") + "&" + name + "=" + $(this).data("id") + "&id_tecnico=" + $(this).data("id_tecnico"));
// Ricaricamento dei dati alla chiusura del modal
@ -560,24 +559,28 @@ echo '
select: function(start, end, allDay) { // info
// let start = info.start;
// let end = info.end;
let is_allDay = !start.hasTime() && !end.hasTime();
let data = moment(start).format("YYYY-MM-DD");
let data_fine = moment(end).format("YYYY-MM-DD");
let orario_inizio = moment(start).format("HH:mm");
let orario_fine = moment(end).format("HH:mm");
if (is_allDay!==true){
let data = moment(start).format("YYYY-MM-DD");
let data_fine = moment(end).format("YYYY-MM-DD");
let orario_inizio = moment(start).format("HH:mm");
let orario_fine = moment(end).format("HH:mm");
// Fix selezione di un giorno avanti per vista mensile
if (globals.dashboard.calendar.fullCalendar("getView").name == "month") {
data_fine = moment(end).subtract(1, "days").format("YYYY-MM-DD");
// Fix selezione di un giorno avanti per vista mensile
if (globals.dashboard.calendar.fullCalendar("getView").name == "month") {
data_fine = moment(end).subtract(1, "days").format("YYYY-MM-DD");
}
openModal(globals.dashboard.select.title, globals.dashboard.select.url + "&ref=dashboard&data=" + data + "&data_fine=" + data_fine + "&orario_inizio=" + orario_inizio + "&orario_fine=" + orario_fine);
}
openModal(globals.dashboard.select.title, globals.dashboard.select.url + "&ref=dashboard&data=" + data + "&data_fine=" + data_fine + "&orario_inizio=" + orario_inizio + "&orario_fine=" + orario_fine);
},
editable: globals.dashboard.write_permission,
eventDrop: function(event, delta, revertFunc ) {// info
// let event = info.event;
$.post(globals.dashboard.load_url, {
op: "modifica_intervento",
id: event.id,
@ -616,8 +619,8 @@ echo '
// let element = $(info.el);
element.find(".fc-title").html(event.title);
let id_intervento = event.idintervento;
let allday = event.allDay;
if (globals.dashboard.tooltip == 1) {
if (globals.dashboard.tooltip == 1 && event.allDay==false ) {
element.tooltipster({
content: "'.tr('Caricamento...').'",
animation: "grow",
@ -638,7 +641,7 @@ echo '
$.post(globals.dashboard.load_url, {
op: "tooltip_info",
id: id_intervento,
allDay: allday,
allDay: event.allDay,
}, function (data, response) {
instance.content(data);