🎉 User can now select the temperature unit they want in /settings. Additionally, changed malfunctioning location settings.

Author: Will Beddow

core/plugins/weather.py

@@ -18,7 +18,7 @@ def main(event):
     db = event["db"]
     username = event["username"]
     user_table = db["users"].find_one(username=username)
-    if (user_table["city"] and user_table["country"]):
+    if ("city" in user_table.keys() and "country" in user_table.keys()):
         if user_table["state"]:
             fetch_str = "{0}, {1}".format(user_table["city"], user_table["state"])
         else:
@@ -28,9 +28,17 @@ def main(event):
         observation = owm.weather_at_place(fetch_str)
         w = observation.get_weather()
         status = w.get_detailed_status()
-        temperature = w.get_temperature('fahrenheit')
-        weather_str = "Weather for {0} is {1}, with a temperature of {2} F".format(
-            fetch_str, status, temperature["temp"])
+        temp_sym = "F"
+        if "temp_unit" in user_table.keys():
+            user_temp_unit = user_table["temp_unit"]
+            temperature = w.get_temperature(user_temp_unit)
+            if user_temp_unit == "celsius":
+                temp_sym = "C"
+        else:
+            temperature = w.get_temperature('fahrenheit')
+
+        weather_str = "Weather for {0} is {1}, with a temperature of {2} {3}".format(
+            fetch_str, status, temperature["temp"], temp_sym)
         response["text"] = weather_str
     else:
         # TODO: try to use ip data

templates/settings.html

@@ -64,24 +64,23 @@ <h2>Settings</h2>
                                         <p>Email:</p>
                                         <input type="text" id = "email" name="email" value="{{ session["user"]["email"] }}">
                                         <br>
+                                        <p>Temperature Unit:</p>
+                                        <select id="temp_unit">
+                                          <option value="celsius">C</option>
+                                          <option value="fahrenheit">F</option>
+                                        </select>
+                                        <br>
                                         <p>News site:</p>
                                         <input type="text" id = "news_site" name="news_site" value="{{ session["user"]["news_site"] }}">
                                         <p>Please put in your password to submit the settings:</p>
                                         <input type="password" id="password" name="password" placeholder="Password">
                                         <input type="hidden" id="username" name="username" value="{{ session["username"] }}">
                                         <br>
-                                        <br>
-                                    <select name="country" class="countries" id="countryId">
-                                    <option value="">Select Country</option>
-                                    </select>
+                                    <input type="text" name="country" class="countries" id="countryId" value="{{ session["user"]["country"] }}">
                                  <br>
-                                 <select name="state" class="states" id="stateId">
-                                    <option value="">Select State</option>
-                                 </select>
+                                        <input type="text" class="states" id="stateId" value="{{ session["user"]["state"] }}">
                                     <br>
-                                    <select name="city" class="cities" id="cityId">
-                                    <option value="">Select City</option>
-                                    </select>
+                                        <input type="text" class="cities" id="cityId" value="{{ session["user"]["city"] }}">
                                         <input id="goButton" type="submit" onclick="submitSettings();">
                                     </form>
                                     <div id="loader">
@@ -117,13 +116,15 @@ <h2>Settings</h2>
                     email=document.getElementById("email").value;
                     username=document.getElementById("username").value;
                     password=document.getElementById("password").value;
-                     city = document.getElementById("cityId").value;
+                    city = document.getElementById("cityId").value;
                     country = document.getElementById("countryId").value;
                     state = document.getElementById("stateId").value;
+                    temp_unit = document.getElementById("temp_unit").value;
                     var http = new XMLHttpRequest();
                     var url = "/api/settings";
                     var params="first_name="+first_name+"&"+"last_name="+last_name+"&"+"email="+email+"&"+"username="+
-                        username+"&"+"password="+password+"&city="+city+"&country="+country+"&state="+state;
+                        username+"&"+"password="+password+"&city="+city+"&country="+country+"&state="+state+
+                        "&temp_unit="+temp_unit;
                     http.open("POST", url, true);
                     //Send the proper header information along with the request
                     http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");

templates/signup.html

@@ -94,17 +94,11 @@ <h2>Sign up</h2>
 									<input type="email" name="email" id="email" value="" placeholder="Email" />
 								</div>
                                 <br>
-                                <select name="country" class="countries" id="countryId">
-                                <option value=""></option>
-                                </select>
-                                <br>
-                                <select name="state" class="states" id="stateId">
-                                <option value="">Select State</option>
-                                </select>
-                                <br>
-                                <select name="city" class="cities" id="cityId">
-                                <option value="">Select City</option>
-                                </select>
+                                 <input type="text" name="country" class="countries" placeholder = "Country" id="countryId" >
+                                 <br>
+                                        <input type="text" class="states" id="stateId" placeholder="State/Region">
+                                    <br>
+                                <input type="text" class="cities" id="cityId" placeholder="City">
 							</div>
 							<div class="row uniform">
 								<div class="12u">

will.py

@@ -123,7 +123,8 @@ def new_user():
                     "news_site": "http://reuters.com",
                     "city": city,
                     "country": country,
-                    "state": state
+                    "state": state,
+                    "temp_unit": "fahrenheit"
                 })
                 db.commit()
                 response["type"] = "success"