Compare commits
68 Commits
alpha2
...
f993220ad6
| Author | SHA1 | Date | |
|---|---|---|---|
| f993220ad6 | |||
| dac342f3ec | |||
| 61ab5a9deb | |||
| b61c52972d | |||
| c80a587cbd | |||
| 0d114a325d | |||
| 9532eb7247 | |||
| 7e9d5bec9b | |||
| 6407cf4229 | |||
| 9ad45ed63f | |||
| 3224c1c2aa | |||
| ca88c4d229 | |||
| 12d0d7034f | |||
| 2d840d6ad4 | |||
| 0ae2c7e559 | |||
| 96995f1e80 | |||
| ec130fcee9 | |||
| 95ed06df45 | |||
| 9ea44933a6 | |||
| dc27197129 | |||
| bbdbaadb92 | |||
| ad66988e09 | |||
| 3fd0147158 | |||
| aec7770e74 | |||
| d16aefe20f | |||
| 307057a387 | |||
| 4917e5e9bd | |||
| 3f6b22abc8 | |||
| 6785a8f46d | |||
| dd51921784 | |||
| 15dc182a37 | |||
| 057e0a02de | |||
| 6c8ce7b208 | |||
| bcb4bb90d5 | |||
| 00a1e00c86 | |||
| 3d3a833d4f | |||
| 70b5fe5ef7 | |||
| 325f9214c7 | |||
| b50e0df01b | |||
| 8c5cb753cf | |||
| cca474b4c8 | |||
| bd1564540d | |||
| ca14ecea76 | |||
| 748519f45f | |||
| 1ee64f5d95 | |||
| 32eb0ee6c1 | |||
| 26e1d1f2da | |||
| dc86d8ce01 | |||
| 7ef1fca873 | |||
| e3d8b94bd6 | |||
| 889ec19c7a | |||
| d9ae7153a5 | |||
| 043cb0a626 | |||
| d9fee6dc57 | |||
| aae762ba28 | |||
| 72b4614d4d | |||
| bb31a52934 | |||
| 5e071503d0 | |||
| 2f30baeed2 | |||
| d23408ab47 | |||
| e3c7daddd3 | |||
| 974fce8a26 | |||
| 9c6669f349 | |||
| 139b951087 | |||
| 05599acd56 | |||
| 7cf3f6cc1f | |||
| 62e8bb728b | |||
| 5f568d3850 |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -166,3 +166,7 @@ cython_debug/
|
||||
/.idea/modules.xml
|
||||
/.idea/inspectionProfiles/profiles_settings.xml
|
||||
/.idea/inspectionProfiles/Project_Default.xml
|
||||
|
||||
/deb-package/brovski-adressetiketten/usr/local/bin/brovski-adress-etiketten-verwaltung
|
||||
/deb-package/brovski-adressetiketten/usr/local/bin/brovski-adressetiketten
|
||||
/brovski-adressetiketten.deb
|
||||
|
||||
21
compile.sh
Executable file
21
compile.sh
Executable file
@@ -0,0 +1,21 @@
|
||||
#!/usr/bin/env bash
|
||||
if [ "$VIRTUAL_ENV" == "" ]
|
||||
then
|
||||
source venv/bin/activate
|
||||
fi
|
||||
version=$(cat version.txt)
|
||||
echo "current version set to: $version"
|
||||
new_version=""
|
||||
read -r -p "Enter new version or empty to keep the current: " new_version
|
||||
if [ "$new_version" != "" ]
|
||||
then
|
||||
echo "$new_version" | tee version.txt
|
||||
fi
|
||||
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].[0-9]\w/Version: $(cat version.txt)/g" deb-package/brovski-adressetiketten/DEBIAN/control
|
||||
|
||||
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
|
||||
dpkg-deb --build deb-package/brovski-adressetiketten
|
||||
mv deb-package/brovski-adressetiketten.deb ./
|
||||
5
deb-package/brovski-adressetiketten/DEBIAN/control
Normal file
5
deb-package/brovski-adressetiketten/DEBIAN/control
Normal file
@@ -0,0 +1,5 @@
|
||||
Package: brovski-adressetiketten
|
||||
Version: 0.2.0b
|
||||
Maintainer: Ovski
|
||||
Architecture: all
|
||||
Description: manage csv files for glables address labels
|
||||
@@ -1,8 +1,8 @@
|
||||
[Desktop Entry]
|
||||
Name=Brovski Adress Etiketten
|
||||
GenericName=Brovski Adress Etiketten
|
||||
Icon=/home/sroth/app/brovski-adress-etiketten-verwaltung/icon.svg
|
||||
Exec=/home/sroth/app/brovski-adress-etiketten-verwaltung/brovski-adress-etiketten-verwaltung
|
||||
Icon=/usr/share/icons/hicolor/512x512/apps/brovski-adressetiketten.svg
|
||||
Exec=/usr/local/bin/brovski-adressetiketten
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Utility
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 89 KiB |
|
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 94 KiB |
@@ -1,3 +0,0 @@
|
||||
alpha muster-firma,otti,tottistrasse,1234 daheim
|
||||
c3000,erich roth,zentralstrasse 120,5430 wettingen
|
||||
muster-firma,Peter Muster,Peter-Musterstrasse 1,1234 Ort
|
||||
|
@@ -2,216 +2,116 @@ import csv
|
||||
import os
|
||||
import sys
|
||||
import tkinter as tk
|
||||
from tkinter import font, filedialog
|
||||
from configparser import NoSectionError, NoOptionError
|
||||
from configparser import ConfigParser
|
||||
from tkinter import messagebox
|
||||
from tkinter import ttk
|
||||
import json
|
||||
|
||||
class SettingsWindow(tk.Toplevel):
|
||||
def __init__(self, root: tk.Tk):
|
||||
super().__init__()
|
||||
self.root = root
|
||||
self.protocol("WM_DELETE_WINDOW", self.close_window)
|
||||
self.geometry(f"500x330+{self.root.winfo_x()+20}+{self.root.winfo_y()+20}")
|
||||
|
||||
self.config = Config()
|
||||
|
||||
self.json_file = tk.StringVar()
|
||||
self.csv_file = tk.StringVar()
|
||||
|
||||
title = font.Font(family='Ubuntu Mono', size=20, weight=font.BOLD)
|
||||
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.Entry(path_frame, textvariable=self.json_file, width=50).grid(row=1, column=0)
|
||||
tk.Button(path_frame, text="Pfad", command=self.set_json_path).grid(row=1, column=1)
|
||||
|
||||
tk.Label(path_frame, text="Datenpfad CSV Export Datei").grid(row=2, column=0)
|
||||
tk.Entry(path_frame, textvariable=self.csv_file, width=50).grid(row=3, column=0)
|
||||
tk.Button(path_frame, text="Pfad", command=self.set_csv_path).grid(row=3, column=1)
|
||||
|
||||
bottom_frame = tk.Frame(self)
|
||||
bottom_frame.pack()
|
||||
tk.Button(bottom_frame, text="Ok", command=self.ok).pack(side=tk.LEFT)
|
||||
tk.Button(bottom_frame, text="Abbrechen", command=self.cancel).pack(side=tk.LEFT)
|
||||
|
||||
self.load_config()
|
||||
|
||||
def set_json_path(self):
|
||||
self.json_file.set(filedialog.askdirectory(initialdir="~/", title="Datenpfad JSON Datei"))
|
||||
|
||||
def set_csv_path(self):
|
||||
self.csv_file.set(filedialog.askdirectory(initialdir="~/", title="Datenpfad CSV Datei"))
|
||||
|
||||
def load_config(self):
|
||||
try:
|
||||
self.json_file.set(self.config.get("json", "path"))
|
||||
except NoSectionError:
|
||||
self.config.add_section("json")
|
||||
self.config.set("json", "path", "")
|
||||
except NoOptionError:
|
||||
self.config.set("json", "path", "")
|
||||
|
||||
try:
|
||||
self.csv_file.set(self.config.get("csv", "path"))
|
||||
except NoSectionError:
|
||||
self.config.add_section("csv")
|
||||
self.config.set("csv", "path", "")
|
||||
except NoOptionError:
|
||||
self.config.set("csv", "path", "")
|
||||
|
||||
def ok(self):
|
||||
self.config.set("json", "path", self.json_file.get())
|
||||
self.config.set("csv", "path", self.csv_file.get())
|
||||
self.close_window()
|
||||
|
||||
def cancel(self):
|
||||
self.close_window()
|
||||
|
||||
def close_window(self):
|
||||
if self.json_file.get() == "" or self.csv_file.get() == "":
|
||||
messagebox.showwarning(title="Fehlerhafte Konfiguration", message="Pfad für JSON oder CSV Datei fehlt")
|
||||
return
|
||||
self.destroy_window()
|
||||
|
||||
def destroy_window(self):
|
||||
self.root.update()
|
||||
self.root.deiconify()
|
||||
self.destroy()
|
||||
|
||||
class Config:
|
||||
parser: ConfigParser
|
||||
|
||||
def __init__(self):
|
||||
"""
|
||||
Config parser reading config.ini
|
||||
|
||||
Attributes:
|
||||
self.parser: ConfigParser holding list of sections and options
|
||||
self.__filename: Path and name to the config file
|
||||
"""
|
||||
self.parser = ConfigParser()
|
||||
|
||||
self.config_file_name = "files/config.ini"
|
||||
self.root_path = os.path.dirname(os.path.abspath(__file__))
|
||||
self.config_file = os.path.join(self.root_path, self.config_file_name)
|
||||
|
||||
self._load()
|
||||
|
||||
def _save(self):
|
||||
with open(self.config_file, 'w') as outfile:
|
||||
self.parser.write(outfile)
|
||||
|
||||
def _load(self):
|
||||
self.parser.read(self.config_file)
|
||||
|
||||
def add_section(self, section):
|
||||
self._load()
|
||||
self.parser.add_section(section)
|
||||
self._save()
|
||||
|
||||
def set(self, section: str, option: str, value: str):
|
||||
self._load()
|
||||
self.parser.set(section, option, value)
|
||||
self._save()
|
||||
|
||||
def get(self, section: str, option: str):
|
||||
self._load()
|
||||
return self.parser.get(section, option)
|
||||
from config import Config
|
||||
from model import Model
|
||||
from connector import JSONConnector
|
||||
from windows import SettingsWindow, EditRecord, show_error
|
||||
|
||||
|
||||
class Application:
|
||||
def __init__(self):
|
||||
os.chdir(os.getcwd())
|
||||
# tkinter settings
|
||||
x_offset = 700
|
||||
y_offset = 400
|
||||
title = "Brovski Adress-Etiketten Verwaltung"
|
||||
y_offset = 200
|
||||
width = 1050
|
||||
height = 700
|
||||
VERSION = '0.2.0b'
|
||||
title = f"Brovski Adress-Etiketten Verwaltung {VERSION}"
|
||||
|
||||
self.root = tk.Tk(className="BrovskiAdressEtiketten")
|
||||
self.root.title(title)
|
||||
self.root.protocol("WM_DELETE_WINDOW", self.on_close)
|
||||
self.root.geometry(f"+{x_offset}+{y_offset}")
|
||||
self.root.geometry(f"{width}x{height}+{x_offset}+{y_offset}")
|
||||
self.config = Config()
|
||||
self.config_good = False
|
||||
|
||||
# variables
|
||||
self.address_list = []
|
||||
self.current_record: int | None = None
|
||||
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
|
||||
self.json_file_name = "brovski-adress-etiketten-verwaltung.json"
|
||||
self.csv_file_name = "brovski-adress-etiketten.csv"
|
||||
self.json_path = ""
|
||||
self.csv_path = ""
|
||||
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)
|
||||
|
||||
# status bar content
|
||||
self.statusbar = tk.StringVar()
|
||||
self.length_address_list = None
|
||||
self.length_address_list_active = None
|
||||
|
||||
# leave application if settings are bad
|
||||
if not self.config_good:
|
||||
self.show_error("Fehler Konfiguration",
|
||||
"Die Konfiguration ist fehlerhaft, bitte prüfe deine config.ini")
|
||||
show_error(message_title="Fehler Konfiguration",
|
||||
message="Die Konfiguration ist fehlerhaft, bitte prüfe deine config.ini",
|
||||
parent=self.root
|
||||
)
|
||||
sys.exit()
|
||||
|
||||
# frames
|
||||
top_frame = tk.Frame(self.root)
|
||||
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
|
||||
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="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.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="Settings", command=self.show_settings, width=button_width).pack(side=tk.RIGHT)
|
||||
|
||||
self.aktiv = tk.StringVar()
|
||||
self.firma = tk.StringVar()
|
||||
self.name = tk.StringVar()
|
||||
self.strasse = tk.StringVar()
|
||||
self.plz_ort = tk.StringVar()
|
||||
|
||||
edit_frame = tk.Frame(self.root)
|
||||
edit_frame.pack(side=tk.TOP, fill=tk.X)
|
||||
tk.Label(edit_frame, text="Aktiv").grid(row=0, column=0)
|
||||
tk.Label(edit_frame, text="Firma").grid(row=0, column=1)
|
||||
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="Plz/Ort").grid(row=0, column=4)
|
||||
edit_aktiv = tk.Checkbutton(edit_frame, variable=self.aktiv, onvalue="x", offvalue="")
|
||||
edit_aktiv.grid(row=1, column=0)
|
||||
edit_firma = tk.Entry(edit_frame, textvariable=self.firma)
|
||||
edit_firma.grid(row=1, column=1)
|
||||
edit_name = tk.Entry(edit_frame, textvariable=self.name)
|
||||
edit_name.grid(row=1, column=2)
|
||||
edit_strasse = tk.Entry(edit_frame, textvariable=self.strasse)
|
||||
edit_strasse.grid(row=1, column=3)
|
||||
edit_plz_ort = tk.Entry(edit_frame, textvariable=self.plz_ort)
|
||||
edit_plz_ort.grid(row=1, column=4)
|
||||
tk.Button(edit_frame, text="Update", command=self.update_record).grid(row=1, column=5)
|
||||
|
||||
data_frame = tk.Frame(self.root, bg="teal")
|
||||
data_frame.pack(side=tk.TOP, fill=tk.BOTH, expand=True)
|
||||
|
||||
self.table = ttk.Treeview(data_frame, columns=("0", "1", "2", "3", "4"), show="headings")
|
||||
# table content
|
||||
scrollbar = ttk.Scrollbar(data_frame, orient=tk.VERTICAL)
|
||||
self.table = ttk.Treeview(data_frame, yscrollcommand=scrollbar.set, columns=("0", "1", "2", "3", "4", "5"),
|
||||
show="headings")
|
||||
scrollbar.config(command=self.table.yview)
|
||||
self.table.heading('0', text="Aktiv")
|
||||
self.table.column('0', anchor=tk.CENTER, width=0)
|
||||
self.table.heading('1', text="Firma")
|
||||
self.table.heading('2', text="Name")
|
||||
self.table.heading('3', text="Strasse")
|
||||
self.table.heading('4', text="Plz/Ort")
|
||||
self.table.pack()
|
||||
self.table.heading('5', text="Anzahl")
|
||||
self.table.pack(side=tk.LEFT, fill=tk.BOTH, expand=True)
|
||||
scrollbar.pack(side=tk.LEFT, fill=tk.Y)
|
||||
|
||||
self.table.bind("<ButtonRelease-1>", self.mouse_click)
|
||||
self.table.bind("<Return>", self.enter_button)
|
||||
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()
|
||||
|
||||
def load_config(self):
|
||||
try:
|
||||
self.json_path = self.config.get("json", "path")
|
||||
self.csv_path = self.config.get("csv", "path")
|
||||
if self.csv_path == "":
|
||||
raise ValueError("Empty JSON or CSV path")
|
||||
self.config_good = True
|
||||
except NoSectionError:
|
||||
self.show_config_error()
|
||||
@@ -219,144 +119,177 @@ class Application:
|
||||
except NoOptionError:
|
||||
self.show_config_error()
|
||||
self.show_settings()
|
||||
|
||||
except ValueError:
|
||||
self.show_config_error()
|
||||
self.show_settings()
|
||||
|
||||
def show_config_error(self):
|
||||
if self.show_error("Fehlerhafte Konfiguration",
|
||||
"Konnte benötigte Parameter in config.ini nicht finden"):
|
||||
print("Fehlerhafte Konfiguration")
|
||||
show_error(message_title="Fehlerhafte Konfiguration",
|
||||
message="Konnte benötigte Parameter in config.ini nicht finden",
|
||||
parent=self.root)
|
||||
|
||||
def on_close(self):
|
||||
self.root.destroy()
|
||||
|
||||
def show_settings(self):
|
||||
self.root.withdraw()
|
||||
settings = SettingsWindow(self.root)
|
||||
settings = self.open_window_settings()
|
||||
settings.wait_window()
|
||||
|
||||
def insert_record(self):
|
||||
if self.current_record is not None:
|
||||
self.clear_entry_fields()
|
||||
children = self.table.get_children()
|
||||
values = [
|
||||
"x",
|
||||
"Firma",
|
||||
"Name",
|
||||
"Strasse",
|
||||
"Plz/Ort",
|
||||
]
|
||||
self.table.insert('', 'end', values=values)
|
||||
self._save_json_file()
|
||||
values = {
|
||||
"aktiv": "x",
|
||||
"firma": "Firma",
|
||||
"name": "Name",
|
||||
"strasse": "Strasse",
|
||||
"plzort": "Plz/Ort",
|
||||
"anzahl": "Anzahl"
|
||||
}
|
||||
self.model.create_new(values)
|
||||
self.populate_table()
|
||||
self.deselect_tree()
|
||||
|
||||
def delete_record(self):
|
||||
if self.current_record is None:
|
||||
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(
|
||||
"Eintrag löschen?",
|
||||
"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.clear_entry_fields()
|
||||
self._save_json_file()
|
||||
self.deselect_tree()
|
||||
self.populate_table()
|
||||
|
||||
def update_record(self, record: dict):
|
||||
if self.current_record is None:
|
||||
return
|
||||
self.model.update_record(record)
|
||||
self.populate_table()
|
||||
|
||||
def clear_entry_fields(self):
|
||||
entry_var_list = [self.aktiv, self.firma, self.name, self.strasse, self.plz_ort]
|
||||
for entry in entry_var_list:
|
||||
entry.set("")
|
||||
def toggle_active(self):
|
||||
selection = self.table.selection()
|
||||
if len(selection) == 0:
|
||||
return
|
||||
|
||||
item_list = [int(x) for x in selection]
|
||||
for address in self.address_list:
|
||||
record_id = address.get("record_id")
|
||||
if record_id in item_list:
|
||||
address["aktiv"] = "x" if address["aktiv"] == "" else ""
|
||||
self.model.update_record(address)
|
||||
self.table.set(record_id, "0", address["aktiv"])
|
||||
|
||||
self.update_status_bar()
|
||||
|
||||
def deselect_tree(self):
|
||||
while len(self.table.selection()) > 0:
|
||||
self.table.selection_remove(self.table.selection()[0])
|
||||
self.current_record = None
|
||||
|
||||
def mouse_click(self, event):
|
||||
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)
|
||||
match region:
|
||||
case "heading":
|
||||
self.click_on_header(event)
|
||||
|
||||
if region == "heading":
|
||||
def mouse_click_double(self, event):
|
||||
region = self.table.identify("region", event.x, event.y)
|
||||
match region:
|
||||
case "cell":
|
||||
self.edit_selected_record()
|
||||
|
||||
def enter_button(self, event):
|
||||
self.edit_selected_record()
|
||||
|
||||
def click_on_header(self, event):
|
||||
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:
|
||||
case "#1":
|
||||
self.address_list.sort(key=lambda x: x[int(column[-1]) - 1])
|
||||
self.populate_table()
|
||||
field = "aktiv"
|
||||
case "#2":
|
||||
self.address_list.sort(key=lambda x: x[int(column[-1]) - 1])
|
||||
self.populate_table()
|
||||
field = "firma"
|
||||
case "#3":
|
||||
self.address_list.sort(key=lambda x: x[int(column[-1]) - 1])
|
||||
self.populate_table()
|
||||
field = "name"
|
||||
case "#4":
|
||||
self.address_list.sort(key=lambda x: x[int(column[-1]) - 1])
|
||||
self.populate_table()
|
||||
field = "strasse"
|
||||
case "#5":
|
||||
self.address_list.sort(key=lambda x: x[int(column[-1]) - 1])
|
||||
self.populate_table()
|
||||
field = "plzort"
|
||||
case "#6":
|
||||
field = "anzahl"
|
||||
case _:
|
||||
print(column)
|
||||
field = "name"
|
||||
|
||||
if region == "cell":
|
||||
self.current_record = self.table.focus()
|
||||
values = self.table.item(self.current_record, "values")
|
||||
entry_var_list = [self.aktiv, self.firma, self.name, self.strasse, self.plz_ort]
|
||||
for i in range(len(values)):
|
||||
entry_var_list[i].set(values[i])
|
||||
self.address_list = self.model.get_all_sorted_by(field, self.sort_order)
|
||||
self.populate_table(reload=False)
|
||||
|
||||
def update_record(self):
|
||||
if self.current_record is None:
|
||||
def edit_selected_record(self):
|
||||
if self.table.focus() is None or self.table.focus() == "":
|
||||
return
|
||||
values = {
|
||||
0: self.aktiv.get(),
|
||||
1: self.firma.get(),
|
||||
2: self.name.get(),
|
||||
3: self.strasse.get(),
|
||||
4: self.plz_ort.get(),
|
||||
}
|
||||
for key, value in values.items():
|
||||
self.table.set(self.current_record, key, value)
|
||||
self.current_record = int(self.table.focus())
|
||||
self.open_window_edit_records(self.current_record)
|
||||
|
||||
self.clear_entry_fields()
|
||||
self._save_json_file()
|
||||
|
||||
def _load_json_file(self):
|
||||
try:
|
||||
with open(self.json_file, "r", encoding="utf-8") as f:
|
||||
self.address_list = json.load(f)
|
||||
self.address_list.sort(key=lambda x: (x[0], x[1]))
|
||||
except FileNotFoundError:
|
||||
self.show_error(
|
||||
message_title="Datei nicht gefunden",
|
||||
message=f"{self.json_file_name} nicht gefunden, erstelle leere Datei unter {self.json_path}"
|
||||
)
|
||||
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:
|
||||
self.show_error(
|
||||
message_title="Unexpected Error: File not found?!", message=f"{self.json_file_name} not found"
|
||||
)
|
||||
|
||||
def export_csv(self):
|
||||
try:
|
||||
with open(self.csv_file, "w", encoding="utf-8") as f:
|
||||
writer = csv.writer(f, delimiter=",")
|
||||
for address in self.address_list:
|
||||
if address[0] != "x":
|
||||
if address["aktiv"] != "x":
|
||||
continue
|
||||
del address[0]
|
||||
if address[0] == "":
|
||||
del address[0]
|
||||
writer.writerow(address)
|
||||
for index in range(int(address["anzahl"])):
|
||||
line = []
|
||||
if address["firma"] != "":
|
||||
line.append(address["firma"])
|
||||
line.append(address["name"])
|
||||
line.append(address["strasse"])
|
||||
line.append(address["plzort"])
|
||||
writer.writerow(line)
|
||||
# todo: add "absender" to config parameters
|
||||
line = []
|
||||
line.append("Absender:")
|
||||
line.append("Matthias Braun")
|
||||
line.append("Wolfacherweg 1")
|
||||
line.append("5724 Dürrenäsch")
|
||||
writer.writerow(line)
|
||||
except FileNotFoundError:
|
||||
self.show_error("Unexpected error", f"Could not write file {self.csv_file}")
|
||||
show_error(message_title="Unexpected error",
|
||||
message=f"Could not write file {self.csv_file}",
|
||||
parent=self.root
|
||||
)
|
||||
|
||||
def populate_table(self):
|
||||
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()
|
||||
for index, item in enumerate(self.address_list):
|
||||
self.table.insert('', 'end', iid=index, values=item)
|
||||
return
|
||||
self.delete_all_table_items()
|
||||
for address in self.address_list:
|
||||
# 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):
|
||||
self.address_list.clear()
|
||||
@@ -364,14 +297,50 @@ class Application:
|
||||
self.address_list.append([])
|
||||
for value in self.table.item(child)['values']:
|
||||
self.address_list[-1].append(value)
|
||||
self.update_status_bar()
|
||||
|
||||
def delete_all_table_items(self):
|
||||
for item in self.table.get_children():
|
||||
self.table.delete(item)
|
||||
|
||||
@staticmethod
|
||||
def show_error(message_title: str, message: str):
|
||||
messagebox.showwarning(title=message_title, message=message)
|
||||
def open_window_settings(self):
|
||||
window = SettingsWindow(self, self.root, self.config)
|
||||
window.wm_transient(self.root)
|
||||
window.wait_visibility()
|
||||
window.grab_set()
|
||||
return window
|
||||
|
||||
def open_window_edit_records(self, record_id: int):
|
||||
window = EditRecord(self, self.root, record_id, self.config)
|
||||
window.wm_transient(self.root)
|
||||
window.wait_visibility()
|
||||
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__':
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
pyinstaller --clean --add-data=files/config.ini:files brovski-adress-etiketten-verwaltung.py
|
||||
56
src/config.py
Normal file
56
src/config.py
Normal file
@@ -0,0 +1,56 @@
|
||||
import os
|
||||
from configparser import ConfigParser, NoOptionError, NoSectionError, DuplicateSectionError
|
||||
|
||||
|
||||
class Config:
|
||||
parser: ConfigParser
|
||||
|
||||
def __init__(self, filename: str = "config.ini"):
|
||||
"""
|
||||
Config parser reading config.ini
|
||||
|
||||
Attributes:
|
||||
self.parser: ConfigParser holding list of sections and options
|
||||
self.__filename: Path and name to the config file
|
||||
"""
|
||||
self.parser = ConfigParser()
|
||||
|
||||
home_path = os.environ["HOME"]
|
||||
full_path = os.path.join(home_path, ".config", "brovski-adress-etiketten" )
|
||||
if not os.path.exists(full_path):
|
||||
os.makedirs(full_path)
|
||||
self.config_file = os.path.join(full_path, filename)
|
||||
|
||||
self._load()
|
||||
|
||||
def _save(self):
|
||||
with open(self.config_file, 'w') as outfile:
|
||||
self.parser.write(outfile)
|
||||
|
||||
def _load(self):
|
||||
self.parser.read(self.config_file)
|
||||
|
||||
def add_section(self, section):
|
||||
self._load()
|
||||
try:
|
||||
self.parser.add_section(section)
|
||||
except DuplicateSectionError:
|
||||
return
|
||||
|
||||
self._save()
|
||||
|
||||
def set(self, section: str, option: str, value: str):
|
||||
self._load()
|
||||
self.add_section(section)
|
||||
self.parser.set(section, option, value)
|
||||
self._save()
|
||||
|
||||
def get(self, section: str, option: str):
|
||||
self._load()
|
||||
try:
|
||||
option = self.parser.get(section, option)
|
||||
except NoOptionError:
|
||||
option = ""
|
||||
except NoSectionError:
|
||||
option = ""
|
||||
return option
|
||||
88
src/connector.py
Normal file
88
src/connector.py
Normal 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
24
src/model.py
Normal 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)
|
||||
163
src/windows.py
Normal file
163
src/windows.py
Normal file
@@ -0,0 +1,163 @@
|
||||
import tkinter as tk
|
||||
from configparser import NoSectionError, NoOptionError
|
||||
from tkinter import font, filedialog, messagebox
|
||||
|
||||
from config import Config
|
||||
from connector import JSONConnector
|
||||
|
||||
|
||||
def show_error(message_title: str, message: str, parent: tk.Tk | tk.Toplevel):
|
||||
messagebox.showwarning(
|
||||
title=message_title,
|
||||
message=message,
|
||||
parent=parent
|
||||
)
|
||||
|
||||
|
||||
class Window(tk.Toplevel):
|
||||
def __init__(self, parent, root: tk.Tk):
|
||||
super().__init__(root)
|
||||
self.parent = parent
|
||||
self.root = root
|
||||
self.protocol("WM_DELETE_WINDOW", self.close_window)
|
||||
self.bind("<Escape>", self.close_window)
|
||||
|
||||
def close_window(self, event = None):
|
||||
self._destroy_window()
|
||||
|
||||
def _destroy_window(self):
|
||||
self.parent.populate_table()
|
||||
self.root.update()
|
||||
self.destroy()
|
||||
|
||||
|
||||
class EditRecord(Window):
|
||||
def __init__(self, parent, root: tk.Tk, record_id: int, config: Config):
|
||||
super().__init__(parent, root)
|
||||
self.bind("<Return>", self._update)
|
||||
|
||||
self.model = JSONConnector(config)
|
||||
|
||||
record = self.model.get_by_id(record_id)
|
||||
|
||||
button_width = 8
|
||||
self.title("Adresse bearbeiten")
|
||||
self.record_id = tk.IntVar(value=record_id)
|
||||
self.aktiv = tk.StringVar(value=record.get("aktiv"))
|
||||
self.firma = tk.StringVar(value=record.get("firma"))
|
||||
self.name = tk.StringVar(value=record.get("name"))
|
||||
self.strasse = tk.StringVar(value=record.get("strasse"))
|
||||
self.plz_ort = tk.StringVar(value=record.get("plzort"))
|
||||
self.anzahl = tk.StringVar(value=record.get("anzahl"))
|
||||
|
||||
edit_frame = tk.Frame(self)
|
||||
edit_frame.pack(side=tk.TOP, fill=tk.X, pady=20, padx=20)
|
||||
tk.Label(edit_frame, text="Aktiv", anchor=tk.W).grid(row=0, column=0)
|
||||
tk.Label(edit_frame, text="Firma").grid(row=0, column=1)
|
||||
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="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.grid(row=1, column=0)
|
||||
edit_firma = tk.Entry(edit_frame, textvariable=self.firma)
|
||||
edit_firma.grid(row=1, column=1)
|
||||
edit_name = tk.Entry(edit_frame, textvariable=self.name)
|
||||
edit_name.grid(row=1, column=2)
|
||||
edit_strasse = tk.Entry(edit_frame, textvariable=self.strasse)
|
||||
edit_strasse.grid(row=1, column=3)
|
||||
edit_plz_ort = tk.Entry(edit_frame, textvariable=self.plz_ort)
|
||||
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.pack(side=tk.TOP, pady=10)
|
||||
tk.Button(button_frame, text="Save", command=self._update, 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):
|
||||
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()
|
||||
|
||||
|
||||
class SettingsWindow(Window):
|
||||
def __init__(self, parent, root: tk.Tk, config: Config):
|
||||
super().__init__(parent, root)
|
||||
self.geometry(f"500x330+{self.root.winfo_x() + 20}+{self.root.winfo_y() + 20}")
|
||||
self.config = config
|
||||
self.json_file = tk.StringVar()
|
||||
self.csv_file = tk.StringVar()
|
||||
|
||||
title = font.Font(family='Ubuntu Mono', size=20, weight=font.BOLD)
|
||||
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.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,
|
||||
column=1)
|
||||
|
||||
tk.Label(path_frame, text="Datenpfad CSV Export Datei").grid(row=2, 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)
|
||||
|
||||
bottom_frame = tk.Frame(self)
|
||||
bottom_frame.pack()
|
||||
tk.Button(bottom_frame, text="Ok", command=self.ok).pack(side=tk.LEFT)
|
||||
tk.Button(bottom_frame, text="Abbrechen", command=self.cancel).pack(side=tk.LEFT)
|
||||
|
||||
self.load_config()
|
||||
|
||||
def set_json_path(self, initial_dir: str = ""):
|
||||
initial_dir = "~/" if initial_dir == "" else initial_dir
|
||||
new_path = filedialog.askdirectory(initialdir=initial_dir, title="Datenpfad JSON Datei")
|
||||
new_path = initial_dir if len(new_path) == 0 else new_path
|
||||
self.json_file.set(new_path)
|
||||
|
||||
def set_csv_path(self, initial_dir: str = ""):
|
||||
initial_dir = "~/" if initial_dir == "" else initial_dir
|
||||
new_path = filedialog.askdirectory(initialdir=initial_dir, title="Datenpfad CSV Datei")
|
||||
new_path = initial_dir if len(new_path) == 0 else new_path
|
||||
self.csv_file.set(new_path)
|
||||
|
||||
def load_config(self):
|
||||
try:
|
||||
self.json_file.set(self.config.get("json", "path"))
|
||||
except NoSectionError:
|
||||
self.config.add_section("json")
|
||||
self.config.set("json", "path", "")
|
||||
except NoOptionError:
|
||||
self.config.set("json", "path", "")
|
||||
|
||||
try:
|
||||
self.csv_file.set(self.config.get("csv", "path"))
|
||||
except NoSectionError:
|
||||
self.config.add_section("csv")
|
||||
self.config.set("csv", "path", "")
|
||||
except NoOptionError:
|
||||
self.config.set("csv", "path", "")
|
||||
|
||||
def ok(self):
|
||||
if self.json_file.get() == "" or self.csv_file.get() == "":
|
||||
show_error(message_title="Fehlerhafte Konfiguration",
|
||||
message="Pfad für JSON oder CSV Datei fehlt",
|
||||
parent=self)
|
||||
return
|
||||
self.config.set("json", "path", self.json_file.get())
|
||||
self.config.set("csv", "path", self.csv_file.get())
|
||||
self.close_window()
|
||||
|
||||
def cancel(self):
|
||||
self.close_window()
|
||||
1
version.txt
Normal file
1
version.txt
Normal file
@@ -0,0 +1 @@
|
||||
0.2.0b
|
||||
Reference in New Issue
Block a user