From 6b5220f27428ce5a8fb75dce13ff8e57c454047a Mon Sep 17 00:00:00 2001 From: Tyler De Jong <88603381+tsdejong@users.noreply.github.com> Date: Wed, 14 Feb 2024 10:52:59 -0800 Subject: [PATCH] Tour (#59) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * tour updates - added overview of rating curve development and partially fixed tour bug * tour updates - fixed bug that displayed tour after user selected end tour and then reloaded page with the autofit button. Fixed bug that reloaded tour after user selected end tour in the import page but then moved on to develop page. --------- Co-authored-by: tylersdejong Co-authored-by: Tobias Müller --- frontend/rctool/forms.py | 5 +- frontend/rctool/templates/rctool/base.html | 2 +- .../templates/rctool/components/navbar.html | 6 +- .../templates/rctool/components/table.html | 30 ++-- frontend/rctool/templates/rctool/home.html | 26 ++-- .../rctool/rctool/develop/rctool_develop.html | 23 +-- .../rctool_export.html | 0 .../rctool_export_pdf.html | 0 .../rctool/rctool/import/rctool_import.html | 76 ++++----- .../rctool/rctool/tour/rctool_tour_intro.html | 144 ++++++++++++++++++ frontend/rctool/urls.py | 2 +- frontend/rctool/views.py | 35 +++-- frontend/static/css/header.css | 3 +- frontend/static/css/main.css | 46 +++--- frontend/static/css/rctool_develop.css | 126 +++++++++++++-- frontend/static/css/rctool_intro.css | 13 +- frontend/static/css/rctool_main.css | 65 -------- frontend/static/css/rctool_tour.css | 34 +++++ frontend/static/images/RMSE.JPG | Bin 0 -> 21493 bytes frontend/static/images/RMSE.png | Bin 0 -> 5210 bytes frontend/static/images/error_percent.JPG | Bin 0 -> 18458 bytes .../images/fig_breakpoint_example_slide3.JPG | Bin 0 -> 31171 bytes ...g_breakpoint_example_slide3_greylabels.JPG | Bin 0 -> 54686 bytes .../fig_breakpoint_example_slide3_padded.JPG | Bin 0 -> 34932 bytes ...ig_breakpoint_example_slide3_redlabels.JPG | Bin 0 -> 57689 bytes .../fig_rating_curve_example_slide1.JPG | Bin 0 -> 32096 bytes ...ating_curve_example_slide1_sidepadding.JPG | Bin 0 -> 35723 bytes frontend/static/images/fig_rating_error.JPG | Bin 0 -> 28546 bytes .../static/images/fig_rating_error_legend.JPG | Bin 0 -> 31097 bytes 29 files changed, 431 insertions(+), 205 deletions(-) rename frontend/rctool/templates/rctool/rctool/{export & review => export}/rctool_export.html (100%) rename frontend/rctool/templates/rctool/rctool/{export & review => export}/rctool_export_pdf.html (100%) create mode 100644 frontend/rctool/templates/rctool/rctool/tour/rctool_tour_intro.html delete mode 100644 frontend/static/css/rctool_main.css create mode 100644 frontend/static/css/rctool_tour.css create mode 100644 frontend/static/images/RMSE.JPG create mode 100644 frontend/static/images/RMSE.png create mode 100644 frontend/static/images/error_percent.JPG create mode 100644 frontend/static/images/fig_breakpoint_example_slide3.JPG create mode 100644 frontend/static/images/fig_breakpoint_example_slide3_greylabels.JPG create mode 100644 frontend/static/images/fig_breakpoint_example_slide3_padded.JPG create mode 100644 frontend/static/images/fig_breakpoint_example_slide3_redlabels.JPG create mode 100644 frontend/static/images/fig_rating_curve_example_slide1.JPG create mode 100644 frontend/static/images/fig_rating_curve_example_slide1_sidepadding.JPG create mode 100644 frontend/static/images/fig_rating_error.JPG create mode 100644 frontend/static/images/fig_rating_error_legend.JPG diff --git a/frontend/rctool/forms.py b/frontend/rctool/forms.py index 74f62817..b1000b8d 100644 --- a/frontend/rctool/forms.py +++ b/frontend/rctool/forms.py @@ -5,8 +5,9 @@ class DatePickerInput(forms.DateInput): input_type = 'date' class import_rc_data(forms.Form): - csv_upload = forms.FileField(label="csv file") - header_row = forms.IntegerField(label="header row number", widget=forms.NumberInput(attrs={'class': 'form-control', 'min':1, 'value':1, 'id':'form-header-row'})) + # csv_upload = forms.FileField(label="csv file", widget=forms.FileInput(attrs={'class': 'form-control form-control-sm'})) + csv_upload = forms.FileField(label="csv file", widget=forms.FileInput(attrs={'class': 'form-control form-control-sm', 'style': 'font-size: 11.5px;'})) + header_row = forms.IntegerField(label="header row number", widget=forms.NumberInput(attrs={'class': 'form-control form-control-sm', 'min':1, 'value':1, 'id':'form-header-row'})) csv_upload.required = False header_row.required = False diff --git a/frontend/rctool/templates/rctool/base.html b/frontend/rctool/templates/rctool/base.html index 185d17b8..2d06542c 100644 --- a/frontend/rctool/templates/rctool/base.html +++ b/frontend/rctool/templates/rctool/base.html @@ -11,8 +11,8 @@ - + diff --git a/frontend/rctool/templates/rctool/components/navbar.html b/frontend/rctool/templates/rctool/components/navbar.html index 219d945c..5a2d41e8 100644 --- a/frontend/rctool/templates/rctool/components/navbar.html +++ b/frontend/rctool/templates/rctool/components/navbar.html @@ -3,7 +3,7 @@