Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/67 fix color order #71

Merged
merged 8 commits into from
May 23, 2020
Merged

Conversation

fvitalini
Copy link
Contributor

@fvitalini fvitalini commented Apr 27, 2020

closes #67
Color order is now fixed between facet plots and line-bullets plot. The order is determined by the number of confirmed cases as of max(date). Therefore by adding a new country there is a possible rearrangement of the colors. Nonetheless, colors are consistent between plots for a given selection of countries

@riccardoporreca
Copy link
Member

@fvitalini, sorry for messing up here in the wrong branch. We should squash-merge to avoid my extra commits

@GuidoMaggio
Copy link
Member

Comparison plot looks fine, thanks

In the global page there is still a difference when we open it and things are set on confirmed cases.
However I understand here it would be harder to make it work.
Please confirm if this is the case. If so, I am completely ok with how it is now.
thanks

@GuidoMaggio
Copy link
Member

Unrelated to this ticket, but there is warning that could be fixed

observeEvent(input$select_countries,{
if (input$select_countries != "") {
# Data ----

I assume it should be
if (any(input$select_countries != "")) {

@GuidoMaggio GuidoMaggio merged commit cd77f8a into develop May 23, 2020
GuidoMaggio added a commit that referenced this pull request May 27, 2020
* update version

* updated version

* Feature/38 improve header (#42)

* Add News.md

* Add Mirai logo inverted colours

* Add get_Covid19 version()

* Header a-la SmaRP with pure CSS styling (#38).

Co-authored-by: fvitalini <francesca.vitalini@mirai-solutions.com>
Co-authored-by: riccardoporreca <riccardo.porreca@mirai-solutions.com>

* added modalDialogue with content of NEWS.md (#44)

* added modalDialogue with content of NEWS.md

* improve style NEWS.md in pop-up

* Refine header and modal style (#43, #38)

* Also updated NEWS.md with dates and development version

Co-authored-by: riccardoporreca <riccardo.porreca@mirai-solutions.com>

* Feature/3 add map (#37)

* added mod for map

* added fixed legend per indicator

* add slider

* adapt DESCRIPTION to standards
fix test

* improve map legend #36

* Unicode escape for non-ASCI characters (R CMD check warning).

stringi::stri_escape_unicode("ô")
stringi::stri_escape_unicode("é")
stringi::stri_escape_unicode("ç")

* Map slider position absolute, but relative to a map container div.

* Added cssloader for the map.

Note however that this is only displayed when the app launches, further re-rendering go via leafletProxy.

* Do no show zoom control clashing with slider

* Refactored country name alignment, now in a function.

* add static shape files for map under inst/countries_data

* added spinner to all modules

* Only include >1 cases, fix legend.

* update NEWS.md

Co-authored-by: riccardoporreca <riccardo.porreca@mirai-solutions.com>

* Fix/45 map fix (#46)

* fix addPolygons #45

* fix map height #45

* 1.1.0 release preps

closes #3
closes #36
closes #38
closes #40
closes #43
closes #45

* Added missing css loader for the plotly plots (#40)

* 1.1.0 release preps

* NEWS.md consolidation.

* Fix BugReports link + cosmetics.

* LICENSE file included

usethis::use_gpl3_license("Mirai Solutions GmbH")

* updated version

* Feature/48 fix depricated data sources (#51)

* use new dataset  and add alert on app launch #48.

Co-authored-by: riccardoporreca <riccardo.porreca@mirai-solutions.com>

* release preps 1.1.2

closes #48

* updated version

* Feature/29 pop data (#53)

* add map with population data #29

* fix bug in US states aggregation

* release preps 1.1.3

- Integrate population data for map (#29)

* development version

* Feature/update-global-tab (#41)

* add plot countries comparison from day of 1000nd contagion

* added hist plot for growth rate and death rate

* removed gray lines top countries from nth day

* fix growth rate and death rate definition and bar plots

* fix tests

* changed layout and growth rate definition --> now a growth factor

* finalized growth factor and growth rate bar plots

* added new fields to map #56

* updated NEWS.md

* release preps
closes #39
closes #56
implements #5 for global tab

* development version

* Feature/63 remove disclaimer (#62)

* Remove disclaimer

* Update Readme with the information from the additional file

* Added tooltip for the data source
new import bsplus

Co-authored-by: Gabriel Foix <gabriel.foix@mirai-solutions.com>

* Frature/5 new global graphs in other tabs (#64)

* dataset with growth factor and lethality rate in all tabs

* fix NA in input data

* add independent spinner line plot

* added plots comparison tab

* added info to boxes #63

* add options bullet plot

* added plot to country tab

* fix NEWS

* release preps version 1.1.6

close #5
close #63

- adding growth factor and lethality rate data to tables in country and country comparison tabs (#5)
- adding growth factor and lethality rate plots to country comparison tab (#5)
- adding comparison from 1000nd case to country comparison tab and country tab (#5)
- fix NA in input data
- add info to boxes #63
- remove pop up with data source information (#63)

* fix typos NEWS.md

* prepared new development version

* dynamic titles #66

* added system dependency

* test fix installation dependencies

* test dependencies issue

* back to original dependencies installation configuration

* - Add angle to bar-plot labels (#68)

* - Merge the two boxes for current and new values into one.(#69)

* reverse sort of colors in area plot (#74)

* removing unnecessary differences from develop branch

* hard coded plot trend both global & country (#74)

* update NEWS.md

* update doc - remove param for sort_type_hardcoded

* Temporarily delete cached library

As it was produced with R 4.x

* Revert "Temporarily delete cached library"

This reverts commit 64f501d.

* Feature/67 fix color order (#71)

* fix colour order (#67)

* Temporarily delete cached library

As it was produced with R 4.x

* Fix re-installation of remotes after library rm

* Need Rscript to re-install remotes

* Revert flushing the R library cache

* Restore original indention

Co-authored-by: Riccardo Porreca <riccardo.porreca@mirai-solutions.com>
Co-authored-by: Guido Maggio <GuidoMaggio@users.noreply.github.com>

* First version of stacked barplot per status

* update titles

* Addition new functions for 83

* Added stacked barplot in page

* corrected title

* Added stackedbarplot to comparison tab

* GM: corercted stackedbarplot function and args

* news updated

* roxygen

* space missing before table

* Added additional label with count

Co-authored-by: fvitalini <francesca.vitalini@mirai-solutions.com>
Co-authored-by: Gabriel <gabriel.foix@mirai-solutions.com>
Co-authored-by: riccardoporreca <riccardo.porreca@mirai-solutions.com>
Co-authored-by: StefGehring <stephanie.gehring@mirai-solutions.com>
@GuidoMaggio GuidoMaggio deleted the feature/67-fix-colour-order branch March 2, 2022 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants