doubtfire-lms · coskun-kilinc · Dec 15, 2022 · Dec 16, 2022 · Aug 29, 2023 · Aug 29, 2023
diff --git a/.ci-setup/texlive-install.sh b/.ci-setup/texlive-install.sh
@@ -28,7 +28,7 @@ if ! command -v "$TEX_COMPILER" > /dev/null; then
 
   echo "----------------------------------------"
   echo "Installing additional texlive packages:"
-  tlmgr install fontawesome luatextra luacode minted fvextra catchfile xstring framed lastpage pdfmanagement-testphase newpax tcolorbox environ pdfcol tikzfill markdown paralist csvsimple gobble
+  tlmgr install fontawesome luatextra luacode minted fvextra catchfile xstring framed lastpage pdfmanagement-testphase newpax tcolorbox environ pdfcol tikzfill markdown paralist csvsimple gobble upquote
 
   echo "----------------------------------------"
   echo "Ensuring the newpax package is sufficiently up to date:"

diff --git a/.gitignore b/.gitignore
@@ -25,7 +25,6 @@ rails_best_practices_output.html
 spec/reports
 
 config/initializers/pdfkit.rb
-config/ldap.yml
 student_work/
 student-work/
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [7.0.21](https://github.com/macite/doubtfire-deploy/compare/v7.0.20...v7.0.21) (2023-09-04)
+
+
+### Features
+
+* allow admin bind in ldap ([de66236](https://github.com/macite/doubtfire-deploy/commit/de662367d8cb3a291cc00424e25ccf1a6d6587ac))
+
+### [7.0.20](https://github.com/macite/doubtfire-deploy/compare/v7.0.19...v7.0.20) (2023-08-29)
+
+
+### Bug Fixes
+
+* add processing for raw cells in ipynb ([ebacf38](https://github.com/macite/doubtfire-deploy/commit/ebacf3867aa09dbfad1a9eaa88953cbb418644f8))
+* auto generate rake task ([3bd9107](https://github.com/macite/doubtfire-deploy/commit/3bd91079764ad153f299e2519e7ddbba9377fc8e))
+* ensure devise is setup for ldap auth ([2561a05](https://github.com/macite/doubtfire-deploy/commit/2561a05649b0a3b34420fc2104b0c0b6be1a2fca))
+
 ### [7.0.19](https://github.com/macite/doubtfire-deploy/compare/v7.0.18...v7.0.19) (2023-06-20)
 
 

diff --git a/app/api/api_root.rb b/app/api/api_root.rb
@@ -55,10 +55,8 @@ class ApiRoot < Grape::API
   mount BreaksApi
   mount DiscussionCommentApi
   mount ExtensionCommentsApi
-  mount FeedbackApi::StageApi
+  mount FeedbackApi::FeedbackGroupApi
   mount FeedbackApi::FeedbackCommentTemplateApi
-  mount FeedbackApi::CriterionApi
-  mount FeedbackApi::CriterionOptionApi
   mount GroupSetsApi
   mount LearningOutcomesApi
   mount LearningAlignmentApi
@@ -105,10 +103,8 @@ class ApiRoot < Grape::API
   AuthenticationHelpers.add_auth_to LearningAlignmentApi
   AuthenticationHelpers.add_auth_to ProjectsApi
   AuthenticationHelpers.add_auth_to StudentsApi
-  AuthenticationHelpers.add_auth_to FeedbackApi::StageApi
+  AuthenticationHelpers.add_auth_to FeedbackApi::FeedbackGroupApi
   AuthenticationHelpers.add_auth_to FeedbackApi::FeedbackCommentTemplateApi
-  AuthenticationHelpers.add_auth_to FeedbackApi::CriterionApi
-  AuthenticationHelpers.add_auth_to FeedbackApi::CriterionOptionApi
   AuthenticationHelpers.add_auth_to Submission::PortfolioApi
   AuthenticationHelpers.add_auth_to Submission::PortfolioEvidenceApi
   AuthenticationHelpers.add_auth_to Submission::BatchTaskApi

diff --git a/app/api/entities/feedback_entities/criterion_entity.rb b/app/api/entities/feedback_entities/criterion_entity.rb
diff --git a/app/api/entities/feedback_entities/criterion_option_entity.rb b/app/api/entities/feedback_entities/criterion_option_entity.rb
diff --git a/app/api/entities/feedback_entities/feedback_comment_entity.rb b/app/api/entities/feedback_entities/feedback_comment_entity.rb
diff --git a/app/api/entities/feedback_entities/feedback_comment_template_entity.rb b/app/api/entities/feedback_entities/feedback_comment_template_entity.rb
@@ -2,8 +2,13 @@ module Entities
   module FeedbackEntities
     class FeedbackCommentTemplateEntity < Grape::Entity
       expose :id
-      expose :comment_text_situation
-      expose :comment_text_next_action
+      expose :abbreviation
+      expose :order
+      expose :chip_text
+      expose :description
+      expose :comment_text
+      expose :summary_text
+      expose :task_status
     end
   end
 end
diff --git a/...ntities/feedback_entities/stage_entity.rb → ...eedback_entities/feedback_group_entity.rb b/...ntities/feedback_entities/stage_entity.rb → ...eedback_entities/feedback_group_entity.rb
diff --git a/app/api/entities/stage_entity.rb b/app/api/entities/stage_entity.rb
@@ -0,0 +1,7 @@
+module Entities
+  class StageEntity < Grape::Entity
+    expose :id
+    expose :title
+    expose :order
+  end
+end
diff --git a/app/api/feedback_api/criterion_api.rb b/app/api/feedback_api/criterion_api.rb
diff --git a/app/api/feedback_api/criterion_option_api.rb b/app/api/feedback_api/criterion_option_api.rb
diff --git a/app/api/feedback_api/feedback_comment_api.rb b/app/api/feedback_api/feedback_comment_api.rb
diff --git a/app/api/feedback_api/feedback_comment_template_api.rb b/app/api/feedback_api/feedback_comment_template_api.rb
@@ -4,46 +4,63 @@ module FeedbackApi
   class FeedbackCommentTemplateApi < Grape::API
     desc 'Feedback comment templates are used to provide a list of comments that can be used to provide feedback on a task. This endpoint allows you to create a new feedback comment template.'
     params do
-      requires :comment_text_situation, type: String, desc: 'What the comment is about. Could be what is wrong with or what is good about a student\'s submission.'
-      requires :comment_text_next_action, type: String, desc: 'What the student should do next to improve their submission'
-      optional :criterion_option_id, type: Integer, desc: 'The criterion option to which the comment template is associated'
+      requires :abbreviation,       type: String,   desc: 'A short abbreviation for the feedback comment template'
+      requires :order,              type: Integer,  desc: 'The order in which to display the comment templates'
+      requires :chip_text,          type: String,   desc: 'A short text displayed on the feedback UI'
+      requires :description,        type: String,   desc: 'A detailed description of the feedback comment template'
+      requires :comment_text,       type: String,   desc: 'The actual feedback comment text'
+      requires :summary_text,       type: String,   desc: 'A short summary of the feedback comment'
+      optional :task_status_id,     type: Integer,  desc: 'The task status associated with this feedback comment template'
+      requires :feedback_group_id,  type: Integer,  desc: 'The feedback group to which the comment template belongs'
     end
     post '/feedback_comment_templates' do # pathname of URL
-      criterion_option = CriterionOption.find(params[:criterion_option_id])
+      feedback_group = FeedbackGroup.find(params[:feedback_group_id])
 
-      unless authorise? current_user, criterion_option.unit, :update
+      unless authorise? current_user, feedback_group.unit, :update
         error!({ error: 'Not authorised to create a feedback comment template for this unit' }, 403)
       end
 
       feedback_comment_template_parameters = ActionController::Parameters.new(params)
-                                                                         .permit(:comment_text_situation, :comment_text_next_action)
-
-      feedback_comment_template_parameters[:criterion_option] = criterion_option
+                                                                         .permit(:abbreviation, :order, :chip_text, :description, :comment_text, :summary_text, :task_status_id)
+      feedback_comment_template_parameters[:feedback_group] = feedback_group
+
+      # If the task_status_id is provided, find the task status and add it to
+      # the feedback_comment_template_parameters
+      if params[:task_status_id]
+        task_status = TaskStatus.find(params[:task_status_id])
+        feedback_comment_template_parameters[:task_status] = task_status
+      end
 
       result = FeedbackCommentTemplate.create!(feedback_comment_template_parameters)
 
       present result, with: Entities::FeedbackEntities::FeedbackCommentTemplateEntity
       # presents JSON format of the newly posted FeedbackCommentTemplate object from the FeedbackCommentTemplateEntity
     end
 
-    desc 'This endpoint allows you to get all the feedback comment templates for a given criterion_option.'
+    desc 'This endpoint allows you to get all the feedback comment templates for a given feedback_group.'
     params do
-      requires :criterion_option_id, type: Integer, desc: 'The criterion option to which the comment template belongs'
+      requires :feedback_group_id, type: Integer, desc: 'The feedback group to which the comment template belongs'
     end
+
     get '/feedback_comment_templates' do
-      criterion_option = CriterionOption.find(params[:criterion_option_id])
+      feedback_group = FeedbackGroup.find(params[:feedback_group_id])
 
-      unless authorise? current_user, criterion_option.unit, :read
+      unless authorise? current_user, feedback_group.unit, :read
         error!({ error: 'Not authorised to read feedback comment templates for this unit' }, 403)
       end
 
       present stage.feedback_comment_templates, with: Entities::FeedbackEntities::FeedbackCommentTemplateEntity
     end
 
-    desc 'This endpoint allows you to update the comment text situation or comment text next action for a feedback comment template.'
+    desc 'This endpoint allows you to update a feedback comment template.'
     params do
-      optional :comment_text_situation, type: String, desc: 'The new comment text situation for the feedback comment template'
-      optional :comment_text_next_action, type: String, desc: 'The new comment text next action for the feedback comment template'
+      optional :abbreviation,     type: String,   desc: 'The new abbreviation for the feedback comment template'
+      optional :order,            type: Integer,  desc: 'The new order value for the comment template'
+      optional :chip_text,        type: String,   desc: 'The new chip text for the feedback comment template'
+      optional :description,      type: String,   desc: 'The new description for the feedback comment template'
+      optional :comment_text,     type: String,   desc: 'The new comment text for the feedback comment template'
+      optional :summary_text,     type: String,   desc: 'The new summary text for the feedback comment template'
+      optional :task_status_id,   type: Integer,  desc: 'The new task status associated with this feedback comment template'
     end
     put '/feedback_comment_templates/:id' do
       feedback_comment_template = FeedbackCommentTemplate.find(params[:id])
@@ -53,7 +70,12 @@ class FeedbackCommentTemplateApi < Grape::API
       end
 
       feedback_comment_template_parameters = ActionController::Parameters.new(params)
-                                                                         .permit(:comment_text_situation, :comment_text_next_action)
+                                                                         .permit(:abbreviation, :order, :chip_text, :description, :comment_text, :summary_text, :task_status_id)
+
+      if params[:task_status_id]
+        task_status = TaskStatus.find(params[:task_status_id])
+        feedback_comment_template_parameters[:task_status] = task_status
+      end
 
       feedback_comment_template.update!(feedback_comment_template_parameters)
 
@@ -64,7 +86,7 @@ class FeedbackCommentTemplateApi < Grape::API
     delete '/feedback_comment_templates/:id' do
       feedback_comment_template = FeedbackCommentTemplate.find(params[:id])
 
-      unless authorise? current_user, feedback_comment_template.unit, :update
+      unless authorise? current_user, feedback_comment_template.feedback_group.unit, :update
         error!({ error: 'Not authorised to delete feedback comment templates for this unit' }, 403)
       end