Merge branch 'feature/recent' into dev

Conflicts:
	eos/db/saveddata/character.py
	eos/db/saveddata/fit.py

Implements #983 but utilizing sqlalchemy events to update the fit modified date whenever something is added/changed.
This commit is contained in:
blitzmann
2017-05-07 20:48:41 -04:00
23 changed files with 356 additions and 103 deletions

View File

@@ -20,6 +20,7 @@
import sys
import os.path
from logbook import Logger
import datetime
import sqlalchemy
# noinspection PyPackageRequirements
@@ -940,7 +941,16 @@ class MainFrame(wx.Frame):
wx.PostEvent(self, FitSelected(fitID=fit.ID))
wx.PostEvent(self.shipBrowser, Stage3Selected(shipID=fit.shipID, back=True))
else:
wx.PostEvent(self.shipBrowser, ImportSelected(fits=fits, back=True))
fits.sort(key=lambda _fit: (_fit.ship.item.name, _fit.name))
results = []
for fit in fits:
results.append((
fit.ID,
fit.name,
fit.modifiedCoalesce,
fit.ship.item
))
wx.PostEvent(self.shipBrowser, ImportSelected(fits=results, back=True))
def closeProgressDialog(self):
# Windows apparently handles ProgressDialogs differently. We can