SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

implementd search in stock items

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2025-12-03 18:45:46 +01:00
parent 4cb9c6bd2f
commit 74a1d526ae
4 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/src/routes/search/Search.svelte
View File

@@ -105,7 +105,7 @@
} }
} }
async function handleStock(resp){ async function handleStock(resp){
if (resp.ok){ if (resp.ok){
const res = await resp.json(); const res = await resp.json();
stock = Object.keys(res).length ? res : null; stock = Object.keys(res).length ? res : null;
@@ -219,6 +219,23 @@
</ul> </ul>
</fieldset> </fieldset>
{/if} {/if}
{#if stock}
<fieldset>
<legend>
{t('stock')}
</legend>
<ul>
{#each Object.values(stock) as item}
<li>
<a href="/stock/{item.owner.type}/{item.owner.id}/item/{item.owner_number}" {onclick} >
{item.name} [{t('code')}: <span class="code">{item.code}</span>]
</a>
{@html item.description.rendered}
</li>
{/each}
</ul>
</fieldset>
{/if}
{#if notes} {#if notes}
<fieldset> <fieldset>
<legend> <legend>

12
stock/src/main/java/de/srsoftware/umbrella/stock/SqliteDb.java
View File

@@ -191,19 +191,21 @@ public class SqliteDb extends BaseDb implements StockDb {
} }
@Override @Override
public Map<Long, Item> find(long userId, Collection<String> keys, boolean fulltext) { public Map<Long, Item> find(Collection<Owner> owners, Collection<String> keys, boolean fulltext) {
try { try {
var items = new HashMap<Long,Item>(); var items = new HashMap<Long,Item>();
var query = select(ALL).from(TABLE_ITEMS).where(USER_ID, equal(userId)); var ownerCodes = owners.stream().map(Owner::dbCode).toArray();
var query = select(ALL).from(TABLE_ITEMS).where(OWNER, in(ownerCodes));
if (fulltext) { if (fulltext) {
// TODO: implement full-text search query.leftJoin(ID,TABLE_ITEM_PROPERTIES,ITEM_ID);
for (var key : keys) query.where(format("CONCAT({0},\" \",{1},\" \",{2})",NAME,DESCRIPTION,VALUE),like("%"+key+"%"));
} else { } else {
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);
while (rs.next()){ while (rs.next()){
var project = Item.of(rs); var item = Item.of(rs);
items.put(project.id(),project); items.put(item.id(),item);
} }
rs.close(); rs.close();
return items; return items;

4
stock/src/main/java/de/srsoftware/umbrella/stock/StockDb.java
View File

@@ -5,13 +5,13 @@ import de.srsoftware.umbrella.core.api.Owner;
import de.srsoftware.umbrella.core.model.*; import de.srsoftware.umbrella.core.model.*;
import de.srsoftware.umbrella.core.model.Location; import de.srsoftware.umbrella.core.model.Location;
import java.util.Collection; import java.util.Collection;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
public interface StockDb { public interface StockDb {
Property addNewProperty(long itemId, String name, Object value, String unit); Property addNewProperty(long itemId, String name, Object value, String unit);
Location delete(DbLocation location); Location delete(DbLocation location);
Map<Long, Item> find(long userId, Collection<String> keys, boolean fulltext); Map<Long, Item> find(Collection<Owner> owners, Collection<String> keys, boolean fulltext);
Collection<DbLocation> listChildLocations(long parentId); Collection<DbLocation> listChildLocations(long parentId);
Collection<DbLocation> listCompanyLocations(Company company); Collection<DbLocation> listCompanyLocations(Company company);
Collection<Item> listItemsAt(Location location); Collection<Item> listItemsAt(Location location);

4
stock/src/main/java/de/srsoftware/umbrella/stock/StockModule.java
View File

@@ -397,7 +397,9 @@ public class StockModule extends BaseHandler implements StockService {
if (!(json.has(KEY) && json.get(KEY) instanceof String key)) throw missingFieldException(KEY); if (!(json.has(KEY) && json.get(KEY) instanceof String key)) throw missingFieldException(KEY);
var keys = Arrays.asList(key.split(" ")); var keys = Arrays.asList(key.split(" "));
var fulltext = json.has(FULLTEXT) && json.get(FULLTEXT) instanceof Boolean val && val; var fulltext = json.has(FULLTEXT) && json.get(FULLTEXT) instanceof Boolean val && val;
var items = stockDb.find(user.id(),keys,fulltext); Set<Owner> owners = new HashSet<>(companyService().listCompaniesOf(user).values());
owners.add(user);
var items = stockDb.find(owners,keys,fulltext);
return sendContent(ex,mapValues(items)); return sendContent(ex,mapValues(items));
} }