diff --git a/sql/v01/12.create.season.sql b/sql/v01/12.create.season.sql index f6820f4..4af4d6c 100644 --- a/sql/v01/12.create.season.sql +++ b/sql/v01/12.create.season.sql @@ -111,7 +111,7 @@ CREATE TABLE delivery_part ( acid REAL DEFAULT NULL, scale_id TEXT, - weighing_id TEXT, + weighing_data TEXT, weighing_reason TEXT CHECK (NOT (manual_weighing = FALSE AND weighing_reason IS NOT NULL)), comment TEXT DEFAULT NULL, diff --git a/sql/v01/99.schema_version.sql b/sql/v01/99.schema_version.sql index 20409cf..ef2f45d 100644 --- a/sql/v01/99.schema_version.sql +++ b/sql/v01/99.schema_version.sql @@ -1,3 +1,3 @@ -- This value MUST NOT be changed while other connections are open! -PRAGMA schema_version = 2400; +PRAGMA schema_version = 2500; diff --git a/wgmaster/migrate.py b/wgmaster/migrate.py index bf2d072..dd4bdf1 100755 --- a/wgmaster/migrate.py +++ b/wgmaster/migrate.py @@ -1565,7 +1565,7 @@ def migrate_deliveries(in_dir: str, out_dir: str) -> None: f_delivery.header('year', 'did', 'date', 'time', 'zwstid', 'lnr', 'lsnr', 'mgnr', 'comment') f_part.header('year', 'did', 'dpnr', 'sortid', 'attrid', 'cultid', 'weight', 'kmw', 'qualid', 'hkid', 'kgnr', 'rdnr', 'gerebelt', 'manual_weighing', 'spl_check', 'hand_picked', 'lesewagen', - 'gebunden', 'temperature', 'acid', 'scale_id', 'weighing_id', 'weighing_reason', 'comment') + 'gebunden', 'temperature', 'acid', 'scale_id', 'weighing_data', 'weighing_reason', 'comment') for lsnr, linrs, date in fixed: if date.year not in seasons: @@ -1678,7 +1678,7 @@ def migrate_deliveries(in_dir: str, out_dir: str) -> None: handwiegung = d['Handwiegung'] or False waage = list(glob_waage)[0] if len(glob_waage) == 1 else d['Waagentext'] - scale_id, weighing_id = None, None + scale_id, weighing_data = None, None if waage: # Waagenr: 1 ID: 19 # Waagennummer: 1 Speichernummer: 9166 @@ -1686,6 +1686,7 @@ def migrate_deliveries(in_dir: str, out_dir: str) -> None: waage = re.split(r' +', waage) scale_id = waage[1] if len(waage) > 2 else '1' weighing_id = waage[-1] if len(waage) > 2 and waage[2] == 'Speichernummer:' else f'{date}/{waage[-1]}' + weighing_data = f'{{"id":"{weighing_id}","nr":{waage[-1]}}}' elif len(glob_waage) == 0 and not handwiegung: handwiegung = True @@ -1724,7 +1725,7 @@ def migrate_deliveries(in_dir: str, out_dir: str) -> None: f_part.row( date.year, snr, dpnr, sortid, attrid, cultid, int(d['Gewicht']), kmw, qualid, hkid, kgnr, rdnr, gerebelt, handwiegung, d['Spaetlese-Ueberpruefung'] or False, - hand, lesewagen, gebunden, d['Temperatur'], acid, scale_id, weighing_id, None, comment + hand, lesewagen, gebunden, d['Temperatur'], acid, scale_id, weighing_data, None, comment ) f_delivery.row(date.year, snr, date, d['Uhrzeit'], zwstid, lnr, lsnr, mgnr, '; '.join(comments) or None) for k, v in updated_varieties.items():