Merge branch 'master' into 8-integrate-the-necessary-parts-of-the-kypo2-training (6e99a488) · Commits · MUNI-KYPO-CRP / backend-java / kypo-adaptive-training

Commit 6e99a488 authored 4 years ago by Dominik Pilar

Browse files

Merge branch 'master' into 8-integrate-the-necessary-parts-of-the-kypo2-training

parents 9d4eb350 61b6eba1

No related branches found

No related tags found

1 merge request!14Resolve "Integrate the necessary parts of the kypo2-training"

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractPhaseDTO.java 26 additions, 0 deletions

...muni/ics/kypo/training/adaptive/dto/AbstractPhaseDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/PhaseCreateDTO.java 14 additions, 0 deletions

...z/muni/ics/kypo/training/adaptive/dto/PhaseCreateDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseDTO.java 16 additions, 0 deletions

...uni/ics/kypo/training/adaptive/dto/info/InfoPhaseDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseUpdateDTO.java 15 additions, 0 deletions

...s/kypo/training/adaptive/dto/info/InfoPhaseUpdateDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/AbstractQuestionDTO.java 27 additions, 0 deletions

...ining/adaptive/dto/questionnaire/AbstractQuestionDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionChoiceDTO.java 27 additions, 0 deletions

...raining/adaptive/dto/questionnaire/QuestionChoiceDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionDTO.java 23 additions, 0 deletions

...kypo/training/adaptive/dto/questionnaire/QuestionDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionPhaseRelationDTO.java 29 additions, 0 deletions

.../adaptive/dto/questionnaire/QuestionPhaseRelationDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionRequiredIdDTO.java 0 additions, 20 deletions

...ing/adaptive/dto/questionnaire/QuestionRequiredIdDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionUpdateDTO.java 0 additions, 85 deletions

...raining/adaptive/dto/questionnaire/QuestionUpdateDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnairePhaseDTO.java 31 additions, 0 deletions

...ing/adaptive/dto/questionnaire/QuestionnairePhaseDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnaireUpdateDTO.java 16 additions, 0 deletions

...ng/adaptive/dto/questionnaire/QuestionnaireUpdateDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/DecisionMatrixRowDTO.java 37 additions, 0 deletions

.../training/adaptive/dto/training/DecisionMatrixRowDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskCopyDTO.java 20 additions, 0 deletions

.../ics/kypo/training/adaptive/dto/training/TaskCopyDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskDTO.java 42 additions, 0 deletions

...muni/ics/kypo/training/adaptive/dto/training/TaskDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskUpdateDTO.java 20 additions, 0 deletions

...cs/kypo/training/adaptive/dto/training/TaskUpdateDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseDTO.java 38 additions, 0 deletions

...kypo/training/adaptive/dto/training/TrainingPhaseDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseUpdateDTO.java 32 additions, 1 deletion

...raining/adaptive/dto/training/TrainingPhaseUpdateDTO.java
src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java 0 additions, 6 deletions

...cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java

with 413 additions and 112 deletions

Please register or to comment