Mewu/smallfixes

R/header.R

@@ -121,8 +121,10 @@ headerServer <- function(id, store=NULL) {
           # populate previous run config, let user select it as config
           showModal(
             modalDialog(
-              title = "Select config file from previous run",
-              "Please note that the region data is not supported.",
+              title = "Select previous run to reload assumptions from.",
+              "When you reload from a previous run, the option to change the default region values is not available. If you would like to run a new region, please cancel and instead choose to run a new simulation.",
+              tags$br(),
+              tags$br(),
               DTOutput(ns("dt_select_prev_config")),
               footer = tagList(
                 actionButton(ns("proceedPrevConfigBtn"), "Proceed"),

R/run_simulation.R

@@ -8,9 +8,7 @@ sim_tabs <- function(ns){
   type = "hidden",
   tabPanel(sim_pages[1],
            fluidRow(
-             column(12, 
-                    h5(config_intro_str)
-             ),
+             column(12, HTML(gsub("\n", "<br>", config_intro_str)))
            ),
            fluidRow(
              column(6,
@@ -153,11 +151,11 @@ runSimulationServer <- function(id, return_event, rv, store = NULL) {
       if(sim_pages[rv$page]=="Configuration"){
         if(!rv$show_region){
           isolate(updateSelectInput(session, "region", label = "Region (Unavailable)"))
-          shinyjs::disable("region")
+          shinyjs::hide("region")
         }
         else{
           isolate(updateSelectInput(session, "region", label = "Region"))
-          shinyjs::enable("region")
+          shinyjs::show("region")
         }
       }
     })
@@ -170,8 +168,7 @@ runSimulationServer <- function(id, return_event, rv, store = NULL) {
         showModal(
           modalDialog(
             title = "Confirmation Needed",
-            "Are you sure you want to proceed? Change to new region will reset your data from the original template, 
-            the data that you previously changed will be lost!",
+            "Are you sure you want to proceed? When you select this region, the application will reload all data from the input file with the corresponding name. This will override any changes that you have made to the configuration (e.g., run years)",
             footer = tagList(
               actionButton(ns("proceedRegionBtn"), "Proceed"),
               actionButton(ns("cancelRegionBtn"), "Cancel")

R/tooltips.R

@@ -3,9 +3,14 @@
 # Configuration Page
 
 config_intro_str <- "Edit your key inputs here before you run the model,
-  The model comes pre-populated with default valuesspecific to your region, 
+  The model comes pre-populated with default values specific to your region, 
   but if you want to edit those, you can use the optional button at the bottom of this screen.
-  "
+
+  If you would like to use your own configuration files, you can do so.
+  This allows you to input different assumptions about your population pyramid, fertility and mortality rates, and specify a modified list of tasks and disease incidence rates.
+  To do so, please see instructions from: https://github.com/InstituteforDiseaseModeling/PACE-HRH-UI/blob/main/Configuration.md.
+
+"
 
 
 # Validation Page

start_pace_ui.bat

@@ -1,7 +1,7 @@
 cls
 setlocal
 @echo off
-SET VERSION=1.0.1
+SET VERSION=2.0.0
 
 REM Determine if this a git repository
 IF EXIST ".git" (