mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-17 13:32:15 +00:00
* 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>
203 lines
7.6 KiB
Python
203 lines
7.6 KiB
Python
import re
|
|
from django.core.exceptions import ValidationError
|
|
from django.db import models, connection
|
|
from django.urls import reverse
|
|
|
|
from django.db.models.signals import pre_save
|
|
from django.dispatch.dispatcher import receiver
|
|
|
|
from reversion import revisions as reversion
|
|
from reversion.models import Version
|
|
|
|
from RIGS.models import RevisionMixin, Profile
|
|
|
|
|
|
class AssetCategory(models.Model):
|
|
class Meta:
|
|
verbose_name = 'Asset Category'
|
|
verbose_name_plural = 'Asset Categories'
|
|
ordering = ['name']
|
|
|
|
name = models.CharField(max_length=80)
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
|
|
class AssetStatus(models.Model):
|
|
class Meta:
|
|
verbose_name = 'Asset Status'
|
|
verbose_name_plural = 'Asset Statuses'
|
|
ordering = ['name']
|
|
|
|
name = models.CharField(max_length=80)
|
|
should_show = models.BooleanField(
|
|
default=True, help_text="Should this be shown by default in the asset list.")
|
|
display_class = models.CharField(max_length=80, blank=True, null=True, help_text="HTML class to be appended to alter display of assets with this status, such as in the list.")
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
|
|
@reversion.register
|
|
class Supplier(models.Model, RevisionMixin):
|
|
class Meta:
|
|
ordering = ['name']
|
|
|
|
name = models.CharField(max_length=80)
|
|
phone = models.CharField(max_length=15, blank=True, null=True)
|
|
email = models.EmailField(blank=True, null=True)
|
|
address = models.TextField(blank=True, null=True)
|
|
|
|
notes = models.TextField(blank=True, null=True)
|
|
|
|
def get_absolute_url(self):
|
|
return reverse('supplier_list')
|
|
|
|
def __str__(self):
|
|
return self.name
|
|
|
|
|
|
class Connector(models.Model):
|
|
description = models.CharField(max_length=80)
|
|
current_rating = models.DecimalField(decimal_places=2, max_digits=10, help_text='Amps')
|
|
voltage_rating = models.IntegerField(help_text='Volts')
|
|
num_pins = models.IntegerField(blank=True, null=True)
|
|
|
|
def __str__(self):
|
|
return self.description
|
|
|
|
|
|
# Things are nullable that shouldn't be because I didn't properly fix the data structure when moving this to its own model...
|
|
class CableType(models.Model):
|
|
class Meta:
|
|
ordering = ['plug', 'socket', '-circuits']
|
|
|
|
circuits = models.IntegerField(default=1)
|
|
cores = models.IntegerField(default=3)
|
|
plug = models.ForeignKey(Connector, on_delete=models.CASCADE,
|
|
related_name='plug', null=True)
|
|
socket = models.ForeignKey(Connector, on_delete=models.CASCADE,
|
|
related_name='socket', null=True)
|
|
|
|
def __str__(self):
|
|
if self.plug and self.socket:
|
|
return "%s → %s" % (self.plug.description, self.socket.description)
|
|
else:
|
|
return "Unknown"
|
|
|
|
|
|
@reversion.register
|
|
class Asset(models.Model, RevisionMixin):
|
|
class Meta:
|
|
ordering = ['asset_id_prefix', 'asset_id_number']
|
|
permissions = [
|
|
('asset_finance', 'Can see financial data for assets')
|
|
]
|
|
|
|
parent = models.ForeignKey(to='self', related_name='asset_parent',
|
|
blank=True, null=True, on_delete=models.SET_NULL)
|
|
asset_id = models.CharField(max_length=15, unique=True)
|
|
description = models.CharField(max_length=120)
|
|
category = models.ForeignKey(to=AssetCategory, on_delete=models.CASCADE)
|
|
status = models.ForeignKey(to=AssetStatus, on_delete=models.CASCADE)
|
|
serial_number = models.CharField(max_length=150, blank=True)
|
|
purchased_from = models.ForeignKey(to=Supplier, on_delete=models.CASCADE, blank=True, null=True, related_name="assets")
|
|
date_acquired = models.DateField()
|
|
date_sold = models.DateField(blank=True, null=True)
|
|
purchase_price = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10)
|
|
salvage_value = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10)
|
|
comments = models.TextField(blank=True)
|
|
|
|
# Audit
|
|
last_audited_at = models.DateTimeField(blank=True, null=True)
|
|
last_audited_by = models.ForeignKey(Profile, on_delete=models.SET_NULL, related_name='audited_by', blank=True, null=True)
|
|
|
|
# Cable assets
|
|
is_cable = models.BooleanField(default=False)
|
|
cable_type = models.ForeignKey(to=CableType, blank=True, null=True, on_delete=models.SET_NULL)
|
|
length = models.DecimalField(decimal_places=1, max_digits=10,
|
|
blank=True, null=True, help_text='m')
|
|
csa = models.DecimalField(decimal_places=2, max_digits=10,
|
|
blank=True, null=True, help_text='mm²')
|
|
|
|
# Hidden asset_id components
|
|
# For example, if asset_id was "C1001" then asset_id_prefix would be "C" and number "1001"
|
|
asset_id_prefix = models.CharField(max_length=8, default="")
|
|
asset_id_number = models.IntegerField(default=1)
|
|
|
|
reversion_perm = 'assets.asset_finance'
|
|
|
|
def get_available_asset_id(wanted_prefix=""):
|
|
sql = """
|
|
SELECT a.asset_id_number+1
|
|
FROM assets_asset a
|
|
LEFT OUTER JOIN assets_asset b ON
|
|
(a.asset_id_number + 1 = b.asset_id_number AND
|
|
a.asset_id_prefix = b.asset_id_prefix)
|
|
WHERE b.asset_id IS NULL AND a.asset_id_number >= %s AND a.asset_id_prefix = %s;
|
|
"""
|
|
with connection.cursor() as cursor:
|
|
cursor.execute(sql, [9000, wanted_prefix])
|
|
row = cursor.fetchone()
|
|
if row is None or row[0] is None:
|
|
return 9000
|
|
else:
|
|
return row[0]
|
|
|
|
def get_absolute_url(self):
|
|
return reverse('asset_detail', kwargs={'pk': self.asset_id})
|
|
|
|
def __str__(self):
|
|
out = str(self.asset_id) + ' - ' + self.description
|
|
if self.is_cable and self.cable_type is not None:
|
|
out += '{} - {}m - {}'.format(self.cable_type.plug, self.length, self.cable_type.socket)
|
|
return out
|
|
|
|
def clean(self):
|
|
errdict = {}
|
|
if self.date_sold and self.date_acquired > self.date_sold:
|
|
errdict["date_sold"] = ["Cannot sell an item before it is acquired"]
|
|
|
|
self.asset_id = self.asset_id.upper()
|
|
asset_search = re.search("^([a-zA-Z0-9]*?[a-zA-Z]?)([0-9]+)$", self.asset_id)
|
|
if asset_search is None:
|
|
errdict["asset_id"] = [
|
|
"An Asset ID can only consist of letters and numbers, with a final number"]
|
|
|
|
if self.purchase_price and self.purchase_price < 0:
|
|
errdict["purchase_price"] = ["A price cannot be negative"]
|
|
|
|
if self.salvage_value and self.salvage_value < 0:
|
|
errdict["salvage_value"] = ["A price cannot be negative"]
|
|
|
|
if self.is_cable:
|
|
if not self.length or self.length <= 0:
|
|
errdict["length"] = ["The length of a cable must be more than 0"]
|
|
if not self.csa or self.csa <= 0:
|
|
errdict["csa"] = ["The CSA of a cable must be more than 0"]
|
|
if not self.cable_type:
|
|
errdict["cable_type"] = ["A cable must have a type"]
|
|
|
|
if errdict != {}: # If there was an error when validation
|
|
raise ValidationError(errdict)
|
|
|
|
@property
|
|
def activity_feed_string(self):
|
|
return str(self)
|
|
|
|
@property
|
|
def display_id(self):
|
|
return str(self.asset_id)
|
|
|
|
|
|
@receiver(pre_save, sender=Asset)
|
|
def pre_save_asset(sender, instance, **kwargs):
|
|
"""Automatically fills in hidden members on database access"""
|
|
asset_search = re.search("^([a-zA-Z0-9]*?[a-zA-Z]?)([0-9]+)$", instance.asset_id)
|
|
if asset_search is None:
|
|
instance.asset_id += "1"
|
|
asset_search = re.search("^([a-zA-Z0-9]*?[a-zA-Z]?)([0-9]+)$", instance.asset_id)
|
|
instance.asset_id_prefix = asset_search.group(1)
|
|
instance.asset_id_number = int(asset_search.group(2))
|