mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-17 13:32:15 +00:00
Arona Jones
3414204209
* 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 ofd274ea4606. 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/supersedes0e67da82e2* 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 commitcce0ad0f9f. # 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>
6 lines
10 KiB
JavaScript
6 lines
10 KiB
JavaScript
/*!
|
|
* Bootstrap modal.js v4.5.2 (https://getbootstrap.com/)
|
|
* Copyright 2011-2020 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
|
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
|
|
*/
|
|
!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("jquery"),require("./util.js")):"function"==typeof define&&define.amd?define(["jquery","./util.js"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).Modal=t(e.jQuery,e.Util)}(this,(function(e,t){"use strict";function i(){return(i=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var i=arguments[t];for(var n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n])}return e}).apply(this,arguments)}function n(e,t){for(var i=0;i<t.length;i++){var n=t[i];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}e=e&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e,t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var o="modal",s=".bs.modal",a=e.fn.modal,r={backdrop:!0,keyboard:!0,focus:!0,show:!0},l={backdrop:"(boolean|string)",keyboard:"boolean",focus:"boolean",show:"boolean"},d=function(){function a(e,t){this._config=this._getConfig(t),this._element=e,this._dialog=e.querySelector(".modal-dialog"),this._backdrop=null,this._isShown=!1,this._isBodyOverflowing=!1,this._ignoreBackdropClick=!1,this._isTransitioning=!1,this._scrollbarWidth=0}var d,h,c,m=a.prototype;return m.toggle=function(e){return this._isShown?this.hide():this.show(e)},m.show=function(t){var i=this;if(!this._isShown&&!this._isTransitioning){e(this._element).hasClass("fade")&&(this._isTransitioning=!0);var n=e.Event("show.bs.modal",{relatedTarget:t});e(this._element).trigger(n),this._isShown||n.isDefaultPrevented()||(this._isShown=!0,this._checkScrollbar(),this._setScrollbar(),this._adjustDialog(),this._setEscapeEvent(),this._setResizeEvent(),e(this._element).on("click.dismiss.bs.modal",'[data-dismiss="modal"]',(function(e){return i.hide(e)})),e(this._dialog).on("mousedown.dismiss.bs.modal",(function(){e(i._element).one("mouseup.dismiss.bs.modal",(function(t){e(t.target).is(i._element)&&(i._ignoreBackdropClick=!0)}))})),this._showBackdrop((function(){return i._showElement(t)})))}},m.hide=function(i){var n=this;if(i&&i.preventDefault(),this._isShown&&!this._isTransitioning){var o=e.Event("hide.bs.modal");if(e(this._element).trigger(o),this._isShown&&!o.isDefaultPrevented()){this._isShown=!1;var s=e(this._element).hasClass("fade");if(s&&(this._isTransitioning=!0),this._setEscapeEvent(),this._setResizeEvent(),e(document).off("focusin.bs.modal"),e(this._element).removeClass("show"),e(this._element).off("click.dismiss.bs.modal"),e(this._dialog).off("mousedown.dismiss.bs.modal"),s){var a=t.getTransitionDurationFromElement(this._element);e(this._element).one(t.TRANSITION_END,(function(e){return n._hideModal(e)})).emulateTransitionEnd(a)}else this._hideModal()}}},m.dispose=function(){[window,this._element,this._dialog].forEach((function(t){return e(t).off(s)})),e(document).off("focusin.bs.modal"),e.removeData(this._element,"bs.modal"),this._config=null,this._element=null,this._dialog=null,this._backdrop=null,this._isShown=null,this._isBodyOverflowing=null,this._ignoreBackdropClick=null,this._isTransitioning=null,this._scrollbarWidth=null},m.handleUpdate=function(){this._adjustDialog()},m._getConfig=function(e){return e=i({},r,e),t.typeCheckConfig(o,e,l),e},m._triggerBackdropTransition=function(){var i=this;if("static"===this._config.backdrop){var n=e.Event("hidePrevented.bs.modal");if(e(this._element).trigger(n),n.defaultPrevented)return;var o=this._element.scrollHeight>document.documentElement.clientHeight;o||(this._element.style.overflowY="hidden"),this._element.classList.add("modal-static");var s=t.getTransitionDurationFromElement(this._dialog);e(this._element).off(t.TRANSITION_END),e(this._element).one(t.TRANSITION_END,(function(){i._element.classList.remove("modal-static"),o||e(i._element).one(t.TRANSITION_END,(function(){i._element.style.overflowY=""})).emulateTransitionEnd(i._element,s)})).emulateTransitionEnd(s),this._element.focus()}else this.hide()},m._showElement=function(i){var n=this,o=e(this._element).hasClass("fade"),s=this._dialog?this._dialog.querySelector(".modal-body"):null;this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE||document.body.appendChild(this._element),this._element.style.display="block",this._element.removeAttribute("aria-hidden"),this._element.setAttribute("aria-modal",!0),this._element.setAttribute("role","dialog"),e(this._dialog).hasClass("modal-dialog-scrollable")&&s?s.scrollTop=0:this._element.scrollTop=0,o&&t.reflow(this._element),e(this._element).addClass("show"),this._config.focus&&this._enforceFocus();var a=e.Event("shown.bs.modal",{relatedTarget:i}),r=function(){n._config.focus&&n._element.focus(),n._isTransitioning=!1,e(n._element).trigger(a)};if(o){var l=t.getTransitionDurationFromElement(this._dialog);e(this._dialog).one(t.TRANSITION_END,r).emulateTransitionEnd(l)}else r()},m._enforceFocus=function(){var t=this;e(document).off("focusin.bs.modal").on("focusin.bs.modal",(function(i){document!==i.target&&t._element!==i.target&&0===e(t._element).has(i.target).length&&t._element.focus()}))},m._setEscapeEvent=function(){var t=this;this._isShown?e(this._element).on("keydown.dismiss.bs.modal",(function(e){t._config.keyboard&&27===e.which?(e.preventDefault(),t.hide()):t._config.keyboard||27!==e.which||t._triggerBackdropTransition()})):this._isShown||e(this._element).off("keydown.dismiss.bs.modal")},m._setResizeEvent=function(){var t=this;this._isShown?e(window).on("resize.bs.modal",(function(e){return t.handleUpdate(e)})):e(window).off("resize.bs.modal")},m._hideModal=function(){var t=this;this._element.style.display="none",this._element.setAttribute("aria-hidden",!0),this._element.removeAttribute("aria-modal"),this._element.removeAttribute("role"),this._isTransitioning=!1,this._showBackdrop((function(){e(document.body).removeClass("modal-open"),t._resetAdjustments(),t._resetScrollbar(),e(t._element).trigger("hidden.bs.modal")}))},m._removeBackdrop=function(){this._backdrop&&(e(this._backdrop).remove(),this._backdrop=null)},m._showBackdrop=function(i){var n=this,o=e(this._element).hasClass("fade")?"fade":"";if(this._isShown&&this._config.backdrop){if(this._backdrop=document.createElement("div"),this._backdrop.className="modal-backdrop",o&&this._backdrop.classList.add(o),e(this._backdrop).appendTo(document.body),e(this._element).on("click.dismiss.bs.modal",(function(e){n._ignoreBackdropClick?n._ignoreBackdropClick=!1:e.target===e.currentTarget&&n._triggerBackdropTransition()})),o&&t.reflow(this._backdrop),e(this._backdrop).addClass("show"),!i)return;if(!o)return void i();var s=t.getTransitionDurationFromElement(this._backdrop);e(this._backdrop).one(t.TRANSITION_END,i).emulateTransitionEnd(s)}else if(!this._isShown&&this._backdrop){e(this._backdrop).removeClass("show");var a=function(){n._removeBackdrop(),i&&i()};if(e(this._element).hasClass("fade")){var r=t.getTransitionDurationFromElement(this._backdrop);e(this._backdrop).one(t.TRANSITION_END,a).emulateTransitionEnd(r)}else a()}else i&&i()},m._adjustDialog=function(){var e=this._element.scrollHeight>document.documentElement.clientHeight;!this._isBodyOverflowing&&e&&(this._element.style.paddingLeft=this._scrollbarWidth+"px"),this._isBodyOverflowing&&!e&&(this._element.style.paddingRight=this._scrollbarWidth+"px")},m._resetAdjustments=function(){this._element.style.paddingLeft="",this._element.style.paddingRight=""},m._checkScrollbar=function(){var e=document.body.getBoundingClientRect();this._isBodyOverflowing=Math.round(e.left+e.right)<window.innerWidth,this._scrollbarWidth=this._getScrollbarWidth()},m._setScrollbar=function(){var t=this;if(this._isBodyOverflowing){var i=[].slice.call(document.querySelectorAll(".fixed-top, .fixed-bottom, .is-fixed, .sticky-top")),n=[].slice.call(document.querySelectorAll(".sticky-top"));e(i).each((function(i,n){var o=n.style.paddingRight,s=e(n).css("padding-right");e(n).data("padding-right",o).css("padding-right",parseFloat(s)+t._scrollbarWidth+"px")})),e(n).each((function(i,n){var o=n.style.marginRight,s=e(n).css("margin-right");e(n).data("margin-right",o).css("margin-right",parseFloat(s)-t._scrollbarWidth+"px")}));var o=document.body.style.paddingRight,s=e(document.body).css("padding-right");e(document.body).data("padding-right",o).css("padding-right",parseFloat(s)+this._scrollbarWidth+"px")}e(document.body).addClass("modal-open")},m._resetScrollbar=function(){var t=[].slice.call(document.querySelectorAll(".fixed-top, .fixed-bottom, .is-fixed, .sticky-top"));e(t).each((function(t,i){var n=e(i).data("padding-right");e(i).removeData("padding-right"),i.style.paddingRight=n||""}));var i=[].slice.call(document.querySelectorAll(".sticky-top"));e(i).each((function(t,i){var n=e(i).data("margin-right");void 0!==n&&e(i).css("margin-right",n).removeData("margin-right")}));var n=e(document.body).data("padding-right");e(document.body).removeData("padding-right"),document.body.style.paddingRight=n||""},m._getScrollbarWidth=function(){var e=document.createElement("div");e.className="modal-scrollbar-measure",document.body.appendChild(e);var t=e.getBoundingClientRect().width-e.clientWidth;return document.body.removeChild(e),t},a._jQueryInterface=function(t,n){return this.each((function(){var o=e(this).data("bs.modal"),s=i({},r,e(this).data(),"object"==typeof t&&t?t:{});if(o||(o=new a(this,s),e(this).data("bs.modal",o)),"string"==typeof t){if(void 0===o[t])throw new TypeError('No method named "'+t+'"');o[t](n)}else s.show&&o.show(n)}))},d=a,c=[{key:"VERSION",get:function(){return"4.5.2"}},{key:"Default",get:function(){return r}}],(h=null)&&n(d.prototype,h),c&&n(d,c),a}();return e(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',(function(n){var o,s=this,a=t.getSelectorFromElement(this);a&&(o=document.querySelector(a));var r=e(o).data("bs.modal")?"toggle":i({},e(o).data(),e(this).data());"A"!==this.tagName&&"AREA"!==this.tagName||n.preventDefault();var l=e(o).one("show.bs.modal",(function(t){t.isDefaultPrevented()||l.one("hidden.bs.modal",(function(){e(s).is(":visible")&&s.focus()}))}));d._jQueryInterface.call(e(o),r,this)})),e.fn.modal=d._jQueryInterface,e.fn.modal.Constructor=d,e.fn.modal.noConflict=function(){return e.fn.modal=a,d._jQueryInterface},d})); |