Skip to content

Commit de7901c

Browse files
committed
remove question type from question metadata
1 parent ecb7845 commit de7901c

13 files changed

Lines changed: 3 additions & 191 deletions

File tree

mdm-frontend/src/app/legacy/questionmanagement/configuration/translations-de.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ angular.module('metadatamanagementApp').config([
4242
'question': 'Frage',
4343
'questions': 'Fragen',
4444
'annotations': 'Anmerkungen',
45-
'type': 'Fragetyp',
4645
'topic': 'Thema',
4746
'instruction': 'Anleitung',
4847
'introduction': 'Einführung',

mdm-frontend/src/app/legacy/questionmanagement/configuration/translations-en.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ angular.module('metadatamanagementApp').config([
4242
'question': 'Question',
4343
'questions': 'Questions',
4444
'annotations': 'Annotations',
45-
'type': 'Question Type',
4645
'topic': 'Topic',
4746
'instruction': 'Instruction',
4847
'introduction': 'Introduction',

mdm-frontend/src/app/legacy/questionmanagement/templates/common-details.html.tmpl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@
3636
class="md-secondary"
3737
display-i18n-string="$ctrl.options.instruction"></span>
3838
</md-list-item>
39-
<md-list-item ng-if="$ctrl.options.type">
40-
<h5>{{'question-management.detail.label.type' | translate }}:</h5>
41-
<span
42-
class="md-secondary"
43-
display-i18n-string="$ctrl.options.type" ></span>
44-
</md-list-item>
4539
<md-list-item ng-if="$ctrl.options.topic">
4640
<h5>{{'question-management.detail.label.topic' | translate }}:</h5>
4741
<span

mdm-frontend/src/app/legacy/questionmanagement/templates/technical-representation.html.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<md-card>
22
<md-card-header ng-click="$ctrl.collapsed = !$ctrl.collapsed">
33
<md-card-header-text>
4-
<h2 class="md-title">{{'question-management.detail.technical-representation' | translate}} ({{$ctrl.options.question.technicalRepresentation.type}})</h2>
4+
<h2 class="md-title">{{'question-management.detail.technical-representation' | translate}}</h2>
55
</md-card-header-text>
66
<md-button
77
class="md-card-collapsible-button"

mdm-frontend/src/app/legacy/searchmanagement/directives/question-search-result.html.tmpl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@
1212
<md-tooltip md-autohide="true" md-direction="top" md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
1313
{{'search-management.cards.question-tooltip' | translate: {id: searchResult.masterId} }}
1414
</md-tooltip>
15-
<div class="md-subhead">
16-
<div>
17-
<span>{{'question-management.detail.label.type' | translate }}:</span>
18-
<span display-i18n-string="searchResult.type"></span>
19-
</div>
20-
</div>
2115
</md-card-header-text>
2216
</md-card-header>
2317
<md-card-content>

src/main/java/eu/dzhw/fdz/metadatamanagement/questionmanagement/domain/Question.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import eu.dzhw.fdz.metadatamanagement.ordermanagement.domain.OrderedDataPackage;
2828
import eu.dzhw.fdz.metadatamanagement.projectmanagement.domain.DataAcquisitionProject;
2929
import eu.dzhw.fdz.metadatamanagement.questionmanagement.domain.validation.ValidQuestionIdName;
30-
import eu.dzhw.fdz.metadatamanagement.questionmanagement.domain.validation.ValidQuestionType;
3130
import eu.dzhw.fdz.metadatamanagement.questionmanagement.domain.validation.ValidUniqueQuestionNumber;
3231
import eu.dzhw.fdz.metadatamanagement.surveymanagement.domain.Survey;
3332
import eu.dzhw.fdz.metadatamanagement.variablemanagement.domain.Variable;
@@ -167,15 +166,6 @@ public class Question extends AbstractShadowableRdcDomainObject {
167166
message = "question-management.error.question.introduction.i18n-string-size")
168167
private I18nString introduction;
169168

170-
/**
171-
* The type of the question.
172-
*
173-
* Must be one of QuestionTypes and must not be empty.
174-
*/
175-
@NotNull(message = "question-management.error.question.type.not-null")
176-
@ValidQuestionType(message = "question-management.error.question.type.valid-question-type")
177-
private I18nString type;
178-
179169
/**
180170
* Arbitrary additional question text which has been presented to the participant.
181171
*

src/main/java/eu/dzhw/fdz/metadatamanagement/questionmanagement/domain/QuestionTypes.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/main/java/eu/dzhw/fdz/metadatamanagement/questionmanagement/domain/TechnicalRepresentation.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,6 @@ public class TechnicalRepresentation implements Serializable {
2727

2828
private static final long serialVersionUID = 5361313820939313016L;
2929

30-
/**
31-
* The type of the technical representation. E.g. "zofar".
32-
*
33-
* Must not be empty and must not contain more than 32 characters.
34-
*/
35-
@NotEmpty(message = "question-management.error.technical-representation.type.not-empty")
36-
@Size(max = StringLengths.SMALL,
37-
message = "question-management.error.technical-representation.type.size")
38-
private String type;
39-
4030
/**
4131
* The technical language of the source of this representation. E.g. "qml".
4232
*

src/main/java/eu/dzhw/fdz/metadatamanagement/questionmanagement/domain/validation/ValidQuestionType.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/main/java/eu/dzhw/fdz/metadatamanagement/questionmanagement/domain/validation/ValidQuestionTypeValidator.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)