From a8b95413b813e20d939b06cf2a4438e50e87733f Mon Sep 17 00:00:00 2001 From: ublefo <90136978+ublefo@users.noreply.github.com> Date: Sun, 24 Mar 2024 21:41:45 +1100 Subject: [PATCH 1/5] refactor: remove unused task-outcomes-card component --- src/app/doubtfire-angularjs.module.ts | 2 - .../directives/directives.coffee | 3 -- .../task-outcomes-card.coffee | 17 -------- .../task-outcomes-card.scss | 16 ------- .../task-outcomes-card.tpl.html | 43 ------------------- .../task-dashboard/task-dashboard.coffee | 4 +- 6 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/directives.coffee delete mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.coffee delete mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.scss delete mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.tpl.html diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts index e84dd192a..5fd5f91d7 100644 --- a/src/app/doubtfire-angularjs.module.ts +++ b/src/app/doubtfire-angularjs.module.ts @@ -75,8 +75,6 @@ import 'build/src/app/projects/states/states.js'; import 'build/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.js'; import 'build/src/app/projects/states/dashboard/directives/student-task-list/student-task-list.js'; import 'build/src/app/projects/states/dashboard/directives/directives.js'; -import 'build/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.js'; -import 'build/src/app/projects/states/dashboard/directives/task-dashboard/directives/directives.js'; import 'build/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.js'; import 'build/src/app/projects/states/dashboard/dashboard.js'; import 'build/src/app/projects/states/outcomes/outcomes.js'; diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/directives.coffee b/src/app/projects/states/dashboard/directives/task-dashboard/directives/directives.coffee deleted file mode 100644 index 12196bbd4..000000000 --- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/directives.coffee +++ /dev/null @@ -1,3 +0,0 @@ -angular.module('doubtfire.projects.states.dashboard.directives.task-dashboard.directives', [ - 'doubtfire.projects.states.dashboard.directives.task-dashboard.directives.task-outcomes-card' -]) diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.coffee b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.coffee deleted file mode 100644 index b264c2f01..000000000 --- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.coffee +++ /dev/null @@ -1,17 +0,0 @@ -angular.module('doubtfire.projects.states.dashboard.directives.task-dashboard.directives.task-outcomes-card', []) -# -# Describes more about ILO linkages between a task -# -.directive('taskOutcomesCard', -> - restrict: 'E' - templateUrl: 'projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.tpl.html' - scope: - taskDef: '=' - unit: '=' - controller: ($scope, $filter, listenerService, outcomeService) -> - return unless $scope.unit? - listeners = listenerService.listenTo($scope) - listeners.push $scope.$watch('taskDef.id', -> - $scope.alignments = $scope.unit.staffAlignmentsForTaskDefinition($scope.taskDef) - ) -) diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.scss b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.scss deleted file mode 100644 index 9de570c17..000000000 --- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.scss +++ /dev/null @@ -1,16 +0,0 @@ -task-outcomes-card .card .list-group { - @media (min-width: $screen-md) { - heading { - display: flex; - } - .task-ilo-alignment-rater { - align-self: center; - margin-left: auto; - } - } - @media (max-width: $screen-md) { - .task-ilo-alignment-rater { - margin: 1em; - } - } -} diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.tpl.html deleted file mode 100644 index 54b66ae11..000000000 --- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.tpl.html +++ /dev/null @@ -1,43 +0,0 @@ -
-
-

Intended Learning Outcomes

-
- Teaching staff believe that completing this task will help you achieve - the outcomes listed below. -
-
-
- -
-
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee index db9be96bc..62292ad91 100644 --- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee +++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee @@ -1,6 +1,4 @@ -angular.module('doubtfire.projects.states.dashboard.directives.task-dashboard', [ - 'doubtfire.projects.states.dashboard.directives.task-dashboard.directives' -]) +angular.module('doubtfire.projects.states.dashboard.directives.task-dashboard', []) # # Dashboard of task-related info # From bafccd003cf7b6715ca8a270570f1073478acd87 Mon Sep 17 00:00:00 2001 From: ublefo <90136978+ublefo@users.noreply.github.com> Date: Sun, 24 Mar 2024 21:11:17 +1100 Subject: [PATCH 2/5] refactor: remove unused task-status-selector module --- src/app/doubtfire-angularjs.module.ts | 1 - .../task-status-selector.coffee | 26 ------------------- .../task-status-selector.scss | 11 -------- .../task-status-selector.tpl.html | 26 ------------------- src/app/tasks/tasks.coffee | 1 - 5 files changed, 65 deletions(-) delete mode 100644 src/app/tasks/task-status-selector/task-status-selector.coffee delete mode 100644 src/app/tasks/task-status-selector/task-status-selector.scss delete mode 100644 src/app/tasks/task-status-selector/task-status-selector.tpl.html diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts index 5fd5f91d7..34b84e162 100644 --- a/src/app/doubtfire-angularjs.module.ts +++ b/src/app/doubtfire-angularjs.module.ts @@ -42,7 +42,6 @@ import 'build/src/app/visualisations/alignment-bullet-chart.js'; import 'build/src/app/visualisations/achievement-custom-bar-chart.js'; import 'build/src/app/visualisations/alignment-bar-chart.js'; import 'build/src/app/visualisations/achievement-box-plot.js'; -import 'build/src/app/tasks/task-status-selector/task-status-selector.js'; import 'build/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.js'; import 'build/src/app/tasks/modals/grade-task-modal/grade-task-modal.js'; import 'build/src/app/tasks/modals/modals.js'; diff --git a/src/app/tasks/task-status-selector/task-status-selector.coffee b/src/app/tasks/task-status-selector/task-status-selector.coffee deleted file mode 100644 index 0096855f6..000000000 --- a/src/app/tasks/task-status-selector/task-status-selector.coffee +++ /dev/null @@ -1,26 +0,0 @@ -angular.module('doubtfire.tasks.task-status-selector',[]) - -.directive('taskStatusSelector', -> - replace: true - restrict: 'E' - templateUrl: 'tasks/task-status-selector/task-status-selector.tpl.html' - scope: - task: "=task" - assessingUnitRole: "=assessingUnitRole" - inMenu: "=inMenu" - triggerTransition: "=triggerTransition" - controller: ($scope, newTaskService) -> - $scope.newTaskService = newTaskService - - # - # Statuses tutors/students may change task to - # - $scope.studentStatuses = newTaskService.switchableStates.student - $scope.tutorStatuses = newTaskService.switchableStates.tutor - $scope.taskEngagementConfig = - studentTriggers: $scope.studentStatuses.map newTaskService.statusData - tutorTriggers: $scope.tutorStatuses.map newTaskService.statusData - - $scope.futureStates = () -> - _.reject $scope.studentStatuses.map(newTaskService.statusData), (s) -> s.status in newTaskService.rejectFutureStates.get($scope.task.status) -) diff --git a/src/app/tasks/task-status-selector/task-status-selector.scss b/src/app/tasks/task-status-selector/task-status-selector.scss deleted file mode 100644 index a645dfe38..000000000 --- a/src/app/tasks/task-status-selector/task-status-selector.scss +++ /dev/null @@ -1,11 +0,0 @@ -.task-status-selector { - // Constrict width when in dropdown menu - list-style:none; - &.dropdown-menu { - width: 500px; - } - padding: 7px; - li { - border: 7px solid white; - } -} diff --git a/src/app/tasks/task-status-selector/task-status-selector.tpl.html b/src/app/tasks/task-status-selector/task-status-selector.tpl.html deleted file mode 100644 index 85ce1daca..000000000 --- a/src/app/tasks/task-status-selector/task-status-selector.tpl.html +++ /dev/null @@ -1,26 +0,0 @@ - diff --git a/src/app/tasks/tasks.coffee b/src/app/tasks/tasks.coffee index 9b289aab3..c4da63481 100644 --- a/src/app/tasks/tasks.coffee +++ b/src/app/tasks/tasks.coffee @@ -3,5 +3,4 @@ angular.module('doubtfire.tasks', [ 'doubtfire.tasks.task-ilo-alignment' 'doubtfire.tasks.project-tasks-list' 'doubtfire.tasks.task-definition-selector' - 'doubtfire.tasks.task-status-selector' ]) From 15db60275bc38b25ab4d826d36848d2c3fbe8b2d Mon Sep 17 00:00:00 2001 From: ublefo <90136978+ublefo@users.noreply.github.com> Date: Sun, 24 Mar 2024 21:33:53 +1100 Subject: [PATCH 3/5] refactor: remove unused tutor-group-manager component --- src/app/doubtfire-angularjs.module.ts | 1 - src/app/groups/groups.coffee | 1 - .../tutor-group-manager/tutor-group-manager.coffee | 11 ----------- .../tutor-group-manager/tutor-group-manager.tpl.html | 8 -------- 4 files changed, 21 deletions(-) delete mode 100644 src/app/groups/tutor-group-manager/tutor-group-manager.coffee delete mode 100644 src/app/groups/tutor-group-manager/tutor-group-manager.tpl.html diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts index 34b84e162..9a11a80ef 100644 --- a/src/app/doubtfire-angularjs.module.ts +++ b/src/app/doubtfire-angularjs.module.ts @@ -99,7 +99,6 @@ import 'build/src/app/groups/groups.js'; import 'build/src/app/groups/group-member-contribution-assigner/group-member-contribution-assigner.js'; import 'build/src/app/groups/group-member-list/group-member-list.js'; import 'build/src/app/groups/group-set-selector/group-set-selector.js'; -import 'build/src/app/groups/tutor-group-manager/tutor-group-manager.js'; import 'build/src/app/units/modals/unit-student-enrolment-modal/unit-student-enrolment-modal.js'; import 'build/src/app/units/modals/unit-ilo-edit-modal/unit-ilo-edit-modal.js'; import 'build/src/app/units/modals/modals.js'; diff --git a/src/app/groups/groups.coffee b/src/app/groups/groups.coffee index 56269f957..031080f0b 100644 --- a/src/app/groups/groups.coffee +++ b/src/app/groups/groups.coffee @@ -4,5 +4,4 @@ angular.module('doubtfire.groups', [ 'doubtfire.groups.group-selector' 'doubtfire.groups.group-set-manager' 'doubtfire.groups.group-set-selector' - 'doubtfire.groups.tutor-group-manager' ]) diff --git a/src/app/groups/tutor-group-manager/tutor-group-manager.coffee b/src/app/groups/tutor-group-manager/tutor-group-manager.coffee deleted file mode 100644 index a0dff1061..000000000 --- a/src/app/groups/tutor-group-manager/tutor-group-manager.coffee +++ /dev/null @@ -1,11 +0,0 @@ -angular.module('doubtfire.groups.tutor-group-manager', []) - -# -# Context for tutors to see and manage groups -# -.directive('tutorGroupManager', -> - restrict: 'E' - templateUrl: 'groups/tutor-group-manager/tutor-group-manager.tpl.html' - - controller: ($scope) -> -) diff --git a/src/app/groups/tutor-group-manager/tutor-group-manager.tpl.html b/src/app/groups/tutor-group-manager/tutor-group-manager.tpl.html deleted file mode 100644 index 91d3ca6b4..000000000 --- a/src/app/groups/tutor-group-manager/tutor-group-manager.tpl.html +++ /dev/null @@ -1,8 +0,0 @@ - -
- -
-
-
- -
From 6cafd671b8d07b82523dc41246ce2be2303c987a Mon Sep 17 00:00:00 2001 From: ublefo <90136978+ublefo@users.noreply.github.com> Date: Sun, 24 Mar 2024 21:28:51 +1100 Subject: [PATCH 4/5] refactor: remove unused progress-modal module --- src/app/common/modals/modals.coffee | 1 - .../progress-modal/progress-modal.coffee | 40 ------------------- .../progress-modal/progress-modal.tpl.html | 23 ----------- src/app/doubtfire-angularjs.module.ts | 1 - 4 files changed, 65 deletions(-) delete mode 100644 src/app/common/modals/progress-modal/progress-modal.coffee delete mode 100644 src/app/common/modals/progress-modal/progress-modal.tpl.html diff --git a/src/app/common/modals/modals.coffee b/src/app/common/modals/modals.coffee index 6c40a882d..16d2be1ec 100644 --- a/src/app/common/modals/modals.coffee +++ b/src/app/common/modals/modals.coffee @@ -1,6 +1,5 @@ angular.module("doubtfire.common.modals", [ 'doubtfire.common.modals.csv-result-modal' - 'doubtfire.common.modals.progress-modal' 'doubtfire.common.modals.confirmation-modal' 'doubtfire.common.modals.comments-modal' ]) diff --git a/src/app/common/modals/progress-modal/progress-modal.coffee b/src/app/common/modals/progress-modal/progress-modal.coffee deleted file mode 100644 index feaed3187..000000000 --- a/src/app/common/modals/progress-modal/progress-modal.coffee +++ /dev/null @@ -1,40 +0,0 @@ -angular.module("doubtfire.common.modals.progress-modal", []) - -# -# Services for making new modals -# -.factory("ProgressModal", ($modal, $rootScope) -> - ProgressModal = {} - - # - # Show a progress modal for long running tasks. - # - # Provide an angular resource $promise and the - # modal will automatically close itself when the XHR - # request is complete - # - ProgressModal.show = (title, message, promise) -> - modalInstance = $modal.open - templateUrl: 'common/modals/progress-modal/progress-modal.tpl.html' - controller: 'ProgressModalCtrl' - resolve: - title: -> title - message: -> message - # If a promise was provided, then when the finally block is reached - # close the modal instance created - promise?.finally -> - modalInstance.close() - - ProgressModal -) - -# -# Controller for progress modal -# -.controller('ProgressModalCtrl', ($scope, $modalInstance, title, message) -> - $scope.title = title - $scope.message = message - - $scope.close = -> - $modalInstance.dismiss() -) diff --git a/src/app/common/modals/progress-modal/progress-modal.tpl.html b/src/app/common/modals/progress-modal/progress-modal.tpl.html deleted file mode 100644 index 7e49fc64b..000000000 --- a/src/app/common/modals/progress-modal/progress-modal.tpl.html +++ /dev/null @@ -1,23 +0,0 @@ -
-
-

- -
{{title}}
- {{message}} -

-
-
-
- -

Processing...

-
-
-
-

- You can close this modal and you will be alerted when processing has finished -

- -
-
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts index 9a11a80ef..54e7f42e0 100644 --- a/src/app/doubtfire-angularjs.module.ts +++ b/src/app/doubtfire-angularjs.module.ts @@ -132,7 +132,6 @@ import 'build/src/app/common/alert-list/alert-list.js'; import 'build/src/app/common/modals/confirmation-modal/confirmation-modal.js'; import 'build/src/app/common/modals/comments-modal/comments-modal.js'; import 'build/src/app/common/modals/csv-result-modal/csv-result-modal.js'; -import 'build/src/app/common/modals/progress-modal/progress-modal.js'; import 'build/src/app/common/modals/modals.js'; import 'build/src/app/common/grade-icon/grade-icon.js'; import 'build/src/app/common/file-uploader/file-uploader.js'; From c9fa0f2014e72e6dec9ec8cfa93372fc0f3a90ba Mon Sep 17 00:00:00 2001 From: ublefo <90136978+ublefo@users.noreply.github.com> Date: Sun, 24 Mar 2024 21:16:06 +1100 Subject: [PATCH 5/5] refactor: remove unused task-definition-selector component --- src/app/doubtfire-angularjs.module.ts | 1 - .../task-definition-selector.coffee | 36 ------------------- .../task-definition-selector.scss | 6 ---- .../task-definition-selector.tpl.html | 31 ---------------- src/app/tasks/tasks.coffee | 1 - 5 files changed, 75 deletions(-) delete mode 100644 src/app/tasks/task-definition-selector/task-definition-selector.coffee delete mode 100644 src/app/tasks/task-definition-selector/task-definition-selector.scss delete mode 100644 src/app/tasks/task-definition-selector/task-definition-selector.tpl.html diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts index 54e7f42e0..c2eb65a1b 100644 --- a/src/app/doubtfire-angularjs.module.ts +++ b/src/app/doubtfire-angularjs.module.ts @@ -45,7 +45,6 @@ import 'build/src/app/visualisations/achievement-box-plot.js'; import 'build/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.js'; import 'build/src/app/tasks/modals/grade-task-modal/grade-task-modal.js'; import 'build/src/app/tasks/modals/modals.js'; -import 'build/src/app/tasks/task-definition-selector/task-definition-selector.js'; import 'build/src/app/tasks/tasks.js'; import 'build/src/app/tasks/project-tasks-list/project-tasks-list.js'; import 'build/src/app/tasks/task-ilo-alignment/task-ilo-alignment.js'; diff --git a/src/app/tasks/task-definition-selector/task-definition-selector.coffee b/src/app/tasks/task-definition-selector/task-definition-selector.coffee deleted file mode 100644 index 1e6162b5b..000000000 --- a/src/app/tasks/task-definition-selector/task-definition-selector.coffee +++ /dev/null @@ -1,36 +0,0 @@ -angular.module('doubtfire.tasks.task-definition-selector',[]) - -# -# A switch that that the selection of a specified task definition -# Only handles task definition - not tasks in a project -# -.directive('taskDefinitionSelector', -> - replace: true - restrict: 'E' - templateUrl: 'tasks/task-definition-selector/task-definition-selector.tpl.html' - scope: - # Unit required - unit: "=" - # What to do when definition is changed - onSelectDefinition: "=" - # Use ng-model to select task - ngModel: '=?' - # Provide a btn-style to force the colour to change` - buttonStyle: '@' - # Clearable - showClear: '=?' - controller: ($scope) -> - $scope.buttonStyle ?= 'default' - $scope.groupSetName = (id) -> - $scope.unit.groupSetsCache.get(id)?.name || "Individual Work" - - $scope.hideGroupSetName = $scope.unit.groupSets?.length is 0 - - $scope.selectedDefinition = null - - $scope.setSelectedDefinition = (taskDef) -> - $scope.selectedDefinition = taskDef - $scope.ngModel = taskDef - if $scope.onSelectDefinition? && _.isFunction($scope.onSelectDefinition) - $scope.onSelectDefinition(taskDef) -) diff --git a/src/app/tasks/task-definition-selector/task-definition-selector.scss b/src/app/tasks/task-definition-selector/task-definition-selector.scss deleted file mode 100644 index fad60049e..000000000 --- a/src/app/tasks/task-definition-selector/task-definition-selector.scss +++ /dev/null @@ -1,6 +0,0 @@ -.task-definition-selector.dropdown { - @include dropdown-selector; - .caret { - margin-right: 1.5ex; - } -} diff --git a/src/app/tasks/task-definition-selector/task-definition-selector.tpl.html b/src/app/tasks/task-definition-selector/task-definition-selector.tpl.html deleted file mode 100644 index 34ec4219c..000000000 --- a/src/app/tasks/task-definition-selector/task-definition-selector.tpl.html +++ /dev/null @@ -1,31 +0,0 @@ -
- - -
diff --git a/src/app/tasks/tasks.coffee b/src/app/tasks/tasks.coffee index c4da63481..5144dc666 100644 --- a/src/app/tasks/tasks.coffee +++ b/src/app/tasks/tasks.coffee @@ -2,5 +2,4 @@ angular.module('doubtfire.tasks', [ 'doubtfire.tasks.modals' 'doubtfire.tasks.task-ilo-alignment' 'doubtfire.tasks.project-tasks-list' - 'doubtfire.tasks.task-definition-selector' ])