Commit graph

126 commits

Author SHA1 Message Date
ff9867f274 Merge pull request '#27 Medikamente Modul - Alternative Medikamente' (#51) from story/medikamente-modul-alternative-medikamente into main
All checks were successful
Quality Check / Linting Check (push) Successful in 19s
Javadoc Deploy / Javadoc (push) Successful in 38s
Quality Check / Javadoc Check (push) Successful in 34s
Reviewed-on: #51
2024-05-22 18:18:52 +00:00
6b63675e84
#27: Implement Alternative Medications
All checks were successful
Quality Check / Linting Check (push) Successful in 18s
Quality Check / Linting Check (pull_request) Successful in 23s
Quality Check / Javadoc Check (push) Successful in 39s
Quality Check / Javadoc Check (pull_request) Successful in 37s
Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>
2024-05-22 20:15:39 +02:00
97373930ec Merge pull request 'NOTICKET: Bugfix for Treatment locking' (#52) from bugfixes into main
All checks were successful
Quality Check / Linting Check (push) Successful in 19s
Javadoc Deploy / Javadoc (push) Successful in 36s
Quality Check / Javadoc Check (push) Successful in 34s
Reviewed-on: #52
2024-05-22 17:15:36 +00:00
a437b00921 NOTICKET: Bugfix for Treatment locking
All checks were successful
Quality Check / Linting Check (push) Successful in 29s
Quality Check / Linting Check (pull_request) Successful in 30s
Quality Check / Javadoc Check (push) Successful in 49s
Quality Check / Javadoc Check (pull_request) Successful in 47s
Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>
2024-05-22 16:57:03 +00:00
efea16e5b1 Merge pull request '#24 story/medikamente-als-veraltet-markieren' (#46) from story/medikamente-als-veraltet-markieren into main
All checks were successful
Quality Check / Linting Check (push) Successful in 19s
Quality Check / Javadoc Check (push) Successful in 32s
Javadoc Deploy / Javadoc (push) Successful in 20s
Reviewed-on: #46
Reviewed-by: SZUT-Ole <ole.kueck@hmmh.de>
Reviewed-by: Dominik Säume <dominik.saeume@hmmh.de>
2024-05-22 16:52:01 +00:00
Dorian Nemec
db572dfa95
#24: Javadoc & Cleanup
All checks were successful
Quality Check / Linting Check (push) Successful in 18s
Quality Check / Linting Check (pull_request) Successful in 23s
Quality Check / Javadoc Check (push) Successful in 39s
Quality Check / Javadoc Check (pull_request) Successful in 37s
Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>
2024-05-22 18:49:53 +02:00
Dorian Nemec
02232cd27f
#24: Implement Deprecated and Available medications 2024-05-22 17:50:07 +02:00
arminribic
e584e220a5
#24: Logik implementiert und UI fertig gestellt 2024-05-22 17:47:19 +02:00
Dorian Nemec
9fac5b34a3
#24: Implemented isDeprecated in Dao 2024-05-22 17:46:40 +02:00
Dorian Nemec
6300509873
#24: UI Veraltete Medikamenten addiert 2024-05-22 17:46:25 +02:00
e9aa98d63a Merge pull request '#8 story/pfleger-module-login-pfleger' (#50) from story/pfleger-module-login-pfleger into main
All checks were successful
Quality Check / Linting Check (push) Successful in 19s
Javadoc Deploy / Javadoc (push) Successful in 33s
Quality Check / Javadoc Check (push) Successful in 31s
Reviewed-on: #50
Reviewed-by: SZUT-Ole <ole.kueck@hmmh.de>
2024-05-22 09:46:01 +00:00
0df409e775
#8: Cleanup & Javadoc
All checks were successful
Quality Check / Linting Check (push) Successful in 16s
Quality Check / Linting Check (pull_request) Successful in 21s
Quality Check / Javadoc Check (push) Successful in 35s
Quality Check / Javadoc Check (pull_request) Successful in 34s
Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>
2024-05-22 10:36:32 +02:00
7db1c83a08
#8: Use Permissions in Nurse Controller
Some checks failed
Quality Check / Linting Check (push) Failing after 12s
Quality Check / Javadoc Check (push) Successful in 21s
Quality Check / Linting Check (pull_request) Failing after 13s
Quality Check / Javadoc Check (pull_request) Successful in 21s
Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>
2024-05-22 09:44:53 +02:00
ae7fc3ab64
#8: Implement User Permissions System Base and usage with Tabs
Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>
2024-05-22 09:44:53 +02:00
069465c4ca
#8: Implement Login Logic 2024-05-22 09:44:48 +02:00
fb6fc923ac
#8: Setup Model, DAO & Fixtures
Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>
2024-05-21 19:11:43 +02:00
03ef4a235a
#8: Setup Schema for User Login 2024-05-21 19:11:05 +02:00
092b436247
#8: Setup Modal Window 2024-05-21 19:11:05 +02:00
fb26756309 README.md aktualisiert
All checks were successful
Quality Check / Linting Check (push) Successful in 18s
Javadoc Deploy / Javadoc (push) Successful in 32s
Quality Check / Javadoc Check (push) Successful in 29s
2024-05-21 17:06:34 +00:00
6e58574909 Merge pull request '#24 Bugfix' (#47) from story/sperren-und-loeschen-von-pflegern-bugfix into main
All checks were successful
Javadoc Deploy / Javadoc (push) Successful in 32s
Quality Check / Linting Check (push) Successful in 12s
Quality Check / Javadoc Check (push) Successful in 21s
Reviewed-on: #47
Reviewed-by: SZUT-Armin <arminribic@web.de>
2024-05-21 08:49:48 +00:00
Dorian Nemec
449f3ade06 #24 Bugfix
All checks were successful
Quality Check / Linting Check (push) Successful in 12s
Quality Check / Javadoc Check (push) Successful in 21s
Quality Check / Linting Check (pull_request) Successful in 12s
Quality Check / Javadoc Check (pull_request) Successful in 21s
2024-05-21 10:38:04 +02:00
970f167bc3
#7 Cleanup
All checks were successful
Quality Check / Linting Check (push) Successful in 19s
Javadoc Deploy / Javadoc (push) Successful in 32s
Quality Check / Javadoc Check (push) Successful in 30s
2024-05-21 09:01:04 +02:00
Dorian Nemec
f77072ab70
#7 Implement Logic 2024-05-21 09:00:59 +02:00
Dorian Nemec
efe10a72a3
#7 Update UI 2024-05-21 09:00:49 +02:00
Dorian Nemec
2856cbd13c
#7 Update model 2024-05-21 09:00:46 +02:00
1cbafa2fe9
#25: Implement Editing of Nurses 2024-05-21 08:56:38 +02:00
30120f3709
#26: Bugfix 2024-05-21 08:56:38 +02:00
8496f714d3
#26: Cleanup & Javadoc
All checks were successful
Quality Check / Linting Check (push) Successful in 16s
Quality Check / Linting Check (pull_request) Successful in 21s
Quality Check / Javadoc Check (push) Successful in 37s
Quality Check / Javadoc Check (pull_request) Successful in 33s
2024-05-17 15:35:03 +02:00
ad3bd8ba0a
#26: Implementing Editing of Medications
All checks were successful
Quality Check / Linting Check (push) Successful in 13s
Quality Check / Javadoc Check (push) Successful in 21s
Quality Check / Linting Check (pull_request) Successful in 12s
Quality Check / Javadoc Check (pull_request) Successful in 21s
2024-05-17 15:32:29 +02:00
1d419a6220 Merge pull request '#23 Medikamente Anlegen' (#40) from story/medikamente-modul-medikamente-anlegen into main
All checks were successful
Quality Check / Linting Check (push) Successful in 18s
Javadoc Deploy / Javadoc (push) Successful in 35s
Quality Check / Javadoc Check (push) Successful in 31s
Reviewed-on: #40
Reviewed-by: Dominik Säume <dominik.saeume@hmmh.de>
2024-05-17 12:34:27 +00:00
f3f266e2d8
#23: Javadoc
All checks were successful
Quality Check / Linting Check (push) Successful in 17s
Quality Check / Linting Check (pull_request) Successful in 21s
Quality Check / Javadoc Check (push) Successful in 35s
Quality Check / Javadoc Check (pull_request) Successful in 34s
2024-05-17 14:31:40 +02:00
c5237fed83
#23: Implementing Medication Modal with Validation 2024-05-17 14:28:12 +02:00
71fd693f37
#23: Creating Custom ListCell<T> for Ingredients 2024-05-17 14:27:47 +02:00
c7d60802ab
#23: Creating Medication Modal View 2024-05-17 14:27:31 +02:00
2d64beaece
#23: Fix Medicaiton DAO 2024-05-17 14:26:59 +02:00
6908e8129b Merge pull request '#10 story/pfleger-modul-sperren-und-loschen-von-pflegern' (#37) from story/pfleger-modul-sperren-und-loschen-von-pflegern into main
All checks were successful
Quality Check / Linting Check (push) Successful in 19s
Javadoc Deploy / Javadoc (push) Successful in 34s
Quality Check / Javadoc Check (push) Successful in 31s
Reviewed-on: #37
Reviewed-by: Dominik Säume <dominik.saeume@hmmh.de>
2024-05-16 11:57:12 +00:00
Dorian Nemec
e583d825ec #10 JavaDoc ergänzt #2
All checks were successful
Quality Check / Linting Check (push) Successful in 16s
Quality Check / Linting Check (pull_request) Successful in 22s
Quality Check / Javadoc Check (push) Successful in 35s
Quality Check / Javadoc Check (pull_request) Successful in 33s
2024-05-16 13:54:32 +02:00
Dorian Nemec
d9e0aa2049 #10 dataSources.xml ergänzt
All checks were successful
Quality Check / Linting Check (push) Successful in 15s
Quality Check / Linting Check (pull_request) Successful in 21s
Quality Check / Javadoc Check (push) Successful in 35s
Quality Check / Javadoc Check (pull_request) Successful in 32s
2024-05-16 13:24:09 +02:00
Dorian Nemec
814f0a367b #10 toString korrigiert
All checks were successful
Quality Check / Linting Check (push) Successful in 15s
Quality Check / Linting Check (pull_request) Successful in 21s
Quality Check / Javadoc Check (push) Successful in 36s
Quality Check / Javadoc Check (pull_request) Successful in 34s
2024-05-16 13:17:08 +02:00
Dorian Nemec
505d9e3f5c #10 Javadoc Änderungen ergänzt
Some checks failed
Quality Check / Linting Check (push) Successful in 16s
Quality Check / Linting Check (pull_request) Successful in 20s
Quality Check / Javadoc Check (push) Failing after 22s
Quality Check / Javadoc Check (pull_request) Failing after 20s
2024-05-16 13:14:56 +02:00
Dorian Nemec
d982242718 #10 Javadoc addiert
All checks were successful
Quality Check / Linting Check (push) Successful in 16s
Quality Check / Linting Check (pull_request) Successful in 21s
Quality Check / Javadoc Check (push) Successful in 34s
Quality Check / Javadoc Check (pull_request) Successful in 32s
2024-05-16 11:58:49 +02:00
Dorian Nemec
b401bdd91b #10 Javadoc addiert
All checks were successful
Quality Check / Linting Check (push) Successful in 16s
Quality Check / Linting Check (pull_request) Successful in 21s
Quality Check / Javadoc Check (push) Successful in 37s
Quality Check / Javadoc Check (pull_request) Successful in 34s
2024-05-16 11:42:21 +02:00
d8de1e17fa
#10: Cleanup
All checks were successful
Quality Check / Linting Check (push) Successful in 17s
Quality Check / Linting Check (pull_request) Successful in 21s
Quality Check / Javadoc Check (push) Successful in 34s
Quality Check / Javadoc Check (pull_request) Successful in 32s
Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>
2024-05-16 10:37:55 +02:00
arminribic
353146cbd7 #10: Deletedate calculated & DeletreBurtton enabled/disabled
Some checks failed
Quality Check / Linting Check (push) Failing after 12s
Quality Check / Javadoc Check (push) Successful in 21s
Quality Check / Linting Check (pull_request) Failing after 12s
Quality Check / Javadoc Check (pull_request) Successful in 20s
2024-05-16 10:20:23 +02:00
arminribic
917aa8275f
#10: Add Base for Delete Date Functionality
All checks were successful
Quality Check / Linting Check (push) Successful in 12s
Quality Check / Javadoc Check (push) Successful in 21s
2024-05-15 12:08:48 +02:00
arminribic
453616c175
#10: Update Views to Reflect Locked and Active Nurses 2024-05-15 12:08:22 +02:00
arminribic
9353c9990e
#10: Modify Model, Dao and Fixtures 2024-05-15 12:04:25 +02:00
192c14eb0d Merge pull request 'Javadoc' (#35) from javadoc into main
All checks were successful
Javadoc Deploy / Javadoc (push) Successful in 31s
Quality Check / Linting Check (push) Successful in 11s
Quality Check / Javadoc Check (push) Successful in 21s
Reviewed-on: #35
Reviewed-by: SZUT-Ole <ole.kueck@hmmh.de>
2024-05-15 09:59:59 +00:00
c2857de8ee
NOTICKET: Javaodc & Cleanup
All checks were successful
Quality Check / Linting Check (push) Successful in 17s
Quality Check / Linting Check (pull_request) Successful in 21s
Quality Check / Javadoc Check (push) Successful in 34s
Quality Check / Javadoc Check (pull_request) Successful in 31s
Signed-off-by: Dominik Säume <Dominik.Saeume@hmmh.de>
2024-05-15 11:44:19 +02:00
cc59218a41 Merge pull request 'task/#17 Treatement -> Nurse Relation' (#36) from task/refactor-dao into main
All checks were successful
Javadoc Deploy / Javadoc (push) Successful in 32s
Quality Check / Linting Check (push) Successful in 14s
Quality Check / Linting Check (pull_request) Successful in 21s
Quality Check / Javadoc Check (push) Successful in 34s
Quality Check / Javadoc Check (pull_request) Successful in 31s
Reviewed-on: #36
Reviewed-by: SZUT-Armin <arminribic@web.de>
2024-05-15 09:29:51 +00:00