Update

.dockerignore

@@ -1 +1 @@
-.git*
+.git*

.env.default

@@ -1,2 +1 @@
-CAS_URL=
-CAS_KEY=
+LITE_CONFIG='{}'

.gitignore

@@ -3,10 +3,13 @@ data/Surveys/*.svydesign
 rsconnect
 .vscode
 
+panels/**/*.html
+
 # renv files
 .Rprofile
 renv.lock
 renv/
+.Rapp.history
 
 # misc files
 NEWS.html
@@ -148,4 +151,4 @@ $RECYCLE.BIN/
 
 # From Lite 2
 .env
-.env.local
+.env.local

DESCRIPTION

@@ -47,5 +47,7 @@ Imports:
     tibble,
     viridis,
     wkb
+Suggests:
+    iNZightMultivariate
 Additional_repository: https://r.docker.stat.auckland.ac.nz
 RoxygenNote: 6.0.1

Dockerfile

@@ -22,6 +22,14 @@ RUN R -e "remotes::install_github(\
     repos = c('https://cloud.r-project.org'), \
     dependencies = TRUE \
   )"
+RUN R -e "install.packages(\
+  c('iNZightMultivariate'), \
+  repos = c( \
+    'https://r.docker.stat.auckland.ac.nz', \
+    'https://cloud.r-project.org'\
+  ), \
+  dependencies = TRUE \
+)"
 RUN rm .Renviron
 COPY . /srv/shiny-server
 RUN cp /srv/shiny-server/VARS.default /srv/shiny-server/VARS \

NEWS.md

@@ -1,10 +1,18 @@
-# Pre-release, 2023.12
+# December 2023
 
-- fix bug in Model Fitting module (panel had a duplicate ID, resulting in some weird behaviour)
-- remove gpairs dependency
-- fix bug where variables swap after saving residuals
+## Changes
+
+- Add additional advanced options to the 'Import Data' dialog (delimiter, decimal, etc.).
+- Integrates instance-configurability to allow various instances to run on the same deployment (e.g., the Census at School build). This will eventually replace the 'lite2' instance used by CaS.
+- Removes 'gpairs' dependency.
+- Temporary data files are now deleted after import, instead of remaining on the filesystem until the temporary directory is cleared.
+
+## Fixes
 
-- major update: integrate instance-configurability to allow various instances to run on the same deployment (e.g., the Census at School build)
+- Fixes bug in Model Fitting module (panel had a duplicate ID, resulting in some weird behaviour).
+- Fixes bug where variables swap after saving residuals, and fitted line is removed.
+- Installs iNZightMultivariate package so the module can be used.
+- Fix bug where help panels were not being displayed
 
 ---
 

README.md

@@ -1,10 +1,7 @@
-iNZight *Lite* 
-==============================
-
+# iNZight _Lite_
 
 This is the online version of iNZight (http://lite.docker.stat.auckland.ac.nz)
 
-
 ## To run locally:
 
 ### With Docker
@@ -19,122 +16,125 @@ iNZight Lite is a shiny app, so you can run it locally if you have R installed.
 
 1. [Download and unzip](https://github.com/iNZightVIT/Lite/archive/master.zip) or clone this repository
 
-    _Note: if you use Git to clone the repository, you can easily keep Lite updated via `git pull`_
+   _Note: if you use Git to clone the repository, you can easily keep Lite updated via `git pull`_
 
 2. Open R and set the working directory to the Lite folder
+
 ```{r}
 setwd("/path/to/Lite")
 ```
 
 3. Install the `devtools` R package (if you don't already have it):
+
 ```{r}
 install.packages("devtools")
 ```
+
 4. Install package dependencies (NOTE: we host iNZight packages on our own server, see below)
+
 ```{r}
-devtools::install_deps(repos = c("http://r.docker.stat.auckland.ac.nz/R", 
+devtools::install_deps(repos = c("http://r.docker.stat.auckland.ac.nz/R",
                                  "https://cloud.r-project.org/"))
 ```
+
 5. Run the iNZight Lite app!
+
 ```{r}
 shiny::runApp()
 ```
 
 ### RStudio users:
 
-1. __If you have git installed__: in RStudio > File > New Project > Version Control > Git 
+1. **If you have git installed**: in RStudio > File > New Project > Version Control > Git
+
+   - For the URL, enter: `https://github.com/iNZightVIT/Lite.git`
+   - And choose a location to save the app
+   - Then Create Project
 
-    - For the URL, enter: `https://github.com/iNZightVIT/Lite.git`
-    - And choose a location to save the app
-    - Then Create Project
-
-    __If you don't have git__: 
-
-    - [Download and unzip](https://github.com/iNZightVIT/Lite/archive/master.zip) the app
-    - In the folder, double click `Lite.rproj` to open the project in RStudio
+   **If you don't have git**:
+
+   - [Download and unzip](https://github.com/iNZightVIT/Lite/archive/master.zip) the app
+   - In the folder, double click `Lite.rproj` to open the project in RStudio
 
 2. To install the dependencies, enter the following into the Console:
+
 ```{r}
 install.packages("devtools")  ## skip if you know you already have devtools
-devtools::install_deps(repos = c("http://r.docker.stat.auckland.ac.nz/R", 
+devtools::install_deps(repos = c("http://r.docker.stat.auckland.ac.nz/R",
                                  "https://cloud.r-project.org/"))
 ```
-
-3. To run iNZight Lite, open the `ui.R` file and click the __Run App__ button at the top.
 
+3. To run iNZight Lite, open the `ui.R` file and click the **Run App** button at the top.
 
 Send bug reports/errors to inzightlite_support@stat.auckland.ac.nz.
 
-Directories:
-------------
+## Directories:
+
 - data:
-This directory holds all the data. The data must be placed in sub-directories, which will come up as data categories within iNZight-Lite.
+  This directory holds all the data. The data must be placed in sub-directories, which will come up as data categories within iNZight-Lite.
 
 - www:
-This directory is used for graphics and/or web-related files such as .css and .gif/.jpeg/.png javascript files. Images are stored in a sub-directory called "images". Javascript code is stored in a subdirectory "js".
+  This directory is used for graphics and/or web-related files such as .css and .gif/.jpeg/.png javascript files. Images are stored in a sub-directory called "images". Javascript code is stored in a subdirectory "js".
 
 - panels:
-This directory contains the gui, server, help, and other functions for each module. 
+  This directory contains the gui, server, help, and other functions for each module.
+
+## Main files:
 
-Main files:
------------
 - README:
-Documentation for iNZight *Lite*. Update as required.
+  Documentation for iNZight _Lite_. Update as required.
 
 - global.R:
-Defines functions and variables that are used globally. For now, all non-GUI functions are stored here.
+  Defines functions and variables that are used globally. For now, all non-GUI functions are stored here.
 
 - server.R:
-Script for shiny server.
+  Script for shiny server.
 
 - ui.R:
-Defines the main GUI.
+  Defines the main GUI.
 
 - functions.R
-Defines al functions used in iNZight-lite, some of them are also in iNZightTools.
+  Defines al functions used in iNZight-lite, some of them are also in iNZightTools.
 
 - data:
-This directory holds all the data. The data must be placed in sub-directories, which will come up as data categories within iNZight *Lite*. 
+  This directory holds all the data. The data must be placed in sub-directories, which will come up as data categories within iNZight _Lite_.
 
 - www:
-This directory is used for graphics and/or web-related files such as .css and .gif/.jpeg/.png. Images are stored in a sub-directory called "images".
+  This directory is used for graphics and/or web-related files such as .css and .gif/.jpeg/.png. Images are stored in a sub-directory called "images".
 
 - panels:
-This directory contains the gui, server, help, and other functions for each module. The directory/file names will be of the form:
-  + [Directory] N_(sub-)panel-name
-  + [File] 1_panelname-panel-gui.R
-  + [File] 2_panelname-panel-server.R
-  + [File] 3_panelname-panel-help.R
-  + [File] 4_panelname-panel-null.R
-  + [File] 5_panelname-panel-other.R
-
-iNZight-lite URL feature
-------------------------
-
-Some GET parameters can be added to the URL to access iNZight-lite. In the moment 
+  This directory contains the gui, server, help, and other functions for each module. The directory/file names will be of the form:
+  - [Directory] N\_(sub-)panel-name
+  - [File] 1_panelname-panel-gui.R
+  - [File] 2_panelname-panel-server.R
+  - [File] 3_panelname-panel-help.R
+  - [File] 4_panelname-panel-null.R
+  - [File] 5_panelname-panel-other.R
+
+## iNZight-lite URL feature
+
+Some GET parameters can be added to the URL to access iNZight-lite. In the moment
 the following are implemented.
 
 - url:
-An URL to a dataset sitting somewhere in the internet.
+  An URL to a dataset sitting somewhere in the internet.
 - example:
-A name of an data set inside the data folder.
+  A name of an data set inside the data folder.
 - land:
-The place where iNZight-lite starts. If not specified it is "About". Three 
-possibilities (visualize, timeSeries, regression).
+  The place where iNZight-lite starts. If not specified it is "About". Three
+  possibilities (visualize, timeSeries, regression).
 - x:
-The x variable in the visualize module
+  The x variable in the visualize module
 - y:
-The y variable in the visualize module
+  The y variable in the visualize module
 - time:
-The variable in time series where the dates are stored.
--seriesVars
-A comma seperated list of column names. This names are set in time series to be 
-plotted
+  The variable in time series where the dates are stored.
+  -seriesVars
+  A comma seperated list of column names. This names are set in time series to be
+  plotted
 - Y:
-The dependend variable in regression.
+  The dependend variable in regression.
 - predict:
-Comma seperated list with predictor variables.
+  Comma seperated list with predictor variables.
 - confound:
-Comma seperated list for confounding variables. 
-
-
+  Comma seperated list for confounding variables.