Merged with master. (d8ac5133) · Commits · MUNI-KYPO-CRP / backend-java / kypo-adaptive-training

Commit d8ac5133 authored 4 years ago by Dominik Pilar

Browse files

Merged with master.

parents 109c00d2 811ba0c9

No related branches found

No related tags found

1 merge request!27Resolve "Add position attribute in the ApiModelProperty annotations"

Pipeline #74031 passed 4 years ago

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/cz/muni/ics/kypo/training/adaptive/domain/AccessToken.java 4 additions, 18 deletions

...z/muni/ics/kypo/training/adaptive/domain/AccessToken.java
src/main/java/cz/muni/ics/kypo/training/adaptive/domain/TRAcquisitionLock.java 3 additions, 13 deletions

.../ics/kypo/training/adaptive/domain/TRAcquisitionLock.java
src/main/java/cz/muni/ics/kypo/training/adaptive/domain/User.java 4 additions, 17 deletions

.../java/cz/muni/ics/kypo/training/adaptive/domain/User.java
src/main/java/cz/muni/ics/kypo/training/adaptive/domain/phase/DecisionMatrixRow.java 4 additions, 17 deletions

...ypo/training/adaptive/domain/phase/DecisionMatrixRow.java
src/main/java/cz/muni/ics/kypo/training/adaptive/domain/phase/Task.java 3 additions, 13 deletions

...cz/muni/ics/kypo/training/adaptive/domain/phase/Task.java
src/main/java/cz/muni/ics/kypo/training/adaptive/domain/phase/questions/Question.java 3 additions, 13 deletions

...po/training/adaptive/domain/phase/questions/Question.java
src/main/java/cz/muni/ics/kypo/training/adaptive/domain/phase/questions/QuestionAnswer.java 14 additions, 8 deletions

...ining/adaptive/domain/phase/questions/QuestionAnswer.java
src/main/java/cz/muni/ics/kypo/training/adaptive/domain/phase/questions/QuestionChoice.java 3 additions, 13 deletions

...ining/adaptive/domain/phase/questions/QuestionChoice.java
src/main/java/cz/muni/ics/kypo/training/adaptive/domain/phase/questions/QuestionPhaseRelation.java 4 additions, 17 deletions

...daptive/domain/phase/questions/QuestionPhaseRelation.java
src/main/java/cz/muni/ics/kypo/training/adaptive/domain/phase/questions/QuestionsPhaseRelationResult.java 8 additions, 18 deletions

.../domain/phase/questions/QuestionsPhaseRelationResult.java
src/main/java/cz/muni/ics/kypo/training/adaptive/domain/phase/questions/TrainingPhaseQuestionsFulfillment.java 76 additions, 0 deletions

...in/phase/questions/TrainingPhaseQuestionsFulfillment.java
src/main/java/cz/muni/ics/kypo/training/adaptive/domain/training/TrainingDefinition.java 5 additions, 22 deletions

...training/adaptive/domain/training/TrainingDefinition.java
src/main/java/cz/muni/ics/kypo/training/adaptive/domain/training/TrainingInstance.java 7 additions, 30 deletions

...o/training/adaptive/domain/training/TrainingInstance.java
src/main/java/cz/muni/ics/kypo/training/adaptive/domain/training/TrainingRun.java 9 additions, 38 deletions

...s/kypo/training/adaptive/domain/training/TrainingRun.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionAnswerDTO.java 8 additions, 7 deletions

...raining/adaptive/dto/questionnaire/QuestionAnswerDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/view/QuestionChoiceViewDTO.java 67 additions, 0 deletions

...daptive/dto/questionnaire/view/QuestionChoiceViewDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/view/QuestionViewDTO.java 93 additions, 0 deletions

...ning/adaptive/dto/questionnaire/view/QuestionViewDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/view/QuestionnairePhaseViewDTO.java 54 additions, 0 deletions

...ive/dto/questionnaire/view/QuestionnairePhaseViewDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/view/TaskViewDTO.java 99 additions, 0 deletions

...kypo/training/adaptive/dto/training/view/TaskViewDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/view/TrainingPhaseViewDTO.java 75 additions, 0 deletions

...ning/adaptive/dto/training/view/TrainingPhaseViewDTO.java

with 543 additions and 244 deletions

Please register or to comment

Admin message

Merged with master.