updating everything to the current user

FEMR · Jun 6, 2024 · 5cee9f9 · 5cee9f9
1 parent e78784b
commit 5cee9f9
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 10 deletions.
diff --git a/app/femr/ui/views/admin/index.scala.html b/app/femr/ui/views/admin/index.scala.html
@@ -9,7 +9,8 @@
                     .then(response => response.json())
                     .then(data => {
                         languageData = data;
-                        const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                        //const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                        const initialLanguage = @currentUser.getLanguageCode();
                         updateLanguage(initialLanguage);
                         document.getElementById('languageSelect').value = initialLanguage;
                     });

diff --git a/app/femr/ui/views/layouts/admin.scala.html b/app/femr/ui/views/layouts/admin.scala.html
@@ -28,7 +28,8 @@
                          .then(response => response.json())
                          .then(data => {
                              languageData = data;
-                             const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                             //const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                             const initialLanguage = @currentUser.getLanguageCode();
                              updateLanguage(initialLanguage);
                              document.getElementById('languageSelect').value = initialLanguage;
                          });

diff --git a/app/femr/ui/views/layouts/settings.scala.html b/app/femr/ui/views/layouts/settings.scala.html
@@ -24,7 +24,8 @@
                         .then(response => response.json())
                         .then(data => {
                             languageData = data;
-                            const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                            //const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                            const initialLanguage = @currentUser.getLanguageCode();
                             updateLanguage(initialLanguage);
                             document.getElementById('languageSelect').value = initialLanguage;
                         });

diff --git a/app/femr/ui/views/manager/index.scala.html b/app/femr/ui/views/manager/index.scala.html
@@ -16,7 +16,8 @@
                         .then(response => response.json())
                         .then(data => {
                             languageData = data;
-                            const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                            //const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                            const initialLanguage = @currentUser.getLanguageCode();
                             updateLanguage(initialLanguage);
                             document.getElementById('languageSelect').value = initialLanguage;
                         });

diff --git a/app/femr/ui/views/medical/index.scala.html b/app/femr/ui/views/medical/index.scala.html
@@ -13,7 +13,8 @@
                         .then(response => response.json())
                         .then(data => {
                             languageData = data;
-                            const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                            //const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                            const initialLanguage = @currentUser.getLanguageCode();
                             updateLanguage(initialLanguage);
                             document.getElementById('languageSelect').value = initialLanguage;
                         });

diff --git a/app/femr/ui/views/partials/authenticated.scala.html b/app/femr/ui/views/partials/authenticated.scala.html
@@ -20,7 +20,8 @@
                     .then(response => response.json())
                     .then(data => {
                         languageData = data;
-                        const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                        //const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                        const initialLanguage = @currentUser.getLanguageCode();
                         updateLanguage(initialLanguage);
                         document.getElementById('languageSelect').value = initialLanguage;
                     });

diff --git a/app/femr/ui/views/partials/footer.scala.html b/app/femr/ui/views/partials/footer.scala.html
@@ -6,7 +6,8 @@
                     .then(response => response.json())
                     .then(data => {
                         languageData = data;
-                        const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                        //const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                        const initialLanguage = @currentUser.getLanguageCode();
                         updateLanguage(initialLanguage);
                         document.getElementById('languageSelect').value = initialLanguage;
                     });

diff --git a/app/femr/ui/views/pharmacies/index.scala.html b/app/femr/ui/views/pharmacies/index.scala.html
@@ -13,7 +13,8 @@
                         .then(response => response.json())
                         .then(data => {
                             languageData = data;
-                            const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                            //const initialLanguage = localStorage.getItem('languageCode') || 'en';
+                            const initialLanguage = @currentUser.getLanguageCode();
                             updateLanguage(initialLanguage);
                             document.getElementById('languageSelect').value = initialLanguage;
                         });

diff --git a/app/femr/ui/views/settings/index.scala.html b/app/femr/ui/views/settings/index.scala.html
@@ -10,11 +10,9 @@
                     .then(data => {
                         languageData = data;
                         let initialLanguage = @currentUser.getLanguageCode();
-                        console.log(initialLanguage);
                         if (initialLanguage == null) {
                             initialLanguage = "en";
                         }
-                        console.log(initialLanguage);
                         updateLanguage(initialLanguage);
                         document.getElementById('languageSelect').value = initialLanguage;
                     });