feat: separate last comment/other comment

Author: MurielleDelmotte

NAMESPACE

@@ -25,6 +25,8 @@ importFrom(cli,cli_alert_danger)
 importFrom(cli,cli_alert_info)
 importFrom(cli,cli_rule)
 importFrom(digest,digest)
+importFrom(dplyr,arrange)
+importFrom(dplyr,desc)
 importFrom(dplyr,distinct)
 importFrom(dplyr,filter)
 importFrom(dplyr,full_join)

R/app_server.R

@@ -93,7 +93,8 @@ app_server <- function(input, output, session) {
           date_p = as.Date(info$chene$planting_date),
           der_truf = info$truffes$derniere_truffe,
           tot_weight = info$truffes$weight_tot,
-          comments = info$truffes$comments
+          last_comment = info$truffes$last_comment,
+          other_comments = info$truffes$other_comments
         )
       )
     }

R/check_param.R

@@ -23,7 +23,7 @@ check_names_dataframe <- function(names, df) {
 
 #' formater_comment
 #' @noRd
-formater_comment <- function(comment) {
-  c <- paste0(comment, " : ")
+formater_comment <- function(date_found, comment) {
+  c <- paste(date_found, comment, sep = " : ")
   return(c)
 }

R/get_info_chene_truffe.R

@@ -11,7 +11,7 @@
 #' @return A list containing information about truffles associated with the oak tree,
 #' including the total weight, date of the last truffle found, and any comments.
 #'
-#' @importFrom dplyr filter summarise pull
+#' @importFrom dplyr filter summarise pull arrange desc
 #' @export
 #'
 #' @examples
@@ -24,42 +24,48 @@
 #' get_info_chene_truffe(dbtruffe = truffe, theidoak = "119")
 #' DBI::dbDisconnect(conn)
 get_info_chene_truffe <- function(dbtruffe, theidoak) {
-  check_param(dbtruffe, "data.frame")
-  check_param(theidoak, "character")
-  check_names_dataframe(c("idoak", "weight", "date_found", "comment"), dbtruffe)
+    check_param(dbtruffe, "data.frame")
+    check_param(theidoak, "character")
+    check_names_dataframe(c(
+        "idoak", "weight", "date_found",
+        "comment"
+    ), dbtruffe)
+    truffe_chene <- filter(dbtruffe, idoak == theidoak)
+    if (nrow(truffe_chene) == 0) {
+        return(list(weight_tot = 0, derniere_truffe = "-", last_comment = "-", other_comments = "-"))
+    }
 
-  truffe_chene <- dbtruffe |>
-    filter(idoak == theidoak)
 
-  if (nrow(truffe_chene) == 0) {
-    return(list(
-      weight_tot = 0,
-      derniere_truffe = "-",
-      comments = "-"
-    ))
-  }
+    weight_tot <- pull(summarise(truffe_chene, weight_tot = sum(weight,
+        na.rm = TRUE
+    )), weight_tot)
+    derniere_truffe <- pull(summarise(truffe_chene, date_found = as.Date(max(date_found,
+        na.rm = TRUE
+    ))), date_found)
 
-  weight_tot <- truffe_chene |>
-    summarise(weight_tot = sum(weight, na.rm = TRUE)) |>
-    pull(weight_tot)
+    sort_comment <- truffe_chene |>
+        arrange(desc(date_found))
 
-  derniere_truffe <- truffe_chene |>
-    summarise(date_found = as.Date(max(date_found, na.rm = TRUE))) |>
-    pull(date_found)
-
-  comments <-
-    paste(
-      paste(
-        as.Date(truffe_chene$date_found),
-        truffe_chene$comment,
+    last_comment <- paste(as.Date(sort_comment$date_found[1]),
+        sort_comment$comment[1],
         sep = " : "
-      ),
-      collapse = "<br>"
     )
 
-  return(list(
-    weight_tot = weight_tot,
-    derniere_truffe = derniere_truffe,
-    comments = comments
-  ))
-}
+    if (nrow(sort_comment) > 1) {
+        other_comments <- paste(paste(as.Date(sort_comment$date_found[-1]),
+            sort_comment$comment[-1],
+            sep = " : "
+        ), collapse = "<br>")
+    } else {
+        other_comments <- "-"
+    }
+
+
+
+    return(list(
+        weight_tot = weight_tot, 
+        derniere_truffe = derniere_truffe,
+        last_comment = last_comment,
+        other_comments = other_comments
+    ))
+}

R/update_db_truffe.R

@@ -43,7 +43,7 @@
 #'   comment = "It's good!"
 #' )
 update_db_truffe <- function(conn, idtruffle, idoak, date_found, weight, comment, estimation) {
-  comment <- formater_comment(comment)
+  comment <- formater_comment(date_found, comment)
 
   # Build and execute the SQL query to update the line
 

R/write_db_new_truffe.R

@@ -28,7 +28,7 @@ write_db_new_truffe <-
       date_found = as.character(date_found),
       weight = weight,
       estimation = estimation,
-      comment = formater_comment(comment)
+      comment = formater_comment(date_found, comment)
     )
 
     dbAppendTable(conn, "truffe", add_truffe)

inst/app/www/template_identity_card.html

@@ -4,4 +4,9 @@
 <hr> <b>Dernier Réensemencement : </b> {{date_reens}}
 <hr> <b>Dernière truffe : </b> {{der_truf}}
 <hr> <b>Poids total trouvé : </b> {{tot_weight}} g
-<hr> <b>Commentaires : </b> {{comments}}
+<hr> <b>Dernier Commentaire : </b> {{last_comment}}
+<hr> 
+<details>
+  <summary><b>Autres Commentaires :</b></summary>
+  {{other_comments}}
+</details>

tests/testthat/test-get_info.R

@@ -39,7 +39,8 @@ test_that("get_info works", {
     truffes = list(
       weight_tot = 0,
       derniere_truffe = "-",
-      comments = "-"
+      last_comment = "-",
+      other_comments = "-"
     ),
     reensemence = "2021-06-20"
   )
@@ -56,7 +57,8 @@ test_that("get_info works", {
       truffes = list(
         weight_tot = 125,
         derniere_truffe = structure(19844, class = "Date"),
-        comments = "2024-04-01 : Small truffle<br>2024-05-01 : Medium truffle"
+        last_comment = "2024-05-01 : Medium truffle",
+        other_comments = "2024-04-01 : Small truffle"
       ),
       reensemence = "-"
     )

tests/testthat/test-get_info_chene_truffe.R

@@ -25,7 +25,8 @@ test_that("get_info_chene_truffe works", {
     list(
       weight_tot = 0,
       derniere_truffe = "-",
-      comments = "-"
+      last_comment = "-",
+      other_comments = "-"
     )
   )
 
@@ -34,7 +35,8 @@ test_that("get_info_chene_truffe works", {
     list(
       weight_tot = 125,
       derniere_truffe = as.Date("2024-05-01"),
-      comments = "2024-04-01 : Truffe petite<br>2024-05-01 : Truffe moyenne"
+      last_comment = "2024-05-01 : Truffe moyenne",
+      other_comments = "2024-04-01 : Truffe petite"
     )
 
   expect_equal(get_info_chene_truffe(dbtruffe, "3"), expected_output)

tests/testthat/test-update_db_truffe.R

@@ -36,7 +36,7 @@ test_that("update_db_truffe works", {
       date_found = 18294,
       weight = 22,
       estimation = 0,
-      comment = formater_comment("New comment")
+      comment = formater_comment("18294", "New comment")
     )
   expect_equal(
     DBI::dbReadTable(conn, "truffe") |>