From 6631008fcca1fa767e1fd9064af19a21865e515e Mon Sep 17 00:00:00 2001
From: Thomas Breil <thomas.breil@etu.unilim.fr>
Date: Fri, 12 Jan 2024 15:13:37 +0100
Subject: [PATCH] Fix GlossaryDetails issues

---
 src/main/kotlin/main/Detail.kt |  1 +
 src/main/kotlin/main/Main.kt   | 54 ++++++++++++++++++----------------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/main/kotlin/main/Detail.kt b/src/main/kotlin/main/Detail.kt
index 45d9e5a..7419fe3 100644
--- a/src/main/kotlin/main/Detail.kt
+++ b/src/main/kotlin/main/Detail.kt
@@ -28,6 +28,7 @@ fun glossaryDetailedPage(
     onExportClick: () -> Unit,
     onImportClick: () -> Unit
 ) {
+    println(glossary)
     Column(
         modifier = Modifier.fillMaxSize(),
         verticalArrangement = Arrangement.Top, // Align content at the top
diff --git a/src/main/kotlin/main/Main.kt b/src/main/kotlin/main/Main.kt
index a10aa4e..9413f9d 100644
--- a/src/main/kotlin/main/Main.kt
+++ b/src/main/kotlin/main/Main.kt
@@ -34,7 +34,7 @@ fun app() {
     val languageManager = remember { LanguageManager() }
     MaterialTheme {
 
-        val glossaryDetail: List<Word> by remember { mutableStateOf(emptyList()) }
+
         var isJavaScriptFileSelected by remember { mutableStateOf(false) }
 
 
@@ -81,32 +81,34 @@ fun app() {
             }
             
             "glossaireDetail" -> {
-                glossaryDetailedPage(
-                    glossary = glossaryDetail,
-                    glossaryName = appState.selectedGlossary?.name ?: "",
-                    onBackClick = { currentPage.value = "glossaires" },
-                    onAddWordClick = { currentPage.value = "formulaire" },
-                    onExportClick = {
-                        val fileDialog = FileDialog(Frame(), "Save as CSV", FileDialog.SAVE)
-                        fileDialog.file = appState.selectedGlossary?.name // Initial file name
-                        fileDialog.isVisible = true
-                        val selectedFile = fileDialog.file
-                        val selectedDirectory = fileDialog.directory
-                        if (selectedFile != null) {
-                            val csvFilePath = "$selectedDirectory$selectedFile"
-                            println("Exporting to: $csvFilePath")
-                            appState.selectedGlossary?.let { exportToCSV(it, csvFilePath) }
-                        } else {
-                            println("Export command cancelled by user.")
+                appState.selectedGlossary?.let { loadDatasFromFile(it.jsonFilePath) }?.let {
+                    glossaryDetailedPage(
+                        glossary = it,
+                        glossaryName = appState.selectedGlossary?.name ?: "",
+                        onBackClick = { currentPage.value = "glossaires" },
+                        onAddWordClick = { currentPage.value = "formulaire" },
+                        onExportClick = {
+                            val fileDialog = FileDialog(Frame(), "Save as CSV", FileDialog.SAVE)
+                            fileDialog.file = appState.selectedGlossary?.name // Initial file name
+                            fileDialog.isVisible = true
+                            val selectedFile = fileDialog.file
+                            val selectedDirectory = fileDialog.directory
+                            if (selectedFile != null) {
+                                val csvFilePath = "$selectedDirectory$selectedFile"
+                                println("Exporting to: $csvFilePath")
+                                appState.selectedGlossary?.let { exportToCSV(it, csvFilePath) }
+                            } else {
+                                println("Export command cancelled by user.")
+                            }
+                        },
+                        onImportClick = {
+                            selectFile(setOf("csv", "xlsx")) { filePath ->
+                                println("Importing file: $filePath")
+                                appState.selectedGlossary?.let { importFile(it, filePath) }
+                            }
                         }
-                    },
-                    onImportClick = {
-                        selectFile(setOf("csv", "xlsx")) { filePath ->
-                            println("Importing file: $filePath")
-                            appState.selectedGlossary?.let { importFile(it, filePath) }
-                        }
-                    }
-                )
+                    )
+                }
             }
 
             "formulaire" -> {