[6.5.2] Fixed sort of calendar & favorite team for teams-page

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "de.timodittmann.scd"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 651000
-        versionName "6.5.1"
+        versionCode 652000
+        versionName "6.5.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="de.timodittmann.scd" version="6.5.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="de.timodittmann.scd" version="6.5.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>SC Dahenfeld</name>
     <description>An awesome SC Dahenfeld app.</description>
     <author email="[email protected]" href="http://timo-dittmann.de/">Timo Dittmann</author>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sc-dahenfeld",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "author": "Timo Dittmann",
   "homepage": "http://timo-dittmann.de/",
   "scripts": {

requests.http

@@ -0,0 +1,7 @@
+### GET Test Notification
+GET https://sc-dahenfeld.de/components/com_tdwapp/v9/notificationtest.php
+Authorization: Basic {{authUsername}} {{authPassword}}
+
+### GET Persons by project ID
+GET https://sc-dahenfeld.de/components/com_tdwapp/v9/persons?teamId=200
+Authorization: Basic {{authUsername}} {{authPassword}}

src/app/core/domain/rankingTeam.model.ts

@@ -12,7 +12,7 @@ export class RankingTeam {
   points = 0;
 
   public isFavoriteTeam(): boolean {
-    return this.name.includes('Dahenfeld') || this.name.includes('SGM Neuenstadt Kochertal') || this.name.includes('SGM Oedheim Kochertal');
+    return this.name.includes('Dahenfeld') || this.name.includes('Kochertal');
   }
 
   public getGoalsDiff(): number {

src/app/dataproviders/calendar/calendar.service.ts

@@ -20,20 +20,20 @@ export class CalendarService {
       .get<CalendarJson[]>(environment.backendUrl + 'calendarEvents')
       .pipe(map((value) => value.map(this.eventMapper.mapFrom)))
       .pipe(map((values) => values.map((value) => value as CalendarEvent)))
-      .pipe(tap((values) => [...values].sort((a, b) => a.compareTo(b))));
+      .pipe(map((values) => [...values].sort((a, b) => a.compareTo(b))));
   }
 
   loadCalendarMatches(): Observable<CalendarEntry[]> {
     return this.httpService
       .get<CalendarJson[]>(environment.backendUrl + 'calendarMatches')
       .pipe(map((value) => value.map(this.eventMapper.mapFrom)))
       .pipe(map((values) => values.map((value) => value as CalendarMatch)))
-      .pipe(tap((values) => [...values].sort((a, b) => a.compareTo(b))));
+      .pipe(map((values) => [...values].sort((a, b) => a.compareTo(b))));
   }
 
   public loadCalendarEntries(): Observable<CalendarEntry[]> {
     return combineLatest([this.loadCalendarEvents(), this.loadCalendarMatches()])
       .pipe(map((result) => result[0].concat(result[1])))
-      .pipe(tap((values) => [...values].sort((a, b) => a.compareTo(b))));
+      .pipe(map((values) => [...values].sort((a, b) => a.compareTo(b))));
   }
 }

src/app/presentation/pages/imprint/imprint.page.ts

@@ -13,7 +13,7 @@ import { App } from '@capacitor/app';
 })
 export class ImprintPage implements OnInit {
   heading: string;
-  version = '6.5.1';
+  version = '6.5.2';
   developer = 'Timo Dittmann';
   darkMode = false;