34 Commits
alpha6 ... main

Author SHA1 Message Date
6c7113849f typo and update of deb package description 2025-10-25 13:51:54 +02:00
321cbc7f89 increment version for new release 0.2.2b 2025-10-25 13:41:25 +02:00
aa5d5e6698 changed sender and receiver order in csv output 2025-10-25 13:39:56 +02:00
2b55aa62f0 refactored variables 2025-10-25 13:26:51 +02:00
cda807a467 updated compilation script, including requirements.txt 2025-10-06 12:32:18 +02:00
3299584924 up version to 0.2.1b: added absender to configuration window 2025-09-30 00:31:21 +02:00
0869bb96f8 have compile exit if a command fails 2025-09-30 00:28:27 +02:00
89a86ca271 implemented config absender to csv export 2025-09-30 00:26:41 +02:00
6410853d3c added absender to config window 2025-09-30 00:23:10 +02:00
f993220ad6 up version to 0.2.0b 2025-09-27 12:47:35 +02:00
dac342f3ec fix target dir can be missing 2025-09-27 12:47:19 +02:00
61ab5a9deb fix import and paths 2025-09-27 12:46:57 +02:00
b61c52972d added amount of labels per print 2025-09-27 12:05:32 +02:00
c80a587cbd inject connector instead of coupling 2025-06-17 18:16:05 +02:00
0d114a325d updated to version 0.1.1b 2025-05-10 02:31:12 +02:00
9532eb7247 new version numbers with three digits 2025-05-10 02:30:45 +02:00
7e9d5bec9b Merge pull request 'handle-empty-datafile' (#14) from handle-empty-datafile into main
Reviewed-on: #14
2025-05-10 02:27:33 +02:00
6407cf4229 fixed bug #12 2025-05-09 21:28:39 +02:00
9ad45ed63f bash syntax fix 2025-05-09 21:27:47 +02:00
3224c1c2aa Merge pull request 'fix_model_structure' (#13) from fix_model_structure into main
Reviewed-on: #13
2025-05-04 16:33:22 +02:00
ca88c4d229 compiled 0.1.0b beta version for release 2025-05-04 16:30:50 +02:00
12d0d7034f refactored model, fixed utf-8 export json 2025-05-04 16:22:56 +02:00
2d840d6ad4 Merge pull request 'Statuszeile und filtern von aktiven Adressen' (#9) from statuszeile_und_filter into main
Reviewed-on: #9
2025-04-30 20:04:41 +02:00
0ae2c7e559 new version 0.7a, and update json filename for new format 2025-04-30 20:00:20 +02:00
96995f1e80 fixed keybindings, refactoring and table focus 2025-04-30 19:58:16 +02:00
ec130fcee9 removed all "debug" print commands 2025-04-28 00:24:00 +02:00
95ed06df45 typo in label 2025-04-28 00:23:19 +02:00
9ea44933a6 recreated json file handling as connector model, fixing #10 and introducing #8 and #7 2025-04-28 00:18:22 +02:00
dc27197129 handles data storage 2025-04-27 22:56:14 +02:00
bbdbaadb92 filtering inactive records 2025-04-27 12:22:25 +02:00
ad66988e09 sorting of columns was not nice, should be better now 2025-04-27 11:54:32 +02:00
3fd0147158 implemented status bar covering #8 2025-04-27 00:33:10 +02:00
aec7770e74 added statusbar with stringvar 2025-04-27 00:24:30 +02:00
d16aefe20f refactoring 2025-04-27 00:21:12 +02:00
9 changed files with 370 additions and 128 deletions

View File

@@ -1,8 +1,22 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [ $VIRTUAL_ENV=="" ]
set -e
if [ "$VIRTUAL_ENV" == "" ]
then then
source venv/bin/activate if [ ! -d "./venv/bin" ]; then
echo "venv not found, trying to create one"
python3 -m venv venv
fi
source venv/bin/activate
fi fi
if [[ ! $(pip3 freeze | grep pyinstaller) ]];
then
echo "pyinstaller not found"
pip3 install -r requirements.txt
fi
version=$(cat version.txt) version=$(cat version.txt)
echo "current version set to: $version" echo "current version set to: $version"
new_version="" new_version=""
@@ -11,10 +25,11 @@ if [ "$new_version" != "" ]
then then
echo "$new_version" | tee version.txt echo "$new_version" | tee version.txt
fi fi
sed -i "s/VERSION = '[0-9]\.[0-9]\w'/VERSION = '$(cat version.txt)'/g" src/brovski-adress-etiketten-verwaltung.py sed -i "s/VERSION = '[0-9]\.[0-9].[0-9]\w'/VERSION = '$(cat version.txt)'/g" src/brovski-adress-etiketten-verwaltung.py
sed -i "s/Version: [0-9]\.[0-9]\w/Version: $(cat version.txt)/g" deb-package/brovski-adressetiketten/DEBIAN/control sed -i "s/Version: [0-9]\.[0-9].[0-9]\w/Version: $(cat version.txt)/g" deb-package/brovski-adressetiketten/DEBIAN/control
pyinstaller --clean --onefile src/brovski-adress-etiketten-verwaltung.py pyinstaller --clean --onefile src/brovski-adress-etiketten-verwaltung.py
mkdir -p deb-package/brovski-adressetiketten/usr/local/bin
cp dist/brovski-adress-etiketten-verwaltung deb-package/brovski-adressetiketten/usr/local/bin/brovski-adressetiketten cp dist/brovski-adress-etiketten-verwaltung deb-package/brovski-adressetiketten/usr/local/bin/brovski-adressetiketten
dpkg-deb --build deb-package/brovski-adressetiketten dpkg-deb --build deb-package/brovski-adressetiketten
mv deb-package/brovski-adressetiketten.deb ./ mv deb-package/brovski-adressetiketten.deb ./

View File

@@ -1,5 +1,5 @@
Package: brovski-adressetiketten Package: brovski-adressetiketten
Version: 0.6a Version: 0.2.2b
Maintainer: Ovski Maintainer: Ovski
Architecture: all Architecture: all
Description: manage csv files for glables address labels Description: Manage and export addresses to csv. Can be used with glabels (example included in the source).

5
requirements.txt Normal file
View File

@@ -0,0 +1,5 @@
altgraph==0.17.4
packaging==25.0
pyinstaller==6.16.0
pyinstaller-hooks-contrib==2025.9
setuptools==80.9.0

View File

@@ -1,3 +1,4 @@
import _csv
import csv import csv
import os import os
import sys import sys
@@ -5,20 +6,22 @@ import tkinter as tk
from configparser import NoSectionError, NoOptionError from configparser import NoSectionError, NoOptionError
from tkinter import messagebox from tkinter import messagebox
from tkinter import ttk from tkinter import ttk
import json
from config import Config from config import Config
from windows import SettingsWindow, EditRecord, Window, show_error from model import Model
from connector import JSONConnector
from windows import SettingsWindow, EditRecord, show_error
class Application: class Application:
def __init__(self): def __init__(self):
os.chdir(os.getcwd())
# tkinter settings # tkinter settings
x_offset = 700 x_offset = 700
y_offset = 200 y_offset = 200
width = 1050 width = 1050
height = 700 height = 700
VERSION = '0.6a' VERSION = '0.2.2b'
title = f"Brovski Adress-Etiketten Verwaltung {VERSION}" title = f"Brovski Adress-Etiketten Verwaltung {VERSION}"
self.root = tk.Tk(className="BrovskiAdressEtiketten") self.root = tk.Tk(className="BrovskiAdressEtiketten")
@@ -32,16 +35,24 @@ class Application:
self.address_list = [] self.address_list = []
self.current_record: int | None = None self.current_record: int | None = None
self.sort_order = False self.sort_order = False
self.last_sort_field = "#3"
self.filter_active = tk.BooleanVar(value=False)
# model connector
self.model = Model(JSONConnector(self.config))
# init paths to json and csv file # init paths to json and csv file
self.json_file_name = "brovski-adress-etiketten-verwaltung.json" self.json_file_name = "brovski-adress-etiketten-verwaltung.json"
self.csv_file_name = "brovski-adress-etiketten.csv" self.csv_file_name = "brovski-adress-etiketten.csv"
self.json_path = ""
self.csv_path = "" self.csv_path = ""
self.load_config() self.load_config()
self.json_file = os.path.join(self.json_path, self.json_file_name)
self.csv_file = os.path.join(self.csv_path, self.csv_file_name) self.csv_file = os.path.join(self.csv_path, self.csv_file_name)
# status bar content
self.statusbar = tk.StringVar()
self.length_address_list = None
self.length_address_list_active = None
# leave application if settings are bad # leave application if settings are bad
if not self.config_good: if not self.config_good:
show_error(message_title="Fehler Konfiguration", show_error(message_title="Fehler Konfiguration",
@@ -50,21 +61,28 @@ class Application:
) )
sys.exit() sys.exit()
# frames
top_frame = tk.Frame(self.root) top_frame = tk.Frame(self.root)
top_frame.pack(side=tk.TOP, fill=tk.X) top_frame.pack(side=tk.TOP, fill=tk.X)
data_frame = tk.Frame(self.root, bg="teal")
data_frame.pack(side=tk.TOP, fill=tk.BOTH, expand=True)
bottom_frame = tk.Frame(self.root)
bottom_frame.pack(side=tk.BOTTOM, fill=tk.X)
# top buttons
button_width = 8 button_width = 8
tk.Button(top_frame, text="Insert", command=self.insert_record, width=button_width).pack(side=tk.LEFT) tk.Button(top_frame, text="Insert", command=self.insert_record, width=button_width).pack(side=tk.LEFT)
tk.Button(top_frame, text="Delete", command=self.delete_record, width=button_width).pack(side=tk.LEFT) tk.Button(top_frame, text="Delete", command=self.delete_record, width=button_width).pack(side=tk.LEFT)
tk.Button(top_frame, text="Export CSV", command=self.export_csv, width=button_width).pack(side=tk.LEFT) tk.Button(top_frame, text="Export CSV", command=self.export_csv, width=button_width).pack(side=tk.LEFT)
tk.Button(top_frame, text="Toggle Aktiv", command=self.toggle_active, width=button_width).pack(side=tk.LEFT) tk.Button(top_frame, text="Toggle Aktiv", command=self.toggle_active, width=button_width).pack(side=tk.LEFT)
tk.Checkbutton(top_frame, text="Filter aktiv", variable=self.filter_active, command=self.populate_table).pack(
side=tk.LEFT)
tk.Button(top_frame, text="Quit", command=self.on_close, width=button_width).pack(side=tk.RIGHT) tk.Button(top_frame, text="Quit", command=self.on_close, width=button_width).pack(side=tk.RIGHT)
tk.Button(top_frame, text="Settings", command=self.show_settings, width=button_width).pack(side=tk.RIGHT) tk.Button(top_frame, text="Settings", command=self.show_settings, width=button_width).pack(side=tk.RIGHT)
data_frame = tk.Frame(self.root, bg="teal") # table content
data_frame.pack(side=tk.TOP, fill=tk.BOTH, expand=True)
scrollbar = ttk.Scrollbar(data_frame, orient=tk.VERTICAL) scrollbar = ttk.Scrollbar(data_frame, orient=tk.VERTICAL)
self.table = ttk.Treeview(data_frame, yscrollcommand=scrollbar.set, columns=("0", "1", "2", "3", "4"), self.table = ttk.Treeview(data_frame, yscrollcommand=scrollbar.set, columns=("0", "1", "2", "3", "4", "5"),
show="headings") show="headings")
scrollbar.config(command=self.table.yview) scrollbar.config(command=self.table.yview)
self.table.heading('0', text="Aktiv") self.table.heading('0', text="Aktiv")
@@ -73,22 +91,27 @@ class Application:
self.table.heading('2', text="Name") self.table.heading('2', text="Name")
self.table.heading('3', text="Strasse") self.table.heading('3', text="Strasse")
self.table.heading('4', text="Plz/Ort") self.table.heading('4', text="Plz/Ort")
self.table.heading('5', text="Anzahl")
self.table.pack(side=tk.LEFT, fill=tk.BOTH, expand=True) self.table.pack(side=tk.LEFT, fill=tk.BOTH, expand=True)
scrollbar.pack(side=tk.LEFT, fill=tk.Y) scrollbar.pack(side=tk.LEFT, fill=tk.Y)
self.table.bind("<ButtonRelease-1>", self.mouse_click) self.table.bind("<ButtonRelease-1>", self.mouse_click)
self.table.bind("<Return>", self.mouse_click_double) self.table.bind("<Return>", self.enter_button)
self.table.bind("<Double-1>", self.mouse_click_double) self.table.bind("<Double-1>", self.mouse_click_double)
self.root.bind("<Up>", self.focus_table)
self.root.bind("<Down>", self.focus_table)
self._load_json_file() # bottom status bar
tk.Label(bottom_frame, textvariable=self.statusbar).pack(side=tk.LEFT)
self.first_sort_after_start()
self.root.mainloop() self.root.mainloop()
def load_config(self): def load_config(self):
try: try:
self.json_path = self.config.get("json", "path")
self.csv_path = self.config.get("csv", "path") self.csv_path = self.config.get("csv", "path")
if self.json_path == "" or self.csv_path == "": if self.csv_path == "":
raise ValueError("Empty JSON or CSV path") raise ValueError("Empty JSON or CSV path")
self.config_good = True self.config_good = True
except NoSectionError: except NoSectionError:
@@ -114,55 +137,56 @@ class Application:
settings.wait_window() settings.wait_window()
def insert_record(self): def insert_record(self):
values = [ values = {
"x", "aktiv": "x",
"Firma", "firma": "Firma",
"Name", "name": "Name",
"Strasse", "strasse": "Strasse",
"Plz/Ort", "plzort": "Plz/Ort",
] "anzahl": "Anzahl"
last_iid = self.table.get_children()[-1] }
next_iid = int(last_iid) + 1 self.model.create_new(values)
self.table.insert('', 'end', iid=next_iid, values=values) self.populate_table()
self._save_json_file()
self.deselect_tree() self.deselect_tree()
def delete_record(self): def delete_record(self):
if self.current_record is None: if self.current_record is None:
return return
if len(self.table.selection()) > 1:
show_error(message_title="Mehrere Adressen ausgewählt",
message="Es können nur einzelne Adressen gelöscht werden",
parent=self.root)
return
if messagebox.askyesno( if messagebox.askyesno(
"Eintrag löschen?", "Eintrag löschen?",
"Willst du diesen Eintrag wirklich löschen?\nDies kann nicht rückgängig gemacht werden"): "Willst du diesen Eintrag wirklich löschen?\nDies kann nicht rückgängig gemacht werden"):
self.table.delete(self.current_record) self.model.delete_by_id(self.current_record)
self.deselect_tree() self.deselect_tree()
self._save_json_file() self.populate_table()
def update_record(self, data: list): def update_record(self, record: dict):
if self.current_record is None: if self.current_record is None:
return return
values = {} self.model.update_record(record)
for idx, value in enumerate(data): self.populate_table()
values[str(idx)] = value.get()
for key, value in values.items():
self.table.set(self.current_record, key, value)
self._save_json_file()
def toggle_active(self): def toggle_active(self):
items = self.table.selection() selection = self.table.selection()
if len(items) == 0: if len(selection) == 0:
return return
for record_id in items: item_list = [int(x) for x in selection]
values = self.table.item(record_id, "values") for address in self.address_list:
active = values[0] record_id = address.get("record_id")
new_active = "x" if active == "" else "" if record_id in item_list:
self.table.set(record_id, "0", new_active) address["aktiv"] = "x" if address["aktiv"] == "" else ""
self.model.update_record(address)
self.table.set(record_id, "0", address["aktiv"])
self._save_json_file() self.update_status_bar()
def deselect_tree(self): def deselect_tree(self):
while len(self.table.selection()) > 0: while len(self.table.selection()) > 0:
@@ -170,7 +194,11 @@ class Application:
self.current_record = None self.current_record = None
def mouse_click(self, event): def mouse_click(self, event):
self.current_record = self.table.focus() id_string = self.table.focus()
if id_string is not None and id_string != "":
self.current_record = int(self.table.focus())
else:
self.current_record = None
region = self.table.identify("region", event.x, event.y) region = self.table.identify("region", event.x, event.y)
match region: match region:
case "heading": case "heading":
@@ -180,84 +208,92 @@ class Application:
region = self.table.identify("region", event.x, event.y) region = self.table.identify("region", event.x, event.y)
match region: match region:
case "cell": case "cell":
self.click_on_cell() self.edit_selected_record()
def enter_button(self, event):
self.edit_selected_record()
def click_on_header(self, event): def click_on_header(self, event):
column = self.table.identify_column(event.x) column = self.table.identify_column(event.x)
if self.last_sort_field == column:
self.sort_order = False if self.sort_order else True
else:
self.sort_order = False
self.last_sort_field = column
match column: match column:
case "#1": case "#1":
self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order) field = "aktiv"
self.populate_table()
case "#2": case "#2":
self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order) field = "firma"
self.populate_table()
case "#3": case "#3":
self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order) field = "name"
self.populate_table()
case "#4": case "#4":
self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order) field = "strasse"
self.populate_table()
case "#5": case "#5":
self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order) field = "plzort"
self.populate_table() case "#6":
field = "anzahl"
case _: case _:
print(column) field = "name"
self.sort_order = not self.sort_order
def click_on_cell(self): self.address_list = self.model.get_all_sorted_by(field, self.sort_order)
self.current_record = self.table.focus() self.populate_table(reload=False)
values = self.table.item(self.current_record, "values")
self.open_window_edit_records(values)
def _load_json_file(self): def edit_selected_record(self):
try: if self.table.focus() is None or self.table.focus() == "":
with open(self.json_file, "r", encoding="utf-8") as f: return
self.address_list = json.load(f) self.current_record = int(self.table.focus())
self.address_list.sort(key=lambda x: (x[0], x[1])) self.open_window_edit_records(self.current_record)
except FileNotFoundError:
show_error(
message_title="Datei nicht gefunden",
message=f"{self.json_file_name} nicht gefunden, erstelle leere Datei unter {self.json_path}",
parent=self.root
)
self.address_list = [["", "firma", "name", "adresse", "plz/ort"]]
with open(self.json_file, "w", encoding="utf-8") as f:
json.dump(self.address_list, f)
self.populate_table()
def _save_json_file(self):
self.export_table_to_address_list()
try:
with open(self.json_file, "w", encoding="utf-8") as f:
json.dump(self.address_list, f, indent=4, sort_keys=True)
except FileNotFoundError:
show_error(
message_title="Unexpected Error: File not found?!",
message=f"{self.json_file_name} not found",
parent=self.root
)
def export_csv(self): def export_csv(self):
try: try:
with open(self.csv_file, "w", encoding="utf-8") as f: with open(self.csv_file, "w", encoding="utf-8") as f:
writer = csv.writer(f, delimiter=",") writer = csv.writer(f, delimiter=",")
for address in self.address_list: for address in self.address_list:
if address[0] != "x": if address["aktiv"] != "x":
continue continue
if address[1] == "": for index in range(int(address["anzahl"])):
writer.writerow(address[2:]) self.write_sender_to_csv(address, writer)
else: self.write_receiver_to_csv(address, writer)
writer.writerow(address[1:])
except FileNotFoundError: except FileNotFoundError:
show_error(message_title="Unexpected error", show_error(message_title="Unexpected error",
message=f"Could not write file {self.csv_file}", message=f"Could not write file {self.csv_file}",
parent=self.root parent=self.root
) )
def populate_table(self): def write_receiver_to_csv(self, address: dict, csv_writer: _csv.writer):
receiver_line = []
if address["firma"] != "":
receiver_line.append(address["firma"])
receiver_line.append(address["name"])
receiver_line.append(address["strasse"])
receiver_line.append(address["plzort"])
csv_writer.writerow(receiver_line)
def write_sender_to_csv(self, address: dict, csv_writer: _csv.writer):
sender_line = []
for idx in range(4):
sender_line.append(self.config.get("absender", f"{idx}"))
csv_writer.writerow(sender_line)
def populate_table(self, reload=True):
if reload:
self.address_list = self.model.get_all()
if len(self.address_list) == 0:
self.delete_all_table_items()
return
self.delete_all_table_items() self.delete_all_table_items()
for index, item in enumerate(self.address_list): for address in self.address_list:
self.table.insert('', 'end', iid=index, values=item) # skip inactive records if filter is true
if self.filter_active.get() and address["aktiv"] != "x":
continue
self.table.insert('', 'end', iid=address["record_id"],
values=(address["aktiv"], address["firma"], address["name"], address["strasse"],
address["plzort"], address["anzahl"])
)
self.update_status_bar()
def export_table_to_address_list(self): def export_table_to_address_list(self):
self.address_list.clear() self.address_list.clear()
@@ -265,25 +301,50 @@ class Application:
self.address_list.append([]) self.address_list.append([])
for value in self.table.item(child)['values']: for value in self.table.item(child)['values']:
self.address_list[-1].append(value) self.address_list[-1].append(value)
self.update_status_bar()
def delete_all_table_items(self): def delete_all_table_items(self):
for item in self.table.get_children(): for item in self.table.get_children():
self.table.delete(item) self.table.delete(item)
def open_window_settings(self): def open_window_settings(self):
window = SettingsWindow(self, self.root) window = SettingsWindow(self, self.root, self.config)
window.wm_transient(self.root) window.wm_transient(self.root)
window.wait_visibility() window.wait_visibility()
window.grab_set() window.grab_set()
return window return window
def open_window_edit_records(self, data): def open_window_edit_records(self, record_id: int):
window = EditRecord(self, self.root, data) window = EditRecord(self, self.root, record_id, self.config)
window.wm_transient(self.root) window.wm_transient(self.root)
window.wait_visibility() window.wait_visibility()
window.grab_set() window.grab_set()
def update_status_bar(self):
self._count_address_records()
self.statusbar.set(f"Adressen: {self.length_address_list} | Aktive Adressen: {self.length_address_list_active}")
def _count_address_records(self):
self.length_address_list = len(self.address_list)
count = 0
for address in self.address_list:
if address["aktiv"] == "x":
count += 1
self.length_address_list_active = count
def first_sort_after_start(self):
self.address_list.sort(key=lambda x: (x["firma"], x["name"]))
self.populate_table()
def focus_table(self, event):
first = self.table.get_children()[0]
last = self.table.get_children()[-1]
goto = last if event.keysym == "Up" else first
if self.table.focus() == "":
self.table.selection_set(goto)
self.table.focus(goto)
self.table.see(goto)
self.table.focus_force()
if __name__ == '__main__': if __name__ == '__main__':

View File

@@ -1,11 +1,11 @@
import os import os
from configparser import ConfigParser from configparser import ConfigParser, NoOptionError, NoSectionError, DuplicateSectionError
class Config: class Config:
parser: ConfigParser parser: ConfigParser
def __init__(self): def __init__(self, filename: str = "config.ini"):
""" """
Config parser reading config.ini Config parser reading config.ini
@@ -19,7 +19,7 @@ class Config:
full_path = os.path.join(home_path, ".config", "brovski-adress-etiketten" ) full_path = os.path.join(home_path, ".config", "brovski-adress-etiketten" )
if not os.path.exists(full_path): if not os.path.exists(full_path):
os.makedirs(full_path) os.makedirs(full_path)
self.config_file = os.path.join(full_path, "config.ini") self.config_file = os.path.join(full_path, filename)
self._load() self._load()
@@ -32,14 +32,25 @@ class Config:
def add_section(self, section): def add_section(self, section):
self._load() self._load()
self.parser.add_section(section) try:
self.parser.add_section(section)
except DuplicateSectionError:
return
self._save() self._save()
def set(self, section: str, option: str, value: str): def set(self, section: str, option: str, value: str):
self._load() self._load()
self.add_section(section)
self.parser.set(section, option, value) self.parser.set(section, option, value)
self._save() self._save()
def get(self, section: str, option: str): def get(self, section: str, option: str):
self._load() self._load()
return self.parser.get(section, option) try:
option = self.parser.get(section, option)
except NoOptionError:
option = ""
except NoSectionError:
option = ""
return option

88
src/connector.py Normal file
View File

@@ -0,0 +1,88 @@
import json
import os
from abc import ABC, abstractmethod
from config import Config
class Connector(ABC):
def __init__(self, config: Config):
self.config = config
@abstractmethod
def get_all(self) -> list:
pass
@abstractmethod
def get_by_id(self, record_id: int) -> dict:
pass
@abstractmethod
def delete_by_id(self, record_id: int):
pass
@abstractmethod
def update_record(self, updated_record: dict):
pass
@abstractmethod
def create_new(self, values: dict) -> int:
pass
@abstractmethod
def get_all_sorted_by(self, field: str, reverse: bool = False) -> list:
pass
class JSONConnector(Connector):
def __init__(self, config: Config):
super().__init__(config)
self.json_path = self.config.get("json", "path")
self.json_file = os.path.join(self.json_path, "brovski-adress-etiketten-verwaltung-v7.json")
def get_all(self) -> list:
try:
with open(self.json_file, "r") as f:
return json.load(f)
except FileNotFoundError:
return []
def get_all_sorted_by(self, field: str, reverse=False) -> list:
with open(self.json_file, "r") as f:
data = json.load(f)
return sorted(data, key=lambda k: k[field], reverse=reverse)
def get_by_id(self, record_id: int) -> dict:
data = self.get_all()
for record in data:
if record["record_id"] == record_id:
return record
def delete_by_id(self, record_id: int):
data = self.get_all()
for idx, record in enumerate(data):
if record["record_id"] == record_id:
del data[idx]
self._write_to_file(data)
def update_record(self, new_record: dict):
data = self.get_all()
for idx, record in enumerate(data):
if record["record_id"] == new_record["record_id"]:
data[idx] = new_record
self._write_to_file(data)
def create_new(self, record: dict) -> int:
data = self.get_all()
if len(data) == 0:
next_id = 0
else:
next_id = max(data, key=lambda x: x["record_id"])["record_id"] + 1
record["record_id"] = next_id
data.append(record)
self._write_to_file(data)
return next_id
def _write_to_file(self, data):
with open(self.json_file, "w", encoding="UTF-8") as f:
json.dump(data, f, indent=4, ensure_ascii=False)

24
src/model.py Normal file
View File

@@ -0,0 +1,24 @@
from connector import Connector
class Model:
def __init__(self, connector: Connector):
self.connector = connector
def get_all(self):
return self.connector.get_all()
def get_all_sorted_by(self, field: str, reverse: bool = False):
return self.connector.get_all_sorted_by(field=field, reverse=reverse)
def get_by_id(self, record_id: int):
return self.connector.get_by_id(record_id)
def delete_by_id(self, record_id: int):
self.connector.delete_by_id(record_id)
def update_record(self, new_record: dict):
self.connector.update_record(new_record)
def create_new(self, record: dict):
self.connector.create_new(record)

View File

@@ -3,6 +3,7 @@ from configparser import NoSectionError, NoOptionError
from tkinter import font, filedialog, messagebox from tkinter import font, filedialog, messagebox
from config import Config from config import Config
from connector import JSONConnector
def show_error(message_title: str, message: str, parent: tk.Tk | tk.Toplevel): def show_error(message_title: str, message: str, parent: tk.Tk | tk.Toplevel):
@@ -25,27 +26,29 @@ class Window(tk.Toplevel):
self._destroy_window() self._destroy_window()
def _destroy_window(self): def _destroy_window(self):
self.parent.populate_table()
self.root.update() self.root.update()
self.destroy() self.destroy()
class EditRecord(Window): class EditRecord(Window):
def __init__(self, parent, root: tk.Tk, data: tuple): def __init__(self, parent, root: tk.Tk, record_id: int, config: Config):
super().__init__(parent, root) super().__init__(parent, root)
self.bind("<Return>", self._update) self.bind("<Return>", self._update)
self.data = data self.model = JSONConnector(config)
record = self.model.get_by_id(record_id)
button_width = 8 button_width = 8
self.title("Adresse bearbeiten") self.title("Adresse bearbeiten")
self.aktiv = tk.StringVar() self.record_id = tk.IntVar(value=record_id)
self.firma = tk.StringVar() self.aktiv = tk.StringVar(value=record.get("aktiv"))
self.name = tk.StringVar() self.firma = tk.StringVar(value=record.get("firma"))
self.strasse = tk.StringVar() self.name = tk.StringVar(value=record.get("name"))
self.plz_ort = tk.StringVar() self.strasse = tk.StringVar(value=record.get("strasse"))
self.plz_ort = tk.StringVar(value=record.get("plzort"))
self.field_list = [self.aktiv, self.firma, self.name, self.strasse, self.plz_ort] self.anzahl = tk.StringVar(value=record.get("anzahl"))
for argument, field in zip(self.data, self.field_list):
field.set(argument)
edit_frame = tk.Frame(self) edit_frame = tk.Frame(self)
edit_frame.pack(side=tk.TOP, fill=tk.X, pady=20, padx=20) edit_frame.pack(side=tk.TOP, fill=tk.X, pady=20, padx=20)
@@ -54,6 +57,7 @@ class EditRecord(Window):
tk.Label(edit_frame, text="Name").grid(row=0, column=2) tk.Label(edit_frame, text="Name").grid(row=0, column=2)
tk.Label(edit_frame, text="Strasse").grid(row=0, column=3) tk.Label(edit_frame, text="Strasse").grid(row=0, column=3)
tk.Label(edit_frame, text="Plz/Ort").grid(row=0, column=4) tk.Label(edit_frame, text="Plz/Ort").grid(row=0, column=4)
tk.Label(edit_frame, text="Anzahl").grid(row=0, column=5)
edit_aktiv = tk.Checkbutton(edit_frame, variable=self.aktiv, onvalue="x", offvalue="") edit_aktiv = tk.Checkbutton(edit_frame, variable=self.aktiv, onvalue="x", offvalue="")
edit_aktiv.grid(row=1, column=0) edit_aktiv.grid(row=1, column=0)
edit_firma = tk.Entry(edit_frame, textvariable=self.firma) edit_firma = tk.Entry(edit_frame, textvariable=self.firma)
@@ -64,6 +68,8 @@ class EditRecord(Window):
edit_strasse.grid(row=1, column=3) edit_strasse.grid(row=1, column=3)
edit_plz_ort = tk.Entry(edit_frame, textvariable=self.plz_ort) edit_plz_ort = tk.Entry(edit_frame, textvariable=self.plz_ort)
edit_plz_ort.grid(row=1, column=4) edit_plz_ort.grid(row=1, column=4)
edit_anzahl = tk.Entry(edit_frame, textvariable=self.anzahl)
edit_anzahl.grid(row=1, column=5)
button_frame = tk.Frame(self) button_frame = tk.Frame(self)
button_frame.pack(side=tk.TOP, pady=10) button_frame.pack(side=tk.TOP, pady=10)
@@ -71,25 +77,39 @@ class EditRecord(Window):
tk.Button(button_frame, text="Abbrechen", command=self.close_window, width=button_width).pack(side=tk.LEFT) tk.Button(button_frame, text="Abbrechen", command=self.close_window, width=button_width).pack(side=tk.LEFT)
def _update(self, event = None): def _update(self, event = None):
self.parent.update_record(self.field_list) new_record = {
"record_id": self.record_id.get(),
"aktiv": self.aktiv.get(),
"firma": self.firma.get(),
"name": self.name.get(),
"strasse": self.strasse.get(),
"plzort": self.plz_ort.get(),
"anzahl": self.anzahl.get(),
}
self.model.update_record(new_record)
self.close_window() self.close_window()
class SettingsWindow(Window): class SettingsWindow(Window):
def __init__(self, parent, root: tk.Tk): def __init__(self, parent, root: tk.Tk, config: Config):
super().__init__(parent, root) super().__init__(parent, root)
self.geometry(f"500x330+{self.root.winfo_x() + 20}+{self.root.winfo_y() + 20}") width = 500
self.config = Config() height = 630
self.geometry(f"{width}x{height}+{self.root.winfo_x() + 20}+{self.root.winfo_y() + 20}")
self.config = config
self.json_file = tk.StringVar() self.json_file = tk.StringVar()
self.csv_file = tk.StringVar() self.csv_file = tk.StringVar()
self.absender_line = [tk.StringVar() for idx in range(4)]
title = font.Font(family='Ubuntu Mono', size=20, weight=font.BOLD) title = font.Font(family='Ubuntu Mono', size=20, weight=font.BOLD)
tk.Label(self, text="Einstellungen", font=title).pack(pady=20) tk.Label(self, text="Einstellungen", font=title).pack(pady=20)
path_frame = tk.Frame(self)
path_frame.pack(pady=(10, 40))
tk.Label(path_frame, text="Datenpfad JSON Datei").grid(row=0, column=0) tk.Label(self, text="Datenpfad JSON Datei").pack()
path_frame = tk.Frame(self)
path_frame.pack(pady=(10, 10))
tk.Entry(path_frame, textvariable=self.json_file, width=50).grid(row=1, column=0) tk.Entry(path_frame, textvariable=self.json_file, width=50).grid(row=1, column=0)
tk.Button(path_frame, text="Pfad", command=lambda: self.set_json_path(self.json_file.get())).grid(row=1, tk.Button(path_frame, text="Pfad", command=lambda: self.set_json_path(self.json_file.get())).grid(row=1,
column=1) column=1)
@@ -98,6 +118,13 @@ class SettingsWindow(Window):
tk.Entry(path_frame, textvariable=self.csv_file, width=50).grid(row=3, column=0) tk.Entry(path_frame, textvariable=self.csv_file, width=50).grid(row=3, column=0)
tk.Button(path_frame, text="Pfad", command=lambda: self.set_csv_path(self.csv_file.get())).grid(row=3, column=1) tk.Button(path_frame, text="Pfad", command=lambda: self.set_csv_path(self.csv_file.get())).grid(row=3, column=1)
absender_frame = tk.Frame(self)
absender_frame.pack(pady=(10, 40))
tk.Label(absender_frame, text="Absender").pack(side=tk.TOP)
for idx in range(4):
tk.Entry(absender_frame, textvariable=self.absender_line[idx], width=50).pack(side=tk.TOP)
bottom_frame = tk.Frame(self) bottom_frame = tk.Frame(self)
bottom_frame.pack() bottom_frame.pack()
tk.Button(bottom_frame, text="Ok", command=self.ok).pack(side=tk.LEFT) tk.Button(bottom_frame, text="Ok", command=self.ok).pack(side=tk.LEFT)
@@ -134,6 +161,15 @@ class SettingsWindow(Window):
except NoOptionError: except NoOptionError:
self.config.set("csv", "path", "") self.config.set("csv", "path", "")
for idx in range(4):
try:
self.absender_line[idx].set(self.config.get(f"absender", f"{idx}"))
except NoSectionError:
self.config.add_section(f"line")
self.config.set("line", f"{idx}", "")
except NoOptionError:
self.config.set("line", f"{idx}", "")
def ok(self): def ok(self):
if self.json_file.get() == "" or self.csv_file.get() == "": if self.json_file.get() == "" or self.csv_file.get() == "":
show_error(message_title="Fehlerhafte Konfiguration", show_error(message_title="Fehlerhafte Konfiguration",
@@ -142,6 +178,8 @@ class SettingsWindow(Window):
return return
self.config.set("json", "path", self.json_file.get()) self.config.set("json", "path", self.json_file.get())
self.config.set("csv", "path", self.csv_file.get()) self.config.set("csv", "path", self.csv_file.get())
for i in range(4):
self.config.set("absender", f"{i}", f"{self.absender_line[i].get()}")
self.close_window() self.close_window()
def cancel(self): def cancel(self):

View File

@@ -1 +1 @@
0.6a 0.2.2b