Unter dem Punkt Optionen ist ein neuer Button dazugekommen, womit man die Ausgewählte Zeile nachträglich bearbeiten kann
This commit is contained in:
@@ -2,8 +2,8 @@
|
|||||||
{
|
{
|
||||||
"nummer": "SB18-2T-051",
|
"nummer": "SB18-2T-051",
|
||||||
"bearbeitungsnummer": "A-1078",
|
"bearbeitungsnummer": "A-1078",
|
||||||
"start": "2025-08-18T17:18:35.298192",
|
"start": "2025-08-18T16:18:35.000000",
|
||||||
"stopp": "2025-08-18T17:18:45.208586",
|
"stopp": "2025-08-18T17:18:45.000000",
|
||||||
"kommentar": "Inbetriebnahme"
|
"kommentar": "Inbetriebnahme"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -262,6 +262,7 @@ class ZeitErfassungApp:
|
|||||||
darstellung_menu = tk.Menu(optionen_menu, tearoff=0)
|
darstellung_menu = tk.Menu(optionen_menu, tearoff=0)
|
||||||
|
|
||||||
optionen_menu.add_command(label="Bearbeitungs-Excel festlegen…", command=self._set_excel_path)
|
optionen_menu.add_command(label="Bearbeitungs-Excel festlegen…", command=self._set_excel_path)
|
||||||
|
optionen_menu.add_command(label="Ausgewählten Eintrag bearbeiten…", command=self._open_edit_dialog)
|
||||||
menubar.add_cascade(label="Optionen", menu=optionen_menu)
|
menubar.add_cascade(label="Optionen", menu=optionen_menu)
|
||||||
|
|
||||||
# Bearbeiten
|
# Bearbeiten
|
||||||
@@ -522,3 +523,154 @@ class ZeitErfassungApp:
|
|||||||
bg=self.bg_color, fg=self.fg_color, selectcolor="#FFFFFF"
|
bg=self.bg_color, fg=self.fg_color, selectcolor="#FFFFFF"
|
||||||
).pack()
|
).pack()
|
||||||
ttk.Button(theme_window, text="Anwenden", command=apply_theme).pack(pady=12)
|
ttk.Button(theme_window, text="Anwenden", command=apply_theme).pack(pady=12)
|
||||||
|
|
||||||
|
def _get_selected_index(self) -> int | None:
|
||||||
|
"""Index der ausgewählten Zeile im Treeview, oder None."""
|
||||||
|
if hasattr(self, "tree"):
|
||||||
|
sel = self.tree.selection()
|
||||||
|
if not sel:
|
||||||
|
return None
|
||||||
|
return int(sel[0]) # iid = Index
|
||||||
|
# Fallback, falls noch Listbox verwendet wird
|
||||||
|
if hasattr(self, "listbox"):
|
||||||
|
sel = self.listbox.curselection()
|
||||||
|
if not sel:
|
||||||
|
return None
|
||||||
|
return int(sel[0])
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _fmt_dt(self, dt: datetime | None) -> str:
|
||||||
|
return dt.strftime(DATUM_FORMAT) if dt else ""
|
||||||
|
|
||||||
|
def _parse_dt(self, s: str) -> datetime | None:
|
||||||
|
s = (s or "").strip()
|
||||||
|
if not s:
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
return datetime.strptime(s, DATUM_FORMAT)
|
||||||
|
except Exception:
|
||||||
|
# Toleranter: ISO versuchen
|
||||||
|
try:
|
||||||
|
return datetime.fromisoformat(s)
|
||||||
|
except Exception:
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _open_edit_dialog(self):
|
||||||
|
idx = self._get_selected_index()
|
||||||
|
if idx is None:
|
||||||
|
messagebox.showwarning("Hinweis", "Bitte zuerst einen Vorgang auswählen.")
|
||||||
|
return
|
||||||
|
|
||||||
|
v = self.vorgaenge[idx]
|
||||||
|
|
||||||
|
dlg = tk.Toplevel(self.root)
|
||||||
|
dlg.title("Eintrag bearbeiten")
|
||||||
|
dlg.transient(self.root)
|
||||||
|
dlg.grab_set()
|
||||||
|
dlg.resizable(False, False)
|
||||||
|
|
||||||
|
# Grid-Layout
|
||||||
|
frm = tk.Frame(dlg, bg=self.bg_color)
|
||||||
|
frm.pack(fill="both", expand=True, padx=12, pady=12)
|
||||||
|
for i in range(2):
|
||||||
|
frm.grid_columnconfigure(i, weight=1)
|
||||||
|
|
||||||
|
# Felder
|
||||||
|
tk.Label(frm, text="Maschinennummer", bg=self.bg_color, fg=self.fg_color).grid(row=0, column=0, sticky="w", pady=(0,4))
|
||||||
|
e_nummer = ttk.Entry(frm)
|
||||||
|
e_nummer.grid(row=0, column=1, sticky="ew", pady=(0,4))
|
||||||
|
e_nummer.insert(0, v.get("nummer",""))
|
||||||
|
|
||||||
|
tk.Label(frm, text="Bearbeitungsnummer (auto)", bg=self.bg_color, fg=self.fg_color).grid(row=1, column=0, sticky="w", pady=(0,4))
|
||||||
|
e_bearb = ttk.Entry(frm, state="readonly")
|
||||||
|
e_bearb.grid(row=1, column=1, sticky="ew", pady=(0,4))
|
||||||
|
# Anfangswert anzeigen
|
||||||
|
bearb_var = tk.StringVar(value=v.get("bearbeitungsnummer",""))
|
||||||
|
e_bearb.configure(textvariable=bearb_var)
|
||||||
|
|
||||||
|
tk.Label(frm, text=f"Start ({DATUM_FORMAT})", bg=self.bg_color, fg=self.fg_color).grid(row=2, column=0, sticky="w", pady=(0,4))
|
||||||
|
e_start = ttk.Entry(frm)
|
||||||
|
e_start.grid(row=2, column=1, sticky="ew", pady=(0,4))
|
||||||
|
e_start.insert(0, self._fmt_dt(v.get("start")))
|
||||||
|
|
||||||
|
tk.Label(frm, text=f"Stopp ({DATUM_FORMAT})", bg=self.bg_color, fg=self.fg_color).grid(row=3, column=0, sticky="w", pady=(0,4))
|
||||||
|
e_stopp = ttk.Entry(frm)
|
||||||
|
e_stopp.grid(row=3, column=1, sticky="ew", pady=(0,4))
|
||||||
|
e_stopp.insert(0, self._fmt_dt(v.get("stopp")))
|
||||||
|
|
||||||
|
tk.Label(frm, text="Kommentar", bg=self.bg_color, fg=self.fg_color).grid(row=4, column=0, sticky="nw", pady=(0,4))
|
||||||
|
txt_komm = tk.Text(frm, height=4, wrap="word")
|
||||||
|
txt_komm.grid(row=4, column=1, sticky="ew", pady=(0,4))
|
||||||
|
txt_komm.insert("1.0", v.get("kommentar",""))
|
||||||
|
|
||||||
|
# Live: Wenn Maschinennummer geändert → INTEGRA neu suchen und Bearb.-Nr. aktualisieren
|
||||||
|
def _on_nummer_change(*_):
|
||||||
|
nummer = e_nummer.get().strip()
|
||||||
|
if not nummer:
|
||||||
|
bearb_var.set("")
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
bearb_num, fehler = finde_integra_nummern(nummer)
|
||||||
|
if fehler:
|
||||||
|
# wir zeigen den Fehler nicht als Popup, nur Feld leeren
|
||||||
|
bearb_var.set("")
|
||||||
|
else:
|
||||||
|
bearb_var.set(bearb_num or "")
|
||||||
|
except Exception:
|
||||||
|
bearb_var.set("")
|
||||||
|
|
||||||
|
e_nummer.bind("<FocusOut>", lambda e: _on_nummer_change())
|
||||||
|
e_nummer.bind("<KeyRelease>", lambda e: (_on_nummer_change() if e.keysym not in ("Shift","Control","Alt") else None))
|
||||||
|
|
||||||
|
# Buttons (mit deinem schwarzen Rahmen)
|
||||||
|
btns = tk.Frame(frm, bg=self.bg_color)
|
||||||
|
btns.grid(row=5, column=0, columnspan=2, sticky="e", pady=(8,0))
|
||||||
|
|
||||||
|
def _save_and_close():
|
||||||
|
nummer = e_nummer.get().strip()
|
||||||
|
if not nummer:
|
||||||
|
messagebox.showerror("Fehler", "Maschinennummer darf nicht leer sein.")
|
||||||
|
return
|
||||||
|
|
||||||
|
start_dt = self._parse_dt(e_start.get())
|
||||||
|
if not start_dt:
|
||||||
|
messagebox.showerror("Fehler", f"Start muss im Format {DATUM_FORMAT} vorliegen.")
|
||||||
|
return
|
||||||
|
|
||||||
|
stopp_dt = self._parse_dt(e_stopp.get())
|
||||||
|
if e_stopp.get().strip() and not stopp_dt:
|
||||||
|
messagebox.showerror("Fehler", f"Stopp muss im Format {DATUM_FORMAT} vorliegen (oder leer lassen).")
|
||||||
|
return
|
||||||
|
if stopp_dt and stopp_dt < start_dt:
|
||||||
|
messagebox.showerror("Fehler", "Stopp darf nicht vor Start liegen.")
|
||||||
|
return
|
||||||
|
|
||||||
|
kommentar = txt_komm.get("1.0","end").strip()
|
||||||
|
# Bearbeitungsnummer nicht direkt editierbar, aber automatisch gesetzt:
|
||||||
|
v["nummer"] = nummer
|
||||||
|
v["start"] = start_dt
|
||||||
|
v["stopp"] = stopp_dt
|
||||||
|
v["kommentar"] = kommentar
|
||||||
|
v["bearbeitungsnummer"] = bearb_var.get().strip() # auto
|
||||||
|
|
||||||
|
speichere_daten(self.vorgaenge)
|
||||||
|
self.aktualisiere_liste()
|
||||||
|
dlg.destroy()
|
||||||
|
|
||||||
|
def _cancel():
|
||||||
|
dlg.destroy()
|
||||||
|
|
||||||
|
w1 = tk.Frame(btns, highlightthickness=3, highlightbackground="black", bd=0); w1.pack(side="right", padx=4)
|
||||||
|
ttk.Button(w1, text="Speichern", command=_save_and_close).pack()
|
||||||
|
|
||||||
|
w2 = tk.Frame(btns, highlightthickness=3, highlightbackground="black", bd=0); w2.pack(side="right", padx=4)
|
||||||
|
ttk.Button(w2, text="Abbrechen", command=_cancel).pack()
|
||||||
|
|
||||||
|
# Dialog mittig platzieren
|
||||||
|
dlg.update_idletasks()
|
||||||
|
rx, ry = self.root.winfo_rootx(), self.root.winfo_rooty()
|
||||||
|
rw, rh = self.root.winfo_width(), self.root.winfo_height()
|
||||||
|
dw, dh = dlg.winfo_width(), dlg.winfo_height()
|
||||||
|
dlg.geometry(f"+{rx + (rw - dw)//2}+{ry + (rh - dh)//2}")
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user