Add reminder types

mainsail-crew · Mar 4, 2023 · 6ebd1c6 · 6ebd1c6
1 parent 76efd43
commit 6ebd1c6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/src/components/notifications/NotificationMenuEntry.vue b/src/components/notifications/NotificationMenuEntry.vue
@@ -99,7 +99,7 @@
 <script lang="ts">
 import BaseMixin from '@/components/mixins/base'
 import { Component, Mixins, Prop, Watch } from 'vue-property-decorator'
-import { mdiClose, mdiLinkVariant, mdiBellOffOutline } from '@mdi/js'
+import { mdiClose, mdiLinkVariant, mdiBellOffOutline, mdiSleep } from '@mdi/js'
 import { GuiNotificationStateEntry } from '@/store/gui/notifications/types'
 
 @Component({
@@ -109,6 +109,7 @@ export default class NotificationMenuEntry extends Mixins(BaseMixin) {
     mdiClose = mdiClose
     mdiLinkVariant = mdiLinkVariant
     mdiBellOffOutline = mdiBellOffOutline
+    mdiSleep = mdiSleep
 
     private expand = false
 

diff --git a/src/store/gui/notifications/getters.ts b/src/store/gui/notifications/getters.ts
@@ -61,6 +61,7 @@ export const getters: GetterTree<GuiNotificationState, any> = {
                     date: entry.date,
                     dismissed: entry.dismissed,
                     url: entry.url,
+                    type: 'announcement',
                 } as GuiNotificationStateEntry)
             })
         }
@@ -95,6 +96,7 @@ export const getters: GetterTree<GuiNotificationState, any> = {
                     description: i18n.t(`App.ThrottledStates.Description${flag}`),
                     date,
                     dismissed: false,
+                    type: 'flag',
                 } as GuiNotificationStateEntry)
             })
         }
@@ -136,6 +138,7 @@ export const getters: GetterTree<GuiNotificationState, any> = {
                         .toString(),
                     date,
                     dismissed: false,
+                    type: 'dependency',
                 } as GuiNotificationStateEntry)
             })
         }
@@ -181,6 +184,7 @@ export const getters: GetterTree<GuiNotificationState, any> = {
                     description: description,
                     date,
                     dismissed: false,
+                    type: 'moonraker_warning',
                 } as GuiNotificationStateEntry)
             })
         }
@@ -215,6 +219,7 @@ export const getters: GetterTree<GuiNotificationState, any> = {
                         .toString(),
                     date,
                     dismissed: false,
+                    type: 'moonraker_failed_components',
                 } as GuiNotificationStateEntry)
             })
         }
@@ -267,6 +272,7 @@ export const getters: GetterTree<GuiNotificationState, any> = {
                     date,
                     url,
                     dismissed: false,
+                    type: 'klipper_warnings',
                 } as GuiNotificationStateEntry)
             })
         }
@@ -303,6 +309,7 @@ export const getters: GetterTree<GuiNotificationState, any> = {
                     description: description,
                     date,
                     dismissed: false,
+                    type: 'overdue_reminder',
                 })
             })
         }

diff --git a/src/store/gui/notifications/types.ts b/src/store/gui/notifications/types.ts
@@ -10,6 +10,14 @@ export interface GuiNotificationStateEntry {
     date: Date
     dismissed: boolean
     url?: string
+    type:
+        | 'announcement'
+        | 'flag'
+        | 'dependency'
+        | 'moonraker_warning'
+        | 'moonraker_failed_components'
+        | 'klipper_warnings'
+        | 'overdue_reminder'
 }
 
 export interface GuiNotificationStateDismissEntry {

diff --git a/src/store/gui/reminders/getters.ts b/src/store/gui/reminders/getters.ts
@@ -22,7 +22,7 @@ export const getters: GetterTree<GuiRemindersState, any> = {
     getOverdueReminders: (state, getters, rootState) => {
         const currentTotalPrintTime = rootState.server.history.job_totals.total_print_time
         return Object.values(state.reminders).filter(
-            (reminder) => reminder.time_delta - (currentTotalPrintTime - reminder.start_total_print_time) < 0
+            (reminder) => reminder.time_delta - 20000 - (currentTotalPrintTime - reminder.start_total_print_time) < 0
         )
     },
 }