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

fix

Browse Source
This commit is contained in:
Alyona 2018-11-10 20:28:17 +04:00
parent e76e7ad864
commit 376c820b44
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/ru/ulstu/timeline/model/Event.java
View File

@ -70,6 +70,22 @@ public class Event extends BaseEntity {
this.title = title;
}
public Event.EventStatus getStatus() {
return status;
}
public void setStatus(EventStatus status) {
this.status = status;
}
public PeriodEvent getPeriod() {return period;}
public void setPeriod(PeriodEvent period){this.period = period;}
public Date getBeginDate() {return beginDate;}
public void setBeginDate(Date beginDate) {this.beginDate = beginDate;}
public Date getCreateDate() {
return createDate;
}

4
src/main/java/ru/ulstu/timeline/service/EventScheduler.java
View File

@ -7,6 +7,7 @@ import ru.ulstu.core.util.DateUtils;
import ru.ulstu.timeline.model.Event;
import ru.ulstu.timeline.model.EventDto;
import ru.ulstu.timeline.repository.EventRepository;
import ru.ulstu.user.model.UserDto;
import java.sql.Date;
import java.time.LocalDate;
@ -14,6 +15,7 @@ import java.time.Period;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
public class EventScheduler {
@ -36,9 +38,11 @@ public class EventScheduler {
event.setBeginDate(DateUtils.addDays(event.getBeginDate(), event.getPeriod().getPeriod().getDays()));
event.setUpdateDate(null);
eventService.create(new EventDto(
event.getId(),
event.getTitle(),
event.getStatus(),
event.getPeriod(),
event.getBeginDate(),
event.getExecuteDate(),