From 76d32b8ce81e85454170bf7712a1abf4bca9acf5 Mon Sep 17 00:00:00 2001
From: Vincent Bourgmayer <vincent.bourgmayer@eelo.io>
Date: Tue, 26 Jan 2021 11:12:51 +0000
Subject: [PATCH] Revert "second proposition for fixed part of feedback"

This reverts commit 7c49286e95810a72afe261d22f7352fb257e1299
---
 .../controllers/subcontrollers/FeedbackController.java        | 4 ++--
 src/main/resources/fxml/9-feedback.fxml                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/FeedbackController.java b/src/main/java/ecorp/easy/installer/controllers/subcontrollers/FeedbackController.java
index afc8aa2e..56cb7123 100644
--- a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/FeedbackController.java
+++ b/src/main/java/ecorp/easy/installer/controllers/subcontrollers/FeedbackController.java
@@ -51,7 +51,7 @@ public class FeedbackController extends AbstractSubController {
     
     private @FXML Button sendAnswerBtn;
     private @FXML TextArea commentArea;
-    private @FXML TextArea fixedFeedbackContent;
+    private @FXML Label fixedFeedbackContent;
     private @FXML Label thanksLabel;
     private @FXML Label sendPrecision;
     private Button selectedFeelings;
@@ -144,7 +144,7 @@ public class FeedbackController extends AbstractSubController {
         String time = LocalDateTime.now().withNano(0).toString();
         
         sb.append("Timestamp: "+time.replace("T", " "))
-                .append("\nDevice model: FP3, FP3")
+                .append("\nDevice model: "+this.deviceModel)
                 .append("\nOS name: "+AppConstants.OsName)
                 .append("\neasy-installer version:"+AppConstants.APP_VERSION)
                 .append("\nFeelings: ");
diff --git a/src/main/resources/fxml/9-feedback.fxml b/src/main/resources/fxml/9-feedback.fxml
index 221f85b2..b569bf4f 100644
--- a/src/main/resources/fxml/9-feedback.fxml
+++ b/src/main/resources/fxml/9-feedback.fxml
@@ -86,7 +86,7 @@
         <Label text="%feedback_lbl_comment"/>
         <VBox alignment="CENTER" spacing="10"> 
             <children>
-                <TextArea fx:id="fixedFeedbackContent" disable="true" maxHeight="175.0" maxWidth="844.0" editable="false"/>
+                <Label fx:id="fixedFeedbackContent" maxWidth="844.0" wrapText="true"/>
                 <TextArea fx:id="commentArea"  maxWidth="844.0"/>
             </children>
         </VBox>
-- 
GitLab