filipizydorczyk/backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: filipizydorczyk:master
Branches Tags
filipizydorczyk:master
filipizydorczyk:single0-group-fix
filipizydorczyk:capacity-fix
filipizydorczyk:Add-licence
filipizydorczyk:capacity-symb
filipizydorczyk:api-fileds
filipizydorczyk:statistics-relase
filipizydorczyk:beta
filipizydorczyk:group-types-update
filipizydorczyk:adding-type-into-AssignmentDetailed
filipizydorczyk:exchanges-fix-tour-blocking
filipizydorczyk:exchanges
filipizydorczyk:poprawki-29-12
filipizydorczyk:refresh-token
filipizydorczyk:restservice
filipizydorczyk:token-release
filipizydorczyk:endpoint-change
filipizydorczyk:cors-fixed
filipizydorczyk:auth-save-release
filipizydorczyk:beta-v1.0
..
compare: filipizydorczyk:capacity-fix
Branches Tags
filipizydorczyk:master
filipizydorczyk:single0-group-fix
filipizydorczyk:capacity-fix
filipizydorczyk:Add-licence
filipizydorczyk:capacity-symb
filipizydorczyk:api-fileds
filipizydorczyk:statistics-relase
filipizydorczyk:beta
filipizydorczyk:group-types-update
filipizydorczyk:adding-type-into-AssignmentDetailed
filipizydorczyk:exchanges-fix-tour-blocking
filipizydorczyk:exchanges
filipizydorczyk:poprawki-29-12
filipizydorczyk:refresh-token
filipizydorczyk:restservice
filipizydorczyk:token-release
filipizydorczyk:endpoint-change
filipizydorczyk:cors-fixed
filipizydorczyk:auth-save-release
filipizydorczyk:beta-v1.0

No commits in common. "master" and "capacity-fix" have entirely different histories.
master ... capacity-f

1 changed files with 4 additions and 8 deletions
Show Stats Expand all files Collapse all files

12
restservice/src/main/java/com/plannaplan/responses/models/AssignmentResponse.java
View File

@ -108,12 +108,8 @@ public class AssignmentResponse {
this.id = course.getId(); this.id = course.getId();
this.name = course.getName(); this.name = course.getName();
this.symbol = course.getSymbol(); this.symbol = course.getSymbol();
this.classes = classes != null this.classes = new GroupWithCapacityResponse(classes, ammounts.get(classes.getGroup().getId()));
? new GroupWithCapacityResponse(classes, ammounts.get(classes.getGroup().getId())) this.lecture = new GroupWithCapacityResponse(lecture, ammounts.get(lecture.getGroup().getId()));
: null;
this.lecture = lecture != null
? new GroupWithCapacityResponse(lecture, ammounts.get(lecture.getGroup().getId()))
: null;
} }
/** /**
@ -125,8 +121,8 @@ public class AssignmentResponse {
this.id = course.getId(); this.id = course.getId();
this.name = course.getName(); this.name = course.getName();
this.symbol = course.getSymbol(); this.symbol = course.getSymbol();
this.classes = classes != null ? new GroupWithCapacityResponse(classes) : null; this.classes = new GroupWithCapacityResponse(classes);
this.lecture = lecture != null ? new GroupWithCapacityResponse(lecture) : null; this.lecture = new GroupWithCapacityResponse(lecture);
} }
/** /**