take time format from settings on mount

Z1xus · Dec 5, 2024 · 55540f1 · 55540f1
1 parent aced887
commit 55540f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "dht22-webui"
-version = "1.0.0"
+version = "1.0.1"
 description = "DHT22 Sensor monitoring system"
 readme = "README.md"
 requires-python = ">=3.12"

diff --git a/templates/index.html b/templates/index.html
@@ -595,7 +595,7 @@ <h2>Historical Data</h2>
                         day: 'numeric',
                         hour: settings.timeFormat === '24h' ? '2-digit' : 'numeric',
                         minute: '2-digit',
-                        hour12: settings.timeFormat === '12h'
+                        hour12: settings.timeFormat !== '24h'
                     });
                 };
             });
@@ -668,9 +668,9 @@ <h2>Historical Data</h2>
                                 return date.toLocaleString('en-US', {
                                     month: 'short',
                                     day: 'numeric',
-                                    hour: 'numeric',
+                                    hour: settings.timeFormat === '24h' ? '2-digit' : 'numeric',
                                     minute: '2-digit',
-                                    hour12: true
+                                    hour12: settings.timeFormat !== '24h'
                                 });
                             },
                             label: function (context) {
@@ -689,12 +689,12 @@ <h2>Historical Data</h2>
                         time: {
                             unit: 'minute',
                             displayFormats: {
-                                minute: 'HH:mm',
-                                hour: 'HH:mm',
+                                minute: settings.timeFormat === '24h' ? 'HH:mm' : 'hh:mm a',
+                                hour: settings.timeFormat === '24h' ? 'HH:mm' : 'hh:mm a',
                                 day: 'MMM D',
                                 month: 'MMM YYYY'
                             },
-                            tooltipFormat: 'MMM D, HH:mm'
+                            tooltipFormat: settings.timeFormat === '24h' ? 'MMM D, HH:mm' : 'MMM D, hh:mm a'
                         },
                         grid: {
                             display: false