Merge branch 'feature/add-data-import' into 'main' (c52617c3) · Commits · Fedor Lagutin / BRS back

Commit c52617c3 authored 10 months ago by

Fedor Lagutin

Merge branch 'feature/add-data-import' into 'main'

feature/add-data-import

See merge request !3

parents c5ef315c 4ffc2d7a

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 6 additions, 0 deletions

pom.xml
src/main/java/edu/sfedu/brsback/controllers/RecordBookController.java 30 additions, 9 deletions

...a/edu/sfedu/brsback/controllers/RecordBookController.java
src/main/java/edu/sfedu/brsback/controllers/admin/RightController.java 57 additions, 0 deletions

.../edu/sfedu/brsback/controllers/admin/RightController.java
src/main/java/edu/sfedu/brsback/controllers/employee/ImportController.java 71 additions, 0 deletions

.../sfedu/brsback/controllers/employee/ImportController.java
src/main/java/edu/sfedu/brsback/controllers/employee/teacher/ScoreController.java 2 additions, 1 deletion

...brsback/controllers/employee/teacher/ScoreController.java
src/main/java/edu/sfedu/brsback/controllers/employee/teacher/VisitController.java 1 addition, 1 deletion

...brsback/controllers/employee/teacher/VisitController.java
src/main/java/edu/sfedu/brsback/dto/imprt/ImportResultDto.java 20 additions, 0 deletions

...ain/java/edu/sfedu/brsback/dto/imprt/ImportResultDto.java
src/main/java/edu/sfedu/brsback/dto/imprt/module/ModuleImportDto.java 28 additions, 0 deletions

...a/edu/sfedu/brsback/dto/imprt/module/ModuleImportDto.java
src/main/java/edu/sfedu/brsback/dto/imprt/module/ModuleImportDtoList.java 14 additions, 0 deletions

...u/sfedu/brsback/dto/imprt/module/ModuleImportDtoList.java
src/main/java/edu/sfedu/brsback/dto/imprt/recordbook/RecordBookImportDto.java 22 additions, 0 deletions

...edu/brsback/dto/imprt/recordbook/RecordBookImportDto.java
src/main/java/edu/sfedu/brsback/dto/recordbook/RecordBookDto.java 6 additions, 11 deletions

.../java/edu/sfedu/brsback/dto/recordbook/RecordBookDto.java
src/main/java/edu/sfedu/brsback/dto/recordbook/RecordBookShortDto.java 26 additions, 0 deletions

.../edu/sfedu/brsback/dto/recordbook/RecordBookShortDto.java
src/main/java/edu/sfedu/brsback/dto/right/SetRightDto.java 25 additions, 0 deletions

src/main/java/edu/sfedu/brsback/dto/right/SetRightDto.java
src/main/java/edu/sfedu/brsback/entities/EducationPeriod.java 1 addition, 1 deletion

...main/java/edu/sfedu/brsback/entities/EducationPeriod.java
src/main/java/edu/sfedu/brsback/entities/Module.java 14 additions, 0 deletions

src/main/java/edu/sfedu/brsback/entities/Module.java
src/main/java/edu/sfedu/brsback/entities/RecordBook.java 16 additions, 0 deletions

src/main/java/edu/sfedu/brsback/entities/RecordBook.java
src/main/java/edu/sfedu/brsback/exceptions/ImportException.java 8 additions, 0 deletions

...in/java/edu/sfedu/brsback/exceptions/ImportException.java
src/main/java/edu/sfedu/brsback/repos/EducationPeriodRepository.java 3 additions, 0 deletions

...va/edu/sfedu/brsback/repos/EducationPeriodRepository.java
src/main/java/edu/sfedu/brsback/services/ImportService.java 15 additions, 0 deletions

src/main/java/edu/sfedu/brsback/services/ImportService.java
src/main/java/edu/sfedu/brsback/services/RecordBookService.java 19 additions, 0 deletions

...in/java/edu/sfedu/brsback/services/RecordBookService.java

with 384 additions and 23 deletions

Please register or to comment

Admin message

Merge branch 'feature/add-data-import' into 'main'