Finish 0.5.3

octoprint_filamentmanager/data/__init__.py

@@ -343,7 +343,7 @@ def from_csv(table):
                         values = dict(zip(header, row))
 
                         if self.engine_dialect_is(self.DIALECT_SQLITE):
-                            identifier = values[table.c.id]
+                            identifier = values[table.c.id.name]
                             # try to update entry
                             stmt = update(table).values(values).where(table.c.id == identifier)
                             if self.conn.execute(stmt).rowcount == 0:

octoprint_filamentmanager/templates/spool_confirmation.jinja2

@@ -6,14 +6,20 @@
     </div>
 
     <div class="modal-body">
-        <p>{{ _("Please confirm your selected spools for all active tools. This dialog is meant to protect you from accidentically selecting wrong spools for the print.") }}</p>
-        <!-- ko foreach: viewModels.confirmation.selections -->
-        <div class="control-group">
-           <div class="controls form-inline">
-               <label class="control-label">{{ _('Tool') }} <span data-bind="text: $data.tool"></span></label>&nbsp;
-               <select data-bind="enable: !$root.core.bridge.allViewModels.printerStateViewModel.isPrinting() && $root.core.bridge.allViewModels.loginStateViewModel.isUser(), options: $root.viewModels.spools.allSpools.items, optionsText: function(item) { return item.name + ' ' + (item.weight - item.used).toFixed(0) + 'g - ' + item.profile.material + ' (' + item.profile.vendor + ')'; }, optionsValue: function(item) { return item.id; }, optionsCaption: '{{ _('--- Select Spool ---') }}', value: $root.viewModels.confirmation.selections()[$index()].spool, event: { change: function() { $root.viewModels.confirmation.checkSelection(); } }"></select>
-           </div>
-        </div>
+        <!-- ko if: viewModels.confirmation.selections().length < 1 -->
+            <p>{{ _("There are no information available about the active tools for the print job. Make sure the analysing process of the file has finished and that it's loaded correctly.") }}</p>
+        <!-- /ko -->
+
+        <!-- ko if: viewModels.confirmation.selections().length >= 1 -->
+            <p>{{ _("Please confirm your selected spools for all active tools. This dialog is meant to protect you from accidentically selecting wrong spools for the print.") }}</p>
+            <!-- ko foreach: viewModels.confirmation.selections -->
+            <div class="control-group">
+               <div class="controls form-inline">
+                   <label class="control-label">{{ _('Tool') }} <span data-bind="text: $data.tool"></span></label>&nbsp;
+                   <select data-bind="enable: !$root.core.bridge.allViewModels.printerStateViewModel.isPrinting() && $root.core.bridge.allViewModels.loginStateViewModel.isUser(), options: $root.viewModels.spools.allSpools.items, optionsText: function(item) { return item.name + ' ' + (item.weight - item.used).toFixed(0) + 'g - ' + item.profile.material + ' (' + item.profile.vendor + ')'; }, optionsValue: function(item) { return item.id; }, optionsCaption: '{{ _('--- Select Spool ---') }}', value: $root.viewModels.confirmation.selections()[$index()].spool, event: { change: function() { $root.viewModels.confirmation.checkSelection(); } }"></select>
+               </div>
+            </div>
+            <!-- /ko -->
         <!-- /ko -->
     </div>
 

octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OctoPrint-FilamentManager 0.1.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-01-11 13:47+0100\n"
-"PO-Revision-Date: 2018-01-11 13:48+0100\n"
+"POT-Creation-Date: 2018-02-04 15:21+0100\n"
+"PO-Revision-Date: 2018-02-04 15:24+0100\n"
 "Last-Translator: Sven Lohrmann <malnvenshorn@gmail.com>\n"
 "Language: de\n"
 "Language-Team: de <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.4.0\n"
-"X-Generator: Poedit 2.0.5\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:334
 msgid "Start Print"
@@ -331,7 +331,7 @@ msgstr "Währungssymbol"
 
 #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:149
 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87
-#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:21
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -398,25 +398,34 @@ msgid "Temperature offset"
 msgstr "Temperaturoffset"
 
 #: octoprint_filamentmanager/templates/sidebar.jinja2:4
-#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:13
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18
 msgid "Tool"
 msgstr "Tool"
 
 #: octoprint_filamentmanager/templates/sidebar.jinja2:5
-#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19
 msgid "--- Select Spool ---"
 msgstr "--- Spule auswählen ---"
 
 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:5
 msgid "Confirm your selected spools"
 msgstr "Bestätige deine Spulauswahl"
 
-#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:9
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:10
+msgid ""
+"There are no information available about the active tools for the print job. "
+"Make sure the analysing process of the file has finished and that it's loaded "
+"correctly."
+msgstr ""
+"Es sind keine Informationen über die aktiven Tools für den Druckauftrag "
+"vorhanden. Überprüfe ob die Datei bereits analysiert und korrekt geladen wurde."
+
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14
 msgid ""
 "Please confirm your selected spools for all active tools. This dialog is meant "
 "to protect you from accidentically selecting wrong spools for the print."
 msgstr ""
-"Bitte bestätige deine Spulauswahl für alle aktiven Extruder. Dieser Dialog soll "
+"Bitte bestätige deine Spulenauswahl für alle aktiven Tools. Dieser Dialog soll "
 "verhindern, dass du aus Versehen falsche Spulen für deinen Druck auswählst."
 
 #~ msgid "Profile (ascending)"

setup.py

@@ -6,7 +6,7 @@
 plugin_identifier = "filamentmanager"
 plugin_package = "octoprint_filamentmanager"
 plugin_name = "OctoPrint-FilamentManager"
-plugin_version = "0.5.2"
+plugin_version = "0.5.3"
 plugin_description = "Manage your spools and keep track of remaining filament on them"
 plugin_author = "Sven Lohrmann"
 plugin_author_email = "malnvenshorn@gmail.com"

translations/de/LC_MESSAGES/messages.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OctoPrint-FilamentManager 0.1.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-01-11 13:47+0100\n"
-"PO-Revision-Date: 2018-01-11 13:48+0100\n"
+"POT-Creation-Date: 2018-02-04 15:21+0100\n"
+"PO-Revision-Date: 2018-02-04 15:24+0100\n"
 "Last-Translator: Sven Lohrmann <malnvenshorn@gmail.com>\n"
 "Language: de\n"
 "Language-Team: de <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.4.0\n"
-"X-Generator: Poedit 2.0.5\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:334
 msgid "Start Print"
@@ -331,7 +331,7 @@ msgstr "Währungssymbol"
 
 #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:149
 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87
-#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:21
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -398,25 +398,34 @@ msgid "Temperature offset"
 msgstr "Temperaturoffset"
 
 #: octoprint_filamentmanager/templates/sidebar.jinja2:4
-#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:13
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18
 msgid "Tool"
 msgstr "Tool"
 
 #: octoprint_filamentmanager/templates/sidebar.jinja2:5
-#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19
 msgid "--- Select Spool ---"
 msgstr "--- Spule auswählen ---"
 
 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:5
 msgid "Confirm your selected spools"
 msgstr "Bestätige deine Spulauswahl"
 
-#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:9
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:10
+msgid ""
+"There are no information available about the active tools for the print job. "
+"Make sure the analysing process of the file has finished and that it's loaded "
+"correctly."
+msgstr ""
+"Es sind keine Informationen über die aktiven Tools für den Druckauftrag "
+"vorhanden. Überprüfe ob die Datei bereits analysiert und korrekt geladen wurde."
+
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14
 msgid ""
 "Please confirm your selected spools for all active tools. This dialog is meant "
 "to protect you from accidentically selecting wrong spools for the print."
 msgstr ""
-"Bitte bestätige deine Spulauswahl für alle aktiven Extruder. Dieser Dialog soll "
+"Bitte bestätige deine Spulenauswahl für alle aktiven Tools. Dieser Dialog soll "
 "verhindern, dass du aus Versehen falsche Spulen für deinen Druck auswählst."
 
 #~ msgid "Profile (ascending)"

translations/messages.pot

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OctoPrint-FilamentManager 0.5.2\n"
 "Report-Msgid-Bugs-To: i18n@octoprint.org\n"
-"POT-Creation-Date: 2018-01-11 13:47+0100\n"
+"POT-Creation-Date: 2018-02-04 15:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -313,7 +313,7 @@ msgstr ""
 
 #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:149
 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87
-#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:21
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27
 msgid "Cancel"
 msgstr ""
 
@@ -380,20 +380,27 @@ msgid "Temperature offset"
 msgstr ""
 
 #: octoprint_filamentmanager/templates/sidebar.jinja2:4
-#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:13
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18
 msgid "Tool"
 msgstr ""
 
 #: octoprint_filamentmanager/templates/sidebar.jinja2:5
-#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19
 msgid "--- Select Spool ---"
 msgstr ""
 
 #: octoprint_filamentmanager/templates/spool_confirmation.jinja2:5
 msgid "Confirm your selected spools"
 msgstr ""
 
-#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:9
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:10
+msgid ""
+"There are no information available about the active tools for the print "
+"job. Make sure the analysing process of the file has finished and that "
+"it's loaded correctly."
+msgstr ""
+
+#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14
 msgid ""
 "Please confirm your selected spools for all active tools. This dialog is "
 "meant to protect you from accidentically selecting wrong spools for the "