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

Refactor buildsystem to NPM/Gulp, port to BS4 & rewrite RIGS tests accordingly... #412

Merged
merged 288 commits into from
Jan 23, 2021
Merged

Refactor buildsystem to NPM/Gulp, port to BS4 & rewrite RIGS tests accordingly... #412

merged 288 commits into from
Jan 23, 2021

Conversation

FreneticScribbler
Copy link
Member

@FreneticScribbler FreneticScribbler commented Sep 15, 2020 •
edited
Loading

...and some more features along the way. I am the best at scope, the best I say!

Much testing required. No idea if Heroku is even going to be able to spin it...

New Features

  • Digitised Risk Assessments and Event Checklists
    • Not a lot of validation going on here, these are intended to be reviewed by a human, and have a mechanism for doing so that is similar to event approvals
    • However, RIGS will display a confirmation screen when a 'nonstandard' RA is created, asking the user to check with a supervisor/confirm they have done so. It probably needs tweaking to be a bit less annoying...
    • RIGS determines event size automatically when a RA is filled out based on the answers in the power section, then shows the relevant section in subsequent event checklist(s).
  • Dark theme!(!!)
  • General rethink of layouts and UX to hopefully make stuff much more clean, readable and consistent. Also should make some little known features more accessible and understandable.
  • Search bar now follows you around so it's always in reach.
  • Version history for Invoices/Payments. Also, you should see more stuff show up in the recent changes feed...provided you have the right permissions.
  • Status chips on the rigboard, to help you see an event's overall status at a glance.
  • Ctrl-Enter global form submission shortcut

Notable Bugs Squashed

  • Firefox's infuriating lack of support for datetime-local has been fixed with javascript fuckery. No more manually entering ISO format into 'Access at'!
  • File naming for paperwork now works more consistently (Technical: Previously, we weren't wrapping the spaces in the file names properly, which made some browsers choke)

Technical Stuff

  • Ported to Bootstrap4 and generally upgraded dependencies across the board
  • RIGS tests rewritten from the ground up, coverage now steady at >90%!
  • Better buildsystem that also includes:
    • Browsersync, for automated reloads when changing templates
    • No more bloody compass bodge. Ruby I hate you
    • NPM >.>
  • Much much much template deduplication, perhaps too much in places
  • Lots of logic that was previously in templates moved up to python level
  • User auth and versioning shite separated into (mostly) independent modules, versioning module does some black magic™️ for automatic views.

Closes #162
Closes #215
Closes #136 because I got carried away
Closes #405
Supersedes and closes #337.
Probably closes #322
Closes #391
Closes #398
Closes #413

FreneticScribbler and others added 30 commits March 18, 2020 17:36
@FreneticScribbler
Start to seperate versioning into its own app
0144bd3
@FreneticScribbler
Start reworking invoice things
50ca782
@FreneticScribbler
Reduced overall font size a touch
41b0387
@FreneticScribbler
Improvements to generic lists
ee7ba3e
@FreneticScribbler
Tweak some colours to be a bit less OTT
7a08f2d 
I need to work out if I can seperate background and primary colours like BS3 did
@FreneticScribbler
Improvements to event table mobile
0271840
@FreneticScribbler
First pass at mobile-ising the generic list
de210ca
@FreneticScribbler
Item table fixes
d351d9e
@FreneticScribbler
Fixed fullcalendar print css not included
4c40226
@FreneticScribbler
Asset list table improvements
7aa19cc
@FreneticScribbler
Tweak asset list to be more in line with other lists
55e37d8
@FreneticScribbler
Versioning template improvements
d216dd4 
//TODO Rather than have seperate asset templates, convert 'id' into a template variable
@FreneticScribbler
Tweak versioning templates to allow ID overrides
176324e 
Asset specific templates begone. Still need to bring back the ID formatting for the Rigboard.
@FreneticScribbler
Asset form fixes
c8d0c0d
@FreneticScribbler
Use the right autocompleter.js...
2bf643c
@FreneticScribbler
Breakout (most) user stuff to separate module
f308a09 
The model remains in RIGS for now, as it's pretty painful to move...
@FreneticScribbler
Python Format/import opt
5e60675
@FreneticScribbler
Merge branch 'master' into bs4
70995a0 
# Conflicts:
#	assets/models.py
#	assets/templates/asset_update.html
#	assets/templates/partials/asset_buttons.html
#	assets/templates/partials/asset_list_table_body.html
#	assets/views.py
#	templates/base_assets.html
@FreneticScribbler
Test Refactor Part 1 - Shuffle things around
abb8dc2
@FreneticScribbler
Fix migrations
3f48c51 
TODO - need to ensure moved models are *moved* rather than deleted and recreated!
@FreneticScribbler
Start on new tests
e3c1da9
@FreneticScribbler
Initial work on event create test reimpl
5a3547e
@FreneticScribbler
Init other tests, more rigs test faffery
c23d18c
@FreneticScribbler
Desaturate theme colors even more
0d0c783 
Much closer to BS3
@FreneticScribbler
Fix event item adding
919975e 
Bit too heavy handed with the deduplication there Arona
@FreneticScribbler
Initial refactor of event item testing
813db2c
@FreneticScribbler
Upgrade bootstrap-select
34bf498
@mattysmith22
Updated bootstrap-select for BS4
8ffb5ab
@FreneticScribbler
Initial port of duplicate testing
3c0005d 
Needs the latter half rewriting once we have an EventDetail POM
@FreneticScribbler
Refactor date validation test
cc225b2 
So close to killing test_functional.EventTest!
@FreneticScribbler
Copy link
Member Author

Also allow space on RA for attaching links to rigging and power plans in relevant Sharepoint folders

@FreneticScribbler FreneticScribbler temporarily deployed to pyrigs-pr-412 December 17, 2020 17:49 Inactive
@FreneticScribbler FreneticScribbler temporarily deployed to pyrigs-pr-412 December 27, 2020 17:51 Inactive
@FreneticScribbler
Why does this work
a0c6793 
Indeed, it may not
@FreneticScribbler FreneticScribbler temporarily deployed to pyrigs-pr-412 December 27, 2020 18:28 Inactive
@FreneticScribbler FreneticScribbler temporarily deployed to pyrigs-staging December 27, 2020 18:33 Inactive
@FreneticScribbler FreneticScribbler temporarily deployed to pyrigs-pr-412 December 27, 2020 18:42 Inactive
@FreneticScribbler FreneticScribbler temporarily deployed to pyrigs-staging December 27, 2020 18:47 Inactive
@FreneticScribbler FreneticScribbler temporarily deployed to pyrigs-pr-412 December 27, 2020 18:49 Inactive
@FreneticScribbler FreneticScribbler temporarily deployed to pyrigs-staging December 27, 2020 19:00 Inactive
@FreneticScribbler
Copy link
Member Author

FreneticScribbler commented Dec 30, 2020 •
edited
Loading

If you ignore anything not python and migrations/tests, there's only like 50 files to review @mattysmith22 :P

https://github.com/nottinghamtec/PyRIGS/pull/412/files?file-filters%5B%5D=.py&w=1

@FreneticScribbler FreneticScribbler temporarily deployed to pyrigs-pr-412 January 23, 2021 17:48 Inactive
@FreneticScribbler FreneticScribbler temporarily deployed to pyrigs-staging January 23, 2021 18:55 Inactive
@FreneticScribbler FreneticScribbler temporarily deployed to pyrigs-staging January 23, 2021 19:33 Inactive
@FreneticScribbler FreneticScribbler merged commit 3414204 into master Jan 23, 2021
RIGS Refactor automation moved this from In progress to Done Jan 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattysmith22 mattysmith22 Awaiting requested review from mattysmith22

Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file enhancement
Projects
No open projects
RIGS Refactor
  
Done
Milestone
No milestone
6 participants
@FreneticScribbler @josephjboyden @tomtom5152 @mattysmith22 @alexdaniel654 @johnathan99j