Scarriffle/Vorrania
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lagerort-QR + Zuordnen per Scan

Browse Source 
Web: druckbare QR-Etiketten fuer Lagerorte (Locations-Seite) und Route /l/<id>
(zeigt den Ort im Browser). Geteilter QR-Helfer (web/src/qr.jsx).

iOS: neuer Ablauf "Ort zuordnen" - erst Einzelstueck-QR (…/i/<UID>) scannen, dann
Lagerort-QR (…/l/<ID>); das Stueck wird dem Ort zugewiesen, danach gleich das
naechste. Plus die zuvor gebaute "Nachschlagen"-Kachel.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Scarriffle
2026-07-26 08:09:00 +02:00
parent 953e0aa483
commit 7f9895245c
8 changed files with 198 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
ios/Sources/AssignScanView.swift Normal file
View File

@@ -0,0 +1,90 @@
import SwiftUI
/// Zuordnen per Scan: erst ein Einzelstück (…/i/<UID>) scannen, dann einen
/// Lagerort (…/l/<ID>) – das Stück wird dem Ort zugewiesen. Danach gleich das
/// nächste Stück, ohne Tippen.
struct AssignScanView: View {
@Environment(\.dismiss) private var dismiss
@State private var paused = false
@State private var torchOn = false
@State private var pending: Item? // gescanntes Stück, wartet auf Ort
@State private var status: String?
@State private var error: String?
var body: some View {
ScrollView {
VStack(spacing: 14) {
ScannerView(onCode: { code in Task { await handle(code) } },
isPaused: $paused, torchOn: $torchOn)
.aspectRatio(4.0 / 3.0, contentMode: .fit)
.clipShape(RoundedRectangle(cornerRadius: 16))
.padding(.horizontal)
if let pending {
VStack(spacing: 4) {
Text("Einzelstück \(pending.uid)").font(.headline)
Text("Jetzt den Lagerort-QR scannen")
.font(.caption).foregroundStyle(.secondary)
Button("Abbrechen") { self.pending = nil }
.font(.caption).padding(.top, 2)
}
.padding().frame(maxWidth: .infinity)
.background(Color.accentColor.opacity(0.15))
.clipShape(RoundedRectangle(cornerRadius: 12)).padding(.horizontal)
} else {
Text("Schritt 1: Einzelstück-QR scannen")
.font(.caption).foregroundStyle(.secondary)
}
if let status {
Text(status).font(.callout).foregroundStyle(.green)
.frame(maxWidth: .infinity, alignment: .leading).padding(.horizontal)
}
if let error {
Text(error).font(.callout).foregroundStyle(.red)
.frame(maxWidth: .infinity, alignment: .leading).padding(.horizontal)
}
}
.padding(.vertical)
}
.navigationTitle("Ort zuordnen")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .topBarLeading) { Button("Fertig") { dismiss() } }
ToolbarItem(placement: .topBarTrailing) { TorchButton(isOn: $torchOn) }
}
}
private func handle(_ code: String) async {
// Lagerort-QR (…/l/<ID>)?
if let r = code.range(of: "/l/") {
let idStr = String(code[r.upperBound...])
.trimmingCharacters(in: CharacterSet(charactersIn: "/ "))
if let locId = Int(idStr) {
guard let it = pending else {
error = "Erst ein Einzelstück scannen."; status = nil; return
}
do {
_ = try await APIClient.shared.updateItem(id: it.id, ItemUpdateRequest(
locationId: locId, shopId: it.shopId,
acquiredOn: it.acquiredOn, warrantyUntil: it.warrantyUntil, note: it.note))
status = "\(it.uid) zugeordnet. Nächstes Stück scannen."
error = nil
pending = nil
} catch { self.error = error.localizedDescription }
return
}
}
// Einzelstück-QR (…/i/<UID>)?
if let r = code.range(of: "/i/") {
let uid = String(code[r.upperBound...])
.trimmingCharacters(in: CharacterSet(charactersIn: "/ ")).uppercased()
if !uid.isEmpty, let it = try? await APIClient.shared.itemByUid(uid: uid) {
pending = it; status = nil; error = nil
return
}
}
error = "Unbekannter Code – bitte einen Einzelstück- oder Lagerort-QR scannen."
}
}

8
ios/Sources/RootView.swift
View File

@@ -30,6 +30,7 @@ struct RootView: View {
case .checkin: CheckInView()
case .checkout: CheckOutView()
case .lookup: LookupScanView()
case .assign: AssignScanView()
case .expiring:
ExpiringView()
.toolbar {
@@ -111,6 +112,13 @@ struct ScanTabView: View {
subtitle: "Ohne Barcode – Name, Kategorie, eigene Felder",
systemImage: "plus")
}
Button {
router.route = .assign
} label: {
ActionTile(title: "Ort zuordnen",
subtitle: "Einzelstück-QR scannen, dann Lagerort-QR",
systemImage: "mappin.and.ellipse")
}
}
Spacer()
}

1
ios/Sources/VorraniaApp.swift
View File

@@ -10,6 +10,7 @@ enum Route: String {
case checkout
case expiring
case lookup
case assign
}
final class Router: ObservableObject {

4
ios/Vorrania.xcodeproj/project.pbxproj
View File

@@ -19,6 +19,7 @@
4C486D190D1AB338925D29B5 /* HistoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DACFBB69CB536BA7CBBD484 /* HistoryView.swift */; };
4F86620DF8303DB02314DB5A /* CheckInView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0365A16FEAE3F2BEC321E68A /* CheckInView.swift */; };
56A5DFAC86DF972B1481A691 /* ItemViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69B59B9F69BC30451D45A3C7 /* ItemViews.swift */; };
5A0C3254B45CA13B1C3D9265 /* AssignScanView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76393ADA26304E5BC5AD7E7F /* AssignScanView.swift */; };
6816C33381DF52A96E5BB303 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 314B1BB7220691A7423E8929 /* Models.swift */; };
728CF5124D2D5BBF826BCD2C /* ServerFetch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1847E65D41ACEDD01CD108BC /* ServerFetch.swift */; };
75F805F8AE93479933BD811D /* VorraniaApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9948219CDDC4188EA4298F22 /* VorraniaApp.swift */; };
@@ -64,6 +65,7 @@
69B59B9F69BC30451D45A3C7 /* ItemViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemViews.swift; sourceTree = "<group>"; };
6F574168AA0F849D46C384EE /* ProductDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductDetailView.swift; sourceTree = "<group>"; };
717C8EB336170526F5F3E695 /* DateScanView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateScanView.swift; sourceTree = "<group>"; };
76393ADA26304E5BC5AD7E7F /* AssignScanView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssignScanView.swift; sourceTree = "<group>"; };
7B5BB49FBEFF88768B0BC902 /* ObjectStockView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectStockView.swift; sourceTree = "<group>"; };
7DACFBB69CB536BA7CBBD484 /* HistoryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryView.swift; sourceTree = "<group>"; };
8AF19A735AC17451B57BF5BB /* ScannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScannerView.swift; sourceTree = "<group>"; };
@@ -89,6 +91,7 @@
children = (
378F1B2DE567B62169E84426 /* APIClient.swift */,
660ACEFA22BC77D52FBE736A /* AppDashboards.swift */,
76393ADA26304E5BC5AD7E7F /* AssignScanView.swift */,
AA022A27118BEEEC5912ECDC /* BestBeforeText.swift */,
CDD672F65352DA0D122EC9AE /* CategoryPicker.swift */,
E580BA2815BB8F6341D64B47 /* ChartCards.swift */,
@@ -215,6 +218,7 @@
files = (
39F1F17DCB4E491652D08DEE /* APIClient.swift in Sources */,
F3F718BFC60BF945CFA32BD2 /* AppDashboards.swift in Sources */,
5A0C3254B45CA13B1C3D9265 /* AssignScanView.swift in Sources */,
A7017E6C0532A650439AED7B /* BestBeforeText.swift in Sources */,
25FC3913EFFA37D013328FDE /* CategoryPicker.swift in Sources */,
FFD4DB783F89083C9098F1C4 /* ChartCards.swift in Sources */,