New Version 1.13.2

- B #145 csv-export of filament was not working

Author: OllisGit

octoprint_PrintJobHistory/api/PrintJobHistoryAPI.py

@@ -527,7 +527,7 @@ def post_csvUpload(self):
 
 		return flask.jsonify(started=True)
 
-	###################################################################################### EXPORT of PrintHistory.db
+	###################################################################################### EXPORT of PrintHistory.db - Plugin
 	# @octoprint.plugin.BlueprintPlugin.route("/exportPrintHistory", methods=["GET"])
 	def exportPrintHistoryData(self):
 

octoprint_PrintJobHistory/common/CSVExportImporter.py

@@ -233,35 +233,29 @@ def parseAndAssignFieldValue(self, fieldLabel, fieldName, fieldValue, printJobMo
 
 class FilamentCSVFormattorParser:
 
-	def formatValue(self, printJob, fieldNames):
-
-		if (hasattr(printJob, fieldNames[0]) == False):
-			return "-"
-		allFilamentModels = getattr(printJob, fieldNames[0])
-		if (allFilamentModels is None):
-			allFilamentModels = printJob.filaments
+	def formatValue(self, printJob, fieldName):
 
-		if (allFilamentModels is None or len(allFilamentModels) == 0):
+		# only support for total model
+		totalFilamentModel = printJob.getFilamentModelByToolId("total")
+		if (totalFilamentModel == None):
 			return "-"
-		# only support for one model
-		filamentModel = allFilamentModels[0]
-		if (hasattr(filamentModel, fieldNames[1]) == False):
+		if (hasattr(totalFilamentModel, fieldName) == False):
 			return "-"
-		valueToFormat = getattr(filamentModel, fieldNames[1])
+		valueToFormat = getattr(totalFilamentModel, fieldName)
 
 		# append unit to value
-		if ("usedCost" == fieldNames[1] and valueToFormat != None and valueToFormat != ""):
-			if (hasattr(filamentModel, "spoolCostUnit") == True and filamentModel.spoolCostUnit != None):
-				valueToFormat = StringUtils.formatFloatSave(StringUtils.FLOAT_DEFAULT_FORMAT, valueToFormat, "-")
+		if ("usedCost" == fieldName and valueToFormat != None and valueToFormat != ""):
+			valueToFormat = StringUtils.formatFloatSave(StringUtils.FLOAT_DEFAULT_FORMAT, valueToFormat, "-")
+			if (hasattr(totalFilamentModel, "spoolCostUnit") == True and totalFilamentModel.spoolCostUnit != None):
 				if (valueToFormat != "-"):
-					if (isinstance(filamentModel.spoolCostUnit, str)):
-						valueToFormat = valueToFormat + filamentModel.spoolCostUnit
+					if (isinstance(totalFilamentModel.spoolCostUnit, str)):
+						valueToFormat = valueToFormat + totalFilamentModel.spoolCostUnit
 					else:
-						valueToFormat = valueToFormat + filamentModel.spoolCostUnit.encode("utf-8")
+						valueToFormat = valueToFormat + totalFilamentModel.spoolCostUnit.encode("utf-8")
 
-		if ("usedLength" == fieldNames[1] or
-			"calculatedLength" == fieldNames[1] or
-			"usedWeight" == fieldNames[1]):
+		if ("usedLength" == fieldName or
+			"calculatedLength" == fieldName or
+			"usedWeight" == fieldName):
 
 			if (valueToFormat != None and valueToFormat != "" and valueToFormat != "-"):
 				valueToFormat = StringUtils.formatFloatSave(StringUtils.FLOAT_DEFAULT_FORMAT, valueToFormat, "-")
@@ -370,15 +364,15 @@ def parseAndAssignFieldValue(self, fieldLabel, fieldName, fieldValue, printJobMo
 	COLUMN_HEIGHT: CSVColumn("printedHeight", COLUMN_HEIGHT, "", DefaultCSVFormattorParser()),
 	COLUMN_NOTE: CSVColumn("noteText", COLUMN_NOTE, "", DefaultCSVFormattorParser()),
 	COLUMN_TEMPERATURES: CSVColumn("allTemperatures", COLUMN_TEMPERATURES, "", TemperaturCSVFormattorParser()),
-	COLUMN_SPOOL_VENDOR: CSVColumn(["allFilaments", "vendor"], COLUMN_SPOOL_VENDOR, "", FilamentCSVFormattorParser()),
-	COLUMN_SPOOL_NAME: CSVColumn(["allFilaments", "spoolName"], COLUMN_SPOOL_NAME, "", FilamentCSVFormattorParser()),
-	COLUMN_MATERIAL: CSVColumn(["allFilaments", "material"], COLUMN_MATERIAL, "", FilamentCSVFormattorParser()),
-	COLUMN_DIAMETER: CSVColumn(["allFilaments", "diameter"], COLUMN_DIAMETER, "", FilamentCSVFormattorParser()),
-	COLUMN_DENSITY: CSVColumn(["allFilaments", "density"], COLUMN_DENSITY, "", FilamentCSVFormattorParser()),
-	COLUMN_USED_LENGTH: CSVColumn(["allFilaments", "usedLength"], COLUMN_USED_LENGTH, "", FilamentCSVFormattorParser()),
-	COLUMN_CALCULATED_LENGTH: CSVColumn(["allFilaments", "calculatedLength"], COLUMN_CALCULATED_LENGTH, "", FilamentCSVFormattorParser()),
-	COLUMN_USED_WEIGHT: CSVColumn(["allFilaments", "usedWeight"], COLUMN_USED_WEIGHT, "", FilamentCSVFormattorParser()),
-	COLUMN_USED_FILAMENT_COSTS: CSVColumn(["allFilaments", "usedCost"], COLUMN_USED_FILAMENT_COSTS, "", FilamentCSVFormattorParser()),
+	COLUMN_SPOOL_VENDOR: CSVColumn("vendor", COLUMN_SPOOL_VENDOR, "", FilamentCSVFormattorParser()),
+	COLUMN_SPOOL_NAME: CSVColumn("spoolName", COLUMN_SPOOL_NAME, "", FilamentCSVFormattorParser()),
+	COLUMN_MATERIAL: CSVColumn("material", COLUMN_MATERIAL, "", FilamentCSVFormattorParser()),
+	COLUMN_DIAMETER: CSVColumn("diameter", COLUMN_DIAMETER, "", FilamentCSVFormattorParser()),
+	COLUMN_DENSITY: CSVColumn("density", COLUMN_DENSITY, "", FilamentCSVFormattorParser()),
+	COLUMN_USED_LENGTH: CSVColumn("usedLength", COLUMN_USED_LENGTH, "", FilamentCSVFormattorParser()),
+	COLUMN_CALCULATED_LENGTH: CSVColumn("calculatedLength", COLUMN_CALCULATED_LENGTH, "", FilamentCSVFormattorParser()),
+	COLUMN_USED_WEIGHT: CSVColumn("usedWeight", COLUMN_USED_WEIGHT, "", FilamentCSVFormattorParser()),
+	COLUMN_USED_FILAMENT_COSTS: CSVColumn("usedCost", COLUMN_USED_FILAMENT_COSTS, "", FilamentCSVFormattorParser()),
 }
 
 

octoprint_PrintJobHistory/templates/PrintJobHistory_tab_dialogs.jinja2

@@ -310,8 +310,8 @@
                                                     <th style="width: 15%" >Tool</th>
                                                     <th style="width: 15%" >Spool</th>
                                                     <th style="width: 15%" >Material</th>
-                                                    <th style="width: 15%" >Used [mm]</th>
-                                                    <th style="width: 15%" >Calculated [mm]</th>
+                                                    <th style="width: 15%" >Used [m]</th>
+                                                    <th style="width: 15%" >Calculated [m]</th>
                                                     <th style="width: 15%" >Used weight [g]</th>
                                                     <th style="width: 10%" >Cost [E]</th>
                                                 </tr>

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.13.1"
+plugin_version = "1.13.2"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module