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

fix code

Browse Source
This commit is contained in:
Anton Romanov 2018-11-14 17:03:22 +04:00
parent 112958a70b
commit f587f80eb6
4 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/ru/ulstu/core/controller/AdviceController.java
View File

@ -11,8 +11,15 @@ import ru.ulstu.core.error.EntityIdIsNullException;
import ru.ulstu.core.model.ErrorConstants; import ru.ulstu.core.model.ErrorConstants;
import ru.ulstu.core.model.response.Response; import ru.ulstu.core.model.response.Response;
import ru.ulstu.core.model.response.ResponseExtended; import ru.ulstu.core.model.response.ResponseExtended;
import ru.ulstu.user.error.*; import ru.ulstu.user.error.UserActivationError;
import ru.ulstu.user.error.*; import ru.ulstu.user.error.UserEmailExistsException;
import ru.ulstu.user.error.UserIdExistsException;
import ru.ulstu.user.error.UserIsUndeadException;
import ru.ulstu.user.error.UserLoginExistsException;
import ru.ulstu.user.error.UserNotActivatedException;
import ru.ulstu.user.error.UserNotFoundException;
import ru.ulstu.user.error.UserPasswordsNotValidOrNotMatchException;
import ru.ulstu.user.error.UserResetKeyError;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;

19
src/main/java/ru/ulstu/odin/service/OdinService.java
View File

@ -5,12 +5,25 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.ulstu.core.error.OdinException; import ru.ulstu.core.error.OdinException;
import ru.ulstu.odin.model.*; import ru.ulstu.odin.model.OdinBooleanField;
import ru.ulstu.odin.model.*; import ru.ulstu.odin.model.OdinCollectionField;
import ru.ulstu.odin.model.OdinDateField;
import ru.ulstu.odin.model.OdinDto;
import ru.ulstu.odin.model.OdinField;
import ru.ulstu.odin.model.OdinMetadata;
import ru.ulstu.odin.model.OdinNumericField;
import ru.ulstu.odin.model.OdinObjectField;
import ru.ulstu.odin.model.OdinStringField;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.*; import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service

8
src/main/java/ru/ulstu/timeline/model/EventDto.java
View File

@ -65,9 +65,13 @@ public class EventDto {
return title; return title;
} }
public PeriodEvent getPeriod() { return period; } public PeriodEvent getPeriod() {
return period;
}
public Event.EventStatus getStatus() { return status; } public Event.EventStatus getStatus() {
return status;
}
public Date getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;

28
src/main/java/ru/ulstu/timeline/model/PeriodEvent.java
View File

@ -3,22 +3,24 @@ package ru.ulstu.timeline.model;
import java.time.Period; import java.time.Period;
public enum PeriodEvent { public enum PeriodEvent {
EVERY_YEAR(Period.ofYears(1), "Каждый год"), EVERY_YEAR(Period.ofYears(1), "Каждый год"),
EVERY_MONTH(Period.ofMonths(1), "Каждый месяц"), EVERY_MONTH(Period.ofMonths(1), "Каждый месяц"),
EVERY_WEEK(Period.ofWeeks(1), "Каждую неделю"), EVERY_WEEK(Period.ofWeeks(1), "Каждую неделю"),
EVERY_DAY(Period.ofDays(1), "Каждый день"); EVERY_DAY(Period.ofDays(1), "Каждый день");
private Period period; private Period period;
private String message; private String message;
PeriodEvent(Period period, String message) { PeriodEvent(Period period, String message) {
this.period = period; this.period = period;
this.message = message; this.message = message;
} }
public Period getPeriod() { return period; } public Period getPeriod() {
return period;
}
public String getMessage() { public String getMessage() {
return message; return message;
} }
} }