Merge branch 'master' into 46-mvc

# Conflicts:
#	src/main/java/ru/ulstu/paper/controller/PaperController.java
#	src/main/java/ru/ulstu/paper/model/Paper.java
#	src/main/java/ru/ulstu/paper/model/PaperDto.java
#	src/main/resources/public/js/papers.js
#	src/main/resources/templates/papers/paper.html
#	src/main/resources/templates/papers/papers.html

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,3 @@
-#Tue Feb 06 11:48:53 SAMT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

src/main/java/ru/ulstu/deadline/model/Deadline.java

@@ -0,0 +1,41 @@
+package ru.ulstu.deadline.model;
+
+import ru.ulstu.core.model.BaseEntity;
+
+import javax.persistence.Entity;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import java.util.Date;
+
+@Entity
+public class Deadline extends BaseEntity {
+
+    private String description;
+
+    @Temporal(value = TemporalType.TIMESTAMP)
+    private Date date;
+
+    public Deadline() {
+    }
+
+    public Deadline(Date deadlineDate, String description) {
+        this.date = deadlineDate;
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+}

src/main/java/ru/ulstu/deadline/model/DeadlineDto.java

@@ -0,0 +1,41 @@
+package ru.ulstu.deadline.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Date;
+
+public class DeadlineDto {
+    private final Integer id;
+
+    private final String description;
+
+    private final Date date;
+
+    @JsonCreator
+    public DeadlineDto(@JsonProperty("id") Integer id,
+                       @JsonProperty("description") String description,
+                       @JsonProperty("date") Date date) {
+        this.id = id;
+        this.description = description;
+        this.date = date;
+    }
+
+    public DeadlineDto(Deadline deadline) {
+        this.id = deadline.getId();
+        this.description = deadline.getDescription();
+        this.date = deadline.getDate();
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+}

src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java

@@ -0,0 +1,9 @@
+package ru.ulstu.deadline.repository;
+
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import ru.ulstu.deadline.model.Deadline;
+
+public interface DeadlineRepository extends JpaRepository<Deadline, Integer> {
+
+}

src/main/java/ru/ulstu/deadline/service/DeadlineService.java

@@ -0,0 +1,45 @@
+package ru.ulstu.deadline.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.deadline.model.DeadlineDto;
+import ru.ulstu.deadline.repository.DeadlineRepository;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class DeadlineService {
+    private final DeadlineRepository deadlineRepository;
+
+    public DeadlineService(DeadlineRepository deadlineRepository) {
+        this.deadlineRepository = deadlineRepository;
+    }
+
+    public List<Deadline> saveOrCreate(List<DeadlineDto> deadlines) {
+        return deadlines.stream().map(deadlineDto -> {
+            return deadlineDto.getId() != null ? update(deadlineDto) : create(deadlineDto);
+        }).collect(Collectors.toList());
+    }
+
+    @Transactional
+    public Deadline update(DeadlineDto deadlineDto) {
+        Deadline deadline = deadlineRepository.findOne(deadlineDto.getId());
+        deadlineRepository.save(copyFromDto(deadline, deadlineDto));
+        return deadline;
+    }
+
+    @Transactional
+    public Deadline create(DeadlineDto deadlineDto) {
+        Deadline newDeadline = copyFromDto(new Deadline(), deadlineDto);
+        newDeadline = deadlineRepository.save(newDeadline);
+        return newDeadline;
+    }
+
+    private Deadline copyFromDto(Deadline deadline, DeadlineDto deadlineDto) {
+        deadline.setDate(deadlineDto.getDate());
+        deadline.setDescription(deadlineDto.getDescription());
+        return deadline;
+    }
+}

src/main/java/ru/ulstu/grant/model/Grant.java

@@ -0,0 +1,106 @@
+package ru.ulstu.grant.model;
+
+import org.hibernate.validator.constraints.NotBlank;
+import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.core.model.UserContainer;
+import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.file.model.FileData;
+import ru.ulstu.project.model.Project;
+import ru.ulstu.user.model.User;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@Entity
+public class Grant extends BaseEntity  {
+    public enum GrantStatus {
+        APPLICATION("Заявка"),
+        ON_COMPETITION("Отправлен на конкурс"),
+        SUCCESSFUL_PASSAGE("Успешное прохождение"),
+        IN_WORK("В работе"),
+        COMPLETED("Завершен"),
+        FAILED("Провалены сроки");
+
+        private String name;
+
+        GrantStatus(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
+    @NotBlank
+    private String title;
+
+    @Enumerated(value = EnumType.STRING)
+    private GrantStatus status = GrantStatus.APPLICATION;
+
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "grant_id")
+    private List<Deadline> deadlines = new ArrayList<>();
+
+    //Описание гранта
+    @NotNull
+    private String comment;
+
+    //Заявка на грант
+    @ManyToOne
+    @JoinColumn(name = "file_id")
+    private FileData application;
+
+    @ManyToOne(cascade = CascadeType.ALL)
+    @JoinColumn(name = "project_id")
+    private Project project;
+
+    public GrantStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(GrantStatus status) {
+        this.status = status;
+    }
+
+    public List<Deadline> getDeadlines() {
+        return deadlines;
+    }
+
+    public void setDeadlines(List<Deadline> deadlines) {
+        this.deadlines = deadlines;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public FileData getApplication() {
+        return application;
+    }
+
+    public void setApplication(FileData application) { this.application = application; }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) { this.title = title; }
+
+    public Project getProject() {
+        return project;
+    }
+
+    public void setProject(Project project) {
+        this.project = project;
+    }
+}

src/main/java/ru/ulstu/grant/model/GrantDto.java

@@ -0,0 +1,76 @@
+package ru.ulstu.grant.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.hibernate.validator.constraints.NotEmpty;
+import ru.ulstu.deadline.model.DeadlineDto;
+import ru.ulstu.project.model.ProjectDto;
+
+import java.util.List;
+
+import static ru.ulstu.core.util.StreamApiUtils.convert;
+
+public class GrantDto {
+    private final Integer id;
+    @NotEmpty
+    private final String title;
+    private final Grant.GrantStatus status;
+    private final List<DeadlineDto> deadlines;
+    private final String comment;
+    private final String applicationFileName;
+    private final ProjectDto project;
+
+    @JsonCreator
+    public GrantDto(@JsonProperty("id") Integer id,
+                    @JsonProperty("title") String title,
+                    @JsonProperty("status") Grant.GrantStatus status,
+                    @JsonProperty("deadlines") List<DeadlineDto> deadlines,
+                    @JsonProperty("comment") String comment,
+                    @JsonProperty("project") ProjectDto project) {
+        this.id = id;
+        this.title = title;
+        this.status = status;
+        this.deadlines = deadlines;
+        this.comment = comment;
+        this.applicationFileName = null;
+        this.project = project;
+    }
+
+    public GrantDto(Grant grant) {
+        this.id = grant.getId();
+        this.title = grant.getTitle();
+        this.status = grant.getStatus();
+        this.deadlines = convert(grant.getDeadlines(), DeadlineDto::new);
+        this.comment = grant.getComment();
+        this.project = grant.getProject() == null ? null : new ProjectDto(grant.getProject());
+        this.applicationFileName = grant.getApplication() == null ? null : grant.getApplication().getName();
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Grant.GrantStatus getStatus() {
+        return status;
+    }
+
+    public List<DeadlineDto> getDeadlines() {
+        return deadlines;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public ProjectDto getProject() {
+        return project;
+    }
+
+    public String getApplicationFileName() {
+        return applicationFileName;
+    }
+}

src/main/java/ru/ulstu/grant/model/GrantStatusDto.java

@@ -0,0 +1,19 @@
+package ru.ulstu.grant.model;
+
+public class GrantStatusDto {
+    private final String id;
+    private final String name;
+
+    public GrantStatusDto(Grant.GrantStatus status) {
+        this.id = status.name();
+        this.name = status.getName();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

src/main/java/ru/ulstu/paper/model/Paper.java

@@ -3,9 +3,11 @@ package ru.ulstu.paper.model;
 import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.core.model.UserContainer;
+import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileData;
 import ru.ulstu.user.model.User;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -16,9 +18,14 @@ import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.OneToMany;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 @Entity
@@ -56,10 +63,9 @@ public class Paper extends BaseEntity implements UserContainer {
     @Temporal(TemporalType.TIMESTAMP)
     private Date updateDate = new Date();
 
-    @Column(name = "deadline_date")
-    @NotNull
-    @Temporal(TemporalType.DATE)
-    private Date deadlineDate;
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "paper_id")
+    private List<Deadline> deadlines = new ArrayList<>();
 
     private String comment;
 
@@ -96,12 +102,12 @@ public class Paper extends BaseEntity implements UserContainer {
         this.updateDate = updateDate;
     }
 
-    public Date getDeadlineDate() {
-        return deadlineDate;
+    public List<Deadline> getDeadlines() {
+        return deadlines;
     }
 
-    public void setDeadlineDate(Date deadlineDate) {
-        this.deadlineDate = deadlineDate;
+    public void setDeadlines(List<Deadline> deadlines) {
+        this.deadlines = deadlines;
     }
 
     public String getComment() {
@@ -148,4 +154,12 @@ public class Paper extends BaseEntity implements UserContainer {
     public Set<User> getUsers() {
         return getAuthors();
     }
+
+    public Optional<Deadline> getNextDeadline() {
+        return deadlines
+                .stream()
+                .sorted(Comparator.comparing(Deadline::getDate))
+                .filter(d -> d.getDate().after(new Date()))
+                .findFirst();
+    }
 }

src/main/java/ru/ulstu/paper/model/PaperDto.java

@@ -1,13 +1,18 @@
 package ru.ulstu.paper.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.format.annotation.DateTimeFormat;
+import ru.ulstu.deadline.model.DeadlineDto;
+import ru.ulstu.deadline.model.DeadlineDto;
 import ru.ulstu.user.model.UserDto;
 
 import javax.validation.constraints.Future;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.Date;
+import java.util.List;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -21,9 +26,7 @@ public class PaperDto {
     private Paper.PaperStatus status;
     private Date createDate;
     private Date updateDate;
-    @NotNull
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date deadlineDate;
+    private final List<DeadlineDto> deadlines;
     private String comment;
     private Boolean locked;
     private String tmpFileName;
@@ -32,7 +35,30 @@ public class PaperDto {
     private Date fileCreateDate;
     private Set<Integer> authors;
 
-    public PaperDto() {
+    @JsonCreator
+    public PaperDto(@JsonProperty("id") Integer id,
+                    @JsonProperty("title") String title,
+                    @JsonProperty("status") Paper.PaperStatus status,
+                    @JsonProperty("createDate") Date createDate,
+                    @JsonProperty("updateDate") Date updateDate,
+                    @JsonProperty("deadlines") List<DeadlineDto> deadlines,
+                    @JsonProperty("comment") String comment,
+                    @JsonProperty("locked") Boolean locked,
+                    @JsonProperty("tmpFileName") String tmpFileName,
+                    @JsonProperty("authors") Set<Integer> authors) {
+        this.id = id;
+        this.title = title;
+        this.status = status;
+        this.createDate = createDate;
+        this.updateDate = updateDate;
+        this.deadlines = deadlines;
+        this.comment = comment;
+        this.locked = locked;
+        this.tmpFileName = tmpFileName;
+        this.fileId = null;
+        this.fileName = null;
+        this.fileCreateDate = null;
+        this.authors = authors;
     }
 
     public PaperDto(Paper paper) {
@@ -41,7 +67,7 @@ public class PaperDto {
         this.status = paper.getStatus();
         this.createDate = paper.getCreateDate();
         this.updateDate = paper.getUpdateDate();
-        this.deadlineDate = paper.getDeadlineDate();
+        this.deadlines = convert(paper.getDeadlines(), DeadlineDto::new);
         this.comment = paper.getComment();
         this.locked = paper.getLocked();
         this.tmpFileName = null;
@@ -71,8 +97,8 @@ public class PaperDto {
         return updateDate;
     }
 
-    public Date getDeadlineDate() {
-        return deadlineDate;
+    public List<DeadlineDto> getDeadlines() {
+        return deadlines;
     }
 
     public String getComment() {
@@ -123,10 +149,6 @@ public class PaperDto {
         this.updateDate = updateDate;
     }
 
-    public void setDeadlineDate(Date deadlineDate) {
-        this.deadlineDate = deadlineDate;
-    }
-
     public void setComment(String comment) {
         this.comment = comment;
     }

src/main/java/ru/ulstu/paper/service/PaperNotificationService.java

@@ -29,16 +29,16 @@ public class PaperNotificationService {
     }
 
     private boolean needToSendDeadlineNotification(Paper paper, Date compareDate, boolean isDeadlineBeforeWeek) {
-        return (paper.getDeadlineDate() != null)
-                && (compareDate.after(paper.getDeadlineDate()) && isDeadlineBeforeWeek
-                || compareDate.before(paper.getDeadlineDate()) && !isDeadlineBeforeWeek)
-                && paper.getDeadlineDate().after(new Date());
+        return (paper.getNextDeadline().isPresent())
+                && (compareDate.after(paper.getNextDeadline().get().getDate()) && isDeadlineBeforeWeek
+                || compareDate.before(paper.getNextDeadline().get().getDate()) && !isDeadlineBeforeWeek)
+                && paper.getNextDeadline().get().getDate().after(new Date());
     }
 
     private void sendMessageDeadline(Paper paper) {
         paper.getAuthors().forEach(user -> {
             mailService.sendEmail(user.getEmail(), "Приближается срок сдачи статьи",
-                    "Срок сдачи статьи " + paper.getTitle() + " " + paper.getDeadlineDate().toString());
+                    "Срок сдачи статьи " + paper.getTitle() + " " + paper.getNextDeadline().get().getDate().toString());
         });
     }
 

src/main/java/ru/ulstu/paper/service/PaperService.java

@@ -2,6 +2,8 @@ package ru.ulstu.paper.service;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.file.service.FileService;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.model.PaperDto;
@@ -27,17 +29,19 @@ public class PaperService {
     private final PaperNotificationService paperNotificationService;
     private final PaperRepository paperRepository;
     private final UserService userService;
+    private final DeadlineService deadlineService;
     private final FileService fileService;
 
-
     public PaperService(PaperRepository paperRepository,
                         FileService fileService,
                         PaperNotificationService paperNotificationService,
-                        UserService userService) {
+                        UserService userService,
+                        DeadlineService deadlineService) {
         this.paperRepository = paperRepository;
         this.fileService = fileService;
         this.paperNotificationService = paperNotificationService;
         this.userService = userService;
+        this.deadlineService = deadlineService;
     }
 
     public List<Paper> findAll() {
@@ -75,7 +79,7 @@ public class PaperService {
         paper.setStatus(paperDto.getStatus() == null ? DRAFT : paperDto.getStatus());
         paper.setTitle(paperDto.getTitle());
         paper.setUpdateDate(new Date());
-        paper.setDeadlineDate(paperDto.getDeadlineDate());
+        paper.setDeadlines(deadlineService.saveOrCreate(paperDto.getDeadlines()));
         if (paperDto.getTmpFileName() != null) {
             paper.setFileData(fileService.createFileFromTmp(paperDto.getTmpFileName()));
         }
@@ -121,7 +125,7 @@ public class PaperService {
         Paper paper = new Paper();
         paper.setTitle(title);
         paper.getAuthors().add(user);
-        paper.setDeadlineDate(deadlineDate);
+        paper.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
         paper.setCreateDate(new Date());
         paper.setUpdateDate(new Date());
         paper.setStatus(DRAFT);
@@ -136,14 +140,18 @@ public class PaperService {
         return convert(paperRepository.filter(userService.findById(filterDto.getAuthorId()), filterDto.getYear()), PaperDto::new);
     }
 
+    public PaperDto findPaper(int id){
+        return new PaperDto(paperRepository.getOne(id));
+    }
+
     public void closeFailedPapers() {
         List<Paper> papers = paperRepository.findAll()
                 .stream()
-                .filter(paper -> paper.getDeadlineDate() != null
+                .filter(paper -> paper.getNextDeadline().isPresent()
                         && (paper.getStatus() == ON_PREPARATION
                         || paper.getStatus() == DRAFT
                         || paper.getStatus() == ATTENTION)
-                        && paper.getDeadlineDate().before(new Date()))
+                        && paper.getNextDeadline().get().getDate().before(new Date()))
                 .collect(Collectors.toList());
         papers.forEach(paper -> {
             Paper.PaperStatus oldStatus = paper.getStatus();

src/main/java/ru/ulstu/project/model/Project.java

@@ -0,0 +1,39 @@
+package ru.ulstu.project.model;
+
+import org.hibernate.validator.constraints.NotBlank;
+import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.deadline.model.Deadline;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+public class Project extends BaseEntity {
+
+    @NotBlank
+    private String title;
+
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "project_id")
+    private List<Deadline> deadlines = new ArrayList<>();
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public List<Deadline> getDeadlines() {
+        return deadlines;
+    }
+
+    public void setDeadlines(List<Deadline> deadlines) {
+        this.deadlines = deadlines;
+    }
+}

src/main/java/ru/ulstu/project/model/ProjectDto.java

@@ -0,0 +1,42 @@
+package ru.ulstu.project.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.hibernate.validator.constraints.NotEmpty;
+import ru.ulstu.deadline.model.DeadlineDto;
+
+import java.util.List;
+
+import static ru.ulstu.core.util.StreamApiUtils.convert;
+
+public class ProjectDto {
+    private final Integer id;
+
+    @NotEmpty
+    private final String title;
+
+    private final List<DeadlineDto> deadlines;
+
+    @JsonCreator
+    public ProjectDto(@JsonProperty("id") Integer id,
+                      @JsonProperty("title") String title,
+                      @JsonProperty("deadlines") List<DeadlineDto> deadlines) {
+        this.id = id;
+        this.title = title;
+        this.deadlines = deadlines;
+    }
+
+    public ProjectDto(Project project) {
+        this.id = project.getId();
+        this.title = project.getTitle();
+        this.deadlines = convert(project.getDeadlines(), DeadlineDto::new);
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+}

src/main/resources/db/changelog-20181208_000000-schema.xml

@@ -0,0 +1,65 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="tanya" id="20181208_000000-1">
+        <createTable tableName="project">
+            <column name="id" type="integer">
+                <constraints nullable="false"/>
+            </column>
+            <column name="title" type="varchar(255)"/>
+            <column name="version" type="integer"/>
+        </createTable>
+        <addPrimaryKey columnNames="id" constraintName="pk_project" tableName="project"/>
+    </changeSet>
+
+
+    <changeSet author="tanya" id="20181208_000000-2">
+        <createTable tableName="grant">
+            <column name="id" type="integer">
+                <constraints nullable="false"/>
+            </column>
+            <column name="title" type="varchar(255)"/>
+            <column name="status" type="varchar(255)"/>
+            <column name="deadline_date" type="timestamp"/>
+            <column name="comment" type="varchar(255)"/>
+            <column name="project_id" type="integer"/>
+            <column name="file_id" type="integer"/>
+            <column name="applicationFileName" type="varchar(255)">
+                <constraints nullable="true"/>
+            </column>
+            <column name="version" type="integer"/>
+        </createTable>
+        <addPrimaryKey columnNames="id" constraintName="pk_grant" tableName="grant"/>
+        <addForeignKeyConstraint baseTableName="grant" baseColumnNames="project_id"
+                                 constraintName="fk_grant_project_id" referencedTableName="project"
+                                 referencedColumnNames="id"/>
+        <addForeignKeyConstraint baseTableName="grant" baseColumnNames="file_id"
+                                 constraintName="fk_grant_file_id" referencedTableName="file"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+
+    <changeSet author="orion" id="20181211_000000-3">
+        <createTable tableName="deadline">
+            <column name="id" type="integer">
+                <constraints nullable="false"/>
+            </column>
+            <column name="date" type="timestamp"/>
+            <column name="description" type="varchar(255)"/>
+            <column name="project_id" type="integer"/>
+            <column name="grant_id" type="integer"/>
+            <column name="paper_id" type="integer"/>
+            <column name="version" type="integer"/>
+        </createTable>
+        <addPrimaryKey columnNames="id" constraintName="pk_deadline" tableName="deadline"/>
+        <addForeignKeyConstraint baseTableName="deadline" baseColumnNames="project_id"
+                                 constraintName="fk_deadline_project_id" referencedTableName="project"
+                                 referencedColumnNames="id"/>
+        <addForeignKeyConstraint baseTableName="deadline" baseColumnNames="grant_id"
+                                 constraintName="fk_deadline_grant_id" referencedTableName="grant"
+                                 referencedColumnNames="id"/>
+        <addForeignKeyConstraint baseTableName="deadline" baseColumnNames="paper_id"
+                                 constraintName="fk_deadline_paper_id" referencedTableName="paper"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog-master.xml

@@ -16,4 +16,5 @@
     <include file="db/changelog-20181031_000000-schema.xml"/>
     <include file="db/changelog-20181108_000000-data.xml"/>
     <include file="db/changelog-20181111_000000-schema.xml"/>
+    <include file="db/changelog-20181208_000000-schema.xml"/>
 </databaseChangeLog>

src/main/resources/mail_templates/paperCreateNotification.html

@@ -13,7 +13,7 @@
     Вам нужно поработать над статьей "<a th:href="@{|${baseUrl}/papers/paper?id=${paper.id}|}"><span th:text="${paper.title}">Title</span></a>".
 </p>
 <p>
-    Срок исполнения: <span th:text="${#dates.format(paper.deadlineDate, 'dd.MM.yyyy HH:mm')}"></span>.
+    Срок исполнения: <span th:text="${#dates.format(paper.nextDeadline.get().date, 'dd.MM.yyyy HH:mm')}"></span>.
 </p>
 <p>
     Regards,

src/main/resources/mail_templates/paperDeadlineNotification.html

@@ -13,7 +13,7 @@
     Приближается срок сдачи статьи "<span th:text="${paper.title}">Title</span>".
 </p>
 <p>
-    Срок исполнения: <span th:text="${#dates.format(paper.deadlineDate, 'dd.MM.yyyy HH:mm')}"></span>.
+    Срок исполнения: <span th:text="${#dates.format(paper.nextDeadline.get().date, 'dd.MM.yyyy HH:mm')}"></span>.
 </p>
 <p>
     Regards,

src/main/resources/public/js/papers.js

@@ -1,6 +1,7 @@
 var urlPapers = "/api/1.0/papers";
 var urlPaperStatuses = "/api/1.0/papers/statuses";
 var urlDeletePaper = "/api/1.0/papers/";
+var urlFilterPaper = "/api/1.0/papers/filter"
 
 function showPapers(papersElement, paperRowClass) {
     getFromRest(urlPapers, function (paperList) {
@@ -32,7 +33,49 @@ function showPapers(papersElement, paperRowClass) {
     });
 }
 
-function deletePaper(idElement, papersElement, paperRowClass) {
+
+function filterPapers(papersElement, paperRowClass, authorId, year) {
+    var paperData = JSON.stringify({
+        "authorId": authorId,
+        "year": year
+    });
+    postToRest(urlFilterPaper, paperData, function (data) {
+        $(paperRowClass).remove();
+        if(data.length > 0){
+            data.forEach(function (paper, index) {
+                $(papersElement).parent().append("<div class='row text-left paper-row'>" +
+                    "                <div class='col-md-11'>" +
+                    "                <span class='fa-stack fa-1x'>\n" +
+                    "                  <i class='fa fa-circle fa-stack-2x " + getPaperStatusClass(paper.status) + "'></i>" +
+                    "                  <i class='fa fa-file-text-o fa-stack-1x fa-inverse'></i>" +
+                    "                </span>" +
+                    "                    <a href='paper?id=" + paper.id + "" +
+                    "'><span>" + paper.title + "</span></a></div>" +
+                    "<div class='col-md-1'>" +
+                    "<span class='remove-paper d-none' onclick=\"deletePaper(" + paper.id + ",'" + papersElement + "', '" + paperRowClass + "')\">" +
+                    "<i class=\"fa fa-trash\" aria-hidden=\"true\"></i></span>" +
+                    "                </div></div>");
+            });
+
+
+            $(paperRowClass).mouseenter(function (event) {
+                var paperRow = $(event.target).closest(paperRowClass);
+                $(paperRow).css("background-color", "#f8f9fa");
+                $(paperRow).find(".remove-paper").removeClass("d-none");
+
+            });
+            $(paperRowClass).mouseleave(function (event) {
+                var paperRow = $(event.target).closest(paperRowClass);
+                $(paperRow).css("background-color", "white");
+                $(paperRow).closest(paperRowClass).find(".remove-paper").addClass("d-none");
+            });
+        }
+    });
+
+
+}
+
+function deletePaper(id, papersElement, paperRowClass) {
     var id = $(idElement).parent().find('.id-class').val();
     $("#remove-paper-modal").modal('show');
 
@@ -50,16 +93,16 @@ function deletePaper(idElement, papersElement, paperRowClass) {
     });
 }
 
-function addPaper(title, status, comment, locked) {
-    var paperData = JSON.stringify({
+function addPaper(title, status, datePublish, dateUpdate, deadline, comment, locked, tmpFileName, authors) {
+     var paperData = JSON.stringify({
         "title": title,
         "status": status,
-        "comment": comment,
-        "locked": locked
-    });
-    postToRest(urlPapers, paperData, function (data) {
+        "deadlineDate":deadline,
+        "comment": comment
+      });
+     postToRest(urlPapers, paperData, function (data) {
         alert(data);
-    });
+     });
 }
 
 function getPaperStatusClass(status) {

src/main/resources/templates/papers/papers.html

@@ -28,7 +28,27 @@
                             <a href="./paper?id=0" class="btn btn-light toolbar-button"><i class="fa fa-plus-circle"
                                                                                       aria-hidden="true"></i>
                                 Добавить статью</a>
+
                         </div>
+
+                    </div>
+                    <div class = "filter">
+                        <h5>Фильтровать по:</h5>
+                        <select id = "author">
+                            <option value = "1">Алёна</option>
+                            <option value = "2">Маша</option>
+                            <option value = "3">Петя</option>
+                        </select>
+                        <select id = "index score">
+                            <option >РИНЦ</option>
+                            <option>Scopus</option>
+                            <option>Web of science</option>
+                        </select>
+                        <select id = "year">
+                            <option>2018</option>
+                            <option>2017</option>
+                            <option>2016</option>
+                        </select>
                     </div>
                 </div>
             </div>
@@ -70,6 +90,11 @@
                 $(paperRow).css("background-color", "white");
                 $(paperRow).closest(".paper-row").find(".remove-paper").addClass("d-none");
             });
+            showPapers("#paper-list", ".paper-row");
+            jQuery('.filter').on('change','#year',function(){
+
+                filterPapers("#paper-list", ".paper-row",'1','2018');
+            });
         });
         /*]]>*/
     </script>