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

General UI review/test

Browse Source
This commit is contained in:
Bernd Bestel
2020-12-19 14:03:28 +01:00
parent 7ef5bc6f77
commit 574d17fa52
15 changed files with 64 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/viewjs/components/productamountpicker.js
View File

@@ -76,6 +76,8 @@ Grocy.Components.ProductAmountPicker.AllowAnyQu = function(keepInitialQu = false
Grocy.Components.ProductAmountPicker.SetQuantityUnit($("#qu_id").attr("data-initial-qu-id"));
}
$("#qu_id").removeAttr("disabled");
$(".input-group-productamountpicker").trigger("change");
}

2
public/viewjs/mealplan.js
View File

@@ -667,7 +667,7 @@ $(document).on('click', '.recipe-consume-button', function(e)
var servings = $(e.currentTarget).attr('data-mealplan-servings');
bootbox.confirm({
message: __t('Are you sure to consume all ingredients needed by recipe "%s" (ingredients marked with "check only if a single unit is in stock" will be ignored)?', objectName),
message: __t('Are you sure to consume all ingredients needed by recipe "%s" (ingredients marked with "only check if any amount is in stock" will be ignored)?', objectName),
closeButton: false,
buttons: {
confirm: {

2
public/viewjs/recipeposform.js
View File

@@ -136,7 +136,7 @@ $('#recipe-pos-form input').keydown(function(event)
}
});
$("#only_check_single_unit_in_stock").on("click", function()
$("#only_check_single_unit_in_stock").on("change", function()
{
if (this.checked)
{

2
public/viewjs/recipes.js
View File

@@ -192,7 +192,7 @@ $(".recipe-consume").on('click', function(e)
var objectId = $(e.currentTarget).attr('data-recipe-id');
bootbox.confirm({
message: __t('Are you sure to consume all ingredients needed by recipe "%s" (ingredients marked with "check only if a single unit is in stock" will be ignored)?', objectName),
message: __t('Are you sure to consume all ingredients needed by recipe "%s" (ingredients marked with "only check if any amount is in stock" will be ignored)?', objectName),
closeButton: false,
buttons: {
confirm: {

2
public/viewjs/stockjournal.js
View File

@@ -74,6 +74,8 @@ $("#clear-filter-button").on("click", function()
$("#transaction-type-filter").val("all");
$("#location-filter").val("all");
$("#user-filter").val("all");
$("#product-filter").val("all");
stockJournalTable.column(1).search("").draw();
stockJournalTable.column(4).search("").draw();
stockJournalTable.column(5).search("").draw();
stockJournalTable.column(6).search("").draw();

1
public/viewjs/stockjournalsummary.js
View File

@@ -62,6 +62,7 @@ $("#clear-filter-button").on("click", function()
$("#transaction-type-filter").val("all");
$("#location-filter").val("all");
$("#user-filter").val("all");
$("#product-filter").val("all");
journalSummaryTable.column(1).search("").draw();
journalSummaryTable.column(2).search("").draw();
journalSummaryTable.column(3).search("").draw();