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

UI test/review

Browse Source
This commit is contained in:
Bernd Bestel
2020-11-08 19:51:56 +01:00
parent 3e3321bf11
commit ea5b3dcd51
6 changed files with 85 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/viewjs/equipment.js
View File

@@ -1,6 +1,14 @@
var equipmentTable = $('#equipment-table').DataTable({
'order': [[0, 'asc']],
'select': 'single',
'columnDefs': [
{ 'orderable': false, 'targets': 0 },
{ 'searchable': false, "targets": 0 },
{ 'orderData': 2, 'targets': 1 }
],
select: {
style: 'single',
selector: 'tr td:not(:first-child)'
},
'initComplete': function()
{
this.api().row({ order: 'current' }, 0).select();
@@ -29,8 +37,6 @@ function DisplayEquipment(id)
$(".selected-equipment-name").text(equipmentItem.name);
$("#description-tab-content").html(equipmentItem.description);
$(".equipment-edit-button").attr("href", U("/equipment/" + equipmentItem.id.toString()));
$(".equipment-delete-button").attr("data-equipment-id", equipmentItem.id);
$(".equipment-delete-button").attr("data-equipment-name", equipmentItem.name);
if (equipmentItem.instruction_manual_file_name !== null && !equipmentItem.instruction_manual_file_name.isEmpty())
{

9
public/viewjs/equipmentform.js
View File

@@ -137,3 +137,12 @@ ResizeResponsiveEmbeds();
Grocy.Components.UserfieldsForm.Load();
$('#name').focus();
Grocy.FrontendHelpers.ValidateForm('equipment-form');
$("#instruction-manual").on("change", function(e)
{
$("#instruction-manual-label").removeClass("d-none");
$("#instruction-manual-label-none").addClass("d-none");
$("#delete-current-instruction-manual-on-save-hint").addClass("d-none");
$("#current-instruction-manuale").addClass("d-none");
Grocy.DeleteProductPictureOnSave = false;
});