implemented search on in stock locations

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

frontend/src/routes/search/Search.svelte

@@ -265,8 +265,10 @@
     <legend>
         {t('stock')}
     </legend>
+    {#if Object.keys(stock.items).length }
+    {t('items')}
     <ul>
-        {#each Object.values(stock) as item}
+        {#each Object.values(stock.items) 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>]
@@ -275,6 +277,18 @@
         </li>
         {/each}
     </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>
 {/if}
 {#if times}

stock/src/main/java/de/srsoftware/umbrella/stock/SqliteDb.java

@@ -132,7 +132,7 @@ public class SqliteDb extends BaseDb implements StockDb {
 	private void createItemsTable() {
 		try {
 			var sql = "CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255) NOT NULL, {3} TEXT, {4} VARCHAR(255))";
-			sql = format(sql, TABLE_ITEMS, ID, Field.CODE, NAME, LOCATION_ID);
+			sql     = format(sql, TABLE_ITEMS, ID, Field.CODE, NAME, LOCATION_ID);
 			db.prepareStatement(sql).execute();
 		} catch (SQLException e) {
 			throw failedToCreateTable(TABLE_ITEMS).causedBy(e);
@@ -142,7 +142,7 @@ public class SqliteDb extends BaseDb implements StockDb {
 	private void createItemPropsTable() {
 		try {
 			var sql = "CREATE TABLE IF NOT EXISTS {0} ( {1} INT NOT NULL, {2} INT NOT NULL, {3} VARCHAR(255) NOT NULL, PRIMARY KEY({1}, {2}))";
-			sql = format(sql, TABLE_ITEM_PROPERTIES, ITEM_ID, PROPERTY_ID,VALUE);
+			sql     = format(sql, TABLE_ITEM_PROPERTIES, ITEM_ID, PROPERTY_ID,VALUE);
 			db.prepareStatement(sql).execute();
 		} catch (SQLException e) {
 			throw failedToCreateTable(TABLE_ITEM_PROPERTIES).causedBy(e);
@@ -152,7 +152,7 @@ public class SqliteDb extends BaseDb implements StockDb {
 	private void createLocationsTable() {
 		try {
 			var sql = "CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255) DEFAULT NULL, {3} VARCHAR(255) NOT NULL, {4} TEXT)";
-			sql = format(sql, TABLE_LOCATIONS, ID, LOCATION_ID, NAME, DESCRIPTION);
+			sql     = format(sql, TABLE_LOCATIONS, ID, LOCATION_ID, NAME, DESCRIPTION);
 			db.prepareStatement(sql).execute();
 		} catch (SQLException e) {
 			throw failedToCreateTable(TABLE_LOCATIONS).causedBy(e);
@@ -162,7 +162,7 @@ public class SqliteDb extends BaseDb implements StockDb {
 	private void createPropertiesTable() {
 		try {
 			var sql = "CREATE TABLE IF NOT EXISTS {0} ( {1} INTEGER PRIMARY KEY, {2} VARCHAR(255) NOT NULL, {3} INT NOT NULL, {4} VARCHAR(255))";
-			sql = format(sql, TABLE_PROPERTIES, ID, NAME, TYPE, UNIT);
+			sql     = format(sql, TABLE_PROPERTIES, ID, NAME, TYPE, UNIT);
 			db.prepareStatement(sql).execute();
 		} catch (SQLException e) {
 			throw failedToCreateTable(TABLE_PROPERTIES).causedBy(e);
@@ -209,16 +209,16 @@ public class SqliteDb extends BaseDb implements StockDb {
 	@Override
 	public Map<Long, Item> findItems(Collection<Owner> owners, Collection<String> keys, boolean fulltext) {
 		try {
-			var items = new HashMap<Long,Item>();
 			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) {
 				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 {
 				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()){
 				var item = Item.of(rs);
 				items.put(item.id(),item);
@@ -232,13 +232,31 @@ public class SqliteDb extends BaseDb implements StockDb {
 
 	@Override
 	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
 	public Collection<DbLocation> listChildLocations(long parentId) {
 		try {
-			var rs = select(ALL).from(TABLE_LOCATIONS).where(PARENT_LOCATION_ID,equal(parentId)).exec(db);
+			var rs   = select(ALL).from(TABLE_LOCATIONS).where(PARENT_LOCATION_ID,equal(parentId)).exec(db);
 			var list = new ArrayList<DbLocation>();
 			while (rs.next()) list.add(DbLocation.of(rs));
 			rs.close();
@@ -251,7 +269,7 @@ public class SqliteDb extends BaseDb implements StockDb {
 	@Override
 	public Collection<DbLocation> listCompanyLocations(Company company) {
 		try {
-			var rs = select(ALL).from(TABLE_LOCATIONS).where(OWNER,equal(company.dbCode())).where(PARENT_LOCATION_ID,isNull()).exec(db);
+			var rs   = select(ALL).from(TABLE_LOCATIONS).where(OWNER,equal(company.dbCode())).where(PARENT_LOCATION_ID,isNull()).exec(db);
 			var list = new ArrayList<DbLocation>();
 			while (rs.next()) list.add(DbLocation.of(rs));
 			rs.close();