kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-17 03:04:36 +00:00
Code Issues Projects Releases Wiki Activity

Squashed commit

Browse Source 
Updated dependencies
Added the possibility to skip chore schedules (closes #1486)
Show the meal plan section on the corresponding calendar events (closes #1582)
Make it possible to define a time for meal plan sections and use that time for the corresponding calendar events (references #1582)
Added a changelog template
Make it possible to toggle the meal plan calendar view on bigger screens (closes #1678)
This commit is contained in:
Bernd Bestel
2022-02-08 18:08:26 +01:00
parent 4279bf6445
commit 66cf7e4ffa
27 changed files with 556 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
public/viewjs/choretracking.js
View File

@@ -1,4 +1,4 @@
$('#save-choretracking-button').on('click', function(e)
$('.save-choretracking-button').on('click', function(e)
{
e.preventDefault();
@@ -7,13 +7,15 @@
return;
}
var skipped = $(e.currentTarget).hasClass("skip");
var jsonForm = $('#choretracking-form').serializeJSON();
Grocy.FrontendHelpers.BeginUiBusy("choretracking-form");
Grocy.Api.Get('chores/' + jsonForm.chore_id,
function(choreDetails)
{
Grocy.Api.Post('chores/' + jsonForm.chore_id + '/execute', { 'tracked_time': Grocy.Components.DateTimePicker.GetValue(), 'done_by': $("#user_id").val() },
Grocy.Api.Post('chores/' + jsonForm.chore_id + '/execute', { 'tracked_time': Grocy.Components.DateTimePicker.GetValue(), 'done_by': $("#user_id").val(), 'skipped': skipped },
function(result)
{
Grocy.EditObjectId = result.id;
@@ -58,6 +60,7 @@ $('#chore_id').on('change', function(e)
Grocy.Api.Get('objects/chores/' + choreId,
function(chore)
{
if (chore.track_date_only == 1)
{
Grocy.Components.DateTimePicker.ChangeFormat("YYYY-MM-DD");
@@ -68,6 +71,17 @@ $('#chore_id').on('change', function(e)
Grocy.Components.DateTimePicker.ChangeFormat("YYYY-MM-DD HH:mm:ss");
Grocy.Components.DateTimePicker.SetValue(moment().format("YYYY-MM-DD HH:mm:ss"));
}
if (chore.period_type == "manually")
{
$(".save-choretracking-button.skip").addClass("keep-disabled");
}
else
{
$(".save-choretracking-button.skip").removeClass("keep-disabled");
}
Grocy.FrontendHelpers.ValidateForm('choretracking-form');
},
function(xhr)
{
@@ -114,7 +128,7 @@ $('#choretracking-form input').keydown(function(event)
}
else
{
$('#save-choretracking-button').click();
$('.save-choretracking-button').first().click();
}
}
});