From 97f4e668ee544fc53381a15009484c5cc617b7eb Mon Sep 17 00:00:00 2001 From: Nicoletta Farabullini Date: Thu, 7 Mar 2019 16:49:10 +0100 Subject: [PATCH 01/15] updated SmaRP version --- DESCRIPTION | 2 +- NEWS.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 95c832e..d9e48dd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: SmaRP Title: SmaRP: Smart Retirement Planning -Version: 1.1.0 +Version: 1.1.0-9000 Authors@R: c(person("Gabriel", "Foix", role = c("aut", "cre"), email = "gabriel.foix@mirai-solutions.com"), person("Francesca", "Vitalini", role = c("aut"), diff --git a/NEWS.md b/NEWS.md index df698a8..7e68ef2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# SmaRP 1.1.0-9000 + # SmaRP 1.1.0 * Retirement age automatically resets to 70 if a higher number is inserted (#27) From ded18b5a1c8719b9335af4fe6c307f1b5e42abc8 Mon Sep 17 00:00:00 2001 From: fvitalini Date: Tue, 12 Mar 2019 12:28:10 +0100 Subject: [PATCH 02/15] fixes #96, fix column names in the report and align column names in app and report --- inst/application/report.Rmd | 6 +++--- inst/application/server.R | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/inst/application/report.Rmd b/inst/application/report.Rmd index 7139be1..d9145b8 100644 --- a/inst/application/report.Rmd +++ b/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), diff --git a/inst/application/server.R b/inst/application/server.R index 90e65e6..62e4f69 100644 --- a/inst/application/server.R +++ b/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) From 06bf5e300a930e7d86cd4819e37f4b75d74a350c Mon Sep 17 00:00:00 2001 From: fvitalini Date: Tue, 12 Mar 2019 12:30:22 +0100 Subject: [PATCH 03/15] update news after fix of issue #96 --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index 7e68ef2..f7befe2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,5 @@ # SmaRP 1.1.0-9000 +* Align legend in app and report # SmaRP 1.1.0 From d9ad1b3d8b67df305384848fd7c6343356eb5523 Mon Sep 17 00:00:00 2001 From: fvitalini Date: Tue, 12 Mar 2019 14:00:30 +0100 Subject: [PATCH 04/15] #97 removed webshot as a dependency --- DESCRIPTION | 3 +-- Dockerfile | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d9e48dd..f253b6f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -33,8 +33,7 @@ Imports: rmarkdown, shiny, shinydashboardPlus, - shinyWidgets, - webshot + shinyWidgets Suggests: testthat, roxygen2 (>= 6.1.1) VignetteBuilder: knitr RoxygenNote: 6.1.1 diff --git a/Dockerfile b/Dockerfile index e416181..c8945c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,9 +32,8 @@ RUN install2.r --error \ rmarkdown \ shiny \ shinydashboardPlus \ - shinyWidgets \ - webshot - + shinyWidgets + # install PhantomJS RUN R -e "library(webshot); webshot::install_phantomjs()" From 32daddec30f4e0523a6ab207dccb0ae608c4f0d5 Mon Sep 17 00:00:00 2001 From: fvitalini Date: Thu, 21 Mar 2019 09:03:12 +0100 Subject: [PATCH 05/15] updated NEWS.md according to suggestions in pull request #98 --- NEWS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index f7befe2..2c6efa2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,6 @@ # SmaRP 1.1.0-9000 -* Align legend in app and report +* Fixed missing bar-plot in the PDF report (#96). +* Reviewed plots labels. # SmaRP 1.1.0 From 1fa3fb7fe51ed2cbe329f8859f88277555ed269b Mon Sep 17 00:00:00 2001 From: fvitalini Date: Thu, 21 Mar 2019 09:09:33 +0100 Subject: [PATCH 06/15] fix #102 removed red border for checkboxes and radiobuttons in css --- inst/application/www/style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/inst/application/www/style.css b/inst/application/www/style.css index be22884..d0ecbb9 100644 --- a/inst/application/www/style.css +++ b/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 { From dba29dac8ca4a07a9f9a5c14220487bf8fd33ba9 Mon Sep 17 00:00:00 2001 From: riccardoporreca Date: Thu, 21 Mar 2019 17:52:42 +0100 Subject: [PATCH 07/15] Update NEWS.md --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 2c6efa2..846ace4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # SmaRP 1.1.0-9000 * Fixed missing bar-plot in the PDF report (#96). -* Reviewed plots labels. +* Aligned plots labels to the tables in the report. # SmaRP 1.1.0 From 3c4b8c3e19063f233f833d1b1939054f7bc6892b Mon Sep 17 00:00:00 2001 From: riccardoporreca Date: Thu, 21 Mar 2019 18:09:36 +0100 Subject: [PATCH 08/15] Include checkboxes and radio fix (#102). Forgotten in pull #104. --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index 846ace4..0e7b361 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,7 @@ # SmaRP 1.1.0-9000 * Fixed missing bar-plot in the PDF report (#96). * Aligned plots labels to the tables in the report. +* Fixed rendering of checkboxes and radio in Safari browser (#102). # SmaRP 1.1.0 From e1736b4afd4d01ef138cbcf7ea9aa1ed4b8629f3 Mon Sep 17 00:00:00 2001 From: riccardoporreca Date: Thu, 21 Mar 2019 18:27:24 +0100 Subject: [PATCH 09/15] Remove the usage of webshot from Dockerfile --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c8945c9..3adbdce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,8 +34,6 @@ RUN install2.r --error \ shinydashboardPlus \ shinyWidgets -# install PhantomJS -RUN R -e "library(webshot); webshot::install_phantomjs()" # copy the app to the image RUN mkdir /root/SmaRP From 6b7a52d3c888a0e924374a3bbd25a3b36afd6ab6 Mon Sep 17 00:00:00 2001 From: Riccardo Porreca Date: Thu, 21 Mar 2019 18:50:59 +0100 Subject: [PATCH 10/15] Fix wrong pillars in the report (fixes #105). --- inst/application/report.Rmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inst/application/report.Rmd b/inst/application/report.Rmd index d9145b8..1bafe5c 100644 --- a/inst/application/report.Rmd +++ b/inst/application/report.Rmd @@ -211,7 +211,7 @@ ggplot(data = barGraphData.long, aes(x = contribution, y = value, fill = variabl
-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.
From c0275cec41728eac88231fa63e461601d4be38cb Mon Sep 17 00:00:00 2001 From: Riccardo Porreca Date: Thu, 21 Mar 2019 18:53:25 +0100 Subject: [PATCH 11/15] Updated NEWS.md for #105. --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index 0e7b361..120e210 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,7 @@ * Fixed missing bar-plot in the PDF report (#96). * Aligned plots labels to the tables in the report. * Fixed rendering of checkboxes and radio in Safari browser (#102). +* Fixed wrong pillars mentioned in the PDF report (#105). # SmaRP 1.1.0 From 3e0666fb7b3228087672f0c202d8ebc18d1f5f4d Mon Sep 17 00:00:00 2001 From: Riccardo Porreca Date: Fri, 22 Mar 2019 09:37:26 +0100 Subject: [PATCH 12/15] 1.1.1 release preps * closes #96 * closes #105 * closes #102 * closes #97 --- DESCRIPTION | 2 +- NEWS.md | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index f253b6f..17b3fab 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: SmaRP Title: SmaRP: Smart Retirement Planning -Version: 1.1.0-9000 +Version: 1.1.1 Authors@R: c(person("Gabriel", "Foix", role = c("aut", "cre"), email = "gabriel.foix@mirai-solutions.com"), person("Francesca", "Vitalini", role = c("aut"), diff --git a/NEWS.md b/NEWS.md index 120e210..4738881 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,8 +1,10 @@ -# SmaRP 1.1.0-9000 +# SmaRP 1.1.1 + * Fixed missing bar-plot in the PDF report (#96). -* Aligned plots labels to the tables in the report. -* Fixed rendering of checkboxes and radio in Safari browser (#102). * Fixed wrong pillars mentioned in the PDF report (#105). +* Fixed rendering of checkboxes and radio in Safari browser (#102). +* Aligned plots labels to the tables in the report. +* Removed unused dependency on package webshot (#97). # SmaRP 1.1.0 From 845ee24674e694b023f6aa9e94dc37d6d7e70b4d Mon Sep 17 00:00:00 2001 From: RolandASc Date: Fri, 22 Mar 2019 11:43:00 +0100 Subject: [PATCH 13/15] Initial review of NEWS.md structure for 1.1.1 Co-Authored-By: riccardoporreca --- NEWS.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/NEWS.md b/NEWS.md index 4738881..81fa632 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,10 +1,17 @@ # SmaRP 1.1.1 -* Fixed missing bar-plot in the PDF report (#96). -* Fixed wrong pillars mentioned in the PDF report (#105). -* Fixed rendering of checkboxes and radio in Safari browser (#102). -* Aligned plots labels to the tables in the report. -* Removed unused dependency on package webshot (#97). +## Patch release + +#### 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 From 961d1cbad074be0670acc24559fba1d90e177baf Mon Sep 17 00:00:00 2001 From: riccardoporreca Date: Fri, 22 Mar 2019 11:50:41 +0100 Subject: [PATCH 14/15] Finalized 1.1.1 NEWS.md. * No Patch Release level-2 heading. * Level-3 heading for sections, rendering nicely on GitHub. --- NEWS.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/NEWS.md b/NEWS.md index 81fa632..b9ba1c1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,14 +1,12 @@ # SmaRP 1.1.1 -## Patch release - -#### Fixes +### 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 +### Maintenance * Aligned plot labels with table headers in the report. * Removed obsolete dependency on package webshot and PhantomJS (#97). From 2fe14f1a36f4efb9ff7ec054916cc2090259564c Mon Sep 17 00:00:00 2001 From: riccardoporreca Date: Fri, 22 Mar 2019 11:52:51 +0100 Subject: [PATCH 15/15] Removed maintener from Dockerfile. * Existing maintainer obsolete. * Not needed. --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3adbdce..34164d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ FROM rocker/r-ver:3.5.1 -MAINTAINER Nicola Lambiase "nicola.lambiase@mirai-solutions.com" - RUN apt-get update && apt-get install -y \ sudo \ pandoc \