From 0e18bed48d10416a22a30eef2c8e9eb69b2c3aa0 Mon Sep 17 00:00:00 2001 From: Alexander Malzkuhn Date: Wed, 9 Apr 2025 17:37:06 +0200 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20GUI-Tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __pycache__/ui.cpython-311.pyc | Bin 2829 -> 2747 bytes __pycache__/users.cpython-311.pyc | Bin 2582 -> 2585 bytes ui.py | 13 ++++++------- users.py | 5 +++-- users/testuser/2025-4.txt | 2 ++ users/testuser2/2025-4.txt | 6 ++++++ zeiterfassung.py | 2 +- 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/__pycache__/ui.cpython-311.pyc b/__pycache__/ui.cpython-311.pyc index db35bf96df21e27081c68ff5e716cd122d0402b4..a47c84f43fadad122e5f070d6773a548a1e87405 100644 GIT binary patch delta 1090 zcmZ`&&uqCMO4AD;ve9I*2q=SaDfAdAR*<%ffH}mq*aS}+WF?adGF19@6GHl zd!J5t4?S-TfqWDnS~I_TmBu+R?jnjPj?lcCwFuWWnDq$9dR@nAjet(-B-f3|h|Rhg zTXie9&B%_Ox&yj(6V=D44OpPsS>!ug>ZB(R{=@|n6lN>1M5v|4B&eQvqus}Uh+F#m zX=+e&(^}UMdIV!681?a*Bj$|p>*yzXW^9{4Knq0*zwUnyNd6O;&@>hil9b2=f|e{WX)6D_95z0Z*$lG zxhIo55#JzMq@^z-z`slFP(*zV>ML*VUf1DNT|74?aZz~=qCWXA6X=OX&1Dav747E@ z=ub(-i6iC@CB@dq(p(C{)>Xb`h^~3&uqx2kB)-fhKuZ<(nHjbhrjK?lYQ&dmnd&(! zC~y@3J;X{1$^cRemLN}Ooh4~DJ5euAq?z)t*}mqNrN-M*n{P{lhg@*$==^S#QXIuK zJIR%>)nkElA^Ts;Jk{g8lQ2u2kv}U%T9OtEsWcniZjexE$Bi(FI-Ra>h!57mBRFJx zASyKgW|ZW8kglpe}zjg8#%^Q4!7~!^7wC+)#Don9-n;XW*07I-}BF3xi={H zhUK34*11%2H|8Gm+l7H$8``zZu8DijF*9$tE8aQPKs{Qfh)b7;agg#x+zpc!%l|9Y z1!?rsfTg2ms9Vn~`F(V2I~N{zXfFy*uv6ey&n3MBu&rZ^w@rkn#mX43PGO+_CFHmN E32it6w*UYD delta 1208 zcmZWoO=u)V6n@oz)AQ4l?Tnkr?CfG>nPtaAL>3pxEh7Vs z$H@*oP7Vv^pogUe_ZSeeyKV%%DSGpww;72j4GSK;QJspvkv=A0#~u0C(LUPuab_}GTA#NBF{slJz6e-NTSmN17Ik<|6N4(Oc58$+6$x*uV~js zg88PDkT#z|Ef5!+o8whn{?xBB%WYF@ad0LGZMSPPZ~iLt*DMw+qLTR<;w$kgJMhD1 zZ~RVweB<58=IC&9v;$la)|3+^w6{b4BpOL>&39ePqg)WrOK=GhF9%%I!c76w2npFf zQgOwbDeDeniPE*`jU(}L&FT1hZs|2~WK!xo-nzfKVLP3TFp(V(f!SW7E%n0C_qdKh zS(`l}!ZFF(R-#$muI$O6@d9mYa)C3q;q> zWs)+)7esymg0G+(U)JrdpUm2i=7sOg3lsC=p?Ps<`B;PU%rWHE*%WrkgX)>v3!ln& zU%qD?7?b*QUr3Ys!lZiTuzF>;^uVlqSiAlF-KRc#b-c1V?re;gN7*y6mUU#_RLmy>dTd!9M%d8^Z(w|Wkj@sjZ;`LiRzEXQU= z0z=2OgV1uj_;2#`uN0gmYA>*PkWnW(BrWn@_Mj)t;rg`4>_vVJ{o-MQI|#=zAp|QX bPmiJb@c0>O<9|kcsld)w3DWU6q%HF|QM(p> diff --git a/__pycache__/users.cpython-311.pyc b/__pycache__/users.cpython-311.pyc index 1c084e8a608481a80a84e1a8ad93fe54c022e51b..62d96c4592bf7392a564d7b311cf7a02e8b24d36 100644 GIT binary patch delta 714 zcmYk3&5P4e5WwHdN7G~z`(gcPS8QDrjI0z7dQgy6_9DuPhzIqslqOvxZCWSK%Tn1r zh`Q>fJn;h*Pr3*3AYQ!sA6TgvBWRLGfp=%|1``u@jCow>@_D9y*qD?tVQ$)e zBu}sKk~8)SPb!{DK4D7LI5Dd&01^96(Piam&DDWO#X2;?B|lbi&{*$55DJ)ls=GO!+liE7Pbz+a^>}l*Dt7 z+-4q}r+~|Wc)LdO&aeyZc*^rzK^Taj8%D{13A*IRX^a2b%3J2ioXQJ7*+g0Lvw2LT G=KlZ}t(uGg delta 681 zcmZWm&ubG=5PtJEo84^KCbo+p}=mYz6u}czlZu_iHw6z#SIw)@}io0gAfCZ{Ot7!j#nN ziA04$23)%2n~#!6CJ9ITzAvW;awuda!{rPD)IC{3^=p%9#|WUjd(rp=mWR-9Xz0JW z%d@GIbfoC3ep@|A9m?&l_rgf(Yv!r^90tmhT9|Y5S%c{?QjuH}akSDEy(n(4MREaS zrt}+g?_3$J4!()lXc_o^aA3HxLOm8`44>B;xv|UG0L`};@O~2Xm?>KPP(rQ>`g6W< zsW?U$Q$)m}Y(QxIUn9&Brd)m6x_;Me$>ZorqU;;B8SthbSQ%Avo_=bmQd73$)hIP^ zztrqY5i40iJm9HK^bp4>h>Un2iPs;k6AKiOB&aso*HY#6;&%O2{oTx{TK_N@Rj-Un z&An1nf3faCSzoYs^0b$<^}g*_@?;Wo*$EHEpjmu9TR6K+9|1@@7!I1HRnbn1Vbm3| kP+~n!4(6vb$U3QPlOtvIR^dj8!?EvdqHLWOuI8xtKVy!JYXATM diff --git a/ui.py b/ui.py index 18ce463..cccb30f 100644 --- a/ui.py +++ b/ui.py @@ -1,7 +1,5 @@ # Zeiterfassung # UI -from wx.lib.agw.aui import aero_up_single - from definitions import * import tkinter as tk @@ -20,7 +18,7 @@ def ui_stempeln(button, label): else: buttons[button].configure(relief="sunken", bg="green") -def stempeln(userlist): +def win_stempeln(userlist): stempeln = tk.Tk() stempeln.title(program_name + " " + program_version) stempeln.geometry("600x400") @@ -29,17 +27,18 @@ def stempeln(userlist): global buttons buttons = [ ] button_index = 0 - windowSize = stempeln.winfo_height() + stempeln.columnconfigure(0, weight=1) + stempeln.rowconfigure(0, weight=1) for i in userlist: - buttonheight = int(windowSize / len(userlist) - 10) - button = tk.Button(stempeln, text=i, height=buttonheight, command=lambda b=button_index, label=i: ui_stempeln(b, label)) + + button = tk.Button(stempeln, text=i, height=5, command=lambda b=button_index, label=i: ui_stempeln(b, label)) if len_timestamps(determine_filename(i)) % 2 == 0: button.configure(relief="raised", bg ="red") else: button.configure(relief="sunken", bg="green") - button.pack(fill="x", pady=5) + button.grid(row=button_index, column=0, sticky="ew") buttons.append(button) button_index+=1 diff --git a/users.py b/users.py index 0aedf62..1326ece 100644 --- a/users.py +++ b/users.py @@ -7,7 +7,8 @@ import datetime from definitions import * # Benutzer anhand Verzeichnisse auflisten -def list_users(directory): +def list_users(): + directory = scriptpath() + "/" + userfolder users = [d for d in os.listdir(directory) if os.path.isdir(os.path.join(directory, d))] return users @@ -23,7 +24,7 @@ def determine_filename(user, type="stamping"): # Benutzerliste anzeigen def printUserList(): - userlist = list_users(scriptpath() + "/" + userfolder) + userlist = list_users() for i in range(0, len(userlist)): print(str(i + 1) + ": " + str(userlist[i])) return(userlist) diff --git a/users/testuser/2025-4.txt b/users/testuser/2025-4.txt index 0f2a1af..c96cedb 100644 --- a/users/testuser/2025-4.txt +++ b/users/testuser/2025-4.txt @@ -72,3 +72,5 @@ 1744198071 1744198392 1744198393 +1744210902 +1744210904 diff --git a/users/testuser2/2025-4.txt b/users/testuser2/2025-4.txt index e1a06f5..c1403e5 100644 --- a/users/testuser2/2025-4.txt +++ b/users/testuser2/2025-4.txt @@ -18,3 +18,9 @@ 1744197306 1744197767 1744197768 +1744210910 +1744210912 +1744210913 +1744210914 +1744211937 +1744211939 diff --git a/zeiterfassung.py b/zeiterfassung.py index 1d25594..2cbcd9d 100644 --- a/zeiterfassung.py +++ b/zeiterfassung.py @@ -15,7 +15,7 @@ from ui import * def main(): userList = printUserList() - stempeln(userList) + win_stempeln(userList) exit() # Konsole