diff --git a/PyRIGS/views.py b/PyRIGS/views.py
index 0216b104..2803ea55 100644
--- a/PyRIGS/views.py
+++ b/PyRIGS/views.py
@@ -16,6 +16,7 @@ from django.views.decorators.clickjacking import xframe_options_exempt
from RIGS import models
from assets import models as asset_models
+from training import models as training_models
def is_ajax(request):
@@ -38,7 +39,8 @@ class SecureAPIRequest(generic.View):
'organisation': models.Organisation,
'profile': models.Profile,
'event': models.Event,
- 'supplier': asset_models.Supplier
+ 'supplier': asset_models.Supplier,
+ 'training_item': training_models.TrainingItem,
}
perms = {
@@ -47,7 +49,8 @@ class SecureAPIRequest(generic.View):
'organisation': 'RIGS.view_organisation',
'profile': 'RIGS.view_profile',
'event': None,
- 'supplier': None
+ 'supplier': None,
+ 'training_item': None, # TODO
}
'''
diff --git a/RIGS/templates/event_form.html b/RIGS/templates/event_form.html
index 87163ea5..2e29de3e 100644
--- a/RIGS/templates/event_form.html
+++ b/RIGS/templates/event_form.html
@@ -72,7 +72,7 @@
{% endblock %}
{% block content %}
-{% include 'item_modal.html' %}
+{% include 'partials/item_modal.html' %}
+{% endblock %}
diff --git a/training/templates/session_log_form.html b/training/templates/session_log_form.html
index ab6638f2..739ecf03 100644
--- a/training/templates/session_log_form.html
+++ b/training/templates/session_log_form.html
@@ -1,6 +1,7 @@
{% extends 'base_rigs.html' %}
{% load static %}
+{% load button from filters %}
{% block css %}
{{ block.super }}
@@ -23,11 +24,30 @@
diff --git a/training/templates/trainee_detail.html b/training/templates/trainee_detail.html
index 7c3639c2..f4aca630 100644
--- a/training/templates/trainee_detail.html
+++ b/training/templates/trainee_detail.html
@@ -1,6 +1,11 @@
{% extends 'base_rigs.html' %}
{% block content %}
+
Training Levels
{{ user.name }} is a...
diff --git a/training/urls.py b/training/urls.py
index 46c03358..88d3bbbd 100644
--- a/training/urls.py
+++ b/training/urls.py
@@ -12,5 +12,7 @@ urlpatterns = [
path('trainee/
/',
permission_required_with_403('RIGS.view_profile')(views.TraineeDetail.as_view()),
name='trainee_detail'),
+ path('trainee//edit/', views.AddQualification.as_view(),
+ name='edit_record'),
path('session/', views.SessionLog.as_view(), name='session_log'),
]
diff --git a/training/views.py b/training/views.py
index 0aab5e14..585b6c88 100644
--- a/training/views.py
+++ b/training/views.py
@@ -1,6 +1,8 @@
from django.shortcuts import render
+from django.urls import reverse_lazy
from django.views import generic
+from PyRIGS.views import OEmbedView, is_ajax
from training import models, forms
from users import views
@@ -38,4 +40,29 @@ class SessionLog(generic.FormView):
def get_context_data(self, **kwargs):
context = super(SessionLog, self).get_context_data(**kwargs)
context["page_title"] = "Log New Training Session"
-
+ context["depths"] = models.TrainingItemQualification.CHOICES
+ return context
+
+
+class AddQualification(generic.CreateView):
+ template_name = "edit_training_record.html"
+ model = models.TrainingItemQualification
+ form_class = forms.QualificationForm
+
+ def get_context_data(self, **kwargs):
+ context = super(AddQualification, self).get_context_data(**kwargs)
+ # context["page_title"] = "Edit {}'s Training Record".format(self.object)
+ context["depths"] = models.TrainingItemQualification.CHOICES
+ if is_ajax(self.request):
+ context['override'] = "base_ajax.html"
+ else:
+ context['override'] = 'base_rigs.html' # TODO
+ return context
+
+ def get_success_url(self):
+ return reverse_lazy('trainee_detail')
+
+ def get_form_kwargs(self):
+ kwargs = super(AddQualification, self).get_form_kwargs()
+ kwargs['pk'] = self.kwargs['pk']
+ return kwargs