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

Finalized latest changes

Browse Source
This commit is contained in:
Bernd Bestel
2018-09-08 14:06:19 +02:00
parent bb60f5f043
commit 6b38cd450f
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ $(".numberpicker-down-button").unbind('click').on("click", function ()
{ {
var inputElement = $(this).parent().parent().find('input[type="number"]')[0]; var inputElement = $(this).parent().parent().find('input[type="number"]')[0];
inputElement.stepDown(); inputElement.stepDown();
$(inputElement).trigger('keyup');
$(inputElement).trigger('change'); $(inputElement).trigger('change');
}); });
@@ -9,5 +10,6 @@ $(".numberpicker-up-button").unbind('click').on("click", function()
{ {
var inputElement = $(this).parent().parent().find('input[type="number"]')[0]; var inputElement = $(this).parent().parent().find('input[type="number"]')[0];
inputElement.stepUp(); inputElement.stepUp();
$(inputElement).trigger('keyup');
$(inputElement).trigger('change'); $(inputElement).trigger('change');
}); });

2
views/components/numberpicker.blade.php
View File

@@ -11,6 +11,7 @@
@php if(empty($additionalCssClasses)) { $additionalCssClasses = ''; } @endphp @php if(empty($additionalCssClasses)) { $additionalCssClasses = ''; } @endphp
@php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp
@php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp @php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp
@php if(empty($additionalHtmlElements)) { $additionalHtmlElements = ''; } @endphp
<div class="form-group {{ $additionalGroupCssClasses }}"> <div class="form-group {{ $additionalGroupCssClasses }}">
<label for="{{ $id }}">{{ $L($label) }}&nbsp;&nbsp;<span id="{{ $hintId }}" class="small text-muted">{{ $hint }}</span></label> <label for="{{ $id }}">{{ $L($label) }}&nbsp;&nbsp;<span id="{{ $hintId }}" class="small text-muted">{{ $hint }}</span></label>
@@ -24,4 +25,5 @@
</div> </div>
<div class="invalid-feedback">{{ $invalidFeedback }}</div> <div class="invalid-feedback">{{ $invalidFeedback }}</div>
</div> </div>
{!! $additionalHtmlElements !!}
</div> </div>

5
views/habitform.blade.php
View File

@@ -49,11 +49,10 @@
'value' => $value, 'value' => $value,
'min' => '0', 'min' => '0',
'additionalCssClasses' => 'input-group-habit-period-type', 'additionalCssClasses' => 'input-group-habit-period-type',
'invalidFeedback' => $L('This cannot be negative') 'invalidFeedback' => $L('This cannot be negative'),
'additionalHtmlElements' => '<p id="habit-period-type-info" class="form-text text-muted small d-none"></p>'
)) ))
<p id="habit-period-type-info" class="form-text text-muted small d-none"></p>
<button id="save-habit-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button> <button id="save-habit-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
</form> </form>

4
views/inventory.blade.php
View File

@@ -23,9 +23,9 @@
'min' => 0, 'min' => 0,
'value' => 1, 'value' => 1,
'invalidFeedback' => $L('The amount cannot be lower than #1', '1'), 'invalidFeedback' => $L('The amount cannot be lower than #1', '1'),
'additionalAttributes' => ' data-notequal="notequal" not-equal="-1"' 'additionalAttributes' => 'data-notequal="notequal" not-equal="-1"',
'additionalHtmlElements' => '<div id="inventory-change-info" class="form-text text-muted small d-none"></div>'
)) ))
<div id="inventory-change-info" class="form-text text-muted small d-none"></div>
@include('components.datetimepicker', array( @include('components.datetimepicker', array(
'id' => 'best_before_date', 'id' => 'best_before_date',

5
views/productform.blade.php
View File

@@ -94,11 +94,10 @@
'min' => 1, 'min' => 1,
'value' => $value, 'value' => $value,
'invalidFeedback' => $L('The amount cannot be lower than #1', '1'), 'invalidFeedback' => $L('The amount cannot be lower than #1', '1'),
'additionalCssClasses' => 'input-group-qu' 'additionalCssClasses' => 'input-group-qu',
'additionalHtmlElements' => '<p id="qu-conversion-info" class="form-text text-muted small d-none"></p>'
)) ))
<p id="qu-conversion-info" class="form-text text-muted small d-none"></p>
<button id="save-product-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button> <button id="save-product-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
</form> </form>
</div> </div>