Browse Source

Fix variables related to random order

pull/1370/head
Hironsan 3 years ago
parent
commit
c3e4fc5741
6 changed files with 21 additions and 21 deletions
  1. 6
      frontend/components/project/FormCreate.vue
  2. 4
      frontend/components/project/FormUpdate.vue
  3. 20
      frontend/domain/models/project/project.ts
  4. 4
      frontend/pages/projects/index.vue
  5. 2
      frontend/services/application/project/projectApplicationService.ts
  6. 6
      frontend/services/application/project/projectData.ts

6
frontend/components/project/FormCreate.vue

@ -49,9 +49,9 @@
@change="updateValue('singleClassClassification', $event === true)"
/>
<v-checkbox
:value="enableRandomizeDocOrder"
:value="enableRandomOrder"
:label="$t('overview.randomizeDocOrder')"
@change="updateValue('enableRandomizeDocOrder', $event === true)"
@change="updateValue('enableRandomOrder', $event === true)"
/>
<v-checkbox
:value="enableShareAnnotation"
@ -89,7 +89,7 @@ export default Vue.extend({
default: '',
required: true
},
enableRandomizeDocOrder: {
enableRandomOrder: {
type: Boolean,
default: false,
required: true

4
frontend/components/project/FormUpdate.vue

@ -128,7 +128,7 @@
>
<h3>Shuffle</h3>
<v-checkbox
v-model="project.enableRandomizeDocOrder"
v-model="project.enableRandomOrder"
:label="$t('overview.randomizeDocOrder')"
/>
</v-col>
@ -185,7 +185,7 @@ export default {
},
watch: {
'project.enableRandomizeDocOrder'() {
'project.enableRandomOrder'() {
this.doneEdit()
},
'project.enableShareAnnotation'() {

20
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

4
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,

2
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
)

6
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<ProjectDTO, 'id' | 'name' | 'description' | 'guideline' | 'projectType' | 'enableRandomizeDocOrder' | 'enableShareAnnotation' | 'singleClassClassification' | 'tags'>
export type ProjectWriteDTO = Pick<ProjectDTO, 'id' | 'name' | 'description' | 'guideline' | 'projectType' | 'enableRandomOrder' | 'enableShareAnnotation' | 'singleClassClassification' | 'tags'>
Loading…
Cancel
Save