diff options
| -rw-r--r-- | tools/mmd/MmdDb.py | 4 | ||||
| -rw-r--r-- | tools/mmd/MmdLocation.py | 14 | ||||
| -rw-r--r-- | tools/mmd/MmdLocationList.py | 4 | ||||
| -rw-r--r-- | tools/mmd/MmdUser.py | 6 | ||||
| -rw-r--r-- | tools/mmd/MmdWidgets.py | 7 | ||||
| -rw-r--r-- | tools/mmd/create | 3 |
6 files changed, 24 insertions, 14 deletions
diff --git a/tools/mmd/MmdDb.py b/tools/mmd/MmdDb.py index 356bcfe..a5966d5 100644 --- a/tools/mmd/MmdDb.py +++ b/tools/mmd/MmdDb.py @@ -89,9 +89,9 @@ class Db: return self.cursor.fetchone () # location related methods - def locationCreate (self, location_id, name, longitude, latitude, user_id, is_default): + def locationCreate (self, location_id, name, longitude, latitude, altitude, user_id, is_default): try: - self.cursor.execute ('INSERT INTO location (id, name, longitude, latitude, user_id, is_default) VALUES (?,?,?,?,?,?)', (location_id, name, longitude, latitude, user_id, is_default)) + self.cursor.execute ('INSERT INTO location (id, name, longitude, latitude, altitude, user_id, is_default) VALUES (?,?,?,?,?,?,?)', (location_id, name, longitude, latitude, altitude, user_id, is_default)) self.conn.commit () return True except sqlite3.IntegrityError: diff --git a/tools/mmd/MmdLocation.py b/tools/mmd/MmdLocation.py index c831046..b3a4a42 100644 --- a/tools/mmd/MmdLocation.py +++ b/tools/mmd/MmdLocation.py @@ -32,11 +32,12 @@ class Location: self.latitude = 47.06576 self.altitude = 376 - def create (self, name, longitude, latitude, is_default, user_id): + def create (self, name, longitude, latitude, altitude, is_default, user_id): self.name = name self.is_default = is_default - self.longitude = checkLonngitude (longitude) + self.longitude = checkLongitude (longitude) self.latitude = checkLatitude (latitude) + self.altitude = altitude if not self.longitude: self.longitude = 15.44226 @@ -44,7 +45,14 @@ class Location: self.latitude = 47.06576 self.location_id = hashlib.sha1 ('{0}{1}{2}'.format (user_id, self.longitude, self.latitude)).hexdigest () - return self.db.locationCreate (self.location_id, self.name, self.longitude, self.latitude, user_id, self.is_default) + return self.db.locationCreate ( + self.location_id, + self.name, + self.longitude, + self.latitude, + self.altitude, + user_id, + self.is_default) def findUserId (self, user_id): l = self.db.locationFindUserId (user_id) diff --git a/tools/mmd/MmdLocationList.py b/tools/mmd/MmdLocationList.py index fd793f7..7b4c95d 100644 --- a/tools/mmd/MmdLocationList.py +++ b/tools/mmd/MmdLocationList.py @@ -25,9 +25,9 @@ class LocationList: return l return False - def addLocation (self, name, longitude, latitude, is_default): + def addLocation (self, name, longitude, latitude, altitude, is_default): location = Location () - if location.create (name, longitude, latitude, is_default, self.user_id): + if location.create (name, longitude, latitude, altitude, is_default, self.user_id): self.locations.append (location) return True return False diff --git a/tools/mmd/MmdUser.py b/tools/mmd/MmdUser.py index 7ba1fa0..c5947fe 100644 --- a/tools/mmd/MmdUser.py +++ b/tools/mmd/MmdUser.py @@ -27,9 +27,9 @@ class User: self.user_id = user_id return code - def addLocation (self, name, longitude, latitude, is_default): + def addLocation (self, name, longitude, latitude, altitude, is_default): self.location_list = LocationList (self.user_id) - return self.location_list.addLocation (name, longitude, latitude, is_default) + return self.location_list.addLocation (name, longitude, latitude, altitude, is_default) def findPending (self, code): u = self.db.userFindPending (code) @@ -98,7 +98,7 @@ if __name__ == "__main__": assert code, 'could not create user' assert user.load (email), 'could not load user data from db' print 'User:', user.firstname, user.lastname, user.email - assert user.addLocation ('Graz', '14.4', '47.2', 'yes'), 'could not add location' + assert user.addLocation ('Graz', '14.4', '47.2', '376', 'yes'), 'could not add location' location = user.getDefaultLocation () assert location, 'could not get default location' print 'Location:', location.name, location.longitude, location.latitude, location.is_default diff --git a/tools/mmd/MmdWidgets.py b/tools/mmd/MmdWidgets.py index 4f9397d..d5fa2a1 100644 --- a/tools/mmd/MmdWidgets.py +++ b/tools/mmd/MmdWidgets.py @@ -110,14 +110,15 @@ def registerFormWidget (): <tr><td class="formfield">Confirm Password*: </td><td><input type="password" name="confirm" /></td></tr> <tr><td colspan="2">You can enter your prefered location if you wish</td></tr> <tr><td class="formfield">Name: </td><td><input type="text" name="location_name" /></td></tr> - <tr><td class="formfield">Longitude: </td><td><input type="text" name="latitude" /></td></tr> - <tr><td class="formfield">Latitude: </td><td><input type="text" name="longitude" /></td></tr> + <tr><td class="formfield">Longitude**: </td><td><input type="text" name="latitude" /></td></tr> + <tr><td class="formfield">Latitude**: </td><td><input type="text" name="longitude" /></td></tr> + <tr><td class="formfield">Altitude: </td><td><input type="text" name="altitude" /></td></tr> <!-- <tr><td class="formfield"><input type="submit" value="Register" disabled="disabled" /></td><td></td></tr> --> <tr><td class="formfield"><input type="submit" value="register" /></td><td></td></tr> </table> <input type="hidden" name="cmd" value="register" /> </form> - Fields marked with a * are mandatory. + Fields marked with * are mandatory. Fields markde with ** are mandatory iff you enter your preferred location. ''' return html diff --git a/tools/mmd/create b/tools/mmd/create index d13f1c7..b070e2c 100644 --- a/tools/mmd/create +++ b/tools/mmd/create @@ -32,7 +32,8 @@ CREATE TABLE location ( id TEXT PRIMARY KEY NOT NULL, longitude REAL, latitude REAL, - name TEXT, + altitude INTEGER, + name TEXT default 'unknown', is_default TEXT, user_id TEXT, FOREIGN KEY (user_id) REFERENCES user (id) |