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

[Brendan Donegan]

This branch updates the SubmissionDialog of checkbox-gui to display an option selector and a button, which can be used to select a report type and save it to the users preferred location (where the report types are XML and XLSX). It also moves the code to save the reports to a default location (e.g. /tmp/submission.xml/xlsx) to when the test run completes, rather than when the users submits the report.

[lp:~brendan-donegan/checkbox/save_report_as]

2961. By Brendan Donegan on 2014-05-06

checkbox-gui: Allow user to save both XML and XLSX reports to preffered location

Add to the SubmissionDialog an OptionSelector and a Button, containing the
option to save either the XML or the XLSX format report to a user-specified
location.

Signed-off-by: Brendan Donegan <email address hidden>

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'checkbox-gui/checkbox-gui/qml/RunManagerView.qml'
--- checkbox-gui/checkbox-gui/qml/RunManagerView.qml	2014-02-19 11:31:39 +0000
+++ checkbox-gui/checkbox-gui/qml/RunManagerView.qml	2014-05-06 14:45:28 +0000
@@ -81,7 +81,11 @@
                 runmanagerview.testingComplete = true;
 
                 // update ui
-                //runbuttons.pauseButtonEnabled = false;
+                var option_list = new Array("client-name=" + client_name);
+                var export_path = settings.value("exporter/xml_export_path", "/tmp/submission.xml")
+    
+                var success = guiEngine.GuiExportSessionToFileAsXML(export_path,
+                                                                    option_list);
                 runbuttons.resultsButtonEnabled = true;
                 progress.title = "Completed  (" + utils.formatElapsedTime((new Date() - updater.startTime)) + ")";
                 progress.enabled = false;

=== modified file 'checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml'
--- checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml	2014-04-28 14:17:44 +0000
+++ checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml	2014-05-06 14:45:28 +0000
@@ -29,7 +29,7 @@
     id: dialog
 
     title: i18n.tr("Report")
-    text: settings.value("submission/message", i18n.tr("The following test report has been generated. You may view it now or save it for later."))
+    text: settings.value("submission/message", i18n.tr("The following test report has been generated for submission to Launchpad. You may also view it or save it."))
 
     TextField {
         RegExpValidator {
@@ -89,16 +89,8 @@
         color: UbuntuColors.orange
         onClicked: {
             var submit_to = settings.value("transport/submit_to", "")
-            var option_list = new Array("client-name=" + client_name);
             var export_path = settings.value("exporter/xml_export_path", "/tmp/submission.xml")
 
-            if (!export_path) {
-                export_path = guiEngine.GetSaveFileName();
-            }
-            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,
@@ -109,17 +101,61 @@
                     dialog.text = i18n.tr("Could not export the tests results for uploading.");
                 }
             }
-            else if (submit_to == "local") {
-                if (success) {
-                    runmanagerview.reportIsSaved = success;
-                }
-            }
             else {
                 dialog.text = guiEngine.SendSubmissionViaLaunchpadTransport(export_path,
                                                                             upload_input.text);
             }
         }
     }
+
+    ListModel {
+        function initialize() {
+            reportTypeModel.append({"type": "xml", "name": i18n.tr("XML Report (*.xml)")})
+            reportTypeModel.append({"type": "xlsx", "name": i18n.tr("XLSX Report (*.xlsx)")})
+        }
+
+        id: reportTypeModel
+        Component.onCompleted: initialize()
+    }
+
+    Component {
+        id: reportTypeDelegate
+        OptionSelectorDelegate {
+            text: name
+        }
+    }
+
+    OptionSelector {
+        id: reportTypeSelect
+        model: reportTypeModel
+        delegate: reportTypeDelegate
+    }
+
+    Button {
+        id: save_button
+        text: i18n.tr("Save Report")
+        color: UbuntuColors.lightAubergine
+        onClicked: {
+            var option_list = new Array("client-name=" + client_name);
+            var success = false;
+            if (reportTypeSelect.selectedIndex == 0) {
+                var path = guiEngine.GetSaveFileName('submission.xml',
+                    i18n.tr("XML files (*.xml)"))
+                success = guiEngine.GuiExportSessionToFileAsXML(path,
+                                                                option_list);
+            }
+            else if (reportTypeSelect.selectedIndex == 1) {
+                var path = guiEngine.GetSaveFileName('submission.xlsx',
+                    i18n.tr("XLSX files (*.xlsx)"))
+                success = guiEngine.GuiExportSessionToFileAsXLSX(path, []);
+            }
+
+            if (success) {
+                runmanagerview.reportIsSaved = success;
+            }
+        }
+    }
+
     Button {
         id: view_button
         text: i18n.tr("View Results")

=== modified file 'checkbox-gui/gui-engine/gui-engine.cpp'
--- checkbox-gui/gui-engine/gui-engine.cpp	2014-04-28 14:17:44 +0000
+++ checkbox-gui/gui-engine/gui-engine.cpp	2014-05-06 14:45:28 +0000
@@ -2638,14 +2638,15 @@
     return PBTreeNode::PBJobResult_DepsNotMet;
 }
 
-QString GuiEngine::GetSaveFileName(void)
+QString GuiEngine::GetSaveFileName(const QString& defaultName,
+                                   const QString& text)
 {
     QString prompt = "Choose a filename:";
 
     return QFileDialog::getSaveFileName(NULL, \
                                         prompt, \
-                                        "submission.xml", \
-                                        tr("XML files (*.xml)"), \
+                                        defaultName, \
+                                        text, \
                                         NULL, \
                                         QFileDialog::DontUseNativeDialog);
 }

=== modified file 'checkbox-gui/gui-engine/gui-engine.h'
--- checkbox-gui/gui-engine/gui-engine.h	2014-04-28 14:17:44 +0000
+++ checkbox-gui/gui-engine/gui-engine.h	2014-05-06 14:45:28 +0000
@@ -181,7 +181,7 @@
                                      const QString &email);
 
         // Convenience until we move to Qt 5.1 and the FileDialog component
-        QString GetSaveFileName(void);
+        QString GetSaveFileName(const QString& defaultName, const QString& text);
 
         // Session management from the GUI
         void GuiSessionRemove(void);