Compare commits

..

1 Commits

Author SHA1 Message Date
requires.io
9deb8ebb14 [requires.io] dependency update 2020-02-29 11:34:58 +00:00
7 changed files with 33 additions and 64 deletions

View File

@@ -1,6 +1,6 @@
# TEC PA & Lighting - PyRIGS #
[![Build Status](https://travis-ci.org/nottinghamtec/PyRIGS.svg?branch=develop)](https://travis-ci.org/nottinghamtec/PyRIGS)
[![Coverage Status](https://coveralls.io/repos/github/nottinghamtec/PyRIGS/badge.svg)](https://coveralls.io/github/nottinghamtec/PyRIGS)
[![Coverage Status](https://coveralls.io/repos/github/nottinghamtec/PyRIGS/badge.svg?branch=develop)](https://coveralls.io/github/nottinghamtec/PyRIGS)
Welcome to TEC PA & Lightings PyRIGS program. This is a reimplementation of the existing Rig Information Gathering System (RIGS) that was developed using Ruby on Rails.

View File

@@ -486,10 +486,6 @@ class Event(models.Model, RevisionMixin):
if startEndSameDay and hasStartAndEnd and self.start_time > self.end_time:
raise ValidationError('Unless you\'ve invented time travel, the event can\'t finish before it has started.')
accessAndStartSameDay = self.access_at is not None and self.start_date == self.access_at.date()
if self.access_at.date() > self.start_date or (accessAndStartSameDay and self.access_at.time() > self.start_time):
raise ValidationError('Regardless of what some clients might think, access time cannot be after the event has started.')
def save(self, *args, **kwargs):
"""Call :meth:`full_clean` before saving."""
self.full_clean()

View File

@@ -162,7 +162,6 @@ class EventDuplicate(EventUpdate):
new = copy.copy(old) # Make a copy of the object in memory
new.based_on = old # Make the new event based on the old event
new.purchase_order = None # Remove old PO
new.status = new.PROVISIONAL # Return status to provisional
# Clear checked in by if it's a dry hire
if new.dry_hire is True:

View File

@@ -1,18 +0,0 @@
# Generated by Django 2.0.13 on 2020-03-03 19:40
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('assets', '0010_auto_20200207_1737'),
]
operations = [
migrations.AddField(
model_name='asset',
name='nickname',
field=models.CharField(blank=True, max_length=20, null=True, unique=True),
),
]

View File

@@ -82,7 +82,6 @@ class Asset(models.Model, RevisionMixin):
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)
nickname = models.CharField(max_length=20, blank=True, null=True, unique=True) # Null = true required because of the unique constraint
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)

View File

@@ -32,10 +32,6 @@
<label for="{{ form.serial_number.id_for_label }}">Serial Number</label>
{% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
</div>
<div class="form-group">
<label for="{{ form.nickname.id_for_label }}">Nickname</label>
{% render_field form.nickname|add_class:'form-control' value=object.nickname %}
</div>
<!---TODO: Lower default number of lines in comments box-->
<div class="form-group">
<label for="{{ form.comments.id_for_label }}">Comments</label>
@@ -57,9 +53,6 @@
<dt>Serial Number</dt>
<dd>{{ object.serial_number|default:'-' }}</dd>
<dt>Nickname</dt>
<dd>{{ object.nickname|default:'-' }}</dd>
<dt>Comments</dt>
<dd style="overflow-wrap: break-word;">{{ object.comments|default:'-'|linebreaksbr }}</dd>
{% endif %}

View File

@@ -1,41 +1,41 @@
beautifulsoup4==4.6.0
contextlib2==0.5.5
diff-match-patch==20121119
beautifulsoup4==4.8.2
contextlib2==0.6.0.post1
diff-match-patch==20181111
dj-database-url==0.5.0
dj-static==0.0.6
Django==2.0.13
django-filter==2.0.0
django-widget-tweaks==1.4.3
django-debug-toolbar==1.9.1
django-ical==1.4
django-recaptcha==1.4.0
django-registration-redux==2.4
django-reversion==2.0.13
Django==3.0.3
django-filter==2.2.0
django-widget-tweaks==1.4.5
django-debug-toolbar==2.2
django-ical==1.7.0
django-recaptcha==2.0.6
django-registration-redux==2.7
django-reversion==3.0.7
django-toolbelt==0.0.1
premailer==3.2.0
premailer==3.6.1
git+git://github.com/jazzband/django-widget-tweaks.git@1.4.2
gunicorn==19.8.1
icalendar==4.0.1
lxml==4.2.1
Markdown==2.6.11
Pillow==6.2.0
psycopg2==2.7.4
Pygments==2.2.0
gunicorn==20.0.4
icalendar==4.0.4
lxml==4.5.0
Markdown==3.2.1
Pillow==7.0.0
psycopg2==2.8.4
Pygments==2.5.2
PyPDF2==1.26.0
python-dateutil==2.7.3
pytz==2018.4
raven==6.8.0
reportlab==3.4.0
selenium==3.12.0
simplejson==3.15.0
six==1.11.0
sqlparse==0.2.4
python-dateutil==2.8.1
pytz==2019.3
raven==6.10.0
reportlab==3.5.34
selenium==3.141.0
simplejson==3.17.0
six==1.14.0
sqlparse==0.3.0
static3==0.7.0
svg2rlg==0.3
yolk==0.4.3
whitenoise==4.1.2
z3c.rml==3.5.0
zope.event==4.3.0
zope.interface==4.5.0
zope.schema==4.5.0
whitenoise==5.0.1
z3c.rml==3.9.1
zope.event==4.4
zope.interface==4.7.1
zope.schema==4.9.3
pypom==2.2.0