diff --git a/src/fc/Examen.java b/src/fc/Examen.java
index c3c5f80da6b4fb64c280885490f8c0c73e46a10e..f2f6171f02079471a2ec3388b505dbebaffcf897 100644
--- a/src/fc/Examen.java
+++ b/src/fc/Examen.java
@@ -73,6 +73,7 @@ public class Examen {
*/
public void setCompte_rendu(String compte_rendu) {
this.compte_rendu = compte_rendu;
+ ConnexionDataBase.sqlUpdate("UPDATE EXAMEN SET COMPTE_RENDU = '"+compte_rendu+"' WHERE ID_DMR = '"+this.getId_dmr()+"' AND DATE_EXAMEN = TO_TIMESTAMP('"+this.getDate()+"', 'YYYY-MM-DD HH24:MI:SS.FF')");
}
public boolean creerExamen(String id_dmr, String Date, String Path, String acte) {
@@ -139,4 +140,11 @@ public class Examen {
return examens;
}
+ /**
+ * @return the acte
+ */
+ public String getActe() {
+ return acte;
+ }
+
}
diff --git a/src/ui/PageExamen.fxml b/src/ui/PageExamen.fxml
index 25d0ab3accfe85c76fa115224fba38f0400399b1..10bbfbff659d3ab8a8912d66a67159fdb0b431db 100644
--- a/src/ui/PageExamen.fxml
+++ b/src/ui/PageExamen.fxml
@@ -21,7 +21,7 @@
<Label fx:id="id_dmr" text="Identifiant du DMR" />
<Label fx:id="date" prefHeight="18.0" prefWidth="110.0" text="Date de l'examen" />
</children></VBox>
- <ImageView fx:id="image" fitHeight="184.0" fitWidth="168.0" layoutX="70.0" layoutY="131.0" pickOnBounds="true" preserveRatio="true">
+ <ImageView fx:id="image" fitHeight="242.0" fitWidth="249.0" layoutX="70.0" layoutY="131.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../jpg/sinus/sinus1_0000.jpg" />
</image></ImageView>
@@ -30,6 +30,6 @@
<Font name="System Italic" size="14.0" />
</font></TextArea>
- <Button layoutX="574.0" layoutY="332.0" mnemonicParsing="false" onAction="#enregistrerCompteRendu" text="Valider" />
+ <Button layoutX="482.0" layoutY="330.0" mnemonicParsing="false" onAction="#enregistrerCompteRendu" text="Valider" />
</children>
</AnchorPane>
diff --git a/src/ui/PageExamenController.java b/src/ui/PageExamenController.java
index 4dab191a5cbd9cd503aa2ffa137bdb069066bb16..b84d1113625ca8ca7ed1d78c93a3f666be27ac3e 100644
--- a/src/ui/PageExamenController.java
+++ b/src/ui/PageExamenController.java
@@ -38,23 +38,21 @@ public class PageExamenController implements Initializable {
private ImageView image;
private Examen examen;
-
+
@FXML
private TextArea compteRenduText;
-
+
@FXML
private Label id_dmr;
-
+
@FXML
private Label date;
-
public void initialize(URL url, ResourceBundle rb) {
// TODO
-
}
-
+
// @FXML
// private void actionDeconnexion(ActionEvent event) {
// try {
@@ -76,28 +74,31 @@ public class PageExamenController implements Initializable {
// // Afficher un message d'erreur à l'utilisateur si nécessaire
// }
// }
-
public void setExamen(Examen examen) {
this.examen = examen;
- if (examen!=null){
- try {
- //Image image2 = new Image("file:" + "src/jpg/abdomen/cor494-i436.jpg");
- System.out.println("path :" + examen.getImage_path());
- Image image2 = new Image(new FileInputStream(examen.getImage_path()));// Assurez-vous que le chemin est correct
- this.image.setImage(image2);
- this.image.setPreserveRatio(true);
- this.image.setFitWidth(250);
- this.image.setFitHeight(250);
+ if (examen != null) {
+ try {
+ //Image image2 = new Image("file:" + "src/jpg/abdomen/cor494-i436.jpg");
+ System.out.println("path :" + examen.getImage_path());
+ Image image2 = new Image(new FileInputStream(examen.getImage_path()));// Assurez-vous que le chemin est correct
+ this.image.setImage(image2);
+ this.image.setPreserveRatio(true);
+ this.image.setFitWidth(250);
+ this.image.setFitHeight(250);
+
+ System.out.println("Image chargée : ");
+ } catch (Exception e) {
+ System.out.println("Erreur de chargement de l'image : " + e.getMessage());
+ }
+ id_dmr.setText("ID DMR : " + examen.getId_dmr());
+ date.setText("Date : " + examen.getDate());
+ if (examen.getCompte_rendu() != null) {
+ this.compteRenduText.setText(examen.getCompte_rendu());
+ }
- System.out.println("Image chargée : ");
- } catch (Exception e) {
- System.out.println("Erreur de chargement de l'image : " + e.getMessage());
- }
- id_dmr.setText("ID DMR : " + examen.getId_dmr());
- date.setText("Date : " + examen.getDate());
}
}
-
+
public void afficherCompteRendu() {
if (examen != null) {
compteRenduText.setText(examen.getCompte_rendu());
@@ -112,7 +113,7 @@ public class PageExamenController implements Initializable {
examen.setCompte_rendu(compteRendu);
}
}
- // Mise à jour de l'examen dans la base de données
+ // Mise à jour de l'examen dans la base de données
/* if (majBD(examen)) {
System.out.println("Compte rendu enregistré avec succès.");
} else {
diff --git a/src/ui/RadiologuePage.fxml b/src/ui/RadiologuePage.fxml
index 567b26e8bf9c713960b1a45a24b853d8ab01f689..82bc8668db7621c706220b2ed6bb5ad3871c0c68 100644
--- a/src/ui/RadiologuePage.fxml
+++ b/src/ui/RadiologuePage.fxml
@@ -53,7 +53,7 @@
<TableView fx:id="tableViewExamens" prefHeight="265.0" prefWidth="505.0">
<columns>
<TableColumn fx:id="columnDateExamen" text="Date" />
- <TableColumn fx:id="columnImagerie" prefWidth="159.99996948242188" text="Imagerie" />
+ <TableColumn fx:id="columnActe" prefWidth="159.99996948242188" text="Acte" />
<TableColumn fx:id="columnCompteRendu" prefWidth="638.6666717529297" text="Compte Rendu" />
</columns>
diff --git a/src/ui/RadiologuePageController.java b/src/ui/RadiologuePageController.java
index a61f86a027eb79afc6e445e1e3e08813f513f614..898a7c497fb540a61a46f681a343b993de7b6fca 100644
--- a/src/ui/RadiologuePageController.java
+++ b/src/ui/RadiologuePageController.java
@@ -68,7 +68,7 @@ public class RadiologuePageController {
@FXML
private TableColumn<Examen, String> columnDateExamen;
@FXML
- private TableColumn<Examen, String> columnImagerie;
+ private TableColumn<Examen, String> columnActe;
@FXML
private TableColumn<Examen, String> columnCompteRendu;
@@ -96,6 +96,7 @@ public class RadiologuePageController {
columnMotif.setCellValueFactory(new PropertyValueFactory<>("Motif"));
columnDateExamen.setCellValueFactory(new PropertyValueFactory<>("date"));
columnCompteRendu.setCellValueFactory(new PropertyValueFactory<>("compte_rendu"));
+ columnActe.setCellValueFactory(new PropertyValueFactory<>("acte"));
if (tableViewExamens == null) {
System.out.println("Erreur : tableViewExamens est null.");
return;