Update to heroku-18 stack

Dockerfile

@@ -0,0 +1,12 @@
+FROM python:3.6
+
+WORKDIR /app
+
+ADD . /app
+
+RUN pip install -r requirements.txt && \
+        python manage.py collectstatic --noinput
+
+EXPOSE 8000
+
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]

PyRIGS/settings.py

@@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/1.7/ref/settings/
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 import raven
+import secrets
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
@@ -233,3 +234,7 @@ USE_GRAVATAR = True
 
 TERMS_OF_HIRE_URL = "http://www.nottinghamtec.co.uk/terms.pdf"
 AUTHORISATION_NOTIFICATION_ADDRESS = 'productions@nottinghamtec.co.uk'
+RISK_ASSESSMENT_URL = os.environ.get('RISK_ASSESSMENT_URL') if os.environ.get(
+    'RISK_ASSESSMENT_URL') else "http://example.com"
+RISK_ASSESSMENT_SECRET = os.environ.get('RISK_ASSESSMENT_SECRET') if os.environ.get(
+    'RISK_ASSESSMENT_SECRET') else secrets.token_hex(15)

README.md

@@ -77,6 +77,13 @@ python manage.py runserver
 ```
 Please refer to Django documentation for a full list of options available here.
 
+### Development using docker
+
+```
+docker build . -t pyrigs
+docker run -it --rm -p=8000:8000 -v $(pwd):/app pyrigs
+```
+
 ### Sample Data ###
 Sample data is available to aid local development and user acceptance testing. To load this data into your local database, first ensure the database is empty:
 ```

RIGS/forms.py

@@ -33,7 +33,12 @@ class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
         return self.cleaned_data['initials']
 
 
-# Login form
+# Embedded Login form - remove the autofocus
+class EmbeddedAuthenticationForm(AuthenticationForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['username'].widget.attrs.pop('autofocus', None)
+
 class PasswordReset(PasswordResetForm):
     captcha = ReCaptchaField(label='Captcha')
 

RIGS/migrations/0034_event_risk_assessment_edit_url.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.5 on 2019-07-28 21:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0033_auto_20180325_0016'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='risk_assessment_edit_url',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]

RIGS/models.py

@@ -338,6 +338,9 @@ class Event(models.Model, RevisionMixin):
     auth_request_at = models.DateTimeField(null=True, blank=True)
     auth_request_to = models.EmailField(null=True, blank=True)
 
+    # Risk assessment info
+    risk_assessment_edit_url = models.CharField(verbose_name="risk assessment", max_length=255, blank=True, null=True)
+
     # Calculated values
     """
     EX Vat

RIGS/rigboard.py

@@ -18,6 +18,7 @@ from django.core.exceptions import SuspiciousOperation
 from django.db.models import Q
 from django.contrib import messages
 from django.utils.decorators import method_decorator
+from django.views.decorators.csrf import csrf_exempt
 from z3c.rml import rml2pdf
 from PyPDF2 import PdfFileMerger, PdfFileReader
 import simplejson
@@ -80,6 +81,24 @@ class EventEmbed(EventDetail):
     template_name = 'RIGS/event_embed.html'
 
 
+class EventRA(generic.base.RedirectView):
+    permanent = False
+    def get_redirect_url(self, *args, **kwargs):
+        event = get_object_or_404(models.Event, pk=kwargs['pk'])
+
+        if event.risk_assessment_edit_url:
+            return event.risk_assessment_edit_url
+
+        params = {
+            'entry.708610078': f'N{event.pk:05}',
+            'entry.905899507': event.name,
+            'entry.139491562': event.venue.name if event.venue else '',
+            'entry.1689826056': event.start_date.strftime('%Y-%m-%d') + ((' - ' + event.end_date.strftime('%Y-%m-%d')) if event.end_date else ''),
+            'entry.902421165': event.mic.name if event.mic else ''
+        }
+        return settings.RISK_ASSESSMENT_URL + "?" + urllib.parse.urlencode(params)
+
+
 class EventCreate(generic.CreateView):
     model = models.Event
     form_class = forms.EventForm
@@ -386,3 +405,26 @@ class EventAuthoriseRequestEmailPreview(generic.DetailView):
         })
         context['to_name'] = self.request.GET.get('to_name', None)
         return context
+
+@method_decorator(csrf_exempt, name='dispatch')
+class LogRiskAssessment(generic.View):
+    http_method_names = ["post"]
+
+    def post(self, request, **kwargs):
+        data = request.POST
+        shared_secret = data.get("secret")
+        edit_url = data.get("editUrl")
+        rig_number = data.get("rigNum")
+        if shared_secret is None or edit_url is None or rig_number is None:
+            return HttpResponse(status=422)
+
+        if shared_secret != settings.RISK_ASSESSMENT_SECRET:
+            return HttpResponse(status=403)
+
+        rig_number = int(re.sub("[^0-9]", "", rig_number))
+
+        event = get_object_or_404(models.Event, pk=rig_number)
+        event.risk_assessment_edit_url = edit_url
+        event.save()
+
+        return HttpResponse(status=200)

RIGS/static/scss/screen.scss

@@ -149,16 +149,19 @@ ins {
 }
 
 html.embedded{
-  min-height:100%;
-  display: table;
+  display: flex;
+  flex-direction: column;
   width: 100%;
+  height: 100%;
+  max-height: 100%;
+  overflow: hidden;
+  justify-content: center;
 
   body{
     padding:0;
-    display: table-cell;
-    vertical-align: middle;
     width:100%;
     background:none;
+    overflow: scroll;
   }
 
   .embed_container{

RIGS/templates/RIGS/event_detail_buttons.html

@@ -3,6 +3,17 @@
             class="glyphicon glyphicon-edit"></span> <span
             class="hidden-xs">Edit</span></a>
     {% if event.is_rig %}
+        {% if not event.dry_hire %}
+            <a href="{% url 'event_ra' event.pk %}" class="btn btn-default
+                {% if event.risk_assessment_edit_url %}
+                    btn-success
+                {% else %}
+                    btn-warning
+                {% endif %}
+            "><span
+                class="glyphicon glyphicon-paperclip"></span> <span
+                class="hidden-xs">RA</span></a>
+        {% endif %}
         <a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-default"><span
                 class="glyphicon glyphicon-print"></span> <span
                 class="hidden-xs">Print</span></a>

RIGS/urls.py

@@ -101,6 +101,9 @@ urlpatterns = [
     url(r'^event/(?P<pk>\d+)/print/$',
         permission_required_with_403('RIGS.view_event')(rigboard.EventPrint.as_view()),
         name='event_print'),
+    url(r'^event/(?P<pk>\d+)/ra/$',
+        permission_required_with_403('RIGS.change_event')(rigboard.EventRA.as_view()),
+        name='event_ra'),
     url(r'^event/create/$',
         permission_required_with_403('RIGS.add_event')(rigboard.EventCreate.as_view()),
         name='event_create'),
@@ -185,6 +188,9 @@ urlpatterns = [
     url(r'^api/(?P<model>\w+)/(?P<pk>\d+)/$', login_required(views.SecureAPIRequest.as_view()),
         name="api_secure"),
 
+    # Risk assessment API
+    url(r'^log_risk_assessment/$', rigboard.LogRiskAssessment.as_view(), name='log_risk_assessment'),
+
     # Legacy URL's
     url(r'^rig/show/(?P<pk>\d+)/$',
         RedirectView.as_view(permanent=True, pattern_name='event_detail')),

RIGS/versioning.py

@@ -27,6 +27,8 @@ class FieldComparison(object):
     def display_value(self, value):
         if isinstance(self.field, IntegerField) and len(self.field.choices) > 0:
             return [x[1] for x in self.field.choices if x[0] == value][0]
+        if self.field.name == "risk_assessment_edit_url":
+            return "completed" if value else ""
         return value
 
     @property

RIGS/views.py

@@ -62,7 +62,7 @@ def login_embed(request, **kwargs):
                 messages.warning(request, 'Cookies do not seem to be enabled. Try logging in using a new tab.')
                 request.method = 'GET'  # Render the page without trying to login
 
-        return login(request, template_name="registration/login_embed.html")
+        return login(request, template_name="registration/login_embed.html", authentication_form=forms.EmbeddedAuthenticationForm) 
 
 
 """

app.json

@@ -49,5 +49,6 @@
     {
       "url": "heroku/python"
     }
-  ]
+  ],
+  "stack": "heroku-18"
 }

requirements.txt

@@ -3,7 +3,7 @@ contextlib2==0.5.5
 diff-match-patch==20121119
 dj-database-url==0.5.0
 dj-static==0.0.6
-Django==2.0.5
+Django==2.0.13
 django-debug-toolbar==1.9.1
 django-ical==1.4
 django-recaptcha==1.4.0