From 61fb27dc840dc3489e3f3fc585682a6462204224 Mon Sep 17 00:00:00 2001 From: tomtom5152 Date: Wed, 5 Nov 2014 22:20:16 +0000 Subject: [PATCH] Added EventCrew model Added collector to Event --- RIGS/migrations/0008_auto_20141105_1908.py | 81 +++++++++++++++++++++ RIGS/migrations/0009_auto_20141105_1916.py | 46 ++++++++++++ RIGS/migrations/0010_auto_20141105_2219.py | 41 +++++++++++ RIGS/models.py | 12 ++- db.sqlite3 | Bin 880640 -> 883712 bytes 5 files changed, 179 insertions(+), 1 deletion(-) create mode 100644 RIGS/migrations/0008_auto_20141105_1908.py create mode 100644 RIGS/migrations/0009_auto_20141105_1916.py create mode 100644 RIGS/migrations/0010_auto_20141105_2219.py diff --git a/RIGS/migrations/0008_auto_20141105_1908.py b/RIGS/migrations/0008_auto_20141105_1908.py new file mode 100644 index 00000000..2bba681c --- /dev/null +++ b/RIGS/migrations/0008_auto_20141105_1908.py @@ -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, + ), + ] diff --git a/RIGS/migrations/0009_auto_20141105_1916.py b/RIGS/migrations/0009_auto_20141105_1916.py new file mode 100644 index 00000000..77973814 --- /dev/null +++ b/RIGS/migrations/0009_auto_20141105_1916.py @@ -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, + ), + ] diff --git a/RIGS/migrations/0010_auto_20141105_2219.py b/RIGS/migrations/0010_auto_20141105_2219.py new file mode 100644 index 00000000..e6a9ef25 --- /dev/null +++ b/RIGS/migrations/0010_auto_20141105_2219.py @@ -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, + ), + ] diff --git a/RIGS/models.py b/RIGS/models.py index 58a8dc51..3db762e7 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -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 \ No newline at end of file + 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) \ No newline at end of file diff --git a/db.sqlite3 b/db.sqlite3 index f2b9d5c2877fdac21c52598cb21ccff8ac338e70..52e3517a52eb29eb61193a53999d72b260ecea15 100644 GIT binary patch delta 1323 zcmZWoUrbw77(eIx?(Lt;rBD`V`7^lG5va7#d)p2NxaicO%fg(x#KdU1v=``r7TYrR z;M^R`criv+=UvPmd@$g{5`s;<4@J#nW+ocU661qOVKa+PA9UFgwva_Uw?xa_&Ha5j z-|u|qJHPKc=bXA8K6O9*eqB`^5`qy@`cBOH6qEJ;YT+4Mj$bj0k;RF_SdLE&5dv3L zW)=ssE4Ujg$WqqIHPWT5)AwO-cLh(Xd!Byjg}#>q0XYy+Co{>25|Bf(90*4gMc!jN zep&Vh!jhtND}nA%s6$qQ!Ei8lpR;2NP7?=w0hq_%@ke|W&*7Wcfp&Zf?%^f40oT~% zY|iN$1;A;&(ub}twxqQrzc{LLqnDa0BHA%6k%?!tad5b>c^e1W8^RsGa|dEOWim%1 z6IyCKo=(S;iC{HgCygCd6T`{KczigeW*D2U_)O$Ptc0el)!hWp#8lj)jSWtoG*>qj z_mQG0ZOYuX=$TIL$-1l5Rtb5+wC8g|!vbVi8Xdej=gh4%?%s(3xS6%~zGi{j@CV#v zN#BAh9w~JOi&iOGd3t^C%=%u+01U{$G4Ko)1}lS&!EUVY70R>C0J8Y^u2l$ShyTdg%cd|m%@PH=PPc=lSjGZi29NQ24bnACsh6{-Ko!Gk`@lbTFCO2#x6 zs~469kG?!F^k%=F+GlWAga_?{z|N842Eh%c=`XYpvkhQu-W9C7;8~(qeh;D97j44K z9@Xk9|Dq)o|2LoiS}p z%V?zz1h;6GFfqK1R(5c-l{(c}tQ0C6kDnEPKH}hMfzSdRfF<08=UMXaD2xv3=hwth zn273+t%(yb6w~vo;t(V?{lKc2g!quYRuJQ#Ul+NC8arGd_zQlCA7L8zV=df)Z{Pw; z^fsJq5Avjo`kzq~(w0=IbUz;v->&=@yj8&V;QyD@BJ)J1t!8Fc*7nG4Rf0BU)NYEu zP0;cj4Isx;{D7eDY=dcb?`&9q6l#g<#7>*d-dudItm>zC*s1MJw zqJE$-GOSM)#1TB*JEC8i6WRc)40i9TXv^`q)z#yLcUs^+_oghIit=#U!K hSLXzmK3@1ZFuKTwp|D!RqkYJ3 zFgxyoCE|i9z*+o`AMpY{#Ot^p?RX4+<4Y*O986`)wJ|v2*@64$xlNPu2-CKEQ4l4@$D3z1!&0DX+LPTIj~5rWil=lvb=g4j5^J0%+|WH%eA2z3`5aS zBAqhoBN#14$BR)a0SQWHdu6p2k@H;Yl#5#QVpBa=j)PxKee8|B(PbMl$G2k=hh zkT^Z$3<10`Geb@f&Am{W&q|RIWb&myAZF*)zt0y`Eq9zVX0mk^cEc4S+!3XH;;c;_ z4|FJ%!64ip7Og%@Pa|pA_?|27K{0`rEsmfuNs<;w@$Ha6m^Y>JKHbLoI8KW(r zgO5}W*VydAtyMZ@Ndb1dO-$c%w&hwli(nb