arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity
1,786 Commits 54 Branches 0 Tags
d33a4231fb595c8ed1b167dd8fcfe71e4c6d5cd8
Commit Graph

1786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FreneticScribbler
d33a4231fb Fix selectpickers showing up slightly wonky 2022-01-30 12:14:26 +00:00
FreneticScribbler
8dea6aeab0 Allow to search training items by (full) reference number) 2022-01-30 12:03:40 +00:00
FreneticScribbler
34c03e379d Switch to using competency assessed for leaderboard 2022-01-30 11:23:54 +00:00
FreneticScribbler
988fb78b45 Rewrite admin merge functionality. Should close #473 2022-01-29 14:58:15 +00:00
FreneticScribbler
eda314c092 Test work, some CSS fixes, mild reversion pokage 2022-01-27 00:52:12 +00:00
FreneticScribbler
8ef520619a Potential test fix 2022-01-26 20:32:22 +00:00
FreneticScribbler
95931f86b4 Add link to H&S reporter in quick links and fix some layout issues 2022-01-26 20:00:14 +00:00
FreneticScribbler
cc2cb5c4d1 Fix tests 2022-01-26 19:49:18 +00:00
FreneticScribbler
3ae507b469 Filter trainees for active approved users 
Closes #477
 2022-01-25 13:08:33 +00:00
FreneticScribbler
33754eed60 System for allowing certain TrainingCategories to be trained by certain levels, regardless of supervisor status 
I.e. the haulage department, ref #482. As generic as I can make it I think.
 2022-01-25 13:04:26 +00:00
FreneticScribbler
15ab626593 HOTFIX: Version string broken on paperwork generation 
Why the hell didn't the tests catch that?
 2022-01-25 12:30:37 +00:00
FreneticScribbler
7bc47b446c Add functionality to filter trainee list by is_supervisor 
Closes #479
 2022-01-25 10:53:25 +00:00
FreneticScribbler
83b287a418 Refactor merge logic to allow merging of users. Closes #473. 2022-01-25 10:29:46 +00:00
FreneticScribbler
3b9848d457 Set user on level confirmation 2022-01-24 22:36:53 +00:00
FreneticScribbler
308d0c697e Fix (probably) reversion for trainingitemqualification 2022-01-24 22:32:12 +00:00
FreneticScribbler
f243a589fa Remove duplicate RevisionMixin 2022-01-24 21:07:32 +00:00
FreneticScribbler
79c90ac92c PATCH: Bullets in paperwork hard crashing 2022-01-24 15:51:57 +00:00
FreneticScribbler
8244287a64 FIX: inability to scroll modals on dark theme 
What. The. Hell.
 2022-01-24 15:51:57 +00:00
FreneticScribbler
da4d62729b Properly folderise rigboard views 2022-01-24 13:49:11 +00:00
FreneticScribbler
f8a48798de Hide index page images on mobile 2022-01-20 18:35:30 +00:00
FreneticScribbler
fc817fa9b5 Swap to EasyMDE 
Various other fixes too
 2022-01-20 11:31:23 +00:00
FreneticScribbler
b04a168f01 Remove flatpickr polyfill 
Firefox now supports it natively...finally! Closes #475
 2022-01-20 11:04:15 +00:00
FreneticScribbler
cc6992976e Fix #476 broken darktheme embeds 
One tiny step toward #419 as well ;p
 2022-01-20 10:50:41 +00:00
FreneticScribbler
a556b17d2d Rip out analytics 
Closes #423
 2022-01-20 10:38:02 +00:00
FreneticScribbler
f9e38338dc Fix error when trying to load detailed item list 2022-01-20 10:35:52 +00:00
FreneticScribbler
ce83ae6dd1 Refactor asset search to use SecureAPIRequest 
Closes #474 and #465
 2022-01-19 19:19:50 +00:00
FreneticScribbler
9e1d54dc02 FIX #472: Filter common competencies out of get_levels_of_depth 2022-01-19 18:38:37 +00:00
Arona Jones
375b0af2fd Delete Dockerfile 2022-01-19 13:20:03 +00:00
imgbot[bot]
0354662864 [ImgBot] Optimize images (#471) 
*Total -- 8,936.02kb -> 7,990.11kb (10.59%)

/assets/static/imgs/square_logo.png -- 23.90kb -> 17.64kb (26.18%)
/RIGS/static/imgs/tappytaptap.gif -- 6,433.15kb -> 5,493.51kb (14.61%)
/RIGS/static/imgs/rigs.jpg -- 277.61kb -> 277.60kb (0%)
/RIGS/static/imgs/training.jpg -- 852.42kb -> 852.42kb (0%)
/RIGS/static/imgs/assets.jpg -- 1,348.94kb -> 1,348.94kb (0%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>

Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com>
 2022-01-19 13:17:44 +00:00
FreneticScribbler
c537118037 Fix typo in training level list 2022-01-18 17:43:52 +00:00
FreneticScribbler
466a9a9693 Delete broken migration 
Manual SQL time whee
 2022-01-18 16:20:18 +00:00
Arona Jones
d25381b2de Create the training database (#463) 
Co-authored-by: josephjboyden <josephjboyden@gmail.com>
 2022-01-18 15:47:53 +00:00
dependabot[bot]
eaf891daf7 Build(deps): Bump copy-props from 2.0.4 to 2.0.5 (#468) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-15 12:13:40 +00:00
dependabot[bot]
801d2e8a7d Build(deps): Bump marked from 4.0.8 to 4.0.10 (#466) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-15 11:51:58 +00:00
dependabot[bot]
3d329219b8 Build(deps): Bump follow-redirects from 1.14.6 to 1.14.7 (#467) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-15 11:50:56 +00:00
FreneticScribbler
2ddc8923ba CHORE: Fix pep8 2022-01-14 18:01:59 +00:00
FreneticScribbler
276a86c5be FEAT(Asset): Add filter by date acquired 
Date created isn't a DB field, so isn't efficient to filter by...
 2022-01-14 17:54:20 +00:00
FreneticScribbler
484f155e43 FEAT(Asset): Add ability to generate whole page of labels 2021-12-31 12:55:13 +00:00
FreneticScribbler
fdbdaab52e FEAT(Asset): Add filter for only cables 2021-12-30 18:49:52 +00:00
Tom Price
a01e351e89 Markdown (#214) 
* Add basic markdown support site wide

* Improved MD support.

Add some styling for images in MD

Add support for the bastardisation of the MD html for RML.

* Add processing for <ul> in RML

* Add OL processing to RML

* Fix a bug with squares appearing around the last page number

* Remove rml formatting in event_detail

* Improve handling of code blocks in RML

* Add MD to rigboard

Reduce MD title sizes as they were offensively large

* Add parsing of markdown when editing event items

* Improved list handling in RML

* Add tests for markdown support.

Focuses mainly on RML as that's where it will break

* Add indications of where MD support is enabled as per comment by @samozzy in #178.

Isn't quite a full description, but for the most part this should be enough for the people who know how to use it see where they can use it.

* Add failing test for markdown processing none

* Fix for failing test in e0d56e

* Add failing test for using single line breaks as per comment on #214

* Enable line break extension for single breaks in paragraphs by new lines.

Pass tests in ef3de607c3

* Enable GH flavour linebreaks in JS rendered markdown

* Made RML bullets pretty :)

* Added WYSIWYG editor. Works for notes & description, fails miserably for items :(

* Fixed for event items. Will probably fail tests because selenium can't type in simpleMDE :(

* FIX: Re-enable markdown on paperwork

Strikethrough is broken in all sorts of places for whatever reason

* FEAT: Markdown support on asset comments

* FIX: Prevent js injection through markdown fields

* Initial fixes

* Basic dark theme for simplemde

* Swap to locally delivered SimpleMDE

* Region for selenium testing of SimpleMDE

Bleh, Javascript all around

* Tests passing!

Fixed not using region for item modal, and overflow error on paperwork with really long description. Looks junk but I'm not really bothered

* Pep8 fixes

* Fallback for null HCapatcha sitekey

I.e. when we're on a branch

* Fix item description print being broken

* Actually fix sitekey problem

* Fixes for using markdown in asset comments

* Properly initialise markdown on asset comments

Co-authored-by: David Taylor <david@taylorhq.com>
Co-authored-by: FreneticScribbler <aj@aronajones.com>
 2021-12-22 21:22:15 +00:00
dependabot[bot]
708a387774 Build(deps): Bump lodash from 4.17.20 to 4.17.21 (#461) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

---
updated-dependencies:
- dependency-name: lodash
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-19 12:12:01 +00:00
dependabot[bot]
af6fe582e0 Build(deps): Bump hosted-git-info from 2.8.8 to 2.8.9 (#460) 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

---
updated-dependencies:
- dependency-name: hosted-git-info
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-19 12:11:52 +00:00
dependabot[bot]
905a144e7d Build(deps): Bump path-parse from 1.0.6 to 1.0.7 (#459) 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-19 12:11:43 +00:00
Arona Jones
0e64021f01 Pin >8 ver of postcss 2021-12-19 11:49:58 +00:00
Arona Jones
2eb87a51f8 Update for gulp-sass change 2021-12-19 11:39:26 +00:00
Arona Jones
30fac1d1b9 NPM Dependency update 2021-12-19 11:26:55 +00:00
FreneticScribbler
c4fec483ae FIX/CHNG: Clients may see line prices on event auth form 
Not sure why they couldn't previous, its not like we only quote totals...
 2021-12-13 12:13:47 +00:00
FreneticScribbler
3028fb92d9 Fix up the copy button stuff 2021-12-13 12:07:42 +00:00
Arona Jones
215697ba64 Change navbar logo link when authenticated to RIGS 2021-11-23 09:22:06 +00:00
FreneticScribbler
d966bddfd7 QOL: Add copy to clipboard buttons to emails on event auth request modal 2021-11-07 13:40:04 +00:00