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.

Sign up for GitHub

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

Jump to bottom

E1 second graph addition #2

Open
wants to merge 75 commits into
base: main
Choose a base branch
from
Open

E1 second graph addition #2

wants to merge 75 commits into from

Commits on May 2, 2024

  1. Conflict testing

    @alex-bruce
    alex-bruce committed May 2, 2024
    Configuration menu
    Copy the full SHA
    ffbf958 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Testing commit

    @Cormac-Murray
    Cormac-Murray committed May 8, 2024
    Configuration menu
    Copy the full SHA
    5269429 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. removing test comment

    @MahriScot
    MahriScot committed May 16, 2024
    Configuration menu
    Copy the full SHA
    2d2c8dd View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Added code to keep app active longer for accessibility. Also set the … 

    …language attribute to English for screen readers.
    @alex-bruce
    alex-bruce committed May 17, 2024
    Configuration menu
    Copy the full SHA
    d12e6ec View commit details
    Browse the repository at this point in the history

  2. Started adding functions and moving setup to its own file

    @alex-bruce
    alex-bruce committed May 17, 2024
    Configuration menu
    Copy the full SHA
    e04dbed View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. EF2 updated

    @Cormac-Murray
    Cormac-Murray committed May 28, 2024
    Configuration menu
    Copy the full SHA
    ab35b55 View commit details
    Browse the repository at this point in the history

  2. EF3 updated.

    @Cormac-Murray
    Cormac-Murray committed May 28, 2024
    Configuration menu
    Copy the full SHA
    e8e1d47 View commit details
    Browse the repository at this point in the history

  3. EF4 updated.

    @Cormac-Murray
    Cormac-Murray committed May 28, 2024
    Configuration menu
    Copy the full SHA
    975aa1b View commit details
    Browse the repository at this point in the history

  4. Ef5 updated.

    @Cormac-Murray
    Cormac-Murray committed May 28, 2024
    Configuration menu
    Copy the full SHA
    9027283 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. EQ Updates

    @Cormac-Murray
    Cormac-Murray committed May 30, 2024
    Configuration menu
    Copy the full SHA
    6b96e33 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Fixing tabName 'object not found' error

    @alex-bruce
    alex-bruce committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    9965ec3 View commit details
    Browse the repository at this point in the history

  2. Fixing tabName 'object not found' error

    @alex-bruce
    alex-bruce committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    93ad79e View commit details
    Browse the repository at this point in the history

  3. Fixing tabName 'object not found' error

    @alex-bruce
    alex-bruce committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    0926acf View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Added initial graph to E1

    @alex-bruce
    alex-bruce committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    5ff4bb1 View commit details
    Browse the repository at this point in the history

  2. Removed x-axis tick labels 'tickangle' attribute to make them reactive

    @alex-bruce
    alex-bruce committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    bb183bf View commit details
    Browse the repository at this point in the history

  3. Changed E1 legend string wrap width

    @alex-bruce
    alex-bruce committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    571a2e6 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Adding tab text styling

    @alex-bruce
    alex-bruce committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    e3ee863 View commit details
    Browse the repository at this point in the history

  2. Added data prep file

    @alex-bruce
    alex-bruce committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    f9d1a11 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Moved nav buttons fluidRow into mainPanel section to keep them at the… 

    … bottom of pages
    @alex-bruce
    alex-bruce committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    0b41b34 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Applying fix for indicator content spacing

    @alex-bruce
    alex-bruce committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    7864e36 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Update README.md

    @alex-bruce
    alex-bruce authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    a92d511 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Minor grammar fix in intro

    @alex-bruce
    alex-bruce committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    9161aaa View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. 2nd graph added for E1 

    Additional code added to:
* app.R (added tidyverse library)
* data_preperation.R (added distinct financial years for graph)
* E1_server.R
* E1_ui.R
    @MahriScot
    MahriScot committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    1e3ee4d View commit details
    Browse the repository at this point in the history

  2. added archive/

    @MahriScot
    MahriScot committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    21e66f3 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. E1 graph - added margin/padding around axis and graph's title. Also a… 

    …dded same code as for graph 1 that removes unnecessary buttons from modebar
    @MahriScot
    MahriScot committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    0162b08 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. EQ1 graph and server updates

    @Cormac-Murray
    Cormac-Murray committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    0dd69c4 View commit details
    Browse the repository at this point in the history

  2. Outlining indicator alt text method

    @alex-bruce
    alex-bruce committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    fb46e51 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. E1 2nd graph - xasis changes. 

    I wanted the axis range to be "0:whatever the highest value is across ALL years" for every year's graph. Things I tried, that didn't work, included:
    # rangemode = "tozero"
    # tick0 = 0
    # range = list(c(0, 300), round(max(E1_data$rate_per_1000_population), 10)) ----- this one ensures all graphs have the same range of 0-300 days but the graph wasn't starting at 0 (As bed days are going up each year, "round(...,10)" sets the xaxis as 10 more than whatever the new data shows as the maximum value)
    @MahriScot
    MahriScot committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    a232c15 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. EQ1 Chart Updates

    @Cormac-Murray
    Cormac-Murray committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    0241130 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. changing filter names so they include indicator e.g. "unique_area_typ… 

    …es" to "E1_area_types"
    @MahriScot
    MahriScot committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    731eb05 View commit details
    Browse the repository at this point in the history

  2. EF4 Server

    @alex-bruce
    alex-bruce committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    e3eea1a View commit details
    Browse the repository at this point in the history

  3. EF4 progress

    @alex-bruce
    alex-bruce committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    2167d99 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. EF4 graph v0.1

    @alex-bruce
    alex-bruce committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    7e3cd5b View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. 2x E1 warning errors fixed: 

    1. Plot 1 - Pulling out max. bed day value with a function for adding to y-axis range.
2. Plot 2 - chosing correct filter option after user input.
    @MahriScot
    MahriScot committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    b7f8fb7 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Creation of second EQ1 chart, with accompanying data.

    @Cormac-Murray
    Cormac-Murray committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    ae42505 View commit details
    Browse the repository at this point in the history

  2. EF4 graph work

    @alex-bruce
    alex-bruce committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    2bad464 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Changed page layout method EF4, EF2, T1

    @alex-bruce
    alex-bruce committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    044e753 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Changing E1 graph code from just using plotly to running it through g… 

    …gplot first. (Old code commented out until we make a decision)
    @MahriScot
    MahriScot committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    c320c1d View commit details
    Browse the repository at this point in the history

  2. E1 graph 1 scale taken away - will fix and add back next week

    @MahriScot
    MahriScot committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    388a547 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Updates to page layout for EQ1 and EF5.

    @Cormac-Murray
    Cormac-Murray committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    03a7528 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Apply fluidRow changes to the Person-centred and Safe indicators, as … 

    …well as adjust default font size for box text.
    @Cormac-Murray
    Cormac-Murray committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    f2e40e5 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. E1 plot 1 scale changed

    @MahriScot
    MahriScot committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    ccb69cf View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Updated E1 tab to use boxes

    @alex-bruce
    alex-bruce committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    76a320d View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Removed bslib package

    @alex-bruce
    alex-bruce committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    443e472 View commit details
    Browse the repository at this point in the history

  2. Updated sidebar to include updated indicators

    @alex-bruce
    alex-bruce committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    b3c7c19 View commit details
    Browse the repository at this point in the history

  3. Added loading spinner to E1 graph 1

    @alex-bruce
    alex-bruce committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    aef5183 View commit details
    Browse the repository at this point in the history

  4. Created phs_spinner function to apply spinner to all plots more easily

    @alex-bruce
    alex-bruce committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    489e490 View commit details
    Browse the repository at this point in the history

  5. Added spinner to E1 graph 2

    @alex-bruce
    alex-bruce committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    e273107 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. Apply fluidRow to all remaining pages with infographics.

    @Cormac-Murray
    Cormac-Murray committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    316f9a2 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Added package text for purrr

    @alex-bruce
    alex-bruce committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    07d2a09 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Updates to E1 chart selection and lines.

    @Cormac-Murray
    Cormac-Murray committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    f552716 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Various css adjustments to Scotland Hub Tab

    @alex-bruce
    alex-bruce committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    2a3f96e View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. EF4 graph changed to ggplot and run through plotly. E1 graph2 title c… 

    …hanged to reflect "per 1,000 population"
    @MahriScot
    MahriScot committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    b87d93d View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. EQ1 graphs now ggplot before plotly. Graph titles reworded and positi… 

    …oned as well.
    @MahriScot
    MahriScot committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    3533edd View commit details
    Browse the repository at this point in the history

  2. E1 graph 1 now shows data when page is loaded

    @MahriScot
    MahriScot committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    0acc903 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. EQ1 - first graph now showing legend, also rounded all values

    @MahriScot
    MahriScot committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    78bac16 View commit details
    Browse the repository at this point in the history

  2. EF4 graph now shows a legend

    @MahriScot
    MahriScot committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    38930f4 View commit details
    Browse the repository at this point in the history

  3. E1 graph one now shows legend

    @MahriScot
    MahriScot committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    9deb855 View commit details
    Browse the repository at this point in the history

  4. phsstyles colours now used in graphs - E1, EF4, EQ1.

    @MahriScot
    MahriScot committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    a187ef9 View commit details
    Browse the repository at this point in the history

  5. Added some spacing between page titles and graphs.

    @MahriScot
    MahriScot committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    ea95bce View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Create data tables on E1 page, along with option to download.

    @Cormac-Murray
    Cormac-Murray committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    bfabddb View commit details
    Browse the repository at this point in the history

  2. Added borders to Scot Hub boxes and changed box header colour

    @alex-bruce
    alex-bruce committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    12e3bf5 View commit details
    Browse the repository at this point in the history

  3. Changed Scot Hub header colour to phs teal 10%

    @alex-bruce
    alex-bruce committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    29cfc25 View commit details
    Browse the repository at this point in the history

  4. Put E1 tables within collapsed boxes.

    @Cormac-Murray
    Cormac-Murray committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    e616ff0 View commit details
    Browse the repository at this point in the history

  5. Added password protection

    @alex-bruce
    alex-bruce committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    1772813 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Remove highlight column from second E1 downloadable table.

    @Cormac-Murray
    Cormac-Murray committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    c4c7726 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Adding tables and download option to EF4.

    @Cormac-Murray
    Cormac-Murray committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    976294b View commit details
    Browse the repository at this point in the history

  2. Create tables and download buttons for EQ1.

    @Cormac-Murray
    Cormac-Murray committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    a93b3b2 View commit details
    Browse the repository at this point in the history

  3. Set the collapsable tables to be uncollapsed at load.

    @Cormac-Murray
    Cormac-Murray committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    d5d5a45 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Updated password protection

    @alex-bruce
    alex-bruce committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    57c636d View commit details
    Browse the repository at this point in the history

  2. Updated password protection

    @alex-bruce
    alex-bruce committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    8cc1e98 View commit details
    Browse the repository at this point in the history

  3. Updated .gitignore

    @alex-bruce
    alex-bruce committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    6182306 View commit details
    Browse the repository at this point in the history

  4. Minor Scot Hub fixes

    @alex-bruce
    alex-bruce committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    b5bfbd3 View commit details
    Browse the repository at this point in the history

  5. Update table headers and give downloadable csv files more descriptive… 

    … names
    @Cormac-Murray
    Cormac-Murray committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    f4a8b41 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Scotland Hub wording and variable values changed and linked to alt te… 

    …xt csv file. (Some are still to be worked on)
    @MahriScot
    MahriScot committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    18c7f22 View commit details
    Browse the repository at this point in the history