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

#79 fixing bug

Browse Source
This commit is contained in:
ASH 2019-04-30 22:05:57 +04:00
parent b4c11a7f90
commit 7ce8b20841
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/ru/ulstu/students/service/TaskService.java
View File

@ -130,12 +130,15 @@ public class TaskService {
return newTask; return newTask;
} }
@Transactional
public void generateYearTasks() { public void generateYearTasks() {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.setTime(new Date()); cal.setTime(new Date());
List<Task> tasks = taskRepository.findToGenerate(cal.get(Calendar.DAY_OF_MONTH), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.YEAR)); List<Task> tasks = taskRepository.findToGenerate(cal.get(Calendar.DAY_OF_MONTH), cal.get(Calendar.MONTH) + 1, cal.get(Calendar.YEAR) - 1);
System.out.println(cal.get(Calendar.DAY_OF_MONTH) + " " + cal.get(Calendar.MONTH)); tasks.forEach(task -> {
tasks.forEach(task -> taskRepository.save(copyYearTask(task))); Task newTask = copyYearTask(task);
taskRepository.save(newTask);
});
} }
public List<Task.TaskStatus> getTaskStatuses() { public List<Task.TaskStatus> getTaskStatuses() {

8
src/main/resources/public/js/tasks.js
View File

@ -21,6 +21,14 @@ $(document).ready(function () {
$("#input-tag").keyup(function (event) { $("#input-tag").keyup(function (event) {
if(event.keyCode == 13 || event.keyCode == 188) { if(event.keyCode == 13 || event.keyCode == 188) {
var tagNumber = $("#tags .tag").length; var tagNumber = $("#tags .tag").length;
if(length != 0) {
tagNumber = $("#tags .tag").last()
.children('input')
.attr("name")
.split(']')[0]
.split('[')[1];
tagNumber++;
}
var tagName = $.trim($(this).val()); var tagName = $.trim($(this).val());
var addTag = true; var addTag = true;
// проверка, добавлен ли этот тег // проверка, добавлен ли этот тег