From 68bc9bf52620d0f7449aa022f2f0b188512adae0 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 25 Oct 2009 14:41:15 +0000 Subject: [PATCH] Audit report work --- openlp/core/ui/thememanager.py | 2 +- openlp/plugins/audit/auditplugin.py | 1 + openlp/plugins/audit/forms/auditdetailform.py | 67 ++++++++++++++++--- 3 files changed, 58 insertions(+), 12 deletions(-) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 7b34874b3..3e882c812 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -198,7 +198,7 @@ class ThemeManager(QtGui.QWidget): return theme = unicode(item.data(QtCore.Qt.UserRole).toString()) path = QtGui.QFileDialog.getExistingDirectory(self, - self.trUtf8(u'Save Theme - (%s)') % theme, + unicode(self.trUtf8(u'Save Theme - (%s)')) % theme, self.config.get_last_dir(1) ) path = unicode(path) if path != u'': diff --git a/openlp/plugins/audit/auditplugin.py b/openlp/plugins/audit/auditplugin.py index e2c3230ec..a02146022 100644 --- a/openlp/plugins/audit/auditplugin.py +++ b/openlp/plugins/audit/auditplugin.py @@ -160,6 +160,7 @@ class AuditPlugin(Plugin): self.auditdeleteform.exec_() def onAuditReport(self): + self.auditdetailform.initialise() self.auditdetailform.exec_() def about(self): diff --git a/openlp/plugins/audit/forms/auditdetailform.py b/openlp/plugins/audit/forms/auditdetailform.py index d93c07527..275de3229 100644 --- a/openlp/plugins/audit/forms/auditdetailform.py +++ b/openlp/plugins/audit/forms/auditdetailform.py @@ -37,41 +37,86 @@ class AuditDetailForm(QtGui.QDialog, Ui_AuditDetailDialog): QtGui.QDialog.__init__(self, None) self.parent = parent self.setupUi(self) - self.initialise() def initialise(self): - self.firstService = \ - int(self.parent.config.get_config(u'first service', QtCore.Qt.Checked)) - self.secondService = \ - int(self.parent.config.get_config(u'second service', QtCore.Qt.Checked)) + self.FirstCheckBox.setCheckState( + int(self.parent.config.get_config(u'first service', QtCore.Qt.Checked))) + self.SecondCheckBox.setCheckState( + int(self.parent.config.get_config(u'second service', QtCore.Qt.Checked))) + self.ThirdCheckBox.setCheckState( + int(self.parent.config.get_config(u'third service', QtCore.Qt.Checked))) + year = QtCore.QDate().currentDate().year() + if QtCore.QDate().currentDate().month() < 9: + year -= 1 + toDate = QtCore.QDate(year, 8, 31) + fromDate = QtCore.QDate(year - 1, 9, 1) + self.FromDateEdit.setDate(fromDate) + self.ToDateEdit.setDate(toDate) + self.FileLineEdit.setText(self.parent.config.get_last_dir(1)) self.resetWindow() def changeFirstService(self, value): - self.firstService = value self.parent.config.set_config(u'first service', value) self.resetWindow() def changeSecondService(self, value): - self.secondService = value self.parent.config.set_config(u'second service', value) self.resetWindow() def changeThirdService(self, value): - pass + self.parent.config.set_config(u'third service', value) + self.resetWindow() def defineOutputLocation(self): - pass + path = QtGui.QFileDialog.getExistingDirectory(self, + self.trUtf8(u'Output File Location'), + self.parent.config.get_last_dir(1) ) + path = unicode(path) + if path != u'': + self.parent.config.set_last_dir(path, 1) + self.FileLineEdit.setText(path) def resetWindow(self): - if self.firstService == QtCore.Qt.Unchecked: + if self.FirstCheckBox.checkState() == QtCore.Qt.Unchecked: self.FirstFromTimeEdit.setEnabled(False) self.FirstToTimeEdit.setEnabled(False) else: self.FirstFromTimeEdit.setEnabled(True) self.FirstToTimeEdit.setEnabled(True) - if self.secondService == QtCore.Qt.Unchecked: + if self.SecondCheckBox.checkState() == QtCore.Qt.Unchecked: self.SecondFromTimeEdit.setEnabled(False) self.SecondToTimeEdit.setEnabled(False) else: self.SecondFromTimeEdit.setEnabled(True) self.SecondToTimeEdit.setEnabled(True) + if self.ThirdCheckBox.checkState() == QtCore.Qt.Unchecked: + self.ThirdFromTimeEdit.setEnabled(False) + self.ThirdToTimeEdit.setEnabled(False) + else: + self.ThirdFromTimeEdit.setEnabled(True) + self.ThirdToTimeEdit.setEnabled(True) + + def accept(self): + print self.DetailedReport.isChecked() + print self.SummaryReport.isChecked() + print self.FromDateEdit.date() + print self.ToDateEdit.date() + if self.DetailedReport.isChecked(): + self.detailedReport() + else: + self.summaryReport() + self.close() + + def detailedReport(self): + print "detailed" + filename = u'audit_det_%s_%s.txt' % \ + (self.FromDateEdit.date().toString(u'ddMMyyyy'), + self.ToDateEdit.date().toString(u'ddMMyyyy')) + print filename + + def summaryReport(self): + print "summary" + filename = u'audit_sum_%s_%s.txt' % \ + (self.FromDateEdit.date().toString(u'ddMMyyyy'), + self.ToDateEdit.date().toString(u'ddMMyyyy')) + print filename