From 33325d556036f5681094fc399c78d5621d4f35fb Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Mon, 31 Aug 2020 20:32:50 +0200 Subject: [PATCH] Applied .blade.php formatting rules --- views/about.blade.php | 38 +- views/barcodescannertesting.blade.php | 33 +- views/batteries.blade.php | 30 +- views/batteriesjournal.blade.php | 35 +- views/batteriesoverview.blade.php | 110 +++- views/batteriessettings.blade.php | 15 +- views/batteryform.blade.php | 53 +- views/batterytracking.blade.php | 27 +- views/calendar.blade.php | 11 +- views/choreform.blade.php | 230 +++++--- views/chores.blade.php | 90 +-- views/choresjournal.blade.php | 33 +- views/choresoverview.blade.php | 135 +++-- views/choressettings.blade.php | 15 +- views/choretracking.blade.php | 40 +- views/components/barcodescanner.blade.php | 29 +- views/components/batterycard.blade.php | 20 +- views/components/calendarcard.blade.php | 5 +- views/components/chorecard.blade.php | 20 +- views/components/datetimepicker.blade.php | 47 +- views/components/datetimepicker2.blade.php | 44 +- views/components/locationpicker.blade.php | 19 +- views/components/numberpicker.blade.php | 26 +- .../components/productamountpicker.blade.php | 30 +- views/components/productcard.blade.php | 59 +- views/components/productpicker.blade.php | 34 +- views/components/recipepicker.blade.php | 19 +- .../shoppinglocationpicker.blade.php | 21 +- views/components/userfields_tbody.blade.php | 44 +- views/components/userfields_thead.blade.php | 2 +- views/components/userfieldsform.blade.php | 161 +++--- .../userpermission_select.blade.php | 16 +- views/components/userpicker.blade.php | 14 +- views/consume.blade.php | 80 ++- views/equipment.blade.php | 78 ++- views/equipmentform.blade.php | 63 ++- views/errors/403.blade.php | 8 +- views/errors/404.blade.php | 13 +- views/errors/500.blade.php | 17 +- views/errors/base.blade.php | 28 +- views/inventory.blade.php | 105 ++-- views/layout/default.blade.php | 501 ++++++++++++----- views/locationcontentsheet.blade.php | 38 +- views/locationform.blade.php | 49 +- views/locations.blade.php | 30 +- views/login.blade.php | 27 +- views/manageapikeys.blade.php | 30 +- views/mealplan.blade.php | 107 ++-- views/openapiui.blade.php | 28 +- views/productbarcodesform.blade.php | 59 +- views/productform.blade.php | 461 +++++++++------ views/productgroupform.blade.php | 34 +- views/productgroups.blade.php | 35 +- views/products.blade.php | 40 +- views/purchase.blade.php | 144 +++-- views/quantityunitconversionform.blade.php | 71 ++- views/quantityunitform.blade.php | 66 ++- views/quantityunitpluraltesting.blade.php | 26 +- views/quantityunits.blade.php | 30 +- views/recipeform.blade.php | 231 +++++--- views/recipeposform.blade.php | 86 ++- views/recipes.blade.php | 531 ++++++++++-------- views/recipessettings.blade.php | 8 +- views/shoppinglist.blade.php | 194 ++++--- views/shoppinglistform.blade.php | 25 +- views/shoppinglistitemform.blade.php | 58 +- views/shoppinglistsettings.blade.php | 21 +- views/shoppinglocationform.blade.php | 34 +- views/shoppinglocations.blade.php | 32 +- views/stockentries.blade.php | 126 +++-- views/stockentryform.blade.php | 138 ++--- views/stockjournal.blade.php | 34 +- views/stockoverview.blade.php | 187 ++++-- views/stocksettings.blade.php | 62 +- views/taskcategories.blade.php | 30 +- views/taskcategoryform.blade.php | 34 +- views/taskform.blade.php | 74 ++- views/tasks.blade.php | 96 +++- views/taskssettings.blade.php | 15 +- views/transfer.blade.php | 68 ++- views/userentities.blade.php | 24 +- views/userentityform.blade.php | 60 +- views/userfieldform.blade.php | 70 ++- views/userfields.blade.php | 28 +- views/userform.blade.php | 49 +- views/userobjectform.blade.php | 18 +- views/userobjects.blade.php | 29 +- views/userpermissions.blade.php | 20 +- views/users.blade.php | 24 +- views/usersettings.blade.php | 12 +- 90 files changed, 4000 insertions(+), 2091 deletions(-) diff --git a/views/about.blade.php b/views/about.blade.php index cbd87569..55cd3be7 100644 --- a/views/about.blade.php +++ b/views/about.blade.php @@ -10,19 +10,27 @@
-
+

Version {{ $version }}
- {{ $__t('Released on') }} {{ $releaseDate }} + {{ $__t('Released on') }} {{ $releaseDate }}

@@ -32,19 +40,25 @@

{{ $__t('Do you find grocy useful?') }}
- {{ $__t('Say thanks') }} + {{ $__t('Say thanks') }}

-
+
@php $Parsedown = new Parsedown(); @endphp @foreach($changelog['changelog_items'] as $changelogItem)
- + Version {{ $changelogItem['version'] }}
{{ $__t('Released on') }} {{ $changelogItem['release_date'] }} - +
@@ -60,10 +74,14 @@

grocy is a project by - Bernd Bestel
+ Bernd Bestel
Created with passion since 2017
Life runs on code
- +

diff --git a/views/barcodescannertesting.blade.php b/views/barcodescannertesting.blade.php index 988b1f3f..a0fb54c6 100644 --- a/views/barcodescannertesting.blade.php +++ b/views/barcodescannertesting.blade.php @@ -5,7 +5,8 @@ @section('viewJsName', 'barcodescannertesting') @push('pageScripts') - + @endpush @section('content') @@ -18,27 +19,45 @@
-
+
- +
- +
- {{ $__t('Hit') }}: 0 // - {{ $__t('Miss') }}: 0 + {{ $__t('Hit') }}: 0 // + {{ $__t('Miss') }}: 0
- +
diff --git a/views/batteries.blade.php b/views/batteries.blade.php index 8d2a1239..4fded256 100644 --- a/views/batteries.blade.php +++ b/views/batteries.blade.php @@ -10,7 +10,8 @@

@yield('title')

- + {{ $__t('Configure userfields') }}
@@ -20,7 +21,8 @@
- + {{ $__t('Add') }}
@@ -29,16 +31,20 @@
- +
- +
- +
@@ -48,7 +54,7 @@ @include('components.userfields_thead', array( - 'userfields' => $userfields + 'userfields' => $userfields )) @@ -57,10 +63,14 @@ @foreach($batteries as $battery) @@ -78,8 +88,8 @@ @include('components.userfields_tbody', array( - 'userfields' => $userfields, - 'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $battery->id) + 'userfields' => $userfields, + 'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $battery->id) )) diff --git a/views/batteriesjournal.blade.php b/views/batteriesjournal.blade.php index 2caa0b9c..a2478650 100644 --- a/views/batteriesjournal.blade.php +++ b/views/batteriesjournal.blade.php @@ -16,21 +16,25 @@
- +
- +
- +
- - @foreach($batteries as $battery) + @foreach($batteries as $battery) - @endforeach + @endforeach
@@ -38,7 +42,8 @@
-
{{ $__t('Charge cycle interval (days)') }}
- + - +
+
@@ -48,9 +53,15 @@ @foreach($chargeCycles as $chargeCycleEntry) - + @@ -59,12 +70,14 @@ @if($chargeCycleEntry->undone == 1)
{{ $__t('Undone on') . ' ' . $chargeCycleEntry->undone_timestamp }} - + @endif @endforeach diff --git a/views/batteriesoverview.blade.php b/views/batteriesoverview.blade.php index b9cd43af..ed2d5fd6 100644 --- a/views/batteriesoverview.blade.php +++ b/views/batteriesoverview.blade.php @@ -5,7 +5,8 @@ @section('viewJsName', 'batteriesoverview') @push('pageStyles') - + @endpush @section('content') @@ -14,14 +15,20 @@

@yield('title')

- - {{ $__t('Journal') }} + + {{ $__t('Journal') }}
-

-

+

+

@@ -29,17 +36,21 @@
- +
- +
- +
- @@ -50,7 +61,8 @@
-
- + {{ $chargeCycleEntry->tracked_time }} - +
+
@@ -60,60 +72,92 @@ @include('components.userfields_thead', array( - 'userfields' => $userfields + 'userfields' => $userfields )) @foreach($current as $currentBatteryEntry) - + - - - @include('components.userfields_tbody', array( - 'userfields' => $userfields, - 'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $currentBatteryEntry->battery_id) - )) + "@if(FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->charge_interval_days > 0 && $currentBatteryEntry->next_estimated_charge_time < date('Y-m-d + H:i:s')) + overdue + @elseif(FindObjectInArrayByPropertyValue($batteries, 'id' + , + $currentBatteryEntry->battery_id)->charge_interval_days > 0 && $currentBatteryEntry->next_estimated_charge_time < date('Y-m-d + H:i:s', + strtotime("+$nextXDays + days"))) + duesoon + @endif + + @include('components.userfields_tbody', + array( 'userfields'=> $userfields, + 'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $currentBatteryEntry->battery_id) + )) @endforeach @@ -122,14 +166,18 @@ -
Hidden status
-
-
- + {{ $__t('Show battery details') }} - + {{ $__t('Journal for this battery') }} - + {{ $__t('Edit battery') }}
+ {{ FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->name }} {{ $currentBatteryEntry->last_tracked_time }} - + @if(FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->charge_interval_days > 0) - {{ $currentBatteryEntry->next_estimated_charge_time }} - + {{ $currentBatteryEntry->next_estimated_charge_time }} + @else - ... + ... @endif - "@if(FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->charge_interval_days > 0 && $currentBatteryEntry->next_estimated_charge_time < date('Y-m-d H:i:s')) overdue @elseif(FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->charge_interval_days > 0 && $currentBatteryEntry->next_estimated_charge_time < date('Y-m-d H:i:s', strtotime("+$nextXDays days"))) duesoon @endif -
- - - - - - +
{{ $__t('Name') }}{{ $__t('Period type') }}{{ $__t('Description') }}
+ + + + + + - @include('components.userfields_thead', array( + @include('components.userfields_thead', array( 'userfields' => $userfields - )) + )) - - - - @foreach($chores as $chore) - - - - - + + + + @foreach($chores as $chore) + + + + + - @include('components.userfields_tbody', array( + @include('components.userfields_tbody', array( 'userfields' => $userfields, 'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $chore->id) - )) + )) - - @endforeach - + + @endforeach +
{{ $__t('Name') }}{{ $__t('Period type') }}{{ $__t('Description') }}
- - - - - - - - {{ $chore->name }} - - {{ $__t($chore->period_type) }} - - {{ $chore->description }} -
+ + + + + + + + {{ $chore->name }} + + {{ $__t($chore->period_type) }} + + {{ $chore->description }} +
diff --git a/views/choresjournal.blade.php b/views/choresjournal.blade.php index 6410e076..691b31de 100644 --- a/views/choresjournal.blade.php +++ b/views/choresjournal.blade.php @@ -16,20 +16,24 @@
- +
- +
- +
- @foreach($chores as $chore) - + @endforeach
@@ -38,7 +42,8 @@
- +
@@ -51,9 +56,15 @@ @foreach($choresLog as $choreLogEntry) - + @@ -62,12 +73,14 @@ @if($choreLogEntry->undone == 1)
{{ $__t('Undone on') . ' ' . $choreLogEntry->undone_timestamp }} - + @endif @if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS)
- + {{ $choreLogEntry->tracked_time }} - + diff --git a/views/choresoverview.blade.php b/views/choresoverview.blade.php index 81f1e1e9..7ebf2a0c 100644 --- a/views/choresoverview.blade.php +++ b/views/choresoverview.blade.php @@ -5,7 +5,8 @@ @section('viewJsName', 'choresoverview') @push('pageStyles') - + @endpush @section('content') @@ -14,16 +15,24 @@

@yield('title')

- + {{ $__t('Journal') }}
-

-

+

+

@if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS) -

+

@endif @@ -32,18 +41,22 @@
- +
- +
- +
- @@ -55,12 +68,14 @@
- +
- @foreach($users as $user) - + @endforeach
@@ -70,7 +85,8 @@
- +
@@ -86,77 +102,112 @@ @endif @include('components.userfields_thead', array( - 'userfields' => $userfields + 'userfields' => $userfields )) @foreach($currentChores as $curentChoreEntry) - + - @if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS) @endif - - @if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS) - + @if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS) + @endif @include('components.userfields_tbody', array( - 'userfields' => $userfields, - 'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $curentChoreEntry->chore_id) + 'userfields' => $userfields, + 'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $curentChoreEntry->chore_id) )) @@ -166,14 +217,18 @@ - diff --git a/views/components/chorecard.blade.php b/views/components/chorecard.blade.php index ee60e524..6e195d2d 100644 --- a/views/components/chorecard.blade.php +++ b/views/components/chorecard.blade.php @@ -1,21 +1,31 @@ @push('componentScripts') - + @endpush
{{ $__t('Chore overview') }} - + - +

- {{ $__t('Tracked count') }}:
- {{ $__t('Last tracked') }}:
+ {{ $__t('Tracked count') }}:
+ {{ $__t('Last tracked') }}:
@if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS) {{ $__t('Last done by') }}: @endif diff --git a/views/components/datetimepicker.blade.php b/views/components/datetimepicker.blade.php index d3ca83bc..d704ab8b 100644 --- a/views/components/datetimepicker.blade.php +++ b/views/components/datetimepicker.blade.php @@ -1,5 +1,5 @@ @push('componentScripts') - + @endpush @php if(!isset($isRequired)) { $isRequired = true; } @endphp @@ -16,33 +16,60 @@ @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp @php if(empty($activateNumberPad)) { $activateNumberPad = false; } @endphp -
+
-
- + -
+
{{ $invalidFeedback }}
-
{{ $earlierThanInfoText }}
+
{{ $earlierThanInfoText }}
@if(isset($shortcutValue) && isset($shortcutLabel))
- - + +
@endif
diff --git a/views/components/datetimepicker2.blade.php b/views/components/datetimepicker2.blade.php index b887f9f3..58c40ab0 100644 --- a/views/components/datetimepicker2.blade.php +++ b/views/components/datetimepicker2.blade.php @@ -1,5 +1,5 @@ @push('componentScripts') - + @endpush @php if(!isset($isRequired)) { $isRequired = true; } @endphp @@ -15,33 +15,57 @@ @php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp -
+
-
- + -
+
{{ $invalidFeedback }}
-
{{ $earlierThanInfoText }}
+
{{ $earlierThanInfoText }}
@if(isset($shortcutValue) && isset($shortcutLabel))
- - + +
@endif
diff --git a/views/components/locationpicker.blade.php b/views/components/locationpicker.blade.php index b219ed20..f8840b3d 100644 --- a/views/components/locationpicker.blade.php +++ b/views/components/locationpicker.blade.php @@ -1,5 +1,5 @@ @push('componentScripts') - + @endpush @php if(empty($prefillByName)) { $prefillByName = ''; } @endphp @@ -7,12 +7,21 @@ @php if(!isset($isRequired)) { $isRequired = true; } @endphp @php if(empty($hint)) { $hint = ''; } @endphp -
- - @foreach($locations as $location) - + @endforeach
{{ $__t('You have to select a location') }}
diff --git a/views/components/numberpicker.blade.php b/views/components/numberpicker.blade.php index db52ea8c..8e18395d 100644 --- a/views/components/numberpicker.blade.php +++ b/views/components/numberpicker.blade.php @@ -1,5 +1,5 @@ @push('componentScripts') - + @endpush @php if(!isset($value)) { $value = 1; } @endphp @@ -16,12 +16,30 @@ @php if(!isset($isRequired)) { $isRequired = true; } @endphp @php if(!isset($noNameAttribute)) { $noNameAttribute = false; } @endphp -
+
+ {!! $additionalHtmlContextHelp !!}
- +
diff --git a/views/components/productamountpicker.blade.php b/views/components/productamountpicker.blade.php index 36400119..2864f644 100644 --- a/views/components/productamountpicker.blade.php +++ b/views/components/productamountpicker.blade.php @@ -1,5 +1,5 @@ @push('componentScripts') - + @endpush @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp @@ -9,25 +9,33 @@
@include('components.numberpicker', array( - 'id' => 'display_amount', - 'label' => 'Amount', - 'min' => 0, - 'value' => $value, - 'invalidFeedback' => $__t('This cannot be negative and must be an integral number'), - 'additionalGroupCssClasses' => 'col-4 mb-1', - 'additionalCssClasses' => 'input-group-productamountpicker' + 'id' => 'display_amount', + 'label' => 'Amount', + 'min' => 0, + 'value' => $value, + 'invalidFeedback' => $__t('This cannot be negative and must be an integral number'), + 'additionalGroupCssClasses' => 'col-4 mb-1', + 'additionalCssClasses' => 'input-group-productamountpicker' ))
-
{{ $__t('A quantity unit is required') }}
-
- +
+
diff --git a/views/components/productcard.blade.php b/views/components/productcard.blade.php index 91b93aaa..57f919d5 100644 --- a/views/components/productcard.blade.php +++ b/views/components/productcard.blade.php @@ -1,45 +1,70 @@ @push('componentScripts') - - + + @endpush
{{ $__t('Product overview') }} - + - +

-
-

- +
+

+
- {{ $__t('Stock amount') }}: - -
- {{ $__t('Stock value') }}: -
+ {{ $__t('Stock amount') }}: + +
+ {{ $__t('Stock value') }}: +
@if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING){{ $__t('Default location') }}:
@endif - {{ $__t('Last purchased') }}:
- {{ $__t('Last used') }}:
+ {{ $__t('Last purchased') }}:
+ {{ $__t('Last used') }}:
@if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING){{ $__t('Last price') }}:
@endif @if (GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING){{ $__t('Average price') }}:
@endif @if (GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING){{ $__t('Average shelf life') }}:
@endif {{ $__t('Spoil rate') }}: -

+

@if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
{{ $__t('Price history') }}
- - {{ $__t('No price history available') }} + + {{ $__t('No price history available') }} @endif
diff --git a/views/components/productpicker.blade.php b/views/components/productpicker.blade.php index ac7f51a6..fb83e68e 100644 --- a/views/components/productpicker.blade.php +++ b/views/components/productpicker.blade.php @@ -1,5 +1,5 @@ @push('componentScripts') - + @endpush @php if(empty($disallowAddProductWorkflows)) { $disallowAddProductWorkflows = false; } @endphp @@ -12,23 +12,41 @@ @php if(empty($hint)) { $hint = ''; } @endphp @php if(empty($nextInputSelector)) { $nextInputSelector = ''; } @endphp -
+
- @foreach($products as $product) - + @endforeach
{{ $__t('You have to select a product') }}
-
+
@if(!$disallowAllProductWorkflows) -
{{ $__t('Type a new product name or barcode and hit TAB to start a workflow') }}
+
{{ $__t('Type a new product name or barcode and hit TAB to start a workflow') }}
@endif -
{{ $__t('will be added to the list of barcodes for the selected product on submit') }}
+
{{ $__t('will be added to the list of barcodes for the selected product on submit') }}
@include('components.barcodescanner') diff --git a/views/components/recipepicker.blade.php b/views/components/recipepicker.blade.php index 1a1237cf..d409c831 100644 --- a/views/components/recipepicker.blade.php +++ b/views/components/recipepicker.blade.php @@ -1,5 +1,5 @@ @push('componentScripts') - + @endpush @php if(empty($prefillByName)) { $prefillByName = ''; } @endphp @@ -9,12 +9,21 @@ @php if(empty($hintId)) { $hintId = ''; } @endphp @php if(empty($nextInputSelector)) { $nextInputSelector = ''; } @endphp -
- - @foreach($recipes as $recipe) - + @endforeach
{{ $__t('You have to select a recipe') }}
diff --git a/views/components/shoppinglocationpicker.blade.php b/views/components/shoppinglocationpicker.blade.php index c72c6928..d7d8a419 100644 --- a/views/components/shoppinglocationpicker.blade.php +++ b/views/components/shoppinglocationpicker.blade.php @@ -1,5 +1,5 @@ @push('componentScripts') - + @endpush @php if(empty($prefillByName)) { $prefillByName = ''; } @endphp @@ -8,13 +8,22 @@ @php if(empty($hint)) { $hint = ''; } @endphp @php if(empty($nextInputSelector)) { $nextInputSelector = ''; } @endphp -
- - @foreach($shoppinglocations as $shoppinglocation) - + @endforeach -
{{ $__t('You have to select a store') }}
+
{{ $__t('You have to select a store') }}
diff --git a/views/components/userfields_tbody.blade.php b/views/components/userfields_tbody.blade.php index 7b2029df..ec2a8b76 100644 --- a/views/components/userfields_tbody.blade.php +++ b/views/components/userfields_tbody.blade.php @@ -3,27 +3,33 @@ @foreach($userfields as $userfield) @if($userfield->show_as_column_in_tables == 1) - @php $userfieldObject = FindObjectInArrayByPropertyValue($userfieldValues, 'name', $userfield->name) @endphp -
+ @endif + @endif @endforeach diff --git a/views/components/userfields_thead.blade.php b/views/components/userfields_thead.blade.php index eb41ade8..fe5a0c68 100644 --- a/views/components/userfields_thead.blade.php +++ b/views/components/userfields_thead.blade.php @@ -3,7 +3,7 @@ @foreach($userfields as $userfield) @if($userfield->show_as_column_in_tables == 1) - + @endif @endforeach diff --git a/views/components/userfieldsform.blade.php b/views/components/userfieldsform.blade.php index c35e12b6..09b5de50 100644 --- a/views/components/userfieldsform.blade.php +++ b/views/components/userfieldsform.blade.php @@ -1,10 +1,13 @@ @push('componentScripts') - + @endpush @if(count($userfields) > 0) -
+

{{ $__t('Userfields') }}

@foreach($userfields as $userfield) @@ -12,114 +15,142 @@ @if($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_SINGLE_LINE_TEXT)
- +
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_SINGLE_MULTILINE_TEXT)
- +
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_INTEGRAL_NUMBER) @include('components.numberpicker', array( - 'id' => $userfield->name, - 'label' => $userfield->caption, - 'noNameAttribute' => true, - 'min' => 0, - 'isRequired' => false, - 'additionalCssClasses' => 'userfield-input', - 'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"' + 'id' => $userfield->name, + 'label' => $userfield->caption, + 'noNameAttribute' => true, + 'min' => 0, + 'isRequired' => false, + 'additionalCssClasses' => 'userfield-input', + 'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"' )) @elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_DECIMAL_NUMBER) @include('components.numberpicker', array( - 'id' => '', - 'label' => $userfield->caption, - 'noNameAttribute' => true, - 'min' => 0, - 'step' => 0.01, - 'isRequired' => false, - 'additionalCssClasses' => 'userfield-input', - 'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"' + 'id' => '', + 'label' => $userfield->caption, + 'noNameAttribute' => true, + 'min' => 0, + 'step' => 0.01, + 'isRequired' => false, + 'additionalCssClasses' => 'userfield-input', + 'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"' )) @elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_DATE) @include('components.datetimepicker', array( - 'id' => $userfield->name, - 'label' => $userfield->caption, - 'noNameAttribute' => true, - 'format' => 'YYYY-MM-DD', - 'initWithNow' => false, - 'limitEndToNow' => false, - 'limitStartToNow' => false, - 'additionalGroupCssClasses' => 'date-only-datetimepicker', - 'isRequired' => false, - 'additionalCssClasses' => 'userfield-input', - 'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"' + 'id' => $userfield->name, + 'label' => $userfield->caption, + 'noNameAttribute' => true, + 'format' => 'YYYY-MM-DD', + 'initWithNow' => false, + 'limitEndToNow' => false, + 'limitStartToNow' => false, + 'additionalGroupCssClasses' => 'date-only-datetimepicker', + 'isRequired' => false, + 'additionalCssClasses' => 'userfield-input', + 'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"' )) @elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_DATETIME) @include('components.datetimepicker', array( - 'id' => $userfield->name, - 'label' => $userfield->caption, - 'noNameAttribute' => true, - 'format' => 'YYYY-MM-DD HH:mm:ss', - 'initWithNow' => false, - 'limitEndToNow' => false, - 'limitStartToNow' => false, - 'isRequired' => false, - 'additionalCssClasses' => 'userfield-input', - 'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"' + 'id' => $userfield->name, + 'label' => $userfield->caption, + 'noNameAttribute' => true, + 'format' => 'YYYY-MM-DD HH:mm:ss', + 'initWithNow' => false, + 'limitEndToNow' => false, + 'limitStartToNow' => false, + 'isRequired' => false, + 'additionalCssClasses' => 'userfield-input', + 'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"' )) @elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_CHECKBOX)
- - + +
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_PRESET_LIST)
- @foreach(preg_split('/\r\n|\r|\n/', $userfield->config) as $option) - + @endforeach
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_PRESET_CHECKLIST)
- @foreach(preg_split('/\r\n|\r|\n/', $userfield->config) as $option) - + @endforeach
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_LINK)
- +
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_FILE) -
- - -
- - -
+
+ + +
+ +
+
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_IMAGE) -
- - -
- {{ $userfield->name }} - -
+
+ + +
+ {{ $userfield->name }} +
+
@endif @endforeach diff --git a/views/components/userpermission_select.blade.php b/views/components/userpermission_select.blade.php index 32aa6b87..b42ff6d2 100644 --- a/views/components/userpermission_select.blade.php +++ b/views/components/userpermission_select.blade.php @@ -1,15 +1,19 @@
    @foreach($perm->uihelper_user_permissionsList(array('user_id' => $user->id))->via('parent') as $p) -
  • - @include('components.userpermission_select', array( - 'perm' => $p - )) -
    • +
  • + @include('components.userpermission_select', array( + 'perm' => $p + )) +
    • @endforeach
diff --git a/views/components/userpicker.blade.php b/views/components/userpicker.blade.php index 7241412a..8ab6dcd9 100644 --- a/views/components/userpicker.blade.php +++ b/views/components/userpicker.blade.php @@ -1,17 +1,23 @@ @push('componentScripts') - + @endpush @php if(empty($prefillByUsername)) { $prefillByUsername = ''; } @endphp @php if(empty($prefillByUserId)) { $prefillByUserId = ''; } @endphp @php if(!isset($nextInputSelector)) { $nextInputSelector = ''; } @endphp -
+
- @foreach($users as $user) - + @endforeach
diff --git a/views/consume.blade.php b/views/consume.blade.php index cd252643..4009369c 100644 --- a/views/consume.blade.php +++ b/views/consume.blade.php @@ -5,7 +5,7 @@ @section('viewJsName', 'consume') @push('pageScripts') - + @endpush @section('content') @@ -15,8 +15,16 @@

@yield('title')

@if(!$embedded) - - + + @else + @if($mode == 'edit') - + - @if(!empty($equipment->instruction_manual_file_name)) - - @endif + @if(!empty($equipment->instruction_manual_file_name)) + + @endif @endif -
+
- +
{{ $__t('A name is required') }}
@@ -41,34 +53,47 @@ {{ $__t('If you don\'t select a file, the current instruction manual will not be altered') }}
- - + +
- +
@include('components.userfieldsform', array( - 'userfields' => $userfields, - 'entity' => 'equipment' + 'userfields' => $userfields, + 'entity' => 'equipment' )) - +
- + @if(!empty($equipment->instruction_manual_file_name)) - -

{{ $__t('The current instruction manual will be deleted when you save the equipment') }}

+ +

{{ $__t('The current instruction manual will be deleted when you save the equipment') }}

@else -

{{ $__t('No instruction manual available') }}

+

{{ $__t('No instruction manual available') }}

@endif
diff --git a/views/errors/403.blade.php b/views/errors/403.blade.php index 0fd85e7f..bbd07b58 100644 --- a/views/errors/403.blade.php +++ b/views/errors/403.blade.php @@ -3,9 +3,9 @@ @section('title', $__t('Unauthorized')) @section('content') -
-
-

{{ $__t('You are not allowed to view this page') }}

-
+
+
+

{{ $__t('You are not allowed to view this page') }}

+
@stop diff --git a/views/errors/404.blade.php b/views/errors/404.blade.php index abf2baf1..a9dcc375 100644 --- a/views/errors/404.blade.php +++ b/views/errors/404.blade.php @@ -3,11 +3,12 @@ @section('title', $__t('Page not found')) @section('content') - -
-
-

{{ $__t('This page does not exist') }}

-
{{ $__t('You will be redirected to the default page in %s seconds', '5') }}
-
+ +
+
+

{{ $__t('This page does not exist') }}

+
{{ $__t('You will be redirected to the default page in %s seconds', '5') }}
+
@stop diff --git a/views/errors/500.blade.php b/views/errors/500.blade.php index 9708de8e..3f125701 100644 --- a/views/errors/500.blade.php +++ b/views/errors/500.blade.php @@ -3,14 +3,15 @@ @section('title', $__t('Server error')) @section('content') -
-
-

{{ $__t('A server error occured while processing your request') }}

-
- {{ $__t('If you think this is a bug, please report it') }}
- → https://github.com/grocy/grocy/issues -
+
+
+

{{ $__t('A server error occured while processing your request') }}

+
+ {{ $__t('If you think this is a bug, please report it') }}
+ → https://github.com/grocy/grocy/issues
- @parent +
+@parent @stop diff --git a/views/errors/base.blade.php b/views/errors/base.blade.php index 3d20995c..99b078df 100644 --- a/views/errors/base.blade.php +++ b/views/errors/base.blade.php @@ -1,20 +1,20 @@ @extends('layout.default') @section('content') -
-
-
-

{{ $__t('Error source') }}

- 
{!! $exception->getFile() !!}:{!! $exception->getLine() !!}
-
-
-

{{ $__t('Error message') }}

- 
{!! $exception->getMessage() !!}
-
-
-

{{ $__t('Stack trace') }}

- 
{!! $exception->getTraceAsString() !!}
-
+
+
+
+

{{ $__t('Error source') }}

+ 
{!! $exception->getFile() !!}:{!! $exception->getLine() !!}
+
+
+

{{ $__t('Error message') }}

+ 
{!! $exception->getMessage() !!}
+
+
+

{{ $__t('Stack trace') }}

+ 
{!! $exception->getTraceAsString() !!}
+
@stop diff --git a/views/inventory.blade.php b/views/inventory.blade.php index eab985ce..1f430f39 100644 --- a/views/inventory.blade.php +++ b/views/inventory.blade.php @@ -9,82 +9,89 @@

@yield('title')

-
+ @include('components.productpicker', array( - 'products' => $products, - 'barcodes' => $barcodes, - 'nextInputSelector' => '#new_amount' + 'products' => $products, + 'barcodes' => $barcodes, + 'nextInputSelector' => '#new_amount' )) @include('components.numberpicker', array( - 'id' => 'new_amount', - 'label' => 'New amount', - 'hintId' => 'new_amount_qu_unit', - 'min' => 0, - 'value' => 1, - 'invalidFeedback' => $__t('The amount cannot be lower than %s', '0'), - 'additionalAttributes' => 'data-not-equal="-1"', - 'additionalHtmlElements' => '
', - 'additionalHtmlContextHelp' => '
' . $__t('Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated') . '
' + 'id' => 'new_amount', + 'label' => 'New amount', + 'hintId' => 'new_amount_qu_unit', + 'min' => 0, + 'value' => 1, + 'invalidFeedback' => $__t('The amount cannot be lower than %s', '0'), + 'additionalAttributes' => 'data-not-equal="-1"', + 'additionalHtmlElements' => '
', + 'additionalHtmlContextHelp' => '
' . $__t('Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated') . '
' )) @php - $additionalGroupCssClasses = ''; - if (!GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) - { - $additionalGroupCssClasses = 'd-none'; - } + $additionalGroupCssClasses = ''; + if (!GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) + { + $additionalGroupCssClasses = 'd-none'; + } @endphp @include('components.datetimepicker', array( - 'id' => 'best_before_date', - 'label' => 'Best before', - 'hint' => 'This will apply to added products', - 'format' => 'YYYY-MM-DD', - 'initWithNow' => false, - 'limitEndToNow' => false, - 'limitStartToNow' => false, - 'invalidFeedback' => $__t('A best before date is required'), - 'nextInputSelector' => '#best_before_date', - 'additionalGroupCssClasses' => 'date-only-datetimepicker', - 'shortcutValue' => '2999-12-31', - 'shortcutLabel' => 'Never expires', - 'earlierThanInfoLimit' => date('Y-m-d'), - 'earlierThanInfoText' => $__t('The given date is earlier than today, are you sure?'), - 'additionalGroupCssClasses' => $additionalGroupCssClasses, - 'activateNumberPad' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD + 'id' => 'best_before_date', + 'label' => 'Best before', + 'hint' => 'This will apply to added products', + 'format' => 'YYYY-MM-DD', + 'initWithNow' => false, + 'limitEndToNow' => false, + 'limitStartToNow' => false, + 'invalidFeedback' => $__t('A best before date is required'), + 'nextInputSelector' => '#best_before_date', + 'additionalGroupCssClasses' => 'date-only-datetimepicker', + 'shortcutValue' => '2999-12-31', + 'shortcutLabel' => 'Never expires', + 'earlierThanInfoLimit' => date('Y-m-d'), + 'earlierThanInfoText' => $__t('The given date is earlier than today, are you sure?'), + 'additionalGroupCssClasses' => $additionalGroupCssClasses, + 'activateNumberPad' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD )) @php $additionalGroupCssClasses = ''; @endphp @if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) @include('components.numberpicker', array( - 'id' => 'price', - 'label' => 'Price', - 'min' => 0, - 'step' => 0.01, - 'value' => '', - 'hint' => $__t('in %s per purchase quantity unit', GROCY_CURRENCY), - 'additionalHtmlContextHelp' => '
' . $__t('This will apply to added products') . '', - 'invalidFeedback' => $__t('The price cannot be lower than %s', '0'), - 'isRequired' => false + 'id' => 'price', + 'label' => 'Price', + 'min' => 0, + 'step' => 0.01, + 'value' => '', + 'hint' => $__t('in %s per purchase quantity unit', GROCY_CURRENCY), + 'additionalHtmlContextHelp' => '
' . $__t('This will apply to added products') . '', + 'invalidFeedback' => $__t('The price cannot be lower than %s', '0'), + 'isRequired' => false )) @include('components.shoppinglocationpicker', array( - 'label' => 'Store', - 'shoppinglocations' => $shoppinglocations + 'label' => 'Store', + 'shoppinglocations' => $shoppinglocations )) @else - + @endif @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) @include('components.locationpicker', array( - 'locations' => $locations, - 'hint' => $__t('This will apply to added products') + 'locations' => $locations, + 'hint' => $__t('This will apply to added products') )) @endif - +
diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php index 4319226b..6161617e 100644 --- a/views/layout/default.blade.php +++ b/views/layout/default.blade.php @@ -1,48 +1,86 @@ + - - + + - - + + - + - - - - - - - - - - - + + + + + + + + + + + @yield('title') | grocy - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @stack('pageStyles') @if(file_exists(GROCY_DATAPATH . '/custom_css.html')) - @php include GROCY_DATAPATH . '/custom_css.html' @endphp + @php include GROCY_DATAPATH . '/custom_css.html' @endphp @endif @endif @if(file_exists(GROCY_DATAPATH . '/custom_js.html')) - @php include GROCY_DATAPATH . '/custom_js.html' @endphp + @php include GROCY_DATAPATH . '/custom_js.html' @endphp @endif diff --git a/views/locationcontentsheet.blade.php b/views/locationcontentsheet.blade.php index f8876ab0..980feaee 100644 --- a/views/locationcontentsheet.blade.php +++ b/views/locationcontentsheet.blade.php @@ -4,33 +4,34 @@ @section('viewJsName', 'locationcontentsheet') @push('pageStyles') - + } + + @endpush @section('content')

@yield('title') - + {{ $__t('Print') . ' (' . $__t('all locations') . ')' }}

@@ -41,9 +42,12 @@ @foreach($locations as $location)

- + {{ $location->name }} - + {{ $__t('Print') . ' (' . $__t('this location') . ')' }}

diff --git a/views/locationform.blade.php b/views/locationform.blade.php index 0e8d19b9..46fab59a 100644 --- a/views/locationform.blade.php +++ b/views/locationform.blade.php @@ -1,9 +1,9 @@ @extends('layout.default') @if($mode == 'edit') - @section('title', $__t('Edit location')) +@section('title', $__t('Edit location')) @else - @section('title', $__t('Create location')) +@section('title', $__t('Create location')) @endif @section('viewJsName', 'locationform') @@ -17,45 +17,66 @@
- + @if($mode == 'edit') - + @endif -
+
- +
{{ $__t('A name is required') }}
- +
@if(GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING)
- - is_freezer == 1) checked @endif class="form-check-input" type="checkbox" id="is_freezer" name="is_freezer" value="1"> -
@else - + @endif @include('components.userfieldsform', array( - 'userfields' => $userfields, - 'entity' => 'locations' + 'userfields' => $userfields, + 'entity' => 'locations' )) - +
diff --git a/views/locations.blade.php b/views/locations.blade.php index 02fea37d..d6deb9fd 100644 --- a/views/locations.blade.php +++ b/views/locations.blade.php @@ -10,7 +10,8 @@

@yield('title')

- + {{ $__t('Configure userfields') }}
@@ -20,7 +21,8 @@
- + {{ $__t('Add') }}
@@ -29,16 +31,20 @@
- +
- +
-
-
-
- + {{ $__t('Show chore details') }} - + {{ $__t('Journal for this chore') }} - + {{ $__t('Edit chore') }}
+ {{ FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->name }} @if(FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->period_type !== \Grocy\Services\ChoresService::CHORE_PERIOD_TYPE_MANUALLY) - {{ $curentChoreEntry->next_estimated_execution_time }} - + {{ $curentChoreEntry->next_estimated_execution_time }} + @else - - + - @endif {{ $curentChoreEntry->last_tracked_time }} - + - @if(!empty($curentChoreEntry->next_execution_assigned_to_user_id)) + @if(!empty($curentChoreEntry->next_execution_assigned_to_user_id)) {{ FindObjectInArrayByPropertyValue($users, 'id', $curentChoreEntry->next_execution_assigned_to_user_id)->display_name }} - @else + @else - - @endif + @endif - @if(FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->period_type !== \Grocy\Services\ChoresService::CHORE_PERIOD_TYPE_MANUALLY && $curentChoreEntry->next_estimated_execution_time < date('Y-m-d H:i:s')) overdue @elseif(FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->period_type !== \Grocy\Services\ChoresService::CHORE_PERIOD_TYPE_MANUALLY && $curentChoreEntry->next_estimated_execution_time < date('Y-m-d H:i:s', strtotime("+$nextXDays days"))) duesoon @endif - - @if(!empty($curentChoreEntry->next_execution_assigned_to_user_id)) - xx{{ $curentChoreEntry->next_execution_assigned_to_user_id }}xx - @endif + + @if(FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->period_type !== \Grocy\Services\ChoresService::CHORE_PERIOD_TYPE_MANUALLY && $curentChoreEntry->next_estimated_execution_time < date('Y-m-d + H:i:s')) + overdue + @elseif(FindObjectInArrayByPropertyValue($chores, 'id' + , + $curentChoreEntry->chore_id)->period_type !== \Grocy\Services\ChoresService::CHORE_PERIOD_TYPE_MANUALLY && $curentChoreEntry->next_estimated_execution_time < date('Y-m-d + H:i:s', + strtotime("+$nextXDays + days"))) + duesoon + @endif + + @if(!empty($curentChoreEntry->next_execution_assigned_to_user_id)) + xx{{ $curentChoreEntry->next_execution_assigned_to_user_id }}xx + @endif
+@php $userfieldObject = FindObjectInArrayByPropertyValue($userfieldValues, 'name', $userfield->name) @endphp + @if($userfieldObject !== null) - @if($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_CHECKBOX) - @if($userfieldObject->value == 1)@endif - @elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_PRESET_CHECKLIST) - {!! str_replace(',', '
', $userfieldObject->value) !!} - @elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_LINK) - {{ $userfieldObject->value }} - @elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_FILE) - {{ base64_decode(explode('_', $userfieldObject->value)[1]) }} - @elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_IMAGE) - - {{ base64_decode(explode('_', $userfieldObject->value)[1]) }} - - @else - {{ $userfieldObject->value }} - @endif + @if($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_CHECKBOX) + @if($userfieldObject->value == 1)@endif + @elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_PRESET_CHECKLIST) + {!! str_replace(',', '
', $userfieldObject->value) !!} + @elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_LINK) + {{ $userfieldObject->value }} + @elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_FILE) + {{ base64_decode(explode('_', $userfieldObject->value)[1]) }} + @elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_IMAGE) + + {{ base64_decode(explode('_', $userfieldObject->value)[1]) }} + + @else + {{ $userfieldObject->value }} @endif - 		{{ $userfield->caption }}{{ $userfield->caption }}
+
@@ -46,7 +52,7 @@ @include('components.userfields_thead', array( - 'userfields' => $userfields + 'userfields' => $userfields )) @@ -55,10 +61,14 @@ @foreach($locations as $location) @@ -70,8 +80,8 @@ @include('components.userfields_tbody', array( - 'userfields' => $userfields, - 'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $location->id) + 'userfields' => $userfields, + 'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $location->id) )) diff --git a/views/login.blade.php b/views/login.blade.php index 608b9d96..e32aa3b1 100644 --- a/views/login.blade.php +++ b/views/login.blade.php @@ -8,27 +8,42 @@

@yield('title')

-
+
- +
- -
+ +
- +
diff --git a/views/manageapikeys.blade.php b/views/manageapikeys.blade.php index b1aa3667..3dfab1d1 100644 --- a/views/manageapikeys.blade.php +++ b/views/manageapikeys.blade.php @@ -5,7 +5,8 @@ @section('viewJsName', 'manageapikeys') @push('pageStyles') - + @endpush @section('content') @@ -17,7 +18,8 @@
- + {{ $__t('Add') }}
@@ -26,16 +28,20 @@
- +
- +
-
{{ $__t('Description') }}
- + - +
+
@@ -51,7 +57,10 @@ @foreach($apiKeys as $apiKey) @@ -63,15 +72,18 @@
- + {{ $apiKey->expires }} - + @if(empty($apiKey->last_used)){{ $__t('never') }}@else{{ $apiKey->last_used }}@endif - + {{ $apiKey->row_created_timestamp }} - + {{ $apiKey->key_type }} diff --git a/views/mealplan.blade.php b/views/mealplan.blade.php index afff50c7..d45e3e4d 100644 --- a/views/mealplan.blade.php +++ b/views/mealplan.blade.php @@ -5,12 +5,13 @@ @section('viewJsName', 'mealplan') @push('pageScripts') - - @if(!empty($__t('fullcalendar_locale') && $__t('fullcalendar_locale') != 'x'))@endif + +@if(!empty($__t('fullcalendar_locale') && $__t('fullcalendar_locale') != 'x'))@endif @endpush @push('pageStyles') - + @endpush @section('content') @@ -38,94 +39,130 @@ -