aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/web/client/controller/LoginController.java7
-rw-r--r--src/org/traccar/web/client/controller/SettingsController.java19
-rw-r--r--src/org/traccar/web/client/model/DataService.java2
-rw-r--r--src/org/traccar/web/client/model/DataServiceAsync.java2
-rw-r--r--src/org/traccar/web/client/model/EnumKeyProvider.java13
-rw-r--r--src/org/traccar/web/client/model/UserSettingsProperties.java20
-rw-r--r--src/org/traccar/web/client/view/UserDialog.ui.xml2
-rw-r--r--src/org/traccar/web/client/view/UserSettingsDialog.java97
-rw-r--r--src/org/traccar/web/client/view/UserSettingsDialog.ui.xml33
-rw-r--r--src/org/traccar/web/server/model/DataServiceImpl.java27
-rw-r--r--src/org/traccar/web/shared/model/User.java3
11 files changed, 203 insertions, 22 deletions
diff --git a/src/org/traccar/web/client/controller/LoginController.java b/src/org/traccar/web/client/controller/LoginController.java
index d2b65ff5..06471377 100644
--- a/src/org/traccar/web/client/controller/LoginController.java
+++ b/src/org/traccar/web/client/controller/LoginController.java
@@ -36,10 +36,11 @@ public class LoginController implements LoginDialog.LoginHandler {
public void login(final LoginHandler loginHandler) {
this.loginHandler = loginHandler;
- Application.getDataService().authenticated(new BaseAsyncCallback<Boolean>() {
+ Application.getDataService().authenticated(new BaseAsyncCallback<User>() {
@Override
- public void onSuccess(Boolean result) {
- if (result) {
+ public void onSuccess(User result) {
+ if (result != null) {
+ ApplicationContext.getInstance().setUser(result);
loginHandler.onLogin();
} else {
dialog = new LoginDialog(LoginController.this);
diff --git a/src/org/traccar/web/client/controller/SettingsController.java b/src/org/traccar/web/client/controller/SettingsController.java
index c369cbb1..a1892ae2 100644
--- a/src/org/traccar/web/client/controller/SettingsController.java
+++ b/src/org/traccar/web/client/controller/SettingsController.java
@@ -21,8 +21,10 @@ import org.traccar.web.client.model.BaseAsyncCallback;
import org.traccar.web.client.view.ApplicationSettingsDialog;
import org.traccar.web.client.view.DeviceView;
import org.traccar.web.client.view.UserDialog;
+import org.traccar.web.client.view.UserSettingsDialog;
import org.traccar.web.shared.model.ApplicationSettings;
import org.traccar.web.shared.model.User;
+import org.traccar.web.shared.model.UserSettings;
public class SettingsController implements DeviceView.SettingsHandler {
@@ -45,8 +47,21 @@ public class SettingsController implements DeviceView.SettingsHandler {
@Override
public void onPreferencesSelected() {
- // TODO Auto-generated method stub
-
+ new UserSettingsDialog(
+ ApplicationContext.getInstance().getUserSettings(),
+ new UserSettingsDialog.UserSettingsHandler() {
+ @Override
+ public void onSave(UserSettings userSettings) {
+ ApplicationContext.getInstance().setUserSettings(userSettings);
+ User user = ApplicationContext.getInstance().getUser();
+ Application.getDataService().updateUser(user, new BaseAsyncCallback<User>() {
+ @Override
+ public void onSuccess(User result) {
+ ApplicationContext.getInstance().setUser(result);
+ }
+ });
+ }
+ }).show();
}
@Override
diff --git a/src/org/traccar/web/client/model/DataService.java b/src/org/traccar/web/client/model/DataService.java
index 859c8128..3e649717 100644
--- a/src/org/traccar/web/client/model/DataService.java
+++ b/src/org/traccar/web/client/model/DataService.java
@@ -29,7 +29,7 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
@RemoteServiceRelativePath("dataService")
public interface DataService extends RemoteService {
- boolean authenticated();
+ User authenticated();
User login(String login, String password);
diff --git a/src/org/traccar/web/client/model/DataServiceAsync.java b/src/org/traccar/web/client/model/DataServiceAsync.java
index 689e6993..559545d9 100644
--- a/src/org/traccar/web/client/model/DataServiceAsync.java
+++ b/src/org/traccar/web/client/model/DataServiceAsync.java
@@ -27,7 +27,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
public interface DataServiceAsync {
- void authenticated(AsyncCallback<Boolean> callback);
+ void authenticated(AsyncCallback<User> callback);
void login(String login, String password, AsyncCallback<User> callback);
diff --git a/src/org/traccar/web/client/model/EnumKeyProvider.java b/src/org/traccar/web/client/model/EnumKeyProvider.java
new file mode 100644
index 00000000..c41d420e
--- /dev/null
+++ b/src/org/traccar/web/client/model/EnumKeyProvider.java
@@ -0,0 +1,13 @@
+package org.traccar.web.client.model;
+
+import com.sencha.gxt.data.shared.ModelKeyProvider;
+
+
+public class EnumKeyProvider<T extends Enum<T>> implements ModelKeyProvider<T> {
+
+ @Override
+ public String getKey(T item) {
+ return String.valueOf(item.ordinal());
+ }
+
+}
diff --git a/src/org/traccar/web/client/model/UserSettingsProperties.java b/src/org/traccar/web/client/model/UserSettingsProperties.java
index ad7e8e0d..dad7111d 100644
--- a/src/org/traccar/web/client/model/UserSettingsProperties.java
+++ b/src/org/traccar/web/client/model/UserSettingsProperties.java
@@ -16,8 +16,10 @@
package org.traccar.web.client.model;
import org.traccar.web.shared.model.UserSettings;
+import org.traccar.web.shared.model.UserSettings.SpeedUnit;
import com.sencha.gxt.core.client.ValueProvider;
+import com.sencha.gxt.data.shared.LabelProvider;
import com.sencha.gxt.data.shared.ModelKeyProvider;
import com.sencha.gxt.data.shared.PropertyAccess;
@@ -27,4 +29,22 @@ public interface UserSettingsProperties extends PropertyAccess<UserSettings> {
ValueProvider<UserSettings, UserSettings.SpeedUnit> speedUnit();
+ public static class SpeedUnitLabelProvider implements LabelProvider<UserSettings.SpeedUnit> {
+
+ @Override
+ public String getLabel(SpeedUnit item) {
+ switch (item) {
+ case kilometersPerHour:
+ return "km/h";
+ case knots:
+ return "knots";
+ case milesPerHour:
+ return "mph";
+ default:
+ return null;
+ }
+ }
+
+ }
+
}
diff --git a/src/org/traccar/web/client/view/UserDialog.ui.xml b/src/org/traccar/web/client/view/UserDialog.ui.xml
index c16ad4c3..9f7fe21d 100644
--- a/src/org/traccar/web/client/view/UserDialog.ui.xml
+++ b/src/org/traccar/web/client/view/UserDialog.ui.xml
@@ -11,7 +11,7 @@
<ui:attributes width="1" height="-1" />
</ui:with>
- <gxt:Window ui:field="window" pixelSize="300, 140" modal="true" headingText="Account" focusWidget="{saveButton}">
+ <gxt:Window ui:field="window" pixelSize="300, 150" modal="true" headingText="Account" focusWidget="{saveButton}">
<container:VerticalLayoutContainer>
<container:child layoutData="{verticalLayoutData}">
<form:FieldLabel text="User">
diff --git a/src/org/traccar/web/client/view/UserSettingsDialog.java b/src/org/traccar/web/client/view/UserSettingsDialog.java
new file mode 100644
index 00000000..be13eca8
--- /dev/null
+++ b/src/org/traccar/web/client/view/UserSettingsDialog.java
@@ -0,0 +1,97 @@
+/*
+ * 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.view;
+
+import java.util.Arrays;
+
+import org.traccar.web.client.model.EnumKeyProvider;
+import org.traccar.web.client.model.UserSettingsProperties;
+import org.traccar.web.shared.model.UserSettings;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.editor.client.Editor;
+import com.google.gwt.editor.client.SimpleBeanEditorDriver;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.uibinder.client.UiHandler;
+import com.google.gwt.user.client.ui.Widget;
+import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction;
+import com.sencha.gxt.data.shared.ListStore;
+import com.sencha.gxt.widget.core.client.Window;
+import com.sencha.gxt.widget.core.client.event.SelectEvent;
+import com.sencha.gxt.widget.core.client.form.ComboBox;
+
+public class UserSettingsDialog implements Editor<UserSettings> {
+
+ private static UserSettingsDialogUiBinder uiBinder = GWT.create(UserSettingsDialogUiBinder.class);
+
+ interface UserSettingsDialogUiBinder extends UiBinder<Widget, UserSettingsDialog> {
+ }
+
+ private UserSettingsDriver driver = GWT.create(UserSettingsDriver.class);
+
+ interface UserSettingsDriver extends SimpleBeanEditorDriver<UserSettings, UserSettingsDialog> {
+ }
+
+ public interface UserSettingsHandler {
+ public void onSave(UserSettings userSettings);
+ }
+
+ private UserSettingsHandler userSettingsHandler;
+
+ @UiField
+ Window window;
+
+ @UiField(provided = true)
+ ComboBox<UserSettings.SpeedUnit> speedUnit;
+
+ public UserSettingsDialog(UserSettings userSettings, UserSettingsHandler userSettingsHandler) {
+ this.userSettingsHandler = userSettingsHandler;
+
+ ListStore<UserSettings.SpeedUnit> speedUnitStore = new ListStore<UserSettings.SpeedUnit>(
+ new EnumKeyProvider<UserSettings.SpeedUnit>());
+ speedUnitStore.addAll(Arrays.asList(UserSettings.SpeedUnit.values()));
+
+ speedUnit = new ComboBox<UserSettings.SpeedUnit>(
+ speedUnitStore, new UserSettingsProperties.SpeedUnitLabelProvider());
+ speedUnit.setForceSelection(true);
+ speedUnit.setTriggerAction(TriggerAction.ALL);
+
+ uiBinder.createAndBindUi(this);
+ driver.initialize(this);
+ driver.edit(userSettings);
+ }
+
+ public void show() {
+ window.show();
+ }
+
+ public void hide() {
+ window.hide();
+ }
+
+ @UiHandler("saveButton")
+ public void onLoginClicked(SelectEvent event) {
+ window.hide();
+ userSettingsHandler.onSave(driver.flush());
+ }
+
+ @UiHandler("cancelButton")
+ public void onRegisterClicked(SelectEvent event) {
+ window.hide();
+ }
+
+}
diff --git a/src/org/traccar/web/client/view/UserSettingsDialog.ui.xml b/src/org/traccar/web/client/view/UserSettingsDialog.ui.xml
new file mode 100644
index 00000000..db6c6932
--- /dev/null
+++ b/src/org/traccar/web/client/view/UserSettingsDialog.ui.xml
@@ -0,0 +1,33 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder
+ xmlns:ui="urn:ui:com.google.gwt.uibinder"
+ xmlns:g="urn:import:com.google.gwt.user.client.ui"
+ xmlns:gxt="urn:import:com.sencha.gxt.widget.core.client"
+ xmlns:container="urn:import:com.sencha.gxt.widget.core.client.container"
+ xmlns:form="urn:import:com.sencha.gxt.widget.core.client.form"
+ xmlns:button="urn:import:com.sencha.gxt.widget.core.client.button">
+
+ <ui:with type="com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData" field="verticalLayoutData">
+ <ui:attributes width="1" height="-1" />
+ </ui:with>
+
+ <gxt:Window ui:field="window" pixelSize="300, 110" modal="true" headingText="Preferences" focusWidget="{saveButton}">
+ <container:VerticalLayoutContainer>
+ <container:child layoutData="{verticalLayoutData}">
+ <form:FieldLabel text="Speed Units">
+ <form:widget>
+ <form:ComboBox ui:field="speedUnit" />
+ </form:widget>
+ </form:FieldLabel>
+ </container:child>
+ </container:VerticalLayoutContainer>
+
+ <gxt:button>
+ <button:TextButton ui:field="saveButton" text="Save" />
+ </gxt:button>
+ <gxt:button>
+ <button:TextButton ui:field="cancelButton" text="Cancel" />
+ </gxt:button>
+ </gxt:Window>
+
+</ui:UiBinder>
diff --git a/src/org/traccar/web/server/model/DataServiceImpl.java b/src/org/traccar/web/server/model/DataServiceImpl.java
index 1f6ff608..c2d9f72e 100644
--- a/src/org/traccar/web/server/model/DataServiceImpl.java
+++ b/src/org/traccar/web/server/model/DataServiceImpl.java
@@ -102,8 +102,8 @@ public class DataServiceImpl extends RemoteServiceServlet implements DataService
}
@Override
- public boolean authenticated() {
- return (getUser() != null);
+ public User authenticated() {
+ return getUser();
}
@Override
@@ -152,19 +152,20 @@ public class DataServiceImpl extends RemoteServiceServlet implements DataService
if (currentUser.getAdmin() || (currentUser.getId() == user.getId() && !user.getAdmin())) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
try {
- // TODO: better solution?
- if (currentUser.getId() == user.getId()) {
- currentUser.setLogin(user.getLogin());
- currentUser.setPassword(user.getPassword());
- currentUser.setUserSettings(user.getUserSettings());
- user = currentUser;
- } else {
- // TODO: handle other users
- }
-
entityManager.getTransaction().begin();
try {
- entityManager.merge(user);
+ // TODO: better solution?
+ if (currentUser.getId() == user.getId()) {
+ entityManager.merge(currentUser);
+ currentUser.setLogin(user.getLogin());
+ currentUser.setPassword(user.getPassword());
+ currentUser.setUserSettings(user.getUserSettings());
+ entityManager.merge(currentUser);
+ user = currentUser;
+ } else {
+ // TODO: handle other users
+ }
+
entityManager.getTransaction().commit();
setUser(user);
return user;
diff --git a/src/org/traccar/web/shared/model/User.java b/src/org/traccar/web/shared/model/User.java
index 77a17eef..f94f884e 100644
--- a/src/org/traccar/web/shared/model/User.java
+++ b/src/org/traccar/web/shared/model/User.java
@@ -19,6 +19,7 @@ import java.io.Serializable;
import java.util.LinkedList;
import java.util.List;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -97,7 +98,7 @@ public class User implements Serializable, Cloneable {
return devices;
}
- @OneToOne
+ @OneToOne(cascade = CascadeType.ALL)
private UserSettings userSettings;
public void setUserSettings(UserSettings userSettings) {