Accounts Tree erstellt
This commit is contained in:
+71
-39
@@ -24,32 +24,38 @@ buchungenUI <- function(id) {
|
||||
)
|
||||
}
|
||||
|
||||
buchungenServer <- function(id, conn, aktiver_filter = reactive("alle")) {
|
||||
buchungenServer <- function(id, conn, r_global) {
|
||||
moduleServer(id, function(input, output, session) {
|
||||
ns <- session$ns
|
||||
|
||||
# * Reactive Variablen ----
|
||||
# ── Reactive Variablen ─────────────────────────────────────────────────────
|
||||
postings_data <- reactiveVal(read_buch_tabelle(conn))
|
||||
details_data <- reactiveVal(NULL)
|
||||
selected_trans_id <- reactiveVal(NULL)
|
||||
current_main_idx <- reactiveVal(NULL)
|
||||
reset_trigger <- reactiveVal(0) # ← neu: erzwingt Re-render mit Filter-Reset
|
||||
reset_trigger <- reactiveVal(0)
|
||||
modal_trigger <- reactiveVal(list(post_id = NULL, counter = 0))
|
||||
highlighted_valuta <- reactiveVal(NULL)
|
||||
|
||||
update_db_trigger <- postingModuleServer(
|
||||
"posting_modal", conn, selected_trans_id, modal_trigger
|
||||
)
|
||||
|
||||
update_db_trigger <- postingModuleServer("posting_modal", conn, selected_trans_id, modal_trigger)
|
||||
# ── Filter ─────────────────────────────────────────────────────────────────
|
||||
aktiver_filter <- reactive(r_global$buchungen_filter)
|
||||
|
||||
gefilterte_daten <- reactive({
|
||||
d <- postings_data()
|
||||
switch(aktiver_filter(),
|
||||
"giro" = d |> filter(grepl("0130", account_name)),
|
||||
"monat" = d |> filter(
|
||||
floor_date(as.Date(valuta), "month") == floor_date(Sys.Date(), "month")
|
||||
|
||||
),
|
||||
d
|
||||
f <- aktiver_filter()
|
||||
if (f == "alle") d
|
||||
else if (f == "giro") d |> filter(grepl("0130", account_name))
|
||||
else if (f == "monat") d |> filter(
|
||||
floor_date(as.Date(valuta), "month") == floor_date(Sys.Date(), "month")
|
||||
)
|
||||
else if (startsWith(f, "contact:")) d |> filter(contact_id == as.integer(sub("contact:", "", f)))
|
||||
else if (startsWith(f, "project:")) d |> filter(project_id == as.integer(sub("project:", "", f)))
|
||||
else if (startsWith(f, "account:")) d |> filter(account_id == as.integer(sub("account:", "", f)))
|
||||
else d
|
||||
})
|
||||
|
||||
observeEvent(aktiver_filter(), {
|
||||
@@ -58,29 +64,55 @@ buchungenServer <- function(id, conn, aktiver_filter = reactive("alle")) {
|
||||
details_data(NULL)
|
||||
})
|
||||
|
||||
# * Haupttabelle rendern ----
|
||||
# ── Sprung von anderem Modul ───────────────────────────────────────────────
|
||||
observeEvent(r_global$jump_to_entry_id, ignoreInit = TRUE, {
|
||||
req(r_global$jump_to_entry_id)
|
||||
t_id <- r_global$jump_to_entry_id
|
||||
|
||||
# Daten neu laden
|
||||
postings_data(read_buch_tabelle(conn))
|
||||
|
||||
# Zeile suchen
|
||||
idx <- which(gefilterte_daten()$entry_id == t_id)[1]
|
||||
req(!is.na(idx))
|
||||
|
||||
current_main_idx(idx)
|
||||
selected_trans_id(t_id)
|
||||
details_data(read_buch_tabelle(conn, trans_id = t_id))
|
||||
highlighted_valuta(gefilterte_daten()[idx, "valuta"])
|
||||
|
||||
reset_trigger(isolate(reset_trigger()) + 1)
|
||||
scroll_to_row(ns("buchungen_table"), idx)
|
||||
|
||||
# Sprungziel zurücksetzen
|
||||
r_global$jump_to_entry_id <- NULL
|
||||
})
|
||||
|
||||
# ── Haupttabelle rendern ───────────────────────────────────────────────────
|
||||
output$buchungen_table <- renderReactable({
|
||||
reset_trigger()
|
||||
f_reactable(
|
||||
daten = gefilterte_daten(), # ← geändert
|
||||
coldefs = coldef_entries_tabelle,
|
||||
selection = "single",
|
||||
hoehe = "60vh",
|
||||
defaultSelected = current_main_idx(),
|
||||
daten = gefilterte_daten(),
|
||||
coldefs = coldef_entries_tabelle,
|
||||
selection = "single",
|
||||
hoehe = "60vh",
|
||||
defaultSelected = current_main_idx(),
|
||||
highlight_valuta = highlighted_valuta()
|
||||
)
|
||||
})
|
||||
|
||||
# * Details-Tabelle laden ----
|
||||
# ── Details laden ──────────────────────────────────────────────────────────
|
||||
sel_details <- reactive(getReactableState("buchungen_table", "selected"))
|
||||
|
||||
observeEvent(sel_details(), ignoreInit = TRUE, {
|
||||
req(sel_details())
|
||||
highlighted_valuta(gefilterte_daten()[sel_details(), "valuta"])
|
||||
current_main_idx(sel_details())
|
||||
t_id <- gefilterte_daten()[sel_details(), "entry_id"] |> pull() # ← geändert
|
||||
t_id <- gefilterte_daten()[sel_details(), "entry_id"] |> pull()
|
||||
selected_trans_id(t_id)
|
||||
details_data(read_buch_tabelle(conn, trans_id = t_id))
|
||||
})
|
||||
|
||||
output$details_table <- renderReactable({
|
||||
req(details_data())
|
||||
f_reactable(
|
||||
@@ -91,13 +123,13 @@ buchungenServer <- function(id, conn, aktiver_filter = reactive("alle")) {
|
||||
)
|
||||
})
|
||||
|
||||
# * Detail hinzufügen ----
|
||||
# ── Detail hinzufügen ──────────────────────────────────────────────────────
|
||||
observeEvent(input$add_detail, {
|
||||
req(selected_trans_id())
|
||||
modal_trigger(list(post_id = NULL, counter = modal_trigger()$counter + 1))
|
||||
})
|
||||
|
||||
# * Detail editieren (Klick auf Detail-Tabelle) ----
|
||||
# ── Detail editieren ───────────────────────────────────────────────────────
|
||||
sel_detail <- reactive(getReactableState("details_table", "selected"))
|
||||
|
||||
observeEvent(sel_detail(), ignoreInit = TRUE, {
|
||||
@@ -105,41 +137,42 @@ buchungenServer <- function(id, conn, aktiver_filter = reactive("alle")) {
|
||||
modal_trigger(list(post_id = p_id, counter = modal_trigger()$counter + 1))
|
||||
})
|
||||
|
||||
# * DB-Update durch Modal ----
|
||||
# ── DB-Update durch Modal ──────────────────────────────────────────────────
|
||||
observeEvent(update_db_trigger(), ignoreInit = TRUE, {
|
||||
req(selected_trans_id())
|
||||
details_data(read_buch_tabelle(conn, trans_id = selected_trans_id()))
|
||||
postings_data(read_buch_tabelle(conn))
|
||||
# Kein Re-render nötig – Filter/Sortierung bleibt erhalten
|
||||
updateReactable("buchungen_table", data = postings_data())
|
||||
updateReactable("buchungen_table", data = gefilterte_daten())
|
||||
})
|
||||
|
||||
# * Neue Transaktion ----
|
||||
# ── Neue Transaktion ───────────────────────────────────────────────────────
|
||||
observeEvent(input$add_trans, {
|
||||
new_t_id <- max_id(conn, "entries") + 1
|
||||
dbxInsert(conn, "entries", data.frame(id = new_t_id))
|
||||
p_id1 <- max_id(conn, "postings") + 1
|
||||
p_id2 <- p_id1 + 1
|
||||
dbxInsert(conn, "postings", data.frame(
|
||||
id = c(p_id1, p_id2),
|
||||
entry_id = c(new_t_id, new_t_id),
|
||||
amount = c(0, 0),
|
||||
id = c(p_id1, p_id2),
|
||||
entry_id = c(new_t_id, new_t_id),
|
||||
amount = c(0, 0),
|
||||
account_id = c(0, 0),
|
||||
valuta = c(Sys.Date(), Sys.Date())
|
||||
valuta = c(Sys.Date(), Sys.Date())
|
||||
))
|
||||
## ** Daten aktualisieren ----
|
||||
|
||||
# Filter zurücksetzen damit neue Transaktion sichtbar ist
|
||||
r_global$buchungen_filter <- "alle"
|
||||
|
||||
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)
|
||||
})
|
||||
|
||||
# * Transaktion löschen ----
|
||||
# ── Transaktion löschen ────────────────────────────────────────────────────
|
||||
observeEvent(input$del_trans, ignoreInit = TRUE, {
|
||||
req(selected_trans_id())
|
||||
dbxDelete(conn, "postings", where = data.frame(entry_id = selected_trans_id()))
|
||||
@@ -148,11 +181,10 @@ buchungenServer <- function(id, conn, aktiver_filter = reactive("alle")) {
|
||||
current_main_idx(NULL)
|
||||
selected_trans_id(NULL)
|
||||
details_data(NULL)
|
||||
updateReactable("buchungen_table", data = postings_data())
|
||||
# details_table re-rendert automatisch weil details_data(NULL) → req() schlägt fehl
|
||||
updateReactable("buchungen_table", data = gefilterte_daten())
|
||||
})
|
||||
|
||||
|
||||
# ── Anhänge ────────────────────────────────────────────────────────────────
|
||||
output$attachments_ui <- renderUI({
|
||||
req(selected_trans_id())
|
||||
att <- dbxSelect(conn, paste0(
|
||||
@@ -164,10 +196,10 @@ buchungenServer <- function(id, conn, aktiver_filter = reactive("alle")) {
|
||||
ext <- tools::file_ext(att$original_name[i])
|
||||
filename <- paste0("attachments/", att$id[i], ".", ext)
|
||||
|
||||
# Observer direkt hier registrieren
|
||||
observeEvent(input[[paste0("open_att_", att$id[i])]], {
|
||||
showModal(modalDialog(
|
||||
tags$iframe(src = filename, width = "100%", height = "600px", style = "border:none;"),
|
||||
tags$iframe(src = filename, width = "100%", height = "600px",
|
||||
style = "border:none;"),
|
||||
title = att$original_name[i],
|
||||
size = "l",
|
||||
easyClose = TRUE,
|
||||
@@ -177,7 +209,7 @@ buchungenServer <- function(id, conn, aktiver_filter = reactive("alle")) {
|
||||
|
||||
div(
|
||||
actionLink(ns(paste0("open_att_", att$id[i])), att$original_name[i]),
|
||||
actionLink(ns(paste0("del_att_", att$id[i])), "✕",
|
||||
actionLink(ns(paste0("del_att_", att$id[i])), "✕",
|
||||
style = "color:red; margin-left:8px;")
|
||||
)
|
||||
}))
|
||||
|
||||
Reference in New Issue
Block a user