diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index 3098c3fb..00e6c6c7 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -46,6 +46,7 @@ INSTALLED_APPS = ( 'django.contrib.messages', 'django.contrib.staticfiles', 'RIGS', + 'subhire', 'debug_toolbar', 'registration', diff --git a/subhire/__init__.py b/subhire/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/subhire/admin.py b/subhire/admin.py new file mode 100644 index 00000000..42aa46d3 --- /dev/null +++ b/subhire/admin.py @@ -0,0 +1,6 @@ +from django.contrib import admin +import models + +# Register your models here. +admin.site.register(models.Hire) +admin.site.register(models.Provider) \ No newline at end of file diff --git a/subhire/migrations/0001_initial.py b/subhire/migrations/0001_initial.py new file mode 100644 index 00000000..16920b97 --- /dev/null +++ b/subhire/migrations/0001_initial.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +from django.conf import settings + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Hire', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('name', models.CharField(max_length=255)), + ('description', models.TextField(null=True, blank=True)), + ('start_date', models.DateField()), + ('end_date', models.DateField()), + ('start_transport', models.IntegerField(blank=True, null=True, choices=[(0, b'TEC Transport'), (1, b'Provider Transports')])), + ('mic', models.ForeignKey(related_name='hire_mic', verbose_name=b'MIC', blank=True, to=settings.AUTH_USER_MODEL, null=True)), + ], + ), + migrations.CreateModel( + name='Provider', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('name', models.CharField(max_length=50)), + ('phone', models.CharField(max_length=15, null=True, blank=True)), + ('email', models.EmailField(max_length=254, null=True, blank=True)), + ('address', models.TextField(null=True, blank=True)), + ('notes', models.TextField(null=True, blank=True)), + ], + ), + migrations.AddField( + model_name='hire', + name='provider', + field=models.ForeignKey(blank=True, to='subhire.Provider', null=True), + ), + ] diff --git a/subhire/migrations/__init__.py b/subhire/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/subhire/models.py b/subhire/models.py new file mode 100644 index 00000000..cc499adf --- /dev/null +++ b/subhire/models.py @@ -0,0 +1,39 @@ +import reversion +from django.db import models +from django.conf import settings +from django.utils.encoding import python_2_unicode_compatible + +# Create your models here. +class Hire(models.Model): + WE_TRANSPORT = 0 + THEY_TRANSPORT = 1 + TRANSPORT_CHOICES = ( + (WE_TRANSPORT, 'TEC Transport'), + (THEY_TRANSPORT, 'Provider Transports'), + ) + + name = models.CharField(max_length=255) + description = models.TextField(blank=True, null=True) + provider = models.ForeignKey('Provider', blank=True, null=True) + + start_date = models.DateField() + end_date = models.DateField() + + start_transport = models.IntegerField( + choices=TRANSPORT_CHOICES, blank=True, null=True) + + mic = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='hire_mic', blank=True, null=True, + verbose_name="MIC") + +class Provider(models.Model): + name = models.CharField(max_length=50) + 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) + + @property + def latest_hires(self): + return self.hire_set.order_by('-start_date').select_related() diff --git a/subhire/tests.py b/subhire/tests.py new file mode 100644 index 00000000..7ce503c2 --- /dev/null +++ b/subhire/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/subhire/views.py b/subhire/views.py new file mode 100644 index 00000000..91ea44a2 --- /dev/null +++ b/subhire/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here.