romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

WIP: Resolve "Статистика по активностям" #232

Draft
arefiev1997 wants to merge 11 commits from 93-activites-analytics into dev
pull from: 93-activites-analytics
merge into: romanov73:dev
Conversation 2 Commits 11 Files Changed 19 +5 -4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e81ee4d36b - Show all commits

7
src/main/java/ru/ulstu/activity/model/ActivityElement.java
View File

@ -4,7 +4,8 @@ public class ActivityElement {
private int startedCount = 0; private int startedCount = 0;
private int completedCount = 0; private int completedCount = 0;
public ActivityElement() {} public ActivityElement() {
}
public ActivityElement(int startedCount, int completedCount) { public ActivityElement(int startedCount, int completedCount) {
this.startedCount = startedCount; this.startedCount = startedCount;
@ -28,10 +29,10 @@ public class ActivityElement {
} }
public void incrementStartedCount() { public void incrementStartedCount() {
this.startedCount ++; this.startedCount++;
} }
public void incrementCompletedCount() { public void incrementCompletedCount() {
this.completedCount ++; this.completedCount++;
} }
} }

2
src/main/java/ru/ulstu/grant/service/GrantService.java
View File

@ -165,7 +165,7 @@ public class GrantService extends BaseService {
if (grant.getLeader() != oldLeader) { if (grant.getLeader() != oldLeader) {
grantNotificationService.sendLeaderChangeNotification(grant, oldLeader); grantNotificationService.sendLeaderChangeNotification(grant, oldLeader);
} }
if(grant.getStatus() != oldStatus) { if (grant.getStatus() != oldStatus) {
activityService.createActivity(new ArrayList<>(grant.getAuthors()), grant.getCommonActivityState()); activityService.createActivity(new ArrayList<>(grant.getAuthors()), grant.getCommonActivityState());
} }
eventService.updateGrantDeadlines(grant); eventService.updateGrantDeadlines(grant);