diff --git a/PyRIGS/urls.py b/PyRIGS/urls.py index 9821ae20..8dae92d6 100644 --- a/PyRIGS/urls.py +++ b/PyRIGS/urls.py @@ -12,7 +12,8 @@ urlpatterns = patterns('', # url(r'^blog/', include('blog.urls')), url(r'^', include('RIGS.urls')), - url('^user/register/$', RegistrationView.as_view(form_class=RIGS.forms.ProfileRegistrationFormUniqueEmail), + url('^training/', include('training.urls', namespace='training')), + url('^user/register/$', RegistrationView.as_view(form_class=RIGS.forms.ProfileRegistrationFormUniqueEmail), name="registration_register"), url('^user/', include('django.contrib.auth.urls')), url('^user/', include('registration.backends.default.urls')), diff --git a/db.sqlite3 b/db.sqlite3 index d0e8fed8..ac9ebe55 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/training/models.py b/training/models.py index e89f7449..e3416c75 100644 --- a/training/models.py +++ b/training/models.py @@ -3,6 +3,7 @@ from django.conf import settings from django.utils.encoding import python_2_unicode_compatible import reversion + # Create your models here. @@ -32,19 +33,34 @@ class TrainingItem(models.Model): @python_2_unicode_compatible @reversion.register class TrainingRecord(models.Model): - trainee = models.ForeignKey(settings.AUTH_USER_MODEL) + trainee = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='trainingrecords') training_item = models.ForeignKey(TrainingItem) started_date = models.DateField(blank=True, null=True) - started_trainer = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='trainingrecords_started', blank=True, null=True) + started_trainer = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='trainingrecords_started', blank=True, + null=True) started_notes = models.TextField(blank=True, null=True) completed_date = models.DateField(blank=True, null=True) - completed_trainer = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='trainingrecords_completed', blank=True, null=True) + completed_trainer = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='trainingrecords_completed', + blank=True, null=True) completed_notes = models.TextField(blank=True, null=True) assessed_date = models.DateField(blank=True, null=True) - assessed_trainer = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='trainingrecords_assessed', blank=True, null=True) + assessed_trainer = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='trainingrecords_assessed', blank=True, + null=True) assessed_notes = models.TextField(blank=True, null=True) + @property + def started(self): + return self.started_date and self.started_trainer + + @property + def complete(self): + return self.completed_date and self.completed_trainer + + @property + def assessed(self): + return self.assessed_date and self.assessed_trainer + def __str__(self): return "{0} - {1}".format(self.trainee, self.training_item) diff --git a/training/templates/training/profile_detail.html b/training/templates/training/profile_detail.html new file mode 100644 index 00000000..be120a88 --- /dev/null +++ b/training/templates/training/profile_detail.html @@ -0,0 +1,63 @@ +{% extends 'base.html' %} +{% load training_extras %} + +{% block title %}{{ profile }} Training{% endblock %} + +{% block content %} +
| Item | +Started | +Complete | +Assessed | +
| {{ record.training_item }} | +
+ {{ record.started_date|default_if_none:"No" }} {{ record.started_trainer|default_if_none:"" }}
+ {% if record.started_notes %}
+ {{ record.started_notes }}
+ {% endif %}
+ |
+
+ {{ record.completed_date|default_if_none:"No" }} {{ record.completed_trainer|default_if_none:"" }}
+ {% if record.completed_notes %}
+ {{ record.completed_notes }}
+ {% endif %}
+ |
+
+ {{ record.assessed_date|default_if_none:"No" }} {{ record.assessed_trainer|default_if_none:"" }}
+ {% if record.assessed_notes %}
+ {{ record.assessed_notes }}
+ {% endif %}
+ |
+