From c3e4fc5741be8b45e1b18db72683022c1d0a87ab Mon Sep 17 00:00:00 2001 From: Hironsan Date: Wed, 12 May 2021 14:53:12 +0900 Subject: [PATCH] Fix variables related to random order --- frontend/components/project/FormCreate.vue | 6 +++--- frontend/components/project/FormUpdate.vue | 4 ++-- frontend/domain/models/project/project.ts | 20 +++++++++---------- frontend/pages/projects/index.vue | 4 ++-- .../project/projectApplicationService.ts | 2 +- .../application/project/projectData.ts | 6 +++--- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/frontend/components/project/FormCreate.vue b/frontend/components/project/FormCreate.vue index d319e10d..5abe5958 100644 --- a/frontend/components/project/FormCreate.vue +++ b/frontend/components/project/FormCreate.vue @@ -49,9 +49,9 @@ @change="updateValue('singleClassClassification', $event === true)" />

Shuffle

@@ -185,7 +185,7 @@ export default { }, watch: { - 'project.enableRandomizeDocOrder'() { + 'project.enableRandomOrder'() { this.doneEdit() }, 'project.enableShareAnnotation'() { diff --git a/frontend/domain/models/project/project.ts b/frontend/domain/models/project/project.ts index 6049b7b1..782aa16d 100644 --- a/frontend/domain/models/project/project.ts +++ b/frontend/domain/models/project/project.ts @@ -17,7 +17,7 @@ export class ProjectReadItem { public current_users_role: CurrentUsersRole, public project_type: ProjectType, public updated_at: string, - public randomize_document_order: boolean, + public random_order: boolean, public collaborative_annotation: boolean, public single_class_classification: boolean, public resourcetype: string, @@ -34,7 +34,7 @@ export class ProjectReadItem { current_users_role, project_type, updated_at, - randomize_document_order, + random_order, collaborative_annotation, single_class_classification, resourcetype, @@ -49,7 +49,7 @@ export class ProjectReadItem { current_users_role: CurrentUsersRole, project_type: ProjectType, updated_at: string, - randomize_document_order: boolean, + random_order: boolean, collaborative_annotation: boolean, single_class_classification: boolean, resourcetype: string, @@ -65,7 +65,7 @@ export class ProjectReadItem { current_users_role, project_type, updated_at, - randomize_document_order, + random_order, collaborative_annotation, single_class_classification, resourcetype, @@ -110,7 +110,7 @@ export class ProjectReadItem { current_users_role: this.current_users_role, project_type: this.project_type, updated_at: this.updated_at, - randomize_document_order: this.randomize_document_order, + random_order: this.random_order, collaborative_annotation: this.collaborative_annotation, single_class_classification: this.single_class_classification, resourcetype: this.resourcetype, @@ -126,7 +126,7 @@ export class ProjectWriteItem { public description: string, public guideline: string, public project_type: ProjectType, - public randomize_document_order: boolean, + public random_order: boolean, public collaborative_annotation: boolean, public single_class_classification: boolean ) {} @@ -138,7 +138,7 @@ export class ProjectWriteItem { description, guideline, project_type, - randomize_document_order, + random_order, collaborative_annotation, single_class_classification }: @@ -148,7 +148,7 @@ export class ProjectWriteItem { description: string, guideline: string, project_type: ProjectType, - randomize_document_order: boolean, + random_order: boolean, collaborative_annotation: boolean, single_class_classification: boolean } @@ -159,7 +159,7 @@ export class ProjectWriteItem { description, guideline, project_type, - randomize_document_order, + random_order, collaborative_annotation, single_class_classification ) @@ -181,7 +181,7 @@ export class ProjectWriteItem { description: this.description, guideline: this.guideline, project_type: this.project_type, - randomize_document_order: this.randomize_document_order, + random_order: this.random_order, collaborative_annotation: this.collaborative_annotation, single_class_classification: this.single_class_classification, resourcetype: this.resourceType diff --git a/frontend/pages/projects/index.vue b/frontend/pages/projects/index.vue index f3b6e59f..a901475e 100644 --- a/frontend/pages/projects/index.vue +++ b/frontend/pages/projects/index.vue @@ -71,7 +71,7 @@ export default Vue.extend({ name: '', description: '', projectType: 'DocumentClassification', - enableRandomizeDocOrder: false, + enableRandomOrder: false, enableShareAnnotation: false, singleClassClassification: false } as ProjectWriteDTO, @@ -79,7 +79,7 @@ export default Vue.extend({ name: '', description: '', projectType: 'DocumentClassification', - enableRandomizeDocOrder: false, + enableRandomOrder: false, enableShareAnnotation: false, singleClassClassification: false } as ProjectWriteDTO, diff --git a/frontend/services/application/project/projectApplicationService.ts b/frontend/services/application/project/projectApplicationService.ts index cc0f0484..8a236a0a 100644 --- a/frontend/services/application/project/projectApplicationService.ts +++ b/frontend/services/application/project/projectApplicationService.ts @@ -54,7 +54,7 @@ export class ProjectApplicationService { item.description, item.guideline, item.projectType, - item.enableRandomizeDocOrder, + item.enableRandomOrder, item.enableShareAnnotation, item.singleClassClassification ) diff --git a/frontend/services/application/project/projectData.ts b/frontend/services/application/project/projectData.ts index 53ede050..fa591ace 100644 --- a/frontend/services/application/project/projectData.ts +++ b/frontend/services/application/project/projectData.ts @@ -8,7 +8,7 @@ export class ProjectDTO { current_users_role: CurrentUsersRole projectType: ProjectType updatedAt: string - enableRandomizeDocOrder: boolean + enableRandomOrder: boolean enableShareAnnotation: boolean singleClassClassification: boolean pageLink: string @@ -24,7 +24,7 @@ export class ProjectDTO { this.current_users_role = item.current_users_role this.projectType = item.project_type this.updatedAt = item.updated_at - this.enableRandomizeDocOrder = item.randomize_document_order + this.enableRandomOrder = item.random_order this.enableShareAnnotation = item.collaborative_annotation this.singleClassClassification = item.single_class_classification this.pageLink = item.annotationPageLink @@ -34,4 +34,4 @@ export class ProjectDTO { } } -export type ProjectWriteDTO = Pick +export type ProjectWriteDTO = Pick