Preparation of 1.17.0 release

- B #154 report link in new tab
- B #194 webcam_rotator id
- B reset capture-button before opening a single print job

Author: OllisGit

octoprint_PrintJobHistory/api/PrintJobHistoryAPI.py

@@ -762,7 +762,7 @@ def get_createSinglePrintJobReport(self, databaseId):
 	@octoprint.plugin.BlueprintPlugin.route("/multiPrintJobReport", methods=["GET"])
 	def get_createMultiPrintJobReport(self):
 
-		tableQuery = flask.request.values
+		tableQuery = flask.request.values.to_dict()
 		allPrintJobModels = []
 		if ("sample" in tableQuery):
 			allPrintJobModels = self._createSamplePrintModels()

octoprint_PrintJobHistory/static/js/PrintJobHistory-EditJobDialog.js

@@ -226,6 +226,7 @@ function PrintJobHistoryEditDialog(){
         self.shouldPrintJobTableReload = false;
 //        TODO Wieso this statt self????
         _setSnapshotImageSource(self.apiClient.getSnapshotUrl(printJobItemForEdit.snapshotFilename()));
+        self.captureButtonText.text(reCaptureText);
 
 //        reset message
         self.snapshotSuccessMessageSpan.hide();

octoprint_PrintJobHistory/static/js/PrintJobHistory.js

@@ -659,13 +659,17 @@ $(function() {
                 window.open(self.apiClient.callCreateSingleReportUrl("sample"), '_blank').focus();
             }
         }
-        self.reportMultiPrintJobItem = function() {
+        self.reportMultiPrintJobItem = function(reportAll) {
             var tableQuery = null;
-            var selectedTableItems = self.printJobHistoryTableHelper.selectedTableItems();
-            if (selectedTableItems.length > 0){
-                tableQuery = "databaseIds="+ self.selectedDatabaseIdsAsCSV
-            } else {
+            if ("all" == reportAll) {
                 tableQuery = self.printJobHistoryTableHelper.getTableQuery();
+            } else {
+                var selectedTableItems = self.printJobHistoryTableHelper.selectedTableItems();
+                if (selectedTableItems.length > 0){
+                    tableQuery = "databaseIds="+ self.selectedDatabaseIdsAsCSV
+                } else {
+                    tableQuery = self.printJobHistoryTableHelper.getTableQuery();
+                }
             }
             return self.apiClient.callCreateMultiReportUrl(tableQuery);
         }

octoprint_PrintJobHistory/templates/PrintJobHistory_tab.jinja2

@@ -25,8 +25,8 @@
 
 
             <div>
-                <a href="#" target="_blank" data-bind="attr: {href: $root.reportMultiPrintJobItem()}"> <i class="icon-print"></i> Report</a>
-                <span data-bind="visible: printJobHistoryTableHelper.selectedTableItems().length > 0">| <a href="#" data-bind="attr: {href: $root.reportMultiPrintJobItem()}"> only selected (<span data-bind="text: printJobHistoryTableHelper.selectedTableItems().length"></span>)</a> </span>
+                <a href="#" target="_blank" data-bind="attr: {href: $root.reportMultiPrintJobItem('all')}"> <i class="icon-print"></i> Report</a>
+                <span data-bind="visible: printJobHistoryTableHelper.selectedTableItems().length > 0">| <a href="#" target="_blank" data-bind="attr: {href: $root.reportMultiPrintJobItem()}"> only selected (<span data-bind="text: printJobHistoryTableHelper.selectedTableItems().length"></span>)</a> </span>
             </div>
 
 

octoprint_PrintJobHistory/templates/PrintJobHistory_tab_dialogs.jinja2

@@ -453,9 +453,7 @@
                                                 </div>
                                             </div>
                                             <!--  END WEBCAM LOADER   -->
-
-
-                                            <div id="webcam_rotator" data-bind="visible: printJobEditDialog.imageDisplayMode()!='videoStreamLoading' && printJobEditDialog.imageDisplayMode()!='videoStreamError', css: { webcam_rotated: printJobEditDialog.webCamSettings.rotate90(), webcam_unrotated: !printJobEditDialog.webCamSettings.rotate90() }">
+                                            <div id="printjobhistory_webcam_rotator" data-bind="visible: printJobEditDialog.imageDisplayMode()!='videoStreamLoading' && printJobEditDialog.imageDisplayMode()!='videoStreamError', css: { webcam_rotated: printJobEditDialog.webCamSettings.rotate90(), webcam_unrotated: !printJobEditDialog.webCamSettings.rotate90() }">
                                                 <div class="webcam_fixed_ratio" data-bind="css: printJobEditDialog.webcamRatioClass">
                                                     <div class="webcam_fixed_ratio_inner">
                                                     <!--

setup.py

@@ -14,7 +14,7 @@
 plugin_name = "Print Job History"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.17.0.dev1"
+plugin_version = "1.17.0.dev2"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module