Fixes in migrate.py
This commit is contained in:
@ -75,28 +75,28 @@ STREET_NAMES: Dict[str, str] = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def success(mgnr: int, key: str, value: str) -> None:
|
def success(mgnr: int, key: str, value) -> None:
|
||||||
if not args.quiet:
|
if not args.quiet:
|
||||||
print(f'\x1B[1;32m{mgnr:>6}: {key:<12} {value}\x1B[0m', file=sys.stderr)
|
print(f'\x1B[1;32m{mgnr:>6}: {key:<12} {value}\x1B[0m', file=sys.stderr)
|
||||||
|
|
||||||
|
|
||||||
def warning(mgnr: int, key: str, value: str) -> None:
|
def warning(mgnr: int, key: str, value) -> None:
|
||||||
print(f'\x1B[1;33m{mgnr:>6}: {key:<12} {value}\x1B[0m', file=sys.stderr)
|
print(f'\x1B[1;33m{mgnr:>6}: {key:<12} {value}\x1B[0m', file=sys.stderr)
|
||||||
|
|
||||||
|
|
||||||
def invalid(mgnr: int, key: str, value: str) -> None:
|
def invalid(mgnr: int, key: str, value) -> None:
|
||||||
print(f'\x1B[1;31m{mgnr:>6}: {key:<12} {value}\x1B[0m', file=sys.stderr)
|
print(f'\x1B[1;31m{mgnr:>6}: {key:<12} {value}\x1B[0m', file=sys.stderr)
|
||||||
|
|
||||||
|
|
||||||
def warning_delivery(lsnr: str, mgnr: int, key:str, value: str) -> None:
|
def warning_delivery(lsnr: str, mgnr: int, key: str, value) -> None:
|
||||||
print(f'\x1B[1;33m{lsnr:<13} ({mgnr:>6}): {key:<12} {value}\x1B[0m', file=sys.stderr)
|
print(f'\x1B[1;33m{lsnr:<13} ({mgnr:>6}): {key:<12} {value}\x1B[0m', file=sys.stderr)
|
||||||
|
|
||||||
|
|
||||||
def invalid_delivery(lsnr: str, mgnr: int, key: str, value: str) -> None:
|
def invalid_delivery(lsnr: str, mgnr: int, key: str, value) -> None:
|
||||||
print(f'\x1B[1;31m{lsnr:<13} ({mgnr:>6}): {key:<12} {value}\x1B[0m', file=sys.stderr)
|
print(f'\x1B[1;31m{lsnr:<13} ({mgnr:>6}): {key:<12} {value}\x1B[0m', file=sys.stderr)
|
||||||
|
|
||||||
|
|
||||||
def convert(mgnr: int, key: str, old_value: str, new_value: str) -> None:
|
def convert(mgnr: int, key: str, old_value: str, new_value) -> None:
|
||||||
if not args.quiet:
|
if not args.quiet:
|
||||||
print(f'\x1B[1m{mgnr:>6}: {key:<12} "{old_value}" -> "{new_value}"\x1B[0m', file=sys.stderr)
|
print(f'\x1B[1m{mgnr:>6}: {key:<12} "{old_value}" -> "{new_value}"\x1B[0m', file=sys.stderr)
|
||||||
|
|
||||||
@ -654,7 +654,7 @@ def migrate_deliveries(in_dir: str, out_dir: str) -> None:
|
|||||||
modifiers = {m['ASNR']: m for m in csv.parse(f'{in_dir}/TAbschlaege.csv') if m['Bezeichnung']}
|
modifiers = {m['ASNR']: m for m in csv.parse(f'{in_dir}/TAbschlaege.csv') if m['Bezeichnung']}
|
||||||
delivery_map = {}
|
delivery_map = {}
|
||||||
seasons = {}
|
seasons = {}
|
||||||
comments = {}
|
comments: Dict[str, str] = {}
|
||||||
|
|
||||||
with open(f'{out_dir}/delivery.csv', 'w+') as f_delivery, \
|
with open(f'{out_dir}/delivery.csv', 'w+') as f_delivery, \
|
||||||
open(f'{out_dir}/delivery_part.csv', 'w+') as f_part:
|
open(f'{out_dir}/delivery_part.csv', 'w+') as f_part:
|
||||||
@ -665,6 +665,7 @@ def migrate_deliveries(in_dir: str, out_dir: str) -> None:
|
|||||||
for d in sorted(csv.parse(f'{in_dir}/TLieferungen.csv'), key=lambda l: f'{l["Datum"]}T{l["Uhrzeit"]}'):
|
for d in sorted(csv.parse(f'{in_dir}/TLieferungen.csv'), key=lambda l: f'{l["Datum"]}T{l["Uhrzeit"]}'):
|
||||||
lsnr: str = d['Lieferscheinnummer']
|
lsnr: str = d['Lieferscheinnummer']
|
||||||
if d['Storniert'] or lsnr is None:
|
if d['Storniert'] or lsnr is None:
|
||||||
|
if lsnr is not None:
|
||||||
comments[lsnr] = d['Anmerkung']
|
comments[lsnr] = d['Anmerkung']
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user