Merge pull request #96 from jac-uk/69/enforce-hard-limit

add hard limit to assessment
jac-uk · Nov 3, 2020 · 4cfaced · 4cfaced
2 parents 37f540b + 5478548
commit 4cfaced
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/views/Assessment/Edit.vue b/src/views/Assessment/Edit.vue
@@ -50,6 +50,16 @@
                 {{ assessment.dueDate | formatDate }}
               </dd>
             </div>
+            <div 
+            v-if="assessment.hardLimitDate && pastDueDate"
+            class="govuk-summary-list__row">
+              <dt class="govuk-summary-list__key">
+                <b> Cut off date </b> 
+              </dt>
+              <dd class="govuk-summary-list__value">
+                {{ assessment.hardLimitDate | formatDate }}
+              </dd>
+            </div>
             <div 
               v-if="assessment.updatedDate"
               class="govuk-summary-list__row"
@@ -66,6 +76,7 @@
             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"
           >
@@ -156,16 +167,19 @@ export default {
       return !isDateInFuture(this.assessment.dueDate);
     },
     submissionPermitted() {
-      if(!this.assessment.hardLimit){
+      if(!this.assessment.hardLimitDate){
         return true;
       }
 
-      if(isDateInFuture(this.assessment.hardLimit)){
+      if(isDateInFuture(this.assessment.hardLimitDate)){
         return true;
       }
 
       return false;
     },
+    pastDueDate() {
+      return !isDateInFuture(this.assessment.dueDate);
+    },
     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
@@ -170,11 +170,11 @@ export default {
       return assessment.status === 'pending';
     },
     submissionPermitted(assessment) {
-      if(!assessment.hardLimit){
+      if(!assessment.hardLimitDate){
         return true;
       }
 
-      if(isDateInFuture(assessment.hardLimit)){
+      if(isDateInFuture(assessment.hardLimitDate)){
         return true;
       }