Merge branch 'master' of https://git.wmi.amu.edu.pl/s416178/Punktonerzy
This commit is contained in:
commit
5a6053aa14
@ -406,7 +406,8 @@ public class GroupService {
|
|||||||
test.setStatus("UNVERIFIED");
|
test.setStatus("UNVERIFIED");
|
||||||
}
|
}
|
||||||
test.setGroup(group);
|
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);
|
this.userActivityService.saveActivity("addedResource", 0, null, user, null, group, null, null, test);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -429,7 +430,7 @@ public class GroupService {
|
|||||||
long grade = 0;
|
long grade = 0;
|
||||||
if (user != null){
|
if (user != null){
|
||||||
for (UserActivity userActivity : t.getActivity()){
|
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();
|
grade = userActivity.getPoints();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -57,7 +57,7 @@ public class Test {
|
|||||||
private StudyGroup group;
|
private StudyGroup group;
|
||||||
|
|
||||||
@OneToMany(fetch = FetchType.LAZY, mappedBy = "test", cascade = CascadeType.ALL)
|
@OneToMany(fetch = FetchType.LAZY, mappedBy = "test", cascade = CascadeType.ALL)
|
||||||
private List<UserActivity> activity;
|
private List<UserActivity> activity = new ArrayList<>();
|
||||||
|
|
||||||
public void setAddDate() {
|
public void setAddDate() {
|
||||||
java.util.Date utilDate = new java.util.Date();
|
java.util.Date utilDate = new java.util.Date();
|
||||||
|
@ -46,7 +46,6 @@ public class UserActivity {
|
|||||||
private Set set;
|
private Set set;
|
||||||
|
|
||||||
@ManyToOne
|
@ManyToOne
|
||||||
@JoinColumn(name = "test_id")
|
|
||||||
private Test test;
|
private Test test;
|
||||||
|
|
||||||
@ManyToOne
|
@ManyToOne
|
||||||
|
Loading…
Reference in New Issue
Block a user