From 7d4fabd576068cc968085bdfbd8e91035242a487 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Thu, 9 May 2024 07:28:07 -0700
Subject: Remove unused time configuration

---
 schema/changelog-6.2.xml                    | 16 ++++++++++++++++
 schema/changelog-master.xml                 |  2 ++
 src/main/java/org/traccar/model/Server.java | 12 +-----------
 src/main/java/org/traccar/model/User.java   | 12 +-----------
 4 files changed, 20 insertions(+), 22 deletions(-)
 create mode 100644 schema/changelog-6.2.xml

diff --git a/schema/changelog-6.2.xml b/schema/changelog-6.2.xml
new file mode 100644
index 000000000..471987d12
--- /dev/null
+++ b/schema/changelog-6.2.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.4.xsd"
+  logicalFilePath="changelog-6.2">
+
+  <changeSet author="author" id="changelog-6.2">
+
+    <dropColumn tableName="tc_servers" columnName="twelvehourformat" />
+    <dropColumn tableName="tc_users" columnName="twelvehourformat" />
+
+  </changeSet>
+
+</databaseChangeLog>
diff --git a/schema/changelog-master.xml b/schema/changelog-master.xml
index 559d90923..e9ae52569 100644
--- a/schema/changelog-master.xml
+++ b/schema/changelog-master.xml
@@ -43,4 +43,6 @@
   <include file="changelog-5.10.xml" relativeToChangelogFile="true" />
   <include file="changelog-5.11.xml" relativeToChangelogFile="true" />
 
+  <include file="changelog-6.2.xml" relativeToChangelogFile="true" />
+
 </databaseChangeLog>
diff --git a/src/main/java/org/traccar/model/Server.java b/src/main/java/org/traccar/model/Server.java
index 6442186b6..b29fe27cc 100644
--- a/src/main/java/org/traccar/model/Server.java
+++ b/src/main/java/org/traccar/model/Server.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2024 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -126,16 +126,6 @@ public class Server extends ExtendedModel implements UserRestrictions {
         this.zoom = zoom;
     }
 
-    private boolean twelveHourFormat;
-
-    public boolean getTwelveHourFormat() {
-        return twelveHourFormat;
-    }
-
-    public void setTwelveHourFormat(boolean twelveHourFormat) {
-        this.twelveHourFormat = twelveHourFormat;
-    }
-
     private boolean forceSettings;
 
     public boolean getForceSettings() {
diff --git a/src/main/java/org/traccar/model/User.java b/src/main/java/org/traccar/model/User.java
index 8cfee0f48..9b8ee3e53 100644
--- a/src/main/java/org/traccar/model/User.java
+++ b/src/main/java/org/traccar/model/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 - 2022 Anton Tananaev (anton@traccar.org)
+ * Copyright 2013 - 2024 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -133,16 +133,6 @@ public class User extends ExtendedModel implements UserRestrictions, Disableable
         this.zoom = zoom;
     }
 
-    private boolean twelveHourFormat;
-
-    public boolean getTwelveHourFormat() {
-        return twelveHourFormat;
-    }
-
-    public void setTwelveHourFormat(boolean twelveHourFormat) {
-        this.twelveHourFormat = twelveHourFormat;
-    }
-
     private String coordinateFormat;
 
     public String getCoordinateFormat() {
-- 
cgit v1.2.3