Merge pull request #107 from miraisolutions/develop

1.1.1 release

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: SmaRP
 Title: SmaRP: Smart Retirement Planning
-Version: 1.1.0
+Version: 1.1.1
 Authors@R: c(person("Gabriel", "Foix", role = c("aut", "cre"),
                     email = "[email protected]"),
              person("Francesca", "Vitalini", role = c("aut"),
@@ -33,8 +33,7 @@ Imports:
     rmarkdown,
     shiny,
     shinydashboardPlus,
-    shinyWidgets,
-    webshot
+    shinyWidgets
 Suggests: testthat, roxygen2 (>= 6.1.1)
 VignetteBuilder: knitr
 RoxygenNote: 6.1.1

Dockerfile

@@ -1,7 +1,5 @@
 FROM rocker/r-ver:3.5.1
 
-MAINTAINER Nicola Lambiase "[email protected]"
-
 RUN apt-get update && apt-get install -y \
     sudo \
     pandoc \
@@ -32,11 +30,8 @@ RUN install2.r --error \
     rmarkdown \
     shiny \
     shinydashboardPlus \
-    shinyWidgets \
-    webshot
-
-# install PhantomJS
-RUN R -e "library(webshot); webshot::install_phantomjs()"
+    shinyWidgets
+
 
 # copy the app to the image
 RUN mkdir /root/SmaRP

NEWS.md

@@ -1,3 +1,16 @@
+# SmaRP 1.1.1
+
+### Fixes
+
+* Bar-plot missing in the PDF report (#96).
+* PDF report refers to wrong pillars (#105).
+* Checkboxes and radio buttons don't render properly in Safari browser (#102).
+
+### Maintenance
+
+* Aligned plot labels with table headers in the report.
+* Removed obsolete dependency on package webshot and PhantomJS (#97).
+
 # SmaRP 1.1.0
 
 * Retirement age automatically resets to 70 if a higher number is inserted (#27)

inst/application/report.Rmd

@@ -162,7 +162,7 @@ tserieGraphData.long$variable <- factor(tserieGraphData.long$variable,
                                                       decreasing = TRUE))
 
 ggplot(tserieGraphData.long, aes(x = Calendar, y = value, fill = variable)) +
-  scale_fill_manual(NULL, values = c("Occupational Pension" = "#008cc3", "Private Pension" = "#FF9966", "Tax Benefits" = "#13991c")) +
+  scale_fill_manual(NULL, values = c("Occupational Fund" = "#008cc3", "Private Fund" = "#FF9966", "Tax Benefits" = "#13991c")) +
   scale_y_continuous(labels = scales::comma) +
   labs(x = "Year", y = "Return [CHF]") +
   geom_area(alpha = 0.6) +
@@ -196,11 +196,11 @@ ggplot(data = barGraphData.long, aes(x = contribution, y = value, fill = variabl
   scale_x_discrete(breaks = NULL) +
   scale_y_continuous(labels = scales::percent) +
   coord_flip() +
-  scale_fill_manual(NULL, values = c("Occupational_Pension" = "#008cc3", "Private_Pension" = "#FF9966", "TaxBenefits" = "#13991c")) +
+  scale_fill_manual(NULL, values = c("Occupational Fund" = "#008cc3", "Private Fund" = "#FF9966", "Tax Benefits" = "#13991c")) +
   labs(x = NULL, y = "% Contribution of each fund at retirement") +
   theme(
     axis.text = element_text(size = 10),
-    axis.title = element_text(color="grey"),
+    axis.title = element_text(color = "grey"),
     aspect.ratio = 0.1,
     panel.background = element_rect(fill = NA),
     panel.grid.major = element_line(colour = NA),
@@ -211,7 +211,7 @@ ggplot(data = barGraphData.long, aes(x = contribution, y = value, fill = variabl
 
 <br>
 
-The graphs above display the amounts at the end of each year for the Pillar I, Pillar II and Tax Benefit fund. The corresponding formulas are in Appendix 1 of this document and a more detailed break down of the amounts can be found in Appendix 2. A comprehensive set of values calculated can de downloaded as well from the Table tab. 
+The graphs above display the amounts at the end of each year for the Pillar II, Pillar III and Tax Benefit fund. The corresponding formulas are in Appendix 1 of this document and a more detailed break down of the amounts can be found in Appendix 2. A comprehensive set of values calculated can de downloaded as well from the Table tab. 
 
 <br>
 

inst/application/server.R

@@ -241,11 +241,11 @@ function(input, output, session) {
   TserieGraphData <- reactive({
     Road2Retirement() %>%
       mutate(`Tax Benefits` = TotalTax) %>%
-      mutate(`Occupational Pension` = DirectP2 + ReturnP2) %>%
-      mutate(`Private Pension` = DirectP3 + ReturnP3) %>%
+      mutate(`Occupational Fund` = DirectP2 + ReturnP2) %>%
+      mutate(`Private Fund` = DirectP3 + ReturnP3) %>%
       select(Calendar,
-             `Occupational Pension`,
-             `Private Pension`,
+             `Occupational Fund`,
+             `Private Fund`,
              `Tax Benefits`) %>%
       .[, colSums(. != 0, na.rm = TRUE) > 0]
   })
@@ -269,9 +269,9 @@ function(input, output, session) {
   FotoFinish <- reactive({
     Road2Retirement() %>%
       mutate(`Tax Benefits` = TotalTax) %>%
-      mutate(`Occupational Pension` = DirectP2 + ReturnP2) %>%
-      mutate(`Private Pension` = DirectP3 + ReturnP3) %>%
-      select(`Occupational Pension`, `Private Pension`, `Tax Benefits`) %>%
+      mutate(`Occupational Fund` = DirectP2 + ReturnP2) %>%
+      mutate(`Private Fund` = DirectP3 + ReturnP3) %>%
+      select(`Occupational Fund`, `Private Fund`, `Tax Benefits`) %>%
       tail(1) %>%
       prop.table() %>%
       select_if(function(x)

inst/application/www/style.css

@@ -167,7 +167,6 @@ label {
 /* vertical radio/checkbox alignment to text */
 input[type=checkbox], input[type=radio] {
   margin: 1px 0 0;
-  border: 10px solid red;
 }
 
 .checkbox, .radio {