Merge branch 'master' of https://git.wmi.amu.edu.pl/s416178/Punktonerzy
This commit is contained in:
commit
3107e7720c
|
@ -157,6 +157,8 @@ public class TestController {
|
|||
TestOwnerDTO testDTO = modelMapper.map(test.get(), TestOwnerDTO.class);
|
||||
testDTO.setOwner(user.getUsername());
|
||||
if (test.get().getPermission().equals("GROUP")) {
|
||||
testDTO.setDateFrom(test.get().getAvailableFrom());
|
||||
testDTO.setDateTo(test.get().getAvailableTo());
|
||||
List<StudyGroupMember> groupUsers = test.get().getGroup().getMembers();
|
||||
for (StudyGroupMember studyGroupMember : groupUsers) {
|
||||
if (studyGroupMember.getIsGroupLeader()) {
|
||||
|
@ -183,6 +185,7 @@ public class TestController {
|
|||
if (testDTO.getAttempted() == null){
|
||||
testDTO.setAttempted(false);
|
||||
}
|
||||
|
||||
return testDTO;
|
||||
}
|
||||
|
||||
|
|
|
@ -32,6 +32,9 @@ public class TestOwnerDTO {
|
|||
private String permission;
|
||||
private int grade;
|
||||
|
||||
private Long dateFrom;
|
||||
private Long dateTo;
|
||||
|
||||
private Boolean attempted = null;
|
||||
|
||||
@JsonProperty("body")
|
||||
|
|
Loading…
Reference in New Issue