verschiedene fehler behoben
This commit is contained in:
+53
-36
@@ -1,59 +1,76 @@
|
||||
# module_buchungen.R
|
||||
|
||||
buchungenUI <- function(id) {
|
||||
ns <- NS(id)
|
||||
tagList(
|
||||
h3("Hauptbuchungen"),
|
||||
reactableOutput(ns("buchungen_table")),
|
||||
hr(),
|
||||
h3("Details / Gegenbuchungen"),
|
||||
reactableOutput(ns("details_table")),
|
||||
postingModuleUI(ns("posting_modal")),
|
||||
actionBttn(ns("add_trans"), "Transaktion hinzu", size = "sm", style = "material-flat", color = "warning"),
|
||||
actionBttn(ns("add_trans"), "Transaktion Löschen", size = "sm", style = "material-flat", color = "danger"),
|
||||
actionBttn(ns("add_detail"), "Detail hinzu", size = "sm", style = "material-flat", color = "success")
|
||||
br(),
|
||||
actionBttn(ns("add_detail"), "Detail hinzufügen", size = "sm", style = "material-flat", color = "success"),
|
||||
# Das UI-Element des Moduls (auch wenn es leer ist)
|
||||
postingModuleUI(ns("posting_modal"))
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
buchungenServer <- function(id) {
|
||||
buchungenServer <- function(id, conn) {
|
||||
moduleServer(id, function(input, output, session) {
|
||||
ns <- session$ns
|
||||
|
||||
postings <- reactiveVal(read_buch_tabelle(conn))
|
||||
details <- reactiveVal()
|
||||
tabelle_neu <- reactiveVal()
|
||||
# NEU: Eine reactive variable für die ID, die wir editieren wollen
|
||||
# current_entry_id <- reactiveVal(NULL)
|
||||
# Reactive States
|
||||
postings_data <- reactiveVal(read_buch_tabelle(conn))
|
||||
details_data <- reactiveVal(NULL)
|
||||
selected_trans_id <- reactiveVal(NULL)
|
||||
|
||||
# NEU: Den Modul-Server EINMALIG hier oben starten (nicht im Observer!)
|
||||
# entryEditServer("entry_edit", entry_id = current_entry_id, conn = conn)
|
||||
# Trigger-Objekt für das Modal: enthält post_id und einen Counter
|
||||
# Der Counter erzwingt eine Reaktion, auch wenn die gleiche ID zweimal geklickt wird
|
||||
modal_trigger <- reactiveVal(list(post_id = NULL, counter = 0))
|
||||
|
||||
# --- MODUL-SERVER STARTEN (EINMALIG) ---
|
||||
update_db_trigger <- postingModuleServer("posting_modal", conn, selected_trans_id, modal_trigger)
|
||||
|
||||
# Haupttabelle rendern
|
||||
output$buchungen_table <- renderReactable({
|
||||
# req(postings())
|
||||
f_reactable(postings(), coldefs = coldef_entries_tabelle)
|
||||
req(postings_data())
|
||||
f_reactable(daten = postings_data(), coldefs = coldef_entries_tabelle, selection = "single")
|
||||
})
|
||||
|
||||
# Buchungen und gegenbuchungen anzeigen
|
||||
selected <- reactive(getReactableState("buchungen_table", "selected"))
|
||||
observeEvent(selected(), {
|
||||
idwert <- postings()[selected(),"entry_id"] %>% pull
|
||||
details(read_buch_tabelle(conn, trans_id = idwert))
|
||||
output$details_table <- renderReactable(
|
||||
f_reactable(details(), coldefs = coldef_entries_tabelle)
|
||||
)
|
||||
# Details laden wenn Zeile gewählt wird
|
||||
sel_details <- reactive(getReactableState("buchungen_table", "selected"))
|
||||
observeEvent(sel_details(), ignoreInit = T, {
|
||||
t_id <- postings_data()[sel_details(), "entry_id"] %>% pull()
|
||||
selected_trans_id(t_id)
|
||||
details_data(read_buch_tabelle(conn, trans_id = t_id))
|
||||
})
|
||||
|
||||
# Buchunge auswähle
|
||||
selected_det <- reactive(getReactableState("details_table", "selected"))
|
||||
observeEvent(selected_det(),{
|
||||
idwert <- postings()[selected(),"id"] %>% pull
|
||||
tabelle_neu(postingModuleServer("posting_modal",conn, idwert))
|
||||
output$details_table <- renderReactable({
|
||||
req(details_data())
|
||||
f_reactable(details_data(), coldefs = coldef_entries_tabelle, selection = "single")
|
||||
})
|
||||
# Buchungstail hinzufügen
|
||||
observeEvent(input$add_detail, ignoreInit = T, {
|
||||
trans_id <- idwert <- postings()[selected(),"entry_id"] %>% pull
|
||||
post_id <- max_id(conn, "posting") + 1
|
||||
tabelle_neu(postingModuleServer("posting_modal",conn, idwert, post_id + 1))
|
||||
|
||||
# Event: Detail hinzufügen (Neu)
|
||||
observeEvent(input$add_detail, {
|
||||
req(selected_trans_id())
|
||||
modal_trigger(list(post_id = NULL, counter = modal_trigger()$counter + 1))
|
||||
})
|
||||
# Tabelle aktualisieren
|
||||
observeEvent(tabelle_neu(), ignoreInit = T, {
|
||||
details(read_buch_tabelle(conn, trans_id = idwert))
|
||||
|
||||
# Event: Detail editieren (Klick auf Detail-Tabelle)
|
||||
sel_detail <- reactive(getReactableState("details_table", "selected"))
|
||||
observeEvent(sel_detail(), ignoreInit = T, {
|
||||
p_id <- details_data()$id[sel]
|
||||
modal_trigger(list(post_id = p_id, counter = modal_trigger()$counter + 1))
|
||||
})
|
||||
|
||||
# --- DAS REAKTIVE UPDATE ---
|
||||
# Wenn das Modal sagt "Fertig", laden wir die Details neu
|
||||
observeEvent(update_db_trigger(), ignoreInit = TRUE, {
|
||||
req(selected_trans_id())
|
||||
# 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))
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user