s416178
/
Punktonerzy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.wmi.amu.edu.pl/s416178/Punktonerzy

This commit is contained in:
s416122 2019-12-15 14:36:36 +01:00
parent 3689a9a85d 1586d6a929
commit 5a6053aa14
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java
View File

@ -406,7 +406,8 @@ public class GroupService {
test.setStatus("UNVERIFIED");
}
test.setGroup(group);
this.testRepository.save(test);
test.setActivity(new ArrayList<>());
test = this.testRepository.save(test);
this.userActivityService.saveActivity("addedResource", 0, null, user, null, group, null, null, test);
});
}
@ -429,7 +430,7 @@ public class GroupService {
long grade = 0;
if (user != null){
for (UserActivity userActivity : t.getActivity()){
if (userActivity.getToUser() != null && userActivity.getToUser().equals(user)){
if (userActivity.getToUser() != null && userActivity.getToUser().equals(user) && userActivity.getType().equalsIgnoreCase("solvedTest")){
grade = userActivity.getPoints();
break;
}

2
BackEnd/src/main/java/studycave/studycaverestservice/model/test/Test.java
View File

@ -57,7 +57,7 @@ public class Test {
private StudyGroup group;
@OneToMany(fetch = FetchType.LAZY, mappedBy = "test", cascade = CascadeType.ALL)
private List<UserActivity> activity;
private List<UserActivity> activity = new ArrayList<>();
public void setAddDate() {
java.util.Date utilDate = new java.util.Date();

1
BackEnd/src/main/java/studycave/studycaverestservice/model/userActivity/UserActivity.java
View File

@ -46,7 +46,6 @@ public class UserActivity {
private Set set;
@ManyToOne
@JoinColumn(name = "test_id")
private Test test;
@ManyToOne