Merge pull request #564 from origami-team/v4.2.0_web

V4.2.0 web
origami-team · Jun 7, 2024 · 4f34fcc · 4f34fcc
2 parents 916143e + 088d4de
commit 4f34fcc
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 24 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v16.10.0
diff --git a/src/app/pages/info/info.page.html b/src/app/pages/info/info.page.html
@@ -239,7 +239,7 @@ <h2 id="m3">Verantwortlicher</h2>
     Institut für Geoinformatik<br />Prof. Dr. Angela Schwering<br />Heisenbergstraße
     2<br />48149 Münster
   </p>
-  <p>E-Mail-Adresse: origami(at)uni-muenster.de.</p>
+  <p>E-Mail-Adresse: geogami(at)uni-muenster.de.</p>
   <h2 id="mOverview">Übersicht der Verarbeitungen</h2>
   <p>
     Die nachfolgende Übersicht fasst die Arten der verarbeiteten Daten und die

diff --git a/src/app/pages/play-game/play-game-list/play-game-list.page.html b/src/app/pages/play-game/play-game-list/play-game-list.page.html
@@ -29,12 +29,7 @@
         (change)="filterGamesEnv($event.target.value)"
       >
         <option value="real">Real world</option>
-
-        <!-- allow scholars to view virtual environment mode -->
-        <option value="virtual" [disabled]="userRole=='unloggedUser'">
-          Virtual env. {{ (userRole=='unloggedUser' ? '('+
-          ('GameList.logInToAccess' | translate) +')':'') }}
-        </option>
+        <option value="virtual">Virtual env.</option>
       </select>
     </div>
     <div>

diff --git a/src/app/pages/play-game/playing-game/playing-game.page.html b/src/app/pages/play-game/playing-game/playing-game.page.html
@@ -79,13 +79,13 @@
           <div *ngIf="!panelMinimized">
             <ion-chip color="primary" *ngIf="task.category.includes('nav')">
               <ion-icon name="navigate"></ion-icon>
-              &nbsp;{{ "General.task" | translate }} {{ taskIndex + 1 }}&nbsp;{{ "General.from" | translate }} {{
-              game.tasks.length }}
+              &nbsp;{{ "General.task" | translate }} ({{ taskIndex + 1 }}/{{
+              game.tasks.length }})
             </ion-chip>
             <ion-chip color="secondary" *ngIf="task.category.includes('theme')">
               <ion-icon name="clipboard"></ion-icon>
-              &nbsp;{{ "General.task" | translate }} {{ taskIndex + 1 }}&nbsp;{{ "General.from" | translate }} {{
-              game.tasks.length }}
+              &nbsp;{{ "General.task" | translate }} ({{ taskIndex + 1 }}/{{
+                game.tasks.length }})
             </ion-chip>
             <!-- <ion-chip color="tertiary" *ngIf="task.category.includes('free')">
               <ion-icon name="rose"></ion-icon>

diff --git a/src/app/start/start.page.ts b/src/app/start/start.page.ts
@@ -59,12 +59,30 @@ export class StartPage implements OnInit {
     Plugins.Device.getInfo().then((device) => (this.device = device));
 
     // get updated app version to notify user of app update
+    if (Capacitor.platform != "web") {
+      this.checkNewAppVersion();
+    }
+
+    // (translation) get languages
+    this.languages = this.languageService.getLangauges();
+    // (translation) set selected language (no need for it)
+    this.selected = this.languageService.selected;
+
+    // Get user role
+    this.user.subscribe((event) => {
+      if (event != null) {
+        this.userRole = event["roles"][0];
+      }
+    });
+  }
+
+  checkNewAppVersion() {
     this.gamesService
       .getAppVersion()
       .then((res) => res.content)
       .then((latestVersionInfo) => {
         this.latestAppVersionInfo = latestVersionInfo;
-        if (this.latestAppVersionInfo.enabled && Capacitor.platform != "web") {
+        if (this.latestAppVersionInfo.enabled) {
           if (Capacitor.platform == "ios" && this.latestAppVersionInfo.ios) {
             this.showUpdateAppAlert(
               this.versionToInt(this.latestAppVersionInfo.version),
@@ -83,18 +101,6 @@ export class StartPage implements OnInit {
           }
         }
       });
-
-    // (translation) get languages
-    this.languages = this.languageService.getLangauges();
-    // (translation) set selected language (no need for it)
-    this.selected = this.languageService.selected;
-
-    // Get user role
-    this.user.subscribe((event) => {
-      if (event != null) {
-        this.userRole = event["roles"][0];
-      }
-    });
   }
 
   handleCardClick(e) {