From 51c167fa8067ac81a47914211cc252f5dd3e40f1 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Tue, 24 Jan 2023 09:59:30 -0800
Subject: Add calendar to report

---
 schema/changelog-5.6.xml                    | 5 +++++
 src/main/java/org/traccar/model/Report.java | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/schema/changelog-5.6.xml b/schema/changelog-5.6.xml
index d7768f8e2..38b206902 100644
--- a/schema/changelog-5.6.xml
+++ b/schema/changelog-5.6.xml
@@ -22,6 +22,9 @@
       <column name="description" type="VARCHAR(128)">
         <constraints nullable="false" />
       </column>
+      <column name="calendarid" type="INT">
+        <constraints nullable="false" />
+      </column>
       <column name="from" type="TIMESTAMP">
         <constraints nullable="false" />
       </column>
@@ -33,6 +36,8 @@
       </column>
     </createTable>
 
+    <addForeignKeyConstraint baseTableName="tc_reports" baseColumnNames="calendarid" constraintName="fk_reports_calendarid" referencedTableName="tc_calendars" referencedColumnNames="id" onDelete="CASCADE" />
+
     <createTable tableName="tc_user_report">
       <column name="userid" type="INT">
         <constraints nullable="false" />
diff --git a/src/main/java/org/traccar/model/Report.java b/src/main/java/org/traccar/model/Report.java
index 393f6fef7..83bb2e920 100644
--- a/src/main/java/org/traccar/model/Report.java
+++ b/src/main/java/org/traccar/model/Report.java
@@ -20,7 +20,7 @@ import org.traccar.storage.StorageName;
 import java.util.Date;
 
 @StorageName("tc_reports")
-public class Report extends ExtendedModel {
+public class Report extends ScheduledModel {
 
     private String type;
 
-- 
cgit v1.2.3