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

Added a dialog to show product related resolved QU conversions (references #2056 and #1360)

Browse Source
This commit is contained in:
Bernd Bestel
2022-12-04 19:02:15 +01:00
parent d889e9d3ad
commit 50fac692ad
8 changed files with 368 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
views/productform.blade.php
View File

@@ -579,7 +579,7 @@
@if($mode == "edit")
<div class="related-links collapse d-md-flex order-2 width-xs-sm-100"
id="related-links">
<a class="btn btn-outline-primary btn-sm m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link"
<a class="btn btn-primary btn-sm m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link"
href="{{ $U('/productbarcodes/new?embedded&product=' . $product->id ) }}">
{{ $__t('Add') }}
</a>
@@ -717,10 +717,17 @@
@if($mode == "edit")
<div class="related-links collapse d-md-flex order-2 width-xs-sm-100"
id="related-links">
<a class="btn btn-outline-primary btn-sm m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link"
<a class="btn btn-primary btn-sm m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link"
href="{{ $U('/quantityunitconversion/new?embedded&product=' . $product->id ) }}">
{{ $__t('Add') }}
</a>
<a class="btn btn-outline-primary btn-sm m-1 mt-md-0 mb-md-0 float-right show-as-dialog-link"
href="{{ $U('/quantityunitconversionsresolved?embedded&product=' . $product->id ) }}"
data-toggle="tooltip"
data-trigger="hover click"
title="{{ $__t('This shows all to this product directly or indirectly related quantity units and their derived conversion factors') }}">
{{ $__t('Show resolved conversions') }}
</a>
</div>
@endif
</div>

104
views/quantityunitconversionsresolved.blade.php Normal file
View File

@@ -0,0 +1,104 @@
@extends('layout.default')
@section('title', $__t('QU conversions resolved'))
@section('viewJsName', 'quantityunitconversionsresolved')
@section('content')
<div class="row">
<div class="col">
<div class="title-related-links">
<h2 class="title">@yield('title')</h2>
@if($product != null)
<h2>
<span class="text-muted small">{{ $__t('Product') }} <strong>{{ $product->name }}</strong></span>
</h2>
@endif
</div>
</div>
</div>
<hr class="my-2">
<div class="row d-md-flex"
id="table-filter-row">
<div class="col-6">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa-solid fa-search"></i></span>
</div>
<input type="text"
id="search"
class="form-control"
placeholder="{{ $__t('Search') }}">
</div>
</div>
<div class="col-5">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa-solid fa-filter"></i>&nbsp;{{ $__t('Quantity unit') }}</span>
</div>
<select class="custom-control custom-select"
id="quantity-unit-filter">
<option value="all">{{ $__t('All') }}</option>
@foreach($quantityUnits as $quantityUnit)
<option value="{{ $quantityUnit->id }}">{{ $quantityUnit->name }}</option>
@endforeach
</select>
</div>
</div>
<div class="col-1">
<div class="float-right">
<button id="clear-filter-button"
class="btn btn-sm btn-outline-info"
data-toggle="tooltip"
title="{{ $__t('Clear filter') }}">
<i class="fa-solid fa-filter-circle-xmark"></i>
</button>
</div>
</div>
</div>
<div class="row">
<div class="col">
<table id="qu-conversions-resolved-table"
class="table table-sm table-striped nowrap w-100">
<thead>
<tr>
<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
data-toggle="tooltip"
title="{{ $__t('Table options') }}"
data-table-selector="#qu-conversions-resolved-table"
href="#"><i class="fa-solid fa-eye"></i></a>
</th>
<th class="allow-grouping">{{ $__t('Quantity unit from') }}</th>
<th class="allow-grouping">{{ $__t('Quantity unit to') }}</th>
<th>{{ $__t('Factor') }}</th>
<th></th>
</tr>
</thead>
<tbody class="d-none">
@foreach($quantityUnitConversionsResolved as $quConversion)
<tr>
<td class="fit-content border-right"></td>
<td>
{{ FindObjectInArrayByPropertyValue($quantityUnits, 'id', $quConversion->from_qu_id)->name }}
</td>
<td>
{{ FindObjectInArrayByPropertyValue($quantityUnits, 'id', $quConversion->to_qu_id)->name }}
</td>
<td>
<span class="locale-number locale-number-quantity-amount">{{ $quConversion->factor }}</span>
</td>
<td class="font-italic">
{!! $__t('This means 1 %1$s is the same as %2$s %3$s', FindObjectInArrayByPropertyValue($quantityUnits, 'id', $quConversion->from_qu_id)->name, '<span class="locale-number locale-number-quantity-amount">' . $quConversion->factor . '</span>', $__n($quConversion->factor, FindObjectInArrayByPropertyValue($quantityUnits, 'id', $quConversion->to_qu_id)->name, FindObjectInArrayByPropertyValue($quantityUnits, 'id', $quConversion->to_qu_id)->name_plural, true)) !!}
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
@stop