Commit Graph

3109 Commits

Author SHA1 Message Date
Luca Haid
fa5aa34059 Merge branch 'constr-consent-add-stats' into 'master'
Added Stats inside ConstructionConsent

See merge request fronk/thetool!1035
2025-02-17 11:57:29 +00:00
Luca Haid
bf5bc71e24 Added Stats inside ConstructionConsent 2025-02-17 12:55:59 +01:00
Frank Schubert
1324c4c5c5 Merge branch 'fronkdev' into 'master'
can delete Consent plan file / added empty page in Consentform.pdf

See merge request fronk/thetool!1034
2025-02-14 17:03:16 +00:00
Frank Schubert
ee5b11773e can delete Consent plan file / added empty page in Consentform.pdf 2025-02-14 18:02:16 +01:00
Frank Schubert
a1819515b6 Merge branch 'fronkdev' into 'master'
added ConstructionConsentController::deleteAction()

See merge request fronk/thetool!1033
2025-02-14 15:19:52 +00:00
Frank Schubert
7575ef05fb added ConstructionConsentController::deleteAction() 2025-02-14 16:19:05 +01:00
Frank Schubert
9b221fe0d2 Merge branch 'fronkdev' into 'master'
Made file pastable in ConstructionConsent/Form

See merge request fronk/thetool!1032
2025-02-14 14:49:50 +00:00
Frank Schubert
61b192e1c9 Merge branch 'master' into 'fronkdev'
# Conflicts:
#   Layout/default/ConstructionConsent/Form.php
2025-02-14 14:46:24 +00:00
Frank Schubert
7c0ab4e45d Made file pastable in ConstructionConsent/Form 2025-02-14 15:45:04 +01:00
Daniel Spitzer
0b02aff72a Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1030
2025-02-14 11:54:08 +00:00
Luca Haid
f89a2c7ea3 Added ConstructionConsentProject to preorderfront if address is correct 2025-02-14 11:51:45 +00:00
Daniel Spitzer
e822ffe718 Zeiterfassung Update
* Gesammtsumme bei Admin Only Mitarbeitern einfeführt
2025-02-14 12:51:20 +01:00
Daniel Spitzer
e9ec68fcd4 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1029
2025-02-14 11:48:22 +00:00
Daniel Spitzer
38e405a2cd Zeiterfassung Update
* Gesammtsumme bei Admin Only Mitarbeitern einfeführt
2025-02-14 12:47:49 +01:00
Frank Schubert
0fa12ef0fb Merge branch 'fronkdev' into 'master'
ConstructionConsent: enable all usages for buildings

See merge request fronk/thetool!1028
2025-02-14 11:34:38 +00:00
Frank Schubert
b7620f3482 ConstructionConsent: enable all usages for buildings 2025-02-14 12:33:38 +01:00
Daniel Spitzer
96f629a2b1 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1027
2025-02-14 11:32:38 +00:00
Daniel Spitzer
d0404f515d Zeiterfassung Update
* Gesammtsumme bei Admin Only Mitarbeitern einfeführt
2025-02-14 12:30:21 +01:00
Luca Haid
cb17eba40b Update tt-modal.js 2025-02-14 10:00:43 +00:00
Frank Schubert
e25046754f Merge branch 'fronkdev' into 'master'
added sbidi creds to import

See merge request fronk/thetool!1026
2025-02-13 17:38:01 +00:00
Frank Schubert
5125d16dae added sbidi creds to import 2025-02-13 18:37:46 +01:00
Frank Schubert
fa8422ec97 added sbidi creds to import 2025-02-13 18:36:19 +01:00
Frank Schubert
6d50b1fcbb Merge branch 'fronkdev' into 'master'
ConstructionConsent: added birthdate

See merge request fronk/thetool!1025
2025-02-13 15:36:58 +00:00
Frank Schubert
1bc7b47b4f ConstructionConsent: added birthdate 2025-02-13 16:36:25 +01:00
Frank Schubert
be5aff4178 Merge branch 'fronkdev' into 'master'
Added toppage to ConstructionConsent PDF

See merge request fronk/thetool!1024
2025-02-13 15:13:20 +00:00
Frank Schubert
2acebb99af Added toppage to ConstructionConsent PDF 2025-02-13 16:12:49 +01:00
Frank Schubert
2945870dda Merge branch 'fronkdev' into 'master'
ConstructionConsent/View: setting owner status returned when result accepted or

See merge request fronk/thetool!1023
2025-02-13 14:24:48 +00:00
Frank Schubert
3e26ea5dff ConstructionConsent/View: setting owner status returned when result accepted or
denied
2025-02-13 15:23:45 +01:00
Frank Schubert
3ed34a8aab Merge branch 'fronkdev' into 'master'
ConstructionConsent Changes

See merge request fronk/thetool!1022
2025-02-13 13:36:53 +00:00
Frank Schubert
ea9e91e6ab ConstructionConsent Changes 2025-02-13 14:35:57 +01:00
Luca Haid
7c5045812f Merge branch 'construction-consent-add-popover' into 'master'
Added Popover to Inform Users

See merge request fronk/thetool!1021
2025-02-13 11:48:32 +00:00
Luca Haid
9e513dfb35 Added Popover to Inform Users 2025-02-13 12:47:54 +01:00
Luca Haid
6f1ec33a1e Merge branch 'improve-warehouse' into 'master'
Fixed WarehouseOffer Modal

See merge request fronk/thetool!1020
2025-02-13 11:37:35 +00:00
Luca Haid
ac5c09c8be Fixed WarehouseOffer Modal 2025-02-13 12:37:10 +01:00
Luca Haid
57f7a1c9fe Merge branch 'improve-warehouse' into 'master'
Fixed WarehouseOrderModel.php

See merge request fronk/thetool!1019
2025-02-13 11:33:42 +00:00
Luca Haid
71b72151f6 Fixed WarehouseOrderModel.php 2025-02-13 12:33:21 +01:00
Luca Haid
c3e1af6649 Merge branch 'improve-warehouse' into 'master'
Allowed ingena for cons consent

See merge request fronk/thetool!1018
2025-02-13 11:10:04 +00:00
Luca Haid
8f20ce39d6 Allowed ingena for cons consent 2025-02-13 12:09:35 +01:00
Luca Haid
1661469d06 Merge branch 'improve-warehouse' into 'master'
Updated Warehouse

See merge request fronk/thetool!1017
2025-02-13 10:57:41 +00:00
Luca Haid
c8d11661d0 Updated Warehouse 2025-02-13 11:56:27 +01:00
Luca Haid
bbe841875e Added gstnr to ConstructionConsent/Index 2025-02-13 08:19:54 +00:00
Luca Haid
2159035675 Added gstnr to ConstructionConsent/Index 2025-02-13 08:18:55 +00:00
Daniel Spitzer
a01e13c52c Merge branch 'spidev' into 'master'
Kalender Bugfix

See merge request fronk/thetool!1016
2025-02-12 17:22:49 +00:00
Daniel Spitzer
5e8ec1d07d Kalender Bugfix
* Ab und zu passiert es das Kalendereinträge doppelt angezeigt werden. Es gab eine überschneidung mit den Event id -> gefixt
2025-02-12 18:19:20 +01:00
Luca Haid
bb5a993c27 Update DashboardNew.js 2025-02-12 17:03:08 +00:00
Luca Haid
5a5fc9d3d9 Merge branch 'improve-warehouse' into 'master'
Changed Dashboard

See merge request fronk/thetool!1015
2025-02-12 16:56:48 +00:00
Luca Haid
cc58b32312 Changed Dashboard 2025-02-12 17:56:34 +01:00
Luca Haid
3da43ea0e7 Merge branch 'improve-warehouse' into 'master'
Changed Dashboard

See merge request fronk/thetool!1014
2025-02-12 16:52:00 +00:00
Luca Haid
14308d3285 Changed Dashboard 2025-02-12 17:51:29 +01:00
Frank Schubert
9f3ce3a019 Merge branch 'fronkdev' into 'master'
Fronkdev

See merge request fronk/thetool!1013
2025-02-12 14:33:19 +00:00