Stash

FEMR · Jun 7, 2024 · e9ada88 · e9ada88
1 parent 5253f6e
commit e9ada88
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/app/femr/ui/controllers/SettingsController.java b/app/femr/ui/controllers/SettingsController.java
@@ -7,16 +7,20 @@
 import femr.common.dtos.CurrentUser;
 import femr.common.dtos.ServiceResponse;
 import femr.common.models.UserItem;
+import femr.data.models.mysql.User;
 import femr.ui.models.settings.EditViewModel;
+import femr.ui.models.settings.IndexViewModelGet;
 import femr.ui.views.html.settings.index;
 
+
 import femr.ui.views.html.sessions.create;
 import femr.util.stringhelpers.StringUtils;
 import play.data.FormFactory;
 import play.mvc.Controller;
 import play.mvc.Result;
 import play.data.Form;
 
+import javax.xml.ws.Service;
 import java.util.ArrayList;
 
 import java.util.ArrayList;
@@ -40,7 +44,18 @@ public SettingsController(AssetsFinder assetsFinder,
 
     public Result index() {
         CurrentUser currentUser = sessionService.retrieveCurrentUserSession();
-        return ok(femr.ui.views.html.settings.index.render(currentUser, assetsFinder));
+        System.out.println("Test");
+        /*ServiceResponse<UserItem> userServiceResponse = userService.retrieveUser(currentUser.getId());
+        if (userServiceResponse.hasErrors()){
+            System.out.println("Test1333");
+            throw new RuntimeException();
+        }*/
+        System.out.println("Test1");
+        IndexViewModelGet viewModelGet = new IndexViewModelGet();
+        System.out.println("Test2");
+        Form<EditViewModel> editViewModelForm = formFactory.form(EditViewModel.class).bindFromRequest();
+        System.out.println("Test3");
+        return ok(femr.ui.views.html.settings.index.render(currentUser, viewModelGet, editViewModelForm, assetsFinder));
     }
 
     public Result update() {
@@ -49,9 +64,10 @@ public Result update() {
             return unauthorized();
         }
 
+        IndexViewModelGet viewModelGet = new IndexViewModelGet();
         Form<EditViewModel> editViewModelForm = formFactory.form(EditViewModel.class).bindFromRequest();
         if (editViewModelForm.hasErrors()) {
-            return badRequest(index.render(currentUser, assetsFinder));
+            return badRequest(index.render(currentUser, viewModelGet, editViewModelForm, assetsFinder));
         }
 
         EditViewModel viewModel = editViewModelForm.get();

diff --git a/app/femr/ui/models/settings/IndexViewModelGet.java b/app/femr/ui/models/settings/IndexViewModelGet.java
@@ -20,15 +20,16 @@
 package femr.ui.models.settings;
 
 import femr.data.models.core.IUser;
+import femr.common.models.UserItem;
 
 public class IndexViewModelGet {
-    private IUser user;
+    private UserItem user;
 
-    public IUser getUser() {
+    public UserItem getUser() {
         return user;
     }
 
-    public void setUser(IUser user) {
+    public void setUser(UserItem user) {
         this.user = user;
     }
 }
diff --git a/app/femr/ui/views/settings/index.scala.html b/app/femr/ui/views/settings/index.scala.html
@@ -1,4 +1,6 @@
 @(currentUser: femr.common.dtos.CurrentUser,
+        viewModelGet: femr.ui.models.settings.IndexViewModelGet,
+        form: play.data.Form[femr.ui.models.settings.EditViewModel],
         assets: AssetsFinder)
 
 @import femr.ui.views.html.layouts.settings