Compare commits
2 Commits
beta-0.1.1
...
b61c52972d
| Author | SHA1 | Date | |
|---|---|---|---|
| b61c52972d | |||
| c80a587cbd |
@@ -8,6 +8,7 @@ from tkinter import ttk
|
|||||||
|
|
||||||
from config import Config
|
from config import Config
|
||||||
from model import Model
|
from model import Model
|
||||||
|
from src.connector import JSONConnector
|
||||||
from windows import SettingsWindow, EditRecord, show_error
|
from windows import SettingsWindow, EditRecord, show_error
|
||||||
|
|
||||||
|
|
||||||
@@ -36,7 +37,7 @@ class Application:
|
|||||||
self.filter_active = tk.BooleanVar(value=False)
|
self.filter_active = tk.BooleanVar(value=False)
|
||||||
|
|
||||||
# model connector
|
# model connector
|
||||||
self.model = Model(self.config)
|
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"
|
||||||
@@ -79,7 +80,7 @@ class Application:
|
|||||||
|
|
||||||
# table content
|
# table content
|
||||||
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")
|
||||||
@@ -88,6 +89,7 @@ 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)
|
||||||
|
|
||||||
@@ -138,7 +140,8 @@ class Application:
|
|||||||
"firma": "Firma",
|
"firma": "Firma",
|
||||||
"name": "Name",
|
"name": "Name",
|
||||||
"strasse": "Strasse",
|
"strasse": "Strasse",
|
||||||
"plzort": "Plz/Ort"
|
"plzort": "Plz/Ort",
|
||||||
|
"anzahl": "Anzahl"
|
||||||
}
|
}
|
||||||
self.model.create_new(values)
|
self.model.create_new(values)
|
||||||
self.populate_table()
|
self.populate_table()
|
||||||
@@ -227,6 +230,8 @@ class Application:
|
|||||||
field = "strasse"
|
field = "strasse"
|
||||||
case "#5":
|
case "#5":
|
||||||
field = "plzort"
|
field = "plzort"
|
||||||
|
case "#6":
|
||||||
|
field = "anzahl"
|
||||||
case _:
|
case _:
|
||||||
field = "name"
|
field = "name"
|
||||||
|
|
||||||
@@ -247,6 +252,7 @@ class Application:
|
|||||||
for address in self.address_list:
|
for address in self.address_list:
|
||||||
if address["aktiv"] != "x":
|
if address["aktiv"] != "x":
|
||||||
continue
|
continue
|
||||||
|
for index in range(int(address["anzahl"])):
|
||||||
line = []
|
line = []
|
||||||
if address["firma"] != "":
|
if address["firma"] != "":
|
||||||
line.append(address["firma"])
|
line.append(address["firma"])
|
||||||
@@ -254,6 +260,13 @@ class Application:
|
|||||||
line.append(address["strasse"])
|
line.append(address["strasse"])
|
||||||
line.append(address["plzort"])
|
line.append(address["plzort"])
|
||||||
writer.writerow(line)
|
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:
|
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}",
|
||||||
@@ -273,7 +286,7 @@ class Application:
|
|||||||
continue
|
continue
|
||||||
self.table.insert('', 'end', iid=address["record_id"],
|
self.table.insert('', 'end', iid=address["record_id"],
|
||||||
values=(address["aktiv"], address["firma"], address["name"], address["strasse"],
|
values=(address["aktiv"], address["firma"], address["name"], address["strasse"],
|
||||||
address["plzort"])
|
address["plzort"], address["anzahl"])
|
||||||
)
|
)
|
||||||
self.update_status_bar()
|
self.update_status_bar()
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,9 @@
|
|||||||
from config import Config
|
from src.connector import Connector
|
||||||
from connector import JSONConnector
|
|
||||||
|
|
||||||
|
|
||||||
class Model:
|
class Model:
|
||||||
def __init__(self, config: Config):
|
def __init__(self, connector: Connector):
|
||||||
self.connector = JSONConnector(config)
|
self.connector = connector
|
||||||
self.config = config
|
|
||||||
|
|
||||||
def get_all(self):
|
def get_all(self):
|
||||||
return self.connector.get_all()
|
return self.connector.get_all()
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ class EditRecord(Window):
|
|||||||
self.name = tk.StringVar(value=record.get("name"))
|
self.name = tk.StringVar(value=record.get("name"))
|
||||||
self.strasse = tk.StringVar(value=record.get("strasse"))
|
self.strasse = tk.StringVar(value=record.get("strasse"))
|
||||||
self.plz_ort = tk.StringVar(value=record.get("plzort"))
|
self.plz_ort = tk.StringVar(value=record.get("plzort"))
|
||||||
|
self.anzahl = tk.StringVar(value=record.get("anzahl"))
|
||||||
|
|
||||||
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)
|
||||||
@@ -56,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)
|
||||||
@@ -66,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)
|
||||||
@@ -80,6 +84,7 @@ class EditRecord(Window):
|
|||||||
"name": self.name.get(),
|
"name": self.name.get(),
|
||||||
"strasse": self.strasse.get(),
|
"strasse": self.strasse.get(),
|
||||||
"plzort": self.plz_ort.get(),
|
"plzort": self.plz_ort.get(),
|
||||||
|
"anzahl": self.anzahl.get(),
|
||||||
}
|
}
|
||||||
self.model.update_record(new_record)
|
self.model.update_record(new_record)
|
||||||
self.close_window()
|
self.close_window()
|
||||||
|
|||||||
Reference in New Issue
Block a user