activitiesPings = new HashMap<>();
+
+ for (Ping ping : pingService.getPings(activityName)) {
+ UserActivity activity = ping.getActivity();
+
+ if (user != null && !activity.getActivityUsers().contains(user)) {
+ continue;
+ }
- for (Ping ping:pings) {
- DiagramElement diagramElement = diagramElements.stream().filter(element -> element.getUser() == ping.getUser()).findFirst().orElse(null);
- if(diagramElement == null) {
- diagramElement = new DiagramElement(ping.getUser());
- diagramElements.add(diagramElement);
+ if (activitiesPings.containsKey(activity.getTitle())) {
+ activitiesPings.put(activity.getTitle(), activitiesPings.get(activity.getTitle()) + 1);
+ } else {
+ activitiesPings.put(activity.getTitle(), 1);
}
- diagramElement.incrementActivity(ping);
+
}
- return diagramElements;
+ return activitiesPings;
}
}
diff --git a/src/main/resources/mail_templates/pingsInfoWeekEmail.html b/src/main/resources/mail_templates/pingsInfoWeekEmail.html
new file mode 100644
index 0000000..180ef3b
--- /dev/null
+++ b/src/main/resources/mail_templates/pingsInfoWeekEmail.html
@@ -0,0 +1,23 @@
+
+
+
+ Уведомление о создании статьи
+
+
+
+
+
+ Уважаемый(ая) Ivan Ivanov
+
+
+ Вы были отмечены в следующих задачах:
+
+
+
+
+ Regards,
+
+ NG-tracker.
+
+
+
diff --git a/src/main/resources/public/js/core.js b/src/main/resources/public/js/core.js
index cc42258..d4eba0d 100644
--- a/src/main/resources/public/js/core.js
+++ b/src/main/resources/public/js/core.js
@@ -225,3 +225,19 @@ function getUrlVar(key) {
var result = new RegExp(key + "=([^&]*)", "i").exec(window.location.search);
return result && decodeURIComponent(result[1]) || "";
}
+
+function sendPing(field, url) {
+ id = document.getElementById(field).value
+
+ $.ajax({
+ url:url + `?${field}=` + id,
+ contentType: "application/json; charset=utf-8",
+ method: "POST",
+ success: function() {
+ showFeedbackMessage("Ping был отправлен", MessageTypesEnum.SUCCESS)
+ },
+ error: function(errorData) {
+ showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING)
+ }
+ })
+}
\ No newline at end of file
diff --git a/src/main/resources/public/js/users.js b/src/main/resources/public/js/users.js
index d0c7c38..0de86d6 100644
--- a/src/main/resources/public/js/users.js
+++ b/src/main/resources/public/js/users.js
@@ -130,28 +130,22 @@ function drawChart() {
userId = $('#author :selected').val()
activity = $('#activity :selected').val()
$.ajax({
- url:`/api/1.0/users/activities?userId=${userId}&activity=${activity}`,
+ url:`/api/1.0/users/activities/pings?userId=${userId}&activity=${activity}`,
contentType: "application/json; charset=utf-8",
method: "GET",
success: function(response) {
if (response.data.length == 0) {
return;
}
- if(userId) {
- array = [['Активность', 'Количество'],
- ['Конференции', response.data[0].conferences],
- ['Статьи', response.data[0].papers],
- ['Проекты', response.data[0].projects],
- ['Гранты', response.data[0].grants]]
- } else {
- array = [['Пользователи', 'Количество']]
- response.data.forEach(function(element) {
- array.push([element.user.firstName, element[`${activity}`]])
- })
- }
+ array = [['Активности', 'Количество']]
+
+ Object.keys(response.data).forEach(function(key) {
+ console.table('Key : ' + key + ', Value : ' + response.data[key])
+ array.push([key, response.data[key]])
+ })
var data = google.visualization.arrayToDataTable(array);
var options = {
- title: 'Активность',
+ title: 'Активности',
is3D: true,
pieResidueSliceLabel: 'Остальное'
};
diff --git a/src/main/resources/templates/grants/grant.html b/src/main/resources/templates/grants/grant.html
index ff47f83..71f798a 100644
--- a/src/main/resources/templates/grants/grant.html
+++ b/src/main/resources/templates/grants/grant.html
@@ -200,7 +200,7 @@
@@ -333,22 +333,6 @@
var lid = $("#leaderId option:selected").val();
$("#authors [value='" + lid + "']").attr("disabled", "disabled");
}
-
- function sendPing() {
- id = document.getElementById("grantId").value
-
- $.ajax({
- url:"/grants/ping?grantId=" + id,
- contentType: "application/json; charset=utf-8",
- method: "POST",
- success: function() {
- showFeedbackMessage("Пароль был обновлен", MessageTypesEnum.SUCCESS)
- },
- error: function(errorData) {
- showFeedbackMessage(errorData.responseJSON.error.message, MessageTypesEnum.WARNING)
- }
- })
- }