Merge remote-tracking branch 'origin/feature/remove-db-abstract'

* origin/feature/remove-db-abstract: Added the app version to the BO app.
monarc-project · Oct 4, 2024 · e2cdedb · e2cdedb
2 parents 8b385b4 + c139937
commit e2cdedb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/src/BackofficeApp.js b/src/BackofficeApp.js
@@ -291,6 +291,7 @@ angular
                 $rootScope.languages = ConfigService.getLanguages();
                 var uiLang = UserService.getUiLanguage();
                 $rootScope.mospApiUrl = ConfigService.getMospApiUrl();
+                $rootScope.appVersion = ConfigService.getVersion();
 
                 if (uiLang === undefined || uiLang === null) {
                     gettextCatalog.setCurrentLanguage('en');

diff --git a/src/ConfigService.js b/src/ConfigService.js
@@ -10,6 +10,7 @@
             languages: null,
             defaultLanguageIndex: null,
             mospApiUrl: null,
+            appVersion: null,
         };
 
         var loadConfig = function (success) {
@@ -24,9 +25,13 @@
                       name: ISO6391.getName(code),
                       index: lang,
                     }
-                  self.config.languages[lang] = AddLang;
+                    self.config.languages[lang] = AddLang;
                   }
                 }
+
+                if (data.data.appVersion) {
+                  self.config.appVersion = data.data.appVersion;
+                }
                 if (data.data.defaultLanguageIndex) {
                     self.config.defaultLanguageIndex = data.data.defaultLanguageIndex;
                 }
@@ -74,12 +79,21 @@
            }
        };
 
+        var getVersion = function () {
+          if (self.config.appVersion) {
+            return self.config.appVersion;
+          } else {
+            return '';
+          }
+        };
+
         return {
             loadConfig: loadConfig,
             isLoaded: isLoaded,
             getLanguages: getLanguages,
             getDefaultLanguageIndex: getDefaultLanguageIndex,
-            getMospApiUrl: getMospApiUrl
+            getMospApiUrl: getMospApiUrl,
+            getVersion: getVersion,
         };
     }
 

diff --git a/views/index.backoffice.html b/views/index.backoffice.html
@@ -63,8 +63,13 @@
 
         <md-divider></md-divider>
 
-        <p class="md-caption txtcenter">Copyright 2012-2022 <a href="https://www.nc3.lu" target="_blank" rel="noopener noreferrer">NC3</a></p>
-        <p class="md-caption txtcenter"><a href="https://www.monarc.lu" target="_blank" rel="noopener noreferrer">MONARC</a></p>
+        <p class="md-caption txtcenter">Copyright 2012-2024 <a href="https://www.nc3.lu" target="_blank" rel="noopener noreferrer">NC3</a></p>
+        <p class="md-caption txtcenter">
+            <a href="https://www.monarc.lu" title="MONARC Website" target="_blank" rel="noopener noreferrer">
+                MONARC
+            </a>
+            v. {{ appVersion }}
+        </p>
     </md-list>
 </md-sidenav>
 <md-content layout="column" class="md-main-content" flex ng-controller="BackofficeAccountCtrl">