fix: remove pct copy data

switch this to use similarity flag.
macite · Jul 14, 2023 · 6bb96b4 · 6bb96b4
1 parent 3775cfb
commit 6bb96b4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
@@ -36,7 +36,6 @@ export class Task extends Entity {
   grade?: number;
   qualityPts: number;
   includeInPortfolio: boolean = true;
-  pctSimilar: number = 0;
   similarityFlag: boolean = false;
   numNewComments: number = 0;
   hasExtensions: boolean;

diff --git a/src/app/api/services/project.service.ts b/src/app/api/services/project.service.ts
@@ -65,7 +65,7 @@ export class ProjectService extends CachedEntityService<Project> {
       'submittedGrade',
       'portfolioFiles',
       'compilePortfolio',
-      'maxPctCopy',
+      'similarityFlag',
       {
         keys: 'hasPortfolio',
         toEntityFn: (data: object, key: string, entity: Project, params?: any) => {

diff --git a/src/app/api/services/task.service.ts b/src/app/api/services/task.service.ts
@@ -58,7 +58,6 @@ export class TaskService extends CachedEntityService<Task> {
       'grade',
       'qualityPts',
       'includeInPortfolio',
-      'pctSimilar',
       'similarityFlag',
       'numNewComments',
       'trigger',

diff --git a/src/app/common/filters/filters.coffee b/src/app/common/filters/filters.coffee
@@ -46,7 +46,7 @@ angular.module("doubtfire.common.filters", [])
 .filter('studentsWithPlagiarism', ->
   (input) ->
     if input
-      _.filter  input, (student) -> (student?) && student.maxPctCopy > 0
+      _.filter  input, (student) -> (student?) && student.similarityFlag
     else
       input
 )
@@ -70,7 +70,7 @@ angular.module("doubtfire.common.filters", [])
 .filter('taskWithPlagiarism', ->
   (input) ->
     if input
-      _.filter input, (task) -> (task?) && task.pctSimilar > 0
+      _.filter input, (task) -> (task?) && task.similarityFlag
     else
       input
 )

diff --git a/...rectives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts b/...rectives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
@@ -33,7 +33,7 @@ export class TaskSimilarityViewComponent implements OnChanges {
     this.taskSimilarityService
       .update({ taskId: similarity.task.id, id: similarity.id }, { entity: similarity })
       .subscribe((_) => {
-        this.alertsService.success('Updated', 120000);
+        this.alertsService.success('Similarity flag updated');
         similarity.task.similarityFlag = similarity.task.similarityCache.currentValues
           .map((s) => {
             return s.flagged;

diff --git a/src/app/units/states/students-list/students-list.tpl.html b/src/app/units/states/students-list/students-list.tpl.html
@@ -44,7 +44,7 @@
             <button class="btn btn-default" ng-model="tableSort.order" ng-click="sortTableBy('targetGrade')" btn-radio="'targetGrade'">
               <i class="fa fa-check"></i> Grade
             </button>
-            <button class="btn btn-default" ng-model="tableSort.order" ng-click="sortTableBy('maxPctCopy')" btn-radio="'maxPctCopy'">
+            <button class="btn btn-default" ng-model="tableSort.order" ng-click="sortTableBy('similarityFlag')" btn-radio="'similarityFlag'">
               <i class="fa fa-eye"></i> Plagiarism
             </button>
             <button class="btn btn-default" ng-model="tableSort.order" ng-click="sortTableBy('portfolioStatus')" btn-radio="'portfolioStatus'">
@@ -88,7 +88,7 @@ <h4>No students found</h4>
             <a ng-click="sortTableBy('flags')">
               Flags
               <i ng-show="
-                tableSort.order == 'maxPctCopy' ||
+                tableSort.order == 'similarityFlag' ||
                 tableSort.order == 'targetGrade' ||
                 tableSort.order == 'portfolioStatus'"
                 class="ng-hide fa fa-caret-{{tableSort.reverse ? 'down' : 'up'}}"></i>
@@ -132,7 +132,7 @@ <h4>No students found</h4>
               <span class="flag">
                 <grade-icon grade="project.targetGrade"></grade-icon>
               </span>
-              <span ng-show="project.maxPctCopy > 0" class="flag">
+              <span ng-show="project.similarityFlag" class="flag">
                 <i class="fa fa-eye fa-2x" ></i>
               </span>
               <span ng-show="project.hasPortfolio" class="flag">