anzeige der neuen DS hinzugefügt

R/_funktionen/f_table.R

@@ -16,7 +16,7 @@ f_reactable <- function(daten, coldefs = NULL, selection = "single", defaultSele
     theme = reactableTheme(
       highlightColor = "#e6f7ff", # Etwas dezenter als knallgrün, optional
       # borderColor = "#dfe2e5",
-      rowSelectedStyle = list(backgroundColor = "#98F5FF")
+      rowSelectedStyle = list(backgroundColor = "#98F5FF")#
     ),
     rowStyle = list(cursor = "pointer"),
     onClick = "select",

R/_funktionen/scroll_to_Row.R

@@ -0,0 +1,19 @@
+##
+## Datum    : 2026-03-19_14-26 
+## Name     : Christian Oswald
+## Datei    : scroll_to_Row.R
+## Projekt  : gemfin-shiny
+## Kommentar: Springt zur gewünschten Reactable Zeile
+##
+
+scroll_to_row <- function(table_id, row_idx, delay_ms = 200) {
+  shinyjs::delay(delay_ms, {
+    runjs(sprintf("
+      const rows = document.querySelectorAll('#%s .rt-tr-group');
+      const idx = %d - 1;
+      if (rows[idx]) {
+        rows[idx].scrollIntoView({behavior: 'smooth', block: 'center'});
+      }
+    ", table_id, row_idx))
+  })
+}

R/buchungen_mod.R

@@ -3,6 +3,7 @@
 buchungenUI <- function(id) {
   ns <- NS(id)
   tagList(
+    useShinyjs(), 
     h3("Hauptbuchungen"),
     reactableOutput(ns("buchungen_table")),
     hr(),
@@ -21,106 +22,115 @@ buchungenUI <- function(id) {
 buchungenServer <- function(id, conn) {
   moduleServer(id, function(input, output, session) {
     ns <- session$ns
+    
     # * Reactive Variablen ----
-    postings_data <- reactiveVal(read_buch_tabelle(conn))
+    postings_data      <- reactiveVal(read_buch_tabelle(conn))
-    details_data <- reactiveVal(NULL)
+    details_data       <- reactiveVal(NULL)
-    selected_trans_id <- reactiveVal(NULL)
+    selected_trans_id  <- reactiveVal(NULL)
-    current_main_idx <- reactiveVal(NULL)
+    current_main_idx   <- reactiveVal(NULL)
-    # Trigger-Objekt für das Modal: enthält post_id und einen Counter
+    reset_trigger      <- reactiveVal(0)  # ← neu: erzwingt Re-render mit Filter-Reset
-    # Der Counter erzwingt eine Reaktion, auch wenn die gleiche ID zweimal geklickt wird
+    modal_trigger      <- reactiveVal(list(post_id = NULL, counter = 0))
-    modal_trigger <- reactiveVal(list(post_id = NULL, counter = 0))
+    
-    # * Modal starten (EINMALIG) ----
     update_db_trigger <- postingModuleServer("posting_modal", conn, selected_trans_id, modal_trigger)
     
     # * Haupttabelle rendern ----
     output$buchungen_table <- renderReactable({
-      req(postings_data())
+      reset_trigger()  # Abhängigkeit – bei Increment wird neu gerendert
-         f_reactable(
+      f_reactable(
-        daten = postings_data(), coldefs = coldef_entries_tabelle,
+        daten          = postings_data(),
-        selection = "single",
+        coldefs        = coldef_entries_tabelle,
-        hoehe = "60vh",
+        selection      = "single",
+        hoehe          = "60vh",
         defaultSelected = current_main_idx()
       )
     })
     
-    # * Details-Tabelle  laden ----
+    # * Details-Tabelle laden ----
-    # sel_details <- reactive(getReactableState("buchungen_table", "selected"))
+    sel_details <- reactive(getReactableState("buchungen_table", "selected"))
-    # observeEvent(sel_details(), ignoreInit = T, {
+    observeEvent(sel_details(), ignoreInit = TRUE, {
-    #   browser()
+      req(sel_details())
-    #   req(sel_details())
+      current_main_idx(sel_details())
-    #   current_main_idx(getReactableState("buchungen_table", "selected"))
+      t_id <- postings_data()[sel_details(), "entry_id"] |> pull()
-    #   t_id <- postings_data()[sel_details(), "entry_id"] %>% pull()
+      selected_trans_id(t_id)
-    #   selected_trans_id(t_id)
+      details_data(read_buch_tabelle(conn, trans_id = t_id))
-    #   details_data(read_buch_tabelle(conn, trans_id = t_id))
+    })
-    # })
+    output$details_table <- renderReactable({
-    # output$details_table <- renderReactable({
+      req(details_data())
-    #   req(details_data())
+      f_reactable(
-    #      f_reactable(details_data(), coldefs = coldef_entries_tabelle, selection = "single", hoehe = NULL)
+        details_data(),
-    # })
+        coldefs   = coldef_entries_tabelle,
+        selection = "single",
+        hoehe     = NULL
+      )
+    })
     
     # * Detail hinzufügen ----
-    # observeEvent(input$add_detail, {
+    observeEvent(input$add_detail, {
-    #   req(selected_trans_id())
+      req(selected_trans_id())
-    #   modal_trigger(list(post_id = NULL, counter = modal_trigger()$counter + 1))
+      modal_trigger(list(post_id = NULL, counter = modal_trigger()$counter + 1))
-    # })
+    })
     
     # * Detail editieren (Klick auf Detail-Tabelle) ----
-    # sel_detail <- reactive(getReactableState("details_table", "selected"))
+    sel_detail <- reactive(getReactableState("details_table", "selected"))
-    # observeEvent(sel_detail(), ignoreInit = T, {
-    #   p_id <- details_data()$id[sel_detail()]
-    #   modal_trigger(list(post_id = p_id, counter = modal_trigger()$counter + 1))
-    # })
     
-    # * Details laden ----
+    observeEvent(sel_detail(), ignoreInit = TRUE, {
-    # observeEvent(update_db_trigger(), ignoreInit = TRUE, {
+      p_id <- details_data()$id[sel_detail()]
-    #   req(selected_trans_id())
+      modal_trigger(list(post_id = p_id, counter = modal_trigger()$counter + 1))
-    #   # Tabellen-Daten neu aus DB ziehen
+    })
-    #   details_data(read_buch_tabelle(conn, trans_id = selected_trans_id()))
-    #   # Optional: Auch Haupttabelle erneuern, falls sich Summen geändert haben
-    #   postings_data(read_buch_tabelle(conn))
-    #   updateReactable("buchungen_table", data = postings_data(read_buch_tabelle(conn)))
-    # })
     
-    # * Neue Transaktion  ----
+    # * DB-Update durch Modal ----
-    # observeEvent(input$add_trans, {
+    observeEvent(update_db_trigger(), ignoreInit = TRUE, {
-    #   new_t_id <- max_id(conn, "entries") + 1
+      req(selected_trans_id())
-    #   # 1. Entry anlegen
+      details_data(read_buch_tabelle(conn, trans_id = selected_trans_id()))
-    #   dbxInsert(conn, "entries", data.frame(id = new_t_id))
+      postings_data(read_buch_tabelle(conn))
-    #   # 2. Zwei Postings direkt vor-anlegen (z.B. mit Betrag 0)
+      # Kein Re-render nötig – Filter/Sortierung bleibt erhalten
-    #   p_id1 <- max_id(conn, "postings") + 1
+      updateReactable("buchungen_table", data = postings_data())
-    #   p_id2 <- p_id1 + 1
+    })
-    #   new_postings <- data.frame(
+    
-    #     id = c(p_id1, p_id2),
+    # * Neue Transaktion ----
-    #     entry_id = c(new_t_id, new_t_id),
+    observeEvent(input$add_trans, {
-    #     amount = c(0, 0),
+      new_t_id <- max_id(conn, "entries") + 1
-    #     account_id = c(0, 0),
+      dbxInsert(conn, "entries", data.frame(id = new_t_id))
-    #     valuta = c(Sys.Date(), Sys.Date())
+      
-    #   )
+      p_id1 <- max_id(conn, "postings") + 1
-    #   dbxInsert(conn, "postings", new_postings)
+      p_id2 <- p_id1 + 1
-    #   # 3. UI refreshen
+      dbxInsert(conn, "postings", data.frame(
-    #   selected_trans_id(new_t_id)
+        id       = c(p_id1, p_id2),
-    #   postings_data(read_buch_tabelle(conn))
+        entry_id = c(new_t_id, new_t_id),
-    #   neue_zeile <- which(postings_data()$id == p_id1)
+        amount   = c(0, 0),
-    #   details_data(read_buch_tabelle(conn, trans_id = new_t_id))
+        account_id = c(0, 0),
-    #   daten_postings <- postings_data()
+        valuta   = c(Sys.Date(), Sys.Date())
-    #   daten_details <- details_data()
+      ))
-    #   updateReactable("buchungen_table", data = daten_postings, selected = neue_zeile, filters = NULL, sortsBy=NULL)
+      ## ** Daten aktualisieren ----
-    # })
+      postings_data(read_buch_tabelle(conn))
+      selected_trans_id(new_t_id)
+      details_data(read_buch_tabelle(conn, trans_id = new_t_id))
+      ## ** Index in neuen Daten suchen ----
+      neue_zeile <- which(postings_data()$id == p_id1)
+      current_main_idx(neue_zeile)
+      ## ** Re-render erzwingen → Filter wird zurückgesetzt, neue Zeile selektiert ----
+      reset_trigger(isolate(reset_trigger()) + 1)
+      scroll_to_row(ns("buchungen_table"), neue_zeile)
+      showNotification(
+        "Filter zurückgesetzt – neue Transaktion ist jetzt sichtbar.",
+        type    = "message",
+        duration = 3
+      )
+    })
     
     # * Transaktion löschen ----
-    # observeEvent(input$del_trans, ignoreInit = T, {
+    observeEvent(input$del_trans, ignoreInit = TRUE, {
-    #   req(selected_trans_id())
+      req(selected_trans_id())
-    #   print(selected_trans_id())
+      dbxDelete(conn, "postings", where = data.frame(entry_id = selected_trans_id()))
-    #   dbxDelete(conn, "postings", where = data.frame(entry_id = selected_trans_id()))
+      dbxDelete(conn, "entries",  where = data.frame(id = selected_trans_id()))
-    #   dbxDelete(conn, "entries", where = data.frame(id = selected_trans_id()))
+      
-    #   postings_data(read_buch_tabelle(conn))
+      postings_data(read_buch_tabelle(conn))
-    #   details_data(leer_df_from_table(conn, "postings"))
+      current_main_idx(NULL)
-    #   daten_postings <- postings_data()
+      selected_trans_id(NULL)
-    #   daten_details <- details_data(NULL)
+      details_data(NULL)
-    #   browser()
+      
-    #   updateReactable("buchungen_table", data = daten_postings)
+      updateReactable("buchungen_table", data = postings_data())
-    #   current_main_idx(NULL)
+      # details_table re-rendert automatisch weil details_data(NULL) → req() schlägt fehl
-    #   # updateReactable("details_table", data = daten_details)
+    })
-    # })
   })
 }

global.R

@@ -9,6 +9,7 @@ library("shinydashboard")
 library("reactable")
 library("conflicted")
 library("R.utils")
+library("shinyjs")
 
 conflicts_prefer(dplyr::select)
 conflicts_prefer(dplyr::filter)