mirror of
https://github.com/itflow-org/itflow
synced 2026-03-17 03:04:50 +00:00
More calendar tweaks
This commit is contained in:
@@ -79,14 +79,13 @@ document.addEventListener('DOMContentLoaded', function() {
|
|||||||
right: 'dayGridMonth,timeGridWeek,timeGridDay,listMonth addEvent addCalendar'
|
right: 'dayGridMonth,timeGridWeek,timeGridDay,listMonth addEvent addCalendar'
|
||||||
},
|
},
|
||||||
<?php if (!$session_mobile) {
|
<?php if (!$session_mobile) {
|
||||||
?>aspectRatio: 2.5,<?php
|
?>aspectRatio: 2.5,
|
||||||
} else {
|
<?php } else { ?>
|
||||||
?>aspectRatio: 0.75,<?php
|
aspectRatio: 0.7,
|
||||||
}
|
<?php } ?>
|
||||||
?>
|
|
||||||
//initialDate: '2023-01-12',
|
|
||||||
navLinks: true, // can click day/week names to navigate views
|
navLinks: true, // can click day/week names to navigate views
|
||||||
selectable: true,
|
selectable: true,
|
||||||
|
height: '90vh',
|
||||||
selectMirror: true,
|
selectMirror: true,
|
||||||
eventClick: function(editEvent) {
|
eventClick: function(editEvent) {
|
||||||
$('#editEventModal' + editEvent.event.id).modal();
|
$('#editEventModal' + editEvent.event.id).modal();
|
||||||
@@ -123,10 +122,15 @@ document.addEventListener('DOMContentLoaded', function() {
|
|||||||
$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN invoices ON client_id = invoice_client_id");
|
$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN invoices ON client_id = invoice_client_id");
|
||||||
while ($row = mysqli_fetch_array($sql)) {
|
while ($row = mysqli_fetch_array($sql)) {
|
||||||
$event_id = intval($row['invoice_id']);
|
$event_id = intval($row['invoice_id']);
|
||||||
$event_title = json_encode($row['invoice_prefix'] . $row['invoice_number'] . " " . $row['invoice_scope']);
|
$scope = strval($row['invoice_scope']);
|
||||||
|
if (empty($scope)) {
|
||||||
|
$scope = "Not Set";
|
||||||
|
}
|
||||||
|
$event_title = json_encode($row['invoice_prefix'] . $row['invoice_number'] . " created -scope: " . $scope);
|
||||||
$event_start = json_encode($row['invoice_date']);
|
$event_start = json_encode($row['invoice_date']);
|
||||||
|
|
||||||
echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'blue', url: 'invoice.php?invoice_id=$event_id' },";
|
|
||||||
|
echo "{ id: $event_id, title: $event_title, start: $event_start, display: 'list-item', color: 'blue', url: 'invoice.php?invoice_id=$event_id' },";
|
||||||
}
|
}
|
||||||
|
|
||||||
//Quotes Created
|
//Quotes Created
|
||||||
@@ -136,27 +140,49 @@ document.addEventListener('DOMContentLoaded', function() {
|
|||||||
$event_title = json_encode($row['quote_prefix'] . $row['quote_number'] . " " . $row['quote_scope']);
|
$event_title = json_encode($row['quote_prefix'] . $row['quote_number'] . " " . $row['quote_scope']);
|
||||||
$event_start = json_encode($row['quote_date']);
|
$event_start = json_encode($row['quote_date']);
|
||||||
|
|
||||||
echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'purple', url: 'quote.php?quote_id=$event_id' },";
|
echo "{ id: $event_id, title: $event_title, start: $event_start, display: 'list-item', color: 'purple', url: 'quote.php?quote_id=$event_id' },";
|
||||||
}
|
}
|
||||||
|
|
||||||
//Tickets Created
|
//Tickets Created
|
||||||
$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id");
|
$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN users ON ticket_assigned_to = user_id");
|
||||||
while ($row = mysqli_fetch_array($sql)) {
|
while ($row = mysqli_fetch_array($sql)) {
|
||||||
$event_id = intval($row['ticket_id']);
|
$event_id = intval($row['ticket_id']);
|
||||||
$event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " " . $row['ticket_subject']);
|
$ticket_status = strval($row['ticket_status']);
|
||||||
|
$username = $row['user_name'];
|
||||||
|
if (empty($username)) {
|
||||||
|
$username = "";
|
||||||
|
} else {
|
||||||
|
//Limit to characters and add ...
|
||||||
|
$username = "[". substr($row['user_name'], 0, 9) . "...]";
|
||||||
|
}
|
||||||
|
|
||||||
|
$event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " created - " . $row['ticket_subject'] . " " . $username . "{" . $ticket_status . "}");
|
||||||
$event_start = json_encode($row['ticket_created_at']);
|
$event_start = json_encode($row['ticket_created_at']);
|
||||||
|
|
||||||
echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'orange', url: 'ticket.php?ticket_id=$event_id' },";
|
|
||||||
|
if ($ticket_status == "Closed") {
|
||||||
|
$event_color = "black";
|
||||||
|
} else if ($ticket_status == "Scheduled") {
|
||||||
|
$event_color = "grey";
|
||||||
|
} else if ($ticket_status == "Pending-Assignment") {
|
||||||
|
$event_color = "red";
|
||||||
|
} else {
|
||||||
|
$event_color = "blue";
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'ticket.php?ticket_id=$event_id' },";
|
||||||
}
|
}
|
||||||
|
|
||||||
//Tickets Scheduled
|
//Tickets Scheduled
|
||||||
$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_schedule IS NOT NULL");
|
$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_schedule IS NOT NULL");
|
||||||
while ($row = mysqli_fetch_array($sql)) {
|
while ($row = mysqli_fetch_array($sql)) {
|
||||||
$event_id = intval($row['ticket_id']);
|
$event_id = intval($row['ticket_id']);
|
||||||
if (empty($username)) {
|
|
||||||
$username = "Unassigned";
|
|
||||||
} else {
|
|
||||||
$username = $row['user_name'];
|
$username = $row['user_name'];
|
||||||
|
if (empty($username)) {
|
||||||
|
$username = "";
|
||||||
|
} else {
|
||||||
|
//Limit to characters and add ...
|
||||||
|
$username = substr($row['user_name'], 0, 9) . "...";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strtotime($row['ticket_schedule']) < time()) {
|
if (strtotime($row['ticket_schedule']) < time()) {
|
||||||
@@ -169,9 +195,11 @@ document.addEventListener('DOMContentLoaded', function() {
|
|||||||
$event_color = "grey";
|
$event_color = "grey";
|
||||||
}
|
}
|
||||||
|
|
||||||
$event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " " . $row['ticket_subject'] . " [" . $username . "]");
|
$ticket_status = strval($row['ticket_status']);
|
||||||
|
$event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " scheduled - " . $row['ticket_subject'] . " [" . $username . "]{" . $ticket_status . "}");
|
||||||
$event_start = json_encode($row['ticket_schedule']);
|
$event_start = json_encode($row['ticket_schedule']);
|
||||||
|
|
||||||
|
|
||||||
echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'ticket.php?ticket_id=$event_id' },";
|
echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'ticket.php?ticket_id=$event_id' },";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,7 +208,7 @@ document.addEventListener('DOMContentLoaded', function() {
|
|||||||
while ($row = mysqli_fetch_array($sql)) {
|
while ($row = mysqli_fetch_array($sql)) {
|
||||||
$event_id = intval($row['vendor_id']);
|
$event_id = intval($row['vendor_id']);
|
||||||
$client_id = intval($row['client_id']);
|
$client_id = intval($row['client_id']);
|
||||||
$event_title = json_encode($row['vendor_name']);
|
$event_title = json_encode("Vendor : '" . $row['vendor_name'] . "' created");
|
||||||
$event_start = json_encode($row['vendor_created_at']);
|
$event_start = json_encode($row['vendor_created_at']);
|
||||||
|
|
||||||
echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'brown', url: 'client_vendors.php?client_id=$client_id' },";
|
echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'brown', url: 'client_vendors.php?client_id=$client_id' },";
|
||||||
@@ -190,19 +218,18 @@ document.addEventListener('DOMContentLoaded', function() {
|
|||||||
$sql = mysqli_query($mysqli, "SELECT * FROM clients");
|
$sql = mysqli_query($mysqli, "SELECT * FROM clients");
|
||||||
while ($row = mysqli_fetch_array($sql)) {
|
while ($row = mysqli_fetch_array($sql)) {
|
||||||
$event_id = intval($row['client_id']);
|
$event_id = intval($row['client_id']);
|
||||||
$event_title = json_encode($row['client_name']);
|
$event_title = json_encode("Client: '" . $row['client_name'] . "' created");
|
||||||
$event_start = json_encode($row['client_created_at']);
|
$event_start = json_encode($row['client_created_at']);
|
||||||
|
|
||||||
echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'green', url: 'client_overview.php?client_id=$event_id' },";
|
echo "{ id: $event_id, title: $event_title, start: $event_start, color: 'brown', url: 'client_overview.php?client_id=$event_id' },";
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
]
|
],
|
||||||
|
eventOrder: 'allDay,start,-duration,title',
|
||||||
});
|
});
|
||||||
|
|
||||||
calendar.render();
|
calendar.render();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<!-- Automatically set new event end date to 1 hr after start date -->
|
<!-- Automatically set new event end date to 1 hr after start date -->
|
||||||
|
|||||||
Reference in New Issue
Block a user