diff --git a/favicon_original.svg b/favicon_original.svg deleted file mode 100644 index ecbb5e4..0000000 --- a/favicon_original.svg +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - Openclipart - - - - - - - - - - - diff --git a/lib/users.py b/lib/users.py index a556904..410a509 100644 --- a/lib/users.py +++ b/lib/users.py @@ -28,12 +28,9 @@ class user: self.photofile = os.path.join(self.userfolder, photofilename) # Stammdaten einlesen - #try: + with open(self.settingsfile) as json_file: data = json.load(json_file) - #except: - # print("Fehler beim Erstellen des Datenarrays.") - # #TODO Hier muss noch Fehlerbehandlungcode hin self.password = data["password"] self.workhours = data["workhours"] diff --git a/no-photo-svgrepo-com.svg b/no-photo-svgrepo-com.svg deleted file mode 100644 index 6c2d79d..0000000 --- a/no-photo-svgrepo-com.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/settings.json b/settings.json deleted file mode 100644 index 72a00b8..0000000 --- a/settings.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "admin_user": "admin", - "admin_password": "8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918", - "port": "8090", - "secret": "ftgzuhjikg,mt5jn46uzer8sfi9okrmtzjhndfierko5zltjhdgise", - "touchscreen": true, - "times_on_touchscreen": true, - "photos_on_touchscreen": true, - "picture_height": "200", - "button_height": "300", - "user_notes": true, - "vacation_application": true, - "backup_folder": "/home/alexander/Dokumente/Python/Zeiterfassung/backup", - "backup_api_key": "6fed93dc4a35308b2c073a8a6f3284afe1fb9946", - "holidays": { - "2025-01-01": "Neujahr", - "2025-04-18": "Karfreitag", - "2025-04-21": "Ostermontag", - "2025-05-01": "Tag der Arbeit", - "2025-05-29": "Christi Himmelfahrt", - "2025-06-08": "Pfingstmontag", - "2025-10-03": "Tag der deutschen Einheit", - "2025-10-30": "Reformationstag", - "2025-12-25": "1. Weihnachtsfeiertag", - "2025-12-26": "2. Weihnachtsfeiertag", - "2026-01-01": "Neujahr", - "2026-04-03": "Karfreitag", - "2026-04-06": "Ostermontag", - "2026-05-01": "Tag der Arbeit", - "2026-05-14": "Christi Himmelfahrt", - "2026-05-24": "Pfingstmontag", - "2026-10-03": "Tag der deutschen Einheit", - "2026-10-30": "Reformationstag", - "2026-12-25": "1. Weihnachtsfeiertag", - "2026-12-26": "2. Weihnachtsfeiertag", - "2027-01-01": "Neujahr", - "2027-03-26": "Karfreitag", - "2027-03-29": "Ostermontag", - "2027-05-01": "Tag der Arbeit", - "2027-05-06": "Christi Himmelfahrt", - "2027-05-16": "Pfingstmontag", - "2027-10-03": "Tag der deutschen Einheit", - "2027-10-30": "Reformationstag", - "2027-12-25": "1. Weihnachtsfeiertag", - "2027-12-26": "2. Weihnachtsfeiertag", - "2028-01-01": "Neujahr", - "2028-04-14": "Karfreitag", - "2028-04-17": "Ostermontag", - "2028-05-01": "Tag der Arbeit", - "2028-05-25": "Christi Himmelfahrt", - "2028-06-04": "Pfingstmontag", - "2028-10-03": "Tag der deutschen Einheit", - "2028-10-30": "Reformationstag", - "2028-12-25": "1. Weihnachtsfeiertag", - "2028-12-26": "2. Weihnachtsfeiertag", - "2029-01-01": "Neujahr", - "2029-03-30": "Karfreitag", - "2029-04-02": "Ostermontag", - "2029-05-01": "Tag der Arbeit", - "2029-05-10": "Christi Himmelfahrt", - "2029-05-20": "Pfingstmontag", - "2029-10-03": "Tag der deutschen Einheit", - "2029-10-30": "Reformationstag", - "2029-12-25": "1. Weihnachtsfeiertag", - "2029-12-26": "2. Weihnachtsfeiertag", - "2030-01-01": "Neujahr", - "2030-04-19": "Karfreitag", - "2030-04-22": "Ostermontag", - "2030-05-01": "Tage der Arbeit", - "2030-05-30": "Christi Himmelfahrt", - "2030-06-09": "Pfingstmontag", - "2030-10-03": "Tag der deutschen Einheit", - "2030-10-30": "Reformationstag", - "2030-12-25": "1. Weihnachtsfeiertag", - "2030-12-26": "2. Weihnachtsfeiertag", - "2025-06-11": "Testeintrag", - "2025-05-31": "Testeintrag" - } -} \ No newline at end of file diff --git a/users/testuser1/2024-11.txt b/users/testuser1/2024-11.txt deleted file mode 100644 index f25130e..0000000 --- a/users/testuser1/2024-11.txt +++ /dev/null @@ -1,28 +0,0 @@ -1743965819 -1743965909 -1743966022 -1743966045 -1743966047 -1743966049 -1743967346 -1744889948 -1744889966 -1744989797 -1744989827 -1744989830 -1744989883 -1744989909 -1744989914 -1744989916 -1744991169 -1744991171 -1744991288 -1744991291 -1744991473 -1744991477 -1744991770 -1744991777 -1745181046 -1745181050 -1745240760 -1745240762 diff --git a/users/testuser1/2024-12.txt b/users/testuser1/2024-12.txt deleted file mode 100644 index f25130e..0000000 --- a/users/testuser1/2024-12.txt +++ /dev/null @@ -1,28 +0,0 @@ -1743965819 -1743965909 -1743966022 -1743966045 -1743966047 -1743966049 -1743967346 -1744889948 -1744889966 -1744989797 -1744989827 -1744989830 -1744989883 -1744989909 -1744989914 -1744989916 -1744991169 -1744991171 -1744991288 -1744991291 -1744991473 -1744991477 -1744991770 -1744991777 -1745181046 -1745181050 -1745240760 -1745240762 diff --git a/users/testuser1/2025-11.json b/users/testuser1/2025-11.json deleted file mode 100644 index b951d02..0000000 --- a/users/testuser1/2025-11.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "archived": 0, - "overtime": 0, - "absence": {} -} \ No newline at end of file diff --git a/users/testuser1/2025-12.json b/users/testuser1/2025-12.json deleted file mode 100644 index bae53bc..0000000 --- a/users/testuser1/2025-12.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "archived": 0, - "overtime": 0, - "absence": { - "1": "EZ", - "2": "EZ", - "3": "EZ", - "4": "EZ", - "5": "EZ", - "8": "EZ", - "9": "EZ", - "10": "EZ", - "11": "EZ", - "12": "EZ", - "15": "EZ", - "16": "EZ", - "17": "EZ", - "18": "EZ", - "19": "EZ", - "22": "EZ", - "23": "EZ", - "24": "EZ", - "25": "EZ", - "26": "EZ", - "29": "EZ", - "30": "EZ", - "31": "EZ" - } -} \ No newline at end of file diff --git a/users/testuser1/2025-2.txt b/users/testuser1/2025-2.txt deleted file mode 100644 index f25130e..0000000 --- a/users/testuser1/2025-2.txt +++ /dev/null @@ -1,28 +0,0 @@ -1743965819 -1743965909 -1743966022 -1743966045 -1743966047 -1743966049 -1743967346 -1744889948 -1744889966 -1744989797 -1744989827 -1744989830 -1744989883 -1744989909 -1744989914 -1744989916 -1744991169 -1744991171 -1744991288 -1744991291 -1744991473 -1744991477 -1744991770 -1744991777 -1745181046 -1745181050 -1745240760 -1745240762 diff --git a/users/testuser1/2025-3.json b/users/testuser1/2025-3.json deleted file mode 100755 index d438ef3..0000000 --- a/users/testuser1/2025-3.json +++ /dev/null @@ -1 +0,0 @@ -{"archived": 0, "overtime": -528928} \ No newline at end of file diff --git a/users/testuser1/2025-3.txt b/users/testuser1/2025-3.txt deleted file mode 100755 index da7ed21..0000000 --- a/users/testuser1/2025-3.txt +++ /dev/null @@ -1,4 +0,0 @@ -1740996000 -1742460540 -1741038540 -1742464500 diff --git a/users/testuser1/2025-4.json b/users/testuser1/2025-4.json deleted file mode 100644 index f5daf68..0000000 --- a/users/testuser1/2025-4.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "archived": 1, - "overtime": -348226, - "absence": { - "7": "U", - "8": "K", - "9": "KK", - "10": "UU", - "11": "F", - "14": "EZ" - } -} \ No newline at end of file diff --git a/users/testuser1/2025-4.txt b/users/testuser1/2025-4.txt deleted file mode 100644 index bd42eec..0000000 --- a/users/testuser1/2025-4.txt +++ /dev/null @@ -1,18 +0,0 @@ -1744889948 -1744890300 -1745390818 -1745390894 -1745390894 -1745391029 -1746006467 -1746006593 -1746006933 -1746006937 -1746007004 -1746007012 -1746007119 -1746007383 -1746010855 -1746010861 -1746011089 -1746011092 diff --git a/users/testuser1/2025-5.json b/users/testuser1/2025-5.json deleted file mode 100644 index d8be30a..0000000 --- a/users/testuser1/2025-5.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "archived": 0, - "overtime": 0, - "absence": { - "2": "SO", - "8": "U", - "9": "U", - "10": "U", - "11": "U" - }, - "notes": { - "5": {}, - "4": {}, - "2": {}, - "1": {}, - "9": {}, - "12": {}, - "14": {}, - "22": {} - } -} \ No newline at end of file diff --git a/users/testuser1/2025-5.txt b/users/testuser1/2025-5.txt deleted file mode 100644 index 4425bef..0000000 --- a/users/testuser1/2025-5.txt +++ /dev/null @@ -1,32 +0,0 @@ -1746385124 -1746388680 -1746607385 -1746607536 -1746607833 -1746608922 -1746609024 -1746609037 -1747206908 -1747207022 -1747213977 -1747214813 -1747216800 -1747220619 -1747301302 -1747301459 -1747302876 -1747302887 -1747302889 -1747302897 -1747386098 -1747386110 -1747387148 -1747387150 -1747387501 -1747387508 -1747387633 -1747387635 -1747387761 -1747388239 -1747388242 -1747388615 diff --git a/users/testuser1/2025-7.json b/users/testuser1/2025-7.json deleted file mode 100644 index b951d02..0000000 --- a/users/testuser1/2025-7.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "archived": 0, - "overtime": 0, - "absence": {} -} \ No newline at end of file diff --git a/users/testuser1/2026-1.json b/users/testuser1/2026-1.json deleted file mode 100644 index ed17121..0000000 --- a/users/testuser1/2026-1.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "archived": 0, - "overtime": 0, - "absence": { - "1": "EZ", - "2": "EZ", - "3": "EZ", - "4": "EZ", - "5": "EZ", - "6": "EZ", - "7": "EZ", - "8": "EZ", - "9": "EZ", - "10": "EZ", - "11": "EZ", - "12": "EZ", - "13": "EZ", - "14": "EZ", - "15": "EZ", - "16": "EZ", - "17": "EZ", - "18": "EZ", - "19": "EZ", - "20": "EZ", - "21": "EZ", - "22": "EZ", - "23": "EZ", - "24": "EZ", - "25": "EZ", - "26": "EZ", - "27": "EZ", - "28": "EZ" - } -} \ No newline at end of file diff --git a/users/testuser1/2026-4.json b/users/testuser1/2026-4.json deleted file mode 100644 index e24cac5..0000000 --- a/users/testuser1/2026-4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "archived": 0, - "overtime": 0, - "absence": { - "14": "F" - } -} \ No newline at end of file diff --git a/users/testuser1/photo.jpg b/users/testuser1/photo.jpg deleted file mode 100644 index dcaa401..0000000 Binary files a/users/testuser1/photo.jpg and /dev/null differ diff --git a/users/testuser1/settings.json b/users/testuser1/settings.json deleted file mode 100644 index f4cb50d..0000000 --- a/users/testuser1/settings.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "username": "testuser1", - "fullname": "Pia Paulina", - "password": "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08", - "workhours": { - "2025-05-13": { - "1": "4", - "2": "5", - "3": "6", - "4": "7", - "5": "8", - "6": "0", - "7": "0", - "vacation": "30" - }, - "2025-04-22": { - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7", - "vacation": "30" - }, - "2025-03-01": { - "1": "4", - "2": "8", - "3": "8", - "4": "8", - "5": "8", - "6": 0, - "7": 0, - "vacation": "30" - } - }, - "api_key": "0d8b1baf9219fe568c0f0ea7c4244927e1c901da" -} \ No newline at end of file diff --git a/users/testuser1/settings.json.bak b/users/testuser1/settings.json.bak deleted file mode 100644 index 1bf319c..0000000 --- a/users/testuser1/settings.json.bak +++ /dev/null @@ -1,27 +0,0 @@ -{ - "username": "testuser", - "fullname": "Pia Paulina", - "password": "123456789", - "workhours": { - "2024-04-01": { - "1": "8", - "2": "8", - "3": "8", - "4": "4", - "5": "5", - "6": "4", - "7": "0", - "vacation": "35" - }, - "2024-04-07": { - "1": "8", - "2": "7", - "3": "12", - "4": "0", - "5": "0", - "6": "0", - "7": "0", - "vacation": "28" - } - } -} \ No newline at end of file diff --git a/users/testuser1/vacation_application.json b/users/testuser1/vacation_application.json deleted file mode 100644 index 9e26dfe..0000000 --- a/users/testuser1/vacation_application.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/users/testuser10/2025-12.json b/users/testuser10/2025-12.json deleted file mode 100644 index d45d40f..0000000 --- a/users/testuser10/2025-12.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "archived": 0, - "overtime": 0, - "absence": { - "23": "U", - "24": "U", - "27": "U", - "28": "U", - "29": "U", - "30": "U", - "31": "U" - } -} \ No newline at end of file diff --git a/users/testuser10/2025-4.json b/users/testuser10/2025-4.json deleted file mode 100644 index 48d10a6..0000000 --- a/users/testuser10/2025-4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "archived": 0, - "total_hours": 0, - "absence": { - "1": "U" - } -} \ No newline at end of file diff --git a/users/testuser10/2025-4.txt b/users/testuser10/2025-4.txt deleted file mode 100644 index 83ef3f8..0000000 --- a/users/testuser10/2025-4.txt +++ /dev/null @@ -1,14 +0,0 @@ -1744989835 -1744989837 -1744989913 -1744989917 -1744991287 -1744991291 -1744991475 -1744991478 -1744991773 -1744991776 -1744991910 -1744991912 -1745411021 -1745411025 diff --git a/users/testuser10/2025-5.json b/users/testuser10/2025-5.json deleted file mode 100644 index 942539d..0000000 --- a/users/testuser10/2025-5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "archived": 1, - "total_hours": 0, - "absence": {}, - "overtime": -406441 -} \ No newline at end of file diff --git a/users/testuser10/2025-5.txt b/users/testuser10/2025-5.txt deleted file mode 100644 index 2ed4771..0000000 --- a/users/testuser10/2025-5.txt +++ /dev/null @@ -1,4 +0,0 @@ -1747387168 -1747387171 -1747388261 -1747388617 diff --git a/users/testuser10/2025-6.json b/users/testuser10/2025-6.json deleted file mode 100644 index 96d7478..0000000 --- a/users/testuser10/2025-6.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "archived": 0, - "overtime": 0, - "absence": { - "9": "U", - "10": "U", - "12": "U", - "13": "U", - "14": "U", - "15": "U", - "16": "U", - "17": "U", - "18": "U", - "26": "U", - "27": "U", - "28": "U", - "29": "U", - "30": "U" - } -} \ No newline at end of file diff --git a/users/testuser10/2025-6.txt b/users/testuser10/2025-6.txt deleted file mode 100644 index e69de29..0000000 diff --git a/users/testuser10/2025-7.json b/users/testuser10/2025-7.json deleted file mode 100644 index 7eb49e7..0000000 --- a/users/testuser10/2025-7.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "archived": 0, - "overtime": 0, - "absence": { - "1": "U", - "2": "U", - "3": "U", - "4": "U", - "5": "U", - "6": "U", - "7": "U", - "8": "U", - "9": "U", - "10": "U", - "11": "U", - "12": "U", - "13": "U", - "14": "U", - "15": "U" - } -} \ No newline at end of file diff --git a/users/testuser10/2025-8.json b/users/testuser10/2025-8.json deleted file mode 100644 index 6a7338a..0000000 --- a/users/testuser10/2025-8.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "archived": 0, - "overtime": 0, - "absence": { - "18": "U", - "19": "U", - "20": "U", - "21": "U" - } -} \ No newline at end of file diff --git a/users/testuser10/2026-1.json b/users/testuser10/2026-1.json deleted file mode 100644 index 470556f..0000000 --- a/users/testuser10/2026-1.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "archived": 0, - "overtime": 0, - "absence": { - "2": "U", - "3": "U", - "4": "U", - "5": "U", - "6": "U", - "7": "U", - "8": "U", - "9": "U", - "10": "U", - "11": "U", - "12": "U", - "13": "U", - "14": "U" - } -} \ No newline at end of file diff --git a/users/testuser10/photo.jpg b/users/testuser10/photo.jpg deleted file mode 100644 index 57c5a04..0000000 Binary files a/users/testuser10/photo.jpg and /dev/null differ diff --git a/users/testuser10/settings.json b/users/testuser10/settings.json deleted file mode 100644 index 9734a44..0000000 --- a/users/testuser10/settings.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "username": "testuser10", - "fullname": "Diego Dieci", - "password": "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08", - "workhours": { - "2024-04-01": { - "1": "1", - "2": "2", - "3": "3", - "4": "4", - "5": "5", - "6": "6", - "7": "7", - "vacation": "30" - } - }, - "api_key": "807518cd5bd85c1e4855d340f9b77b23eac21b7f" -} \ No newline at end of file diff --git a/users/testuser10/vacation_application.json b/users/testuser10/vacation_application.json deleted file mode 100644 index 45adac7..0000000 --- a/users/testuser10/vacation_application.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "0": [ - "2025-06-09", - "2025-06-19" - ] -} \ No newline at end of file diff --git a/users/testuser2/settings.json b/users/testuser2/settings.json deleted file mode 100644 index f852870..0000000 --- a/users/testuser2/settings.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "username": "testuser2", - "fullname": "testuser2", - "password": "37a8eec1ce19687d132fe29051dca629d164e2c4958ba141d5f4133a33f0688f", - "api_key": "84799b1cbb92514f047bc2186cb4b4aafb352d69", - "workhours": { - "2025-05-27": { - "1": 0, - "2": 0, - "3": 0, - "4": 0, - "5": 0, - "6": 0, - "7": 0, - "vacation": 0 - } - } -} \ No newline at end of file diff --git a/users/testuser3/2025-4.json b/users/testuser3/2025-4.json deleted file mode 100644 index b7881be..0000000 --- a/users/testuser3/2025-4.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "archived": 0, - "total_hours": 0 -} \ No newline at end of file diff --git a/users/testuser3/2025-4.txt b/users/testuser3/2025-4.txt deleted file mode 100644 index a4487a4..0000000 --- a/users/testuser3/2025-4.txt +++ /dev/null @@ -1,12 +0,0 @@ -1744989835 -1744989837 -1744989913 -1744989917 -1744991287 -1744991291 -1744991475 -1744991478 -1744991773 -1744991776 -1744991910 -1744991912 diff --git a/users/testuser3/2025-5.json b/users/testuser3/2025-5.json deleted file mode 100644 index b7881be..0000000 --- a/users/testuser3/2025-5.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "archived": 0, - "total_hours": 0 -} \ No newline at end of file diff --git a/users/testuser3/2025-5.txt b/users/testuser3/2025-5.txt deleted file mode 100644 index 4eff463..0000000 --- a/users/testuser3/2025-5.txt +++ /dev/null @@ -1,6 +0,0 @@ -1746385111 -1746385118 -1747388255 -1747388619 -1747391536 -1747391567 diff --git a/users/testuser3/photo.jpg b/users/testuser3/photo.jpg deleted file mode 100644 index 8da4f2e..0000000 Binary files a/users/testuser3/photo.jpg and /dev/null differ diff --git a/users/testuser3/settings.json b/users/testuser3/settings.json deleted file mode 100644 index 82b037c..0000000 --- a/users/testuser3/settings.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "username": "testuser3", - "fullname": "Karl Klammer", - "password": "123456789", - "api_key": "0219f98ec471ea4e2ac6bd6c14b96051aae5209b", - "workhours": { - "2024-04-01": { - "1": "4", - "2": "4", - "3": "4", - "4": "8", - "5": "8", - "6": "0", - "7": "0", - "vacation": "30" - } - } -} \ No newline at end of file