Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity
1,769 Commits 7 Branches 0 Tags
c00489171801806b697ee342a30a783c8867121a
Commit Graph
1769 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Spitzer d03a0e0be0 Merge branch 'spidev' into 'master' 
Zeiterfassung Update

See merge request fronk/thetool!353
 2024-05-07 07:34:15 +00:00
Spi eaaaeb1581 Zeiterfassung Update 
* Berechnungen BP
 * Möglichkeit Mehrstunden in Gutstunden umzuwandeln
 2024-05-07 09:33:44 +02:00
Daniel Spitzer e182fa09d3 Merge branch 'spidev' into 'master' 
Zeiterfassung Update

See merge request fronk/thetool!352
 2024-05-07 06:54:41 +00:00
Spi fe1a3e7948 Zeiterfassung Update 
* Berechnungen BP
 * Möglichkeit Mehrstunden in Gutstunden umzuwandeln
 2024-05-07 08:53:19 +02:00
Frank Schubert 6002876343 WIP Ivt Import 2024-05-02 2024-05-06 13:24:25 +02:00
Daniel Spitzer b44656e6ac Merge branch 'spidev' into 'master' 
Zeiterfassung Update Monatsabschluss/Verrechnung

See merge request fronk/thetool!351
 2024-05-05 10:40:54 +00:00
Spi b821c9f2c4 Zeiterfassung Update Monatsabschluss/Verrechnung 
* Berechnungen aller Ü50/Ü100/M25 sowie Steuerfrei und Pflichtig
* Transfer Mehrstunden auf Ü50/Ü100/M25
* Anpassungen der Exports LZs MehrstundenGL ÜGL Ü50,Ü100,M25
* Autoberechnung der anteiligen Mehrstunden
* automatische Ü100 Rausrechnung laut gesetzlichen Vorgaben

Bugfixes:
* Start und Enddatum eines Mitarbeiters werden nun überall berücksichtigt.

* Textuelle Bereinigungen
* Umfangreiche Testscenarien Verechnung/Exports
 2024-05-05 12:36:47 +02:00
Daniel Spitzer a05c657cda Merge branch 'spidev' into 'master' 
Zeiterfassung Update

See merge request fronk/thetool!350
 2024-04-29 18:18:58 +00:00
Spi 45a07abf0e Zeiterfassung Update 
* Erstberechnung Überstunden 50%/100% Steuerfrei/Steuerpflichtig
 * Feiertag werden nun in der Buchungsübersicht angezeigt
 2024-04-29 20:15:39 +02:00
Daniel Spitzer e1c86b8f8e Merge branch 'spidev' into 'master' 
Zeiterfassung Update

See merge request fronk/thetool!349
 2024-04-28 10:29:45 +00:00
Spitzer Daniel 258067ef4d Zeiterfassung Update 
* Script für Email Alarmierung §57a
 * Automatische auswahl beim Buchen von Dienstreisen auf das zugewiesene Fahrzeug
 2024-04-28 12:23:36 +02:00
Frank Schubert 7809f6d19f Merge branch 'fronkdev' into 'master' 
Fixed updateing freigabe in rimo import

See merge request fronk/thetool!348
 2024-04-26 13:06:19 +00:00
Frank Schubert df108dca2d Fixed updateing freigabe in rimo import 2024-04-26 15:05:49 +02:00
Frank Schubert 7e6e59584a Merge branch 'fronkdev' into 'master' 
Fixed showing adrcd-subcd in AdressDB/Form

See merge request fronk/thetool!347
 2024-04-26 12:05:25 +00:00
Frank Schubert 6c1b63d77a Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-04-26 14:04:42 +02:00
Frank Schubert 05ae72ad72 Fixed showing adrcd-subcd in AdressDB/Form 2024-04-26 14:04:20 +02:00