* Start to seperate versioning into its own app
* Start reworking invoice things
* Reduced overall font size a touch
* Improvements to generic lists
* Tweak some colours to be a bit less OTT
I need to work out if I can seperate background and primary colours like BS3 did
* Improvements to event table mobile
* First pass at mobile-ising the generic list
* Item table fixes
* Fixed fullcalendar print css not included
* Asset list table improvements
* Tweak asset list to be more in line with other lists
* Versioning template improvements
//TODO Rather than have seperate asset templates, convert 'id' into a template variable
* Tweak versioning templates to allow ID overrides
Asset specific templates begone. Still need to bring back the ID formatting for the Rigboard.
* Asset form fixes
* Use the right autocompleter.js...
* Breakout (most) user stuff to separate module
The model remains in RIGS for now, as it's pretty painful to move...
* Python Format/import opt
* Test Refactor Part 1 - Shuffle things around
* Fix migrations
TODO - need to ensure moved models are *moved* rather than deleted and recreated!
* Start on new tests
* Initial work on event create test reimpl
* Init other tests, more rigs test faffery
* Desaturate theme colors even more
Much closer to BS3
* Fix event item adding
Bit too heavy handed with the deduplication there Arona
* Initial refactor of event item testing
* Upgrade bootstrap-select
* Updated bootstrap-select for BS4
* Initial port of duplicate testing
Needs the latter half rewriting once we have an EventDetail POM
* Refactor date validation test
So close to killing test_functional.EventTest!
* Deduplication of testing code
* pep8
* Fix some tests
And some things that were actually borked
* FIX: Prevent setting access time after start time
Cherry pick of d274ea4606. Will close#405.
* Refactor calendar tests
* FIX: Don't show asset buttons/history for basic users
* Really ought to get a pre-commit hook for pep8...
* Fully replace test_functional
* Dedupe generic search logic
* Fix the remaining tests
* Ensure submit button is scrolled to in tests
* Fix asset creation test + actually verify its results
* Make CI use latest (stable) chromedriver rather than some ancient one
Since Travis uses the latest stable chrome, should always match. Bash oneliner \o/
* Of course | is part of YAML syntax, of course...
Maybe this works.
* Update python version
Trying to get CI to match my local environment as much as possible...
* Minor test futzing
* Well that wasn't clever of me
* That was even less clever of me
* Revert to old submit wait behaviour
* What about if I did this
* Try disabling chrome cache
* Added screenshot recording of test failures
* Fixed RIGS tests not being run
* Fixed Pep8 - I promise I'll make a pre-commit hook sometime!
* Very initial work at togglable darktheme.
Dammit @alexdaniel654 just when I had my scope creep kinda under control. It'll be v. nice to have though...!
* More dark theme wangling
* Fix some asset template things
* FIX: CI Locale Issues
* Fix sample command
* Initial work at integrating the risk assessment
#136. No clever database structure as yet...
* FIX: Don't set every boolean input to radios
* Different approach to RA linking
* Move text definitions to somewhere more authoratitive
* FIX: Undo breakage causing autopep8
o.O
* Expand detail template
* Use correct view for RA history
* Initial work at coercing activity feed into showing RAs
Also shows Asset/Supplier on the homepage feed.
* Refactor activity feed template logic
Yay for removing arbitrary if/else chains!
* Initial work on caching activity feed
Server side that is. Ref #162.
* Start RA list template
* Refactor RA creation stuff, again
* Add H&S Details to Event Detail View
* Display venue notes in event detail
Notes are no use if nobody reads them. Not sure on this one.
* Add ability to filter event archive by status
Closes#168.
* Fix lingering naive time
* Use locmem cache in sqlite environments
Otherwise the tests just lock up totally. Should close#162
* Update dependencies
Mirrors/supersedes 0e67da82e2
* Add global ctrl/meta-enter shortcut for form submission
Wants rewriting for better efficiency, but hey, it works!
* Update dependencies
* Fix for a situation that should be impossible
* Fix navbar alignment
* FEAT: Improve 'omni'search
- Partialised template
- Added to assets header
- Added ability to search assets/suppliers
- Improved selection logic
- Have it display current query
* Move closemodal into PyRIGS
* Fix tests for search improvements
* Dark mode colour improvements
* Fix table colors for dry hires
* further darktheme fixes
* Remove the dark header from light theme
* Fix reload loops when CSS/JS is changed
* Move dark theme SCSS to separate file, fix inactive pagination styling
* Genercise detail pages
* Testing something re notes
I wonder if I can make that global, rather than per-template...
* Dark theme palette shenanigans
I just can't decide
* Match darktheme palette to forum darktheme palette
Why reinvent the wheel.
* Make supplier detail use the generic template
* Disable mobile event table PoC for now
* Remove the defaults from the RA fields + make them required
* More RA fixes
* Fixes to revisions for RAs
* Add bootstrap 4 test page
* Bunch of dark mode fixes from test page
* Do not use Django 'required' for radio selects
As this requires them to be True, whereas we just need to require that an option be entered.
* Properly fixed popover darktheme
* Fixed search for events
* Style fixes to asset list
* Start RA 'mark review' feature
* Add reviewing to revision history, fix RA editing not working
Also actually commit all the files, that helps
* Fix Power MIC being lost on RA edit
Why it is subtly different to the Event Update behaviour? Who knows
* Invalidate RA review if it is edited after review
* Start work on event checklist
* Add a button for creating and instantly voiding invoices
Handy dandy for when you have loads of cancelled events, like say, a pandemic
* Mooooore status chips, mooore
* Initial shenanigans on storing my overly fancy EC form
* Proof of concept for JSON parsing/storage
\o/
* Add new line functionality for vehicles/drivers
Might it have been easier to create 'dummy' models like with EventItems? Probably...
* Alter rig_count to not include un-checked-in dry hires
* Insert a divider between still-out dry hires and actually upcoming events on rigboard
* Initial work on new checklist handling. No more JSON!
* Versioning module now does magic
Automatic creation of views/urls for anything registered with reversion, with a small amount of hackage to preserve legacy stuff. (and the DAMNED asset IDs!) I would never get distracted...
* Cleanup
* Event checklist crew works
Mostly - its not happy with timezones
* Medium event power stuff done, barring worst case stuff
* Misc fixes
* Validation of power reqs
* Worst case points on checklist
* Templating improvements to RA/EC stuff
* Do event table color logic at python level
* Audit template fixes
* Restrict versioning to one level of depth for speed
Also fixed the template for nested changes
* Event properties internal/authorised always return a explicit boolean rather than sometimes None
* Use template filter for notes
* Fix list templates
TODO: Sensible place to define the 'expected answer' stuff.
* Fix cable table template
* Rethink rigboard color logic again
Also revert some broken stuff
* Test fixes
* Modify auth test so it doesn't try and test for external authorisations
Cause that's not a thing
* Why does this work
Bloody overzealous autoformatter...
* Formatting...
* Initial work on RA tests
* Pages/start of tests for EventChecklists
* Much better coverage of H&S things
* Cleanup & Squash migrations
* Fix wrong variable name in settings.py
* Fix broken invoice list template
* Add revision history to invoices/payments.
Also patches previously introduced reversion permissions hole.
Supersedes and closes#337.
* Various misc fixes
* Fix for my fix
* Curse youuuuu pep8
* Invoice template improvements
* Minor fixes
* More tweaks
* More fixes
* Major improvements/fixes to authorisation templates
* Add ability to mark event checklists as Large Event
This just disables the checks to allow the rest of it to be filled out for large events, though I expect paper forms may still be used...
* Remove database ID from generic list
* Put power threshold values in a collapse
* Use template filter for consistent removal of 'None links'
Plus cleaner template markup! More HTML-in-Python tho, which always feels a bit CSS-in-JS
* Tweak asset list markup
* Begin to change add buttons success -> primary
Also change search primary -> info to avoid clash
* Begin to improve event checklist on mobile
* Asset detail template improvements
* Fix#326 (again)
* Fix errors being squashed
* Fix rigboard validation tests
* Initial work on BS4 button templatetag
Newfeatureitis strikes again
* Allow multiple event checklists per event
TODO: Status chip now needs rethinking
* Minor event detail fixes
* Fix tests
* Rework button tag
* Mobile fixes for search
* Fix event checklist on mobile
* Redo light theme palette
* Switch rigboard new button to primary
* Kill off excess whitespace on rigboard
* Rigboard Timing display tweaks
* Fix tests
* Properly handle eventauthorisations in new versioning
It's not great, not terrible...
* Prevent creating duplicate revisions on event
Potential fix for #322 - I couldn't reproduce even before this change...
* Template improvements
* Minor test fixes
* Revert "Prevent creating duplicate revisions on event"
Apparently it was too strong at preventing dupes...
This reverts commit cce0ad0f9f.
# Conflicts:
# RIGS/models.py
* Better approach to generic list templates + other deduplication
* Also apply better approach to generic detail pages
* One of these days I'll remember to test BEFORE pushing...
* And now the same for generic forms
* Display tick/cross rather than true/false in boolean version diffs
* Upgrade dependencies
* Fixes fixes fixes
* Fix dependency hell
Probably
* Correct handling of spaces in paperwork filenames
Also normalises display of Invoice IDs. Partial fix for #391.
* Buggerit millennium hand and shrimp
Knew I was gonna forget to fix the tests
* FIX: Set duplicated event status to provisional
Closes#398.
Flip flop. Flip flop.
* Update polyfill for datetime-local
Bloody Firefox. We love to hate you. Proper CSS of the fill to come, SoonTM.
Closes#391
* Curses!
* Minor typo fixes
* Initial pass at soop-consult confirmation screen for RAs
* Fix migration
* Make venue/date editable on EC
For multi venue, multi day events
Defaults to date and venue set on the event. Also made power MIC default to that set in RA
* Clearer logic for RA inverted fields
* (probably) fix tests
* Give keyholders supplier edit perm
* Generic list only displays edit button if user has perm
* Same perm check for generic details
* H&S Details takes up free space on non-internal events
* Remove flash of content when loading new rig page
* First pass at clearer display of asset list filters
* Fix tests / default to headless tests
(fingers crossed)
* Fix autocompleter.js to properly disable edit links again
* Move status color logic back to template
Cause that somehow makes it work better??
* Display note icon on event detail page
* Fix caching
* Put rounded corners back where they belong
* Remove lingering use of 'page-header'
BS removed that style
* More search and replace for BS changes
Thought I'd got them all. Clearly not!
* Remove enforced linebreak on status chips
* Fix horizontal-ness on some forms
* Remove animation on prefers-reduced-motion/low referesh rate devices
Also normalises handling of asset list cable table & improves its use of space on large devices
* Make version changes badges more readable
* First pass at making the calendar less crap
* Fix event table success logic
Yay for copy paste fails >.>
* Use borders rather than block colors for coloured tables under darktheme
* First pass at porting calendar from FC V3 to V5
Two major versions and all they did was rename a bunch of names...TWICE.
* Rework version name method to avoid blank names on eventchecklist vehicles/crew
* Fix cable test
* Made radio button focus much more obvious on dark theme
* Implement Jerb's wording changes
* Fix one test, break another...
* Fix recent change stream list mutation issue
* FIX: Do not naively cache event table
Not that easy, it turns out. Duh.
* FEAT: Implement #413 show associated assets on cable type detail pg
Closes#413
* Allow H&S for non-events
* Update emergency contact number
* Improvements to profile detail page
* Implement some of Jonny's suggested changes
TODO:
- Define event size at RA time, pass through to EC
- Have later power questions be context dependent
* Test fixes
* Add space for power/rigging plans to be linked to RAs
* Start move of event size logic to RA from Ec
* Javascript required shenanigans for RA power
* More moving of event size logic
* Fixing tests for new logic etc
* Why does this work
Indeed, it may not
* FIX: Stupid typo in versioning.py
* Further minor fixes to versioning
* Add icons to H&S menu items
* Should fix calendar breaking in production
* Small alignment fix in asset list
* Squash migrations
Co-authored-by: Matthew Smith <psyms13@nottingham.ac.uk>
* WIP: Basic work on audit
* WIP: Audit modal works
Need to get the ID search working.
* WIP: Javascript shenanigans for asset audit search
It's not clean but it works..
* Improve audit search bar
Optimise for APM!
* Filter asset audit list by never-audited
* Added cable functionality to audit form
Also improved styling
* FIX: Revert partialising of asset search
* Various UX Improvements
Also rearranged asset detail/edit to be more space efficient
* FIX: Remove assets from to-be-audited table when audited
Previously required a page reload
* Improve sample data generator
Does reversion properly and sets colours for asset statuses
* FIX: Gracefully handle 404s in audit search
* FEAT: Add buttons for some common defaults on audit form
TODO: Partialise those fragments and add them to the edit/create forms too.
* FIX: Fix asset sample data command when run alone
* FEAT: More handy buttons
* FIX: Stop quickbuttons being tab-selected
If someone's tabbing through, they won't be needing the buttons...
* FIX: Hide asset detail buttons for basic users
* FIX: Migrations
* Start tests for audit
* Some deduplication for testing code
* Improve asset audit testing
* Remember to test the tests Arona
* Potentially make modal tests more consistent
* FIX?: Up WebDriverWait timeout for modal tests
* FIX?: What about this way...
* Remake migrations
* Fix README badges to point to right branch
While I'm here eh :P
* Use aware time in audit
* Fix migrations again
* Fix for my fix...
* Modify audit exclusions to properly prevent data loss
* pep eiiiiiight
* Move relevant fields and create migration to autogen cable types
* CRUD and ordering
* FIX: Prevent creating duplicate cable types
* FIX: pep8/remove debug print
* FIX: Meta migrations... :>
* FIX: Update tests to match new UX
* Move cabletype menu links into 'Assets' dropdown
* Fix migration
* Specify version of reportlab
Should fix CI - looks like I went a bit too ham-handed in my requirements.txt purge last time...
* [requires.io] dependency update
* Server starts...
Various things are broken, but it runs!
* [requires.io] dependency update
* [requires.io] dependency update
* [requires.io] dependency update
* FIX: Broken migrations
* FIX: Update auth framework
* FIX: Correct static use in templates
* FIX: Fix supplier sort
* FIX: Remaining tests
* Revert "Disable password reset as temporary fix to vulnerability (#396)"
This reverts commit e0c6a56263.
# Conflicts:
# RIGS/urls.py
* FIX: Fix broken newlining in PDFs
Introduced by a change in Django 2.1 'HTML rendered by form widgets no longer includes a closing slash on void elements, e.g. <br>. This is incompatible within XHTML, although some widgets already used aspects of HTML5 such as boolean attributes.'
* FIX: Fix some Django4 deprecation warnings
Why not...
* Refactor dependency file
Should now only include dependencies we actually use, not dependencies of dependencies and unused things
* Add newlines to the paperwork print test event
This will catch the error encountered in 79ec9214f9
* Swap to pycodestyle rather than pep8 in Travis
And eliminate W605 errors
* Bit too heavy handed with the dep purge there...
* Whoops, helps if one installs pycodestyle...
* FIX: Re-add overridden login view
* Better fix for previous commit
* FIX: Bloody smartquotes
Co-authored-by: requires.io <support@requires.io>
* Added search to person, venue, organisation and event archive
* Added search to invoice archive
* Added event search to homepage
* Tidy up event search logic and optimise
* Fixed merge issues
* Stopped 404 on failed search
* Set default ordering of people, organisations & venues to alphabetical (rather than order of addition to database)
* Added invoice search to home page (if you have permissions)
* Made invoice archive sort by reverse invoice date (rather than order added to database)
* Added search help page (very pretty)
* Made single search box for all search types
* FIX: Missing date field breaking archive view
* FEAT: Add omnisearch to header
Tis a bit broken on mobile at the moment...
* CHORE: Conform old code to pep8
* FIX: Select the event form, not the search one in tests!
* Revert "FEAT: Add omnisearch to header"
This reverts commit 6bcb242d6b because it caused MANY more problems than anticipated...
* FIX: Stop 404 on failed search, again
* FEAT: Basic testing of search
* Use a tooltip to help explain the UX
Obviously since it needs a tooltip it isn't brilliant UX but the best I can think of for now...
Co-authored-by: Tom Price <tom@codedinternet.com>
Co-authored-by: David Taylor <david@taylorhq.com>
Co-authored-by: Arona Jones <aj@aronajones.com>
* CHANGE: First pass at opening up RIGS #233
Whilst it makes it something of a misnomer, the intent is to make the 'view_event' perm a permission to view event details like client/price. I don't see the point in giving everyone 'view_event' and adding a new 'view_event_detail'...Open to arguments the other way.
* CHANGE: New user signups now require admin approval
Given that I intend to reveal much more data to new users this seems necessary...
* CHORE: Fix CI
* FIX: Legacy Profiles are now auto-approved correctly
* Add testing of approval mechanism
This fixes the other functional tests failing because the user cannot login without being approved.
* Superusers bypass approval check
This should fix the remainder of the tests
* Prevent unapproved users logging in through embeds
Test suite doing its job...!
* FIX: Require login on events and event embeds again
Little too far to the open side there Arona... Whooooooops!
* FIX: Use has_oembed decorator for events
* FIX: Re-prevent basic seeing reversion
This is to prevent financials/client data leaking when changed. Hopefully can show them a filtered version in future.
* FIX: Remove mitigation for #264
Someone quietly fixed it, it appears
* FEAT: Add admin email notif when an account is activated and awaiting approval
No async or time-since shenanigans yet!
* FIX: Whoops, undo accidental whitespace change
* FEAT: Add a fifteen min cooldown between emails to admins
Probably not the right way to go about it...but it does work!
TODO: How to handle cooldown-emailing shared mailbox addresses?
* FIX: Remove event modal history deadlink for basic users
Also removes some links on the RIGS homepage that will deadlink for them
* FIX: Wrong perms syntax for history pages
* CHORE: Squash migrations
* FIX: Use a setting for cooldown
* FIX: Minor code improvements
* Started POM and assets test
* FEAT: Adapt unit tests from RIGS to assets
* CHORE: pep8...
* Added Asset Create and Edit forms
* Add non-cable asset creation test
* CHORE: Frickin pep8...
* Add cable asset creation test
* Basic asset create validation testing
* Asset edit tests are here
A bit dodgy in places but par for the course for me :P
* Add access level tests
* Delete unused code
Much less effort way to increase coverage stats :D
* Add delete sample data test for completeness
Chasing that sweet 100% coverage...
* Add supplier list page + tests
Also fix the supplier page not being ordered alphabetically
* Helps if I add the migration...
* Add supplier create/edit tests
* Asset duplicate tests
Also fixed some random bugs
* Asset search tests
* 404 tests and test that everything requires authentication
* Test visibility of form errors
And fix supplier form not displaying errors correctly!
* Fix broken search test
Co-authored-by: Matthew Smith <mattysmith22@googlemail.com>
Squashed commit messages below:
Also...
FIX: Person selection workflow in tests now works
FIX: Properly test name requirement in rig creation
And removed the dirty workaround for wercker so that the test no longer passes when it shouldn't. Which led to this mess of attempted fixes, now squashed:
Fine. Hardball.
What about if we click the button a different way...
Disable whole chunk of the test that was previously getting skipped
Perhaps you'd like to pass now Travis
Temporarily disable the offending part of the test.
Something odd is going on...TBC.
Reorder some selenium commands to try and fix test only failing on CI.
Another attempt at a CI test fix
FIX: Should fix rig create test failing on CI
* FEAT: Add oembed for assets
Don't see the worth in doing supplier currently...we don't OEmbed Org/Venue etc after all...
* FIX Copy paste error ;D
* Fix embeds not actually working for unauthenticated users
This is why I should have written tests...
I prevented them from seeing the change stream, didn't prevent them seeing individual histories. This has to be done as otherwise it leaks financial information. If I can be arsed I'll come back to this and allow basic users to see a filtered version.
* FIX#388: Prevent assets losing supplier data on edit
* FEAT: Add associated assets to supplier detail view
* FIX: Tweak supplier list to make detail view accessible
* Potential fix for #380
No idea if it works because I can't reproduce locally. S/O Reckons it should... :P
* FEAT #386: Asset search searches serial number.
Pending addition of advanced search.
* FIX: Order asset categories/statuses alphabetically
Instead of by pk because that's silly.
* FEAT: Statuses can have a CSS class defined in the admin panel
This replaces the hardcoding of colours in the asset list.
* FIX: Squash migrations
* Fixed supplier not working on all the create asset template
* Refactored away "assets" property on "Supplier" by using "related_name" instead
Co-authored-by: Matthew Smith <mattysmith22@googlemail.com>
* FEAT: Initial work on revision history for assets
The revision history for individual items mostly works, though it shows database ID where it should show asset ID. Recent changes feed isn't yet done.
* FEAT: Initial implementation of asset activity stream
* CHORE: Fix pep8
* FIX: Asset history table 'branding'
* FIX: Individual asset version history is now correctly filtered
* FEAT: Make revision history for suppliers accessible
* CHORE: *sings* And a pep8 in a broken tree...
* Refactored out duplicated code from `AssetVersionHistory
* CHORE: pep8
And another random bit of wierd whitespace I found
Co-authored-by: Matthew Smith <mattysmith22@googlemail.com>
Closes#358
Fingers crossed this works I don't have the actual data locally... I know I'm making a mess but needs must.
I genuinely hate whoever decided prefixes were a good idea now.
* FIX: Remove misleading admin site title
* Moved across assets_id sorting to use proper numeric values. Also mofifies SQL command to find free asset IDs so that it works on postgres.
* Changed generateSampleAssetsData.py to include prefices on some cables.
* Fixed pep8
* Fixed missed migration
* Ensured hidden asset fields are completed on every database write
* CMULTI is a thing, and therefore a max prefix length of 5 cannot be a thing
