From 65d788512beb022a765933e13b140b1587839f72 Mon Sep 17 00:00:00 2001
From: Elena <emilyelison@mail.ru>
Date: Fri, 9 Nov 2018 13:42:28 +0400
Subject: [PATCH 01/10] =?UTF-8?q?=D0=97=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=20?=
 =?UTF-8?q?=E2=84=9610?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/public/js/papers.js         | 8 ++++++--
 src/main/resources/templates/papers/paper.html | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/public/js/papers.js b/src/main/resources/public/js/papers.js
index bab27a7..9035221 100644
--- a/src/main/resources/public/js/papers.js
+++ b/src/main/resources/public/js/papers.js
@@ -17,12 +17,16 @@ function showPapers(papersElement) {
     });
 }
 
-function addPaper(title, status, comment, locked) {
+function addPaper(title, status, comment, locked, deadline, file, dateCreate, dateUpdate) {
     var paperData = JSON.stringify({
         "title": title,
         "status": status,
         "comment": comment,
-        "locked": locked
+        "deadline":deadline,
+        "locked": locked,
+        "file":file,
+        "dateCreate":dateUpdate,
+        "dateUpdate":dateUpdate
     });
     postToRest(urlPapers, paperData, function (data) {
         alert(data);
diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html
index 8cc9161..eee175d 100644
--- a/src/main/resources/templates/papers/paper.html
+++ b/src/main/resources/templates/papers/paper.html
@@ -149,7 +149,7 @@
                             <div class="col-lg-12">
                                 <div class="form-group">
                                     <button id="sendMessageButton" class="btn btn-success text-uppercase"
-                                            type="submit">
+                                            type="submit" onclick="return addPaper()" >
                                         Сохранить
                                     </button>
                                     <button id="cancelButton" class="btn btn-default text-uppercase" type="button">
@@ -182,6 +182,8 @@
             getFromRest(urlPaperStatuses, function (response) {
                 fillSelect($("#status"), response);
             });
+
+            addPaper("название", "DRAFT", "comment", false);
         });
         /*]]>*/
     </script>

From 2db572f284cbc67483c0e5149d40ff9aadd2652f Mon Sep 17 00:00:00 2001
From: Elena <emilyelison@mail.ru>
Date: Fri, 9 Nov 2018 15:43:25 +0400
Subject: [PATCH 02/10] =?UTF-8?q?=D0=97=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=20?=
 =?UTF-8?q?=E2=84=9610?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/public/js/papers.js         | 11 ++++++-----
 src/main/resources/templates/papers/paper.html |  5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/public/js/papers.js b/src/main/resources/public/js/papers.js
index dd87c0b..d114fd9 100644
--- a/src/main/resources/public/js/papers.js
+++ b/src/main/resources/public/js/papers.js
@@ -17,16 +17,17 @@ function showPapers(papersElement) {
     });
 }
 
-function addPaper(title, status, comment, locked, deadline, file, dateCreate, dateUpdate) {
+function addPaper(title, status,dateCreate, dateUpdate,deadline, comment, locked, tmpFileName, authors) {
     var paperData = JSON.stringify({
         "title": title,
         "status": status,
-        "comment": comment,
+        "date-publish":date-publish,
+        "date-update":date-update,
         "deadline":deadline,
+        "comment": comment,
         "locked": locked,
-        "file":file,
-        "dateCreate":dateUpdate,
-        "dateUpdate":dateUpdate
+        "tmpFileName":tmpFileName,
+        "authors":authors
     });
     postToRest(urlPapers, paperData, function (data) {
         alert(data);
diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html
index eee175d..507a90f 100644
--- a/src/main/resources/templates/papers/paper.html
+++ b/src/main/resources/templates/papers/paper.html
@@ -149,7 +149,8 @@
                             <div class="col-lg-12">
                                 <div class="form-group">
                                     <button id="sendMessageButton" class="btn btn-success text-uppercase"
-                                            type="submit" onclick="return addPaper()" >
+                                            type="button" onclick="return addPaper(name,status,date-publish,date-update,
+                                            deadline,comment,locked,loader,myInput)" >
                                         Сохранить
                                     </button>
                                     <button id="cancelButton" class="btn btn-default text-uppercase" type="button">
@@ -183,7 +184,7 @@
                 fillSelect($("#status"), response);
             });
 
-            addPaper("название", "DRAFT", "comment", false);
+            addPaper(name,status,date-publish,date-update,deadline,comment,locked,loader,myInput);
         });
         /*]]>*/
     </script>

From 02f762b4f17eff57f47ea4d4489bc3307218a115 Mon Sep 17 00:00:00 2001
From: Alyona <alyona.krebs@yandex.ru>
Date: Wed, 14 Nov 2018 08:55:46 +0400
Subject: [PATCH 03/10] filter

---
 src/main/resources/public/js/papers.js        | 10 ++++++++++
 .../resources/templates/papers/papers.html    | 20 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/public/js/papers.js b/src/main/resources/public/js/papers.js
index 3b78d8a..a06198e 100644
--- a/src/main/resources/public/js/papers.js
+++ b/src/main/resources/public/js/papers.js
@@ -62,6 +62,16 @@ function addPaper(title, status, comment, locked) {
     });
 }
 
+function filterPaper(authorId, year) {
+    var paperData = JSON.stringify({
+        "authors": title,
+        "": status
+    });
+    postToRest(urlPapers, paperData, function (data) {
+        alert(data);
+    });
+}
+
 function getPaperStatusClass(status) {
     switch (status) {
         case 'DRAFT':
diff --git a/src/main/resources/templates/papers/papers.html b/src/main/resources/templates/papers/papers.html
index 1c5322a..9a9ee7f 100644
--- a/src/main/resources/templates/papers/papers.html
+++ b/src/main/resources/templates/papers/papers.html
@@ -22,8 +22,26 @@
                             <a href="./paper" class="btn btn-light toolbar-button"><i class="fa fa-plus-circle" aria-hidden="true"></i>
                                 Добавить статью</a>
                         </div>
+                        <div class = "filter">
+                            <h4>Фильтровать по:</h4>
+                            <select id = "author">
+                                <option>Алёна</option>
+                                <option>Маша</option>
+                                <option>Петя</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>
+                </div>1
             </div>
         </div>
     </section>

From 51e84e22a60a5f6516ea5b4e9322969267358d08 Mon Sep 17 00:00:00 2001
From: Elena <emilyelison@mail.ru>
Date: Fri, 23 Nov 2018 13:53:20 +0400
Subject: [PATCH 04/10] =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=2010?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle/wrapper/gradle-wrapper.jar             | Bin 54706 -> 54333 bytes
 gradle/wrapper/gradle-wrapper.properties      |   1 -
 gradlew                                       |  23 ++++++++------
 src/main/resources/public/js/papers.js        |  19 +++++-------
 .../resources/templates/papers/paper.html     |  29 ++++++++++++------
 5 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 59c3905659d674fb3021e1465ad97d87f2b7221a..c44b679acd3f794ddbb3aa5e919244914911014a 100644
GIT binary patch
delta 16261
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
R58?uImXM)F`~TJO{{T0{EVlpv

delta 16615
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
J9Qq&W{{w|CIo|*P

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 98bcec3..568c50b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
diff --git a/gradlew b/gradlew
index 9aa616c..cccdd3d 100755
--- a/gradlew
+++ b/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" "$@"
diff --git a/src/main/resources/public/js/papers.js b/src/main/resources/public/js/papers.js
index e45ea55..07fa21c 100644
--- a/src/main/resources/public/js/papers.js
+++ b/src/main/resources/public/js/papers.js
@@ -49,21 +49,16 @@ function deletePaper(id, papersElement, paperRowClass) {
     });
 }
 
-function addPaper(title, status,dateCreate, dateUpdate,deadline, comment, locked, tmpFileName, authors) {
-    var paperData = JSON.stringify({
+function addPaper(title, status, datePublish, dateUpdate, deadline, comment, locked, tmpFileName, authors) {
+     var paperData = JSON.stringify({
         "title": title,
         "status": status,
-        "date-publish":date-publish,
-        "date-update":date-update,
-        "deadline":deadline,
-        "comment": comment,
-        "locked": locked,
-        "tmpFileName":tmpFileName,
-        "authors":authors
-    });
-    postToRest(urlPapers, paperData, function (data) {
+        "deadlineDate":deadline,
+        "comment": comment
+      });
+     postToRest(urlPapers, paperData, function (data) {
         alert(data);
-    });
+     });
 }
 
 function getPaperStatusClass(status) {
diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html
index 507a90f..fe81537 100644
--- a/src/main/resources/templates/papers/paper.html
+++ b/src/main/resources/templates/papers/paper.html
@@ -49,7 +49,7 @@
 
                                 <div class="form-group">
                                     <label>Дедлайн:</label>
-                                    <input type="date" class="form-control" name="deadline"/>
+                                    <input type="date" class="form-control" name="deadline" id="deadline"/>
                                 </div>
 
                                 <div class="form-check">
@@ -57,18 +57,18 @@
                                     <label class="form-check-label" for="locked">Заблокирована</label>
                                 </div>
                                 <div class="form-group">
-                                    <label for="loader">Загрузить статью:</label>
-                                    <div id="loader">
+                                    <label for="loader" id="loader">Загрузить статью:</label>
+                                    <!--<div id="loader">
 
-                                    </div>
+                                    </div>-->
                                 </div>
                                 <div class="form-group">
                                     <label>Дата публикации:</label>
-                                    <input type="date" class="form-control" name="date-publish"/>
+                                    <input type="date" class="form-control" name="date-publish" id="date-publish"/>
                                 </div>
                                 <div class="form-group">
                                     <label>Последнее изменение:</label>
-                                    <input type="date" class="form-control" name="date-update"/>
+                                    <input type="date" class="form-control" name="date-update" id="date-update"/>
                                 </div>
                                 <p><a href="#myModal1" class="btn btn-primary" data-toggle="modal">Редактировать авторов
                                     статьи</a></p>
@@ -149,8 +149,7 @@
                             <div class="col-lg-12">
                                 <div class="form-group">
                                     <button id="sendMessageButton" class="btn btn-success text-uppercase"
-                                            type="button" onclick="return addPaper(name,status,date-publish,date-update,
-                                            deadline,comment,locked,loader,myInput)" >
+                                            type="button" onclick="savePaper();" >
                                         Сохранить
                                     </button>
                                     <button id="cancelButton" class="btn btn-default text-uppercase" type="button">
@@ -184,8 +183,20 @@
                 fillSelect($("#status"), response);
             });
 
-            addPaper(name,status,date-publish,date-update,deadline,comment,locked,loader,myInput);
         });
+         function savePaper(){
+             var title = document.getElementById("name").value;
+             var status = document.getElementById("status").value;
+             var datePublish = document.getElementById("date-publish").value;
+             var dateUpdate = document.getElementById("date-update").value;
+             var deadline = document.getElementById("deadline").value;
+             var comment = document.getElementById("comment").value;
+             var locked = document.getElementById("locked").value;
+             var tmpFileName = document.getElementById("loader").value;
+             var authors = document.getElementById("myInput").value;
+
+             addPaper(title,status,datePublish,dateUpdate,deadline,comment,locked,tmpFileName,authors);
+        }
         /*]]>*/
     </script>
 </div>

From 8fc6d3b569bf7b857c99ab6ed44b8652fbe44d7d Mon Sep 17 00:00:00 2001
From: Elena <emilyelison@mail.ru>
Date: Fri, 23 Nov 2018 14:05:23 +0400
Subject: [PATCH 05/10] =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=2010?=
 =?UTF-8?q?(new)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/ru/ulstu/paper/controller/PaperController.java | 5 +++++
 src/main/java/ru/ulstu/paper/service/PaperService.java       | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/ru/ulstu/paper/controller/PaperController.java b/src/main/java/ru/ulstu/paper/controller/PaperController.java
index c5cbf4f..b004b18 100644
--- a/src/main/java/ru/ulstu/paper/controller/PaperController.java
+++ b/src/main/java/ru/ulstu/paper/controller/PaperController.java
@@ -37,6 +37,11 @@ public class PaperController {
         return new Response<>(paperService.findAllDto());
     }
 
+    @GetMapping("/{paper-id}")
+    public Response<PaperDto> getPaper(@PathVariable("paper-id") Integer paperId){
+        return new Response(paperService.findPaper(paperId));
+    }
+
     @PostMapping
     public Response<Integer> createPaper(@RequestBody @Valid PaperDto paperDto) throws IOException {
         return new Response<>(paperService.create(paperDto));
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index 0e1abbc..83b975b 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -130,6 +130,10 @@ 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()

From 5eff1bac819190e6f2caf8ce67c179f785bbabdb Mon Sep 17 00:00:00 2001
From: Alyona <alyona.krebs@yandex.ru>
Date: Fri, 23 Nov 2018 14:10:36 +0400
Subject: [PATCH 06/10] =?UTF-8?q?Merge=20branch=20'master'=20of=20C:\Users?=
 =?UTF-8?q?\=D0=BA=D0=B0=D1=82=D1=8F\IdeaProjects\ng-tracker=20with=20conf?=
 =?UTF-8?q?licts.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/public/js/papers.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/resources/public/js/papers.js b/src/main/resources/public/js/papers.js
index 3b78d8a..a06198e 100644
--- a/src/main/resources/public/js/papers.js
+++ b/src/main/resources/public/js/papers.js
@@ -62,6 +62,16 @@ function addPaper(title, status, comment, locked) {
     });
 }
 
+function filterPaper(authorId, year) {
+    var paperData = JSON.stringify({
+        "authors": title,
+        "": status
+    });
+    postToRest(urlPapers, paperData, function (data) {
+        alert(data);
+    });
+}
+
 function getPaperStatusClass(status) {
     switch (status) {
         case 'DRAFT':

From f5068f8be94caa6d791ffd0b93f0970d30ae9bb7 Mon Sep 17 00:00:00 2001
From: Alyona <alyona.krebs@yandex.ru>
Date: Fri, 23 Nov 2018 14:17:16 +0400
Subject: [PATCH 07/10] filter

---
 src/main/resources/public/js/papers.js        | 86 ++++++++++---------
 .../resources/templates/papers/papers.html    | 58 +++++++------
 2 files changed, 79 insertions(+), 65 deletions(-)

diff --git a/src/main/resources/public/js/papers.js b/src/main/resources/public/js/papers.js
index 88eaed1..e2be107 100644
--- a/src/main/resources/public/js/papers.js
+++ b/src/main/resources/public/js/papers.js
@@ -1,21 +1,23 @@
 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) {
         paperList.forEach(function (paper, index) {
             $(papersElement).parent().append("<div class='row text-left paper-row'>" +
-                "                <div class='col'>" +
+                "                <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>" + (index + 1) + ". " + paper.title + "</span></a>" +
-                "<span class='remove-paper d-none pull-right' onclick=\"deletePaper(" + paper.id + ",'" + papersElement + "', '" + paperRowClass + "')\">" +
+                "'><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>");
+                "                </div></div>");
         });
 
         $(paperRowClass).mouseenter(function (event) {
@@ -32,6 +34,47 @@ function showPapers(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) {
     $("#remove-paper-modal").modal('show');
 
@@ -61,52 +104,17 @@ function addPaper(title, status, comment, locked) {
     });
 }
 
-function filterPaper(authorId, year) {
-    var paperData = JSON.stringify({
-        "authors": title,
-        "": status
-    });
-    postToRest(urlPapers, paperData, function (data) {
-        alert(data);
-    });
-}
-
 function getPaperStatusClass(status) {
     switch (status) {
         case 'DRAFT':
             return "text-draft"
         case 'ON_PREPARATION':
             return "text-primary";
-        case 'ON_REVIEW':
-            return "text-primary";
         case 'COMPLETED':
             return "text-success";
         case 'ATTENTION':
             return "text-warning";
-        case 'FAILED':
-            return "text-failed";
         default:
             return "";
     }
-}
-
-function showPaperDashboard(dashboardElement) {
-    getFromRest(urlPapers, function (paperList) {
-        paperList.forEach(function (paper, index) {
-            $(dashboardElement).append("<div class=\"col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card\">" +
-                "<div class=\"row\">" +
-                "<div class=\"col-2\">" +
-                "<span class=\"fa-stack fa-1x\">" +
-                "<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>" +
-                "</div>" +
-                "<div class=\"col col-10 text-right\">" +
-                "<h7 class=\"service-heading\">" + paper.title + "</h7>" +
-                "<p class=\"text-muted\">" + paper.authorsString + "</p>" +
-                "</div>" +
-                "</div>" +
-                "</div>");
-        });
-    });
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/papers/papers.html b/src/main/resources/templates/papers/papers.html
index b381204..c41988a 100644
--- a/src/main/resources/templates/papers/papers.html
+++ b/src/main/resources/templates/papers/papers.html
@@ -14,39 +14,36 @@
                     <h2 class="section-heading text-uppercase">Статьи</h2>
 
                     <div class="row justify-content-center">
-                        <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
-                            <a href="./papers" class="btn btn-light toolbar-button"><i class="fa fa-list-alt"></i>
-                                Список</a>
-                        </div>
                         <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
                             <a href="./dashboard" class="btn btn-light toolbar-button"><i class="fa fa-newspaper-o"
-                                                                           aria-hidden="true"></i> Панель управления</a>
+                                                                                          aria-hidden="true"></i> Панель управления</a>
                         </div>
-
                         <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
                             <a href="./paper" class="btn btn-light toolbar-button"><i class="fa fa-plus-circle" aria-hidden="true"></i>
                                 Добавить статью</a>
+
                         </div>
-                        <div class = "filter">
-                            <h4>Фильтровать по:</h4>
-                            <select id = "author">
-                                <option>Алёна</option>
-                                <option>Маша</option>
-                                <option>Петя</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 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>1
+                </div>
             </div>
         </div>
     </section>
@@ -65,12 +62,21 @@
             </div>
         </div>
     </div>
-    <script src="/js/papers.js"></script>
+
+    <script>jQuery('.filter').on('change','#year',function(){
+
+      filterPapers("#paper-list", ".paper-row",'1','2018');
+});
+</script>
+
+
+    <script src="papers.js"></script>
     <script>
         $(document).ready(function () {
             showPapers("#paper-list", ".paper-row");
         });
     </script>
+
 </div>
 </body>
 

From 13f9081aee467645bef58644fdee1aa38dffc73f Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Fri, 23 Nov 2018 20:37:24 +0400
Subject: [PATCH 08/10] fix failed commit

---
 src/main/resources/public/js/papers.js        | 34 ++++++++++++++++---
 .../resources/templates/papers/papers.html    | 22 ++++++------
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/public/js/papers.js b/src/main/resources/public/js/papers.js
index e2be107..8322440 100644
--- a/src/main/resources/public/js/papers.js
+++ b/src/main/resources/public/js/papers.js
@@ -7,17 +7,16 @@ function showPapers(papersElement, paperRowClass) {
     getFromRest(urlPapers, function (paperList) {
         paperList.forEach(function (paper, index) {
             $(papersElement).parent().append("<div class='row text-left paper-row'>" +
-                "                <div class='col-md-11'>" +
+                "                <div class='col'>" +
                 "                <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 + "')\">" +
+                "'><span>" + (index + 1) + ". " + paper.title + "</span></a>" +
+                "<span class='remove-paper d-none pull-right' onclick=\"deletePaper(" + paper.id + ",'" + papersElement + "', '" + paperRowClass + "')\">" +
                 "<i class=\"fa fa-trash\" aria-hidden=\"true\"></i></span>" +
-                "                </div></div>");
+                "</div></div>");
         });
 
         $(paperRowClass).mouseenter(function (event) {
@@ -110,11 +109,36 @@ function getPaperStatusClass(status) {
             return "text-draft"
         case 'ON_PREPARATION':
             return "text-primary";
+        case 'ON_REVIEW':
+            return "text-primary";
         case 'COMPLETED':
             return "text-success";
         case 'ATTENTION':
             return "text-warning";
+        case 'FAILED':
+            return "text-failed";
         default:
             return "";
     }
+}
+
+function showPaperDashboard(dashboardElement) {
+    getFromRest(urlPapers, function (paperList) {
+        paperList.forEach(function (paper, index) {
+            $(dashboardElement).append("<div class=\"col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card\">" +
+                "<div class=\"row\">" +
+                "<div class=\"col-2\">" +
+                "<span class=\"fa-stack fa-1x\">" +
+                "<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>" +
+                "</div>" +
+                "<div class=\"col col-10 text-right\">" +
+                "<h7 class=\"service-heading\">" + paper.title + "</h7>" +
+                "<p class=\"text-muted\">" + paper.authorsString + "</p>" +
+                "</div>" +
+                "</div>" +
+                "</div>");
+        });
+    });
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/papers/papers.html b/src/main/resources/templates/papers/papers.html
index c41988a..cb492db 100644
--- a/src/main/resources/templates/papers/papers.html
+++ b/src/main/resources/templates/papers/papers.html
@@ -14,10 +14,15 @@
                     <h2 class="section-heading text-uppercase">Статьи</h2>
 
                     <div class="row justify-content-center">
+                        <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
+                            <a href="./papers" class="btn btn-light toolbar-button"><i class="fa fa-list-alt"></i>
+                                Список</a>
+                        </div>
                         <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
                             <a href="./dashboard" class="btn btn-light toolbar-button"><i class="fa fa-newspaper-o"
-                                                                                          aria-hidden="true"></i> Панель управления</a>
+                                                                           aria-hidden="true"></i> Панель управления</a>
                         </div>
+
                         <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
                             <a href="./paper" class="btn btn-light toolbar-button"><i class="fa fa-plus-circle" aria-hidden="true"></i>
                                 Добавить статью</a>
@@ -62,21 +67,16 @@
             </div>
         </div>
     </div>
-
-    <script>jQuery('.filter').on('change','#year',function(){
-
-      filterPapers("#paper-list", ".paper-row",'1','2018');
-});
-</script>
-
-
-    <script src="papers.js"></script>
+    <script src="/js/papers.js"></script>
     <script>
         $(document).ready(function () {
             showPapers("#paper-list", ".paper-row");
+            jQuery('.filter').on('change','#year',function(){
+
+                filterPapers("#paper-list", ".paper-row",'1','2018');
+            });
         });
     </script>
-
 </div>
 </body>
 

From 590cd16abefe3da02eff923e506fbbbcfb64c2e0 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Sat, 8 Dec 2018 23:53:38 +0400
Subject: [PATCH 09/10] Create model for grant, deadline and project

---
 .../java/ru/ulstu/grant/model/Deadline.java   | 21 ++++
 .../ru/ulstu/grant/model/DeadlineDto.java     | 33 +++++++
 src/main/java/ru/ulstu/grant/model/Grant.java | 98 +++++++++++++++++++
 .../java/ru/ulstu/grant/model/GrantDto.java   | 80 +++++++++++++++
 .../ru/ulstu/grant/model/GrantStatusDto.java  | 19 ++++
 .../java/ru/ulstu/grant/model/Project.java    | 22 +++++
 .../java/ru/ulstu/grant/model/ProjectDto.java | 34 +++++++
 .../db/changelog-20181208_000000-schema.xml   | 45 +++++++++
 8 files changed, 352 insertions(+)
 create mode 100644 src/main/java/ru/ulstu/grant/model/Deadline.java
 create mode 100644 src/main/java/ru/ulstu/grant/model/DeadlineDto.java
 create mode 100644 src/main/java/ru/ulstu/grant/model/Grant.java
 create mode 100644 src/main/java/ru/ulstu/grant/model/GrantDto.java
 create mode 100644 src/main/java/ru/ulstu/grant/model/GrantStatusDto.java
 create mode 100644 src/main/java/ru/ulstu/grant/model/Project.java
 create mode 100644 src/main/java/ru/ulstu/grant/model/ProjectDto.java
 create mode 100644 src/main/resources/db/changelog-20181208_000000-schema.xml

diff --git a/src/main/java/ru/ulstu/grant/model/Deadline.java b/src/main/java/ru/ulstu/grant/model/Deadline.java
new file mode 100644
index 0000000..07ee7c5
--- /dev/null
+++ b/src/main/java/ru/ulstu/grant/model/Deadline.java
@@ -0,0 +1,21 @@
+package ru.ulstu.grant.model;
+
+import org.hibernate.validator.constraints.NotBlank;
+import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.file.model.FileData;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Entity
+public class Deadline extends BaseEntity  {
+
+    @ManyToOne
+    @JoinColumn(name = "grant_id")
+    private Integer grantId;
+
+    public Integer getGrantId() { return grantId;}
+    public void setGrantId(Integer grantId) { this.grantId = grantId; }
+
+}
diff --git a/src/main/java/ru/ulstu/grant/model/DeadlineDto.java b/src/main/java/ru/ulstu/grant/model/DeadlineDto.java
new file mode 100644
index 0000000..f2ad56c
--- /dev/null
+++ b/src/main/java/ru/ulstu/grant/model/DeadlineDto.java
@@ -0,0 +1,33 @@
+package ru.ulstu.grant.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+public class DeadlineDto {
+    private final Integer id;
+
+    @NotNull
+    private final Integer grantId;
+
+    @JsonCreator
+    public DeadlineDto(@JsonProperty("id") Integer id,
+                       @JsonProperty("grantId") Integer grantId){
+        this.id = id;
+        this.grantId = grantId;
+    }
+
+    public DeadlineDto(Deadline deadline) {
+        this.id = deadline.getId();
+        this.grantId = deadline.getGrantId();
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public Integer getGrantId() { return grantId; }
+}
diff --git a/src/main/java/ru/ulstu/grant/model/Grant.java b/src/main/java/ru/ulstu/grant/model/Grant.java
new file mode 100644
index 0000000..4d4361e
--- /dev/null
+++ b/src/main/java/ru/ulstu/grant/model/Grant.java
@@ -0,0 +1,98 @@
+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.file.model.FileData;
+import ru.ulstu.user.model.User;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.HashSet;
+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;
+
+    @Column(name = "deadline_date")
+    @NotNull
+    private Date deadlineDate;
+
+    //Описание гранта
+    @NotNull
+    private String comment;
+
+    //Заявка на грант
+    @NotNull
+    private FileData application;
+
+    @OneToOne
+    @JoinColumn(name = "project_id")
+    private Integer projectId;
+
+    public GrantStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(GrantStatus status) {
+        this.status = status;
+    }
+
+    public Date getDeadlineDate() {
+        return deadlineDate;
+    }
+
+    public void setDeadlineDate(Date deadlineDate) {
+        this.deadlineDate = deadlineDate;
+    }
+
+    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 Integer getProjectId() { return projectId;}
+
+    public void setProjectId(Integer project_id) { this.projectId = projectId; }
+
+}
diff --git a/src/main/java/ru/ulstu/grant/model/GrantDto.java b/src/main/java/ru/ulstu/grant/model/GrantDto.java
new file mode 100644
index 0000000..25a7875
--- /dev/null
+++ b/src/main/java/ru/ulstu/grant/model/GrantDto.java
@@ -0,0 +1,80 @@
+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.file.model.FileData;
+import ru.ulstu.user.model.UserDto;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+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;
+    @NotNull
+    private final Date deadlineDate;
+    private final String comment;
+    private final String applicationFileName;
+    private final Integer projectId;
+
+    @JsonCreator
+    public GrantDto(@JsonProperty("id") Integer id,
+                    @JsonProperty("title") String title,
+                    @JsonProperty("status") Grant.GrantStatus status,
+                    @JsonProperty("deadlineDate") Date deadlineDate,
+                    @JsonProperty("comment") String comment,
+                    @JsonProperty("projectId") Integer projectId){
+        this.id = id;
+        this.title = title;
+        this.status = status;
+        this.deadlineDate = deadlineDate;
+        this.comment = comment;
+        this.applicationFileName = null;
+        this.projectId = projectId;
+    }
+
+    public GrantDto(Grant grant) {
+        this.id = grant.getId();
+        this.title = grant.getTitle();
+        this.status = grant.getStatus();
+        this.deadlineDate = grant.getDeadlineDate();
+        this.comment = grant.getComment();
+        this.projectId = grant.getProjectId();
+        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 Date getDeadlineDate() {
+        return deadlineDate;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public Integer getProjectId() {
+        return projectId;
+    }
+
+    public String getApplicationFileName() {
+        return applicationFileName;
+    }
+}
diff --git a/src/main/java/ru/ulstu/grant/model/GrantStatusDto.java b/src/main/java/ru/ulstu/grant/model/GrantStatusDto.java
new file mode 100644
index 0000000..dae40e2
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/src/main/java/ru/ulstu/grant/model/Project.java b/src/main/java/ru/ulstu/grant/model/Project.java
new file mode 100644
index 0000000..6c31839
--- /dev/null
+++ b/src/main/java/ru/ulstu/grant/model/Project.java
@@ -0,0 +1,22 @@
+package ru.ulstu.grant.model;
+
+import org.hibernate.validator.constraints.NotBlank;
+import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.file.model.FileData;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Entity
+public class Project extends BaseEntity  {
+
+    @NotBlank
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) { this.title = title; }
+}
diff --git a/src/main/java/ru/ulstu/grant/model/ProjectDto.java b/src/main/java/ru/ulstu/grant/model/ProjectDto.java
new file mode 100644
index 0000000..2a22d8a
--- /dev/null
+++ b/src/main/java/ru/ulstu/grant/model/ProjectDto.java
@@ -0,0 +1,34 @@
+package ru.ulstu.grant.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+public class ProjectDto {
+    private final Integer id;
+    @NotEmpty
+    private final String title;
+
+    @JsonCreator
+    public ProjectDto(@JsonProperty("id") Integer id,
+                      @JsonProperty("title") String title){
+        this.id = id;
+        this.title = title;
+    }
+
+    public ProjectDto(Project project) {
+        this.id = project.getId();
+        this.title = project.getTitle();
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+}
diff --git a/src/main/resources/db/changelog-20181208_000000-schema.xml b/src/main/resources/db/changelog-20181208_000000-schema.xml
new file mode 100644
index 0000000..e88b73e
--- /dev/null
+++ b/src/main/resources/db/changelog-20181208_000000-schema.xml
@@ -0,0 +1,45 @@
+<?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="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="applicationFileName" type="varchar(255)">
+                <constraints nullable="true"/>
+            </column>
+        </createTable>
+        <addPrimaryKey columnNames="id" constraintName="pk_grant" tableName="grant"/>
+        <addForeignKeyConstraint baseTableName="grant" baseColumnNames="project_id"
+                                 constraintName="fk_project_project_id" referencedTableName="project"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+    <changeSet author="tanya" id="20181208_000000-2">
+        <createTable tableName="project">
+            <column name="id" type="integer">
+                <constraints nullable="false"/>
+            </column>
+            <column name="title" type="varchar(255)"/>
+        </createTable>
+        <addPrimaryKey columnNames="id" constraintName="pk_project" tableName="project"/>
+    </changeSet>
+    <changeSet author="tanya" id="20181208_000000-3">
+        <createTable tableName="deadline">
+            <column name="id" type="integer">
+                <constraints nullable="false"/>
+            </column>
+            <column name="grant_id" type="integer"/>
+        </createTable>
+        <addPrimaryKey columnNames="id" constraintName="pk_deadline" tableName="deadline"/>
+        <addForeignKeyConstraint baseTableName="deadline" baseColumnNames="grant_id"
+                                 constraintName="fk_grant_grant_id" referencedTableName="grant"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>

From d71a8d2c8379860120c69fd91885f9e5e1a9dfff Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Tue, 11 Dec 2018 15:08:35 +0400
Subject: [PATCH 10/10] move classes, add deadline to entities, fix db
 changelogs

---
 .../ru/ulstu/deadline/model/Deadline.java     | 41 +++++++++++++++++
 .../ru/ulstu/deadline/model/DeadlineDto.java  | 41 +++++++++++++++++
 .../repository/DeadlineRepository.java        |  9 ++++
 .../deadline/service/DeadlineService.java     | 45 +++++++++++++++++++
 .../java/ru/ulstu/grant/model/Deadline.java   | 21 ---------
 .../ru/ulstu/grant/model/DeadlineDto.java     | 33 --------------
 src/main/java/ru/ulstu/grant/model/Grant.java | 34 ++++++++------
 .../java/ru/ulstu/grant/model/GrantDto.java   | 34 +++++++-------
 .../java/ru/ulstu/grant/model/Project.java    | 22 ---------
 src/main/java/ru/ulstu/paper/model/Paper.java | 28 +++++++++---
 .../java/ru/ulstu/paper/model/PaperDto.java   | 15 ++++---
 .../service/PaperNotificationService.java     | 10 ++---
 .../ru/ulstu/paper/service/PaperService.java  | 16 ++++---
 .../java/ru/ulstu/project/model/Project.java  | 39 ++++++++++++++++
 .../{grant => project}/model/ProjectDto.java  | 16 +++++--
 .../db/changelog-20181208_000000-schema.xml   | 44 +++++++++++++-----
 src/main/resources/db/changelog-master.xml    |  1 +
 .../paperCreateNotification.html              |  2 +-
 .../paperDeadlineNotification.html            |  2 +-
 19 files changed, 302 insertions(+), 151 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/deadline/model/Deadline.java
 create mode 100644 src/main/java/ru/ulstu/deadline/model/DeadlineDto.java
 create mode 100644 src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java
 create mode 100644 src/main/java/ru/ulstu/deadline/service/DeadlineService.java
 delete mode 100644 src/main/java/ru/ulstu/grant/model/Deadline.java
 delete mode 100644 src/main/java/ru/ulstu/grant/model/DeadlineDto.java
 delete mode 100644 src/main/java/ru/ulstu/grant/model/Project.java
 create mode 100644 src/main/java/ru/ulstu/project/model/Project.java
 rename src/main/java/ru/ulstu/{grant => project}/model/ProjectDto.java (58%)

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
new file mode 100644
index 0000000..1a73e59
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/src/main/java/ru/ulstu/deadline/model/DeadlineDto.java b/src/main/java/ru/ulstu/deadline/model/DeadlineDto.java
new file mode 100644
index 0000000..fbfb598
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java b/src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java
new file mode 100644
index 0000000..f26c572
--- /dev/null
+++ b/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> {
+
+}
diff --git a/src/main/java/ru/ulstu/deadline/service/DeadlineService.java b/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
new file mode 100644
index 0000000..c371d87
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/src/main/java/ru/ulstu/grant/model/Deadline.java b/src/main/java/ru/ulstu/grant/model/Deadline.java
deleted file mode 100644
index 07ee7c5..0000000
--- a/src/main/java/ru/ulstu/grant/model/Deadline.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package ru.ulstu.grant.model;
-
-import org.hibernate.validator.constraints.NotBlank;
-import ru.ulstu.core.model.BaseEntity;
-import ru.ulstu.file.model.FileData;
-
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-@Entity
-public class Deadline extends BaseEntity  {
-
-    @ManyToOne
-    @JoinColumn(name = "grant_id")
-    private Integer grantId;
-
-    public Integer getGrantId() { return grantId;}
-    public void setGrantId(Integer grantId) { this.grantId = grantId; }
-
-}
diff --git a/src/main/java/ru/ulstu/grant/model/DeadlineDto.java b/src/main/java/ru/ulstu/grant/model/DeadlineDto.java
deleted file mode 100644
index f2ad56c..0000000
--- a/src/main/java/ru/ulstu/grant/model/DeadlineDto.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package ru.ulstu.grant.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.hibernate.validator.constraints.NotEmpty;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-public class DeadlineDto {
-    private final Integer id;
-
-    @NotNull
-    private final Integer grantId;
-
-    @JsonCreator
-    public DeadlineDto(@JsonProperty("id") Integer id,
-                       @JsonProperty("grantId") Integer grantId){
-        this.id = id;
-        this.grantId = grantId;
-    }
-
-    public DeadlineDto(Deadline deadline) {
-        this.id = deadline.getId();
-        this.grantId = deadline.getGrantId();
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public Integer getGrantId() { return grantId; }
-}
diff --git a/src/main/java/ru/ulstu/grant/model/Grant.java b/src/main/java/ru/ulstu/grant/model/Grant.java
index 4d4361e..092317b 100644
--- a/src/main/java/ru/ulstu/grant/model/Grant.java
+++ b/src/main/java/ru/ulstu/grant/model/Grant.java
@@ -3,13 +3,17 @@ 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
@@ -39,21 +43,22 @@ public class Grant extends BaseEntity  {
     @Enumerated(value = EnumType.STRING)
     private GrantStatus status = GrantStatus.APPLICATION;
 
-    @Column(name = "deadline_date")
-    @NotNull
-    private Date deadlineDate;
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "grant_id")
+    private List<Deadline> deadlines = new ArrayList<>();
 
     //Описание гранта
     @NotNull
     private String comment;
 
     //Заявка на грант
-    @NotNull
+    @ManyToOne
+    @JoinColumn(name = "file_id")
     private FileData application;
 
-    @OneToOne
+    @ManyToOne(cascade = CascadeType.ALL)
     @JoinColumn(name = "project_id")
-    private Integer projectId;
+    private Project project;
 
     public GrantStatus getStatus() {
         return status;
@@ -63,12 +68,12 @@ public class Grant extends BaseEntity  {
         this.status = status;
     }
 
-    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() {
@@ -91,8 +96,11 @@ public class Grant extends BaseEntity  {
 
     public void setTitle(String title) { this.title = title; }
 
-    public Integer getProjectId() { return projectId;}
-
-    public void setProjectId(Integer project_id) { this.projectId = projectId; }
+    public Project getProject() {
+        return project;
+    }
 
+    public void setProject(Project project) {
+        this.project = project;
+    }
 }
diff --git a/src/main/java/ru/ulstu/grant/model/GrantDto.java b/src/main/java/ru/ulstu/grant/model/GrantDto.java
index 25a7875..922df89 100644
--- a/src/main/java/ru/ulstu/grant/model/GrantDto.java
+++ b/src/main/java/ru/ulstu/grant/model/GrantDto.java
@@ -3,13 +3,10 @@ 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.file.model.FileData;
-import ru.ulstu.user.model.UserDto;
+import ru.ulstu.deadline.model.DeadlineDto;
+import ru.ulstu.project.model.ProjectDto;
 
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.List;
 
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 
@@ -18,35 +15,34 @@ public class GrantDto {
     @NotEmpty
     private final String title;
     private final Grant.GrantStatus status;
-    @NotNull
-    private final Date deadlineDate;
+    private final List<DeadlineDto> deadlines;
     private final String comment;
     private final String applicationFileName;
-    private final Integer projectId;
+    private final ProjectDto project;
 
     @JsonCreator
     public GrantDto(@JsonProperty("id") Integer id,
                     @JsonProperty("title") String title,
                     @JsonProperty("status") Grant.GrantStatus status,
-                    @JsonProperty("deadlineDate") Date deadlineDate,
+                    @JsonProperty("deadlines") List<DeadlineDto> deadlines,
                     @JsonProperty("comment") String comment,
-                    @JsonProperty("projectId") Integer projectId){
+                    @JsonProperty("project") ProjectDto project) {
         this.id = id;
         this.title = title;
         this.status = status;
-        this.deadlineDate = deadlineDate;
+        this.deadlines = deadlines;
         this.comment = comment;
         this.applicationFileName = null;
-        this.projectId = projectId;
+        this.project = project;
     }
 
     public GrantDto(Grant grant) {
         this.id = grant.getId();
         this.title = grant.getTitle();
         this.status = grant.getStatus();
-        this.deadlineDate = grant.getDeadlineDate();
+        this.deadlines = convert(grant.getDeadlines(), DeadlineDto::new);
         this.comment = grant.getComment();
-        this.projectId = grant.getProjectId();
+        this.project = grant.getProject() == null ? null : new ProjectDto(grant.getProject());
         this.applicationFileName = grant.getApplication() == null ? null : grant.getApplication().getName();
     }
 
@@ -62,16 +58,16 @@ public class GrantDto {
         return status;
     }
 
-    public Date getDeadlineDate() {
-        return deadlineDate;
+    public List<DeadlineDto> getDeadlines() {
+        return deadlines;
     }
 
     public String getComment() {
         return comment;
     }
 
-    public Integer getProjectId() {
-        return projectId;
+    public ProjectDto getProject() {
+        return project;
     }
 
     public String getApplicationFileName() {
diff --git a/src/main/java/ru/ulstu/grant/model/Project.java b/src/main/java/ru/ulstu/grant/model/Project.java
deleted file mode 100644
index 6c31839..0000000
--- a/src/main/java/ru/ulstu/grant/model/Project.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package ru.ulstu.grant.model;
-
-import org.hibernate.validator.constraints.NotBlank;
-import ru.ulstu.core.model.BaseEntity;
-import ru.ulstu.file.model.FileData;
-
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-@Entity
-public class Project extends BaseEntity  {
-
-    @NotBlank
-    private String title;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) { this.title = title; }
-}
diff --git a/src/main/java/ru/ulstu/paper/model/Paper.java b/src/main/java/ru/ulstu/paper/model/Paper.java
index b7511d6..06b4c7e 100644
--- a/src/main/java/ru/ulstu/paper/model/Paper.java
+++ b/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;
@@ -14,10 +16,14 @@ import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
+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
@@ -52,9 +58,9 @@ public class Paper extends BaseEntity implements UserContainer {
     @Column(name = "update_date")
     private Date updateDate = new Date();
 
-    @Column(name = "deadline_date")
-    @NotNull
-    private Date deadlineDate;
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "paper_id")
+    private List<Deadline> deadlines = new ArrayList<>();
 
     private String comment;
 
@@ -91,12 +97,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() {
@@ -143,4 +149,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();
+    }
 }
diff --git a/src/main/java/ru/ulstu/paper/model/PaperDto.java b/src/main/java/ru/ulstu/paper/model/PaperDto.java
index d9a1229..208fe4d 100644
--- a/src/main/java/ru/ulstu/paper/model/PaperDto.java
+++ b/src/main/java/ru/ulstu/paper/model/PaperDto.java
@@ -3,10 +3,12 @@ package ru.ulstu.paper.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.user.model.UserDto;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -19,8 +21,7 @@ public class PaperDto {
     private final Paper.PaperStatus status;
     private final Date createDate;
     private final Date updateDate;
-    @NotNull
-    private final Date deadlineDate;
+    private final List<DeadlineDto> deadlines;
     private final String comment;
     private final Boolean locked;
     private final String tmpFileName;
@@ -35,7 +36,7 @@ public class PaperDto {
                     @JsonProperty("status") Paper.PaperStatus status,
                     @JsonProperty("createDate") Date createDate,
                     @JsonProperty("updateDate") Date updateDate,
-                    @JsonProperty("deadlineDate") Date deadlineDate,
+                    @JsonProperty("deadlines") List<DeadlineDto> deadlines,
                     @JsonProperty("comment") String comment,
                     @JsonProperty("locked") Boolean locked,
                     @JsonProperty("tmpFileName") String tmpFileName,
@@ -45,7 +46,7 @@ public class PaperDto {
         this.status = status;
         this.createDate = createDate;
         this.updateDate = updateDate;
-        this.deadlineDate = deadlineDate;
+        this.deadlines = deadlines;
         this.comment = comment;
         this.locked = locked;
         this.tmpFileName = tmpFileName;
@@ -61,7 +62,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;
@@ -91,8 +92,8 @@ public class PaperDto {
         return updateDate;
     }
 
-    public Date getDeadlineDate() {
-        return deadlineDate;
+    public List<DeadlineDto> getDeadlines() {
+        return deadlines;
     }
 
     public String getComment() {
diff --git a/src/main/java/ru/ulstu/paper/service/PaperNotificationService.java b/src/main/java/ru/ulstu/paper/service/PaperNotificationService.java
index 99e0c86..697958b 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperNotificationService.java
+++ b/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());
         });
     }
 
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index 0e1abbc..6455115 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/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() {
@@ -71,7 +75,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()));
         }
@@ -115,7 +119,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);
@@ -133,11 +137,11 @@ public class PaperService {
     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();
diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java
new file mode 100644
index 0000000..06722a1
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/src/main/java/ru/ulstu/grant/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
similarity index 58%
rename from src/main/java/ru/ulstu/grant/model/ProjectDto.java
rename to src/main/java/ru/ulstu/project/model/ProjectDto.java
index 2a22d8a..69e9b1b 100644
--- a/src/main/java/ru/ulstu/grant/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -1,27 +1,35 @@
-package ru.ulstu.grant.model;
+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 javax.validation.constraints.NotNull;
-import java.util.Date;
+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("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() {
diff --git a/src/main/resources/db/changelog-20181208_000000-schema.xml b/src/main/resources/db/changelog-20181208_000000-schema.xml
index e88b73e..1943b26 100644
--- a/src/main/resources/db/changelog-20181208_000000-schema.xml
+++ b/src/main/resources/db/changelog-20181208_000000-schema.xml
@@ -3,6 +3,18 @@
                    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"/>
@@ -12,34 +24,42 @@
             <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_project_project_id" referencedTableName="project"
+                                 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="tanya" id="20181208_000000-2">
-        <createTable tableName="project">
-            <column name="id" type="integer">
-                <constraints nullable="false"/>
-            </column>
-            <column name="title" type="varchar(255)"/>
-        </createTable>
-        <addPrimaryKey columnNames="id" constraintName="pk_project" tableName="project"/>
-    </changeSet>
-    <changeSet author="tanya" id="20181208_000000-3">
+
+    <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_grant_grant_id" referencedTableName="grant"
+                                 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>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index d0199a1..6c7147b 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/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>
\ No newline at end of file
diff --git a/src/main/resources/mail_templates/paperCreateNotification.html b/src/main/resources/mail_templates/paperCreateNotification.html
index afbbe20..2758143 100644
--- a/src/main/resources/mail_templates/paperCreateNotification.html
+++ b/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,
diff --git a/src/main/resources/mail_templates/paperDeadlineNotification.html b/src/main/resources/mail_templates/paperDeadlineNotification.html
index ee63f3b..a239421 100644
--- a/src/main/resources/mail_templates/paperDeadlineNotification.html
+++ b/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,