From 02499c0aae8e32656babf8cfae2636f95417b514 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Tue, 30 Oct 2018 23:26:55 +0400
Subject: [PATCH] fix db

---
 .../java/ru/ulstu/timeline/model/Event.java   |  2 +-
 .../db/changelog-20181030_000000-schema.xml   | 44 +++++++++++++++++++
 src/main/resources/db/changelog-master.xml    |  1 +
 src/main/resources/templates/timeline.html    |  8 ----
 4 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 src/main/resources/db/changelog-20181030_000000-schema.xml

diff --git a/src/main/java/ru/ulstu/timeline/model/Event.java b/src/main/java/ru/ulstu/timeline/model/Event.java
index 6021ccb..404025a 100644
--- a/src/main/java/ru/ulstu/timeline/model/Event.java
+++ b/src/main/java/ru/ulstu/timeline/model/Event.java
@@ -19,7 +19,7 @@ public class Event extends BaseEntity {
     private String title;
 
     @Column(name = "execute_date")
-    @Temporal(TemporalType.DATE)
+    @Temporal(TemporalType.TIMESTAMP)
     private Date executeDate;
 
     @Column(name = "create_date")
diff --git a/src/main/resources/db/changelog-20181030_000000-schema.xml b/src/main/resources/db/changelog-20181030_000000-schema.xml
new file mode 100644
index 0000000..0d65c2a
--- /dev/null
+++ b/src/main/resources/db/changelog-20181030_000000-schema.xml
@@ -0,0 +1,44 @@
+<?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="orion" id="20181030_000000-1">
+        <createTable tableName="timeline">
+            <column name="id" type="integer">
+                <constraints nullable="false"/>
+            </column>
+            <column name="version" type="integer"/>
+        </createTable>
+        <addPrimaryKey columnNames="id" constraintName="pk_timeline" tableName="timeline"/>
+    </changeSet>
+    <changeSet author="orion" id="20181030_000000-4">
+        <createTable tableName="event">
+            <column name="id" type="integer">
+                <constraints nullable="false"/>
+            </column>
+            <column name="title" type="varchar(255)"/>
+            <column name="create_date" type="timestamp"/>
+            <column name="execute_date" type="timestamp"/>
+            <column name="update_date" type="timestamp"/>
+            <column name="description" type="varchar(255)"/>
+            <column name="timeline_id" type="integer"/>
+            <column name="version" type="integer"/>
+        </createTable>
+        <addPrimaryKey columnNames="id" constraintName="pk_event" tableName="event"/>
+        <addForeignKeyConstraint baseTableName="event" baseColumnNames="timeline_id"
+                                 constraintName="fk_event_timeline" referencedTableName="timeline"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+    <changeSet author="orion" id="20181030_000000-5">
+        <createTable tableName="event_recipients">
+            <column name="event_id" type="integer"/>
+            <column name="recipients_id" type="integer"/>
+        </createTable>
+        <addForeignKeyConstraint baseTableName="event_recipients" baseColumnNames="event_id"
+                                 constraintName="fk_event_event_recipients" referencedTableName="event"
+                                 referencedColumnNames="id"/>
+        <addForeignKeyConstraint baseTableName="event_recipients" baseColumnNames="recipients_id"
+                                 constraintName="fk_user_event_recipients" referencedTableName="users"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 4faae2e..eb3dc55 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -11,4 +11,5 @@
     <include file="db/changelog-20180405_110000-schema.xml"/>
     <include file="db/changelog-20180428_110000-schema.xml"/>
     <include file="db/changelog-20180505_000000-schema.xml"/>
+    <include file="db/changelog-20181030_000000-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/templates/timeline.html b/src/main/resources/templates/timeline.html
index 4d2acf7..1109686 100644
--- a/src/main/resources/templates/timeline.html
+++ b/src/main/resources/templates/timeline.html
@@ -100,17 +100,9 @@
         </div>
     </section>
 
-    <!-- Bootstrap core JavaScript -->
-    <script src="vendor/jquery/jquery.min.js"></script>
-    <script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
-
     <!-- Plugin JavaScript -->
     <script src="vendor/jquery-easing/jquery.easing.min.js"></script>
 
-    <!-- Contact form JavaScript -->
-    <script src="js/jqBootstrapValidation.js"></script>
-    <script src="js/contact_me.js"></script>
-
     <!-- Custom scripts for this template -->
     <script src="js/agency.js"></script>
 </div>