raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes Bug #1661416

Browse Source 
Fixes: https://launchpad.net/bugs/1661416
This commit is contained in:
Phill Ridout 2017-11-02 21:46:02 +00:00
parent a268c4476b
commit 7697febb2a
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openlp/plugins/songusage/forms/songusagedetailform.py
View File

@ -54,8 +54,14 @@ class SongUsageDetailForm(QtWidgets.QDialog, Ui_SongUsageDetailDialog, RegistryP
""" """
We need to set up the screen We need to set up the screen
""" """
self.from_date_calendar.setSelectedDate(Settings().value(self.plugin.settings_section + '/from date')) to_date = Settings().value(self.plugin.settings_section + '/to date')
self.to_date_calendar.setSelectedDate(Settings().value(self.plugin.settings_section + '/to date')) if not (isinstance(to_date, QtCore.QDate) and to_date.isValid()):
to_date = QtCore.QDate.currentDate()
from_date = Settings().value(self.plugin.settings_section + '/from date')
if not (isinstance(from_date, QtCore.QDate) and from_date.isValid()):
from_date = to_date.addYears(-1)
self.from_date_calendar.setSelectedDate(from_date)
self.to_date_calendar.setSelectedDate(to_date)
self.report_path_edit.path = Settings().value(self.plugin.settings_section + '/last directory export') self.report_path_edit.path = Settings().value(self.plugin.settings_section + '/last directory export')
def on_report_path_edit_path_changed(self, file_path): def on_report_path_edit_path_changed(self, file_path):

9
openlp/plugins/songusage/songusageplugin.py
View File

@ -38,10 +38,7 @@ from openlp.plugins.songusage.lib.db import init_schema, SongUsageItem
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
YEAR = QtCore.QDate().currentDate().year() TODAY = QtCore.QDate.currentDate()
if QtCore.QDate().currentDate().month() < 9:
YEAR -= 1
__default_settings__ = { __default_settings__ = {
'songusage/db type': 'sqlite', 'songusage/db type': 'sqlite',
@ -50,8 +47,8 @@ __default_settings__ = {
'songusage/db hostname': '', 'songusage/db hostname': '',
'songusage/db database': '', 'songusage/db database': '',
'songusage/active': False, 'songusage/active': False,
'songusage/to date': QtCore.QDate(YEAR, 8, 31), 'songusage/to date': TODAY,
'songusage/from date': QtCore.QDate(YEAR - 1, 9, 1), 'songusage/from date': TODAY.addYears(-1),
'songusage/last directory export': None 'songusage/last directory export': None
} }