arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-19 14:32:16 +00:00
Code Issues Projects Releases Wiki Activity
1,685 Commits 55 Branches 0 Tags
d3de04a03ba92d50d5af75f5bfc679df7c12cede
Commit Graph

358 Commits

Author SHA1 Message Date
FreneticScribbler
d3de04a03b FIX: Re-enable markdown on paperwork 
Strikethrough is broken in all sorts of places for whatever reason
 2020-02-09 22:53:59 +00:00
FreneticScribbler
6e28476ca3 Merge branch 'master' into markdown 
# Conflicts:
#	RIGS/templates/RIGS/event_detail.html
#	RIGS/test_unit.py
#	requirements.txt
 2020-02-09 21:07:12 +00:00
Arona Jones
ae151ed45e Add assets test suite (#400) 
* 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>
 2020-02-08 13:52:07 +00:00
FreneticScribbler
39dbdd7ce4 FIX: Prevent long text breaking out of desc/notes 
Just for good measure
 2020-01-17 17:32:16 +00:00
Arona Jones
1a953073be Merge branch 'master' into misc 2020-01-17 15:36:24 +00:00
Matthew Smith
e0c6a56263 Disable password reset as temporary fix to vulnerability (#396) 
Disabled password reset and left message notifying user of problem. In response to CVE-2019-19844
 2020-01-17 13:13:16 +00:00
FreneticScribbler
87d460c799 FIX: Prevent long text breaking out of changelog popover 
Might even be nicely hypenated on some platforms...

Closes #259
 2020-01-14 19:38:26 +00:00
FreneticScribbler
3a25b85e95 FEAT: Add conditional formatting to whole auth panel 
Matches the formatting on the button
 2020-01-13 21:07:09 +00:00
FreneticScribbler
16b950c3b2 FIX: Make 'authorised at' datetime formatting match all the others 
Closes #385
 2020-01-13 21:07:09 +00:00
Arona Jones
ca8253894a FIX #321: Authorisation time shown as 'None' in emails (#378) 
* FIX #321: Authorisation Success emails dated 'None'

* FIX: Additionally fix datestamp on HTML client emails (#321)
 2019-12-31 12:45:38 +00:00
Arona Jones
01a87e0e0b FEAT: Add revision history to assets and suppliers (#387) 
* 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
 2019-12-31 12:25:42 +00:00
FreneticScribbler
c059227d5d Revert "CHANGE: Restrict viewing asset DB to keyholders." 
This reverts commit 2c334196d5.
 2019-12-05 12:42:05 +00:00
FreneticScribbler
2c334196d5 CHANGE: Restrict viewing asset DB to keyholders. 
This is in line with what it was when it was on the Shared Drive.
 2019-12-04 23:59:39 +00:00
Arona Jones
4f036af85a Create the Asset Database (#363) 2019-12-04 23:14:27 +00:00
FreneticScribbler
858b297929 Merge branch 'master' into markdown 
# Conflicts:
#	RIGS/static/css/print.css
#	RIGS/static/css/screen.css
#	RIGS/static/scss/screen.scss
#	RIGS/templates/RIGS/event_print_page.xml
#	RIGS/test_unit.py
#	requirements.txt
 2019-11-27 20:38:43 +00:00
FreneticScribbler
22a086714c Merge branch 'md-pretty-editor' into markdown 2019-11-27 20:20:36 +00:00
Arona Jones
5210afc772 Combine client authorisation information in rig detail (#373) 
* Combine client authorisation information in rig detail

* Fix stuff for CI

pep8 compliance
migration
 2019-11-26 17:26:32 +00:00
David Taylor
35997aa882 Add API hook for logging risk assessment completion (#341) 2019-07-28 23:08:18 +01:00
David Taylor
7babaee44c Add link to pre-filled risk assessment form 2019-07-14 23:09:44 +01:00
David Taylor
14836f135c Update subhire form location 
Requested by Jonny
 2019-02-25 21:29:14 +00:00
Johnathan Graydon
7e68dfb851 Fix hover text on invoice page 2017-11-29 14:40:11 +00:00
David Taylor
22c520e841 Refactored versioning.py (and associated templates) to improve readability and testability. 
Takes inspiration from, but does not use, django-reversion-compare. We do a lot of RIGS-specific stuff that requires a lot of hacking to get working nicely with django-reversion-compare. The main example of this is event-item “many-to-one” fields. The performance difference of my code compared to django-reversion-compare was found to be negligible.
 2017-06-21 03:09:46 +01:00
Johnathan Graydon
abb56af222 Fix spelling in rig authorisation 2017-06-02 12:52:01 +01:00
David Taylor
bdd7f02fe2 Add EventAuthorisation to the activity feed 2017-05-25 13:09:52 +01:00
Tom Price
7cb9e97ecb Fix text on quote paperwork for external clients 
Actually finish fixing PDF footer formatting.
 2017-05-24 16:34:32 +01:00
Tom Price
7fdafd854e Add payments to invoice PDF 2017-05-23 19:18:19 +01:00
Tom Price
d85ebb63a1 Minor PDF styling fixes 2017-05-23 19:04:57 +01:00
Tom Price
c6b7bbc219 Change to just using online auth for internal clients. 
This effectively reverts 067e03b.
 2017-05-23 18:19:02 +01:00
David Taylor
4e79f00551 Add pound signs to confirmation emails 2017-05-18 17:22:59 +01:00
David Taylor
f3c020b613 Update email templates to avoid using bootstrap. Should improve speed, and also cross-email-client compatability 2017-05-18 15:27:50 +01:00
Tom Price
4b87b0a196 Add some visual indicators that authorisations have been submitted. 
This will show teccies and clients that RIGS is processing emails which can take a short while.
Should prevent duplicate sending.
 2017-05-17 19:08:51 +01:00
David Taylor
f8aaf9f36e Merge branch 'master' into feature/online-auth 
# Conflicts:
#	RIGS/rigboard.py
#	RIGS/test_functional.py
#	RIGS/urls.py
#	requirements.txt
 2017-05-12 20:53:00 +01:00
David Taylor
374c31e8b4 Fix date/time/datetime field types 2017-05-10 23:03:35 +01:00
David Taylor
286e4314f5 Require users to have nottinghamtec.co.uk address before allowing them to send messages to clients 2017-05-10 15:39:13 +01:00
Tom Price
6b05938953 Set authorisation button text to be more verbose 2017-05-09 19:21:35 +01:00
Tom Price
1710c3f01f Send HTML confirmation emails. 
Also tidy up the PDF and some of the source.
 2017-05-09 18:43:27 +01:00
Tom Price
f57ac3acb1 Add sending of html email for the request 2017-05-09 18:35:29 +01:00
Tom Price
331dab20f7 Add basic tracking of when an event authorisation request was sent. 
Designed and requested by Ross because he can't remember if he's push a button...
 2017-04-19 18:14:36 +01:00
Tom Price
430862b24d Add tracking of who sent the link 2017-04-11 15:52:38 +01:00
Tom Price
e12367bde7 Few tweaks to printed documents following a conversation with Marilyn from treasury 2017-04-11 14:32:06 +01:00
Tom Price
36638e4df6 Add some more disclaimers explaining things better to internal clients. 2017-04-11 14:02:58 +01:00
Tom Price
a0440e1587 Add useful email addresses for reference. 2017-04-11 13:48:51 +01:00
Tom Price
6e78f16c33 Add changes suggested by DT 2017-04-11 11:45:08 +01:00
Tom Price
067e03b757 Remove Event.purchase_order in favour of a simple EventAuthorisation object. 2017-04-10 23:16:50 +01:00
Tom Price
391d9ef28f Update PDF templates and enable sending of PDF via email. 
PDFs now state QUOTE, INVOICE or RECEIPT.
Single copy and all but INVOICE includes terms of hire.
 2017-04-10 22:45:27 +01:00
Tom Price
5d17d642ec Update templates to include the new authorisation fields 2017-04-10 21:43:18 +01:00
Tom Price
306c11bb2f Add tooltip JavaScript 2017-04-10 20:47:19 +01:00
Tom Price
3fa9795cde Change mic name to use the full name rather than the display name on RIGS 2017-04-10 20:40:51 +01:00
Tom Price
7fd0c50146 Add sending of emails to clients. 
Add email sending methods.

Add TEC side sending of emails.
 2017-04-10 20:39:19 +01:00
Tom Price
3b2aa02ae5 Add success notification emails. 
Enable RevisionMixin for EventAuthorisation.

Add signal receivers for RIGS.

Expand RIGS into an explicitly defined app to support signals.
 2017-04-10 19:16:45 +01:00