arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 13:32:15 +00:00
Code Issues Projects Releases Wiki Activity
1,690 Commits 54 Branches 0 Tags
98b9697366e7713bd8e06a7d336aa57f8dcb86fa
Commit Graph

1690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Smith
98b9697366 Temporary fix to cable_form tag. No cable functionality has actually been added, that can be done once the frontend is in place to handle it. 2019-10-07 10:45:23 +01:00
Matthew Smith
85db26bdb1 Changed functionality of asset search - now IDs are always searched even if the string is under 3 characters in length 2019-10-06 01:13:26 +01:00
Matthew Smith
7b795ac332 Fixed some bugs with search 2019-10-06 01:03:41 +01:00
Matthew Smith
d944f99e1f Fixed cable form fields not appearing, and made the 'cable details' group appearing more reliable 2019-10-05 23:19:22 +01:00
FreneticScribbler
a22956cc62 Initial work on cable template things 2019-10-05 22:42:21 +01:00
Matthew Smith
3d5272d722 Fixed incorrecty data being sent to the date_sold field in the asset_update template. Fixes last of dates not being passed around correctly 2019-10-05 21:58:49 +01:00
Matthew Smith
1c06bf3ba4 Merge branch 'asset-assetforms' of https://github.com/nottinghamtec/PyRIGS into asset-assetforms 2019-10-05 21:16:58 +01:00
Matthew Smith
d5f08a8bff Started adding functionality for assets and cables forms to be dynamically swapped 2019-10-05 21:16:42 +01:00
Matthew Smith
7359e05427 Started adding functionality for assets and cables forms to be dynamically swapped 2019-10-05 21:16:03 +01:00
FreneticScribbler
366d9c4130 Label the collection 'set parent' field as such 2019-10-05 20:33:03 +01:00
Matthew Smith
e3cbcbd151 Fixed search and implemented an asset search api 
Added asset picker for parent attribute

Co-authored-by: Panagiotis Petridis <lPanagiotisPetridisl@gmail.com>
 2019-10-05 20:18:07 +01:00
Matthew Smith
1d253aa452 Fixed edit always being invalid due to always failing form validation 2019-10-05 15:08:40 +01:00
Matthew Smith
3aa3498d3a Split out create and duplicate templates, got both working 2019-10-05 14:59:15 +01:00
Matthew Smith
a4adc8bc7b Now asset_ids are going to be editable, removed that limitation from form 2019-10-05 14:54:19 +01:00
Matthew Smith
769137fabd Started work on improving asset form update and validation - requires de-spaghettifying of asset_update.html before continuing 2019-10-05 01:44:54 +01:00
FreneticScribbler
5bfa737f6b First pass at filters 
They're currently exclusive with each other and search, which ain't quite right!

Also stopped search from searching comments.
 2019-10-02 22:49:54 +01:00
Matthew Smith
8599a2ae5b Improved handling of asset ID when searching 2019-10-02 21:54:39 +01:00
Matthew Smith
63eb0fc3ce Merge branch 'assets' of https://github.com/nottinghamtec/PyRIGS into assets 2019-10-02 21:14:03 +01:00
Matthew Smith
207bf7bd7a Added dependency django-polymorphic 
Model change to take advantage of said polymorphism
Implemented asset search
 2019-10-02 21:12:24 +01:00
FreneticScribbler
e591ebe05a Show purchase and collection details side by side 
Not sure if I like this or not. Maybe collection should start collapsed, too.
 2019-10-02 19:38:05 +01:00
FreneticScribbler
3d7fc18fb7 Fix unclosed tags in asset_update 2019-10-02 18:58:52 +01:00
FreneticScribbler
6c68343653 Add status colors to asset list 2019-10-02 18:34:34 +01:00
FreneticScribbler
5cb668fd7a Fix delete confirmation modal styling 2019-10-02 17:40:21 +01:00
Matthew Smith
7aba164a46 Added .pytest_cache to gitignore 2019-10-02 17:32:57 +01:00
FreneticScribbler
42a63f035c Asset detail view button improvements 2019-10-02 17:17:35 +01:00
FreneticScribbler
15113c4fbc Fix asset list quicklinks 2019-10-02 16:51:45 +01:00
FreneticScribbler
721599d35e Delete Materialize 2019-10-02 12:49:43 +01:00
warlordjones
9bcff7cd5f Supplier bootstrap port 2019-10-02 12:40:55 +01:00
warlordjones
f3c7f89f31 Initial bootstrap port of asset_update 2019-10-02 12:08:52 +01:00
Matthew Smith
8c60f6cb1d created separate base for RIGS and assets. 
Fixed create asset form
 2019-10-01 22:46:48 +01:00
warlordjones
a9a05b06fa Begin bootstrap port 2019-10-01 19:59:02 +01:00
warlordjones
d89d449ab1 Fix sample data generator 2019-10-01 19:22:15 +01:00
warlordjones
36ac122f7a Add requirements from assets 
Only added new requirements rather than version matching dependencies RIGS already required
 2019-10-01 18:45:59 +01:00
Matthew Smith
6cff7c090c Modified configs so that templates are rendered. Functionality and styling are NOT complete (need to change css framework) 2019-10-01 18:10:34 +01:00
Matthew Smith
1df971bbba Updated RIGS configs to allow for extra assets info 2019-10-01 13:29:52 +01:00
Matthew Smith
39e3898c7d Merge branch 'master' of PyAssets into assets 2019-10-01 13:24:47 +01:00
Matthew Smith
1e1f3037f8 Preparing files for transfer to PyRIGS 2019-10-01 13:22:16 +01:00
David Taylor
1a49bb50e5 Further version history improvements 2019-07-28 23:40:35 +01:00
David Taylor
86b349f60e Tidy up version history for risk assessments 2019-07-28 23:32:54 +01:00
David Taylor
35997aa882 Add API hook for logging risk assessment completion (#341) 2019-07-28 23:08:18 +01:00
David Taylor
faa4573f6d Add dash to date range 2019-07-14 23:15:13 +01:00
David Taylor
7babaee44c Add link to pre-filled risk assessment form 2019-07-14 23:09:44 +01:00
David Taylor
c0fe176495 Add docker dev instructions 2019-07-14 23:04:12 +01:00
David Taylor
b269069b6a Improve embedding style 2019-06-20 00:56:11 +01:00
David Taylor
7e06b5a162 Increase height of forum embeds 2019-06-20 00:29:10 +01:00
David Taylor
a18bb07d78 Update views.py 2019-06-20 00:15:16 +01:00
David Taylor
bd28d2054e Remove autofocus from form 2019-06-20 00:13:24 +01:00
David Taylor
14836f135c Update subhire form location 
Requested by Jonny
 2019-02-25 21:29:14 +00:00
Harry Bridge
5aafa36d2a Tidy up logic for which links to show, made comments duplicate 2019-01-31 20:03:49 +00:00
Harry Bridge
1ef60943ea Put duplication into one view 2019-01-31 20:03:08 +00:00