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

Added a notes field to shopping lists (references #245)

Browse Source
This commit is contained in:
Bernd Bestel 2019-09-20 18:08:38 +02:00
parent 5a91c86b81
commit 339a25d1e3
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
public/viewjs/shoppinglist.js
View File

@ -307,5 +307,28 @@ OnListItemRemoved();
$(document).on("click", "#print-shopping-list-button", function(e) $(document).on("click", "#print-shopping-list-button", function(e)
{ {
$(".print-timestamp").text(moment().format("l LT")); $(".print-timestamp").text(moment().format("l LT"));
$("#description-for-print").html($("#description").val());
window.print(); window.print();
}); });
$("#description").on("summernote.change", function()
{
$("#save-description-button").removeClass("disabled");
});
$(document).on("click", "#save-description-button", function(e)
{
e.preventDefault();
document.activeElement.blur();
Grocy.Api.Put('objects/shopping_lists/' + $("#selected-shopping-list").val(), { description: $("#description").val() },
function(result)
{
$("#save-description-button").addClass("disabled");
},
function(xhr)
{
console.log(xhr);
}
);
});

16
views/shoppinglist.blade.php
View File

@ -142,6 +142,16 @@
</div> </div>
</div> </div>
<div class="row mt-3 d-print-none">
<div class="col-xs-12 col-md-8">
<div class="form-group">
<label for="notes">{{ $__t('Notes') }}</label>
<a id="save-description-button" class="btn btn-success btn-sm ml-1 mb-2 disabled" href="#">{{ $__t('Save') }}</a>
<textarea class="form-control wysiwyg-editor" id="description" name="description">{{ FindObjectInArrayByPropertyValue($shoppingLists, 'id', $selectedShoppingListId)->description }}</textarea>
</div>
</div>
</div>
<div class="modal fade" id="shopping-list-stock-add-workflow-modal" tabindex="-1"> <div class="modal fade" id="shopping-list-stock-add-workflow-modal" tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content text-center"> <div class="modal-content text-center">
@ -195,5 +205,11 @@
</table> </table>
</div> </div>
</div> </div>
<div class="row w-75">
<div class="col">
<h5>{{ $__t('Notes') }}</h5>
<p id="description-for-print"></p>
</div>
</div>
</div> </div>
@stop @stop

5
views/shoppinglistform.blade.php
View File

@ -27,11 +27,6 @@
<div class="invalid-feedback">{{ $__t('A name is required') }}</div> <div class="invalid-feedback">{{ $__t('A name is required') }}</div>
</div> </div>
<div class="form-group">
<label for="description">{{ $__t('Description') }}</label>
<textarea class="form-control" rows="2" id="description" name="description">@if($mode == 'edit'){{ $shoppingList->description }}@endif</textarea>
</div>
<button id="save-shopping-list-button" class="btn btn-success">{{ $__t('Save') }}</button> <button id="save-shopping-list-button" class="btn btn-success">{{ $__t('Save') }}</button>
</form> </form>