Skip to content
  1. Apr 16, 2023
  3. Apr 15, 2023
  5. Apr 12, 2023
    • Martin Gargalovič's avatar
      implemented get Enrolled and get Finished · 6f23ba01
      Martin Gargalovič authored
      6f23ba01
    • Martin Gargalovič's avatar
      added queries for get enrolled and get finished · 7fd55099
      Martin Gargalovič authored
      7fd55099
    • Martin Gargalovič's avatar
      implemented get enrolled and finished · 3b3fc08c
      Martin Gargalovič authored
      3b3fc08c
    • Martin Gargalovič's avatar
      changed the 2 lists of language and proficiency to a Map · d15e122f
      Martin Gargalovič authored
      d15e122f
    • Martin Gargalovič's avatar
      changed the 2 lists of language and proficiency to a Map · d4f61302
      Martin Gargalovič authored
      d4f61302
    • Martin Gargalovič's avatar
      added api response and implemented getFinished/Enrolled · 64e4e06c
      Martin Gargalovič authored
      64e4e06c
    • Martin Gargalovič's avatar
      aadded User-Course mapping · 95e192d2
      Martin Gargalovič authored
      95e192d2
    • Martin Gargalovič's avatar
      changed Course to work with User-Course mapping · e5e9f15b
      Martin Gargalovič authored
      e5e9f15b
    • Martin Gargalovič's avatar
      Merge branch 'M2' into M2-user · 2d087e5f
      Martin Gargalovič authored 
      # Conflicts:
#	README.md
#	application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java
#	application/model/src/main/java/org/fuseri/model/dto/exercise/AnswerCreateDto.java
#	application/model/src/main/java/org/fuseri/model/dto/exercise/AnswersCreateDto.java
#	application/model/src/main/java/org/fuseri/model/dto/exercise/ExerciseCreateDto.java
#	application/model/src/main/java/org/fuseri/model/dto/exercise/ExerciseDto.java
#	application/model/src/main/java/org/fuseri/model/dto/exercise/QuestionCreateDto.java
#	application/model/src/main/java/org/fuseri/model/dto/exercise/QuestionDto.java
#	application/model/src/main/java/org/fuseri/model/dto/exercise/QuestionUpdateDto.java
#	application/model/src/main/java/org/fuseri/model/dto/lecture/LectureCreateDto.java
#	application/model/src/main/java/org/fuseri/model/dto/user/UserDto.java
#	application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateController.java
#	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/Answer.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerController.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerFacade.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerRepository.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerService.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/common/DomainObject.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/common/DomainService.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/Exercise.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseController.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseRepository.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseService.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/Question.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionController.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionFacade.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionRepository.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionService.java
#	application/module-exercise/src/main/resources/application.properties
#	application/module-exercise/src/test/java/org/fuseri/moduleexercise/answer/AnswerTest.java
#	application/module-exercise/src/test/java/org/fuseri/moduleexercise/exercise/ExerciseTest.java
#	application/module-exercise/src/test/java/org/fuseri/moduleexercise/question/QuestionTest.java
#	application/module-language-school/pom.xml
#	application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/common/DomainObject.java
#	application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/Course.java
#	application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/CourseController.java
#	application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/lecture/Lecture.java
#	application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/lecture/LectureController.java
#	application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/UserController.java
#	application/module-language-school/src/main/resources/application.properties
#	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseTest.java
#	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/lecture/LectureTest.java
#	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserControllerTest.java
      2d087e5f
  7. Apr 11, 2023