Merge lp:~sylvain-pineau/checkbox/fix-1452217-gui into lp:checkbox

[Sylvain Pineau]

Fixes https://bugs.launchpad.net/checkbox-gui/+bug/1452217 by adding the needed methods to export to json from the GUI.

[Zygmunt Krynicki (zyga)]

Just one quick comment below

[lp:~sylvain-pineau/checkbox/fix-1452217-gui]

3811. By Sylvain Pineau on 2015-05-26

checkbox-gui: Add all the methods to export results to json format

Fixes https://bugs.launchpad.net/checkbox-gui/+bug/1452217

[Sylvain Pineau (sylvain-pineau)]

Json options list now includes 'with-io-log' and 'with-comments'.

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

+1

[Zygmunt Krynicki (zyga)]

review: Approve

=== modified file 'checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml'
--- checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml	2015-05-12 14:51:58 +0000
+++ checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml	2015-05-26 14:07:16 +0000
@@ -112,6 +112,7 @@
         function initialize() {
             reportTypeModel.append({"type": "xml", "name": i18n.tr("XML Report (*.xml)")})
             reportTypeModel.append({"type": "xlsx", "name": i18n.tr("XLSX Report (*.xlsx)")})
+            reportTypeModel.append({"type": "json", "name": i18n.tr("JSON Report (*.json)")})
         }
 
         id: reportTypeModel
@@ -149,6 +150,11 @@
                     i18n.tr("XLSX files (*.xlsx)"))
                 success = guiEngine.GuiExportSessionToFileAsXLSX(path, ["with-sys-info", "with-summary", "with-job-description", "with-text-attachments"]);
             }
+            else if (reportTypeSelect.selectedIndex == 2) {
+                var path = guiEngine.GetSaveFileName('submission.json',
+                    i18n.tr("JSON files (*.json)"))
+                success = guiEngine.GuiExportSessionToFileAsJSON(path, ["with-certification-status", "with-job-defs", "with-io-log", "with-comments"]);
+            }
 
             if (success) {
                 runmanagerview.reportIsSaved = success;

=== modified file 'checkbox-gui/gui-engine/gui-engine.cpp'
--- checkbox-gui/gui-engine/gui-engine.cpp	2015-02-26 15:17:08 +0000
+++ checkbox-gui/gui-engine/gui-engine.cpp	2015-05-26 14:07:16 +0000
@@ -1571,6 +1571,14 @@
     return ExportSession(m_session,output_format,options);
 }
 
+QString GuiEngine::GuiExportSessionAsJSON(void)
+{
+    qDebug("GuiEngine::GuiExportSessionAsJSON");
+    QString output_format = "json";
+    QStringList options;    // No options
+    return ExportSession(m_session,output_format,options);
+}
+
 
 const QString GuiEngine::ExportSession(const QDBusObjectPath session, \
                                        const QString &output_format, \
@@ -1642,6 +1650,19 @@
     return true;
 }
 
+bool GuiEngine::GuiExportSessionToFileAsJSON(const QString& output_file,
+                                             const QStringList& option_list)
+{
+    QString output_format = "json";
+    // 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	2015-01-13 13:57:09 +0000
+++ checkbox-gui/gui-engine/gui-engine.h	2015-05-26 14:07:16 +0000
@@ -163,6 +163,7 @@
         QString GuiExportSessionAsXML(void);
         QString GuiExportSessionAsHTML(void);
         QString GuiExportSessionAsXLSX(void);
+        QString GuiExportSessionAsJSON(void);
 
         bool GuiExportSessionToFileAsXML(const QString& output_file,
                                          const QStringList& option_list);
@@ -170,7 +171,9 @@
                                           const QStringList& option_list);
         bool GuiExportSessionToFileAsXLSX(const QString& output_file,
                                           const QStringList& option_list);
-        
+        bool GuiExportSessionToFileAsJSON(const QString& output_file,
+                                          const QStringList& option_list);
+
         const QString SendSubmissionViaCertificationTransport( \
                                      const QString &submission_path,
                                      const QString &secure_id,