From b70586c13a3adc21aa39204a121d83d28da4b2a9 Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Mon, 12 Aug 2024 15:00:48 +0100 Subject: [PATCH 1/4] adds ,more descriptive text to actions buttons on the report page --- app/views/report_design/select_report.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/report_design/select_report.html.haml b/app/views/report_design/select_report.html.haml index 437e634..57dfd49 100644 --- a/app/views/report_design/select_report.html.haml +++ b/app/views/report_design/select_report.html.haml @@ -23,7 +23,7 @@ %details %summary %span.summary - Example of this report type + Click to view an example of average prices and volumes report type %div.panel = image_tag( "average-prices-report-screenshot.png", alt: "Screenshot of example average prices report " ) %li @@ -34,7 +34,7 @@ %details %summary %span.summary - Example of this report type + Clck to view an example of banded prices report type %div.panel = image_tag( "banded-prices-report-screenshot.png", alt: "Screenshot of example banded prices report " ) From e6d35425f1c8f1e2f4f1827a3055faf0998857a1 Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Mon, 12 Aug 2024 15:03:32 +0100 Subject: [PATCH 2/4] updates changelog --- CHANGELOG.md | 4 ++++ app/lib/version.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b05aad..80aab17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Standard Reports UI: change log +## 1.5.3 - 2024-08 + +- (Dan) Adds more descriptive text to action buttons on the report page [115](https://github.com/epimorphics/standard-reports-ui/issues/115) + ## 1.5.2 - 2023-11-27 - (Jon) Updated the `lr_common_styles` gem to the latest 1.9.3 patch release. diff --git a/app/lib/version.rb b/app/lib/version.rb index 3fc1fa7..79e1666 100644 --- a/app/lib/version.rb +++ b/app/lib/version.rb @@ -3,7 +3,7 @@ module Version MAJOR = 1 MINOR = 5 - PATCH = 2 + PATCH = 3 SUFFIX = nil VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}#{SUFFIX && ".#{SUFFIX}"}" end From 2cd12319d34249a4855afafe44bce3b58669f608 Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Mon, 12 Aug 2024 15:08:06 +0100 Subject: [PATCH 3/4] imporved grammar --- app/views/report_design/select_report.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/report_design/select_report.html.haml b/app/views/report_design/select_report.html.haml index 57dfd49..b16d9cd 100644 --- a/app/views/report_design/select_report.html.haml +++ b/app/views/report_design/select_report.html.haml @@ -23,7 +23,7 @@ %details %summary %span.summary - Click to view an example of average prices and volumes report type + Click to view an example of the average prices and volumes report type %div.panel = image_tag( "average-prices-report-screenshot.png", alt: "Screenshot of example average prices report " ) %li @@ -34,7 +34,7 @@ %details %summary %span.summary - Clck to view an example of banded prices report type + Clck to view an example of the banded prices report type %div.panel = image_tag( "banded-prices-report-screenshot.png", alt: "Screenshot of example banded prices report " ) From 5a163afe5175570b9cc7e19b992d9d221ace1621 Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Mon, 12 Aug 2024 16:49:48 +0100 Subject: [PATCH 4/4] updates dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 09cf215..8f3e5ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,8 @@ RUN apk add --update \ nodejs \ tzdata \ && rm -rf /var/cache/apk/* \ - && gem update --system \ + && gem install rubygems-update -v 3.4.22 \ + && update_rubygems \ && gem install bundler:$BUNDLER_VERSION \ && bundle config --global frozen 1