github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-11 15:06:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Link to Page on calendar event click

Browse Source
This commit is contained in:
Zack Arnett 2020-04-21 14:42:52 -04:00
parent 7fb76df33a
commit a71eb279ad
3 changed files with 194 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
public/css/grocy.css
View File

@ -1,6 +1,6 @@
/* Main style customizations */
body {
font-family: 'Noto Sans', sans-serif;
font-family: "Noto Sans", sans-serif;
}
.content-text {
@ -114,7 +114,7 @@ iframe {
}
/* Hide the default up/down arrow buttons for number inputs because we use our own buttons in numberpicker */
input[type='number'] {
input[type="number"] {
-moz-appearance: textfield;
}
input::-webkit-outer-spin-button,
@ -202,7 +202,8 @@ input::-webkit-inner-spin-button {
cursor: wait;
}
.expandable-text .collapse, .module .collapsing {
.expandable-text .collapse,
.module .collapsing {
height: 2.4rem;
}
@ -232,7 +233,6 @@ input::-webkit-inner-spin-button {
width: 96vw; /* Set width of popup menu to screen size */
}
/* Set width of popup menu to fixed value on larger devices */
@media (min-width: 400px) {
.table-inline-menu.dropdown-menu {
@ -269,7 +269,6 @@ input::-webkit-inner-spin-button {
}
#barcodescanner-livestream video {
width: 100%;
}
#barcodescanner-livestream canvas {
width: 100%;
@ -290,7 +289,8 @@ input::-webkit-inner-spin-button {
padding-right: 0.75rem !important;
}
.btn-group-xs > .btn, .btn-xs {
.btn-group-xs > .btn,
.btn-xs {
padding: 0.25rem 0.4rem;
font-size: 0.875rem;
line-height: 0.5;
@ -361,7 +361,7 @@ input::-webkit-inner-spin-button {
/* Third party component customizations - SB Admin 2 */
#mainNav .navbar-collapse .navbar-nav > .nav-item.dropdown > .nav-link:after,
#mainNav .navbar-collapse .navbar-sidenav .nav-link-collapse:after {
font-family: 'Font Awesome 5 Free';
font-family: "Font Awesome 5 Free";
font-weight: 900;
}
@ -377,7 +377,7 @@ input::-webkit-inner-spin-button {
}
#mainNav.fixed-top .navbar-sidenav {
height: calc(100vh - 94px)
height: calc(100vh - 94px);
}
#mainNav.fixed-top .sidenav-toggler {
@ -432,7 +432,6 @@ canvas.drawingBuffer {
top: 0;
}
.warning-message,
.error-message,
.normal-message {
@ -513,9 +512,13 @@ canvas.drawingBuffer {
.recipe-expand {
right: 1.25rem;
top: .75rem;
top: 0.75rem;
}
.recipe-servings-input {
width: 125px;
}
.fc-event {
cursor: pointer;
}

5
public/viewjs/calendar.js
View File

@ -16,7 +16,10 @@ var calendar = $("#calendar").fullCalendar({
"firstDay": firstDay,
"eventLimit": false,
"height": "auto",
"eventSources": fullcalendarEventSources
"eventSources": fullcalendarEventSources,
eventClick: function(info) {
location.href = info.link;
}
});
$("#ical-button").on("click", function(e)

15
services/CalendarService.php
View File

@ -31,7 +31,8 @@ class CalendarService extends BaseService
$stockEvents[] = array(
'title' => $titlePrefix . FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name,
'start' => $currentStockEntry->best_before_date,
'date_format' => 'date'
'date_format' => 'date',
'link' => $this->UrlManager->ConstructUrl('/stockoverview')
);
}
}
@ -46,7 +47,8 @@ class CalendarService extends BaseService
$taskEvents[] = array(
'title' => $titlePrefix . $currentTaskEntry->name,
'start' => $currentTaskEntry->due_date,
'date_format' => 'date'
'date_format' => 'date',
'link' => $this->UrlManager->ConstructUrl('/tasks')
);
}
}
@ -71,7 +73,8 @@ class CalendarService extends BaseService
$choreEvents[] = array(
'title' => $titlePrefix . $chore->name . $assignedToText,
'start' => $currentChoreEntry->next_estimated_execution_time,
'date_format' => 'datetime'
'date_format' => 'datetime',
'link' => $this->UrlManager->ConstructUrl('/choresoverview')
);
}
}
@ -86,7 +89,8 @@ class CalendarService extends BaseService
$batteryEvents[] = array(
'title' => $titlePrefix . FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->name,
'start' => $currentBatteryEntry->next_estimated_charge_time,
'date_format' => 'datetime'
'date_format' => 'datetime',
'link' => $this->UrlManager->ConstructUrl('/batteriesoverview')
);
}
}
@ -107,7 +111,8 @@ class CalendarService extends BaseService
'title' => $titlePrefix . FindObjectInArrayByPropertyValue($recipes, 'id', $recipeOfCurrentDay->includes_recipe_id)->name,
'start' => FindObjectInArrayByPropertyValue($recipes, 'id', $recipeOfCurrentDay->recipe_id)->name,
'date_format' => 'date',
'description' => $this->UrlManager->ConstructUrl('/mealplan' . '?week=' . FindObjectInArrayByPropertyValue($recipes, 'id', $recipeOfCurrentDay->recipe_id)->name)
'description' => $this->UrlManager->ConstructUrl('/mealplan' . '?week=' . FindObjectInArrayByPropertyValue($recipes, 'id', $recipeOfCurrentDay->recipe_id)->name),
'link' => $this->UrlManager->ConstructUrl('/recipes' . '?recipe=' . $recipeOfCurrentDay->includes_recipe_id . "#fullscreen")
);
}
}