Initial sketching

PyRIGS/settings.py

@@ -61,6 +61,7 @@ INSTALLED_APPS = (
     'users',
     'RIGS',
     'assets',
+    'training',
 
     'debug_toolbar',
     'registration',

RIGS/admin.py

@@ -14,7 +14,7 @@ from reversion.admin import VersionAdmin
 from RIGS import models
 from users import forms as user_forms
 
-# Register your models here.
+
 admin.site.register(models.VatRate, VersionAdmin)
 admin.site.register(models.Event, VersionAdmin)
 admin.site.register(models.EventItem, VersionAdmin)

templates/index.html

@@ -1,5 +1,6 @@
 {% extends 'base_rigs.html' %}
 {% load humanize %}
+{% load static %}
 
 {% block title %}RIGS{% endblock %}
 
@@ -7,8 +8,9 @@
 <div class="row">
     <h1 class="col-sm-12 pb-3">R<small class="text-muted">ig</small> I<small class="text-muted">nformation</small> G<small class="text-muted">athering</small> S<small class="text-muted">ystem</small></h1>
     <h2 class="col-sm-12 pb-3">Welcome back {{ user.get_full_name }}, there {%if rig_count == 1 %}is one rig coming up{%else%}are {{ rig_count|apnumber }} rigs coming up.{%endif%}</h2>
-    <div class="col-sm mb-3">
+    <div class="col-sm-4 mb-3">
         <div class="card">
+            <img class="card-img-top" src="{% static 'imgs/rigs.jpg' %}" alt="" style="height: 150px; object-fit: cover;">
             <h4 class="card-header">Rigboard</h4>
             <div class="list-group list-group-flush">
                 <a class="list-group-item list-group-item-action" href="{% url 'rigboard' %}"><span class="fas fa-list align-middle"></span><span class="align-middle"> Rigboard</span></a>
@@ -17,6 +19,11 @@
                     <a class="list-group-item list-group-item-action" href="{% url 'event_create' %}"><span class="fas fa-plus align-middle"></span><span class="align-middle"> New Event</span></a>
                 {% endif %}
             </div>
+        </div>
+    </div>
+    <div class="col-sm-4 mb-3">
+        <div class="card">
+            <img class="card-img-top" src="{% static 'imgs/assets.jpg' %}" alt="" style="height: 150px; object-fit: cover;">
             <h4 class="card-header">Asset Database</h4>
             <div class="list-group list-group-flush">
                 <a class="list-group-item list-group-item-action" href="{% url 'asset_index' %}"><span class="fas fa-tag align-middle"></span><span class="align-middle"> Asset List</span></a>
@@ -28,6 +35,18 @@
                     <a class="list-group-item list-group-item-action" href="{% url 'supplier_create' %}"><span class="fas fa-plus align-middle"></span><span class="align-middle"> New Supplier</span></a>
                 {% endif %}
             </div>
+        </div>
+    </div>
+    <div class="col-sm-4 mb-3">
+        <div class="card">
+            <img class="card-img-top" src="{% static 'imgs/training.jpg' %}" alt="" style="height: 150px; object-fit: cover;">
+            <h4 class="card-header">Training Database</h4>
+            <div class="list-group list-group-flush">
+            </div>
+        </div>
+    </div>        
+    <div class="col-sm mb-3">
+        <div class="card">  
             <h4 class="card-header">Quick Links</h4>
             <div class="list-group list-group-flush">
                     <a class="list-group-item list-group-item-action" href="https://forum.nottinghamtec.co.uk" target="_blank" rel="noopener noreferrer"><span class="fas fa-comment-alt text-info align-middle"></span><span class="align-middle"> TEC Forum</span></a>

training/admin.py

@@ -0,0 +1,9 @@
+from django.contrib import admin
+from training import models
+from reversion.admin import VersionAdmin
+
+admin.site.register(models.Trainee, VersionAdmin)
+admin.site.register(models.TechnicalAssistant, VersionAdmin)
+admin.site.register(models.Technician, VersionAdmin)
+admin.site.register(models.Supervisor, VersionAdmin)
+admin.site.register(models.Department, VersionAdmin)

training/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class TrainingConfig(AppConfig):
+    name = 'training'

training/migrations/0001_initial.py

@@ -0,0 +1,106 @@
+# Generated by Django 3.1.5 on 2021-06-29 16:10
+
+import RIGS.models
+import django.contrib.auth.models
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('RIGS', '0041_auto_20210302_1204'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Department',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Trainee',
+            fields=[
+                ('profile_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='RIGS.profile')),
+            ],
+            options={
+                'verbose_name': 'user',
+                'verbose_name_plural': 'users',
+                'abstract': False,
+            },
+            bases=('RIGS.profile',),
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TrainingCategory',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('number', models.CharField(max_length=3)),
+                ('name', models.CharField(max_length=50)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TrainingItem',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('number', models.CharField(max_length=3)),
+                ('name', models.CharField(max_length=50)),
+                ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='training.trainingcategory')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TrainingItemInstance',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('training_started_on', models.DateField()),
+                ('training_complete_on', models.DateField()),
+                ('passed_out_on', models.DateField()),
+                ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='training.trainingitem')),
+                ('passed_out_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='passed_out', to='training.trainee')),
+                ('trainee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='training.trainee')),
+                ('training_complete_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='training_complete', to='training.trainee')),
+                ('training_started_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='training_started', to='training.trainee')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Technician',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('department', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='training.department')),
+                ('requirements', models.ManyToManyField(to='training.TrainingItem')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model, RIGS.models.RevisionMixin),
+        ),
+        migrations.CreateModel(
+            name='TechnicalAssistant',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('requirements', models.ManyToManyField(to='training.TrainingItem')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model, RIGS.models.RevisionMixin),
+        ),
+        migrations.CreateModel(
+            name='Supervisor',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('department', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='training.department')),
+                ('requirements', models.ManyToManyField(to='training.TrainingItem')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model, RIGS.models.RevisionMixin),
+        ),
+    ]

training/models.py

@@ -0,0 +1,61 @@
+from django.db import models
+
+from RIGS.models import RevisionMixin, Profile
+from reversion import revisions as reversion
+
+# 'shim' overtop the profile model to neatly contain all training related fields etc
+@reversion.register
+class Trainee(Profile):
+    pass
+
+# Items
+class TrainingCategory(models.Model):
+    number = models.CharField(max_length=3) # Does this 1:1 correspond with a department? I think the answer is sometimes...
+    name = models.CharField(max_length=50)
+
+
+class TrainingItem(models.Model):
+    category = models.ForeignKey('TrainingCategory', on_delete=models.CASCADE)
+    number = models.CharField(max_length=3)
+    name = models.CharField(max_length=50)
+
+
+class TrainingItemInstance(models.Model):
+    item = models.ForeignKey('TrainingItem', on_delete=models.CASCADE)
+    trainee = models.ForeignKey('Trainee', related_name='items', on_delete=models.CASCADE)    
+
+    training_started_on = models.DateField()
+    training_started_by = models.ForeignKey('Trainee', related_name='training_started', on_delete=models.CASCADE)
+    
+    training_complete_on = models.DateField()
+    training_complete_by = models.ForeignKey('Trainee', related_name='training_complete', on_delete=models.CASCADE)
+
+    passed_out_on = models.DateField()
+    passed_out_by = models.ForeignKey('Trainee', related_name='passed_out', on_delete=models.CASCADE)
+
+
+class Department(models.Model):
+    name = models.CharField(max_length=50)
+
+
+# Levels
+class TrainingLevel(models.Model, RevisionMixin):
+    requirements = models.ManyToManyField(TrainingItem)
+
+    class Meta:
+        abstract = True
+
+@reversion.register
+class TechnicalAssistant(TrainingLevel):
+    # department = models.ForeignKey('Department', on_delete=models.CASCADE)
+    pass
+
+
+@reversion.register
+class Technician(TrainingLevel):
+    department = models.ForeignKey('Department', on_delete=models.CASCADE)
+
+
+@reversion.register
+class Supervisor(TrainingLevel):
+    department = models.ForeignKey('Department', on_delete=models.CASCADE)

training/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.