winzer/elwig-misc
3
1
Fork 0
Code Pull Requests Activity

database: Rename weighing_id to weighing_data

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-07-22 16:43:37 +02:00
parent 8e0047c901
commit 211f15ac2e
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/v01/12.create.season.sql
View File

@ -111,7 +111,7 @@ CREATE TABLE delivery_part (
acid REAL DEFAULT NULL, acid REAL DEFAULT NULL,
scale_id TEXT, scale_id TEXT,
weighing_id TEXT, weighing_data TEXT,
weighing_reason TEXT CHECK (NOT (manual_weighing = FALSE AND weighing_reason IS NOT NULL)), weighing_reason TEXT CHECK (NOT (manual_weighing = FALSE AND weighing_reason IS NOT NULL)),
comment TEXT DEFAULT NULL, comment TEXT DEFAULT NULL,

2
sql/v01/99.schema_version.sql
View File

@ -1,3 +1,3 @@
-- This value MUST NOT be changed while other connections are open! -- This value MUST NOT be changed while other connections are open!
PRAGMA schema_version = 2400; PRAGMA schema_version = 2500;

7
wgmaster/migrate.py
View File

@ -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_delivery.header('year', 'did', 'date', 'time', 'zwstid', 'lnr', 'lsnr', 'mgnr', 'comment')
f_part.header('year', 'did', 'dpnr', 'sortid', 'attrid', 'cultid', 'weight', 'kmw', 'qualid', f_part.header('year', 'did', 'dpnr', 'sortid', 'attrid', 'cultid', 'weight', 'kmw', 'qualid',
'hkid', 'kgnr', 'rdnr', 'gerebelt', 'manual_weighing', 'spl_check', 'hand_picked', 'lesewagen', '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: for lsnr, linrs, date in fixed:
if date.year not in seasons: 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 handwiegung = d['Handwiegung'] or False
waage = list(glob_waage)[0] if len(glob_waage) == 1 else d['Waagentext'] 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: if waage:
# Waagenr: 1 ID: 19 # Waagenr: 1 ID: 19
# Waagennummer: 1 Speichernummer: 9166 # Waagennummer: 1 Speichernummer: 9166
@ -1686,6 +1686,7 @@ def migrate_deliveries(in_dir: str, out_dir: str) -> None:
waage = re.split(r' +', waage) waage = re.split(r' +', waage)
scale_id = waage[1] if len(waage) > 2 else '1' 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_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: elif len(glob_waage) == 0 and not handwiegung:
handwiegung = True handwiegung = True
@ -1724,7 +1725,7 @@ def migrate_deliveries(in_dir: str, out_dir: str) -> None:
f_part.row( f_part.row(
date.year, snr, dpnr, sortid, attrid, cultid, int(d['Gewicht']), kmw, qualid, hkid, kgnr, rdnr, date.year, snr, dpnr, sortid, attrid, cultid, int(d['Gewicht']), kmw, qualid, hkid, kgnr, rdnr,
gerebelt, handwiegung, d['Spaetlese-Ueberpruefung'] or False, 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) f_delivery.row(date.year, snr, date, d['Uhrzeit'], zwstid, lnr, lsnr, mgnr, '; '.join(comments) or None)
for k, v in updated_varieties.items(): for k, v in updated_varieties.items():