Add country dropdown

Author: ManuelMcLure

octoprint_netconnectd/__init__.py

@@ -34,6 +34,7 @@ def initialize(self):
         self._analytics = Analytics(self)
         self.address = self._settings.get(["socket"])
         self.forwardUrl = self._settings.get(["forwardUrl"])
+        self.country = self._settings.get(["country"])
         self._log_state_timed(self.LOG_STATE_DELAY)
 
     @property
@@ -50,6 +51,7 @@ def hostname(self):
 
     def on_settings_save(self, data):
         octoprint.plugin.SettingsPlugin.on_settings_save(self, data)
+        self.country = self._settings.get(["country"])
         self.address = self._settings.get(["socket"])
 
     def get_settings_defaults(self):
@@ -58,6 +60,7 @@ def get_settings_defaults(self):
             hostname=None,
             forwardUrl="http://find.mr-beam.org",
             timeout=80,
+            country=None,
         )
 
     ##~~ TemplatePlugin API
@@ -90,6 +93,13 @@ def on_api_get(self, request):
         except Exception as e:
             return jsonify(dict(error=str(e)))
 
+        try:
+            data = self._get_country_list()
+            countries = data["countries"]
+            country = data["country"]
+        except Exception as e:
+            return jsonify(dict(error=str(e)))
+
         return jsonify(
             dict(
                 wifis=wifis,
@@ -100,6 +110,8 @@ def on_api_get(self, request):
                     eth0=self._get_ip_address("eth0"),
                     wlan0=self._get_ip_address("wlan0"),
                 ),
+                country=country,
+                countries=countries,
             )
         )
 
@@ -183,6 +195,19 @@ def _get_wifi_list(self, force=False):
             )
         return result
 
+    def _get_country_list(self, force=False):
+        payload = {}
+
+        flag, content = self._send_message("country_list", payload)
+        if not flag:
+            raise RuntimeError("Error while getting countries wifi: " + content)
+
+        countries = []
+        for country in content["countries"]:
+            countries.append(country)
+        return {"country": content["country"],
+            "countries": countries}
+
     def _get_status(self):
         payload = dict()
 

octoprint_netconnectd/static/js/netconnectd.js

@@ -19,6 +19,8 @@ $(function() {
 
         self.hostname = ko.observable(undefined);
         self.forwardUrl = ko.observable(undefined);
+	self.countries = ko.observableArray([]);
+	self.country = ko.observable(undefined);
 
         self.status = {
             link: ko.observable(),
@@ -237,6 +239,9 @@ $(function() {
                     self.requestData();
                 }, 30000)
             }
+
+	    self.countries(response.countries)
+	    self.country(response.country)
         };
 
         self.configureWifi = function(data) {
@@ -415,13 +420,10 @@ $(function() {
                 self.pollingTimeoutId = undefined;
             }
 
-            $.ajax({
-                url: API_BASEURL + "plugin/netconnectd",
-                // url: self.isWizardActive ? "/plugin/mrbeam/wifi" : API_BASEURL + "plugin/netconnectd",
-                type: "GET",
-                dataType: "json",
-                success: self.fromResponse
-            });
+	    OctoPrint.simpleApiGet("netconnectd")
+		.done(function(response) {
+		    self.fromResponse(response);
+		});
         };
 
         self.onUserLoggedIn = function(user) {

octoprint_netconnectd/templates/netconnectd_settings.jinja2

@@ -7,6 +7,16 @@
     <p>
         <strong>{{ _('Wifi') }}:</strong> <span data-bind="text: connectionStateTextWifi"></span>
     </p>
+    <div class="control-group">
+	<label class="control-labelt"><strong>Country</strong></label>
+	<div class="controls">
+	    <select data-bind="options: countries,
+		optionsText: 'country',
+		optionsValue: 'code',
+		optionsCaption: 'Select Country...',
+		value: country"></select>
+	</div>
+    </div>
     <div class="pull-right" data-bind="visible: enableQualitySorting">
         <small>
             {{ _('Sort by') }}: <a href="#" data-bind="click: function() { listHelper.changeSorting('ssid'); }">{{ _('SSID') }} ({{ _('ascending') }})</a> | <a href="#" data-bind="click: function() { listHelper.changeSorting('quality'); }">{{ _('Quality') }} ({{ _('descending') }})</a>