[VEX-32]: Added option to ignore inactive days

Author: BitTim

src/VexTrack.py

@@ -501,6 +501,12 @@ def _fixed_map(style, style_name, option):
 selectedForegroundSettingBtn = colorButton.ColorButton(settingsContainer, settings["selectedForeground"])
 selectedForegroundSettingBtn.grid(padx=8, pady=2, column=3, row=6, sticky="we")
 
+ignoreInactiveDaysSettingVar = IntVar()
+ttk.Label(settingsContainer, text="Ignore inactive days in certain statistics:").grid(padx=8, pady=2, columnspan=2, column=0, row=7, sticky="we")
+ignoreInactiveDaysSettingCheck = ttk.Checkbutton(settingsContainer, onvalue=1, offvalue=0, variable=ignoreInactiveDaysSettingVar)
+ignoreInactiveDaysSettingCheck.grid(padx=8, pady=2, columnspan=2, column=2, row=7, sticky="we")
+ignoreInactiveDaysSettingVar.set(settings["ignoreInactiveDays"])
+
 settingsBtnContainer = tk.Frame(settingsTab)
 settingsBtnContainer.pack(fill="x")
 
@@ -699,6 +705,7 @@ def updateSettings():
         updateBufferDays = False
 
     settings["useHistoryColors"] = enableColorsSettingVar.get()
+    settings["ignoreInactiveDays"] = ignoreInactiveDaysSettingVar.get()
 
     settings["winBackground"] = winBackgroundSettingBtn.color
     settings["winForeground"] = winForegroundSettingBtn.color
@@ -1061,6 +1068,7 @@ def updateSettingsUI(updateBufferDays):
         bufferDaysSettingEntry.delete(0, len(str(bufferDaysSettingVar.get())))
         bufferDaysSettingEntry.insert(0, settings["bufferDays"])
     enableColorsSettingVar.set(settings["useHistoryColors"])
+    ignoreInactiveDaysSettingVar.set(settings["ignoreInactiveDays"])
 
     winBackgroundSettingBtn.setValues(color=settings["winBackground"])
     winForegroundSettingBtn.setValues(color=settings["winForeground"])
@@ -1154,7 +1162,7 @@ def updateValues(updateBufferDays=True):
     levelRemainingLabel["text"] = str(levelRemaining) + " XP"
     levelTotalLabel["text"] = str(levelTotal) + " XP"
 
-    miscRemainigDays, miscAverage, miscDeviationIdeal, miscDeviationDaily, miscStrongestDayDate, miscStrongestDayAmount, miscWeakestDayDate, miscWeakestDayAmount = core.calcMiscValues(data, yAxisYou, yAxisIdeal, yAxisDailyIdeal, epilogueVar.get(), seasonIndex.get())
+    miscRemainigDays, miscAverage, miscDeviationIdeal, miscDeviationDaily, miscStrongestDayDate, miscStrongestDayAmount, miscWeakestDayDate, miscWeakestDayAmount = core.calcMiscValues(data, yAxisYou, yAxisIdeal, yAxisDailyIdeal, epilogueVar.get(), seasonIndex.get(), settings)
     miscRemainingDaysLabel["text"] = str(miscRemainigDays) + " Days"
     miscAverageLabel["text"] = str(miscAverage) + " XP"
     miscIdealDeviationLabel["text"] = str(miscDeviationIdeal) + " XP"
@@ -1191,6 +1199,7 @@ def updateValues(updateBufferDays=True):
 
 bufferDaysSettingVar.trace("w", lambda a, b, c: updateSettings())
 enableColorsSettingCheck.configure(command=lambda: updateSettings())
+ignoreInactiveDaysSettingCheck.configure(command=lambda: updateSettings())
 
 winBackgroundSettingBtn.setValues(command=lambda: updateSettings())
 winForegroundSettingBtn.setValues(command=lambda: updateSettings())

src/vars.py

@@ -31,6 +31,7 @@
 
 DEFAULT_BUFFER_DAYS = 8
 DEFAULT_USE_HISTORY_COLORS = 1
+DEFAULT_IGNORE_INACTIVE_DAYS = 0
 
 DEFAULT_NONE_BG_COLOR = "#939393"
 DEFAULT_WIN_BG_COLOR = "#AFE0D2"

src/vextrackLib/core.py

@@ -103,7 +103,7 @@ def calcLevelValues(completeData, epilogue, seasonIndex):
 
     return levelProgress, levelCollected, levelRemaining, levelTotal
 
-def calcMiscValues(completeData, yAxisYou, yAxisIdeal, yAxisDailyIdeal, epilogue, seasonIndex):
+def calcMiscValues(completeData, yAxisYou, yAxisIdeal, yAxisDailyIdeal, epilogue, seasonIndex, settings):
     data = completeData["seasons"][seasonIndex]
 
     seasonEndDate = datetime.strptime(data["endDate"], "%d.%m.%Y")
@@ -126,9 +126,10 @@ def calcMiscValues(completeData, yAxisYou, yAxisIdeal, yAxisDailyIdeal, epilogue
         else:
             deltaDate = (currDate - prevDate)
 
-            for i in range(1, deltaDate.days):
-                dailyXP.append({"date": (prevDate + timedelta(days=i)).strftime("%d.%m.%Y"), "amount": 0})
-                index += 1
+            if settings["ignoreInactiveDays"] == 0:
+                for i in range(1, deltaDate.days):
+                    dailyXP.append({"date": (prevDate + timedelta(days=i)).strftime("%d.%m.%Y"), "amount": 0})
+                    index += 1
 
             dailyXP.append({"date": currDate.strftime("%d.%m.%Y"), "amount": int(h["amount"])})
 

src/vextrackLib/settings.py

@@ -3,22 +3,24 @@
 import os
 import json
 
+defaultSettings = {
+    "bufferDays": DEFAULT_BUFFER_DAYS,
+    "useHistoryColors": DEFAULT_USE_HISTORY_COLORS,
+    "ignoreInactiveDays": DEFAULT_IGNORE_INACTIVE_DAYS,
+    "winBackground": DEFAULT_WIN_BG_COLOR,
+    "winForeground": DEFAULT_WIN_FG_COLOR,
+    "lossBackground": DEFAULT_LOSS_BG_COLOR,
+    "lossForeground": DEFAULT_LOSS_FG_COLOR,
+    "drawBackground": DEFAULT_DRAW_BG_COLOR,
+    "drawForeground": DEFAULT_DRAW_FG_COLOR,
+    "noneBackground": DEFAULT_NONE_BG_COLOR,
+    "noneForeground": DEFAULT_NONE_FG_COLOR,
+    "selectedBackground": DEFAULT_SELECTED_BG_COLOR,
+    "selectedForeground": DEFAULT_SELECTED_FG_COLOR
+}
+
 def initSettings():
-    settings = {
-        "bufferDays": DEFAULT_BUFFER_DAYS,
-        "useHistoryColors": DEFAULT_USE_HISTORY_COLORS,
-        "winBackground": DEFAULT_WIN_BG_COLOR,
-        "winForeground": DEFAULT_WIN_FG_COLOR,
-        "lossBackground": DEFAULT_LOSS_BG_COLOR,
-        "lossForeground": DEFAULT_LOSS_FG_COLOR,
-        "drawBackground": DEFAULT_DRAW_BG_COLOR,
-        "drawForeground": DEFAULT_DRAW_FG_COLOR,
-        "noneBackground": DEFAULT_NONE_BG_COLOR,
-        "noneForeground": DEFAULT_NONE_FG_COLOR,
-        "selectedBackground": DEFAULT_SELECTED_BG_COLOR,
-        "selectedForeground": DEFAULT_SELECTED_FG_COLOR
-    }
-    saveSettings(settings)
+    saveSettings(defaultSettings)
 
 def loadSettings():
     if not os.path.exists(SETTINGS_PATH):
@@ -27,6 +29,14 @@ def loadSettings():
     with open(SETTINGS_PATH, "r") as f:
         settings = json.loads(f.read())
 
+    sK = list(settings.keys())
+    dsK = list(defaultSettings.keys())
+    missingSettings = list(set(dsK) - set(sK))
+    
+    for m in missingSettings:
+        settings[m] = defaultSettings[m]
+        saveSettings(settings)
+
     return settings
 
 def saveSettings(settings):