Merge pull request #319 from origami-team/september

origami-team · Sep 2, 2021 · 0cb4d68 · 0cb4d68
2 parents f938bec + e1d2b3f
commit 0cb4d68
Show file tree

Hide file tree

Showing 12 changed files with 123 additions and 244 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Spatial Intelligence Lab (SIL)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -7,7 +7,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "0.25"
+        versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -368,7 +368,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.0.25;
+				MARKETING_VERSION = 0.1;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = de.reedu.origaminext;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -392,7 +392,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.0.25;
+				MARKETING_VERSION = 0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = de.reedu.origaminext;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/src/app/mapControllers/layer-control.ts b/src/app/mapControllers/layer-control.ts
@@ -331,25 +331,27 @@ export class LayerControl {
     }
 
     public passMarkers(markers) {
-        if (this.layerType == LayerType.Swipe) {
-            const { waypointMarker } = markers;
-            if (waypointMarker) {
-                waypointMarker.addTo(this.satMap);
-            }
-            const { waypointMarkerDuplicate } = markers;
-            if (waypointMarkerDuplicate) {
-                // waypointMarkerDuplicate.addTo(this.satMap)
-                const elDuplicate = document.createElement('div');
-                elDuplicate.className = 'waypoint-marker-disabled';
-
-                new Marker(elDuplicate, {
-                    anchor: 'bottom',
-                    offset: [15, 0]
-                })
-                    .setLngLat(waypointMarkerDuplicate._lngLat).addTo(this.satMap);
-            }
+        setTimeout(() => {
+            if (this.layerType == LayerType.Swipe) {
+                const { waypointMarker } = markers;
+                if (waypointMarker) {
+                    waypointMarker.addTo(this.satMap);
+                }
+                const { waypointMarkerDuplicate } = markers;
+                if (waypointMarkerDuplicate) {
+                    // waypointMarkerDuplicate.addTo(this.satMap)
+                    const elDuplicate = document.createElement('div');
+                    elDuplicate.className = 'waypoint-marker-disabled';
+
+                    new Marker(elDuplicate, {
+                        anchor: 'bottom',
+                        offset: [15, 0]
+                    })
+                        .setLngLat(waypointMarkerDuplicate._lngLat).addTo(this.satMap);
+                }
 
-        }
+            }
+        }, 500)
     }
 
     private _toGeoJSONPoint = (lng, lat): GeoJSON.Feature<GeoJSON.Point> =>

diff --git a/src/app/pages/create-game/create-info-modal/create-info-modal.component.html b/src/app/pages/create-game/create-info-modal/create-info-modal.component.html
@@ -43,7 +43,7 @@ <h5>Informationstext</h5>
         (click)="
           showPopover(
             $event,
-            'Es können Markdown Elemente genutzt werden.\n**Beispiel** für fetten Text.\n_Beispiel_ für kursiven Text.\n~~Beispiel~~ für durchgestrichenen Text.\n[Beispiellink](https://beispiel.de/) für einen Link.\nWeitere Informationen: https://jfcere.github.io/ngx-markdown/cheat-sheet'
+            'Es können Markdown Elemente genutzt werden.\n**Beispiel** für fetten Text.\n_Beispiel_ für kursiven Text.\n~~Beispiel~~ für durchgestrichenen Text.\n[Beispiellink](https://beispiel.de/) Beispiel für einen Link.\n<p>Zeile1<br>Zeile2</p> Beispiel für eine Zeilenumbruch. Weitere Informationen: https://jfcere.github.io/ngx-markdown/cheat-sheet'
           )
         "
       >

diff --git a/src/app/pages/edit-game/edit-game-list/edit-game-list.page.html b/src/app/pages/edit-game/edit-game-list/edit-game-list.page.html
@@ -19,7 +19,7 @@ <h5>Wähle ein Spiel aus der Spieleliste.</h5>
   <ion-card *ngFor="let game of games" (click)="gameClick(game)" detail color="secondary">
     <ion-card-header>
       <ion-label>
-        <h2><span *ngIf="game.place">{{ game.place }} - </span>{{ game.name }}</h2>
+        <h2><ion-icon name="game-controller"></ion-icon><span *ngIf="game.place"><b>&nbsp;&nbsp;{{ game.place }}</b> - </span>{{ game.name }}</h2>
       </ion-label>
     </ion-card-header>
   </ion-card>

diff --git a/src/app/pages/info/info.page.html b/src/app/pages/info/info.page.html
@@ -12,7 +12,7 @@ <h5>Über OriGami</h5>
   <p>
     <b>OriGami</b> ist eine App, zum Erstellen und Spielen von kartenbasierten
     Games und eignet sich insbesondere für den Einsatz an Bildungseinrichtungen.
-    Die Entwicklung der App wird vom <b>Insitut für Geoinformatik</b> der
+    Die Entwicklung der App wird vom <b>Institut für Geoinformatik</b> der
     Westfälischen Wilhelms-Universität Münster wissenschaftlich begleitet und
     didaktisch konzeptioniert.
   </p>

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
@@ -7,6 +7,9 @@
     </ion-buttons>
     <ion-title *ngIf="game">{{ game.name }}</ion-title>
     <ion-buttons slot="end">
+      <ion-button *ngIf="taskIndex>0" color="dark" (click)="previousTask()">
+        <ion-icon name="arrow-back-outline"></ion-icon>
+      </ion-button>
       <ion-button color="dark" (click)="nextTask()">
         <ion-icon name="arrow-forward"></ion-icon>
       </ion-button>

diff --git a/src/app/pages/play-game/playing-game/playing-game.page.ts b/src/app/pages/play-game/playing-game/playing-game.page.ts
@@ -996,6 +996,37 @@ export class PlayingGamePage implements OnInit, OnDestroy {
     this.initTask();
   }
 
+  previousTask() {
+    if(this.taskIndex>0){
+
+    this.taskIndex--;
+    /**
+    if (this.taskIndex > 1) {
+      PlayingGamePage.showSuccess = true;
+      this.trackerService.addEvent({
+        type: 'FINISHED_GAME',
+      });
+      this.trackerService.uploadTrack().then((res) => {
+        if (res.status == 201) {
+          this.uploadDone = true;
+        }
+      });
+      if (Capacitor.isNative) {
+        Plugins.Haptics.vibrate();
+        Plugins.CapacitorKeepScreenOn.disable();
+      }
+
+      return;
+    }
+    */
+
+    this.task = this.game.tasks[this.taskIndex];
+    this.feedbackControl.setTask(this.task);
+    this.initTask();
+  }
+
+  }
+
   async onMultipleChoicePhotoSelected(item, event) {
     this.selectedPhoto = item;
     this.isCorrectPhotoSelected = item.key === '0';

diff --git a/src/app/start/start.page.html b/src/app/start/start.page.html
@@ -28,6 +28,7 @@
   </ion-card>
 
   <ion-card
+    *ngIf="(user | async)?.roles && (user | async)?.roles.includes('admin')"
     id="start_card_analyze"
     (click)="navigateAnalyzePage()"
     color="secondary"

diff --git a/src/assets/icons/marker-editor-solution.png b/src/assets/icons/marker-editor-solution.png