kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-30 01:55:47 +00:00
Code Issues Projects Releases Wiki Activity

Link to respective page on Calendar Event Click (#784)

Browse Source 
* Link to Page on calendar event click

* Undo my Prettier Changes.. Oops
This commit is contained in:
Zack Arnett 2020-04-22 12:03:05 -04:00 committed by GitHub
parent fbb8999513
commit 29b4672346
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/grocy.css
View File

@ -519,3 +519,7 @@ canvas.drawingBuffer {
.recipe-servings-input { .recipe-servings-input {
width: 125px; width: 125px;
} }
.fc-event{
cursor: pointer;
}

5
public/viewjs/calendar.js
View File

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

15
services/CalendarService.php
View File

@ -31,7 +31,8 @@ class CalendarService extends BaseService
$stockEvents[] = array( $stockEvents[] = array(
'title' => $titlePrefix . FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name, 'title' => $titlePrefix . FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name,
'start' => $currentStockEntry->best_before_date, '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( $taskEvents[] = array(
'title' => $titlePrefix . $currentTaskEntry->name, 'title' => $titlePrefix . $currentTaskEntry->name,
'start' => $currentTaskEntry->due_date, '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( $choreEvents[] = array(
'title' => $titlePrefix . $chore->name . $assignedToText, 'title' => $titlePrefix . $chore->name . $assignedToText,
'start' => $currentChoreEntry->next_estimated_execution_time, '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( $batteryEvents[] = array(
'title' => $titlePrefix . FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->name, 'title' => $titlePrefix . FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->name,
'start' => $currentBatteryEntry->next_estimated_charge_time, '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, 'title' => $titlePrefix . FindObjectInArrayByPropertyValue($recipes, 'id', $recipeOfCurrentDay->includes_recipe_id)->name,
'start' => FindObjectInArrayByPropertyValue($recipes, 'id', $recipeOfCurrentDay->recipe_id)->name, 'start' => FindObjectInArrayByPropertyValue($recipes, 'id', $recipeOfCurrentDay->recipe_id)->name,
'date_format' => 'date', '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")
); );
} }
} }