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

fix db

Browse Source
This commit is contained in:
Anton Romanov 2018-10-30 23:26:55 +04:00
parent 128b147bf2
commit 02499c0aae
4 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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")

44
src/main/resources/db/changelog-20181030_000000-schema.xml Normal file
View File

@ -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>

1
src/main/resources/db/changelog-master.xml
View File

@ -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>

8
src/main/resources/templates/timeline.html
View File

@ -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>