From 6801698dfc9c99b34d7ed081ebcfbec4a8853868 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 20 Feb 2013 22:35:43 +1300
Subject: Added account dialog

---
 src/org/traccar/web/client/model/DataService.java  |  7 +++--
 .../traccar/web/client/model/DataServiceAsync.java |  7 +++--
 .../traccar/web/client/model/UserProperties.java   | 34 ++++++++++++++++++++++
 .../web/client/model/UserSettingsProperties.java   | 30 +++++++++++++++++++
 4 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 src/org/traccar/web/client/model/UserProperties.java
 create mode 100644 src/org/traccar/web/client/model/UserSettingsProperties.java

(limited to 'src/org/traccar/web/client/model')

diff --git a/src/org/traccar/web/client/model/DataService.java b/src/org/traccar/web/client/model/DataService.java
index a16ae51..859c812 100644
--- a/src/org/traccar/web/client/model/DataService.java
+++ b/src/org/traccar/web/client/model/DataService.java
@@ -21,6 +21,7 @@ import java.util.List;
 import org.traccar.web.shared.model.ApplicationSettings;
 import org.traccar.web.shared.model.Device;
 import org.traccar.web.shared.model.Position;
+import org.traccar.web.shared.model.User;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
@@ -30,11 +31,13 @@ public interface DataService extends RemoteService {
 
     boolean authenticated();
 
-    boolean login(String login, String password);
+    User login(String login, String password);
 
     boolean logout();
 
-    boolean register(String login, String password);
+    User register(String login, String password);
+
+    User updateUser(User user);
 
     List<Device> getDevices();
 
diff --git a/src/org/traccar/web/client/model/DataServiceAsync.java b/src/org/traccar/web/client/model/DataServiceAsync.java
index c0478fb..689e699 100644
--- a/src/org/traccar/web/client/model/DataServiceAsync.java
+++ b/src/org/traccar/web/client/model/DataServiceAsync.java
@@ -21,6 +21,7 @@ import java.util.List;
 import org.traccar.web.shared.model.ApplicationSettings;
 import org.traccar.web.shared.model.Device;
 import org.traccar.web.shared.model.Position;
+import org.traccar.web.shared.model.User;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
@@ -28,11 +29,13 @@ public interface DataServiceAsync {
 
     void authenticated(AsyncCallback<Boolean> callback);
 
-    void login(String login, String password, AsyncCallback<Boolean> callback);
+    void login(String login, String password, AsyncCallback<User> callback);
 
     void logout(AsyncCallback<Boolean> callback);
 
-    void register(String login, String password, AsyncCallback<Boolean> callback);
+    void register(String login, String password, AsyncCallback<User> callback);
+
+    void updateUser(User user, AsyncCallback<User> callback);
 
     void getDevices(AsyncCallback<List<Device>> callback);
 
diff --git a/src/org/traccar/web/client/model/UserProperties.java b/src/org/traccar/web/client/model/UserProperties.java
new file mode 100644
index 0000000..cba2996
--- /dev/null
+++ b/src/org/traccar/web/client/model/UserProperties.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.web.client.model;
+
+import org.traccar.web.shared.model.User;
+
+import com.sencha.gxt.core.client.ValueProvider;
+import com.sencha.gxt.data.shared.ModelKeyProvider;
+import com.sencha.gxt.data.shared.PropertyAccess;
+
+public interface UserProperties extends PropertyAccess<User> {
+
+    ModelKeyProvider<User> id();
+
+    ValueProvider<User, String> login();
+
+    ValueProvider<User, String> password();
+
+    ValueProvider<User, Boolean> admin();
+
+}
diff --git a/src/org/traccar/web/client/model/UserSettingsProperties.java b/src/org/traccar/web/client/model/UserSettingsProperties.java
new file mode 100644
index 0000000..ad7e8e0
--- /dev/null
+++ b/src/org/traccar/web/client/model/UserSettingsProperties.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.web.client.model;
+
+import org.traccar.web.shared.model.UserSettings;
+
+import com.sencha.gxt.core.client.ValueProvider;
+import com.sencha.gxt.data.shared.ModelKeyProvider;
+import com.sencha.gxt.data.shared.PropertyAccess;
+
+public interface UserSettingsProperties extends PropertyAccess<UserSettings> {
+
+    ModelKeyProvider<UserSettings> id();
+
+    ValueProvider<UserSettings, UserSettings.SpeedUnit> speedUnit();
+
+}
-- 
cgit v1.2.3