From db572dfa95a9e63ae70ca212c4eb648953665580 Mon Sep 17 00:00:00 2001 From: Dorian Nemec Date: Tue, 21 May 2024 08:39:58 +0200 Subject: [PATCH] #24: Javadoc & Cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dominik Säume --- db/nursingHome.db | Bin 57344 -> 57344 bytes .../medication/AllMedicationController.java | 34 ++++++++++++++++++ .../DeprecatedMedicationController.java | 12 ++++++- .../nhplus/medication/AllMedicationView.fxml | 1 + 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/db/nursingHome.db b/db/nursingHome.db index b89b1465940bb9f8aa1e08321a549d20da8681fd..9ce117804f6ced85b396bc7bf6373df784aa6d56 100644 GIT binary patch delta 1356 zcmY*XeM}Tb6yMp|-P_%}+X3M?==IsG#XpC`BMq1dF8#T43c?yuuy2cc&IL zaA2u_)QV2pl$Q8aq^Y77uQsL{A+=V~v|{|IrfQ9qk7x`UsuiiGv(2gL%)Y#R^Lz8& zZ{B~ofY>aGJ5bUMRG|0z;%=fUtUMN{w)8;hH`xadF{uQQuWprODgFRNDkUPaYJz^Ay~K)_YHaR!kPNuU*ZU-M02RHE9z?>}F$Z~n-C@WQ^LiQ<6&9>odXe`_q$>Lr* z7O=q~`XPXUY6f>1qX2`G&?UT2DvWKQpw4WufW}4t(O4<_T#CmRQZ$Ba-?pidLAz}X z!s9Y-NG$52&@dWAS5Xh@3WnD^QJqmQ1SUW;@c31)!k}NMi53tFz!A$52Yjj``;38! zF!bvtDMUsC^(LUbnjsb=@+=IQ5(DkPtvFreIj$NHsp9{x3iOL~dSHPs(-}#z7=$U* zPw4GMm=J747#FOJqrxMJ?8ak!SA?DHqP0cdVJoc7l zi1PtY#U&^jdbBJ%O^XH4C`CSP_B7GhKGzzoCt?U`foNWm39CdYxWuy)hztY*W0cyd z2+WqpqZX-AS}n=XH*rjo>LTJGNa7aB>T+3ic|5XDb@|=;SO_fKLf?rtwMvP!LNJM& zFIRdLFTuP%MOI~>{#DH-Pp7b*J-cRre|NmqW*vpMqb^tP8gD=H z=g1}@_|eR0SK&EplE0&5X7t|At#|Uj95{1$Rr9xn2?L9J3e!Ga*V*zY>cF9l+&S*# zIlb1aT?Ln(+%e31@J4<$TF#r4cq?NF#PQOhTf&q1|RIOK1{!L*uQNvo;jN9oGhpB`J#&EC^JdtCgqi@rym&AJHThh54ErPdB)>Xz31$A z%kJAc+#mP8Ua@(kyuiJ$?)tr)-=~hNsO&4b&{ue}?XfXA`E1JU&Rb1qe!ZF|C66sz zS@Ec%B2fZ;pV&aY3obr3^j%nv& zP<&-7XYVOl_}-T8~x`u%a(#cYWBQos5kGXoNx|!SLQYXzKzN SkDSw!BW-F!M>kz zEB1@LM>ObBE7C<+ou50yb4f&t&?QZ9HYbwo=el8rSnpoUb%I!o)VtI9MI=Yzav#u! z5Z+3u?x(rg($o;VX*%GFbEo38N`<(nG*)0Cb{?n=1|UWrQdp zyZm@xjyr{0Ld2ms=Op&a+$MK2POH^uU5O`*G@^iva{IWAo>qwuin(gsY1~}=fsA^H z-p1*mAoLA?u2V*PCPXPH_Z=bUO0fzm$G9Tcl$)7JM!Br+rQA9BEL7qdl}Dg7f}mnL zAOPKz=P-lyzSG!GLajd4kZMrNry&Ss0;HdTVi^Hq($Ww_!g_TeBxevNf!B%EdJ%&`Et^r9 zDJ9V`aoPmW)r@%(B^*K|us$5#gq^SzHp6<4Qdy+DM000t*czF^uDf|G$s6MKXZ{A_bsg~hL0Ii0;%UE0Gsx>hy z*h)tXlaLUv(J~rsj83a%_>lzt577yTZU)f_NHET;sCbp^se=p148brw5e9H1D1ax7 zR!gP1h;^)4HgMKz<(>*UPhpTl;4OFo9)%oS&$p}u&VE7y5IT@1yv4FtTiFuUuG7Xd zdOgP_zoGzCJ_1j|wJ@9-qBts_zszEah~tX{h9;^|uCO4Qh?n3I@C zT%B~Gm|;V!X5o0^u0?ku3kE*3iUH!E>GG*&?KakaWbZqFUh}lH4jhpsQ6mx*&*gi)JR))RQ`L)#-v@1EpNLoH)bp{ z9e-dtxli_NPGwSB$?<{a_Ry}$-JkyhRvLRtMf?Exa%E<_#hiJe=)#sS&X+8|Zoywp zK8iaXWfx_GwSPtXF791AJobL_aF-MKX8*Rbulw%lwg(;cDtudOT+?%<-(Q>;;;-&9 zovY66Sl;yeiRv?t)MNf5o8ApK?a13(*Rr~L{*fJ+hp?ak@#U*k6_^@n%bc8>4O+B%5(sm!>~hed%PaMJrS z3$OEI69!Irlnp(Q`}QC)hxg`8wOq_EmELxU5CjvW1a`6o3kF`9`yS<`G1! columnCurrentStock; @FXML public Button buttonChangeAvailable; + @FXML + public Button buttonAdd; + @FXML + public Button buttonDelete; private final ObservableList medications = FXCollections.observableArrayList(); private MedicationDao dao; + private boolean hasEditPermissions; /** * Initialization method that is called after the binding of all the fields. */ @FXML public void initialize() { + int editPermissions = Permissions.MANAGEMENT | Permissions.OWNER; + int userPermissions = MainWindowController.getInstance().getUser().getPermissions(); + hasEditPermissions = (userPermissions & editPermissions) != 0; this.readAllAndShowInTableView(); this.columnId.setCellValueFactory(new PropertyValueFactory<>("id")); @@ -86,6 +97,12 @@ public class AllMedicationController { this.tableView.setItems(this.medications); + if (!hasEditPermissions) { + this.buttonAdd.setDisable(true); + this.buttonDelete.setDisable(true); + this.buttonChangeAvailable.setDisable(true); + } + } /** @@ -140,6 +157,22 @@ public class AllMedicationController { this.readAllAndShowInTableView(); } + + @FXML + public void handleDelete() { + Medication selectedItem = this.tableView.getSelectionModel().getSelectedItem(); + if (selectedItem == null) { + return; + } + + try { + this.dao.delete(selectedItem.getId()); + } catch (SQLException exception) { + exception.printStackTrace(); + } + this.readAllAndShowInTableView(); + } + /** * Internal method to create a {@link MedicationModalController MedicationModal}. * @@ -184,4 +217,5 @@ public class AllMedicationController { } }); } + } diff --git a/src/main/java/de/hitec/nhplus/medication/DeprecatedMedicationController.java b/src/main/java/de/hitec/nhplus/medication/DeprecatedMedicationController.java index 8d36f59..03d5947 100644 --- a/src/main/java/de/hitec/nhplus/medication/DeprecatedMedicationController.java +++ b/src/main/java/de/hitec/nhplus/medication/DeprecatedMedicationController.java @@ -15,6 +15,12 @@ import java.sql.SQLException; import java.util.List; import java.util.stream.Collectors; +/** + * The controller for viewing all deprecated {@link Medication}s. + * + * @author Armin Ribic + * @author Dorian Nemec + */ public class DeprecatedMedicationController { @FXML private TableView tableView; @@ -38,6 +44,9 @@ public class DeprecatedMedicationController { private final ObservableList medications = FXCollections.observableArrayList(); private MedicationDao dao; + /** + * Initialization method that is called after the binding of all the fields. + */ public void initialize() { this.readAllAndShowInTableView(); @@ -79,8 +88,9 @@ public class DeprecatedMedicationController { exception.printStackTrace(); } } + @FXML - public void handleChangeAvailable(){ + public void handleChangeAvailable() { Medication selectedItem = tableView.getSelectionModel().getSelectedItem(); if (selectedItem == null) { return; diff --git a/src/main/resources/de/hitec/nhplus/medication/AllMedicationView.fxml b/src/main/resources/de/hitec/nhplus/medication/AllMedicationView.fxml index d9456b9..63407cc 100644 --- a/src/main/resources/de/hitec/nhplus/medication/AllMedicationView.fxml +++ b/src/main/resources/de/hitec/nhplus/medication/AllMedicationView.fxml @@ -73,6 +73,7 @@ fx:id="buttonDelete" mnemonicParsing="false" prefWidth="90.0" + onAction="#handleDelete" text="Löschen" />