Merge pull request #146 from ppfeufer/datatable-tweaks

[CHANGE] Datatable Tweaks
ppfeufer · Dec 15, 2024 · 8cc6201 · 8cc6201
2 parents a3c5f6a + c7fb379
commit 8cc6201
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 27 deletions.
diff --git a/sovtimer/static/sovtimer/css/aa-sov-timer.css b/sovtimer/static/sovtimer/css/aa-sov-timer.css
@@ -73,11 +73,11 @@
         color: var(--bs-danger);
     }
 
-    .aa-sovtimer-campaigns-remaining-time-column {
+    .aa-sovtimer-campaigns-column-remaining-time {
         width: 115px !important;
     }
 
-    .aa-sovtimer-campaigns-progress-column {
+    .aa-sovtimer-campaigns-column-progress {
         width: 125px !important;
     }
 

diff --git a/sovtimer/static/sovtimer/css/aa-sov-timer.min.css b/sovtimer/static/sovtimer/css/aa-sov-timer.min.css
diff --git a/sovtimer/static/sovtimer/css/aa-sov-timer.min.css.map b/sovtimer/static/sovtimer/css/aa-sov-timer.min.css.map
diff --git a/sovtimer/static/sovtimer/js/aa-sov-timer.js b/sovtimer/static/sovtimer/js/aa-sov-timer.js
@@ -269,7 +269,7 @@ $(document).ready(() => {
             elementTimerTotal.html(newTotal);
 
             // Upcoming timer (< 4 hrs)
-            if (data.active_campaign === sovtimerSettings.translation.no && data.remaining_time_in_seconds <= 14400) {
+            if (data.active_campaign === sovtimerSettings.translation.no && data.remaining_time_in_seconds <= sovtimerSettings.upcomingTimerThreshold) {
                 $(row).addClass('aa-sovtimer-upcoming-campaign');
 
                 const currentUpcoming = elementTimerUpcoming.html();
@@ -308,7 +308,7 @@ $(document).ready(() => {
                 elementTimerTotal.html(newTotal);
 
                 // Upcoming timer (< 4 hrs)
-                if (item.active_campaign === sovtimerSettings.translation.no && item.remaining_time_in_seconds <= 14400) {
+                if (item.active_campaign === sovtimerSettings.translation.no && item.remaining_time_in_seconds <= sovtimerSettings.upcomingTimerThreshold) {
                     const currentUpcoming = elementTimerUpcoming.html();
                     const newUpcoming = parseInt(currentUpcoming) + 1;
 

diff --git a/sovtimer/static/sovtimer/js/aa-sov-timer.min.js b/sovtimer/static/sovtimer/js/aa-sov-timer.min.js