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

Added EventCrew model

Browse Source 
Added collector to Event
This commit is contained in:
tomtom5152
2014-11-05 22:20:16 +00:00
parent 8c38091247
commit 61fb27dc84
5 changed files with 179 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
RIGS/migrations/0008_auto_20141105_1908.py Normal file
View File

@@ -0,0 +1,81 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.conf import settings
import RIGS.models
class Migration(migrations.Migration):
dependencies = [
('RIGS', '0007_vatrate'),
]
operations = [
migrations.CreateModel(
name='Event',
fields=[
('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True, serialize=False)),
('name', models.CharField(max_length=255)),
('description', models.TextField(blank=True, null=True)),
('notes', models.TextField(blank=True, null=True)),
('status',
models.IntegerField(choices=[(0, 'Provisional'), (1, 'Confirmed'), (2, 'Booked'), (3, 'Cancelled')])),
('dry_hire', models.BooleanField(default=False)),
('is_rig', models.BooleanField(default=True)),
('start_date', models.DateField()),
('start_time', models.TimeField(blank=True, null=True)),
('end_date', models.DateField(blank=True, null=True)),
('end_time', models.TimeField(blank=True, null=True)),
('access_at', models.DateTimeField(blank=True, null=True)),
('meet_at', models.DateTimeField(blank=True, null=True)),
('meet_info', models.CharField(blank=True, null=True, max_length=255)),
('payment_method', models.CharField(blank=True, null=True, max_length=255)),
('payment_received', models.CharField(blank=True, null=True, max_length=255)),
('purchase_order', models.CharField(blank=True, null=True, max_length=255)),
('based_on', models.ForeignKey(to='RIGS.Event', related_name='future_events')),
('checked_in_by', models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_checked_in')),
('mic', models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_mic')),
('organisation', models.ForeignKey(to='RIGS.Organisation')),
('person', models.ForeignKey(to='RIGS.Person')),
],
options={
},
bases=(models.Model, RIGS.models.RevisionMixin),
),
migrations.CreateModel(
name='EventItem',
fields=[
('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True, serialize=False)),
('name', models.CharField(max_length=255)),
('description', models.TextField(blank=True, null=True)),
('quantity', models.IntegerField()),
('cost', models.DecimalField(max_digits=10, decimal_places=2)),
('order', models.IntegerField()),
('event', models.ForeignKey(to='RIGS.Event', related_name='item')),
],
options={
},
bases=(models.Model,),
),
migrations.CreateModel(
name='Venue',
fields=[
('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True, serialize=False)),
('name', models.CharField(max_length=255)),
('phone', models.CharField(blank=True, null=True, max_length=15)),
('email', models.EmailField(blank=True, null=True, max_length=75)),
('three_phase_available', models.BooleanField(default=False)),
('notes', models.TextField(blank=True, null=True)),
],
options={
},
bases=(models.Model, RIGS.models.RevisionMixin),
),
migrations.AddField(
model_name='event',
name='venue',
field=models.ForeignKey(to='RIGS.Venue'),
preserve_default=True,
),
]

46
RIGS/migrations/0009_auto_20141105_1916.py Normal file
View File

@@ -0,0 +1,46 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.conf import settings
class Migration(migrations.Migration):
dependencies = [
('RIGS', '0008_auto_20141105_1908'),
]
operations = [
migrations.AlterField(
model_name='event',
name='based_on',
field=models.ForeignKey(to='RIGS.Event', related_name='future_events', blank=True, null=True),
preserve_default=True,
),
migrations.AlterField(
model_name='event',
name='checked_in_by',
field=models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_checked_in', blank=True,
null=True),
preserve_default=True,
),
migrations.AlterField(
model_name='event',
name='mic',
field=models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_mic', blank=True, null=True),
preserve_default=True,
),
migrations.AlterField(
model_name='event',
name='organisation',
field=models.ForeignKey(to='RIGS.Organisation', blank=True, null=True),
preserve_default=True,
),
migrations.AlterField(
model_name='event',
name='status',
field=models.IntegerField(default=0,
choices=[(0, 'Provisional'), (1, 'Confirmed'), (2, 'Booked'), (3, 'Cancelled')]),
preserve_default=True,
),
]

41
RIGS/migrations/0010_auto_20141105_2219.py Normal file
View File

@@ -0,0 +1,41 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.conf import settings
class Migration(migrations.Migration):
dependencies = [
('RIGS', '0009_auto_20141105_1916'),
]
operations = [
migrations.CreateModel(
name='EventCrew',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)),
('rig', models.BooleanField(default=False)),
('run', models.BooleanField(default=False)),
('derig', models.BooleanField(default=False)),
('notes', models.TextField(blank=True, null=True)),
('event', models.ForeignKey(related_name='crew', to='RIGS.Event')),
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
],
options={
},
bases=(models.Model,),
),
migrations.AddField(
model_name='event',
name='collector',
field=models.CharField(max_length=255, blank=True, null=True),
preserve_default=True,
),
migrations.AlterField(
model_name='eventitem',
name='event',
field=models.ForeignKey(related_name='items', to='RIGS.Event'),
preserve_default=True,
),
]

12
RIGS/models.py
View File

@@ -135,6 +135,7 @@ class Event(models.Model, RevisionMixin):
payment_method = models.CharField(max_length=255, blank=True, null=True)
payment_received = models.CharField(max_length=255, blank=True, null=True)
purchase_order = models.CharField(max_length=255, blank=True, null=True)
collector = models.CharField(max_length=255, blank=True, null=True)
def __str__(self):
return str(self.pk) + ": " + self.name
@@ -153,4 +154,13 @@ class EventItem(models.Model):
return self.cost * self.quantity
def __str__(self):
return self.event.name + " | " + self.name
return self.event.name + " | " + self.name
class EventCrew(models.Model):
event = models.ForeignKey('Event', related_name='crew')
user = models.ForeignKey(settings.AUTH_USER_MODEL)
rig = models.BooleanField(default=False)
run = models.BooleanField(default=False)
derig = models.BooleanField(default=False)
notes = models.TextField(blank=True, null=True)

BIN
db.sqlite3
View File

Binary file not shown.