Commit Graph

1685 Commits

Author SHA1 Message Date
Spi
54ad11207f Zeiterfassung Update
* Fixed Header bei Auswertung und Verrechnung
2024-05-21 15:54:14 +02:00
Frank Schubert
a4d8e00e00 Merge branch 'fronkdev' into 'master'
Dobl Zwaring Import 4

See merge request fronk/thetool!374
2024-05-18 13:32:45 +00:00
Frank Schubert
dc657b08c7 Dobl Zwaring Import 4 2024-05-18 15:32:03 +02:00
Frank Schubert
8196dc5f3a Merge branch 'fronkdev' into 'master'
Fixed always looking for empty string in stiege in submitPreorder()

See merge request fronk/thetool!373
2024-05-17 14:17:16 +00:00
Frank Schubert
80e4921b46 Fixed always looking for empty string in stiege in submitPreorder() 2024-05-17 16:16:29 +02:00
Daniel Spitzer
3e82ec1749 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!372
2024-05-16 17:13:07 +00:00
Spi
e983cc563e Zeiterfassung Update
* Kalender Heute Anzeige verbesserte Sichtbarkeit
2024-05-16 19:12:41 +02:00
Daniel Spitzer
4f8b17330b Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!371
2024-05-16 16:58:51 +00:00
Spi
f320882e9d Zeiterfassung Update
* Transfer Überstunden50/100,Mehrstunden20 zurück in Gutstunden/Mehrstunden
 * Textuelle Anzeige von transferierten Stunden
 * Kalender Anzeige verbesserungen
 * Offene Krankenstände werden virtuell 2 Wochen in die Zukunft angezeit im Kalender
 * Kalender Heute Anzeige verbesserte Sichtbarkeit
2024-05-16 18:57:14 +02:00
Frank Schubert
88349c6988 Merge branch 'fronkdev' into 'master'
Added preorder export api (for specific user)

See merge request fronk/thetool!370
2024-05-16 14:45:31 +00:00
Frank Schubert
630e618733 Added preorder export api (for specific user) 2024-05-16 16:44:49 +02:00
Frank Schubert
84e49f2774 Merge branch 'fronkdev' into 'master'
ADB: Added stiege as part of Hausnummer

See merge request fronk/thetool!369
2024-05-16 13:48:26 +00:00
Frank Schubert
29459e9cca ADB: Added stiege as part of Hausnummer 2024-05-16 15:47:41 +02:00
Spi
1b5c481442 Zeiterfassung Update
* Transfer Überstunden50/100,Mehrstunden20 zurück in Gutstunden/Mehrstunden
 * Textuelle Anzeige von transferierten Stunden
 * Kalender Anzeige verbesserungen
 * Offene Krankenstände werden virtuell 2 Wochen in die Zukunft angezeit im Kalender
 * Kalender Heute Anzeige verbesserte Sichtbarkeit
2024-05-16 15:12:56 +02:00
Daniel Spitzer
eb2a84cf07 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!368
2024-05-16 12:55:47 +00:00
Spi
4d08114918 Zeiterfassung Update
* Transfer Überstunden50/100,Mehrstunden20 zurück in Gutstunden/Mehrstunden
 * Textuelle Anzeige von transferierten Stunden
 * Kalender Anzeige verbesserungen
 * Offene Krankenstände werden virtuell 2 Wochen in die Zukunft angezeit im Kalender
2024-05-16 14:51:45 +02:00
Frank Schubert
58ffea17a4 WIP Contract 2024-05-08 2024-05-15 14:05:46 +02:00
Luca Haid
deaa48fe01 Merge branch 'feature/add-ip-network' into 'master'
Feature/add ip network

See merge request fronk/thetool!364
2024-05-10 21:11:18 +00:00
Luca Haid
0021725526 Merge branch 'feature/improve-docker-setup' into 'master'
Added cleaning logs to discard older logs as not need while developing

See merge request fronk/thetool!365
2024-05-10 21:09:53 +00:00
Luca Haid
e90ecc020e Added cleaning logs to discard older logs as not need while developing 2024-05-10 23:09:33 +02:00
Luca Haid
f57d57b46d Added IPAM IpNetwork Module 2024-05-10 23:07:21 +02:00
Luca Haid
54dfabaef8 Merge branch 'feature/rework-vue-schema' into 'master'
Feature/rework vue schema

See merge request fronk/thetool!363
2024-05-10 21:03:01 +00:00
Luca Haid
78c9d3ef37 Feature/rework vue schema 2024-05-10 21:03:01 +00:00
Luca Haid
c2e5796661 Improved Performance and Layout of Vue Applications, enhanced caching aswell as using less code 2024-05-10 23:01:19 +02:00
Luca Haid
18ee289509 Update pagination logic and refine controller calculations 2024-05-08 21:31:01 +02:00
Luca Haid
1f477a4b2f Fixed Bug in View when no or a single voice call is active 2024-05-08 21:19:23 +02:00
Luca Haid
1f30671cf9 Merge branch 'feature/rework-docker-setup' into 'master'
reworked docker setup

See merge request fronk/thetool!362
2024-05-08 19:07:53 +00:00
Luca Haid
d8300bfdb5 reworked docker setup 2024-05-08 21:07:07 +02:00
Frank Schubert
2667f2fb59 Merge branch 'fronkdev' into 'master'
Dobl-Zwaring Import 3

See merge request fronk/thetool!361
2024-05-08 15:02:01 +00:00
Frank Schubert
07e47bf302 Dobl-Zwaring Import 3 2024-05-08 17:00:52 +02:00
Luca Haid
0714c864aa Merge branch 'hotfix/table-reset-icon' into 'master'
fixed icon

See merge request fronk/thetool!360
2024-05-08 13:29:12 +00:00
Luca Haid
d4161ef037 fixed icon 2024-05-08 15:27:06 +02:00
Frank Schubert
ca21dd0d26 Including fa-sharp icons 2024-05-08 15:18:07 +02:00
Frank Schubert
54b27e0b7a Merge branch 'fronkdev' into 'master'
New Dobl-Zwaring Order Import

See merge request fronk/thetool!359
2024-05-08 13:06:49 +00:00
Frank Schubert
2228cf011f New Dobl-Zwaring Order Import 2024-05-08 15:05:44 +02:00
Luca Haid
9c1c87c867 Merge branch 'feature/tt-frontend-framework' into 'master'
Updated TheTool Frontend Framework & Table

See merge request fronk/thetool!358
2024-05-08 12:54:27 +00:00
Luca Haid
58e124a461 Updated TheTool Frontend Framework & Table 2024-05-08 12:54:26 +00:00
Frank Schubert
83b10ba922 WIP Contract 2024-05-07 - 2 2024-05-07 22:53:16 +02:00
Frank Schubert
1e57d983b7 Updated Fontawesome pro to 6.5.2 2024-05-07 19:03:23 +02:00
Frank Schubert
7b15b7a528 WIP Contract 2024-05-07 2024-05-07 18:57:20 +02:00
Luca Haid
593fb7cea5 Merge branch 'bugfix/fix-voice-call-history-filter' into 'master'
Bugfix/fix voice call history filter

See merge request fronk/thetool!357
2024-05-07 16:38:24 +00:00
Luca Haid
d6bc567f5d Bugfix/fix voice call history filter 2024-05-07 16:38:23 +00:00
Frank Schubert
4b52599209 WIP Contract 2024-05-06 2024-05-07 16:31:01 +02:00
Daniel Spitzer
b4edd8fa24 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!356
2024-05-07 14:02:07 +00:00
Spi
1294281b3d Zeiterfassung Update
* Fix für BPA stunden Rückgängig
2024-05-07 16:00:21 +02:00
Daniel Spitzer
749d0dac6a Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!355
2024-05-07 12:12:01 +00:00
Spi
a7bc1ff8a6 Zeiterfassung Update
* ZA Anzeige beim genehmigen gefixt
2024-05-07 14:11:34 +02:00
Spi
ba8d96b231 Zeiterfassung Update
* ZA Anzeige beim genehmigen gefixt
2024-05-07 14:09:59 +02:00
Daniel Spitzer
ad02a275d3 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!354
2024-05-07 08:26:26 +00:00
Spi
2f81e1d77e Zeiterfassung Update
* Berechnungen BP
 * Möglichkeit Mehrstunden in Gutstunden umzuwandeln
2024-05-07 10:24:30 +02:00