0.17.0

app/tasks.R

@@ -50,7 +50,7 @@ server <- function(id, values, scheme, mhcs) {
       if (!is.null(values$tasks_data)) {
 
         tasks_selector <- values$tasks_data |>
-          dplyr::filter(task_status != "completed") |>
+          dplyr::filter(task_status == "active") |>
           dplyr::pull(task_id)
 
         tasks_selector <- unique(c(values$tasks_id, tasks_selector))
@@ -117,11 +117,15 @@ server <- function(id, values, scheme, mhcs) {
       on.exit(db$close_db_connection(con, "display_task_modal"), add = TRUE)
 
       values$tasks_data <- if ("tasks" %in% DBI::dbListTables(con)) {
+
         DBI::dbGetQuery(con, glue::glue("SELECT * FROM tasks WHERE task_main_key = '{values$main_key}'")) |>
           dplyr::mutate(dplyr::across(c("task_datetime_created", "task_datetime_last_updated", "task_datetime_completed"), as.POSIXct)) |>
           dplyr::mutate(dplyr::across(c("task_due_date"), as.Date))
+
       } else {
+
         NULL
+
       }
 
       values$tasks_id <- NULL
@@ -159,6 +163,11 @@ server <- function(id, values, scheme, mhcs) {
       con <- db$make_db_connection(scheme(),"tasks_saving_button")
       on.exit(db$close_db_connection(con, "tasks_saving_button"), add = TRUE)
 
+      if (!values$main_key %in% db$get_keys_from_table("main", mhcs(), con)) {
+        showNotification("Невозможно создать задачу для данного ID (нет в базе)", type = "error")
+        return()
+      }
+
       id_and_types_list <- mhcs()$get_id_type_list("tasks")
       input_types   <- unname(id_and_types_list)
       input_ids     <- names(id_and_types_list)
@@ -230,6 +239,7 @@ server <- function(id, values, scheme, mhcs) {
       date_cols <- c("task_datetime_created", "task_datetime_completed", "task_datetime_last_updated", "task_due_date")
       date_cols <- which(colnames(values$tasks_data) %in% date_cols)
 
+
       output$dt_tasks <- DT::renderDataTable(
         DT::datatable(
           values$tasks_data,
@@ -353,7 +363,8 @@ server <- function(id, values, scheme, mhcs) {
     display_tasks_dt_review <- function() {
 
       values$tasks_data <- values$tasks_data |>
-        dplyr::select(task_id:task_datetime_last_updated)
+        dplyr::select(task_id:task_datetime_last_updated) |>
+        dplyr::arrange(task_due_date)
 
       rename_cols <- tasks_colnames[tasks_colnames %in% colnames(values$tasks_data)]
       
@@ -368,6 +379,7 @@ server <- function(id, values, scheme, mhcs) {
           colnames = rename_cols,
           extensions = c("FixedColumns"),
           # editable = 'cell',
+          class = 'cell-border stripe',
           selection = "single",
           options = list(
             dom = 'tip',