From fb554296a61147cc63a500213172402fe23d6cdf Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Tue, 8 May 2018 10:15:25 +0200
Subject: [PATCH 01/17] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f242594..b83da07 100755
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ webpack-stats-prod.json
 
 # Cache
 .cache/
+.pytest_cache/
 
 # OSX
 .DS_Store

From d66222caf61a84a5b7ebf865cc2637865832486e Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Tue, 8 May 2018 10:21:19 +0200
Subject: [PATCH 02/17] Add DRF

---
 Pipfile      |  1 +
 Pipfile.lock | 72 ++++++++++++++++++++++++++++------------------------
 2 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/Pipfile b/Pipfile
index 853e9fc..9d56ab7 100644
--- a/Pipfile
+++ b/Pipfile
@@ -25,6 +25,7 @@ django-taggit = "*"
 python-dateutil = "*"
 "psycopg2" = "*"
 "psycopg2-binary" = "*"
+djangorestframework = "*"
 
 [dev-packages]
 coverage = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 9665001..09e1d9d 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "8be0d2bb76c1723a1cc2bb21044f188642616e0255d69a4a89256c6ec357c244"
+            "sha256": "167e74df13423665b6cec80c84d2156978fa696ddc27e7a7d24c075ffb33d245"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -37,18 +37,18 @@
         },
         "django": {
             "hashes": [
-                "sha256:2d8b9eed8815f172a8e898678ae4289a5e9176bc08295676eff4228dd638ea61",
-                "sha256:d81a1652963c81488e709729a80b510394050e312f386037f26b54912a3a10d0"
+                "sha256:26b34f4417aa38d895b6b5307177b51bc3f4d53179d8696a5c19dcb50582523c",
+                "sha256:71d1a584bb4ad2b4f933d07d02c716755c1394feaac1ce61ce37843ac5401092"
             ],
             "index": "pypi",
-            "version": "==2.0.4"
+            "version": "==2.0.5"
         },
         "django-allauth": {
             "hashes": [
-                "sha256:7b31526cccd1c46f9f09acf0703068e8a9669337d29eb065f7e8143c2d897339"
+                "sha256:7d9646e3560279d6294ebb4c361fef829708d106da697658cf158bf2ca57b474"
             ],
             "index": "pypi",
-            "version": "==0.35.0"
+            "version": "==0.36.0"
         },
         "django-anymail": {
             "hashes": [
@@ -69,10 +69,10 @@
         },
         "django-bootstrap3": {
             "hashes": [
-                "sha256:9f56fa30a2c32142a2785148816cc4e14e7efc8699c5f87a8cb5be162a81658d"
+                "sha256:1a5cc3583a208f423b8a081d3fb432957a3e82416512cbafc4a3b10f27cc884a"
             ],
             "index": "pypi",
-            "version": "==9.1.0"
+            "version": "==10.0.1"
         },
         "django-braces": {
             "hashes": [
@@ -122,6 +122,14 @@
             "index": "pypi",
             "version": "==0.6.0"
         },
+        "djangorestframework": {
+            "hashes": [
+                "sha256:b6714c3e4b0f8d524f193c91ecf5f5450092c2145439ac2769711f7eba89a9d9",
+                "sha256:c375e4f95a3a64fccac412e36fb42ba36881e52313ec021ef410b40f67cddca4"
+            ],
+            "index": "pypi",
+            "version": "==3.8.2"
+        },
         "gevent": {
             "hashes": [
                 "sha256:0901975628790e8a57fc92bb7062e5b856edea48c8de9caf36cfda14eae07329",
@@ -181,11 +189,11 @@
         },
         "gunicorn": {
             "hashes": [
-                "sha256:eb8d8924b117a609fae9f8cd85df0cad3535dd613fdbcdbba3ee88d5459f1d4f",
-                "sha256:f5ca088d029fe3cea166c59bb43b7ccc9c850fe25af3da61350fe712c5cc5aa2"
+                "sha256:7ef2b828b335ed58e3b64ffa84caceb0a7dd7c5ca12f217241350dec36a1d5dc",
+                "sha256:bc59005979efb6d2dd7d5ba72d99f8a8422862ad17ff3a16e900684630dd2a10"
             ],
             "index": "pypi",
-            "version": "==19.8.0"
+            "version": "==19.8.1"
         },
         "idna": {
             "hashes": [
@@ -463,10 +471,10 @@
         },
         "attrs": {
             "hashes": [
-                "sha256:1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9",
-                "sha256:a17a9573a6f475c99b551c0e0a812707ddda1ec9653bed04c13841404ed6f450"
+                "sha256:4b90b09eeeb9b88c35bc642cbac057e45a5fd85367b985bd2809c62b7b939265",
+                "sha256:e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b"
             ],
-            "version": "==17.4.0"
+            "version": "==18.1.0"
         },
         "backcall": {
             "hashes": [
@@ -582,11 +590,11 @@
         },
         "django": {
             "hashes": [
-                "sha256:2d8b9eed8815f172a8e898678ae4289a5e9176bc08295676eff4228dd638ea61",
-                "sha256:d81a1652963c81488e709729a80b510394050e312f386037f26b54912a3a10d0"
+                "sha256:26b34f4417aa38d895b6b5307177b51bc3f4d53179d8696a5c19dcb50582523c",
+                "sha256:71d1a584bb4ad2b4f933d07d02c716755c1394feaac1ce61ce37843ac5401092"
             ],
             "index": "pypi",
-            "version": "==2.0.4"
+            "version": "==2.0.5"
         },
         "django-coverage-plugin": {
             "hashes": [
@@ -643,11 +651,11 @@
         },
         "factory-boy": {
             "hashes": [
-                "sha256:bd5a096d0f102d79b6c78cef1c8c0b650f2e1a3ecba351c735c6d2df8dabd29c",
-                "sha256:be2abc8092294e4097935a29b4e37f5b9ed3e4205e2e32df215c0315b625995e"
+                "sha256:6f25cc4761ac109efd503f096e2ad99421b1159f01a29dbb917359dcd68e08ca",
+                "sha256:d552cb872b310ae78bd7429bf318e42e1e903b1a109e899a523293dfa762ea4f"
             ],
             "index": "pypi",
-            "version": "==2.10.0"
+            "version": "==2.11.1"
         },
         "faker": {
             "hashes": [
@@ -665,10 +673,10 @@
         },
         "flask": {
             "hashes": [
-                "sha256:7fab1062d11dd0038434e790d18c5b9133fd9e6b7257d707c4578ccc1e38b67c",
-                "sha256:b1883637bbee4dc7bc98d900792d0a304d609fce0f5bd9ca91d1b6457e5918dd"
+                "sha256:2271c0070dbcb5275fad4a82e29f23ab92682dc45f9dfbc22c02ba9b9322ce48",
+                "sha256:a080b744b7e345ccfcbc77954861cb05b3c63786e93f2b3875e0913d44b43f05"
             ],
-            "version": "==1.0"
+            "version": "==1.0.2"
         },
         "flask-assets": {
             "hashes": [
@@ -877,10 +885,10 @@
         },
         "maildump": {
             "hashes": [
-                "sha256:7b994bf28c7179b60f005978214faa1046d9489a983a70711f64f873c5b9db08"
+                "sha256:1b546fa056046f909eb634ee7c84592b31f39dc00f9df29fbb14b52af915fc43"
             ],
             "index": "pypi",
-            "version": "==0.5.4"
+            "version": "==0.5.6"
         },
         "markupsafe": {
             "hashes": [
@@ -977,8 +985,6 @@
         },
         "pycodestyle": {
             "hashes": [
-                "sha256:1ec08a51c901dfe44921576ed6e4c1f5b7ecbad403f871397feedb5eb8e4fa14",
-                "sha256:5ff2fbcbab997895ba9ead77e1b38b3ebc2e5c3b8a6194ef918666e4c790a00e",
                 "sha256:682256a5b318149ca0d2a9185d365d8864a768a28db66a84a2ea946bcc426766",
                 "sha256:6c4245ade1edfad79c3446fadfc96b0de2759662dc29d07d80a6f27ad1ca6ba9"
             ],
@@ -1057,19 +1063,19 @@
         },
         "pytest-flake8": {
             "hashes": [
-                "sha256:3996de65a1219697596acac755090c70c47ec901edc438ea88ce1aa6098fb905",
-                "sha256:43598dfa211242525897866ff35fa553ebd88177383783079099057c7ad04331"
+                "sha256:e5cdc4f459c9436ac6c649e428a014bb5988605858549397374ec29a776cae68",
+                "sha256:ec248d4a215d6c7cd9d3ca48f365ece0e3892b46d626c22a95ccc80188ff35ed"
             ],
             "index": "pypi",
-            "version": "==1.0.0"
+            "version": "==1.0.1"
         },
         "pytest-isort": {
             "hashes": [
-                "sha256:e92798127e21d22513c62070989f0fb3b712650e48a4db13e5b8e8034d367cfe",
-                "sha256:fc315e3ceac576f2b7000c4716a55063c45ed60c169ba2ede5a6b4aef97ce13e"
+                "sha256:ce36b62ca1108e16a8b8fc0d5a82302ba0796a3c352b093e13ccbb18e772edc6",
+                "sha256:d4d195ecfe33d81e258d251b2679b32216bad84131fb41984da22d9d0328a6fe"
             ],
             "index": "pypi",
-            "version": "==0.1.0"
+            "version": "==0.2.0"
         },
         "pytest-sugar": {
             "hashes": [

From 5752f4b533289f088cbad2846ba20d0c0c51cba8 Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Thu, 10 May 2018 11:38:29 +0200
Subject: [PATCH 03/17] Add first simple API views

---
 clock/contracts/api/__init__.py    |  0
 clock/contracts/api/serializers.py |  9 +++++++++
 clock/contracts/api/urls.py        | 11 +++++++++++
 clock/contracts/api/views.py       | 15 +++++++++++++++
 clock/shifts/api/__init__.py       |  0
 clock/shifts/api/serializers.py    |  9 +++++++++
 clock/shifts/api/urls.py           |  9 +++++++++
 clock/shifts/api/views.py          |  9 +++++++++
 config/api_urls.py                 |  6 ++++++
 config/settings/common.py          |  1 +
 config/urls.py                     | 23 +++++++++++++++--------
 11 files changed, 84 insertions(+), 8 deletions(-)
 create mode 100644 clock/contracts/api/__init__.py
 create mode 100644 clock/contracts/api/serializers.py
 create mode 100644 clock/contracts/api/urls.py
 create mode 100644 clock/contracts/api/views.py
 create mode 100644 clock/shifts/api/__init__.py
 create mode 100644 clock/shifts/api/serializers.py
 create mode 100644 clock/shifts/api/urls.py
 create mode 100644 clock/shifts/api/views.py
 create mode 100644 config/api_urls.py

diff --git a/clock/contracts/api/__init__.py b/clock/contracts/api/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/clock/contracts/api/serializers.py b/clock/contracts/api/serializers.py
new file mode 100644
index 0000000..b93099c
--- /dev/null
+++ b/clock/contracts/api/serializers.py
@@ -0,0 +1,9 @@
+from rest_framework import serializers
+
+from clock.contracts.models import Contract
+
+
+class ContractEndDateSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Contract
+        fields = ('end_date', )
diff --git a/clock/contracts/api/urls.py b/clock/contracts/api/urls.py
new file mode 100644
index 0000000..ad6fec6
--- /dev/null
+++ b/clock/contracts/api/urls.py
@@ -0,0 +1,11 @@
+from django.urls import include, path
+from rest_framework import routers
+
+from clock.contracts.api import views
+
+router = routers.DefaultRouter()
+router.register(
+    'contracts', views.ContractEndDateViewSet, base_name='end_date'
+)
+
+urlpatterns = [path('', include(router.urls))]
diff --git a/clock/contracts/api/views.py b/clock/contracts/api/views.py
new file mode 100644
index 0000000..8fd6fd4
--- /dev/null
+++ b/clock/contracts/api/views.py
@@ -0,0 +1,15 @@
+from django.shortcuts import get_object_or_404
+from rest_framework import permissions, viewsets
+from rest_framework.response import Response
+
+from clock.contracts.api.serializers import ContractEndDateSerializer
+from clock.contracts.models import Contract
+
+
+class ContractEndDateViewSet(viewsets.ViewSet):
+    permission_classes = (permissions.IsAuthenticated, )
+
+    def retrieve(self, request, pk=None):
+        contract = get_object_or_404(Contract, pk=pk, employee=request.user)
+        serializer = ContractEndDateSerializer(contract)
+        return Response(serializer.data)
diff --git a/clock/shifts/api/__init__.py b/clock/shifts/api/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/clock/shifts/api/serializers.py b/clock/shifts/api/serializers.py
new file mode 100644
index 0000000..6380ee0
--- /dev/null
+++ b/clock/shifts/api/serializers.py
@@ -0,0 +1,9 @@
+from rest_framework import serializers
+
+from clock.shifts.models import Shift
+
+
+class ShiftSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Shift
+        fields = ('started', 'finished', 'employee', 'contract')
diff --git a/clock/shifts/api/urls.py b/clock/shifts/api/urls.py
new file mode 100644
index 0000000..9a1a171
--- /dev/null
+++ b/clock/shifts/api/urls.py
@@ -0,0 +1,9 @@
+from django.urls import include, path
+from rest_framework import routers
+
+from clock.shifts.api import views
+
+router = routers.DefaultRouter()
+router.register('shifts', views.ShiftViewSet)
+
+urlpatterns = [path('', include(router.urls))]
diff --git a/clock/shifts/api/views.py b/clock/shifts/api/views.py
new file mode 100644
index 0000000..5bc0ff8
--- /dev/null
+++ b/clock/shifts/api/views.py
@@ -0,0 +1,9 @@
+from rest_framework import viewsets
+
+from clock.shifts.api.serializers import ShiftSerializer
+from clock.shifts.models import Shift
+
+
+class ShiftViewSet(viewsets.ModelViewSet):
+    queryset = Shift.objects.all().order_by('-started')
+    serializer_class = ShiftSerializer
diff --git a/config/api_urls.py b/config/api_urls.py
new file mode 100644
index 0000000..983ecf0
--- /dev/null
+++ b/config/api_urls.py
@@ -0,0 +1,6 @@
+from django.urls import include, path
+
+urlpatterns = [
+    path('shifts/', include('clock.shifts.api.urls')),
+    path('contracts/', include('clock.contracts.api.urls'))
+]
diff --git a/config/settings/common.py b/config/settings/common.py
index ac0549f..8beefce 100755
--- a/config/settings/common.py
+++ b/config/settings/common.py
@@ -46,6 +46,7 @@
     # 'bootstrap3_datetime',
     'captcha',
     'taggit',
+    'rest_framework'
 )
 
 # Apps specific for this project go here.
diff --git a/config/urls.py b/config/urls.py
index 78f47be..e857508 100755
--- a/config/urls.py
+++ b/config/urls.py
@@ -1,19 +1,20 @@
 # -*- coding: utf-8 -*-
 
-
 # from config.favicon_urls import favicon_urlpatters
 from django.conf import settings
-from django.conf.urls import include, url
+from django.conf.urls import url
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.flatpages import views
 from django.http import HttpResponse
+from django.urls import include, path
 from django.views import defaults as default_views
 
 import clock.profiles.views
 
 urlpatterns = [
     url(r'^', include("clock.pages.urls"), name='pages'),
+    path('api/', include('config.api_urls'), name='api'),
     url(r'^about/$', views.flatpage, {'url': '/about/'}, name='about'),
     url(r'^impressum/$', views.flatpage,
         {'url': '/impressum/'}, name='imprint'),
@@ -48,15 +49,21 @@
     # This allows the error pages to be debugged during development, just visit
     # these url in browser to see how these error pages look like.
     urlpatterns += [
-        url(r'^400/$',
+        url(
+            r'^400/$',
             default_views.bad_request,
-            kwargs={'exception': Exception("Bad Request!")}),
-        url(r'^403/$',
+            kwargs={'exception': Exception("Bad Request!")}
+        ),
+        url(
+            r'^403/$',
             default_views.permission_denied,
-            kwargs={'exception': Exception("Permission Denied")}),
-        url(r'^404/$',
+            kwargs={'exception': Exception("Permission Denied")}
+        ),
+        url(
+            r'^404/$',
             default_views.page_not_found,
-            kwargs={'exception': Exception("Page not Found")}),
+            kwargs={'exception': Exception("Page not Found")}
+        ),
         url(r'^500/$', default_views.server_error),
     ]
     if 'debug_toolbar' in settings.INSTALLED_APPS:

From 762a083001282025e0dd3a569ab616043df134b9 Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Thu, 10 May 2018 11:39:20 +0200
Subject: [PATCH 04/17] Add first simple API2

---
 clock/contracts/api/urls.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/clock/contracts/api/urls.py b/clock/contracts/api/urls.py
index ad6fec6..219b283 100644
--- a/clock/contracts/api/urls.py
+++ b/clock/contracts/api/urls.py
@@ -4,8 +4,6 @@
 from clock.contracts.api import views
 
 router = routers.DefaultRouter()
-router.register(
-    'contracts', views.ContractEndDateViewSet, base_name='end_date'
-)
+router.register('end_date', views.ContractEndDateViewSet, base_name='end_date')
 
 urlpatterns = [path('', include(router.urls))]

From c40239f1dcbe1bc9551c230a7b88f470e07160e5 Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Thu, 10 May 2018 11:42:42 +0200
Subject: [PATCH 05/17] Add first simple3

---
 config/api_urls.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/api_urls.py b/config/api_urls.py
index 983ecf0..8f91844 100644
--- a/config/api_urls.py
+++ b/config/api_urls.py
@@ -1,5 +1,6 @@
 from django.urls import include, path
 
+app_name = 'api'
 urlpatterns = [
     path('shifts/', include('clock.shifts.api.urls')),
     path('contracts/', include('clock.contracts.api.urls'))

From 431e79ae8664b8f99ef90f1a7b0cc251e2d9456c Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Thu, 10 May 2018 12:03:06 +0200
Subject: [PATCH 06/17] Update template url

---
 clock/templates/shift/edit.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/clock/templates/shift/edit.html b/clock/templates/shift/edit.html
index 84aedbd..626987c 100755
--- a/clock/templates/shift/edit.html
+++ b/clock/templates/shift/edit.html
@@ -45,7 +45,6 @@ <h2>{% trans 'New shift' %}</h2>
             }
           }
         });
-        const url = `{% url 'shift:get_contract_id' %}`;
         const contract_select = $("#id_contract");
         const end_date_div = $("#div_id_end_date");
         const end_date_input = $("#id_end_date");
@@ -65,8 +64,10 @@ <h2>{% trans 'New shift' %}</h2>
         }
         const grabContractEndDate = function (contractID) {
           if (reoccuring.val() !== 'ONCE' && contract_select.val() !== '' && user_id.val() !== '') {
+            let url = `{% url 'api:end_date-detail' '0' %}`;
+            url = url.substring(0, url.length - 2) + contractID + '/';
             $.ajax({
-              type: 'POST',
+              type: 'GET',
               url: url,
               data: {
                 'contract': contractID,

From 4250adc58f28f46f01f0a8dc06d546f41c6f04d4 Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Sun, 13 May 2018 16:57:44 +0200
Subject: [PATCH 07/17] Add modal to show shifts to be created

---
 clock/shifts/api/urls.py         |  21 ++++-
 clock/shifts/api/views.py        |  69 +++++++++++++-
 clock/shifts/forms.py            |   8 +-
 clock/shifts/tests/test_utils.py | 155 ++++++++++++++++++++++++++++++-
 clock/shifts/urls.py             |   1 -
 clock/shifts/utils.py            |  81 +++++++++++++++-
 clock/templates/shift/edit.html  | 146 ++++++++++++++++++++++++++++-
 7 files changed, 463 insertions(+), 18 deletions(-)

diff --git a/clock/shifts/api/urls.py b/clock/shifts/api/urls.py
index 9a1a171..54b84b1 100644
--- a/clock/shifts/api/urls.py
+++ b/clock/shifts/api/urls.py
@@ -1,9 +1,20 @@
-from django.urls import include, path
-from rest_framework import routers
+# from django.urls import include, path
+# from rest_framework import routers
+from django.urls import path
+from rest_framework.urlpatterns import format_suffix_patterns
 
 from clock.shifts.api import views
 
-router = routers.DefaultRouter()
-router.register('shifts', views.ShiftViewSet)
+# router = routers.DefaultRouter()
+# router.register('shifts', views.ShiftOverlapView, base_name='test')
 
-urlpatterns = [path('', include(router.urls))]
+urlpatterns = [
+    path('', views.api_root),
+    path(
+        'overlap/<str:started>/<str:finished>/<int:contract>/<str:reoccuring>/<int:pk>/',
+        views.ShiftOverlapView.as_view(),
+        name='overlap-list'
+    )
+]
+
+urlpatterns = format_suffix_patterns(urlpatterns)
diff --git a/clock/shifts/api/views.py b/clock/shifts/api/views.py
index 5bc0ff8..76d23f3 100644
--- a/clock/shifts/api/views.py
+++ b/clock/shifts/api/views.py
@@ -1,9 +1,70 @@
-from rest_framework import viewsets
+from dateutil import parser
+from django.http import Http404
+from rest_framework import permissions, viewsets
+from rest_framework.decorators import action, api_view
+from rest_framework.response import Response
+from rest_framework.reverse import reverse
+from rest_framework.views import APIView
 
+from clock.contracts.models import Contract
 from clock.shifts.api.serializers import ShiftSerializer
 from clock.shifts.models import Shift
+from clock.shifts.utils import (
+    FREQUENCIES,
+    get_shifts_to_check_for_overlaps,
+    sort_overlapping_shifts,
+)
 
 
-class ShiftViewSet(viewsets.ModelViewSet):
-    queryset = Shift.objects.all().order_by('-started')
-    serializer_class = ShiftSerializer
+@api_view(['GET'])
+def api_root(request, format=None):
+    return Response(
+        {
+            'overlap':
+            reverse('api:overlap-list', request=request, format=format)
+        }
+    )
+
+
+class ShiftOverlapView(APIView):
+    permission_classes = (permissions.IsAuthenticated, )
+
+    def get_object(self, started, finished, contract, reoccuring, pk=None):
+        if started >= finished:
+            raise Http404
+
+        shifts = get_shifts_to_check_for_overlaps(
+            started,
+            finished,
+            self.request.user,
+            contract.pk,
+            reoccuring=reoccuring,
+            exclude_shift=pk
+        )
+        if not shifts:
+            raise Http404
+
+        return shifts
+
+    def get(self, request, started, finished, contract, reoccuring, pk):
+        if reoccuring not in FREQUENCIES:
+            raise Http404
+
+        started = parser.parse(started, fuzzy=True)
+        finished = parser.parse(finished, fuzzy=True)
+        contract = Contract.objects.get(pk=contract)
+
+        shifts = self.get_object(
+            started.date(), finished.date(), contract, reoccuring, pk
+        )
+
+        good_shifts, bad_shifts = sort_overlapping_shifts(
+            started, finished, self.request.user, contract, shifts
+        )
+
+        serialized_data = {
+            'without_overlap': ShiftSerializer(good_shifts, many=True).data,
+            'with_overlap': ShiftSerializer(bad_shifts, many=True).data,
+        }
+
+        return Response(serialized_data)
diff --git a/clock/shifts/forms.py b/clock/shifts/forms.py
index 0d8f2be..8c0a953 100755
--- a/clock/shifts/forms.py
+++ b/clock/shifts/forms.py
@@ -341,7 +341,7 @@ def clean(self):
         reoccuring = self.cleaned_data.get('reoccuring')
         if reoccuring != 'ONCE' and self.cleaned_data.get(
             'contract'
-        ).end_date and (
+        ) and self.cleaned_data.get('contract').end_date and (
             self.cleaned_data.get('end_date') >
             self.cleaned_data.get('contract').end_date
         ):
@@ -366,10 +366,14 @@ def save(self, commit=True):
         if reoccuring != 'ONCE':
             # Populate a dictionary with all values that we need to create new
             # Shifts.
+            contract = self.cleaned_data.get('contract', None)
+            if contract is not None:
+                contract = contract.pk
+
             data = {}
             for field in ['key', 'note', 'tags', 'end_date']:
                 data[field] = self.cleaned_data.get(field)
-            data['contract'] = self.cleaned_data.get('contract').pk
+            data['contract'] = contract
             data['duration'] = self.instance.duration
             data['reoccuring'] = 'ONCE'
             started = self.cleaned_data.get('started')
diff --git a/clock/shifts/tests/test_utils.py b/clock/shifts/tests/test_utils.py
index f6e7f00..b6d96b1 100644
--- a/clock/shifts/tests/test_utils.py
+++ b/clock/shifts/tests/test_utils.py
@@ -1,10 +1,163 @@
 """Tests for the shift utilities."""
+import pytest
+import pytz
+from django.contrib.auth import get_user_model
+from django.utils import timezone
 from test_plus import TestCase
 
 from clock.contracts.models import Contract
 from clock.shifts.factories import ShiftFactory, UserFactory
+from clock.shifts.forms import ShiftForm
 from clock.shifts.models import Shift
-from clock.shifts.utils import get_current_shift, get_last_shifts
+from clock.shifts.utils import (
+    get_current_shift,
+    get_last_shifts,
+    get_shifts_to_check_for_overlaps,
+    sort_overlapping_shifts,
+)
+
+
+@pytest.fixture
+@pytest.mark.django_db
+def setup_shifts():
+    user = UserFactory()
+    contract = Contract.objects.create(
+        employee=user, department='Test department', hours='50'
+    )
+
+    started = timezone.datetime(2018, 4, 1, 8, 30)
+    finished = timezone.datetime(2018, 4, 1, 17, 0)
+    end_date = timezone.datetime(2018, 6, 30)
+    form = ShiftForm(
+        data={
+            'started': started,
+            'finished': finished,
+            'reoccuring': 'DAILY',
+            'end_date': end_date,
+            'employee': user,
+            'contract': contract.pk
+        },
+        **{
+            'user': user,
+            'view': None
+        }
+    )
+    form.save()
+
+
+@pytest.fixture
+def get_user():
+    user = get_user_model()
+    return user.objects.all()[0]
+
+
+@pytest.fixture
+def get_contract():
+    return Contract.objects.all()[0]
+
+
+@pytest.mark.django_db
+def test_sort_overlapping_shifts(setup_shifts, get_user, get_contract):
+    """Test that we sort the shifts into the overlapping ones."""
+    started = timezone.make_aware(
+        timezone.datetime(2018, 4, 1, 7), timezone=pytz.utc
+    )
+    finished = timezone.make_aware(
+        timezone.datetime(2018, 4, 1, 10), timezone=pytz.utc
+    )
+    shifts = Shift.objects.filter(
+        employee=get_user,
+        contract=get_contract,
+        started__lte=finished,
+        finished__gte=started
+    ).order_by('-created_at')
+
+    good_shifts, bad_shifts = sort_overlapping_shifts(
+        started, finished, get_user, get_contract, shifts
+    )
+    assert len(bad_shifts) == 1
+    assert not good_shifts
+
+
+@pytest.mark.django_db
+def test_sort_overlapping_shifts_without_overlaps(
+    setup_shifts, get_user, get_contract
+):
+    """Test that we correctly sort shifts into the non-overlapping ones."""
+    started = timezone.make_aware(timezone.datetime(2018, 4, 1, 2))
+    finished = timezone.make_aware(timezone.datetime(2018, 4, 1, 4))
+    shifts = Shift.objects.filter(
+        employee=get_user,
+        contract=get_contract,
+        started__lte=timezone.make_aware(timezone.datetime(2018, 4, 30)),
+        finished__gte=timezone.make_aware(timezone.datetime(2018, 4, 1))
+    ).order_by('-created_at')
+
+    good_shifts, bad_shifts = sort_overlapping_shifts(
+        started, finished, get_user, get_contract, shifts
+    )
+    assert not bad_shifts
+    assert len(good_shifts) == 29
+
+    for shift in good_shifts:
+        assert shift.started.time() == started.astimezone(pytz.utc).time()
+        assert shift.finished.time() == finished.astimezone(pytz.utc).time()
+
+
+@pytest.mark.django_db
+@pytest.mark.parametrize(
+    'start_date, end_date, count', [
+        (
+            timezone.datetime(2018, 4, 5, 6, 0),
+            timezone.datetime(2018, 4, 5, 7, 55), 1
+        ), (timezone.datetime(2018, 4, 5), timezone.datetime(2018, 4, 6), 2),
+        (timezone.datetime(2018, 4, 5), timezone.datetime(2018, 4, 9), 5)
+    ]
+)
+def test_retrieval_of_shifts_to_check_for_overlaps(
+    setup_shifts, get_user, get_contract, start_date, end_date, count
+):
+    """Test that we retrieve the correct shifts to check for overlaps."""
+    started = timezone.make_aware(start_date)
+    finished = timezone.make_aware(end_date)
+    reoccuring = 'DAILY'
+    shifts = get_shifts_to_check_for_overlaps(
+        started, finished, get_user, get_contract.pk, reoccuring
+    )
+    assert shifts.count() == count
+
+
+@pytest.mark.django_db
+def test_overlap_excludes_shift(setup_shifts, get_user, get_contract):
+    """Test that we can exclude a shift from the overlap check."""
+    started = timezone.datetime(2018, 4, 2, 6, 0)
+    finished = timezone.datetime(2018, 4, 2, 8, 0)
+    form = ShiftForm(
+        data={
+            'started': started,
+            'finished': finished,
+            'reoccuring': 'ONCE',
+            'employee': get_user,
+            'contract': get_contract.pk
+        },
+        **{
+            'user': get_user,
+            'view': None
+        }
+    )
+    form.save()
+    start_date = timezone.make_aware(timezone.datetime(2018, 4, 2))
+    end_date = timezone.make_aware(timezone.datetime(2018, 4, 3))
+    reoccuring = 'DAILY'
+    shifts = get_shifts_to_check_for_overlaps(
+        start_date,
+        end_date,
+        get_user,
+        get_contract.pk,
+        reoccuring,
+        exclude_shift=form.instance.pk
+    )
+    assert shifts.count() == 2
 
 
 class TestUtils(TestCase):
diff --git a/clock/shifts/urls.py b/clock/shifts/urls.py
index a5e9ce8..953abda 100755
--- a/clock/shifts/urls.py
+++ b/clock/shifts/urls.py
@@ -7,7 +7,6 @@
     ShiftManualEdit,
     ShiftMonthContractView,
     ShiftYearView,
-    get_contract_end_date,
     shift_action,
 )
 
diff --git a/clock/shifts/utils.py b/clock/shifts/utils.py
index d0c0519..3c50f1a 100755
--- a/clock/shifts/utils.py
+++ b/clock/shifts/utils.py
@@ -1,10 +1,84 @@
 # -*- coding: utf-8 -*-
 from datetime import datetime
 
+import pytz
+from dateutil.rrule import DAILY, MONTHLY, WEEKLY, rrule
 from django.urls import reverse_lazy
+from django.utils import timezone
 
+# from clock.shifts.forms import FREQUENCIES
 from clock.shifts.models import Shift
 
+FREQUENCIES = {'DAILY': DAILY, 'WEEKLY': WEEKLY, 'MONTHLY': MONTHLY}
+
+
+def get_shifts_to_check_for_overlaps(
+    start_date, end_date, user, contract, reoccuring, exclude_shift=None
+):
+    # Grab all dates that are between `start_date` and `end_date`
+    dates = list(
+        rrule(
+            freq=FREQUENCIES[reoccuring], dtstart=start_date, until=end_date
+        )
+    )
+    first_reoccuring_date = dates[0]
+    last_reoccuring_date = dates[-1]
+
+    # Convert all dates into datetimes
+    min_time = datetime.min.time()
+    max_time = datetime.max.time()
+    first_reoccuring_date = timezone.make_aware(
+        datetime.combine(first_reoccuring_date, min_time)
+    )
+    last_reoccuring_date = timezone.make_aware(
+        datetime.combine(last_reoccuring_date, max_time)
+    )
+
+    # Grabs all shifts that are within `first_reoccuring_date` and
+    # `last_reoccuring_date`
+    shifts = Shift.objects.filter(
+        employee=user.pk,
+        started__lte=last_reoccuring_date,
+        finished__gte=first_reoccuring_date,
+        contract__pk=contract
+    )
+
+    if exclude_shift:
+        shifts = shifts.exclude(pk=exclude_shift)
+
+    # Filter shifts to those on the day of reoccurence
+    dates = [datetime.date() for datetime in dates]
+    shifts = shifts.filter(started__date__in=dates)
+
+    return shifts
+
+
+def sort_overlapping_shifts(started, finished, user, contract, shifts):
+    """Sort all shifts by non-overlapping and overlapping ones.
+
+    Returns two sorted QuerySets.
+    """
+    good_shifts = []
+    bad_shifts = []
+
+    for shift in shifts:
+        # Set start and finish datetime for the to-be-created Shift
+        start = datetime.combine(shift.started.date(),
+                                 started.time()).astimezone(pytz.utc)
+        finish = datetime.combine(shift.started.date(),
+                                  finished.time()).astimezone(pytz.utc)
+        s = Shift(
+            employee=user, started=start, finished=finish, contract=contract
+        )
+
+        if (shift.started <= finish.astimezone(pytz.utc)
+            ) and (shift.finished >= start.astimezone(pytz.utc)):
+            bad_shifts.append(s)
+        else:
+            good_shifts.append(s)
+
+    return good_shifts, bad_shifts
+
 
 def get_return_url(request, default_success):
     """Checks whether the user should be returned to the default_success view or to
@@ -47,8 +121,8 @@ def get_return_url(request, default_success):
             }
 
         try:
-            return_kwargs['contract'] = request.session['last_kwargs'][
-                'contract']
+            return_kwargs['contract'] = request.session['last_kwargs'
+                                                        ]['contract']
         except KeyError:
             return_kwargs['contract'] = '00'
 
@@ -137,7 +211,8 @@ def get_last_shifts(user, count=5):
     :return: Shift objects or None
     """
     finished_shifts = Shift.objects.filter(
-        employee=user, finished__isnull=False)[:count]
+        employee=user, finished__isnull=False
+    )[:count]
 
     if not finished_shifts:
         return None
diff --git a/clock/templates/shift/edit.html b/clock/templates/shift/edit.html
index 626987c..8d4dc7e 100755
--- a/clock/templates/shift/edit.html
+++ b/clock/templates/shift/edit.html
@@ -15,6 +15,21 @@
 {% endblock breadcrumbs %}
 
 {% block container %}
+    <div class="modal fade" id="shiftOverlap" tabindex="-1" role="dialog" aria-labelledby="shiftOverlapLabel">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title" id="shiftOverlapLabel">{% trans 'Information' %}</h4>
+                </div>
+                <div class="modal-body"></div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">{% trans 'Cancel' %}</button>
+                    <button type="button" class="btn btn-primary">{% trans 'Save' %}</button>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="row">
         <div class="col-md-6">
             {% if shift %}
@@ -32,6 +47,110 @@ <h2>{% trans 'New shift' %}</h2>
 {% block extra_js %}
     <script type="text/javascript">
       $(function () {
+
+        var getUrlParameter = function getUrlParameter(sParam) {
+          var sPageURL = decodeURIComponent(window.location.search.substring(1)),
+          sURLVariables = sPageURL.split('&'),
+          sParameterName,
+          i;
+
+          for (i = 0; i < sURLVariables.length; i++) {
+            sParameterName = sURLVariables[i].split('=');
+
+            if (sParameterName[0] === sParam) {
+              return sParameterName[1] === undefined ? true : sParameterName[1];
+            }
+          }
+        };
+
+        const submitButton = $("#submit_id");
+
+        function toggleModal() {
+          $("#shiftOverlap").modal('toggle');
+        };
+
+        function showModal() {
+          $("#shiftOverlap").modal('show');
+        };
+
+        function submitShiftForm (event) {
+          event.preventDefault();
+        }
+
+        function addShiftsToModal (shifts, type) {
+            const modal = document.querySelector('#shiftOverlap').getElementsByClassName('modal-body')[0];
+
+            let p = document.createElement('p');
+            if (type === 'wo_overlap') {
+              p.innerHTML = '{% trans "The following shifts will be created:" %}';
+            } else {
+              p.innerHTML = '{% trans "The following shifts will <strong>not</strong> be created:" %}';
+            }
+
+            modal.append(p);
+            const ul = document.createElement('ul');
+            p.append(ul);
+
+
+            shifts.forEach((shift) => {
+
+              moment().localeData('{{ LANGUAGE_CODE }}');
+              const li = document.createElement('li');
+              const started = moment(shift.started);
+              const finished = moment(shift.finished);
+              const liText = document.createTextNode(`${started} - ${finished}`);
+              li.appendChild(liText);
+              ul.append(li);
+            });
+        }
+
+        function clearModal () {
+          const modal = document.querySelector('#shiftOverlap').getElementsByClassName('modal-body')[0];
+          modal.innerHTML = '';
+        }
+
+        $('#shiftOverlap').on('hidden.bs.modal', function (e) {
+          clearModal();
+        })
+
+        $("#submit-id-submit").on('click', function (event) {
+          const reoccuring = $("#id_reoccuring").val() || 'ONCE';
+          if (reoccuring === 'ONCE') {
+            return;
+          };
+          event.preventDefault();
+          const started = $("#id_started").val();
+          let finished = moment($("#id_finished").val());
+          const contract = $("#id_contract").val() || 0;
+          const end_date = $("#id_end_date").val();
+          const shift_id = 0;
+
+          finished = moment(new Date(`${end_date} ${finished.hour()}:${finished.minute()}`));
+
+          let url = `/api/shifts/overlap/${started}/${finished.format('YYYY-MM-DD HH:mm')}/${contract}/${reoccuring}/${shift_id}/`;
+          $.ajax({
+            type: 'GET',
+            url: url,
+            success: function (data) {
+              if (data.without_overlap && data.without_overlap.length) {
+                addShiftsToModal(data.without_overlap, type='wo_overlap');
+              }
+              if (data.with_overlap && data.with_overlap.length) {
+                const warn = `{% trans 'Warning' %}`
+                const modalTitle = document.querySelector('#shiftOverlap').getElementsByClassName('modal-title')[0];
+                modalTitle.innerHTML = warn;
+                addShiftsToModal(data.with_overlap, type='overlap');
+              }
+              showModal();
+            },
+            error: function (data) {
+              console.log('Michael, what happened?');
+            },
+          });
+
+          toggleModal();
+        })
+
         // Taken from the Django documentation
         const csrftoken = $("[name=csrfmiddlewaretoken]").val();
         function csrfSafeMethod(method) {
@@ -62,7 +181,19 @@ <h2>{% trans 'New shift' %}</h2>
         const showContractEndDate = function () {
           end_date_div.show();
         }
+
+        function setReoccuringEndDate(date) {
+            end_date_input.val(date);
+            end_date_div.data("DateTimePicker").date(date);
+        }
+
         const grabContractEndDate = function (contractID) {
+          if (reoccuring.val() !== 'ONCE' && contract_select.val() == '') {
+            const date = moment(new Date()).endOf('month').format('YYYY-MM-DD');
+            showContractEndDate();
+            setReoccuringEndDate(data['end_date']);
+          }
+
           if (reoccuring.val() !== 'ONCE' && contract_select.val() !== '' && user_id.val() !== '') {
             let url = `{% url 'api:end_date-detail' '0' %}`;
             url = url.substring(0, url.length - 2) + contractID + '/';
@@ -75,8 +206,17 @@ <h2>{% trans 'New shift' %}</h2>
               },
               success: function (data) {
                 showContractEndDate();
-                end_date_input.val(data['end_date']);
-                end_date_div.data("DateTimePicker").date(data['end_date']);
+                if (data['end_date'] == null) {
+                  if (end_date_input.val() === '') {
+                    const date = moment(new Date()).endOf('month').format('YYYY-MM-DD');
+                    setReoccuringEndDate(date);
+
+                    return;
+                  } else {
+                    return
+                  }
+                }
+                setReoccuringEndDate(data['end_date']);
               },
               error: function (data) {
                 console.log('No contract ID found.');
@@ -120,12 +260,14 @@ <h2>{% trans 'New shift' %}</h2>
           inline: true,
           sideBySide: true,
           locale: '{{ LANGUAGE_CODE }}',
+          format: 'YYYY-MM-DD HH:mm',
           stepping: 5
         });
         shiftFinishedPicker.datetimepicker({
           inline: true,
           sideBySide: true,
           locale: '{{ LANGUAGE_CODE }}',
+          format: 'YYYY-MM-DD HH:mm',
           stepping: 5
         });
       {% if not shift %}

From 3d14ee540db07c8af860b6e9deb38efad538b21e Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Sun, 13 May 2018 17:29:52 +0200
Subject: [PATCH 08/17] Grab shift ID from URL

---
 clock/templates/shift/edit.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/clock/templates/shift/edit.html b/clock/templates/shift/edit.html
index 8d4dc7e..d63bf8b 100755
--- a/clock/templates/shift/edit.html
+++ b/clock/templates/shift/edit.html
@@ -123,7 +123,10 @@ <h2>{% trans 'New shift' %}</h2>
           let finished = moment($("#id_finished").val());
           const contract = $("#id_contract").val() || 0;
           const end_date = $("#id_end_date").val();
-          const shift_id = 0;
+          let shift_id = 0;
+          if (location.pathname.indexOf('edit') > -1) {
+            shift_id = location.pathname.split('/')[2];
+          }
 
           finished = moment(new Date(`${end_date} ${finished.hour()}:${finished.minute()}`));
 

From 60f7d0a2624877636bf2fdb5b8ae64e006eb217d Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Sun, 13 May 2018 17:30:04 +0200
Subject: [PATCH 09/17] Set end date to last day of the currently selected
 month

---
 clock/templates/shift/edit.html | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/clock/templates/shift/edit.html b/clock/templates/shift/edit.html
index d63bf8b..3e81b4a 100755
--- a/clock/templates/shift/edit.html
+++ b/clock/templates/shift/edit.html
@@ -191,12 +191,6 @@ <h2>{% trans 'New shift' %}</h2>
         }
 
         const grabContractEndDate = function (contractID) {
-          if (reoccuring.val() !== 'ONCE' && contract_select.val() == '') {
-            const date = moment(new Date()).endOf('month').format('YYYY-MM-DD');
-            showContractEndDate();
-            setReoccuringEndDate(data['end_date']);
-          }
-
           if (reoccuring.val() !== 'ONCE' && contract_select.val() !== '' && user_id.val() !== '') {
             let url = `{% url 'api:end_date-detail' '0' %}`;
             url = url.substring(0, url.length - 2) + contractID + '/';
@@ -211,12 +205,11 @@ <h2>{% trans 'New shift' %}</h2>
                 showContractEndDate();
                 if (data['end_date'] == null) {
                   if (end_date_input.val() === '') {
-                    const date = moment(new Date()).endOf('month').format('YYYY-MM-DD');
+                    const date = moment($('#id_started').val()).endOf('month').format('YYYY-MM-DD');
                     setReoccuringEndDate(date);
-
                     return;
                   } else {
-                    return
+                    return;
                   }
                 }
                 setReoccuringEndDate(data['end_date']);
@@ -233,7 +226,12 @@ <h2>{% trans 'New shift' %}</h2>
             resetContractEndDate();
           } else {
             if (contract_select.val() === '') {
-              showContractEndDate()
+              if (reoccuring.val() !== 'ONCE' && contract_select.val() == '') {
+                const date = moment($('#id_started').val()).endOf('month').format('YYYY-MM-DD');
+                showContractEndDate();
+                setReoccuringEndDate(date);
+              }
+              showContractEndDate();
             } else {
               grabContractEndDate(contract_select.val());
             }

From 88ef3ca15ac2942a7cd86babebe809cbef728653 Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Sun, 13 May 2018 17:30:43 +0200
Subject: [PATCH 10/17] Bugfix: Shifts in months without any shifts can now be
 created

---
 clock/shifts/api/views.py | 43 ++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/clock/shifts/api/views.py b/clock/shifts/api/views.py
index 76d23f3..78a8a6f 100644
--- a/clock/shifts/api/views.py
+++ b/clock/shifts/api/views.py
@@ -1,7 +1,11 @@
+from datetime import datetime
+
 from dateutil import parser
+from dateutil.rrule import rrule
 from django.http import Http404
-from rest_framework import permissions, viewsets
-from rest_framework.decorators import action, api_view
+from django.utils import timezone
+from rest_framework import permissions
+from rest_framework.decorators import api_view
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
 from rest_framework.views import APIView
@@ -41,8 +45,6 @@ def get_object(self, started, finished, contract, reoccuring, pk=None):
             reoccuring=reoccuring,
             exclude_shift=pk
         )
-        if not shifts:
-            raise Http404
 
         return shifts
 
@@ -58,13 +60,40 @@ def get(self, request, started, finished, contract, reoccuring, pk):
             started.date(), finished.date(), contract, reoccuring, pk
         )
 
-        good_shifts, bad_shifts = sort_overlapping_shifts(
-            started, finished, self.request.user, contract, shifts
+        if shifts:
+            good_shifts, bad_shifts = sort_overlapping_shifts(
+                started, finished, self.request.user, contract, shifts
+            )
+            serialized_data = {
+                'without_overlap': ShiftSerializer(good_shifts,
+                                                   many=True).data,
+                'with_overlap': ShiftSerializer(bad_shifts, many=True).data,
+            }
+            return Response(serialized_data)
+
+        dates = list(
+            rrule(
+                freq=FREQUENCIES[reoccuring], dtstart=started, until=finished
+            )
         )
+        start_time = started.time()
+        finish_time = finished.time()
+
+        good_shifts = []
+        for date in dates:
+            started = timezone.make_aware(datetime.combine(date, start_time))
+            finished = timezone.make_aware(datetime.combine(date, finish_time))
+            shift = Shift(
+                employee=request.user,
+                contract=contract,
+                started=started,
+                finished=finished
+            )
+            good_shifts.append(shift)
 
         serialized_data = {
             'without_overlap': ShiftSerializer(good_shifts, many=True).data,
-            'with_overlap': ShiftSerializer(bad_shifts, many=True).data,
+            'with_overlap': []
         }
 
         return Response(serialized_data)

From 0261830c12ddc20202691e784bcb7a9140962415 Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Sun, 13 May 2018 17:33:20 +0200
Subject: [PATCH 11/17] Clean up

---
 clock/shifts/urls.py  |  3 ---
 clock/shifts/views.py | 17 -----------------
 2 files changed, 20 deletions(-)

diff --git a/clock/shifts/urls.py b/clock/shifts/urls.py
index 953abda..3516db9 100755
--- a/clock/shifts/urls.py
+++ b/clock/shifts/urls.py
@@ -13,9 +13,6 @@
 app_name = 'shift'
 urlpatterns = [
     # Shift URLs
-    path(
-        'ajax/get_contract_id/', get_contract_end_date, name="get_contract_id"
-    ),
     # Display the ShiftMonthView as default with the current year-month
     path('', ShiftMonthContractView.as_view(month_format='%m', ), name="list"),
     # View to handle all the quick-actions from the dashboard
diff --git a/clock/shifts/views.py b/clock/shifts/views.py
index 14bbcb3..ff3e865 100755
--- a/clock/shifts/views.py
+++ b/clock/shifts/views.py
@@ -3,7 +3,6 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.http import HttpResponse, JsonResponse
 from django.shortcuts import redirect
 from django.utils import timezone
 from django.utils.decorators import method_decorator
@@ -14,7 +13,6 @@
 from django.views.generic.list import ListView
 from pytz import timezone as p_timezone
 
-from clock.contracts.models import Contract
 from clock.pages.mixins import UserObjectOwnerMixin
 from clock.shifts.forms import ClockInForm, ClockOutForm, ShiftForm
 from clock.shifts.models import Shift
@@ -27,21 +25,6 @@
 )
 
 
-@login_required
-def get_contract_end_date(request):
-    if request.method == 'POST':
-        contract_id = request.POST.get('contract', 0)
-        contract = Contract.objects.get(pk=contract_id)
-
-        # Only show data to users that own the requested contract
-        if contract.employee.pk == request.user.pk:
-            return JsonResponse({'end_date': contract.end_date})
-
-        return HttpResponse(status=404)
-
-    return HttpResponse(status=403)
-
-
 @require_POST
 @login_required
 def shift_action(request):

From a21a5c624dc88efa76279e98c1f48719c748f837 Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Sun, 13 May 2018 17:34:41 +0200
Subject: [PATCH 12/17] Add translations

---
 locale/de/LC_MESSAGES/django.po | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 6f5b3c0..f3ce4a5 100755
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-08 09:14+0200\n"
+"POT-Creation-Date: 2018-05-13 17:33+0200\n"
 "PO-Revision-Date: 2017-11-11 14:21+0053\n"
 "Last-Translator: b'M G <mgecht@stud.uni-frankfurt.de>'\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -146,9 +146,6 @@ msgstr "Wir können keine Schichten unter fünf Minuten speichern."
 msgid "The current shift overlaps with the following saved {}:"
 msgstr "Die aktuelle Schicht überlappt mit den folgenden:"
 
-msgid "<a href=\"{}\"><strong>Contract:</strong> {}; <strong>Started:</strong> {}; <strong>Duration:</strong> {}; <strong>Finished:</strong> {}</a>"
-msgstr "<a href=\"{}\"><strong>Vertrag:</strong> {}; <strong>Schichtbeginn:</strong> {}; <strong>Schichtdauer:</strong> {}; <strong>Schichtende:</strong> {}</a>"
-
 msgid "S"
 msgstr "K"
 
@@ -293,6 +290,7 @@ msgstr "Passwort vergessen? Gib  einfach Deine E-Mail-Adresse ein und wir senden
 msgid "Reset My Password"
 msgstr "Setze mein Passwort zurück"
 
+#, python-format
 msgid "Please <a href=\"%(contact_url)s\">contact us</a> if you have any trouble resetting your password."
 msgstr "Bitte <a href=\"%(contact_url)s\">kontaktiere uns</a>, falls du irgendwelche Probleme beim Zurücksetzen deines Passworts hast."
 
@@ -496,6 +494,23 @@ msgstr "Schicht aktualisieren"
 msgid "New shift"
 msgstr "Neue Schicht hinzufügen"
 
+msgid "Information"
+msgstr "Information"
+
+msgid "Save"
+msgstr "Speichern"
+
+msgid "The following shifts will be created:"
+msgstr "Die folgenden Schichten werden erstellt:"
+
+msgid "The following shifts will <strong>not</strong> be created:"
+msgstr "Die folgenden Schichten werden <strong>nicht</strong> erstellt:"
+
+#, fuzzy
+#| msgid "Warning:"
+msgid "Warning"
+msgstr "Warnung:"
+
 msgid "Shifts in"
 msgstr "Schichten"
 
@@ -528,3 +543,6 @@ msgstr "Englisch"
 
 msgid "A new message has arrived!"
 msgstr "Neue Nachricht erhalten!"
+
+#~ msgid "<a href=\"{}\"><strong>Contract:</strong> {}; <strong>Started:</strong> {}; <strong>Duration:</strong> {}; <strong>Finished:</strong> {}</a>"
+#~ msgstr "<a href=\"{}\"><strong>Vertrag:</strong> {}; <strong>Schichtbeginn:</strong> {}; <strong>Schichtdauer:</strong> {}; <strong>Schichtende:</strong> {}</a>"

From 3be0da83ae67c4cc9ac6cf5788a5791e614f3c21 Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Sun, 13 May 2018 17:46:20 +0200
Subject: [PATCH 13/17] Create shifts without a contract

---
 clock/shifts/api/views.py | 7 +++++--
 clock/shifts/utils.py     | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/clock/shifts/api/views.py b/clock/shifts/api/views.py
index 78a8a6f..b56d102 100644
--- a/clock/shifts/api/views.py
+++ b/clock/shifts/api/views.py
@@ -41,7 +41,7 @@ def get_object(self, started, finished, contract, reoccuring, pk=None):
             started,
             finished,
             self.request.user,
-            contract.pk,
+            contract,
             reoccuring=reoccuring,
             exclude_shift=pk
         )
@@ -54,7 +54,10 @@ def get(self, request, started, finished, contract, reoccuring, pk):
 
         started = parser.parse(started, fuzzy=True)
         finished = parser.parse(finished, fuzzy=True)
-        contract = Contract.objects.get(pk=contract)
+        try:
+            contract = Contract.objects.get(pk=contract)
+        except Contract.DoesNotExist:
+            contract = None
 
         shifts = self.get_object(
             started.date(), finished.date(), contract, reoccuring, pk
diff --git a/clock/shifts/utils.py b/clock/shifts/utils.py
index 3c50f1a..0dafd65 100755
--- a/clock/shifts/utils.py
+++ b/clock/shifts/utils.py
@@ -40,9 +40,11 @@ def get_shifts_to_check_for_overlaps(
         employee=user.pk,
         started__lte=last_reoccuring_date,
         finished__gte=first_reoccuring_date,
-        contract__pk=contract
     )
 
+    if contract is not None:
+        shifts.filter(contract=contract)
+
     if exclude_shift:
         shifts = shifts.exclude(pk=exclude_shift)
 

From bcbac1b39056aa14db4439d8992eba153604a055 Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Sun, 13 May 2018 19:04:29 +0200
Subject: [PATCH 14/17] Limit minimal reoccurence date for datepicker

---
 clock/templates/shift/edit.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/clock/templates/shift/edit.html b/clock/templates/shift/edit.html
index 3e81b4a..3e1a818 100755
--- a/clock/templates/shift/edit.html
+++ b/clock/templates/shift/edit.html
@@ -271,6 +271,11 @@ <h2>{% trans 'New shift' %}</h2>
           format: 'YYYY-MM-DD HH:mm',
           stepping: 5
         });
+      shiftStartedPicker.on("dp.change", function (e) {
+        end_date_div.data("DateTimePicker").minDate(e.date);
+        let tomorrow = moment(e.date).add(1, 'days').endOf('month');
+        end_date_div.data("DateTimePicker").date(tomorrow);
+      });
       {% if not shift %}
         shiftStartedPicker.data("DateTimePicker").defaultDate(moment("{{ view.start_datetime }}"));
         shiftFinishedPicker.data("DateTimePicker").defaultDate(moment("{{ view.start_datetime }}"));

From 862c5e88ab9afc3053a533efd3d5d3add5c98a91 Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Sun, 13 May 2018 19:04:43 +0200
Subject: [PATCH 15/17] Deny submit, if we only have overlapping shifts

---
 clock/shifts/forms.py           |  4 +++-
 clock/templates/shift/edit.html | 24 ++++++++++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/clock/shifts/forms.py b/clock/shifts/forms.py
index 8c0a953..ae1293f 100755
--- a/clock/shifts/forms.py
+++ b/clock/shifts/forms.py
@@ -297,6 +297,8 @@ def __init__(self, *args, **kwargs):
         self.helper = FormHelper(self)
         self.helper.form_action = '.'
         self.helper.form_method = 'post'
+        self.helper.attrs = {'name': 'shiftForm'}
+        self.helper.form_id = 'shiftForm'
         self.helper.layout = Layout(
             Field(
                 'started', template='shift/fields/datetimepicker_field.html'
@@ -312,7 +314,7 @@ def __init__(self, *args, **kwargs):
             FormActions(
                 HTML(cancel_html),
                 Submit(
-                    'submit',
+                    'submitShiftForm',
                     add_input_text,
                     css_class='btn btn-primary pull-right'
                 ),
diff --git a/clock/templates/shift/edit.html b/clock/templates/shift/edit.html
index 3e1a818..faddf3b 100755
--- a/clock/templates/shift/edit.html
+++ b/clock/templates/shift/edit.html
@@ -24,8 +24,8 @@ <h4 class="modal-title" id="shiftOverlapLabel">{% trans 'Information' %}</h4>
                 </div>
                 <div class="modal-body"></div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">{% trans 'Cancel' %}</button>
-                    <button type="button" class="btn btn-primary">{% trans 'Save' %}</button>
+                    <button type="button" class="btn btn-default" id="cancel-modal" data-dismiss="modal">{% trans 'Cancel' %}</button>
+                    <button type="button" class="btn btn-primary" id="submit-modal">{% trans 'Save' %}</button>
                 </div>
             </div>
         </div>
@@ -63,8 +63,6 @@ <h2>{% trans 'New shift' %}</h2>
           }
         };
 
-        const submitButton = $("#submit_id");
-
         function toggleModal() {
           $("#shiftOverlap").modal('toggle');
         };
@@ -73,9 +71,12 @@ <h2>{% trans 'New shift' %}</h2>
           $("#shiftOverlap").modal('show');
         };
 
-        function submitShiftForm (event) {
-          event.preventDefault();
-        }
+        let allowFormSubmit = true;
+        $("#submit-modal").click(function() {
+          if (allowFormSubmit) {
+            $("#shiftForm").submit();
+          }
+        });
 
         function addShiftsToModal (shifts, type) {
             const modal = document.querySelector('#shiftOverlap').getElementsByClassName('modal-body')[0];
@@ -107,13 +108,16 @@ <h2>{% trans 'New shift' %}</h2>
         function clearModal () {
           const modal = document.querySelector('#shiftOverlap').getElementsByClassName('modal-body')[0];
           modal.innerHTML = '';
+          allowFormSubmit = true;
+          $('#submit-modal').show();
+          $('#cancel-modal').html(`{% trans 'Cancel' %}`);
         }
 
         $('#shiftOverlap').on('hidden.bs.modal', function (e) {
           clearModal();
         })
 
-        $("#submit-id-submit").on('click', function (event) {
+        $("#submit-id-submitshiftform").on('click', function (event) {
           const reoccuring = $("#id_reoccuring").val() || 'ONCE';
           if (reoccuring === 'ONCE') {
             return;
@@ -137,6 +141,10 @@ <h2>{% trans 'New shift' %}</h2>
             success: function (data) {
               if (data.without_overlap && data.without_overlap.length) {
                 addShiftsToModal(data.without_overlap, type='wo_overlap');
+              } else {
+                allowFormSubmit = false;
+                $('#submit-modal').hide();
+                $('#cancel-modal').html(`{% trans 'OK' %}`);
               }
               if (data.with_overlap && data.with_overlap.length) {
                 const warn = `{% trans 'Warning' %}`

From a0b1e71c54fc9c38c37cdce04b0fc19ae6fab71d Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Sun, 13 May 2018 19:09:46 +0200
Subject: [PATCH 16/17] Show end date picker, when reloading the page

---
 clock/templates/shift/edit.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/clock/templates/shift/edit.html b/clock/templates/shift/edit.html
index faddf3b..b8e979b 100755
--- a/clock/templates/shift/edit.html
+++ b/clock/templates/shift/edit.html
@@ -193,9 +193,15 @@ <h2>{% trans 'New shift' %}</h2>
           end_date_div.show();
         }
 
+        $(document).ready(() => {
+          if (reoccuring.val() !== 'ONCE') {
+            showContractEndDate();
+          }
+        });
+
         function setReoccuringEndDate(date) {
-            end_date_input.val(date);
-            end_date_div.data("DateTimePicker").date(date);
+          end_date_input.val(date);
+          end_date_div.data("DateTimePicker").date(date);
         }
 
         const grabContractEndDate = function (contractID) {

From 1a3f8422487bc05c8c87d92d97346c8dff384140 Mon Sep 17 00:00:00 2001
From: Michael Gecht <gecht.m@gmail.com>
Date: Sun, 13 May 2018 20:46:42 +0200
Subject: [PATCH 17/17] Add tests to shift API

---
 clock/shifts/api/tests/__init__.py   |   0
 clock/shifts/api/tests/test_views.py | 102 +++++++++++++++++++++++++++
 clock/shifts/api/views.py            |  12 ++--
 3 files changed, 107 insertions(+), 7 deletions(-)
 create mode 100644 clock/shifts/api/tests/__init__.py
 create mode 100644 clock/shifts/api/tests/test_views.py

diff --git a/clock/shifts/api/tests/__init__.py b/clock/shifts/api/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/clock/shifts/api/tests/test_views.py b/clock/shifts/api/tests/test_views.py
new file mode 100644
index 0000000..02433d5
--- /dev/null
+++ b/clock/shifts/api/tests/test_views.py
@@ -0,0 +1,102 @@
+from collections import OrderedDict
+
+import pytest
+from django.urls import reverse
+from rest_framework import status
+from rest_framework.test import APIClient
+
+from clock.shifts.factories import UserFactory
+
+
+@pytest.fixture
+def client(user):
+    client = APIClient()
+    client.force_authenticate(user=user)
+    return client
+
+
+@pytest.fixture
+def user():
+    return UserFactory()
+
+
+@pytest.mark.django_db
+def test_shift_overlap_api_start_after_finish(client):
+    """Fail when the finished date is smaller than the started."""
+    url = reverse(
+        'api:overlap-list',
+        kwargs={
+            'started': '2018-05-02',
+            'finished': '2018-05-01',
+            'contract': 1,
+            'reoccuring': 'DAILY',
+            'pk': 0
+        }
+    )
+
+    response = client.get(url)
+    assert response.status_code == status.HTTP_400_BAD_REQUEST
+
+
+@pytest.mark.django_db
+@pytest.mark.parametrize(
+    ['reoccurence', 'status_code'], [
+        ('ONCE', status.HTTP_400_BAD_REQUEST), ('DAILY', status.HTTP_200_OK),
+        ('WEEKLY', status.HTTP_200_OK), ('MONTHLY', status.HTTP_200_OK)
+    ]
+)
+def test_shift_overlap_api_reoccurence_string(
+    client, reoccurence, status_code
+):
+    """Check the response depending on the reoccurence string."""
+    url = reverse(
+        'api:overlap-list',
+        kwargs={
+            'started': '2018-05-01',
+            'finished': '2018-05-02',
+            'contract': 1,
+            'reoccuring': reoccurence,
+            'pk': 0
+        }
+    )
+
+    response = client.get(url)
+    assert response.status_code == status_code
+
+
+@pytest.mark.django_db
+def test_shift_overlap_api_generate_new_shifts(client):
+    """Test we can create new shifts, when not overlapping with anything."""
+    url = reverse(
+        'api:overlap-list',
+        kwargs={
+            'started': '2018-05-01 05:00',
+            'finished': '2018-05-02 08:00',
+            'contract': 1,
+            'reoccuring': 'DAILY',
+            'pk': 0
+        }
+    )
+
+    response = client.get(url)
+    assert response.status_code == status.HTTP_200_OK
+
+    shifts = [
+        {
+            'started': '2018-05-01T05:00:00+02:00',
+            'finished': '2018-05-01T08:00:00+02:00',
+            'employee': 6,
+            'contract': None
+        }, {
+            'started': '2018-05-02T05:00:00+02:00',
+            'finished': '2018-05-02T08:00:00+02:00',
+            'employee': 6,
+            'contract': None
+        }
+    ]
+    shifts = [OrderedDict(shift) for shift in shifts]
+
+    without_overlaps = response.data['without_overlap']
+    with_overlaps = response.data['with_overlap']
+    assert with_overlaps == []
+    assert without_overlaps == shifts
diff --git a/clock/shifts/api/views.py b/clock/shifts/api/views.py
index b56d102..3a5faad 100644
--- a/clock/shifts/api/views.py
+++ b/clock/shifts/api/views.py
@@ -4,7 +4,7 @@
 from dateutil.rrule import rrule
 from django.http import Http404
 from django.utils import timezone
-from rest_framework import permissions
+from rest_framework import permissions, status
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
@@ -34,9 +34,6 @@ class ShiftOverlapView(APIView):
     permission_classes = (permissions.IsAuthenticated, )
 
     def get_object(self, started, finished, contract, reoccuring, pk=None):
-        if started >= finished:
-            raise Http404
-
         shifts = get_shifts_to_check_for_overlaps(
             started,
             finished,
@@ -49,11 +46,12 @@ def get_object(self, started, finished, contract, reoccuring, pk=None):
         return shifts
 
     def get(self, request, started, finished, contract, reoccuring, pk):
-        if reoccuring not in FREQUENCIES:
-            raise Http404
-
         started = parser.parse(started, fuzzy=True)
         finished = parser.parse(finished, fuzzy=True)
+
+        if (started >= finished) or (reoccuring not in FREQUENCIES):
+            return Response(status=status.HTTP_400_BAD_REQUEST)
+
         try:
             contract = Contract.objects.get(pk=contract)
         except Contract.DoesNotExist: