Merge lp:~brendan-donegan/checkbox/xls_report into lp:checkbox

[Brendan Donegan]

When the submission.xml file is saved, also save the xlsx report.

[Daniel Manrique (roadmr)]

Looks good, I'm OK with the empty options list, we can always change that once we implement client information support on the xlsx exporter (rather, generic option list support).

review: Approve

[Zygmunt Krynicki (zyga)]

so two questions:

1) Do we want to do that unconditionally?
2) What happens when someone doesn't have python3-xslxwriter installed and the DBus call crashes?

review: Needs Information

[Daniel Manrique (roadmr)]

(set back to needs review pending answers to Zygmunt's comments - hopefully tarmac will check status *before* doing final merging)

[Zygmunt Krynicki (zyga)]

(It does)

On Mon, Apr 28, 2014 at 5:13 PM, Daniel Manrique <
<email address hidden>> wrote:

> (set back to needs review pending answers to Zygmunt's comments -
> hopefully tarmac will check status *before* doing final merging)
> --
>
> https://code.launchpad.net/~brendan-donegan/checkbox/xls_report/+merge/217455
> You are reviewing the proposed merge of
> lp:~brendan-donegan/checkbox/xls_report into lp:checkbox.
>

[Zygmunt Krynicki (zyga)]

Or so I thought :D

On Mon, Apr 28, 2014 at 5:16 PM, <email address hidden> wrote:

> The proposal to merge lp:~brendan-donegan/checkbox/xls_report into
> lp:checkbox has been updated.
>
> Status: Needs review => Merged
>
> For more details, see:
>
> https://code.launchpad.net/~brendan-donegan/checkbox/xls_report/+merge/217455
> --
>
> https://code.launchpad.net/~brendan-donegan/checkbox/xls_report/+merge/217455
> You are reviewing the proposed merge of
> lp:~brendan-donegan/checkbox/xls_report into lp:checkbox.
>

=== modified file 'checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml'
--- checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml	2014-04-04 11:05:55 +0000
+++ checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml	2014-04-28 14:32:31 +0000
@@ -97,6 +97,8 @@
             }
             var success = guiEngine.GuiExportSessionToFileAsXML(export_path,
                                                                 option_list);
+            var xls_export_path = export_path.replace('.xml', '.xls');
+            guiEngine.GuiExportSessionToFileAsXLSX(xls_export_path, []);
             if (submit_to == "certification") {
                 if (success) {
                     dialog.text = guiEngine.SendSubmissionViaCertificationTransport(export_path,

=== modified file 'checkbox-gui/gui-engine/gui-engine.cpp'
--- checkbox-gui/gui-engine/gui-engine.cpp	2014-04-04 11:05:55 +0000
+++ checkbox-gui/gui-engine/gui-engine.cpp	2014-04-28 14:32:31 +0000
@@ -1970,6 +1970,17 @@
     return ExportSession(m_session,output_format,options);
 }
 
+QString GuiEngine::GuiExportSessionAsXLSX(void)
+{
+    qDebug("GuiEngine::GuiExportSessionAsXLSX");
+
+    QString output_format = "xlsx";
+    QStringList options;    // No options
+
+    return ExportSession(m_session,output_format,options);
+}
+
+
 const QString GuiEngine::ExportSession(const QDBusObjectPath session, \
                                        const QString &output_format, \
                                        const QStringList& option_list)
@@ -2041,6 +2052,22 @@
     return true;
 }
 
+bool GuiEngine::GuiExportSessionToFileAsXLSX(const QString& output_file,
+                                             const QStringList& option_list)
+{
+    QString output_format = "xlsx";
+
+    // very basic argument checking
+    if (output_file.isEmpty()) {
+        return false;
+    }
+
+    // FIXME - When we get a useful success/failure code here, return to caller
+    QString done = ExportSessionToFile(m_session,output_format,option_list,output_file);
+
+    return true;
+}
+
 const QString GuiEngine::ExportSessionToFile(const QDBusObjectPath session, \
                                              const QString &output_format, \
                                              const QStringList &option_list, \

=== modified file 'checkbox-gui/gui-engine/gui-engine.h'
--- checkbox-gui/gui-engine/gui-engine.h	2014-04-04 11:05:55 +0000
+++ checkbox-gui/gui-engine/gui-engine.h	2014-04-28 14:32:31 +0000
@@ -162,11 +162,14 @@
         // Convenience functions for the GUI
         QString GuiExportSessionAsXML(void);
         QString GuiExportSessionAsHTML(void);
+        QString GuiExportSessionAsXLSX(void);
 
         bool GuiExportSessionToFileAsXML(const QString& output_file,
                                          const QStringList& option_list);
         bool GuiExportSessionToFileAsHTML(const QString& output_file,
                                           const QStringList& option_list);
+        bool GuiExportSessionToFileAsXLSX(const QString& output_file,
+                                          const QStringList& option_list);
         
         const QString SendSubmissionViaCertificationTransport( \
                                      const QString &submission_path,