From f5b4dcb85e8e2c0cf4db35aa8227ff10885d396b Mon Sep 17 00:00:00 2001
From: Hugh Wells <hugh@crablab.co.uk>
Date: Thu, 30 Jul 2020 16:02:00 +0100
Subject: [PATCH 1/8] WIP: basic (non-working) implementation of some of the
 hard limit stuff

---
 src/helpers/date.js           | 73 +++++++++++++++++++++++++++++++++++
 src/views/Assessment/Edit.vue | 72 ++++++++++++++++++++--------------
 src/views/Assessments.vue     | 19 +++++++++
 3 files changed, 136 insertions(+), 28 deletions(-)
 create mode 100644 src/helpers/date.js

diff --git a/src/helpers/date.js b/src/helpers/date.js
new file mode 100644
index 0000000..12d2d24
--- /dev/null
+++ b/src/helpers/date.js
@@ -0,0 +1,73 @@
+const isDate = (date) => date instanceof Date;
+
+const isDateInFuture = (date) => {
+  // @TODO #388 update to full datetime instead of hardcoding time
+  if (!(date instanceof Date)) {
+    throw 'Supplied date must be a Date object';
+  }
+
+  const today = new Date();
+
+  date = new Date(
+    date.getFullYear(),
+    date.getMonth(),
+    date.getDate(),
+    13,
+    0,
+    0
+  );
+
+  return date > today;
+};
+
+const formatDate = (date, type) => {
+  if (!(date instanceof Date)) {
+    throw 'Supplied date must be a Date object';
+  }
+
+  if (type && type === 'time') {
+    return date.toLocaleString('en-GB', { hour: 'numeric', minute: 'numeric', hour12: true }).toLowerCase();
+  }
+
+  const month = date.toLocaleString('en-GB', { month: 'long' });
+
+  if (type && type === 'month') {
+    return `${month} ${date.getFullYear()}`;
+  }
+
+  return `${date.getDate()} ${month} ${date.getFullYear()}`;
+};
+
+const parseEstimatedDate = (value) => {
+  if (value instanceof Date) {
+    return value;
+  }
+
+  if (typeof value != 'string') {
+    return;
+  }
+  const parts = value.split('-');
+
+  const [year, month, day] = [...parts, 1];
+  const date = new Date(Date.UTC(year, month - 1, day));
+
+  return date;
+};
+
+const validateYear = (val) => {
+  val = parseInt(val);
+
+  if (isNaN(val) || val.toString().length !== 4) {
+    return null;
+  }
+
+  return val;
+};
+
+export {
+  isDate,
+  isDateInFuture,
+  formatDate,
+  parseEstimatedDate,
+  validateYear
+};
diff --git a/src/views/Assessment/Edit.vue b/src/views/Assessment/Edit.vue
index 96f50f4..6725258 100644
--- a/src/views/Assessment/Edit.vue
+++ b/src/views/Assessment/Edit.vue
@@ -52,45 +52,50 @@
             </div>
           </dl>
 
-          <p class="govuk-body-l">
-            Download the template on this page to complete your assessment.
-          </p>
+          <div
+            v-if="submissionPermitted"
+          >
+            <p class="govuk-body-l">
+              Download the template on this page to complete your assessment.
+            </p>
 
-          <p class="govuk-body-l">
-            Come back to this page to upload your finished assessment.
-          </p>
+            <p class="govuk-body-l">
+              Come back to this page to upload your finished assessment.
+            </p>
 
-          <div class="govuk-form-group">
-            <h2 class="govuk-heading-m">
-              Download self assessment template
-            </h2>
+            <div class="govuk-form-group">
+              <h2 class="govuk-heading-m">
+                Download self assessment template
+              </h2>
 
-            <DownloadLink
-              :file-name="assessment.exercise.template.file"
-              :exercise-id="assessment.exercise.id"
-              :title="assessment.exercise.template.title"
-            />
-          </div>
+              <DownloadLink
+                :file-name="assessment.exercise.template.file"
+                :exercise-id="assessment.exercise.id"
+                :title="assessment.exercise.template.title"
+              />
+            </div>
 
-          <FileUpload
-            id="independent-assessment-file"
-            ref="independent-assessment-file"
-            v-model="assessment.fileRef"
-            :name="fileName"
-            :path="uploadPath"
-            label="Please upload your assessment here"
-            required
-          />
+            <FileUpload
+              id="independent-assessment-file"
+              ref="independent-assessment-file"
+              v-model="assessment.fileRef"
+              :name="fileName"
+              :path="uploadPath"
+              label="Please upload your assessment here"
+              required
+            />
 
-          <button class="govuk-button">
-            Save and continue
-          </button>
+            <button class="govuk-button">
+              Save and continue
+            </button>
+          </div>
         </div>
       </div>
     </form>
   </div>
 </template>
 <script>
+import { isDateInFuture } from '@/helpers/date';
 import Form from '@/components/Form/Form';
 import ErrorSummary from '@/components/Form/ErrorSummary';
 import DownloadLink from '@/components/DownloadLink';
@@ -123,6 +128,17 @@ export default {
     assessorId() {
       return this.$store.getters['auth/currentUserId'];
     },
+    submissionPermitted() {
+      if(!this.assessment.hardLimit){
+        return true;
+      }
+
+      if(isDateInFuture(this.assessment.hardLimit)){
+        return true;
+      }
+
+      return false;
+    },
     uploadPath() {
       const exerciseId = this.assessment.exercise.id;
       const applicationId = this.assessment.application.id;
diff --git a/src/views/Assessments.vue b/src/views/Assessments.vue
index bad12a0..3938072 100644
--- a/src/views/Assessments.vue
+++ b/src/views/Assessments.vue
@@ -80,6 +80,13 @@
                 >
                   View Incomplete Assessment
                 </router-link>
+                <router-link
+                  v-else-if="canEdit(assessment) && !submissionPermitted(assessment)"
+                  class="govuk-button govuk-button--primary"
+                  :to="{ name: 'assessment-edit', params: { id: assessment.id }}"
+                >
+                  View Incomplete Assessment
+                </router-link>
                 <router-link
                   v-else
                   class="govuk-button govuk-button--secondary"
@@ -104,6 +111,7 @@
 </template>
 <script>
 import { mapState } from 'vuex';
+import { isDateInFuture } from '@/helpers/date';
 import TabsList from '@/components/Page/TabsList';
 import LoadingMessage from '@/components/LoadingMessage';
 export default {
@@ -158,6 +166,17 @@ export default {
     canEdit(assessment) {
       return assessment.status === 'pending';
     },
+    submissionPermitted(assessment) {
+      if(!assessment.hardLimit){
+        return false;
+      }
+
+      if(isDateInFuture(assessment.hardLimit)){
+        return true;
+      }
+
+      return false;
+    },
     redirectToErrorPage() {
       this.$router.replace({ name: 'assessments-not-found' });
     },

From a3228ef5dbca836dd2353450a89a1f3debc66cb4 Mon Sep 17 00:00:00 2001
From: Hugh Wells <hugh@crablab.co.uk>
Date: Thu, 30 Jul 2020 16:57:42 +0100
Subject: [PATCH 2/8] Fix some merge errors

---
 src/views/Assessment/Edit.vue |  1 +
 src/views/Assessments.vue     | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/Assessment/Edit.vue b/src/views/Assessment/Edit.vue
index 6725258..14f707e 100644
--- a/src/views/Assessment/Edit.vue
+++ b/src/views/Assessment/Edit.vue
@@ -96,6 +96,7 @@
 </template>
 <script>
 import { isDateInFuture } from '@/helpers/date';
+import BackLink from '@/components/BackLink';
 import Form from '@/components/Form/Form';
 import ErrorSummary from '@/components/Form/ErrorSummary';
 import DownloadLink from '@/components/DownloadLink';
diff --git a/src/views/Assessments.vue b/src/views/Assessments.vue
index 3938072..dbfb159 100644
--- a/src/views/Assessments.vue
+++ b/src/views/Assessments.vue
@@ -81,7 +81,7 @@
                   View Incomplete Assessment
                 </router-link>
                 <router-link
-                  v-else-if="canEdit(assessment) && !submissionPermitted(assessment)"
+                  v-else-if="!canEdit(assessment) && submissionPermitted(assessment)"
                   class="govuk-button govuk-button--primary"
                   :to="{ name: 'assessment-edit', params: { id: assessment.id }}"
                 >
@@ -144,6 +144,17 @@ export default {
         },
       ];
     },
+    submissionPermitted(assessment) {
+      if(!assessment.hardLimit){
+        return true;
+      }
+
+      if(isDateInFuture(assessment.hardLimit)){
+        return true;
+      }
+
+      return false;
+    },
   },
   created() {
     // Ideally we'd use allSettled but IE doesn't support this

From b0d6844ca9e8b4bc0fff2093ae8418c3af36de3b Mon Sep 17 00:00:00 2001
From: Hugh Wells <hugh@crablab.co.uk>
Date: Fri, 31 Jul 2020 11:03:08 +0100
Subject: [PATCH 3/8] Add Warning component from admin

---
 src/components/Warning.vue | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/components/Warning.vue

diff --git a/src/components/Warning.vue b/src/components/Warning.vue
new file mode 100644
index 0000000..258dae9
--- /dev/null
+++ b/src/components/Warning.vue
@@ -0,0 +1,22 @@
+<template>
+  <div class="govuk-warning-text">
+    <span
+      class="govuk-warning-text__icon"
+      aria-hidden="true"
+    >!</span>
+    <strong class="govuk-warning-text__text">
+      <span class="govuk-warning-text__assistive">Warning</span>
+      {{ message }}
+    </strong>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    message: {
+      type: String,
+      required: true,
+    },
+  },
+};
+</script>

From 4b37969a0514700195f03d6d261d0bb013311099 Mon Sep 17 00:00:00 2001
From: Hugh Wells <hugh@crablab.co.uk>
Date: Fri, 31 Jul 2020 11:24:37 +0100
Subject: [PATCH 4/8] Add logic to hide form and display warning when hard
 limit exceeded

---
 src/views/Assessment/Edit.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/Assessment/Edit.vue b/src/views/Assessment/Edit.vue
index 14f707e..09c711f 100644
--- a/src/views/Assessment/Edit.vue
+++ b/src/views/Assessment/Edit.vue
@@ -89,6 +89,10 @@
               Save and continue
             </button>
           </div>
+          <Warning 
+            v-else
+            :message="`This Independent Assessment has expired. The Selection Exercise Team can be contacted via ` + assessment.exercise.exerciseMailbox + ` or ` + assessment.exercise.exercisePhoneNumber + `.`"
+          />
         </div>
       </div>
     </form>
@@ -96,17 +100,18 @@
 </template>
 <script>
 import { isDateInFuture } from '@/helpers/date';
-import BackLink from '@/components/BackLink';
 import Form from '@/components/Form/Form';
 import ErrorSummary from '@/components/Form/ErrorSummary';
 import DownloadLink from '@/components/DownloadLink';
 import FileUpload from '@/components/Form/FileUpload';
+import Warning from '@/components/Warning';
 
 export default {
   components: {
     ErrorSummary,
     DownloadLink,
     FileUpload,
+    Warning,
   },
   extends: Form,
   data() {

From d95ce6353d01583234c0bb6aae931b7be0278307 Mon Sep 17 00:00:00 2001
From: Hugh Wells <hugh@crablab.co.uk>
Date: Fri, 31 Jul 2020 11:29:49 +0100
Subject: [PATCH 5/8] Add overdue callout

---
 src/views/Assessment/Edit.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/views/Assessment/Edit.vue b/src/views/Assessment/Edit.vue
index 09c711f..d6ad881 100644
--- a/src/views/Assessment/Edit.vue
+++ b/src/views/Assessment/Edit.vue
@@ -48,6 +48,12 @@
               </dt>
               <dd class="govuk-summary-list__value">
                 {{ assessment.dueDate | formatDate }}
+                <strong
+                  v-if="assessmentLate"
+                  class="govuk-tag govuk-tag--red"
+                >
+                  Overdue
+                </strong>
               </dd>
             </div>
           </dl>
@@ -134,6 +140,9 @@ export default {
     assessorId() {
       return this.$store.getters['auth/currentUserId'];
     },
+    assessmentLate(){
+      return !isDateInFuture(this.assessment.dueDate);
+    },
     submissionPermitted() {
       if(!this.assessment.hardLimit){
         return true;

From 3c8652c6581982c4615d4e56abc41237e85f574f Mon Sep 17 00:00:00 2001
From: Hugh Wells <hugh@crablab.co.uk>
Date: Fri, 31 Jul 2020 11:45:20 +0100
Subject: [PATCH 6/8] Add overdue to table when is past due date and still
 editable

---
 src/views/Assessments.vue | 40 ++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/views/Assessments.vue b/src/views/Assessments.vue
index dbfb159..6211b54 100644
--- a/src/views/Assessments.vue
+++ b/src/views/Assessments.vue
@@ -69,23 +69,37 @@
               <td class="govuk-table__cell">
                 {{ assessment.dueDate | formatDate }}
               </td>
-              <td class="govuk-table__cell">
+              <td 
+                v-if="!assessmentLate(assessment)"
+                class="govuk-table__cell"
+              >
                 {{ assessment.status | lookup }}
               </td>
+              <td 
+                v-if="assessmentLate(assessment)"
+                class="govuk-table__cell"
+              >
+                <strong
+                  class="govuk-tag govuk-tag--red"
+                >
+                  Overdue
+                </strong>
+              </td>
               <td class="govuk-table__cell">
                 <router-link
-                  v-if="canEdit(assessment)"
+                  v-if="canEdit(assessment) && submissionPermitted(assessment)"
                   class="govuk-button govuk-button--primary"
                   :to="{ name: 'assessment-edit', params: { id: assessment.id }}"
                 >
                   View Incomplete Assessment
                 </router-link>
                 <router-link
-                  v-else-if="!canEdit(assessment) && submissionPermitted(assessment)"
+                  v-else-if="canEdit(assessment) && !submissionPermitted(assessment)"
                   class="govuk-button govuk-button--primary"
-                  :to="{ name: 'assessment-edit', params: { id: assessment.id }}"
+                  :to="{ name: 'assessment-view', params: { id: assessment.id }}"
+                  disabled
                 >
-                  View Incomplete Assessment
+                  Assessment Expired
                 </router-link>
                 <router-link
                   v-else
@@ -144,17 +158,6 @@ export default {
         },
       ];
     },
-    submissionPermitted(assessment) {
-      if(!assessment.hardLimit){
-        return true;
-      }
-
-      if(isDateInFuture(assessment.hardLimit)){
-        return true;
-      }
-
-      return false;
-    },
   },
   created() {
     // Ideally we'd use allSettled but IE doesn't support this
@@ -179,7 +182,7 @@ export default {
     },
     submissionPermitted(assessment) {
       if(!assessment.hardLimit){
-        return false;
+        return true;
       }
 
       if(isDateInFuture(assessment.hardLimit)){
@@ -188,6 +191,9 @@ export default {
 
       return false;
     },
+    assessmentLate(assessment){
+      return !isDateInFuture(assessment.dueDate) && this.canEdit(assessment);
+    },
     redirectToErrorPage() {
       this.$router.replace({ name: 'assessments-not-found' });
     },

From 2ae4041dfdb5d60608500df2f71d338dd28115f7 Mon Sep 17 00:00:00 2001
From: Hugh Wells <hugh@crablab.co.uk>
Date: Tue, 4 Aug 2020 10:27:37 +0100
Subject: [PATCH 7/8] Remove overdue label and replace with Warning component

---
 src/views/Assessment/Edit.vue | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/views/Assessment/Edit.vue b/src/views/Assessment/Edit.vue
index d6ad881..c440099 100644
--- a/src/views/Assessment/Edit.vue
+++ b/src/views/Assessment/Edit.vue
@@ -48,16 +48,13 @@
               </dt>
               <dd class="govuk-summary-list__value">
                 {{ assessment.dueDate | formatDate }}
-                <strong
-                  v-if="assessmentLate"
-                  class="govuk-tag govuk-tag--red"
-                >
-                  Overdue
-                </strong>
               </dd>
             </div>
           </dl>
-
+          <Warning 
+            v-if="assessmentLate && submissionPermitted"
+            :message="`This Independent Assessment is past the due date. The Selection Exercise Team can be contacted via ` + assessment.exercise.exerciseMailbox + ` or ` + assessment.exercise.exercisePhoneNumber + `.`"
+          />
           <div
             v-if="submissionPermitted"
           >

From f8ca05d50ccb99c9a62f8edfda1700140f191285 Mon Sep 17 00:00:00 2001
From: Hugh Wells <hugh@crablab.co.uk>
Date: Tue, 4 Aug 2020 10:29:03 +0100
Subject: [PATCH 8/8] Remove overdue call out

---
 src/views/Assessments.vue | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/views/Assessments.vue b/src/views/Assessments.vue
index 6211b54..ab1d629 100644
--- a/src/views/Assessments.vue
+++ b/src/views/Assessments.vue
@@ -70,21 +70,10 @@
                 {{ assessment.dueDate | formatDate }}
               </td>
               <td 
-                v-if="!assessmentLate(assessment)"
                 class="govuk-table__cell"
               >
                 {{ assessment.status | lookup }}
               </td>
-              <td 
-                v-if="assessmentLate(assessment)"
-                class="govuk-table__cell"
-              >
-                <strong
-                  class="govuk-tag govuk-tag--red"
-                >
-                  Overdue
-                </strong>
-              </td>
               <td class="govuk-table__cell">
                 <router-link
                   v-if="canEdit(assessment) && submissionPermitted(assessment)"