implemented search on in stock locations
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
@@ -265,8 +265,10 @@
|
|||||||
<legend>
|
<legend>
|
||||||
{t('stock')}
|
{t('stock')}
|
||||||
</legend>
|
</legend>
|
||||||
|
{#if Object.keys(stock.items).length }
|
||||||
|
{t('items')}
|
||||||
<ul>
|
<ul>
|
||||||
{#each Object.values(stock) as item}
|
{#each Object.values(stock.items) as item}
|
||||||
<li>
|
<li>
|
||||||
<a href="/stock/{item.owner.type}/{item.owner.id}/item/{item.owner_number}" {onclick} >
|
<a href="/stock/{item.owner.type}/{item.owner.id}/item/{item.owner_number}" {onclick} >
|
||||||
{item.name} [{t('code')}: <span class="code">{item.code}</span>]
|
{item.name} [{t('code')}: <span class="code">{item.code}</span>]
|
||||||
@@ -275,6 +277,18 @@
|
|||||||
</li>
|
</li>
|
||||||
{/each}
|
{/each}
|
||||||
</ul>
|
</ul>
|
||||||
|
{/if}
|
||||||
|
{#if Object.keys(stock.locations).length}
|
||||||
|
{t('locations')}
|
||||||
|
<ul>
|
||||||
|
{#each Object.values(stock.locations) as loc (loc.id)}
|
||||||
|
<li>
|
||||||
|
<a href="/stock/location/{loc.id}">{loc.name}</a>
|
||||||
|
<br/> {@html loc.description.rendered}
|
||||||
|
</li>
|
||||||
|
{/each}
|
||||||
|
</ul>
|
||||||
|
{/if}
|
||||||
</fieldset>
|
</fieldset>
|
||||||
{/if}
|
{/if}
|
||||||
{#if times}
|
{#if times}
|
||||||
|
|||||||
@@ -209,7 +209,6 @@ public class SqliteDb extends BaseDb implements StockDb {
|
|||||||
@Override
|
@Override
|
||||||
public Map<Long, Item> findItems(Collection<Owner> owners, Collection<String> keys, boolean fulltext) {
|
public Map<Long, Item> findItems(Collection<Owner> owners, Collection<String> keys, boolean fulltext) {
|
||||||
try {
|
try {
|
||||||
var items = new HashMap<Long,Item>();
|
|
||||||
var ownerCodes = owners.stream().map(Owner::dbCode).toArray();
|
var ownerCodes = owners.stream().map(Owner::dbCode).toArray();
|
||||||
var query = select(ALL).from(TABLE_ITEMS).where(OWNER, in(ownerCodes));
|
var query = select(ALL).from(TABLE_ITEMS).where(OWNER, in(ownerCodes));
|
||||||
if (fulltext) {
|
if (fulltext) {
|
||||||
@@ -219,6 +218,7 @@ public class SqliteDb extends BaseDb implements StockDb {
|
|||||||
for (var key : keys) query.where(NAME,like("%"+key+"%"));
|
for (var key : keys) query.where(NAME,like("%"+key+"%"));
|
||||||
}
|
}
|
||||||
var rs = query.exec(db);
|
var rs = query.exec(db);
|
||||||
|
var items = new HashMap<Long,Item>();
|
||||||
while (rs.next()){
|
while (rs.next()){
|
||||||
var item = Item.of(rs);
|
var item = Item.of(rs);
|
||||||
items.put(item.id(),item);
|
items.put(item.id(),item);
|
||||||
@@ -232,7 +232,25 @@ public class SqliteDb extends BaseDb implements StockDb {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map<Long, Location> findLocations(Collection<Owner> owners, Collection<String> keys, boolean fulltext) {
|
public Map<Long, Location> findLocations(Collection<Owner> owners, Collection<String> keys, boolean fulltext) {
|
||||||
return Map.of();
|
try {
|
||||||
|
var ownerCodes = owners.stream().map(Owner::dbCode).toArray();
|
||||||
|
var query = select(ALL).from(TABLE_LOCATIONS).where(OWNER, in(ownerCodes));
|
||||||
|
if (fulltext) {
|
||||||
|
for (var key : keys) query.where(format("CONCAT({0},\" \",{1})", NAME, DESCRIPTION), like("%" + key + "%"));
|
||||||
|
} else {
|
||||||
|
for (var key : keys) query.where(NAME, like("%" + key + "%"));
|
||||||
|
}
|
||||||
|
var rs = query.exec(db);
|
||||||
|
var locations = new HashMap<Long, Location>();
|
||||||
|
while (rs.next()) {
|
||||||
|
var location = DbLocation.of(rs);
|
||||||
|
locations.put(location.id(), location);
|
||||||
|
}
|
||||||
|
rs.close();
|
||||||
|
return locations;
|
||||||
|
} catch (SQLException e){
|
||||||
|
throw databaseException(FAILED_TO_LIST_ENTITIES, TYPE,t(LOCATIONS)).causedBy(e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user