diff --git a/app.R b/app.R index d4bc5d7..72a69b5 100644 --- a/app.R +++ b/app.R @@ -40,7 +40,7 @@ enabled_schemes <- setNames(names(enabled_schemes), enabled_schemes) schms <- readRDS("scheme.rds") # CHECK FOR PANDOC ---------- -rmarkdown::find_pandoc(dir = "/opt/homebrew/bin/") +# rmarkdown::find_pandoc(dir = "/opt/homebrew/bin/") # TODO: dynamic button render depend on pandoc installation if (!rmarkdown::pandoc_available()) warning("Can't find pandoc!") diff --git a/config.yml b/config.yml index 719c1b4..79df91d 100644 --- a/config.yml +++ b/config.yml @@ -1,19 +1,10 @@ default: - form_app_version: 0.17.0 - form_id: new_formy - form_name: NEW FORMY + form_app_version: !expr config::get("form_app_version", file = "descr.yml") + form_id: !expr config::get("form_id", file = "descr.yml") + form_name: !expr config::get("form_name", file = "descr.yml") prod: - form_app_configure_path: "." + form_app_configure_path: "example_scheme" form_auth_enabled: false form_schemes: - example_of_scheme: Тестовая база данных - -devel: - form_app_configure_path: _devel/new_bases - form_auth_enabled: false - form_app_version: 0.17.0 dev - form_schemes: - antifib: антифибротическая - d2tra_t: D2TRA_test - main_register: АВЗ и АМИЛОИОДОЗЫ \ No newline at end of file + example_of_scheme: Тестовая база данных \ No newline at end of file diff --git a/descr.yml b/descr.yml new file mode 100644 index 0000000..7f7cbce --- /dev/null +++ b/descr.yml @@ -0,0 +1,4 @@ +default: + form_app_version: 0.17.0 + form_id: new_formy + form_name: NEW FORMY \ No newline at end of file diff --git a/configs/schemas/example_of_scheme.xlsx b/example_scheme/configs/schemas/example_of_scheme.xlsx similarity index 100% rename from configs/schemas/example_of_scheme.xlsx rename to example_scheme/configs/schemas/example_of_scheme.xlsx