feat: add spec con days and flexible unit dates

Author: macite

app/api/entities/project_entity.rb

@@ -10,6 +10,8 @@ class ProjectEntity < Grape::Entity
     expose :enrolled, unless: :for_student
     expose :target_grade
 
+    expose :spec_con_days
+
     expose :submitted_grade, unless: :summary_only
     expose :portfolio_files, unless: :summary_only
     expose :compile_portfolio, unless: :summary_only

app/api/entities/unit_entity.rb

@@ -47,6 +47,7 @@ def can_read_unit_config?(my_role)
     expose :allow_student_extension_requests, unless: :summary_only
     expose :extension_weeks_on_resubmit_request, unless: :summary_only, if: lambda { |unit, options| is_staff?(options[:my_role]) }
     expose :allow_student_change_tutorial, unless: :summary_only
+    expose :allow_flexible_dates, unless: :summary_only
 
     expose :learning_outcomes, using: LearningOutcomeEntity, as: :ilos, unless: :summary_only
     expose :tutorial_streams, using: TutorialStreamEntity, unless: :summary_only

app/api/extension_comments_api.rb

@@ -19,6 +19,10 @@ class ExtensionCommentsApi < Grape::API
       error!({ error: 'Not authorised to request an extension for this task' }, 403)
     end
 
+    if project.unit.allow_flexible_dates
+      error!({ error: 'Extensions are disabled for this unit.' }, 403)
+    end
+
     error!({ error: 'Extension weeks can not be 0.' }, 403) if params[:weeks_requested] == 0
 
     max_duration = task.weeks_can_extend

app/api/projects_api.rb

@@ -34,6 +34,23 @@ class ProjectsApi < Grape::API
     end
   end
 
+  desc 'Adjust special consideration days'
+  params do
+    requires :id, type: Integer, desc: 'The id of the project to adjust'
+    requires :spec_con_days, type: Integer, desc: 'The number of special consideration days to add or remove'
+  end
+  put '/projects/:id/spec_con' do
+    project = Project.find(params[:id])
+    # Can access project and grant spec con
+    unless authorise?(current_user, project, :get) && authorise?(current_user, project.unit, :grant_spec_con)
+      error!({ error: 'You are not authorised to perform this action' }, 403)
+    end
+
+    project.update!(spec_con_days: params['spec_con_days'])
+
+    present project, with: Entities::ProjectEntity, for_staff: true, summary_only: true, user: current_user, only: [:spec_con_days]
+  end
+
   desc 'Update a project'
   params do
     optional :trigger,            type: String,  desc: 'The update trigger'

app/api/tasks_api.rb

@@ -109,6 +109,44 @@ class TasksApi < Grape::API
     present true, Grape::Presenters::Presenter
   end
 
+  desc 'Update the planned date for a task - when date flexibility is allowed'
+  params do
+    requires :id, type: Integer, desc: 'The project id to locate'
+    requires :task_definition_id, type: Integer, desc: 'The id of the task definition of the task to update in this project'
+    requires :extensions, type: Integer, desc: 'The number of weeks to adjust the original planned date by'
+  end
+  put '/projects/:id/task_def_id/:task_definition_id/plan' do
+    project = Project.find(params[:id])
+    task_definition = project.unit.task_definitions.find(params[:task_definition_id])
+
+    # check the user can put this task
+    if authorise? current_user, project, :make_submission
+      # Check unit allows planned date changes
+      unless project.unit.allow_flexible_dates
+        error!({ error: 'This unit does not allow you to adjust due dates.' }, 403)
+      end
+
+      task = project.task_for_task_definition(task_definition)
+
+      # update the planned date
+      task.extensions = params[:extensions]
+      task.save
+
+      TaskComment.create(
+        task: task,
+        user: current_user,
+        comment: "Planned date adjusted to #{task.due_date.strftime('%d %b')}.",
+        content_type: :plan,
+        recipient: project.student,
+        extension_weeks: params[:extensions]
+      )
+
+      present task, with: Entities::TaskEntity, include_other_projects: true, update_only: true
+    else
+      error!({ error: "You are not permitted to adjust the plan." }, 403)
+    end
+  end
+
   desc 'Update a task using its related project and task definition'
   params do
     # requires :id, type: Integer, desc: 'The project id to locate'

app/api/units_api.rb

@@ -81,6 +81,7 @@ class UnitsApi < Grape::API
       optional :enable_sync_enrolments, type: Boolean, desc: 'Sync student enrolments automatically if supported by deployment'
       optional :draft_task_definition_id, type: Integer, desc: 'Indicates the ID of the task definition used as the "draft learning summary task"'
       optional :portfolio_auto_generation_date, type: Date, desc: 'Indicates a date where student portfolio will automatically compile'
+      optional :allow_flexible_dates, type: Boolean, desc: 'Can turn on/off flexible dates for tasks in this unit'
       optional :allow_student_extension_requests, type: Boolean, desc: 'Can turn on/off student extension requests'
       optional :allow_student_change_tutorial, type: Boolean, desc: 'Can turn on/off student ability to change tutorials'
       optional :extension_weeks_on_resubmit_request, type: Integer, desc: 'Determines the number of weeks extension on a resubmit request'
@@ -112,6 +113,7 @@ class UnitsApi < Grape::API
                                                           :enable_sync_enrolments,
                                                           :draft_task_definition_id,
                                                           :portfolio_auto_generation_date,
+                                                          :allow_flexible_dates,
                                                           :allow_student_extension_requests,
                                                           :extension_weeks_on_resubmit_request,
                                                           :allow_student_change_tutorial,
@@ -155,6 +157,7 @@ class UnitsApi < Grape::API
       optional :send_notifications, type: Boolean, desc: 'Indicates if emails should be sent on updates each week', default: true
       optional :enable_sync_timetable, type: Boolean, desc: 'Sync to timetable automatically if supported by deployment', default: true
       optional :enable_sync_enrolments, type: Boolean, desc: 'Sync student enrolments automatically if supported by deployment', default: true
+      optional :allow_flexible_dates, type: Boolean, desc: 'Can turn on/off flexible dates for tasks in this unit', default: true
       optional :allow_student_extension_requests, type: Boolean, desc: 'Can turn on/off student extension requests', default: true
       optional :extension_weeks_on_resubmit_request, type: Integer, desc: 'Determines the number of weeks extension on a resubmit request', default: 1
       optional :portfolio_auto_generation_date, type: Date, desc: 'Indicates a date where student portfolio will automatically compile'
@@ -183,6 +186,7 @@ class UnitsApi < Grape::API
                                                     :send_notifications,
                                                     :enable_sync_timetable,
                                                     :enable_sync_enrolments,
+                                                    :allow_flexible_dates,
                                                     :allow_student_extension_requests,
                                                     :extension_weeks_on_resubmit_request,
                                                     :portfolio_auto_generation_date,

app/models/project.rb

@@ -33,6 +33,7 @@ class Project < ApplicationRecord
   before_destroy :can_destroy?
 
   validates :grade_rationale, length: { maximum: 4095, allow_blank: true }
+  validates :spec_con_days, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 }, if: :spec_con_days_changed?
 
   validate :tutorial_enrolment_same_campus, if: :will_save_change_to_enrolled?
 
@@ -64,7 +65,7 @@ def self.permissions
     # What can admins do with projects?
     admin_role_permissions = [
       :get,
-      :get_submission
+      :get_submission,
     ]
     # What can auditors do with projects?
     auditor_role_permissions = [

app/models/task.rb

@@ -157,7 +157,7 @@ def for_definition_with_quality?
   end
 
   def has_requested_extension?
-    extensions > 0 && will_save_change_to_extensions? && extensions > extensions_in_database
+    extensions != 0 && will_save_change_to_extensions? && extensions != extensions_in_database
   end
 
   def must_have_quality_pts
@@ -169,7 +169,7 @@ def must_have_quality_pts
   # Ensure that extensions do not exceed the defined due date
   def extensions_must_end_with_due_date
     # First check the raw extension date - but allow it to be up to a week later in case due date and target date are on different days
-    if raw_extension_date.to_date - 7.days >= task_definition.due_date.to_date
+    if raw_extension_date - 7.days >= max_date_with_spec_con_days
       errors.add(:extensions, "have exceeded deadline for task. Work must be submitted within current timeframe. Work submitted after current due date will be assessed in the portfolio")
     end
   end
@@ -259,21 +259,26 @@ def processing_pdf?
 
   # Get the raw extension date - with extensions representing weeks
   def raw_extension_date
-    target_date + extensions.weeks
+    target_date.to_date + extensions.weeks
+  end
+
+  def max_date_with_spec_con_days
+    task_definition.due_date.to_date + project.spec_con_days.days
   end
 
   # Get the adjusted extension date, which ensures it is never past the due date
   def extension_date
     result = raw_extension_date
-    return task_definition.due_date if result > task_definition.due_date
+    max_date = max_date_with_spec_con_days
+    return max_date if result > max_date
 
     return result
   end
 
   # The student can apply for an extension if the current extension date is
   # before the task's due date
   def can_apply_for_extension?
-    raw_extension_date.to_date < task_definition.due_date.to_date
+    raw_extension_date < max_date_with_spec_con_days
   end
 
   def tutor
@@ -308,15 +313,18 @@ def apply_for_extension(user, text, weeks)
   end
 
   def weeks_can_extend
-    deadline = task_definition.due_date.to_date
-    current_due = raw_extension_date.to_date
+    deadline = max_date_with_spec_con_days
+    current_due = raw_extension_date
 
     diff = deadline - current_due
     (diff.to_f / 7).ceil
   end
 
   # Add an extension to the task
   def grant_extension(by_user, weeks)
+    # Only used when extensions are allowed - not if the student manages the dates
+    return if unit.allow_flexible_dates
+
     weeks_to_extend = [weeks, weeks_can_extend].min
     return false unless weeks_to_extend > 0
 
@@ -643,7 +651,9 @@ def engage(engagement_status)
   def submitted_before_due?
     return true if due_date.blank?
 
-    to_same_day_anywhere_on_earth(due_date) >= self.submission_date
+    # When using flexible dates, we need to check against the deadline
+    check_date = unit.allow_flexible_dates ? max_date_with_spec_con_days : due_date
+    to_same_day_anywhere_on_earth(check_date) >= self.submission_date
   end
 
   #

app/models/unit.rb

@@ -44,6 +44,7 @@ def self.permissions
       :download_unit_csv,
       :update,
       :employ_staff,
+      :grant_spec_con,
       :add_tutorial,
       :add_task_def,
       :provide_feedback,
@@ -76,7 +77,8 @@ def self.permissions
       :exceed_capacity,
       :get_los,
       :create_feedback_chips,
-      :get_feedback_chips
+      :get_feedback_chips,
+      :grant_spec_con
     ]
 
     # What can auditors do with units?
@@ -450,12 +452,14 @@ def student_query(enrolled)
           'projects.compile_portfolio',
           'projects.grade',
           'projects.grade_rationale',
+          'projects.spec_con_days',
         )
         .select(
           'projects.id AS project_id',
           'projects.enrolled AS enrolled',
           'projects.task_stats AS task_stats',
           'projects.campus_id AS campus_id',
+          'projects.spec_con_days AS spec_con_days',
           'users.first_name AS first_name',
           'users.last_name AS last_name',
           'users.nickname AS nickname',

db/migrate/20250607232750_add_spec_con.rb

@@ -0,0 +1,7 @@
+class AddSpecCon < ActiveRecord::Migration[8.0]
+  def change
+    add_column :projects, :spec_con_days, :integer, default: 0, null: false
+    add_column :units, :allow_flexible_dates, :boolean, default: false, null: false
+    add_column :units, :portfolio_due_date, :datetime
+  end
+end