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

Little wording changes

Browse Source
This commit is contained in:
Bernd Bestel
2017-04-22 15:47:55 +02:00
parent fe969c57c4
commit 69a011bc86
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
grocy.phpproj
View File

@@ -29,7 +29,7 @@
<Compile Include="GrocyPhpHelper.php" /> <Compile Include="GrocyPhpHelper.php" />
<Compile Include="GrocyDbMigrator.php" /> <Compile Include="GrocyDbMigrator.php" />
<Compile Include="index.php" /> <Compile Include="index.php" />
<Compile Include="views\consumption.php" /> <Compile Include="views\consume.php" />
<Compile Include="views\inventory.php" /> <Compile Include="views\inventory.php" />
<Compile Include="views\shoppinglistform.php" /> <Compile Include="views\shoppinglistform.php" />
<Compile Include="views\shoppinglist.php" /> <Compile Include="views\shoppinglist.php" />
@@ -57,7 +57,7 @@
<Content Include="robots.txt" /> <Content Include="robots.txt" />
<Content Include="style.css" /> <Content Include="style.css" />
<Content Include="version.txt" /> <Content Include="version.txt" />
<Content Include="views\consumption.js" /> <Content Include="views\consume.js" />
<Content Include="views\dashboard.js" /> <Content Include="views\dashboard.js" />
<Content Include="views\inventory.js" /> <Content Include="views\inventory.js" />
<Content Include="views\shoppinglistform.js" /> <Content Include="views\shoppinglistform.js" />

6
index.php
View File

@@ -57,11 +57,11 @@ $app->get('/purchase', function(Request $request, Response $response) use($db)
]); ]);
}); });
$app->get('/consumption', function(Request $request, Response $response) use($db) $app->get('/consume', function(Request $request, Response $response) use($db)
{ {
return $this->renderer->render($response, '/layout.php', [ return $this->renderer->render($response, '/layout.php', [
'title' => 'Consumption', 'title' => 'Consume',
'contentPage' => 'consumption.php', 'contentPage' => 'consume.php',
'products' => $db->products() 'products' => $db->products()
]); ]);
}); });

16
views/consumption.js → views/consume.js
View File

@@ -1,8 +1,8 @@
$('#save-consumption-button').on('click', function(e) $('#save-consume-button').on('click', function(e)
{ {
e.preventDefault(); e.preventDefault();
var jsonForm = $('#consumption-form').serializeJSON(); var jsonForm = $('#consume-form').serializeJSON();
var spoiled = 0; var spoiled = 0;
if ($('#spoiled').is(':checked')) if ($('#spoiled').is(':checked'))
@@ -23,7 +23,7 @@
$('#product_id_text_input').focus(); $('#product_id_text_input').focus();
$('#product_id_text_input').val(''); $('#product_id_text_input').val('');
$('#product_id_text_input').trigger('change'); $('#product_id_text_input').trigger('change');
$('#consumption-form').validator('validate'); $('#consume-form').validator('validate');
}, },
function(xhr) function(xhr)
{ {
@@ -56,7 +56,7 @@ $('#product_id').on('change', function(e)
$('#selected-product-last-used').text((productDetails.last_used || 'never').substring(0, 10)); $('#selected-product-last-used').text((productDetails.last_used || 'never').substring(0, 10));
$('#selected-product-last-used-timeago').text($.timeago(productDetails.last_used || '')); $('#selected-product-last-used-timeago').text($.timeago(productDetails.last_used || ''));
$('#amount').attr('max', productDetails.stock_amount); $('#amount').attr('max', productDetails.stock_amount);
$('#consumption-form').validator('update'); $('#consume-form').validator('update');
$('#amount_qu_unit').text(productDetails.quantity_unit_stock.name); $('#amount_qu_unit').text(productDetails.quantity_unit_stock.name);
Grocy.EmptyElementWhenMatches('#selected-product-last-purchased-timeago', 'NaN years ago'); Grocy.EmptyElementWhenMatches('#selected-product-last-purchased-timeago', 'NaN years ago');
@@ -114,8 +114,8 @@ $(function()
$('#product_id_text_input').val(''); $('#product_id_text_input').val('');
$('#product_id_text_input').trigger('change'); $('#product_id_text_input').trigger('change');
$('#consumption-form').validator(); $('#consume-form').validator();
$('#consumption-form').validator('validate'); $('#consume-form').validator('validate');
$('#amount').on('focus', function(e) $('#amount').on('focus', function(e)
{ {
@@ -125,11 +125,11 @@ $(function()
} }
}); });
$('#consumption-form input').keydown(function(event) $('#consume-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) //Enter
{ {
if ($('#consumption-form').validator('validate').has('.has-error').length !== 0) //There is at least one validation error if ($('#consume-form').validator('validate').has('.has-error').length !== 0) //There is at least one validation error
{ {
event.preventDefault(); event.preventDefault();
return false; return false;

6
views/consumption.php → views/consume.php
View File

@@ -1,8 +1,8 @@
<div class="col-sm-3 col-sm-offset-3 col-md-3 col-md-offset-2 main"> <div class="col-sm-3 col-sm-offset-3 col-md-3 col-md-offset-2 main">
<h1 class="page-header">Consumption</h1> <h1 class="page-header">Consume</h1>
<form id="consumption-form"> <form id="consume-form">
<div class="form-group"> <div class="form-group">
<label for="product_id">Product&nbsp;&nbsp;<i class="fa fa-barcode"></i></label> <label for="product_id">Product&nbsp;&nbsp;<i class="fa fa-barcode"></i></label>
@@ -27,7 +27,7 @@
</label> </label>
</div> </div>
<button id="save-consumption-button" type="submit" class="btn btn-default">OK</button> <button id="save-consume-button" type="submit" class="btn btn-default">OK</button>
</form> </form>

8
views/layout.php
View File

@@ -47,8 +47,8 @@
<li data-nav-for-page="purchase.php"> <li data-nav-for-page="purchase.php">
<a class="discrete-link" href="/purchase"><i class="fa fa-shopping-cart fa-fw"></i>&nbsp;Purchase</a> <a class="discrete-link" href="/purchase"><i class="fa fa-shopping-cart fa-fw"></i>&nbsp;Purchase</a>
</li> </li>
<li data-nav-for-page="consumption.php"> <li data-nav-for-page="consume.php">
<a class="discrete-link" href="/consumption"><i class="fa fa-cutlery fa-fw"></i>&nbsp;Consumption</a> <a class="discrete-link" href="/consume"><i class="fa fa-cutlery fa-fw"></i>&nbsp;Consume</a>
</li> </li>
<li data-nav-for-page="inventory.php"> <li data-nav-for-page="inventory.php">
<a class="discrete-link" href="/inventory"><i class="fa fa-list fa-fw"></i>&nbsp;Inventory</a> <a class="discrete-link" href="/inventory"><i class="fa fa-list fa-fw"></i>&nbsp;Inventory</a>
@@ -87,8 +87,8 @@
<li data-nav-for-page="purchase.php"> <li data-nav-for-page="purchase.php">
<a class="discrete-link" href="/purchase"><i class="fa fa-shopping-cart fa-fw"></i>&nbsp;Purchase</a> <a class="discrete-link" href="/purchase"><i class="fa fa-shopping-cart fa-fw"></i>&nbsp;Purchase</a>
</li> </li>
<li data-nav-for-page="consumption.php"> <li data-nav-for-page="consume.php">
<a class="discrete-link" href="/consumption"><i class="fa fa-cutlery fa-fw"></i>&nbsp;Consumption</a> <a class="discrete-link" href="/consume"><i class="fa fa-cutlery fa-fw"></i>&nbsp;Consume</a>
</li> </li>
<li data-nav-for-page="inventory.php"> <li data-nav-for-page="inventory.php">
<a class="discrete-link" href="/inventory"><i class="fa fa-list fa-fw"></i>&nbsp;Inventory</a> <a class="discrete-link" href="/inventory"><i class="fa fa-list fa-fw"></i>&nbsp;Inventory</a>