From c22fc502b00278a981f1a4ea4b7e77d75ed4368c Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 29 Apr 2022 16:44:01 +0200
Subject: [PATCH 01/71] Added ui to enter grade parameters

---
 .../res/layout/activity_grades_listview.xml   | 135 ++++++++++++++----
 1 file changed, 109 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 0e93023062..667db156c1 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -4,52 +4,135 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/default_window_background"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:paddingStart="@dimen/material_default_padding"
     android:paddingTop="@dimen/material_small_padding"
     android:paddingEnd="@dimen/material_default_padding"
     android:paddingBottom="@dimen/material_small_padding">
 
+
     <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+
+            <TextView
+                android:id="@+id/courseNameTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="@color/color_primary"
+                android:textSize="@dimen/large_text_size"
+                android:textStyle="bold"
+                tools:text="Course name" />
+
+            <TextView
+                android:id="@+id/examDateTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="visible"
+                tools:text="Exam date" />
+
+            <TextView
+                android:id="@+id/additionalInfoTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="visible"
+                tools:text="Examiner" />
+
+
+        </LinearLayout>
+
 
         <TextView
-            android:id="@+id/courseNameTextView"
-            android:layout_width="match_parent"
+            android:id="@+id/gradeTextView"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/color_primary"
-            android:textSize="@dimen/large_text_size"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="10dp"
+            android:background="@drawable/grade_background"
+            android:gravity="center"
+            android:textColor="@color/white"
+            android:textSize="22sp"
             android:textStyle="bold"
-            tools:text="Course name" />
+            tools:text="1,0" />
 
-        <TextView
-            android:id="@+id/examDateTextView"
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:weightSum="10">
+
+        <Button
+            android:id="@+id/buttonresetGradeParameters"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:text="Exam date" />
+            android:text="Reset Grade" />
+
+        <CheckBox
+            android:id="@+id/checkBox2"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="5"
+            android:text="Note ausblenden" />
+
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:weightSum="10">
 
         <TextView
-            android:id="@+id/additionalInfoTextView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="5"
+            android:labelFor="@+id/editTextCreditsofSubject"
+            android:text="Credits:" />
+
+        <EditText
+            android:id="@+id/editTextCreditsofSubject"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:text="Examiner" />
+            android:autofillHints="8"
+            android:ems="10"
+            android:inputType="numberSigned" />
+
 
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/gradeTextView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="10dp"
-        android:background="@drawable/grade_background"
-        android:gravity="center"
-        android:textColor="@color/white"
-        android:textSize="22sp"
-        android:textStyle="bold"
-        tools:text="1,0" />
+        android:orientation="horizontal"
+        android:weightSum="10">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="5"
+            android:labelFor="@+id/editTextGradeWeight"
+            android:text="Gewichtung der Note:" />
+
+        <EditText
+            android:id="@+id/editTextGradeWeight"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="1.0"
+            android:ems="10"
+            android:inputType="numberDecimal" />
+
+
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file

From 521b5aa55464193a77847fd181a885e93115470f Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 29 Apr 2022 17:20:47 +0200
Subject: [PATCH 02/71] Added menu item to enter edit mode

---
 app/src/main/res/menu/menu_activity_grades.xml | 9 +++++++++
 app/src/main/res/values-de/strings.xml         | 1 +
 app/src/main/res/values/strings.xml            | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/app/src/main/res/menu/menu_activity_grades.xml b/app/src/main/res/menu/menu_activity_grades.xml
index 652927b992..e39b83e69d 100644
--- a/app/src/main/res/menu/menu_activity_grades.xml
+++ b/app/src/main/res/menu/menu_activity_grades.xml
@@ -19,4 +19,13 @@
         app:iconTint="@color/color_primary"
         app:showAsAction="ifRoom" />
 
+
+    <item
+        android:id="@+id/edit_grades_menu"
+        android:icon="@drawable/ic_outline_settings_24px"
+        android:orderInCategory="100"
+        android:title="@string/edit_grades"
+        app:iconTint="@color/color_primary"
+        app:showAsAction="ifRoom" />
+
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 805c8bd0ea..54c0dc2990 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -47,6 +47,7 @@
     <!-- Exam/Grades -->
     <string name="average_grade">Durchschnittsnote</string>
     <string name="average_grade_hint">Deinen offiziellen Schnitt findest Du in TUMOnline.</string>
+    <string name="edit_grades">Noten Bearbeiten</string>
     <string name="show_column_chart">Zeige als Balkendiagramm</string>
     <string name="show_pie_chart">Zeige als Tortendiagramm</string>
     <string name="result_extra">Ergebnis:&#160;</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 03e4b9b2aa..cd9aa12d4e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -73,6 +73,7 @@
     <!-- Exam/Grades -->
     <string name="average_grade">Average grade</string>
     <string name="average_grade_hint">Estimated average. Please refer to TUMOnline for the precise one.</string>
+    <string name="edit_grades">Edit Grades</string>
     <string name="show_column_chart">Show Column Chart</string>
     <string name="show_pie_chart">Show Pie Chart</string>
     <string name="result_extra">Result:&#160;</string>
@@ -769,4 +770,5 @@ Signature: %5$s</string>
     // for opening hours
     <string name="language">en</string>
     <string name="use_existing">Use existing</string>
+
 </resources>

From eaa6f76f96aa276b08602a5c1e618c1bacd92886 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 29 Apr 2022 18:02:23 +0200
Subject: [PATCH 03/71] Added click listener to edit menu item to toggle edit
 mode

---
 .../component/tumui/grades/GradesFragment.kt  | 108 +++++++++++-------
 .../res/layout/activity_grades_listview.xml   | 107 +++++++++--------
 2 files changed, 124 insertions(+), 91 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index cdf24287b3..68fba7a4f1 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -5,6 +5,7 @@ import android.animation.AnimatorListenerAdapter
 import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
+import android.util.Log
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
@@ -13,6 +14,7 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat.getColor
+import androidx.core.view.isVisible
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.LegendEntry
 import com.github.mikephil.charting.data.*
@@ -26,13 +28,14 @@ import de.tum.`in`.tumcampusapp.component.tumui.grades.model.ExamList
 import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
+import kotlinx.android.synthetic.main.activity_grades_listview.*
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
 import java.text.NumberFormat
 import java.util.*
 
 class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
-        R.layout.fragment_grades,
-        R.string.my_grades
+    R.layout.fragment_grades,
+    R.string.my_grades
 ) {
 
     private var spinnerPosition = 0
@@ -152,7 +155,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 legend.textColor = getColor(resources, R.color.text_primary, null)
 
                 invalidate()
-        }
+            }
 
         }
     }
@@ -196,16 +199,16 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 description = null
                 setTouchEnabled(false)
                 legend.setCustom(
-                        arrayOf(
-                                LegendEntry(
-                                        getString(R.string.grades_without_weight),
-                                        Legend.LegendForm.SQUARE,
-                                        10f,
-                                        0f,
-                                        null,
-                                        ContextCompat.getColor(context, R.color.grade_default)
-                                )
+                    arrayOf(
+                        LegendEntry(
+                            getString(R.string.grades_without_weight),
+                            Legend.LegendForm.SQUARE,
+                            10f,
+                            0f,
+                            null,
+                            ContextCompat.getColor(context, R.color.grade_default)
                         )
+                    )
                 )
 
                 legend.textColor = getColor(resources, R.color.text_primary, null)
@@ -227,8 +230,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun calculateAverageGrade(exams: List<Exam>): Double {
         val numberFormat = NumberFormat.getInstance(Locale.GERMAN)
         val grades = exams
-                .filter { it.isPassed }
-                .map { numberFormat.parse(it.grade).toDouble() }
+            .filter { it.isPassed }
+            .map { numberFormat.parse(it.grade).toDouble() }
 
         val gradeSum = grades.sum()
         return gradeSum / grades.size.toDouble()
@@ -262,15 +265,16 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun initSpinner(exams: List<Exam>) {
         val programIds = exams
-                .map { it.programID }
-                .distinct()
-                .map { getString(R.string.study_program_format_string, it) }
+            .map { it.programID }
+            .distinct()
+            .map { getString(R.string.study_program_format_string, it) }
 
         val filters = mutableListOf(getString(R.string.all_programs))
         filters.addAll(programIds)
 
         val spinnerArrayAdapter = ArrayAdapter(
-                requireContext(), R.layout.simple_spinner_item_actionbar, filters)
+            requireContext(), R.layout.simple_spinner_item_actionbar, filters
+        )
 
         with(binding) {
             filterSpinner?.apply {
@@ -282,7 +286,12 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
 
         binding.filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
+            override fun onItemSelected(
+                parent: AdapterView<*>,
+                view: View?,
+                position: Int,
+                id: Long
+            ) {
                 val filter = filters[position]
                 spinnerPosition = position
 
@@ -325,7 +334,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         }
 
         val averageGrade = calculateAverageGrade(exams)
-        binding.averageGradeTextView.text = String.format("%s: %.2f", getString(R.string.average_grade), averageGrade)
+        binding.averageGradeTextView.text =
+            String.format("%s: %.2f", getString(R.string.average_grade), averageGrade)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -382,7 +392,19 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         return when (item.itemId) {
             R.id.bar_chart_menu,
             R.id.pie_chart_menu -> toggleChart().run { true }
+            R.id.edit_grades_menu -> changeEditMode().run { true }
             else -> super.onOptionsItemSelected(item)
+
+        }
+    }
+
+    /**
+     * Toggles between the standard mode and the mode which allows to change grades.
+     */
+    private fun changeEditMode() {
+        with(binding) {
+            val editIsOn = editGradesContainer.visibility == View.VISIBLE
+            editGradesContainer.isVisible=!editIsOn;
         }
     }
 
@@ -424,21 +446,21 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         // Animate the content view to 100% opacity, and clear any animation
         // listener set on the view.
         fadeIn.animate()
-                .alpha(1f)
-                .setDuration(animationDuration)
-                .setListener(null)
+            .alpha(1f)
+            .setDuration(animationDuration)
+            .setListener(null)
 
         // Animate the loading view to 0% opacity. After the animation ends,
         // set its visibility to GONE as an optimization step (it won't
         // participate in layout passes, etc.)
         fadeOut.animate()
-                .alpha(0f)
-                .setDuration(animationDuration)
-                .setListener(object : AnimatorListenerAdapter() {
-                    override fun onAnimationEnd(animation: Animator) {
-                        fadeOut.visibility = View.GONE
-                    }
-                })
+            .alpha(0f)
+            .setDuration(animationDuration)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    fadeOut.visibility = View.GONE
+                }
+            })
     }
 
     companion object {
@@ -451,19 +473,19 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         private val longGradeRe = Regex("[1-4],[0-9][0-9]+")
 
         private val GRADE_COLORS = intArrayOf(
-                R.color.grade_1_0, R.color.grade_1_1, R.color.grade_1_2, R.color.grade_1_3,
-                R.color.grade_1_4, R.color.grade_1_5, R.color.grade_1_6, R.color.grade_1_7,
-                R.color.grade_1_8, R.color.grade_1_9,
-                R.color.grade_2_0, R.color.grade_2_1, R.color.grade_2_2, R.color.grade_2_3,
-                R.color.grade_2_4, R.color.grade_2_5, R.color.grade_2_6, R.color.grade_2_7,
-                R.color.grade_2_8, R.color.grade_2_9,
-                R.color.grade_3_0, R.color.grade_3_1, R.color.grade_3_2, R.color.grade_3_3,
-                R.color.grade_3_4, R.color.grade_3_5, R.color.grade_3_6, R.color.grade_3_7,
-                R.color.grade_3_8, R.color.grade_3_9,
-                R.color.grade_4_0, R.color.grade_4_1, R.color.grade_4_2, R.color.grade_4_3,
-                R.color.grade_4_4, R.color.grade_4_5, R.color.grade_4_6, R.color.grade_4_7,
-                R.color.grade_4_8, R.color.grade_4_9,
-                R.color.grade_5_0, R.color.grade_default
+            R.color.grade_1_0, R.color.grade_1_1, R.color.grade_1_2, R.color.grade_1_3,
+            R.color.grade_1_4, R.color.grade_1_5, R.color.grade_1_6, R.color.grade_1_7,
+            R.color.grade_1_8, R.color.grade_1_9,
+            R.color.grade_2_0, R.color.grade_2_1, R.color.grade_2_2, R.color.grade_2_3,
+            R.color.grade_2_4, R.color.grade_2_5, R.color.grade_2_6, R.color.grade_2_7,
+            R.color.grade_2_8, R.color.grade_2_9,
+            R.color.grade_3_0, R.color.grade_3_1, R.color.grade_3_2, R.color.grade_3_3,
+            R.color.grade_3_4, R.color.grade_3_5, R.color.grade_3_6, R.color.grade_3_7,
+            R.color.grade_3_8, R.color.grade_3_9,
+            R.color.grade_4_0, R.color.grade_4_1, R.color.grade_4_2, R.color.grade_4_3,
+            R.color.grade_4_4, R.color.grade_4_5, R.color.grade_4_6, R.color.grade_4_7,
+            R.color.grade_4_8, R.color.grade_4_9,
+            R.color.grade_5_0, R.color.grade_default
         )
     }
 }
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 667db156c1..06e184576d 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -66,73 +66,84 @@
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:id="@+id/editGradesContainer"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="10">
+        android:orientation="vertical">
 
-        <Button
-            android:id="@+id/buttonresetGradeParameters"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Reset Grade" />
 
-        <CheckBox
-            android:id="@+id/checkBox2"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="5"
-            android:text="Note ausblenden" />
+            android:orientation="horizontal"
+            android:weightSum="10">
 
-    </LinearLayout>
+            <Button
+                android:id="@+id/buttonresetGradeParameters"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="5"
+                android:text="Reset Grade" />
 
+            <CheckBox
+                android:id="@+id/checkBox2"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="5"
+                android:text="Note ausblenden" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="10">
+        </LinearLayout>
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="5"
-            android:labelFor="@+id/editTextCreditsofSubject"
-            android:text="Credits:" />
 
-        <EditText
-            android:id="@+id/editTextCreditsofSubject"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:autofillHints="8"
-            android:ems="10"
-            android:inputType="numberSigned" />
+            android:orientation="horizontal"
+            android:weightSum="10">
 
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="5"
+                android:labelFor="@+id/editTextCreditsofSubject"
+                android:text="Credits:" />
 
-    </LinearLayout>
+            <EditText
+                android:id="@+id/editTextCreditsofSubject"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="5"
+                android:autofillHints="8"
+                android:ems="10"
+                android:inputType="numberSigned" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="10">
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="5"
-            android:labelFor="@+id/editTextGradeWeight"
-            android:text="Gewichtung der Note:" />
+        </LinearLayout>
 
-        <EditText
-            android:id="@+id/editTextGradeWeight"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:autofillHints="1.0"
-            android:ems="10"
-            android:inputType="numberDecimal" />
+            android:orientation="horizontal"
+            android:weightSum="10"
+            android:layout_marginBottom="@dimen/material_default_padding">
 
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="5"
+                android:labelFor="@+id/editTextGradeWeight"
+                android:text="Gewichtung der Note:" />
+
+            <EditText
+                android:id="@+id/editTextGradeWeight"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="5"
+                android:autofillHints="1.0"
+                android:ems="10"
+                android:inputType="numberDecimal" />
 
-    </LinearLayout>
 
+        </LinearLayout>
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file

From 1590d7cea9fd2a770c4e585bd6ccf2b1b7964fe1 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Wed, 4 May 2022 10:07:43 +0200
Subject: [PATCH 04/71] toggeling edit mode changes now all ui elements

---
 .../component/tumui/grades/ExamListAdapter.kt | 30 +++++++++++++++----
 .../component/tumui/grades/GradesFragment.kt  | 17 ++++++++---
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index f62395fec2..2a6f3c8eca 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -3,6 +3,8 @@ package de.tum.`in`.tumcampusapp.component.tumui.grades
 import android.content.Context
 import android.view.View
 import android.view.ViewGroup
+import android.widget.EditText
+import android.widget.LinearLayout
 import android.widget.TextView
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyListHeadersAdapter
@@ -12,7 +14,10 @@ import org.joda.time.format.DateTimeFormat
 /**
  * Custom UI adapter for a list of exams.
  */
-class ExamListAdapter(context: Context, results: List<Exam>) : SimpleStickyListHeadersAdapter<Exam>(context, results.toMutableList()) {
+class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: GradesFragment) :
+    SimpleStickyListHeadersAdapter<Exam>(context, results.toMutableList()) {
+
+    val localGradesFragment: GradesFragment = gradesFragment
 
     init {
         itemList.sort()
@@ -43,11 +48,20 @@ class ExamListAdapter(context: Context, results: List<Exam>) : SimpleStickyListH
         } else {
             DATE_FORMAT.print(exam.date)
         }
-        holder.examDateTextView.text = String.format("%s: %s", context.getString(R.string.date), date)
+        holder.examDateTextView.text =
+            String.format("%s: %s", context.getString(R.string.date), date)
+
+        holder.additionalInfoTextView.text = String.format(
+            "%s: %s, %s: %s",
+            context.getString(R.string.examiner), exam.examiner,
+            context.getString(R.string.mode), exam.modus
+        )
 
-        holder.additionalInfoTextView.text = String.format("%s: %s, %s: %s",
-                context.getString(R.string.examiner), exam.examiner,
-                context.getString(R.string.mode), exam.modus)
+        if (localGradesFragment.getGlobalEdit()) {
+            holder.editGradesContainer.visibility=View.GONE
+        } else {
+            holder.editGradesContainer.visibility=View.VISIBLE
+        }
 
         return view
     }
@@ -71,9 +85,15 @@ class ExamListAdapter(context: Context, results: List<Exam>) : SimpleStickyListH
         var gradeTextView: TextView = itemView.findViewById(R.id.gradeTextView)
         var examDateTextView: TextView = itemView.findViewById(R.id.examDateTextView)
         var additionalInfoTextView: TextView = itemView.findViewById(R.id.additionalInfoTextView)
+
+        var editTextGradeWeights: EditText = itemView.findViewById(R.id.editTextGradeWeight)
+        var editGradesContainer: LinearLayout = itemView.findViewById(R.id.editGradesContainer)
+
+        //todo hier die Knöpfe definieren
     }
 
     companion object {
         private val DATE_FORMAT = DateTimeFormat.mediumDate()
     }
+
 }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 68fba7a4f1..dd551cb9aa 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -46,6 +46,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     private var showBarChartAfterRotate = false
 
+    private var globaledit = false;
+    private var exams = listOf<Exam>();
+
     private val grades: Array<String> by lazy {
         resources.getStringArray(R.array.grades)
     }
@@ -102,7 +105,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     override fun onDownloadSuccessful(response: ExamList) {
-        val exams = response.exams.orEmpty()
+        exams = response.exams.orEmpty()
 
         initSpinner(exams)
         showExams(exams)
@@ -319,7 +322,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             return
         }
 
-        binding.gradesListView.adapter = ExamListAdapter(requireContext(), exams)
+        binding.gradesListView.adapter = ExamListAdapter(requireContext(), exams, this)
 
         if (!isFetched) {
             // We hide the charts container in the beginning. Then, when we load data for the first
@@ -403,8 +406,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun changeEditMode() {
         with(binding) {
-            val editIsOn = editGradesContainer.visibility == View.VISIBLE
-            editGradesContainer.isVisible=!editIsOn;
+            globaledit = !globaledit;
+
+            // Refresh all values for the ui
+            (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
         }
     }
 
@@ -463,6 +468,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             })
     }
 
+    fun getGlobalEdit(): Boolean {
+        return globaledit;
+    }
+
     companion object {
         private const val KEY_SHOW_BAR_CHART = "showPieChart"
         private const val KEY_SPINNER_POSITION = "spinnerPosition"

From e94549787cbbb25d03ad38c284e3833294bc99fd Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 6 May 2022 11:20:18 +0200
Subject: [PATCH 05/71] Exam List is stored as a json object in shared
 preferences

---
 .../component/tumui/grades/ExamListAdapter.kt | 13 ++-
 .../tumui/grades/GradesBackgroundUpdater.kt   |  1 +
 .../component/tumui/grades/GradesFragment.kt  | 93 ++++++++++++++++++-
 .../component/tumui/grades/model/Exam.kt      | 26 +++++-
 .../res/layout/activity_grades_listview.xml   |  1 +
 5 files changed, 127 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 2a6f3c8eca..e4aeaec081 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -1,6 +1,7 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
@@ -11,6 +12,7 @@ import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyList
 import de.tum.`in`.tumcampusapp.component.tumui.grades.model.Exam
 import org.joda.time.format.DateTimeFormat
 
+
 /**
  * Custom UI adapter for a list of exams.
  */
@@ -57,10 +59,15 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             context.getString(R.string.mode), exam.modus
         )
 
+       // exam.weight = "new weight"
+        //holder.textViewCreditsosSubject.text = exam.weight;
+        //storeExam(exam)
+        //holder.editTextGradeWeights.getText().insert(holder.editTextGradeWeights.getSelectionStart(), 0);
         if (localGradesFragment.getGlobalEdit()) {
-            holder.editGradesContainer.visibility=View.GONE
+            holder.editGradesContainer.visibility = View.GONE
         } else {
-            holder.editGradesContainer.visibility=View.VISIBLE
+            holder.editGradesContainer.visibility = View.VISIBLE
+
         }
 
         return view
@@ -88,6 +95,8 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
         var editTextGradeWeights: EditText = itemView.findViewById(R.id.editTextGradeWeight)
         var editGradesContainer: LinearLayout = itemView.findViewById(R.id.editGradesContainer)
+        var textViewCreditsosSubject: TextView =
+            itemView.findViewById(R.id.textViewCreditsosSubject)
 
         //todo hier die Knöpfe definieren
     }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt
index e271bf5400..348b84f39e 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt
@@ -1,6 +1,7 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
+import android.util.Log
 import de.tum.`in`.tumcampusapp.api.tumonline.CacheControl
 import de.tum.`in`.tumcampusapp.api.tumonline.TUMOnlineClient
 import de.tum.`in`.tumcampusapp.component.notifications.NotificationScheduler
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index dd551cb9aa..1f1c4bb9df 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -2,6 +2,7 @@ package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
+import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
@@ -14,11 +15,12 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat.getColor
-import androidx.core.view.isVisible
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.LegendEntry
 import com.github.mikephil.charting.data.*
 import com.github.mikephil.charting.formatter.ValueFormatter
+import com.google.gson.*
+import com.google.gson.reflect.TypeToken
 import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.api.tumonline.CacheControl
@@ -28,10 +30,15 @@ import de.tum.`in`.tumcampusapp.component.tumui.grades.model.ExamList
 import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
-import kotlinx.android.synthetic.main.activity_grades_listview.*
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
+import org.joda.time.DateTime
+import org.joda.time.format.DateTimeFormat
+import org.joda.time.format.DateTimeFormatter
+import java.lang.reflect.Type
 import java.text.NumberFormat
 import java.util.*
+import javax.inject.Inject
+
 
 class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     R.layout.fragment_grades,
@@ -88,7 +95,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             showChartButton?.setOnClickListener { toggleInLandscape() }
         }
 
-        loadGrades(CacheControl.USE_CACHE)
+                loadGrades(CacheControl.USE_CACHE)      //set to BYPASS_CACHE to force a reload
 
         // Tracks whether the user has used the calendar module before. This is used in determining when to prompt for a
         // Google Play store review
@@ -106,6 +113,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     override fun onDownloadSuccessful(response: ExamList) {
         exams = response.exams.orEmpty()
+//todo these exams should be loaded from shared prefrences, not from the cahe -> allows to modify weights
+        storeExamListInSharedPreferences()
+        loadExamListFromSharedPreferences()
 
         initSpinner(exams)
         showExams(exams)
@@ -119,7 +129,82 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         storeGradedCourses(exams)
     }
 
-    private fun storeGradedCourses(exams: List<Exam>) {
+    fun loadExamListFromSharedPreferences() {
+        //    val jsonList = activity?.getSharedPreferences(
+        //        getString(R.string.examlistpreferences), Context.MODE_PRIVATE)
+        //val mPrefs: SharedPreferences = getPreferences(MODE_PRIVATE)
+        // val prefsEditor: Editor = sharedPref.edit()
+
+        //val userListType : Type = TypeToken<ArrayList<Exam>>() {}.type;
+        // val examListType: Type = TypeToken<List<Exam>>(){}.getType();
+
+        //val json = gson.fromJson(jsonList, Array<Exam>::class.java)
+        //prefsEditor.putString("MyObject", json)
+        //prefsEditor.commit()
+
+        //exams= activity?.getPreferences(Context.MODE_PRIVATE)!!.getStringSet("ExamList", emptySet())!!.toList().sorted()
+        // val gson = Gson()
+        val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
+        val dateTimeConverter = DateTimeConverter()
+        val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
+            .create()
+        val listType = object : TypeToken<List<Exam>>() {}.type
+        if (sharedPref != null) {
+            val jsonString = sharedPref.getString("ExamList", "");
+            Log.d("Examlistdebugging: ", jsonString!!)
+            if (jsonString != null) {
+                val helperExams: List<Exam> = gson.fromJson(jsonString, listType)
+                Log.d("Examlistdebugging: ", helperExams.toString())
+            }
+        }
+    }
+
+    fun storeExamListInSharedPreferences() {
+        val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
+       // val gson = GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").create()
+        val dateTimeConverter = DateTimeConverter()
+        val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
+            .create()
+        val jsonlist = gson.toJson(exams)
+        Log.d("Examlistdebugging: ", jsonlist)
+        with(sharedPref.edit()) {
+            putString("ExamList", jsonlist)
+            apply()
+        }
+    }
+
+
+    /**
+     * Gson serialiser/deserialiser for converting Joda [DateTime] objects.
+     * Source: https://riptutorial.com/android/example/14799/adding-a-custom-converter-to-gson
+     */
+    class DateTimeConverter @Inject constructor() : JsonSerializer<DateTime?>,
+        JsonDeserializer<DateTime?> {
+        private val dateTimeFormatter: DateTimeFormatter
+        override fun serialize(
+            src: DateTime?,
+            typeOfSrc: Type?,
+            context: JsonSerializationContext?
+        ): JsonElement {
+            return JsonPrimitive(dateTimeFormatter.print(src))
+        }
+
+        @Throws(JsonParseException::class)
+        override fun deserialize(
+            json: JsonElement,
+            typeOfT: Type?,
+            context: JsonDeserializationContext?
+        ): DateTime? {
+            return if (json.asString == null || json.asString.isEmpty()) {
+                null
+            } else dateTimeFormatter.parseDateTime(json.asString)
+        }
+
+        init {
+            dateTimeFormatter = DateTimeFormat.forPattern("YYYY-MM-dd HH:mm")
+        }
+    }
+    public fun storeGradedCourses(exams: List<Exam>) {
         val gradesStore = GradesStore(defaultSharedPreferences)
         val courses = exams.map { it.course }
         gradesStore.store(courses)
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index 60503dd8f9..add0abb69d 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -1,6 +1,7 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades.model
 
 import android.content.Context
+import android.util.Log
 import androidx.core.content.ContextCompat
 import com.tickaroo.tikxml.annotation.PropertyElement
 import com.tickaroo.tikxml.annotation.Xml
@@ -36,13 +37,36 @@ data class Exam(
     @PropertyElement(name = "studienidentifikator")
     val programID: String,
     @PropertyElement(name = "lv_semester")
-    val semester: String = ""
+    val semester: String = "",
+    @PropertyElement(name = "credits")
+    var weight: String? = "test",
 ) : Comparable<Exam>, SimpleStickyListHeadersAdapter.SimpleStickyListItem {
 
     override fun getHeadName() = semester
 
     override fun getHeaderId() = semester
 
+    /**
+     * Compare all Attributes which were send from tum online,
+     * All added attributes for the individual grades can be neglected
+     */
+    override fun equals(other: Any?): Boolean {
+        if (other !is Exam){
+            return false;
+        }
+        val otherExam=(other as Exam)
+        if (credits.isNullOrEmpty() xor otherExam.credits.isNullOrEmpty()){
+            return false
+        }
+        //val test: String? ="lorem ipsum";
+        //val test1: String? =null;
+        //val test2: String? =null;
+       /* Log.d("Kotlin logic test start: ", test1.equals(test2).toString())
+        Log.d("Kotlin logic test: ", test.equals(test2).toString())
+        Log.d("Kotlin logic test: ", test1.equals(test).toString())*/
+        return otherExam.course.equals(course) && otherExam.programID.equals(programID) && otherExam.semester.equals(semester);
+    }
+
     override fun compareTo(other: Exam): Int {
         return compareByDescending<Exam> { it.semester }
                 .thenByDescending { it.date }
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 06e184576d..4a62974b41 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -103,6 +103,7 @@
 
             <TextView
                 android:layout_width="0dp"
+                android:id="@+id/textViewCreditsosSubject"
                 android:layout_height="wrap_content"
                 android:layout_weight="5"
                 android:labelFor="@+id/editTextCreditsofSubject"

From 6a1391e10310877ceac426c7670ce59dd8d01e77 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 6 May 2022 14:05:32 +0200
Subject: [PATCH 06/71] connected ui to the model - exams are saved permanently
 in shared preferences

---
 .../component/tumui/grades/ExamListAdapter.kt | 63 ++++++++++++++++---
 .../component/tumui/grades/GradesFragment.kt  | 56 +++++++----------
 .../component/tumui/grades/model/Exam.kt      | 23 ++++---
 3 files changed, 94 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index e4aeaec081..f7730a1b81 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -1,6 +1,8 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
+import android.text.Editable
+import android.text.TextWatcher
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
@@ -10,6 +12,8 @@ import android.widget.TextView
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyListHeadersAdapter
 import de.tum.`in`.tumcampusapp.component.tumui.grades.model.Exam
+import kotlinx.android.synthetic.main.activity_grades_listview.view.*
+import org.jetbrains.anko.db.INTEGER
 import org.joda.time.format.DateTimeFormat
 
 
@@ -59,20 +63,66 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             context.getString(R.string.mode), exam.modus
         )
 
-       // exam.weight = "new weight"
-        //holder.textViewCreditsosSubject.text = exam.weight;
-        //storeExam(exam)
-        //holder.editTextGradeWeights.getText().insert(holder.editTextGradeWeights.getSelectionStart(), 0);
+
         if (localGradesFragment.getGlobalEdit()) {
             holder.editGradesContainer.visibility = View.GONE
         } else {
             holder.editGradesContainer.visibility = View.VISIBLE
 
         }
-
+       // localGradesFragment.storeExamListInSharedPreferences()
+initUIElements(holder, exam);
         return view
     }
 
+    private fun initUIElements(holder: ViewHolder, exam: Exam) {
+        holder.editTextGradeWeights.setText(""+exam.weight)
+        holder.editTextGradeCredits.setText(""+exam.credits_new)
+
+        //todo hier noch auf die Werte Setzten, die das feld laut der Exam instanz hat
+        holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+                exam.weight= Integer.parseInt(s.toString())
+                localGradesFragment.storeExamListInSharedPreferences()
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+            }
+        })
+
+        holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+                exam.credits_new= Integer.parseInt(s.toString())
+                localGradesFragment.storeExamListInSharedPreferences()
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+            }
+        })
+    }
+
+   /* fun EditText.afterTextChanged(afterTextChanged: (String) -> Unit) {
+        this.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(editable: Editable?) {
+                exam
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                Log.d("Editable before textChanges",s.toString())
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                Log.d("Editable on textChanges",s.toString())
+            }
+        })
+    }*/
+
     override fun generateHeaderName(item: Exam): String {
         val headerText = super.generateHeaderName(item)
         val year = Integer.parseInt(headerText.substring(0, 2))
@@ -94,11 +144,10 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         var additionalInfoTextView: TextView = itemView.findViewById(R.id.additionalInfoTextView)
 
         var editTextGradeWeights: EditText = itemView.findViewById(R.id.editTextGradeWeight)
+        var editTextGradeCredits: EditText = itemView.findViewById(R.id.editTextCreditsofSubject)
         var editGradesContainer: LinearLayout = itemView.findViewById(R.id.editGradesContainer)
         var textViewCreditsosSubject: TextView =
             itemView.findViewById(R.id.textViewCreditsosSubject)
-
-        //todo hier die Knöpfe definieren
     }
 
     companion object {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 1f1c4bb9df..8041f6a9ba 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -54,7 +54,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private var showBarChartAfterRotate = false
 
     private var globaledit = false;
-    private var exams = listOf<Exam>();
+    private val exams = mutableListOf<Exam>();
 
     private val grades: Array<String> by lazy {
         resources.getStringArray(R.array.grades)
@@ -95,8 +95,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             showChartButton?.setOnClickListener { toggleInLandscape() }
         }
 
-                loadGrades(CacheControl.USE_CACHE)      //set to BYPASS_CACHE to force a reload
-
+        //    loadGrades(CacheControl.USE_CACHE)      //set to BYPASS_CACHE to force a reload
+        loadExamListFromSharedPreferences();
         // Tracks whether the user has used the calendar module before. This is used in determining when to prompt for a
         // Google Play store review
         Utils.setSetting(requireContext(), Const.HAS_VISITED_GRADES, true)
@@ -111,11 +111,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         fetch(apiCall)
     }
 
-    override fun onDownloadSuccessful(response: ExamList) {
-        exams = response.exams.orEmpty()
+    override fun onDownloadSuccessful(response: ExamList) {     //todo compare both datasets in this method exams einfügen und vergleichen wie anosnten nur bei dem downloader
+        //examsDownloaded = response.exams.orEmpty()
 //todo these exams should be loaded from shared prefrences, not from the cahe -> allows to modify weights
-        storeExamListInSharedPreferences()
-        loadExamListFromSharedPreferences()
+        //storeExamListInSharedPreferences()
+        //loadExamListFromSharedPreferences()
 
         initSpinner(exams)
         showExams(exams)
@@ -130,38 +130,29 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     fun loadExamListFromSharedPreferences() {
-        //    val jsonList = activity?.getSharedPreferences(
-        //        getString(R.string.examlistpreferences), Context.MODE_PRIVATE)
-        //val mPrefs: SharedPreferences = getPreferences(MODE_PRIVATE)
-        // val prefsEditor: Editor = sharedPref.edit()
-
-        //val userListType : Type = TypeToken<ArrayList<Exam>>() {}.type;
-        // val examListType: Type = TypeToken<List<Exam>>(){}.getType();
-
-        //val json = gson.fromJson(jsonList, Array<Exam>::class.java)
-        //prefsEditor.putString("MyObject", json)
-        //prefsEditor.commit()
-
-        //exams= activity?.getPreferences(Context.MODE_PRIVATE)!!.getStringSet("ExamList", emptySet())!!.toList().sorted()
-        // val gson = Gson()
-        val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
-        val dateTimeConverter = DateTimeConverter()
-        val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
-            .create()
-        val listType = object : TypeToken<List<Exam>>() {}.type
-        if (sharedPref != null) {
+        try {
+            val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
+            val dateTimeConverter = DateTimeConverter()
+            val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
+                .create()
+            val listType = object : TypeToken<List<Exam>>() {}.type
             val jsonString = sharedPref.getString("ExamList", "");
-            Log.d("Examlistdebugging: ", jsonString!!)
             if (jsonString != null) {
-                val helperExams: List<Exam> = gson.fromJson(jsonString, listType)
-                Log.d("Examlistdebugging: ", helperExams.toString())
+                exams.clear();
+                exams.addAll(gson.fromJson(jsonString, listType))
+                return
             }
+        } catch (e: Exception) {
+            exams.clear();
         }
+
+        // Exam list could no be loaded - will always e a list, some error occured - clear to prevent any intermediate error states
+
     }
 
     fun storeExamListInSharedPreferences() {
         val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
-       // val gson = GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").create()
+        // val gson = GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").create()
         val dateTimeConverter = DateTimeConverter()
         val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
             .create()
@@ -204,7 +195,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             dateTimeFormatter = DateTimeFormat.forPattern("YYYY-MM-dd HH:mm")
         }
     }
-    public fun storeGradedCourses(exams: List<Exam>) {
+
+    fun storeGradedCourses(exams: List<Exam>) {
         val gradesStore = GradesStore(defaultSharedPreferences)
         val courses = exams.map { it.course }
         gradesStore.store(courses)
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index add0abb69d..20ec44b2ff 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -24,8 +24,7 @@ import java.util.*
 data class Exam(
     @PropertyElement(name = "lv_titel")
     val course: String,
-    @PropertyElement(name = "lv_credits")
-    val credits: String? = null,
+
     @PropertyElement(name = "datum", converter = DateTimeConverter::class)
     val date: DateTime? = null,
     @PropertyElement(name = "pruefer_nachname")
@@ -38,8 +37,14 @@ data class Exam(
     val programID: String,
     @PropertyElement(name = "lv_semester")
     val semester: String = "",
-    @PropertyElement(name = "credits")
-    var weight: String? = "test",
+    @PropertyElement(name = "weight")
+    var weight: Int = 0,
+    @PropertyElement(name = "gradeUsedInAverage")
+    var gradeUsedInAverage: Boolean? = false,
+    @PropertyElement(name = "subjectcredits")               //must not be "credits" -> otherwise naming collision will occur
+    var credits_new: Int = 6,
+
+
 ) : Comparable<Exam>, SimpleStickyListHeadersAdapter.SimpleStickyListItem {
 
     override fun getHeadName() = semester
@@ -50,14 +55,14 @@ data class Exam(
      * Compare all Attributes which were send from tum online,
      * All added attributes for the individual grades can be neglected
      */
-    override fun equals(other: Any?): Boolean {
+   /* override fun equals(other: Any?): Boolean {
         if (other !is Exam){
             return false;
         }
         val otherExam=(other as Exam)
-        if (credits.isNullOrEmpty() xor otherExam.credits.isNullOrEmpty()){
-            return false
-        }
+        //if (credits.isNullOrEmpty() xor otherExam.credits.isNullOrEmpty()){
+        //    return false
+        //}
         //val test: String? ="lorem ipsum";
         //val test1: String? =null;
         //val test2: String? =null;
@@ -65,7 +70,7 @@ data class Exam(
         Log.d("Kotlin logic test: ", test.equals(test2).toString())
         Log.d("Kotlin logic test: ", test1.equals(test).toString())*/
         return otherExam.course.equals(course) && otherExam.programID.equals(programID) && otherExam.semester.equals(semester);
-    }
+    }*/
 
     override fun compareTo(other: Exam): Int {
         return compareByDescending<Exam> { it.semester }

From 1fcb96611e43295fb09c658ae62f9a4bd1675579 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 6 May 2022 14:31:55 +0200
Subject: [PATCH 07/71] connected checkbox to the exam model

---
 .../component/tumui/grades/ExamListAdapter.kt | 50 ++++++++++---------
 .../component/tumui/grades/model/Exam.kt      |  2 +-
 .../res/layout/activity_grades_listview.xml   |  2 +-
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index f7730a1b81..050a3e6ec6 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -6,9 +6,11 @@ import android.text.TextWatcher
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
+import android.widget.CheckBox
 import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyListHeadersAdapter
 import de.tum.`in`.tumcampusapp.component.tumui.grades.model.Exam
@@ -70,19 +72,18 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             holder.editGradesContainer.visibility = View.VISIBLE
 
         }
-       // localGradesFragment.storeExamListInSharedPreferences()
-initUIElements(holder, exam);
+        // localGradesFragment.storeExamListInSharedPreferences()
+        initUIElements(holder, exam);
         return view
     }
 
     private fun initUIElements(holder: ViewHolder, exam: Exam) {
-        holder.editTextGradeWeights.setText(""+exam.weight)
-        holder.editTextGradeCredits.setText(""+exam.credits_new)
+        holder.editTextGradeWeights.setText(exam.weight.toString())
+        holder.editTextGradeCredits.setText(exam.credits_new.toString())
 
-        //todo hier noch auf die Werte Setzten, die das feld laut der Exam instanz hat
         holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
-                exam.weight= Integer.parseInt(s.toString())
+                exam.weight = s.toString().toDouble()
                 localGradesFragment.storeExamListInSharedPreferences()
             }
 
@@ -95,7 +96,7 @@ initUIElements(holder, exam);
 
         holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
-                exam.credits_new= Integer.parseInt(s.toString())
+                exam.credits_new = s.toString().toInt()
                 localGradesFragment.storeExamListInSharedPreferences()
             }
 
@@ -105,23 +106,26 @@ initUIElements(holder, exam);
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
             }
         })
-    }
 
-   /* fun EditText.afterTextChanged(afterTextChanged: (String) -> Unit) {
-        this.addTextChangedListener(object : TextWatcher {
-            override fun afterTextChanged(editable: Editable?) {
-                exam
-            }
-
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-                Log.d("Editable before textChanges",s.toString())
+        holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { buttonView, isChecked ->
+            exam.gradeUsedInAverage=!isChecked
+
+            if (isChecked){
+                holder.editTextGradeCredits.isEnabled=false;
+                holder.editTextGradeWeights.isEnabled=false;
+                holder.gradeTextView.background.setTint(ContextCompat.getColor(context, R.color.transparent))
+                holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.grade_default))
+            }else{
+                holder.editTextGradeCredits.isEnabled=true;
+                holder.editTextGradeWeights.isEnabled=true;
+                val gradeColor = exam.getGradeColor(context)
+                holder.gradeTextView.background.setTint(gradeColor)
+                holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
             }
+           // texview deaktiveren, idealerweise auch die ein Zeichen um die note Setzten(irgendeine Art von Rand?)
+        }
+    }
 
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                Log.d("Editable on textChanges",s.toString())
-            }
-        })
-    }*/
 
     override fun generateHeaderName(item: Exam): String {
         val headerText = super.generateHeaderName(item)
@@ -146,8 +150,8 @@ initUIElements(holder, exam);
         var editTextGradeWeights: EditText = itemView.findViewById(R.id.editTextGradeWeight)
         var editTextGradeCredits: EditText = itemView.findViewById(R.id.editTextCreditsofSubject)
         var editGradesContainer: LinearLayout = itemView.findViewById(R.id.editGradesContainer)
-        var textViewCreditsosSubject: TextView =
-            itemView.findViewById(R.id.textViewCreditsosSubject)
+        var checkBoxUseGradeForAverage: CheckBox =
+            itemView.findViewById(R.id.checkBoxUseGradeForAverage)
     }
 
     companion object {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index 20ec44b2ff..e4986f466f 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -38,7 +38,7 @@ data class Exam(
     @PropertyElement(name = "lv_semester")
     val semester: String = "",
     @PropertyElement(name = "weight")
-    var weight: Int = 0,
+    var weight: Double = 1.0,
     @PropertyElement(name = "gradeUsedInAverage")
     var gradeUsedInAverage: Boolean? = false,
     @PropertyElement(name = "subjectcredits")               //must not be "credits" -> otherwise naming collision will occur
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 4a62974b41..b9e2ffbdeb 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -86,7 +86,7 @@
                 android:text="Reset Grade" />
 
             <CheckBox
-                android:id="@+id/checkBox2"
+                android:id="@+id/checkBoxUseGradeForAverage"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="5"

From d671990658c029c0c08db8c05e000c0129c518e2 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 6 May 2022 15:11:10 +0200
Subject: [PATCH 08/71] reordered ui elements for better visibility

---
 .../main/res/drawable/grade_background.xml    |   2 +-
 .../res/layout/activity_grades_listview.xml   | 175 +++++++++---------
 2 files changed, 92 insertions(+), 85 deletions(-)

diff --git a/app/src/main/res/drawable/grade_background.xml b/app/src/main/res/drawable/grade_background.xml
index 7a0aa515a2..8947607ebd 100644
--- a/app/src/main/res/drawable/grade_background.xml
+++ b/app/src/main/res/drawable/grade_background.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <size android:height="60dp" android:width="60dp"/>
+    <size android:height="0dp" android:width="64dp"/>
     <corners android:radius="10dp"/>
     <solid android:color="@color/grade_default"/>
 </shape>
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index b9e2ffbdeb..49022ca12b 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -8,7 +9,9 @@
     android:paddingStart="@dimen/material_default_padding"
     android:paddingTop="@dimen/material_small_padding"
     android:paddingEnd="@dimen/material_default_padding"
-    android:paddingBottom="@dimen/material_small_padding">
+    android:paddingBottom="@dimen/material_small_padding"
+
+    android:layout_marginBottom="@dimen/material_default_padding">
 
 
     <LinearLayout
@@ -46,6 +49,90 @@
                 android:visibility="visible"
                 tools:text="Examiner" />
 
+            <LinearLayout
+                android:id="@+id/editGradesContainer"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="10">
+
+                    <TextView
+                        android:id="@+id/textViewCreditsosSubject"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+                        android:labelFor="@+id/editTextCreditsofSubject"
+                        android:text="Credits:" />
+
+                    <EditText
+                        android:id="@+id/editTextCreditsofSubject"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+                        android:autofillHints="8"
+                        android:ems="10"
+                        android:inputType="numberSigned" />
+
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="10">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+                        android:labelFor="@+id/editTextGradeWeight"
+                        android:text="Gewichtung der Note:" />
+
+                    <EditText
+                        android:id="@+id/editTextGradeWeight"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+                        android:autofillHints="1.0"
+                        android:ems="10"
+                        android:inputType="numberDecimal" />
+
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="10">
+
+                    <CheckBox
+                        android:id="@+id/checkBoxUseGradeForAverage"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+                        android:text="Note ausblenden" />
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/buttonresetGradeParameters"
+                        style="@style/BlueButton"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="5"
+                        android:text="Reset Grade"
+                        android:textAllCaps="false"
+                        app:cornerRadius="@dimen/material_corner_radius" />
+
+
+                </LinearLayout>
+            </LinearLayout>
 
         </LinearLayout>
 
@@ -53,98 +140,18 @@
         <TextView
             android:id="@+id/gradeTextView"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="10dp"
             android:background="@drawable/grade_background"
-            android:gravity="center"
+            android:gravity="center_horizontal"
             android:textColor="@color/white"
             android:textSize="22sp"
             android:textStyle="bold"
+            android:padding="@dimen/material_default_padding"
             tools:text="1,0" />
 
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/editGradesContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:weightSum="10">
-
-            <Button
-                android:id="@+id/buttonresetGradeParameters"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:text="Reset Grade" />
 
-            <CheckBox
-                android:id="@+id/checkBoxUseGradeForAverage"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:text="Note ausblenden" />
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:weightSum="10">
-
-            <TextView
-                android:layout_width="0dp"
-                android:id="@+id/textViewCreditsosSubject"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:labelFor="@+id/editTextCreditsofSubject"
-                android:text="Credits:" />
-
-            <EditText
-                android:id="@+id/editTextCreditsofSubject"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:autofillHints="8"
-                android:ems="10"
-                android:inputType="numberSigned" />
-
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:weightSum="10"
-            android:layout_marginBottom="@dimen/material_default_padding">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:labelFor="@+id/editTextGradeWeight"
-                android:text="Gewichtung der Note:" />
-
-            <EditText
-                android:id="@+id/editTextGradeWeight"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:autofillHints="1.0"
-                android:ems="10"
-                android:inputType="numberDecimal" />
-
-
-        </LinearLayout>
-    </LinearLayout>
 </LinearLayout>
\ No newline at end of file

From d52dbba9969c6ebb99cfff972f2f33014b249e86 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 6 May 2022 15:20:57 +0200
Subject: [PATCH 09/71] extracted string ressources

---
 .../component/tumui/grades/ExamListAdapter.kt             | 3 ---
 .../tumcampusapp/component/tumui/grades/GradesFragment.kt | 6 +++---
 app/src/main/res/layout/activity_grades_listview.xml      | 8 ++++----
 app/src/main/res/values-de/strings.xml                    | 4 ++++
 app/src/main/res/values/strings.xml                       | 6 ++++++
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 050a3e6ec6..5180dc17ef 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -3,7 +3,6 @@ package de.tum.`in`.tumcampusapp.component.tumui.grades
 import android.content.Context
 import android.text.Editable
 import android.text.TextWatcher
-import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.CheckBox
@@ -14,8 +13,6 @@ import androidx.core.content.ContextCompat
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyListHeadersAdapter
 import de.tum.`in`.tumcampusapp.component.tumui.grades.model.Exam
-import kotlinx.android.synthetic.main.activity_grades_listview.view.*
-import org.jetbrains.anko.db.INTEGER
 import org.joda.time.format.DateTimeFormat
 
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 8041f6a9ba..7f1df8801d 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -56,6 +56,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private var globaledit = false;
     private val exams = mutableListOf<Exam>();
 
+    private val examSharedPreferences: String="ExamList";
+
     private val grades: Array<String> by lazy {
         resources.getStringArray(R.array.grades)
     }
@@ -152,14 +154,12 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     fun storeExamListInSharedPreferences() {
         val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
-        // val gson = GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").create()
         val dateTimeConverter = DateTimeConverter()
         val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
             .create()
         val jsonlist = gson.toJson(exams)
-        Log.d("Examlistdebugging: ", jsonlist)
         with(sharedPref.edit()) {
-            putString("ExamList", jsonlist)
+            putString(examSharedPreferences, jsonlist)
             apply()
         }
     }
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 49022ca12b..cba4c70e1a 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -68,7 +68,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="5"
                         android:labelFor="@+id/editTextCreditsofSubject"
-                        android:text="Credits:" />
+                        android:text="@string/credits_grade_label" />
 
                     <EditText
                         android:id="@+id/editTextCreditsofSubject"
@@ -93,7 +93,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="5"
                         android:labelFor="@+id/editTextGradeWeight"
-                        android:text="Gewichtung der Note:" />
+                        android:text="@string/grade_weight_label" />
 
                     <EditText
                         android:id="@+id/editTextGradeWeight"
@@ -118,7 +118,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="5"
-                        android:text="Note ausblenden" />
+                        android:text="@string/hide_grade" />
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/buttonresetGradeParameters"
@@ -126,7 +126,7 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="5"
-                        android:text="Reset Grade"
+                        android:text="@string/reset_grade"
                         android:textAllCaps="false"
                         app:cornerRadius="@dimen/material_corner_radius" />
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 54c0dc2990..5a635315ec 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -57,6 +57,10 @@
     <string name="all_programs">Alle Noten</string>
     <string name="date">Datum</string>
     <string name="no_grades">Du hast noch keine Noten, die angezeigt werden könnten.</string>
+    <string name="reset_grade">Note Zurücksetzten</string>
+    <string name="hide_grade">Note ausblenden</string>
+    <string name="grade_weight_label">Gewichtung der Note:</string>
+    <string name="credits_grade_label">Credits:</string>
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Kennung</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd9aa12d4e..028838af62 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -84,6 +84,10 @@
     <string name="date">Date</string>
     <string name="credits" translatable="false">ECTS</string>
     <string name="no_grades">You don\'t have any grades yet.</string>
+    <string name="reset_grade">Reset Grade</string>
+    <string name="hide_grade">Hide Grade</string>
+    <string name="grade_weight_label">Grade Weight:</string>
+    <string name="credits_grade_label">Credits:</string>
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Identification</string>
@@ -771,4 +775,6 @@ Signature: %5$s</string>
     <string name="language">en</string>
     <string name="use_existing">Use existing</string>
 
+
+
 </resources>

From 9f1c940801de685591aa59a596ba83f06f79864c Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 6 May 2022 16:11:26 +0200
Subject: [PATCH 10/71] downloading new grades update the existing grade list

---
 .../component/tumui/grades/GradesFragment.kt  | 36 ++++++++++++-------
 .../component/tumui/grades/model/ExamList.kt  |  2 +-
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 7f1df8801d..1dee91cd66 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -6,7 +6,6 @@ import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
-import android.util.Log
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
@@ -30,6 +29,7 @@ import de.tum.`in`.tumcampusapp.component.tumui.grades.model.ExamList
 import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
+import kotlinx.android.synthetic.main.fragment_grades.*
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
@@ -56,7 +56,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private var globaledit = false;
     private val exams = mutableListOf<Exam>();
 
-    private val examSharedPreferences: String="ExamList";
+    private val examSharedPreferences: String = "ExamList";
 
     private val grades: Array<String> by lazy {
         resources.getStringArray(R.array.grades)
@@ -97,8 +97,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             showChartButton?.setOnClickListener { toggleInLandscape() }
         }
 
-        //    loadGrades(CacheControl.USE_CACHE)      //set to BYPASS_CACHE to force a reload
-        loadExamListFromSharedPreferences();
+        loadGrades(CacheControl.USE_CACHE)      //set to BYPASS_CACHE to force a reload
+        //loadExamListFromSharedPreferences();
         // Tracks whether the user has used the calendar module before. This is used in determining when to prompt for a
         // Google Play store review
         Utils.setSetting(requireContext(), Const.HAS_VISITED_GRADES, true)
@@ -113,12 +113,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         fetch(apiCall)
     }
 
-    override fun onDownloadSuccessful(response: ExamList) {     //todo compare both datasets in this method exams einfügen und vergleichen wie anosnten nur bei dem downloader
-        //examsDownloaded = response.exams.orEmpty()
-//todo these exams should be loaded from shared prefrences, not from the cahe -> allows to modify weights
-        //storeExamListInSharedPreferences()
-        //loadExamListFromSharedPreferences()
+    override fun onDownloadSuccessful(response: ExamList) {
+        val examsDownloaded: MutableList<Exam> = response.exams.orEmpty().toMutableList()
 
+        loadExamListFromSharedPreferences()
+        addAllNewItemsToExamList(examsDownloaded)
         initSpinner(exams)
         showExams(exams)
 
@@ -131,6 +130,21 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         storeGradedCourses(exams)
     }
 
+    /**
+     * Adds all exams which are part f the new list to the existing exams list
+     */
+    private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
+
+        val examsTitels = exams.map { it.course }
+        examsDownloaded.removeAll { examsTitels.contains(it.course) }
+
+        if (!examsDownloaded.isEmpty()) {
+            exams.addAll(examsDownloaded)
+            (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
+            storeExamListInSharedPreferences()
+        }
+    }
+
     fun loadExamListFromSharedPreferences() {
         try {
             val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
@@ -138,7 +152,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
                 .create()
             val listType = object : TypeToken<List<Exam>>() {}.type
-            val jsonString = sharedPref.getString("ExamList", "");
+            val jsonString = sharedPref.getString(examSharedPreferences, "");
             if (jsonString != null) {
                 exams.clear();
                 exams.addAll(gson.fromJson(jsonString, listType))
@@ -147,9 +161,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         } catch (e: Exception) {
             exams.clear();
         }
-
         // Exam list could no be loaded - will always e a list, some error occured - clear to prevent any intermediate error states
-
     }
 
     fun storeExamListInSharedPreferences() {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/ExamList.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/ExamList.kt
index df3446c996..cd60a2f853 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/ExamList.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/ExamList.kt
@@ -10,4 +10,4 @@ import com.tickaroo.tikxml.annotation.Xml
  * corresponding request.
  */
 @Xml(name = "rowset")
-data class ExamList(@Element val exams: List<Exam>?)
+data class ExamList(@Element val exams: MutableList<Exam>?)

From 1dbf34053ee2cca44b8f767636053d379cd08d37 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 6 May 2022 16:25:25 +0200
Subject: [PATCH 11/71] hidden grades are o displayed correctly after
 initialization

---
 .../component/tumui/grades/ExamListAdapter.kt | 28 ++++++++++++++++---
 .../component/tumui/grades/model/Exam.kt      | 24 +---------------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 5180dc17ef..72ce7ad9dc 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -69,14 +69,19 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             holder.editGradesContainer.visibility = View.VISIBLE
 
         }
-        // localGradesFragment.storeExamListInSharedPreferences()
         initUIElements(holder, exam);
         return view
     }
 
+
+    /**
+     * Init the ui Elements to change the parameters of the grade
+     */
     private fun initUIElements(holder: ViewHolder, exam: Exam) {
         holder.editTextGradeWeights.setText(exam.weight.toString())
         holder.editTextGradeCredits.setText(exam.credits_new.toString())
+        holder.checkBoxUseGradeForAverage.isChecked=exam.gradeUsedInAverage
+        adaptUIToCheckboxStatus(exam.gradeUsedInAverage, holder, exam)
 
         holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
@@ -107,7 +112,8 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { buttonView, isChecked ->
             exam.gradeUsedInAverage=!isChecked
 
-            if (isChecked){
+            adaptUIToCheckboxStatus(isChecked,holder,exam)
+         /*   if (isChecked){
                 holder.editTextGradeCredits.isEnabled=false;
                 holder.editTextGradeWeights.isEnabled=false;
                 holder.gradeTextView.background.setTint(ContextCompat.getColor(context, R.color.transparent))
@@ -118,8 +124,22 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 val gradeColor = exam.getGradeColor(context)
                 holder.gradeTextView.background.setTint(gradeColor)
                 holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
-            }
-           // texview deaktiveren, idealerweise auch die ein Zeichen um die note Setzten(irgendeine Art von Rand?)
+            }*/
+        }
+    }
+
+    private fun adaptUIToCheckboxStatus(gradeUsedInAverage: Boolean, holder: ViewHolder, exam: Exam) {
+        if (gradeUsedInAverage){
+            holder.editTextGradeCredits.isEnabled=false;
+            holder.editTextGradeWeights.isEnabled=false;
+            holder.gradeTextView.background.setTint(ContextCompat.getColor(context, R.color.transparent))
+            holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.grade_default))
+        }else{
+            holder.editTextGradeCredits.isEnabled=true;
+            holder.editTextGradeWeights.isEnabled=true;
+            val gradeColor = exam.getGradeColor(context)
+            holder.gradeTextView.background.setTint(gradeColor)
+            holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
         }
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index e4986f466f..0c9e41cbe5 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -24,7 +24,6 @@ import java.util.*
 data class Exam(
     @PropertyElement(name = "lv_titel")
     val course: String,
-
     @PropertyElement(name = "datum", converter = DateTimeConverter::class)
     val date: DateTime? = null,
     @PropertyElement(name = "pruefer_nachname")
@@ -40,7 +39,7 @@ data class Exam(
     @PropertyElement(name = "weight")
     var weight: Double = 1.0,
     @PropertyElement(name = "gradeUsedInAverage")
-    var gradeUsedInAverage: Boolean? = false,
+    var gradeUsedInAverage: Boolean = false,
     @PropertyElement(name = "subjectcredits")               //must not be "credits" -> otherwise naming collision will occur
     var credits_new: Int = 6,
 
@@ -51,27 +50,6 @@ data class Exam(
 
     override fun getHeaderId() = semester
 
-    /**
-     * Compare all Attributes which were send from tum online,
-     * All added attributes for the individual grades can be neglected
-     */
-   /* override fun equals(other: Any?): Boolean {
-        if (other !is Exam){
-            return false;
-        }
-        val otherExam=(other as Exam)
-        //if (credits.isNullOrEmpty() xor otherExam.credits.isNullOrEmpty()){
-        //    return false
-        //}
-        //val test: String? ="lorem ipsum";
-        //val test1: String? =null;
-        //val test2: String? =null;
-       /* Log.d("Kotlin logic test start: ", test1.equals(test2).toString())
-        Log.d("Kotlin logic test: ", test.equals(test2).toString())
-        Log.d("Kotlin logic test: ", test1.equals(test).toString())*/
-        return otherExam.course.equals(course) && otherExam.programID.equals(programID) && otherExam.semester.equals(semester);
-    }*/
-
     override fun compareTo(other: Exam): Int {
         return compareByDescending<Exam> { it.semester }
                 .thenByDescending { it.date }

From f00f0c3736b797b93b041f0713818d870c0e0523 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Mon, 9 May 2022 10:19:58 +0200
Subject: [PATCH 12/71] added ui to manually add exams

---
 .../component/tumui/grades/ExamListAdapter.kt |  98 ++++----
 .../component/tumui/grades/GradesFragment.kt  |  90 +++++++-
 .../component/tumui/grades/model/Exam.kt      | 101 +++++----
 .../main/res/layout-land/fragment_grades.xml  | 213 ++++++++++--------
 .../res/layout/activity_grades_listview.xml   |   2 +-
 .../res/layout/dialog_add_grade_input.xml     | 115 ++++++++++
 app/src/main/res/layout/fragment_grades.xml   | 207 ++++++++++-------
 7 files changed, 547 insertions(+), 279 deletions(-)
 create mode 100644 app/src/main/res/layout/dialog_add_grade_input.xml

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 72ce7ad9dc..8ce7583127 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -5,10 +5,7 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
 import android.view.ViewGroup
-import android.widget.CheckBox
-import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.TextView
+import android.widget.*
 import androidx.core.content.ContextCompat
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyListHeadersAdapter
@@ -42,6 +39,15 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         }
 
         val exam = itemList[position]
+
+
+
+        initUIDisplayElements(holder, exam)
+        initUIEditElements(holder, exam);
+        return view
+    }
+
+    private fun initUIDisplayElements(holder: ViewHolder, exam: Exam) {
         holder.nameTextView.text = exam.course
         holder.gradeTextView.text = exam.grade
 
@@ -61,28 +67,38 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             context.getString(R.string.examiner), exam.examiner,
             context.getString(R.string.mode), exam.modus
         )
+    }
 
 
+    /**
+     * Init the ui Elements to change the parameters of the grade
+     */
+    private fun initUIEditElements(holder: ViewHolder, exam: Exam) {
+        holder.editTextGradeWeights.setText(exam.weight.toString())
+        holder.editTextGradeCredits.setText(exam.credits_new.toString())
+        holder.checkBoxUseGradeForAverage.isChecked = exam.gradeUsedInAverage
+        adaptUIToCheckboxStatus(exam.gradeUsedInAverage, holder, exam)
+
         if (localGradesFragment.getGlobalEdit()) {
             holder.editGradesContainer.visibility = View.GONE
         } else {
             holder.editGradesContainer.visibility = View.VISIBLE
 
         }
-        initUIElements(holder, exam);
-        return view
-    }
 
+        holder.buttonResetGradeParameters.setOnClickListener(object : View.OnClickListener {
+            override fun onClick(p0: View?) {
+                exam.gradeUsedInAverage = false
+                exam.weight = 1.0
+                exam.credits_new = 6
+                adaptUIToCheckboxStatus(false, holder, exam)
+                holder.editTextGradeWeights.setText(exam.weight.toString())
+                holder.editTextGradeCredits.setText(exam.credits_new.toString())
+                localGradesFragment.storeExamListInSharedPreferences()
 
-    /**
-     * Init the ui Elements to change the parameters of the grade
-     */
-    private fun initUIElements(holder: ViewHolder, exam: Exam) {
-        holder.editTextGradeWeights.setText(exam.weight.toString())
-        holder.editTextGradeCredits.setText(exam.credits_new.toString())
-        holder.checkBoxUseGradeForAverage.isChecked=exam.gradeUsedInAverage
-        adaptUIToCheckboxStatus(exam.gradeUsedInAverage, holder, exam)
+            }
 
+        })
         holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 exam.weight = s.toString().toDouble()
@@ -110,33 +126,34 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         })
 
         holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { buttonView, isChecked ->
-            exam.gradeUsedInAverage=!isChecked
-
-            adaptUIToCheckboxStatus(isChecked,holder,exam)
-         /*   if (isChecked){
-                holder.editTextGradeCredits.isEnabled=false;
-                holder.editTextGradeWeights.isEnabled=false;
-                holder.gradeTextView.background.setTint(ContextCompat.getColor(context, R.color.transparent))
-                holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.grade_default))
-            }else{
-                holder.editTextGradeCredits.isEnabled=true;
-                holder.editTextGradeWeights.isEnabled=true;
-                val gradeColor = exam.getGradeColor(context)
-                holder.gradeTextView.background.setTint(gradeColor)
-                holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
-            }*/
+            exam.gradeUsedInAverage = !isChecked
+            adaptUIToCheckboxStatus(isChecked, holder, exam)
         }
     }
 
-    private fun adaptUIToCheckboxStatus(gradeUsedInAverage: Boolean, holder: ViewHolder, exam: Exam) {
-        if (gradeUsedInAverage){
-            holder.editTextGradeCredits.isEnabled=false;
-            holder.editTextGradeWeights.isEnabled=false;
-            holder.gradeTextView.background.setTint(ContextCompat.getColor(context, R.color.transparent))
-            holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.grade_default))
-        }else{
-            holder.editTextGradeCredits.isEnabled=true;
-            holder.editTextGradeWeights.isEnabled=true;
+    private fun adaptUIToCheckboxStatus(
+        gradeUsedInAverage: Boolean,
+        holder: ViewHolder,
+        exam: Exam
+    ) {
+        if (gradeUsedInAverage) {
+            holder.editTextGradeCredits.isEnabled = false;
+            holder.editTextGradeWeights.isEnabled = false;
+            holder.gradeTextView.background.setTint(
+                ContextCompat.getColor(
+                    context,
+                    R.color.transparent
+                )
+            )
+            holder.gradeTextView.setTextColor(
+                ContextCompat.getColor(
+                    context,
+                    R.color.grade_default
+                )
+            )
+        } else {
+            holder.editTextGradeCredits.isEnabled = true;
+            holder.editTextGradeWeights.isEnabled = true;
             val gradeColor = exam.getGradeColor(context)
             holder.gradeTextView.background.setTint(gradeColor)
             holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
@@ -169,6 +186,9 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         var editGradesContainer: LinearLayout = itemView.findViewById(R.id.editGradesContainer)
         var checkBoxUseGradeForAverage: CheckBox =
             itemView.findViewById(R.id.checkBoxUseGradeForAverage)
+        val buttonResetGradeParameters: Button =
+            itemView.findViewById(R.id.buttonResetGradeParameters)
+
     }
 
     companion object {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 1dee91cd66..3b49bdc391 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -4,14 +4,18 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.content.Context
 import android.graphics.Color
+import android.opengl.Visibility
 import android.os.Bundle
 import android.util.ArrayMap
+import android.util.Log
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import android.widget.EditText
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat.getColor
 import com.github.mikephil.charting.components.Legend
@@ -30,6 +34,7 @@ import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
 import kotlinx.android.synthetic.main.fragment_grades.*
+import org.jetbrains.anko.commit
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
@@ -53,11 +58,12 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     private var showBarChartAfterRotate = false
 
-    private var globaledit = false;
+    private var globalEditOn = false;
     private val exams = mutableListOf<Exam>();
 
     private val examSharedPreferences: String = "ExamList";
 
+
     private val grades: Array<String> by lazy {
         resources.getStringArray(R.array.grades)
     }
@@ -95,10 +101,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
             showListButton?.setOnClickListener { toggleInLandscape() }
             showChartButton?.setOnClickListener { toggleInLandscape() }
+            initUIVisibility()
         }
 
-        loadGrades(CacheControl.USE_CACHE)      //set to BYPASS_CACHE to force a reload
         //loadExamListFromSharedPreferences();
+        loadGrades(CacheControl.USE_CACHE)
         // Tracks whether the user has used the calendar module before. This is used in determining when to prompt for a
         // Google Play store review
         Utils.setSetting(requireContext(), Const.HAS_VISITED_GRADES, true)
@@ -130,17 +137,30 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         storeGradedCourses(exams)
     }
 
+    fun addExamToList(exam: Exam) {
+        exams.add(exam)
+        storeExamListInSharedPreferences()
+    }
+
     /**
      * Adds all exams which are part f the new list to the existing exams list
      */
     private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
+        val examsTitles = exams.map { it.course }
+        /*exams.clear()
 
-        val examsTitels = exams.map { it.course }
-        examsDownloaded.removeAll { examsTitels.contains(it.course) }
+        examsDownloaded.removeAll { examsTitles.contains(it.course) }
+        examsDownloaded.get(0).course = "Esotheric Programming"
+        examsDownloaded.get(0).grade = "1,0"
+        examsDownloaded.get(0).examiner = "-"
+
+        examsDownloaded.get(1).course = "Advanced Singing and Clapping"
+        examsDownloaded.get(1).grade = "3,7"
+        examsDownloaded.get(1).examiner = "-"*/
 
         if (!examsDownloaded.isEmpty()) {
+            examsDownloaded.forEach { it.credits_new = 6; it.weight = 1.0; }
             exams.addAll(examsDownloaded)
-            (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
             storeExamListInSharedPreferences()
         }
     }
@@ -173,6 +193,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         with(sharedPref.edit()) {
             putString(examSharedPreferences, jsonlist)
             apply()
+
         }
     }
 
@@ -324,7 +345,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         val grades = exams
             .filter { it.isPassed }
             .map { numberFormat.parse(it.grade).toDouble() }
-
+//todo multiply by it.weight and credits and theen divide by the combined numerb of used numbers
         val gradeSum = grades.sum()
         return gradeSum / grades.size.toDouble()
     }
@@ -375,7 +396,19 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 visibility = View.VISIBLE
             }
         }
-
+        binding.floatingbuttonAddExamGrade?.setOnClickListener(View.OnClickListener { openAddGradeDialog() })
+        /*AlertDialog.Builder(requireContext(), R.layout.dialog_add_grade_input)
+            .setTitle("alarm")
+            .setMessage("important message")
+            .setPositiveButton(R.string.logout) { _, _ -> Log.d("custom dialog","positive button") }
+            .setNegativeButton(R.string.cancel, null)
+            .setCancelable(false)
+            .create()
+            .apply {
+                window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
+            }
+            .show()*/
+        // })
 
         binding.filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(
@@ -399,6 +432,33 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         }
     }
 
+    /**
+     * Prompt the user to type in a name for the new chat room
+     */
+    private fun openAddGradeDialog() {
+        // Set an EditText view to get user input
+        val view = View.inflate(requireContext(), R.layout.dialog_add_grade_input, null)
+        val input = view.findViewById<EditText>(R.id.editTextaddGradeCourseName)
+
+        AlertDialog.Builder(requireContext())
+            .setTitle("Add a new exam manually")
+            .setMessage(
+                "Grades are normally added automatically. In case special grades should be added, this can be done here. " +
+                        "Manually added Exams can be deleted later on.\n\n* required"
+            )
+            .setView(view)
+            .setPositiveButton(R.string.create) { dialogInterface, whichButton ->
+                Log.d("custom dialog", "positive button")
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .setCancelable(false)
+            .create()
+            .apply {
+                window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
+            }
+            .show()
+    }
+
     /**
      * Displays all exams in the list view and chart view. If there are no exams, it displays a
      * placeholder instead.
@@ -495,10 +555,22 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun changeEditMode() {
         with(binding) {
-            globaledit = !globaledit;
+            globalEditOn = !globalEditOn;
 
             // Refresh all values for the ui
             (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
+initUIVisibility()
+        }
+    }
+
+    private fun initUIVisibility() {
+        if (!globalEditOn) {
+            frameLayoutAverageGrade?.visibility  = View.GONE
+            floatingbuttonAddExamGrade?.visibility  = View.VISIBLE
+        }else{
+
+            frameLayoutAverageGrade?.visibility  = View.VISIBLE
+            floatingbuttonAddExamGrade?.visibility  = View.GONE
         }
     }
 
@@ -558,7 +630,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     fun getGlobalEdit(): Boolean {
-        return globaledit;
+        return globalEditOn;
     }
 
     companion object {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index 0c9e41cbe5..0ab70aea05 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -23,13 +23,13 @@ import java.util.*
 @Xml(name = "row")
 data class Exam(
     @PropertyElement(name = "lv_titel")
-    val course: String,
+    var course: String,
     @PropertyElement(name = "datum", converter = DateTimeConverter::class)
     val date: DateTime? = null,
     @PropertyElement(name = "pruefer_nachname")
-    val examiner: String? = null,
+    var examiner: String? = null,
     @PropertyElement(name = "uninotenamekurz")
-    val grade: String? = null,
+    var grade: String? = null,
     @PropertyElement(name = "modus")
     val modus: String? = null,
     @PropertyElement(name = "studienidentifikator")
@@ -42,9 +42,12 @@ data class Exam(
     var gradeUsedInAverage: Boolean = false,
     @PropertyElement(name = "subjectcredits")               //must not be "credits" -> otherwise naming collision will occur
     var credits_new: Int = 6,
+    @PropertyElement(name = "examManuallyAdded")
+    var manuallyAdded: Boolean = false,
 
 
-) : Comparable<Exam>, SimpleStickyListHeadersAdapter.SimpleStickyListItem {
+    ) : Comparable<Exam>, SimpleStickyListHeadersAdapter.SimpleStickyListItem {
+
 
     override fun getHeadName() = semester
 
@@ -52,9 +55,9 @@ data class Exam(
 
     override fun compareTo(other: Exam): Int {
         return compareByDescending<Exam> { it.semester }
-                .thenByDescending { it.date }
-                .thenBy { it.course }
-                .compare(this, other)
+            .thenByDescending { it.date }
+            .thenBy { it.course }
+            .compare(this, other)
     }
 
     private val gradeValue: Double?
@@ -72,54 +75,54 @@ data class Exam(
         // grade colors are assigned to grades like 1,52 as if they were a 1,5
         var resId = R.color.grade_default
         if (grade?.length!! > 2) {
-            resId = GRADE_COLORS[grade.subSequence(0, 3)] ?: R.color.grade_default
+            resId = GRADE_COLORS[grade!!.subSequence(0, 3)] ?: R.color.grade_default
         }
         return ContextCompat.getColor(context, resId)
     }
 
     companion object {
         private val GRADE_COLORS = mapOf(
-                "1,0" to R.color.grade_1_0,
-                "1,1" to R.color.grade_1_1,
-                "1,2" to R.color.grade_1_2,
-                "1,3" to R.color.grade_1_3,
-                "1,4" to R.color.grade_1_4,
-                "1,5" to R.color.grade_1_5,
-                "1,6" to R.color.grade_1_6,
-                "1,7" to R.color.grade_1_7,
-                "1,8" to R.color.grade_1_8,
-                "1,9" to R.color.grade_1_9,
-                "2,0" to R.color.grade_2_0,
-                "2,1" to R.color.grade_2_1,
-                "2,2" to R.color.grade_2_2,
-                "2,3" to R.color.grade_2_3,
-                "2,4" to R.color.grade_2_4,
-                "2,5" to R.color.grade_2_5,
-                "2,6" to R.color.grade_2_6,
-                "2,7" to R.color.grade_2_7,
-                "2,8" to R.color.grade_2_8,
-                "2,9" to R.color.grade_2_9,
-                "3,0" to R.color.grade_3_0,
-                "3,1" to R.color.grade_3_1,
-                "3,2" to R.color.grade_3_2,
-                "3,3" to R.color.grade_3_3,
-                "3,4" to R.color.grade_3_4,
-                "3,5" to R.color.grade_3_5,
-                "3,6" to R.color.grade_3_6,
-                "3,7" to R.color.grade_3_7,
-                "3,8" to R.color.grade_3_8,
-                "3,9" to R.color.grade_3_9,
-                "4,0" to R.color.grade_4_0,
-                "4,1" to R.color.grade_4_1,
-                "4,2" to R.color.grade_4_2,
-                "4,3" to R.color.grade_4_3,
-                "4,4" to R.color.grade_4_4,
-                "4,5" to R.color.grade_4_5,
-                "4,6" to R.color.grade_4_6,
-                "4,7" to R.color.grade_4_7,
-                "4,8" to R.color.grade_4_8,
-                "4,9" to R.color.grade_4_9,
-                "5,0" to R.color.grade_5_0
+            "1,0" to R.color.grade_1_0,
+            "1,1" to R.color.grade_1_1,
+            "1,2" to R.color.grade_1_2,
+            "1,3" to R.color.grade_1_3,
+            "1,4" to R.color.grade_1_4,
+            "1,5" to R.color.grade_1_5,
+            "1,6" to R.color.grade_1_6,
+            "1,7" to R.color.grade_1_7,
+            "1,8" to R.color.grade_1_8,
+            "1,9" to R.color.grade_1_9,
+            "2,0" to R.color.grade_2_0,
+            "2,1" to R.color.grade_2_1,
+            "2,2" to R.color.grade_2_2,
+            "2,3" to R.color.grade_2_3,
+            "2,4" to R.color.grade_2_4,
+            "2,5" to R.color.grade_2_5,
+            "2,6" to R.color.grade_2_6,
+            "2,7" to R.color.grade_2_7,
+            "2,8" to R.color.grade_2_8,
+            "2,9" to R.color.grade_2_9,
+            "3,0" to R.color.grade_3_0,
+            "3,1" to R.color.grade_3_1,
+            "3,2" to R.color.grade_3_2,
+            "3,3" to R.color.grade_3_3,
+            "3,4" to R.color.grade_3_4,
+            "3,5" to R.color.grade_3_5,
+            "3,6" to R.color.grade_3_6,
+            "3,7" to R.color.grade_3_7,
+            "3,8" to R.color.grade_3_8,
+            "3,9" to R.color.grade_3_9,
+            "4,0" to R.color.grade_4_0,
+            "4,1" to R.color.grade_4_1,
+            "4,2" to R.color.grade_4_2,
+            "4,3" to R.color.grade_4_3,
+            "4,4" to R.color.grade_4_4,
+            "4,5" to R.color.grade_4_5,
+            "4,6" to R.color.grade_4_6,
+            "4,7" to R.color.grade_4_7,
+            "4,8" to R.color.grade_4_8,
+            "4,9" to R.color.grade_4_9,
+            "5,0" to R.color.grade_5_0
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_grades.xml b/app/src/main/res/layout-land/fragment_grades.xml
index f863ae1106..8c44a3e516 100644
--- a/app/src/main/res/layout-land/fragment_grades.xml
+++ b/app/src/main/res/layout-land/fragment_grades.xml
@@ -1,127 +1,152 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/gradesLayout"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/gradesLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/floatingbuttonAddExamGrade"
+        style="@style/BlueButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.96"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.8"
+        app:srcCompat="@drawable/ic_add"
+        app:tint="@android:color/white" />
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:elevation="12dp"
-            android:theme="@style/TumToolbar"
-            app:popupTheme="@style/TumToolbarPopUp">
+            android:layout_height="wrap_content">
 
-            <Spinner
-                android:id="@+id/filterSpinner"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:elevation="12dp"
+                android:theme="@style/TumToolbar"
+                app:popupTheme="@style/TumToolbarPopUp">
 
-        </androidx.appcompat.widget.Toolbar>
+                <Spinner
+                    android:id="@+id/filterSpinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
 
-    </com.google.android.material.appbar.AppBarLayout>
+            </androidx.appcompat.widget.Toolbar>
 
-    <include
-        android:id="@+id/layout_all_errors"
-        layout="@layout/layout_all_errors"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
+        </com.google.android.material.appbar.AppBarLayout>
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
+        <include
+            android:id="@+id/layout_all_errors"
+            layout="@layout/layout_all_errors"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent" />
 
         <FrameLayout
-            android:id="@+id/chartsContainer"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="@dimen/padding_default">
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
-            <com.github.mikephil.charting.charts.PieChart
-                android:id="@+id/pieChartView"
+            <FrameLayout
+                android:id="@+id/chartsContainer"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:visibility="visible" />
+                android:layout_margin="@dimen/padding_default">
 
-            <com.github.mikephil.charting.charts.BarChart
-                android:id="@+id/barChartView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone" />
+                <com.github.mikephil.charting.charts.PieChart
+                    android:id="@+id/pieChartView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="visible" />
 
-        </FrameLayout>
+                <com.github.mikephil.charting.charts.BarChart
+                    android:id="@+id/barChartView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="gone" />
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/swipeRefreshLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone">
+            </FrameLayout>
 
-            <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-                android:id="@+id/gradesListView"
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                android:id="@+id/swipeRefreshLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:scrollbars="vertical" />
+                android:visibility="gone">
 
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+                <se.emilsjolander.stickylistheaders.StickyListHeadersListView
+                    android:id="@+id/gradesListView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scrollbars="vertical" />
 
-    </FrameLayout>
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        </FrameLayout>
 
-        <TextView
-            android:id="@+id/averageGradeTextView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/material_small_padding"
-            android:layout_weight="1"
-            android:textSize="@dimen/semilarge_text_size"
-            android:visibility="visible"
-            tools:text="1.0" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/showListButton"
-            style="@style/Widget.MaterialComponents.Button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="@dimen/material_tiny_padding"
-            android:drawableStart="@drawable/ic_list_bulleted"
-            android:drawablePadding="@dimen/material_small_padding"
-            android:gravity="center"
-            android:text="@string/show_list"
-            android:textColor="@android:color/white"
-            app:backgroundTint="@color/color_primary"
-            app:cornerRadius="@dimen/material_corner_radius" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/showChartButton"
-            style="@style/Widget.MaterialComponents.Button"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="@dimen/material_tiny_padding"
-            android:drawableStart="@drawable/ic_pie_chart"
-            android:drawablePadding="@dimen/material_small_padding"
-            android:gravity="center"
-            android:text="@string/show_chart"
-            android:textColor="@android:color/white"
-            android:visibility="gone"
-            app:backgroundTint="@color/color_primary"
-            app:cornerRadius="@dimen/material_corner_radius" />
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/averageGradeTextView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="@dimen/material_small_padding"
+                android:layout_weight="1"
+                android:textSize="@dimen/semilarge_text_size"
+                android:visibility="visible"
+                tools:text="1.0" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/showListButton"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_margin="@dimen/material_tiny_padding"
+                android:drawableStart="@drawable/ic_list_bulleted"
+                android:drawablePadding="@dimen/material_small_padding"
+                android:gravity="center"
+                android:text="@string/show_list"
+                android:textColor="@android:color/white"
+                app:backgroundTint="@color/color_primary"
+                app:cornerRadius="@dimen/material_corner_radius" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/showChartButton"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_margin="@dimen/material_tiny_padding"
+                android:drawableStart="@drawable/ic_pie_chart"
+                android:drawablePadding="@dimen/material_small_padding"
+                android:gravity="center"
+                android:text="@string/show_chart"
+                android:textColor="@android:color/white"
+                android:visibility="gone"
+                app:backgroundTint="@color/color_primary"
+                app:cornerRadius="@dimen/material_corner_radius" />
+
+        </LinearLayout>
 
     </LinearLayout>
-
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index cba4c70e1a..bddff9d63c 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -121,7 +121,7 @@
                         android:text="@string/hide_grade" />
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/buttonresetGradeParameters"
+                        android:id="@+id/buttonResetGradeParameters"
                         style="@style/BlueButton"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
new file mode 100644
index 0000000000..676c01106d
--- /dev/null
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:padding="@dimen/material_large_padding">
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextaddGradeCourseName"
+            android:text="Course name *" />
+
+        <EditText
+            android:id="@+id/editTextaddGradeCourseName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="Course name"
+            android:imeOptions="actionGo"
+            android:inputType="textCapWords|textAutoComplete"
+            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextAddGrade"
+            android:text="Grade *" />
+
+        <EditText
+            android:id="@+id/editTextAddGrade"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="1.0"
+            android:ems="10"
+            android:hint="1.0"
+            android:imeOptions="actionGo"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextaddGradeExaminer"
+            android:text="Examiner" />
+
+        <EditText
+            android:id="@+id/editTextaddGradeExaminer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="Examiner name"
+            android:imeOptions="actionGo"
+            android:inputType="textCapWords|textAutoComplete"
+            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextaddGradeCredits"
+            android:text="Credits" />
+
+        <EditText
+            android:id="@+id/editTextaddGradeCredits"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="Credits"
+            android:imeOptions="actionGo"
+            android:inputType="numberSigned"
+            android:text="6"
+            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextAddGradeWeight"
+            android:text="Grade weight" />
+
+        <EditText
+            android:id="@+id/editTextAddGradeWeight"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="1.0"
+            android:ems="10"
+            android:hint="Grade Weight"
+            android:imeOptions="actionGo"
+            android:inputType="numberDecimal"
+            android:text="1.0" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextAddGradeDate"
+            android:text="Examination Date" />
+
+        <EditText
+            android:id="@+id/editTextAddGradeDate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="date" />
+
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index 691ab72c0e..a62b23818c 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -1,115 +1,148 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/gradesLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:elevation="12dp"
-            android:theme="@style/TumToolbar"
-            app:popupTheme="@style/TumToolbarPopUp">
-
-            <Spinner
-                android:id="@+id/filterSpinner"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/gradesLayout"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
 
-        </androidx.appcompat.widget.Toolbar>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/floatingbuttonAddExamGrade"
+        style="@style/BlueButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="16dp"
+        android:clickable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
 
-    </com.google.android.material.appbar.AppBarLayout>
+        app:tint="@android:color/white"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0"
+        app:srcCompat="@drawable/ic_add" />
 
-    <include
-        android:id="@+id/layout_all_errors"
-        layout="@layout/layout_all_errors"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+    <LinearLayout
 
-    <FrameLayout
-        android:id="@+id/contentContainer"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <FrameLayout
-            android:id="@+id/chartsContainer"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="200dp"
-            android:padding="@dimen/material_default_padding"
-            android:background="@color/default_window_background"
-            android:visibility="invisible">
+            android:layout_height="wrap_content">
 
-            <com.github.mikephil.charting.charts.PieChart
-                android:id="@+id/pieChartView"
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="visible" />
+                android:layout_height="?attr/actionBarSize"
+                android:elevation="12dp"
+                android:theme="@style/TumToolbar"
+                app:popupTheme="@style/TumToolbarPopUp">
 
-            <com.github.mikephil.charting.charts.BarChart
-                android:id="@+id/barChartView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone" />
+                <Spinner
+                    android:id="@+id/filterSpinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
 
-        </FrameLayout>
+            </androidx.appcompat.widget.Toolbar>
+
+        </com.google.android.material.appbar.AppBarLayout>
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/swipeRefreshLayout"
+        <include
+            android:id="@+id/layout_all_errors"
+            layout="@layout/layout_all_errors"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent" />
 
-            <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-                android:id="@+id/gradesListView"
+        <FrameLayout
+            android:id="@+id/contentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <FrameLayout
+                android:id="@+id/chartsContainer"
+                android:layout_width="match_parent"
+                android:layout_height="200dp"
+                android:background="@color/default_window_background"
+                android:padding="@dimen/material_default_padding"
+                android:visibility="invisible">
+
+                <com.github.mikephil.charting.charts.PieChart
+                    android:id="@+id/pieChartView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="visible" />
+
+                <com.github.mikephil.charting.charts.BarChart
+                    android:id="@+id/barChartView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="gone" />
+
+            </FrameLayout>
+
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                android:id="@+id/swipeRefreshLayout"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="false"
-                android:divider="@color/list_divider"
-                android:paddingTop="200dp"
-                android:scrollbars="vertical" />
+                android:layout_height="match_parent">
 
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+                <se.emilsjolander.stickylistheaders.StickyListHeadersListView
+                    android:id="@+id/gradesListView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:clipToPadding="false"
+                    android:divider="@color/list_divider"
+                    android:paddingTop="200dp"
+                    android:scrollbars="vertical" />
 
-    </FrameLayout>
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/pop_up_background"
-        android:padding="@dimen/material_default_padding">
+        </FrameLayout>
 
-        <LinearLayout
+        <FrameLayout
+            android:id="@+id/frameLayoutAverageGrade"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:background="@color/pop_up_background"
+            android:visibility="gone"
+            android:padding="@dimen/material_default_padding">
 
-            <TextView
-                android:id="@+id/averageGradeTextView"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/text_light_blue"
-                android:textSize="@dimen/semilarge_text_size"
-                android:textStyle="bold"
-                android:visibility="visible"
-                tools:text="Average grade: 1.0" />
-
-            <TextView
-                android:id="@+id/averageGradeHintTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/text_light_blue"
-                android:visibility="visible"
-                android:text="@string/average_grade_hint"/>
-        </LinearLayout>
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/averageGradeTextView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/text_light_blue"
+                    android:textSize="@dimen/semilarge_text_size"
+                    android:textStyle="bold"
+                    android:visibility="visible"
+                    tools:text="Average grade: 1.0" />
+
+                <TextView
+                    android:id="@+id/averageGradeHintTextView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/average_grade_hint"
+                    android:textColor="@color/text_light_blue"
+                    android:visibility="visible" />
+            </LinearLayout>
+
+        </FrameLayout>
 
-    </FrameLayout>
 
-</LinearLayout>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 3076c27d3ec5f1dbbb4c74d9c37038170fa6633a Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Mon, 9 May 2022 14:52:38 +0200
Subject: [PATCH 13/71] added ui to delete manually added exams

---
 .../component/tumui/grades/ExamListAdapter.kt |  19 +-
 .../component/tumui/grades/GradesFragment.kt  |  53 ++---
 .../res/layout/activity_grades_listview.xml   |  46 ++--
 .../res/layout/dialog_add_grade_input.xml     | 217 +++++++++---------
 4 files changed, 185 insertions(+), 150 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 8ce7583127..07c91d8520 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -81,11 +81,20 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
         if (localGradesFragment.getGlobalEdit()) {
             holder.editGradesContainer.visibility = View.GONE
-        } else {
+            holder.gradeTextViewDeleteCustomGrade.visibility=View.GONE
+        } else {//todo show button only if the exam was added manually - test the parameter
             holder.editGradesContainer.visibility = View.VISIBLE
-
+            holder.gradeTextViewDeleteCustomGrade.visibility=View.VISIBLE
+            holder.gradeTextViewDeleteCustomGrade.background.setTint(
+                ContextCompat.getColor(
+                    context,
+                    R.color.grade_default
+                )
+            )
         }
 
+
+
         holder.buttonResetGradeParameters.setOnClickListener(object : View.OnClickListener {
             override fun onClick(p0: View?) {
                 exam.gradeUsedInAverage = false
@@ -129,6 +138,9 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             exam.gradeUsedInAverage = !isChecked
             adaptUIToCheckboxStatus(isChecked, holder, exam)
         }
+
+
+       // holder.gradeTextViewDeleteCustomGrade.
     }
 
     private fun adaptUIToCheckboxStatus(
@@ -188,6 +200,9 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             itemView.findViewById(R.id.checkBoxUseGradeForAverage)
         val buttonResetGradeParameters: Button =
             itemView.findViewById(R.id.buttonResetGradeParameters)
+        val gradeTextViewDeleteCustomGrade: TextView =
+            itemView.findViewById(R.id.gradeTextViewDeleteCustomGrade)
+
 
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 3b49bdc391..d670fb0812 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -147,8 +147,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
         val examsTitles = exams.map { it.course }
-        /*exams.clear()
-
+        exams.clear()
+/*
         examsDownloaded.removeAll { examsTitles.contains(it.course) }
         examsDownloaded.get(0).course = "Esotheric Programming"
         examsDownloaded.get(0).grade = "1,0"
@@ -390,25 +390,14 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         )
 
         with(binding) {
-            filterSpinner?.apply {
+            filterSpinner.apply {
                 adapter = spinnerArrayAdapter
                 setSelection(spinnerPosition)
                 visibility = View.VISIBLE
             }
         }
-        binding.floatingbuttonAddExamGrade?.setOnClickListener(View.OnClickListener { openAddGradeDialog() })
-        /*AlertDialog.Builder(requireContext(), R.layout.dialog_add_grade_input)
-            .setTitle("alarm")
-            .setMessage("important message")
-            .setPositiveButton(R.string.logout) { _, _ -> Log.d("custom dialog","positive button") }
-            .setNegativeButton(R.string.cancel, null)
-            .setCancelable(false)
-            .create()
-            .apply {
-                window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
-            }
-            .show()*/
-        // })
+        binding.floatingbuttonAddExamGrade.setOnClickListener({ openAddGradeDialog() })
+
 
         binding.filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(
@@ -438,9 +427,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun openAddGradeDialog() {
         // Set an EditText view to get user input
         val view = View.inflate(requireContext(), R.layout.dialog_add_grade_input, null)
-        val input = view.findViewById<EditText>(R.id.editTextaddGradeCourseName)
 
-        AlertDialog.Builder(requireContext())
+
+        val dialog = AlertDialog.Builder(requireContext())
             .setTitle("Add a new exam manually")
             .setMessage(
                 "Grades are normally added automatically. In case special grades should be added, this can be done here. " +
@@ -448,15 +437,23 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             )
             .setView(view)
             .setPositiveButton(R.string.create) { dialogInterface, whichButton ->
-                Log.d("custom dialog", "positive button")
+
+                val name = view.findViewById<EditText>(R.id.editTextaddGradeCourseName).text
+                val grade = view.findViewById<EditText>(R.id.editTextAddGrade).text
+                val examiner = view.findViewById<EditText>(R.id.editTextaddGradeExaminer).text
+                val weight = view.findViewById<EditText>(R.id.editTextAddGradeWeight).text
+                val credits = view.findViewById<EditText>(R.id.editTextaddGradeCredits).text
+                val date = view.findViewById<EditText>(R.id.editTextAddGradeDate).text
+                Log.d("custom dialog", "positive button, Grade: " + grade)
             }
             .setNegativeButton(android.R.string.cancel, null)
-            .setCancelable(false)
             .create()
             .apply {
                 window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
-            }
-            .show()
+            };
+        dialog.show()
+        dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.text_primary));
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.text_primary));
     }
 
     /**
@@ -559,18 +556,18 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
             // Refresh all values for the ui
             (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
-initUIVisibility()
+            initUIVisibility()
         }
     }
 
     private fun initUIVisibility() {
         if (!globalEditOn) {
-            frameLayoutAverageGrade?.visibility  = View.GONE
-            floatingbuttonAddExamGrade?.visibility  = View.VISIBLE
-        }else{
+            frameLayoutAverageGrade?.visibility = View.GONE
+            floatingbuttonAddExamGrade?.visibility = View.VISIBLE
+        } else {
 
-            frameLayoutAverageGrade?.visibility  = View.VISIBLE
-            floatingbuttonAddExamGrade?.visibility  = View.GONE
+            frameLayoutAverageGrade?.visibility = View.VISIBLE
+            floatingbuttonAddExamGrade?.visibility = View.GONE
         }
     }
 
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index bddff9d63c..8b8b03c8bb 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -4,14 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/material_default_padding"
     android:background="@color/default_window_background"
     android:orientation="vertical"
     android:paddingStart="@dimen/material_default_padding"
     android:paddingTop="@dimen/material_small_padding"
     android:paddingEnd="@dimen/material_default_padding"
-    android:paddingBottom="@dimen/material_small_padding"
 
-    android:layout_marginBottom="@dimen/material_default_padding">
+    android:paddingBottom="@dimen/material_small_padding">
 
 
     <LinearLayout
@@ -136,21 +136,39 @@
 
         </LinearLayout>
 
-
-        <TextView
-            android:id="@+id/gradeTextView"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="10dp"
-            android:background="@drawable/grade_background"
-            android:gravity="center_horizontal"
-            android:textColor="@color/white"
-            android:textSize="22sp"
-            android:textStyle="bold"
-            android:padding="@dimen/material_default_padding"
-            tools:text="1,0" />
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/gradeTextViewDeleteCustomGrade"
+                android:layout_width="wrap_content"
+                android:layout_height="64dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/grade_background"
+                android:gravity="center"
+                android:padding="@dimen/material_default_padding"
+                android:tint="@android:color/white"
+                android:layout_marginBottom="8dp"
+                android:drawableStart="@drawable/ic_clear"
+                />
 
+            <TextView
+                android:id="@+id/gradeTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/grade_background"
+                android:gravity="center_horizontal"
+                android:padding="@dimen/material_default_padding"
+                android:textColor="@color/white"
+                android:textSize="22sp"
+                android:textStyle="bold"
+                tools:text="1,0" />
+        </LinearLayout>
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 676c01106d..629dc3057f 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -1,115 +1,120 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="wrap_content"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:padding="@dimen/material_large_padding">
+    android:layout_height="wrap_content">
 
-
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/material_default_padding"
-            android:labelFor="@+id/editTextaddGradeCourseName"
-            android:text="Course name *" />
-
-        <EditText
-            android:id="@+id/editTextaddGradeCourseName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="Course name"
-            android:imeOptions="actionGo"
-            android:inputType="textCapWords|textAutoComplete"
-            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/material_default_padding"
-            android:labelFor="@+id/editTextAddGrade"
-            android:text="Grade *" />
+        android:layout_height="256dp"
+        android:padding="@dimen/material_large_padding">
 
-        <EditText
-            android:id="@+id/editTextAddGrade"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autofillHints="1.0"
-            android:ems="10"
-            android:hint="1.0"
-            android:imeOptions="actionGo"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/material_default_padding"
-            android:labelFor="@+id/editTextaddGradeExaminer"
-            android:text="Examiner" />
-
-        <EditText
-            android:id="@+id/editTextaddGradeExaminer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="Examiner name"
-            android:imeOptions="actionGo"
-            android:inputType="textCapWords|textAutoComplete"
-            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
 
-        <TextView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/material_default_padding"
-            android:labelFor="@+id/editTextaddGradeCredits"
-            android:text="Credits" />
-
-        <EditText
-            android:id="@+id/editTextaddGradeCredits"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="Credits"
-            android:imeOptions="actionGo"
-            android:inputType="numberSigned"
-            android:text="6"
-            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
-
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/material_default_padding"
-            android:labelFor="@+id/editTextAddGradeWeight"
-            android:text="Grade weight" />
-
-        <EditText
-            android:id="@+id/editTextAddGradeWeight"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autofillHints="1.0"
-            android:ems="10"
-            android:hint="Grade Weight"
-            android:imeOptions="actionGo"
-            android:inputType="numberDecimal"
-            android:text="1.0" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/material_default_padding"
-            android:labelFor="@+id/editTextAddGradeDate"
-            android:text="Examination Date" />
-
-        <EditText
-            android:id="@+id/editTextAddGradeDate"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ems="10"
-            android:inputType="date" />
-
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/material_default_padding"
+                android:labelFor="@+id/editTextaddGradeCourseName"
+                android:text="Course name *" />
+
+            <EditText
+                android:id="@+id/editTextaddGradeCourseName"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Course name"
+                android:imeOptions="actionGo"
+                android:inputType="textCapWords|textAutoComplete"
+                android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/material_default_padding"
+                android:labelFor="@+id/editTextAddGrade"
+                android:text="Grade *" />
+
+            <EditText
+                android:id="@+id/editTextAddGrade"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="1.0"
+                android:ems="10"
+                android:hint="1.0"
+                android:imeOptions="actionGo"
+                android:inputType="numberDecimal" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/material_default_padding"
+                android:labelFor="@+id/editTextaddGradeExaminer"
+                android:text="Examiner" />
+
+            <EditText
+                android:id="@+id/editTextaddGradeExaminer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Examiner name"
+                android:imeOptions="actionGo"
+                android:inputType="textCapWords|textAutoComplete"
+                android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/material_default_padding"
+                android:labelFor="@+id/editTextaddGradeCredits"
+                android:text="Credits" />
+
+            <EditText
+                android:id="@+id/editTextaddGradeCredits"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Credits"
+                android:imeOptions="actionGo"
+                android:inputType="numberSigned"
+                android:text="6"
+                android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/material_default_padding"
+                android:labelFor="@+id/editTextAddGradeWeight"
+                android:text="Grade weight" />
+
+            <EditText
+                android:id="@+id/editTextAddGradeWeight"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="1.0"
+                android:ems="10"
+                android:hint="Grade Weight"
+                android:imeOptions="actionGo"
+                android:inputType="numberDecimal"
+                android:text="1.0" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/material_default_padding"
+                android:labelFor="@+id/editTextAddGradeDate"
+                android:text="Examination Date" />
+
+            <EditText
+                android:id="@+id/editTextAddGradeDate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="date" />
+
+
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>
\ No newline at end of file

From 1452b407caf3e59e4c3b27f548b0a9d0ff7988be Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Wed, 11 May 2022 08:57:05 +0200
Subject: [PATCH 14/71] added logic to delete manually added exams

---
 .../component/tumui/grades/ExamListAdapter.kt | 26 ++++++++++++++++++-
 .../component/tumui/grades/GradesFragment.kt  |  5 ++++
 .../res/layout/activity_grades_listview.xml   |  6 ++---
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 07c91d8520..277b78ccd9 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -3,9 +3,11 @@ package de.tum.`in`.tumcampusapp.component.tumui.grades
 import android.content.Context
 import android.text.Editable
 import android.text.TextWatcher
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyListHeadersAdapter
@@ -93,6 +95,28 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             )
         }
 
+        holder.gradeTextViewDeleteCustomGrade.setOnClickListener(object: View.OnClickListener{
+            override fun onClick(p0: View?) {
+                val dialog = AlertDialog.Builder(localGradesFragment.requireContext())
+                    .setTitle("Delete Exam")
+                    .setMessage(
+                        "Should this exam be irrevocably deleted"
+                    )
+                    .setPositiveButton("Delete") { dialogInterface, whichButton ->
+
+                       localGradesFragment.deleteExamFromList(exam)
+                    }
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .create()
+                    .apply {
+                        window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
+                    };
+                dialog.show()
+                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(localGradesFragment.getResources().getColor(R.color.text_primary));
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(localGradesFragment.getResources().getColor(R.color.text_primary));
+            }
+
+        })
 
 
         holder.buttonResetGradeParameters.setOnClickListener(object : View.OnClickListener {
@@ -200,7 +224,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             itemView.findViewById(R.id.checkBoxUseGradeForAverage)
         val buttonResetGradeParameters: Button =
             itemView.findViewById(R.id.buttonResetGradeParameters)
-        val gradeTextViewDeleteCustomGrade: TextView =
+        val gradeTextViewDeleteCustomGrade: ImageView =
             itemView.findViewById(R.id.gradeTextViewDeleteCustomGrade)
 
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index d670fb0812..d707c40083 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -630,6 +630,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         return globalEditOn;
     }
 
+    fun deleteExamFromList(exam: Exam) {
+        exams.remove(exam)
+        (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
+    }
+
     companion object {
         private const val KEY_SHOW_BAR_CHART = "showPieChart"
         private const val KEY_SPINNER_POSITION = "spinnerPosition"
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 8b8b03c8bb..d4fe5a66d6 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -141,7 +141,7 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <TextView
+            <ImageView
                 android:id="@+id/gradeTextViewDeleteCustomGrade"
                 android:layout_width="wrap_content"
                 android:layout_height="64dp"
@@ -150,9 +150,9 @@
                 android:background="@drawable/grade_background"
                 android:gravity="center"
                 android:padding="@dimen/material_default_padding"
-                android:tint="@android:color/white"
+                app:tint="@android:color/white"
                 android:layout_marginBottom="8dp"
-                android:drawableStart="@drawable/ic_clear"
+                android:src="@drawable/ic_clear"
                 />
 
             <TextView

From 835b4c46f2f7a2288be36656d1732f712862e03c Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Wed, 11 May 2022 12:46:22 +0200
Subject: [PATCH 15/71] added logic to manually add exams

---
 .../tumonline/converters/DateTimeConverter.kt |  8 ++-
 .../component/tumui/grades/GradesFragment.kt  | 69 ++++++++++++++++---
 .../res/layout/dialog_add_grade_input.xml     | 29 ++++++--
 3 files changed, 88 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/api/tumonline/converters/DateTimeConverter.kt b/app/src/main/java/de/tum/in/tumcampusapp/api/tumonline/converters/DateTimeConverter.kt
index 15f1d3db5b..ca0d5c991b 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/api/tumonline/converters/DateTimeConverter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/api/tumonline/converters/DateTimeConverter.kt
@@ -9,9 +9,11 @@ import org.joda.time.format.DateTimeFormat
 class DateTimeConverter : TypeConverter<DateTime?> {
 
     private val formats = arrayOf(
-            "yyyy-MM-dd",
-            "yyyy-MM-dd HH:mm",
-            "yyyy-MM-dd HH:mm:ss"
+        "dd.MM.yy",
+        "dd.MM.yyyy",
+        "yyyy-MM-dd",
+        "yyyy-MM-dd HH:mm",
+        "yyyy-MM-dd HH:mm:ss"
     )
 
     override fun read(value: String?): DateTime? {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index d707c40083..be6bdc6dcc 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -4,7 +4,6 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.content.Context
 import android.graphics.Color
-import android.opengl.Visibility
 import android.os.Bundle
 import android.util.ArrayMap
 import android.util.Log
@@ -34,7 +33,6 @@ import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
 import kotlinx.android.synthetic.main.fragment_grades.*
-import org.jetbrains.anko.commit
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
@@ -158,6 +156,31 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         examsDownloaded.get(1).grade = "3,7"
         examsDownloaded.get(1).examiner = "-"*/
 
+        /* val title = "title"
+         val grade = "1,0"
+         val examiner = "examiner"
+         val weight = 1.0
+         val credits = 4
+         val date = "11.03.22"
+
+         val typeConverter1 =
+             de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
+         val exam: Exam = Exam(
+             title,
+             typeConverter1.read(date),
+             examiner,
+             grade,
+             "schriftlich",
+             "31415",
+             "22W",
+             weight,
+             false,
+             credits,
+             true
+         )
+         exams.add(exam)
+         Log.d("new exam", "exam was added")*/
+
         if (!examsDownloaded.isEmpty()) {
             examsDownloaded.forEach { it.credits_new = 6; it.weight = 1.0; }
             exams.addAll(examsDownloaded)
@@ -438,13 +461,35 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             .setView(view)
             .setPositiveButton(R.string.create) { dialogInterface, whichButton ->
 
-                val name = view.findViewById<EditText>(R.id.editTextaddGradeCourseName).text
-                val grade = view.findViewById<EditText>(R.id.editTextAddGrade).text
-                val examiner = view.findViewById<EditText>(R.id.editTextaddGradeExaminer).text
-                val weight = view.findViewById<EditText>(R.id.editTextAddGradeWeight).text
-                val credits = view.findViewById<EditText>(R.id.editTextaddGradeCredits).text
-                val date = view.findViewById<EditText>(R.id.editTextAddGradeDate).text
-                Log.d("custom dialog", "positive button, Grade: " + grade)
+                val title =
+                    view.findViewById<EditText>(R.id.editTextaddGradeCourseName).text.toString()
+                val grade = view.findViewById<EditText>(R.id.editTextAddGrade).text.toString()
+                val examiner =
+                    view.findViewById<EditText>(R.id.editTextaddGradeExaminer).text.toString()
+                val weight =
+                    (view.findViewById<EditText>(R.id.editTextAddGradeWeight).text.toString()).toDouble()
+                val credits =
+                    Integer.parseInt(view.findViewById<EditText>(R.id.editTextaddGradeCredits).text.toString())
+                val date = view.findViewById<EditText>(R.id.editTextAddGradeDate).text.toString()
+                val semester = view.findViewById<EditText>(R.id.editTextSemester).text.toString()
+
+                val typeConverter1 =
+                    de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
+                val exam: Exam = Exam(
+                    title,
+                    typeConverter1.read(date),
+                    examiner,
+                    grade,
+                    null,
+                    "",
+                    semester,
+                    weight,
+                    false,
+                    credits,
+                    true
+                )
+                addExamToList(exam)
+
             }
             .setNegativeButton(android.R.string.cancel, null)
             .create()
@@ -452,8 +497,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
             };
         dialog.show()
-        dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.text_primary));
-        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.text_primary));
+        dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
+            .setTextColor(getResources().getColor(R.color.text_primary));
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE)
+            .setTextColor(getResources().getColor(R.color.text_primary));
     }
 
     /**
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 629dc3057f..5590220b39 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -26,7 +26,8 @@
                 android:id="@+id/editTextaddGradeCourseName"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="Course name"
+                android:hint="Course Name"
+                android:text="Thesis"
                 android:imeOptions="actionGo"
                 android:inputType="textCapWords|textAutoComplete"
                 android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
@@ -36,7 +37,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/material_default_padding"
                 android:labelFor="@+id/editTextAddGrade"
-                android:text="Grade *" />
+                android:text="Grade (comma separated) *" />
 
             <EditText
                 android:id="@+id/editTextAddGrade"
@@ -44,7 +45,8 @@
                 android:layout_height="wrap_content"
                 android:autofillHints="1.0"
                 android:ems="10"
-                android:hint="1.0"
+                android:hint="1,0"
+                android:text="1,0"
                 android:imeOptions="actionGo"
                 android:inputType="numberDecimal" />
 
@@ -60,6 +62,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="Examiner name"
+                android:text="@string/unknown"
                 android:imeOptions="actionGo"
                 android:inputType="textCapWords|textAutoComplete"
                 android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
@@ -112,7 +115,25 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ems="10"
-                android:inputType="date" />
+                android:inputType="date"
+                android:hint="dd.mm.yy"
+                android:text="01.01.22"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/material_default_padding"
+                android:labelFor="@+id/editTextSemester"
+                android:text="Year of the start of the semester (e.g. 22)" />
+
+            <EditText
+                android:id="@+id/editTextSemester"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="date"
+                android:hint="yy"
+                android:text="22"/>
 
 
         </LinearLayout>

From a542da0987fcfcee608497b05d2ef438519fbbec Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Wed, 11 May 2022 14:44:12 +0200
Subject: [PATCH 16/71] reduced number of store operations, newly added exams
 are now directly shown

---
 .../component/tumui/grades/ExamListAdapter.kt | 14 ++++++++++---
 .../component/tumui/grades/GradesFragment.kt  | 21 +++++++++++++++----
 .../res/layout/dialog_add_grade_input.xml     |  6 +++---
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 277b78ccd9..cdb10c59f6 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -1,6 +1,7 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
+import android.database.DataSetObserver
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
@@ -127,7 +128,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 adaptUIToCheckboxStatus(false, holder, exam)
                 holder.editTextGradeWeights.setText(exam.weight.toString())
                 holder.editTextGradeCredits.setText(exam.credits_new.toString())
-                localGradesFragment.storeExamListInSharedPreferences()
+               // localGradesFragment.storeExamListInSharedPreferences()
 
             }
 
@@ -135,7 +136,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 exam.weight = s.toString().toDouble()
-                localGradesFragment.storeExamListInSharedPreferences()
+              //  localGradesFragment.storeExamListInSharedPreferences()
             }
 
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
@@ -148,7 +149,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 exam.credits_new = s.toString().toInt()
-                localGradesFragment.storeExamListInSharedPreferences()
+               // localGradesFragment.storeExamListInSharedPreferences()
             }
 
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
@@ -234,4 +235,11 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         private val DATE_FORMAT = DateTimeFormat.mediumDate()
     }
 
+    override fun getCount(): Int {
+        return super.getCount()
+    }
+
+    override fun registerDataSetObserver(observer: DataSetObserver?) {
+        super.registerDataSetObserver(observer)
+    }
 }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index be6bdc6dcc..f4d9449427 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -11,6 +11,7 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
+import android.widget.Adapter
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.EditText
@@ -137,6 +138,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     fun addExamToList(exam: Exam) {
         exams.add(exam)
+        binding.gradesListView.adapter = ExamListAdapter(requireContext(), exams, this)
         storeExamListInSharedPreferences()
     }
 
@@ -145,9 +147,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
         val examsTitles = exams.map { it.course }
-        exams.clear()
-/*
         examsDownloaded.removeAll { examsTitles.contains(it.course) }
+        //  exams.clear()
+        //  storeExamListInSharedPreferences()
+/*
+
         examsDownloaded.get(0).course = "Esotheric Programming"
         examsDownloaded.get(0).grade = "1,0"
         examsDownloaded.get(0).examiner = "-"
@@ -216,7 +220,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         with(sharedPref.edit()) {
             putString(examSharedPreferences, jsonlist)
             apply()
-
         }
     }
 
@@ -258,6 +261,13 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         gradesStore.store(courses)
     }
 
+    override fun onPause() {
+
+        storeExamListInSharedPreferences()
+        super.onPause()
+    }
+
+
     /**
      * Displays the pie chart and its data set with the provided grade distribution.
      *
@@ -475,7 +485,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
                 val typeConverter1 =
                     de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
-                val exam: Exam = Exam(
+                val exam = Exam(
                     title,
                     typeConverter1.read(date),
                     examiner,
@@ -600,6 +610,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun changeEditMode() {
         with(binding) {
             globalEditOn = !globalEditOn;
+            if (globalEditOn) {      //save values as the edit mode is switched off.
+                storeExamListInSharedPreferences()
+            }
 
             // Refresh all values for the ui
             (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 5590220b39..541b95b70d 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -124,7 +124,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/material_default_padding"
                 android:labelFor="@+id/editTextSemester"
-                android:text="Year of the start of the semester (e.g. 22)" />
+                android:text="Year of the start of the semester (e.g. 22WS or 21SoSe)" />
 
             <EditText
                 android:id="@+id/editTextSemester"
@@ -132,8 +132,8 @@
                 android:layout_height="wrap_content"
                 android:ems="10"
                 android:inputType="date"
-                android:hint="yy"
-                android:text="22"/>
+                android:hint="yyWS"
+                android:text="22WS"/>
 
 
         </LinearLayout>

From 57da62fe66fc8d7c9bf00bb47f4e40381c06c758 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Wed, 11 May 2022 15:07:19 +0200
Subject: [PATCH 17/71] finished manually adding and deleting exams

---
 .../component/tumui/grades/ExamListAdapter.kt | 44 +++++++++----------
 .../component/tumui/grades/GradesFragment.kt  | 23 ++++++++--
 .../res/layout/activity_grades_listview.xml   |  6 +--
 3 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index cdb10c59f6..9f2bb3da54 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -84,19 +84,21 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
         if (localGradesFragment.getGlobalEdit()) {
             holder.editGradesContainer.visibility = View.GONE
-            holder.gradeTextViewDeleteCustomGrade.visibility=View.GONE
-        } else {//todo show button only if the exam was added manually - test the parameter
+            holder.gradeTextViewDeleteCustomGrade.visibility = View.GONE
+        } else {
             holder.editGradesContainer.visibility = View.VISIBLE
-            holder.gradeTextViewDeleteCustomGrade.visibility=View.VISIBLE
-            holder.gradeTextViewDeleteCustomGrade.background.setTint(
-                ContextCompat.getColor(
-                    context,
-                    R.color.grade_default
+            if (exam.manuallyAdded) {
+                holder.gradeTextViewDeleteCustomGrade.visibility = View.VISIBLE
+                holder.gradeTextViewDeleteCustomGrade.background.setTint(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.grade_default
+                    )
                 )
-            )
+            }
         }
 
-        holder.gradeTextViewDeleteCustomGrade.setOnClickListener(object: View.OnClickListener{
+        holder.gradeTextViewDeleteCustomGrade.setOnClickListener(object : View.OnClickListener {
             override fun onClick(p0: View?) {
                 val dialog = AlertDialog.Builder(localGradesFragment.requireContext())
                     .setTitle("Delete Exam")
@@ -105,7 +107,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                     )
                     .setPositiveButton("Delete") { dialogInterface, whichButton ->
 
-                       localGradesFragment.deleteExamFromList(exam)
+                        localGradesFragment.deleteExamFromList(exam)
                     }
                     .setNegativeButton(android.R.string.cancel, null)
                     .create()
@@ -113,8 +115,12 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                         window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
                     };
                 dialog.show()
-                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(localGradesFragment.getResources().getColor(R.color.text_primary));
-                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(localGradesFragment.getResources().getColor(R.color.text_primary));
+                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(
+                    localGradesFragment.getResources().getColor(R.color.text_primary)
+                );
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(
+                    localGradesFragment.getResources().getColor(R.color.text_primary)
+                );
             }
 
         })
@@ -128,7 +134,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 adaptUIToCheckboxStatus(false, holder, exam)
                 holder.editTextGradeWeights.setText(exam.weight.toString())
                 holder.editTextGradeCredits.setText(exam.credits_new.toString())
-               // localGradesFragment.storeExamListInSharedPreferences()
+                // localGradesFragment.storeExamListInSharedPreferences()
 
             }
 
@@ -136,7 +142,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 exam.weight = s.toString().toDouble()
-              //  localGradesFragment.storeExamListInSharedPreferences()
+                //  localGradesFragment.storeExamListInSharedPreferences()
             }
 
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
@@ -149,7 +155,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 exam.credits_new = s.toString().toInt()
-               // localGradesFragment.storeExamListInSharedPreferences()
+                // localGradesFragment.storeExamListInSharedPreferences()
             }
 
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
@@ -165,7 +171,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         }
 
 
-       // holder.gradeTextViewDeleteCustomGrade.
+        // holder.gradeTextViewDeleteCustomGrade.
     }
 
     private fun adaptUIToCheckboxStatus(
@@ -227,18 +233,12 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             itemView.findViewById(R.id.buttonResetGradeParameters)
         val gradeTextViewDeleteCustomGrade: ImageView =
             itemView.findViewById(R.id.gradeTextViewDeleteCustomGrade)
-
-
     }
 
     companion object {
         private val DATE_FORMAT = DateTimeFormat.mediumDate()
     }
 
-    override fun getCount(): Int {
-        return super.getCount()
-    }
-
     override fun registerDataSetObserver(observer: DataSetObserver?) {
         super.registerDataSetObserver(observer)
     }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index f4d9449427..7f793d5c49 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -34,6 +34,9 @@ import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
 import kotlinx.android.synthetic.main.fragment_grades.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.newSingleThreadContext
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
@@ -61,6 +64,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private val exams = mutableListOf<Exam>();
 
     private val examSharedPreferences: String = "ExamList";
+    private val scope = CoroutineScope(newSingleThreadContext("storetopreferences"))
 
 
     private val grades: Array<String> by lazy {
@@ -138,6 +142,15 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     fun addExamToList(exam: Exam) {
         exams.add(exam)
+        changeNumberOfExams()
+    }
+
+    fun deleteExamFromList(exam: Exam) {
+        exams.remove(exam)
+        changeNumberOfExams()
+    }
+
+    private fun changeNumberOfExams() {
         binding.gradesListView.adapter = ExamListAdapter(requireContext(), exams, this)
         storeExamListInSharedPreferences()
     }
@@ -212,6 +225,12 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     fun storeExamListInSharedPreferences() {
+
+        scope.launch { storeExamListInSharedPreferencesThread() }
+
+    }
+
+    private fun storeExamListInSharedPreferencesThread() {
         val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
         val dateTimeConverter = DateTimeConverter()
         val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
@@ -690,10 +709,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         return globalEditOn;
     }
 
-    fun deleteExamFromList(exam: Exam) {
-        exams.remove(exam)
-        (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
-    }
 
     companion object {
         private const val KEY_SHOW_BAR_CHART = "showPieChart"
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index d4fe5a66d6..6a4ef3c45d 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -147,13 +147,13 @@
                 android:layout_height="64dp"
                 android:layout_gravity="center_vertical"
                 android:layout_marginLeft="10dp"
+                android:layout_marginBottom="8dp"
                 android:background="@drawable/grade_background"
                 android:gravity="center"
                 android:padding="@dimen/material_default_padding"
-                app:tint="@android:color/white"
-                android:layout_marginBottom="8dp"
                 android:src="@drawable/ic_clear"
-                />
+                android:visibility="gone"
+                app:tint="@android:color/white" />
 
             <TextView
                 android:id="@+id/gradeTextView"

From 603f0e8267eb8109eede30e7970dab7e25754929 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Wed, 11 May 2022 17:45:21 +0200
Subject: [PATCH 18/71] started input sanitization, tried to fix recycler
 overwrites

---
 .../component/tumui/grades/ExamListAdapter.kt |  22 ++-
 .../component/tumui/grades/GradesFragment.kt  | 136 +++++++++++++-----
 .../res/layout/dialog_add_grade_input.xml     |   9 +-
 3 files changed, 114 insertions(+), 53 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 9f2bb3da54..278ab49cca 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -1,7 +1,6 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
-import android.database.DataSetObserver
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
@@ -45,12 +44,12 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
 
 
-        initUIDisplayElements(holder, exam)
+        initUIDisplayElements(holder, exam,position)
         initUIEditElements(holder, exam);
         return view
     }
 
-    private fun initUIDisplayElements(holder: ViewHolder, exam: Exam) {
+    private fun initUIDisplayElements(holder: ViewHolder, exam: Exam, position: Int) {
         holder.nameTextView.text = exam.course
         holder.gradeTextView.text = exam.grade
 
@@ -77,8 +76,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
      * Init the ui Elements to change the parameters of the grade
      */
     private fun initUIEditElements(holder: ViewHolder, exam: Exam) {
-        holder.editTextGradeWeights.setText(exam.weight.toString())
-        holder.editTextGradeCredits.setText(exam.credits_new.toString())
+
         holder.checkBoxUseGradeForAverage.isChecked = exam.gradeUsedInAverage
         adaptUIToCheckboxStatus(exam.gradeUsedInAverage, holder, exam)
 
@@ -134,6 +132,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 adaptUIToCheckboxStatus(false, holder, exam)
                 holder.editTextGradeWeights.setText(exam.weight.toString())
                 holder.editTextGradeCredits.setText(exam.credits_new.toString())
+                notifyDataSetChanged()
                 // localGradesFragment.storeExamListInSharedPreferences()
 
             }
@@ -142,6 +141,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 exam.weight = s.toString().toDouble()
+                notifyDataSetChanged()
                 //  localGradesFragment.storeExamListInSharedPreferences()
             }
 
@@ -154,7 +154,9 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
         holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
+                Log.d("Insert Credits",exam.course+" Store credits: "+s.toString())
                 exam.credits_new = s.toString().toInt()
+                notifyDataSetChanged()
                 // localGradesFragment.storeExamListInSharedPreferences()
             }
 
@@ -168,10 +170,10 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { buttonView, isChecked ->
             exam.gradeUsedInAverage = !isChecked
             adaptUIToCheckboxStatus(isChecked, holder, exam)
+            notifyDataSetChanged()
         }
-
-
-        // holder.gradeTextViewDeleteCustomGrade.
+        holder.editTextGradeWeights.setText(exam.weight.toString())
+        holder.editTextGradeCredits.setText(exam.credits_new.toString())
     }
 
     private fun adaptUIToCheckboxStatus(
@@ -238,8 +240,4 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
     companion object {
         private val DATE_FORMAT = DateTimeFormat.mediumDate()
     }
-
-    override fun registerDataSetObserver(observer: DataSetObserver?) {
-        super.registerDataSetObserver(observer)
-    }
 }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 7f793d5c49..c876e29142 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -6,14 +6,13 @@ import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
-import android.util.Log
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import android.widget.Adapter
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import android.widget.Button
 import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
@@ -151,6 +150,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     private fun changeNumberOfExams() {
+        //(binding.gradesListView.adapter as ExamListAdapter).
+        //(binding.gradesListView.adapter as ExamListAdapter).itemList=exams
+        //(binding.gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
+
+
         binding.gradesListView.adapter = ExamListAdapter(requireContext(), exams, this)
         storeExamListInSharedPreferences()
     }
@@ -482,54 +486,113 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
 
         val dialog = AlertDialog.Builder(requireContext())
-            .setTitle("Add a new exam manually")
+            .setTitle("Add a New Exam")
             .setMessage(
                 "Grades are normally added automatically. In case special grades should be added, this can be done here. " +
-                        "Manually added Exams can be deleted later on.\n\n* required"
+                        "Manually added Exams can be deleted later on."
             )
             .setView(view)
-            .setPositiveButton(R.string.create) { dialogInterface, whichButton ->
-
-                val title =
-                    view.findViewById<EditText>(R.id.editTextaddGradeCourseName).text.toString()
-                val grade = view.findViewById<EditText>(R.id.editTextAddGrade).text.toString()
-                val examiner =
-                    view.findViewById<EditText>(R.id.editTextaddGradeExaminer).text.toString()
-                val weight =
-                    (view.findViewById<EditText>(R.id.editTextAddGradeWeight).text.toString()).toDouble()
-                val credits =
-                    Integer.parseInt(view.findViewById<EditText>(R.id.editTextaddGradeCredits).text.toString())
-                val date = view.findViewById<EditText>(R.id.editTextAddGradeDate).text.toString()
-                val semester = view.findViewById<EditText>(R.id.editTextSemester).text.toString()
-
-                val typeConverter1 =
-                    de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
-                val exam = Exam(
-                    title,
-                    typeConverter1.read(date),
-                    examiner,
-                    grade,
-                    null,
-                    "",
-                    semester,
-                    weight,
-                    false,
-                    credits,
-                    true
-                )
-                addExamToList(exam)
-
-            }
+            .setPositiveButton(R.string.create, null)
             .setNegativeButton(android.R.string.cancel, null)
             .create()
             .apply {
                 window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
             };
+
+        dialog.setOnShowListener {
+            val button: Button =
+                (dialog as AlertDialog).getButton(AlertDialog.BUTTON_POSITIVE)
+            button.setOnClickListener(View.OnClickListener { // TODO Do something
+
+                val titleView =
+                    view.findViewById<EditText>(R.id.editTextaddGradeCourseName)
+                val gradeView = view.findViewById<EditText>(R.id.editTextAddGrade)
+                val examinerView =
+                    view.findViewById<EditText>(R.id.editTextaddGradeExaminer)
+                val weightView =
+                    view.findViewById<EditText>(R.id.editTextAddGradeWeight)
+                val creditsView =
+                    view.findViewById<EditText>(R.id.editTextaddGradeCredits)
+                val dateView = view.findViewById<EditText>(R.id.editTextAddGradeDate)
+                val semesterView = view.findViewById<EditText>(R.id.editTextSemester)
+
+                val title =
+                    titleView.text.toString()
+                var grade = gradeView.text.toString()
+                val examiner =
+                    examinerView.text.toString()
+
+                var weight=1.0
+                try {
+                    weight = (weightView.text.toString()).toDouble()
+                } catch (exception: Exception) {
+                    weight = 1.0
+                }
+
+                val credits =
+                    Integer.parseInt(creditsView.text.toString())
+                val date = dateView.text.toString()
+                val semester = semesterView.text.toString()
+
+                /* view.findViewById<EditText>(R.id.editTextSemester).setError("Wrong semester format. Correct two numbers for the year +WS/S")
+                 //todo input sanitization -> highlight wrong fields in red
+                 view.findViewById<EditText>(R.id.editTextSemester).getBackground()
+                     .setTint(getResources().getColor(R.color.grade_3_7))
+ */
+
+                //todo allen den error status wieder wegnehmen
+                semesterView.setError(null)
+                weightView.setError(null)
+                var changesRequired = false
+                if (semester.length < 3) {
+                    changesRequired = true;
+                    semesterView.setError("Wrong semester format: Too short. Correct two numbers for the year + W/S")
+                } else if (!(semester.get(2).equals('W') || semester.get(2)
+                        .equals('w') || semester.get(2).equals('S') || semester.get(2).equals('s'))
+                ) {
+                    changesRequired = true;
+                    semesterView.setError("Wrong semester format: Term not specified. Correct two numbers for the year + W/S")
+                }
+
+                if (weight < 0.0) {
+                    changesRequired = true;
+                    weightView.setError("Wrong weight format: Weights can not be negative.")
+                }
+
+                if (grade.equals("0") || grade.equals("0,0")) {
+                    grade="B"
+                }
+
+                if (!changesRequired) {
+                    val typeConverter1 =
+                        de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
+                    val exam = Exam(
+                        title,
+                        typeConverter1.read(date),
+                        examiner,
+                        grade,
+                        null,
+                        "",
+                        semester,
+                        weight,
+                        false,
+                        credits,
+                        true
+                    )
+                    addExamToList(exam)
+                    dialog.dismiss()
+                }
+            })
+        }
+
         dialog.show()
+
         dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
             .setTextColor(getResources().getColor(R.color.text_primary));
         dialog.getButton(AlertDialog.BUTTON_POSITIVE)
             .setTextColor(getResources().getColor(R.color.text_primary));
+
+
     }
 
     /**
@@ -736,3 +799,4 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         )
     }
 }
+
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 541b95b70d..67b5300dd0 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -20,7 +20,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/material_default_padding"
                 android:labelFor="@+id/editTextaddGradeCourseName"
-                android:text="Course name *" />
+                android:text="Course name" />
 
             <EditText
                 android:id="@+id/editTextaddGradeCourseName"
@@ -37,7 +37,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/material_default_padding"
                 android:labelFor="@+id/editTextAddGrade"
-                android:text="Grade (comma separated) *" />
+                android:text="Grade (0 for passed)" />
 
             <EditText
                 android:id="@+id/editTextAddGrade"
@@ -48,7 +48,7 @@
                 android:hint="1,0"
                 android:text="1,0"
                 android:imeOptions="actionGo"
-                android:inputType="numberDecimal" />
+                android:inputType="" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -131,8 +131,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ems="10"
-                android:inputType="date"
-                android:hint="yyWS"
+                android:hint="22WS"
                 android:text="22WS"/>
 
 

From ce218f0960b6aa0ca6bb65ab346d4c853a4cc6b5 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 12 May 2022 12:23:42 +0200
Subject: [PATCH 19/71] improved input sanitization for remaining attributes

---
 .../in/tumcampusapp/api/app/DateSerializer.kt | 25 ++++++++---
 .../component/tumui/grades/GradesFragment.kt  | 43 +++++++++++++++----
 .../res/layout/dialog_add_grade_input.xml     |  2 +-
 3 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt b/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
index 50ae6cf10c..e363c3ee81 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
@@ -14,9 +14,14 @@ import java.util.*
  */
 class DateSerializer : JsonDeserializer<DateTime>, JsonSerializer<DateTime> {
     private val formatStrings = arrayOf(
-            "yyyy-MM-dd",
-            "yyyy-MM-dd HH:mm:ss",
-            "yyyy-MM-dd'T'HH:mm:ss'Z'"
+        "dd.MM.yy",
+        "dd.MM.yyyy",
+        "yyyy.MM.dd",
+        "dd.MM.yy",
+        "dd.MM.yyyy",
+        "yyyy.MM.dd",
+        "yyyy-MM-dd HH:mm:ss",
+        "yyyy-MM-dd'T'HH:mm:ss'Z'"
     )
 
     private val dateFormats = formatStrings.map {
@@ -34,10 +39,20 @@ class DateSerializer : JsonDeserializer<DateTime>, JsonSerializer<DateTime> {
             } catch (ignored: Exception) {
             }
         }
-        throw JsonParseException("Unparseable date: \"${json?.asString.orEmpty()}\". Supported formats: ${Arrays.toString(formatStrings)}")
+        throw JsonParseException(
+            "Unparseable date: \"${json?.asString.orEmpty()}\". Supported formats: ${
+                Arrays.toString(
+                    formatStrings
+                )
+            }"
+        )
     }
 
-    override fun serialize(time: DateTime, typeOfT: Type, context: JsonSerializationContext): JsonElement {
+    override fun serialize(
+        time: DateTime,
+        typeOfT: Type,
+        context: JsonSerializationContext
+    ): JsonElement {
         return JsonPrimitive(DateTimeUtils.getDateString(time))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index c876e29142..d320e07f43 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -518,11 +518,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
                 val title =
                     titleView.text.toString()
-                var grade = gradeView.text.toString()
+                val grade = gradeView.text.toString().toDouble()
                 val examiner =
                     examinerView.text.toString()
 
-                var weight=1.0
+                var weight = 1.0
                 try {
                     weight = (weightView.text.toString()).toDouble()
                 } catch (exception: Exception) {
@@ -541,10 +541,16 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
  */
 
                 //todo allen den error status wieder wegnehmen
-                semesterView.setError(null)
+                titleView.setError(null)
+                gradeView.setError(null)
+                examinerView.setError(null)
                 weightView.setError(null)
+                creditsView.setError(null)
+                dateView.setError(null)
+                semesterView.setError(null)
+
                 var changesRequired = false
-                if (semester.length < 3) {
+                if (semester.length < 3) {                                                  //semester sanitization
                     changesRequired = true;
                     semesterView.setError("Wrong semester format: Too short. Correct two numbers for the year + W/S")
                 } else if (!(semester.get(2).equals('W') || semester.get(2)
@@ -554,15 +560,36 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                     semesterView.setError("Wrong semester format: Term not specified. Correct two numbers for the year + W/S")
                 }
 
-                if (weight < 0.0) {
+                if (weight < 0.0) {             //weight sanitization
                     changesRequired = true;
                     weightView.setError("Wrong weight format: Weights can not be negative.")
                 }
 
-                if (grade.equals("0") || grade.equals("0,0")) {
-                    grade="B"
+
+                var gradeString = ""
+                if (grade <= 5.0 && grade >= 1.0 || grade == 0.0) {
+                    if (grade == 0.0) {
+                        gradeString = "B"
+                    } else {
+                        gradeString = grade.toString()
+                    }
+                } else {
+                    changesRequired = true;
+                    gradeView.setError("Wrong grade format: Grade must be between 1.0 and 5.0 or equal to 0.")
+                }
+
+
+                if (title.length < 1) {             //title sanitization
+                    changesRequired = true;
+                    titleView.setError("Insert a course title.")
                 }
 
+                if (credits < 1) {             //title sanitization
+                    changesRequired = true;
+                    creditsView.setError("Invalid amount of credits. Must be greater than 0.")
+                }
+
+
                 if (!changesRequired) {
                     val typeConverter1 =
                         de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
@@ -570,7 +597,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                         title,
                         typeConverter1.read(date),
                         examiner,
-                        grade,
+                        gradeString,
                         null,
                         "",
                         semester,
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 67b5300dd0..7ff4741a31 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -48,7 +48,7 @@
                 android:hint="1,0"
                 android:text="1,0"
                 android:imeOptions="actionGo"
-                android:inputType="" />
+                android:inputType="numberDecimal" />
 
             <TextView
                 android:layout_width="match_parent"

From 3a2c330592a52af4833bd492dc67a01ad434e109 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 12 May 2022 12:56:50 +0200
Subject: [PATCH 20/71] adapted computation of the average grade

---
 .../component/tumui/grades/GradesFragment.kt  | 195 +++++++-----------
 1 file changed, 77 insertions(+), 118 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index d320e07f43..05d2e54b59 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -59,10 +59,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     private var showBarChartAfterRotate = false
 
-    private var globalEditOn = false;
-    private val exams = mutableListOf<Exam>();
+    private var globalEditOn = false
+    private val exams = mutableListOf<Exam>()
 
-    private val examSharedPreferences: String = "ExamList";
+    private val examSharedPreferences: String = "ExamList"
     private val scope = CoroutineScope(newSingleThreadContext("storetopreferences"))
 
 
@@ -167,40 +167,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         examsDownloaded.removeAll { examsTitles.contains(it.course) }
         //  exams.clear()
         //  storeExamListInSharedPreferences()
-/*
-
-        examsDownloaded.get(0).course = "Esotheric Programming"
-        examsDownloaded.get(0).grade = "1,0"
-        examsDownloaded.get(0).examiner = "-"
-
-        examsDownloaded.get(1).course = "Advanced Singing and Clapping"
-        examsDownloaded.get(1).grade = "3,7"
-        examsDownloaded.get(1).examiner = "-"*/
-
-        /* val title = "title"
-         val grade = "1,0"
-         val examiner = "examiner"
-         val weight = 1.0
-         val credits = 4
-         val date = "11.03.22"
-
-         val typeConverter1 =
-             de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
-         val exam: Exam = Exam(
-             title,
-             typeConverter1.read(date),
-             examiner,
-             grade,
-             "schriftlich",
-             "31415",
-             "22W",
-             weight,
-             false,
-             credits,
-             true
-         )
-         exams.add(exam)
-         Log.d("new exam", "exam was added")*/
+
 
         if (!examsDownloaded.isEmpty()) {
             examsDownloaded.forEach { it.credits_new = 6; it.weight = 1.0; }
@@ -216,19 +183,19 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
                 .create()
             val listType = object : TypeToken<List<Exam>>() {}.type
-            val jsonString = sharedPref.getString(examSharedPreferences, "");
+            val jsonString = sharedPref.getString(examSharedPreferences, "")
             if (jsonString != null) {
-                exams.clear();
+                exams.clear()
                 exams.addAll(gson.fromJson(jsonString, listType))
                 return
             }
         } catch (e: Exception) {
-            exams.clear();
+            exams.clear()
         }
-        // Exam list could no be loaded - will always e a list, some error occured - clear to prevent any intermediate error states
+        // Exam list could no be loaded - will always e a list, some error occurred - clear to prevent any intermediate error states
     }
 
-    fun storeExamListInSharedPreferences() {
+    private fun storeExamListInSharedPreferences() {
 
         scope.launch { storeExamListInSharedPreferencesThread() }
 
@@ -253,7 +220,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     class DateTimeConverter @Inject constructor() : JsonSerializer<DateTime?>,
         JsonDeserializer<DateTime?> {
-        private val dateTimeFormatter: DateTimeFormatter
+        private val dateTimeFormatter: DateTimeFormatter =
+            DateTimeFormat.forPattern("YYYY-MM-dd HH:mm")
+
         override fun serialize(
             src: DateTime?,
             typeOfSrc: Type?,
@@ -273,9 +242,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             } else dateTimeFormatter.parseDateTime(json.asString)
         }
 
-        init {
-            dateTimeFormatter = DateTimeFormat.forPattern("YYYY-MM-dd HH:mm")
-        }
     }
 
     fun storeGradedCourses(exams: List<Exam>) {
@@ -352,7 +318,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
                 // only label grades that are associated with at least one grade
                 data.setValueFormatter(object : ValueFormatter() {
-                    override fun getFormattedValue(value: Float): String? {
+                    override fun getFormattedValue(value: Float): String {
                         if (value > 0.0)
                             return value.toString()
                         return ""
@@ -399,11 +365,19 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun calculateAverageGrade(exams: List<Exam>): Double {
         val numberFormat = NumberFormat.getInstance(Locale.GERMAN)
         val grades = exams
-            .filter { it.isPassed }
-            .map { numberFormat.parse(it.grade).toDouble() }
-//todo multiply by it.weight and credits and theen divide by the combined numerb of used numbers
+            .filter { it.isPassed && !it.gradeUsedInAverage }
+            .map { numberFormat.parse(it.grade).toDouble() * it.credits_new * it.weight }
+        val combinedgradefactors = exams
+            .filter { it.isPassed && !it.gradeUsedInAverage }
+            .map { it.credits_new.toDouble() * it.weight }
+
+
         val gradeSum = grades.sum()
-        return gradeSum / grades.size.toDouble()
+        val factorSum = combinedgradefactors.sum()
+        if (factorSum<=0){
+            return 0.0;
+        }
+        return gradeSum / factorSum.toDouble()
     }
 
     /**
@@ -497,96 +471,86 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             .create()
             .apply {
                 window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
-            };
+            }
 
         dialog.setOnShowListener {
             val button: Button =
-                (dialog as AlertDialog).getButton(AlertDialog.BUTTON_POSITIVE)
-            button.setOnClickListener(View.OnClickListener { // TODO Do something
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE)
+            button.setOnClickListener {
 
-                val titleView =
-                    view.findViewById<EditText>(R.id.editTextaddGradeCourseName)
+                val titleView = view.findViewById<EditText>(R.id.editTextaddGradeCourseName)
                 val gradeView = view.findViewById<EditText>(R.id.editTextAddGrade)
-                val examinerView =
-                    view.findViewById<EditText>(R.id.editTextaddGradeExaminer)
-                val weightView =
-                    view.findViewById<EditText>(R.id.editTextAddGradeWeight)
-                val creditsView =
-                    view.findViewById<EditText>(R.id.editTextaddGradeCredits)
+                val examinerView = view.findViewById<EditText>(R.id.editTextaddGradeExaminer)
+                val weightView = view.findViewById<EditText>(R.id.editTextAddGradeWeight)
+                val creditsView = view.findViewById<EditText>(R.id.editTextaddGradeCredits)
                 val dateView = view.findViewById<EditText>(R.id.editTextAddGradeDate)
                 val semesterView = view.findViewById<EditText>(R.id.editTextSemester)
 
-                val title =
-                    titleView.text.toString()
-                val grade = gradeView.text.toString().toDouble()
-                val examiner =
-                    examinerView.text.toString()
+                val title = titleView.text.toString()
+                val grade = gradeView.text.toString()
+                val examiner = examinerView.text.toString()
+                val credits = Integer.parseInt(creditsView.text.toString())
+                val date = dateView.text.toString()
+                val semester = semesterView.text.toString()
 
-                var weight = 1.0
+                var weight: Double
                 try {
                     weight = (weightView.text.toString()).toDouble()
                 } catch (exception: Exception) {
                     weight = 1.0
                 }
 
-                val credits =
-                    Integer.parseInt(creditsView.text.toString())
-                val date = dateView.text.toString()
-                val semester = semesterView.text.toString()
 
-                /* view.findViewById<EditText>(R.id.editTextSemester).setError("Wrong semester format. Correct two numbers for the year +WS/S")
-                 //todo input sanitization -> highlight wrong fields in red
-                 view.findViewById<EditText>(R.id.editTextSemester).getBackground()
-                     .setTint(getResources().getColor(R.color.grade_3_7))
- */
-
-                //todo allen den error status wieder wegnehmen
-                titleView.setError(null)
-                gradeView.setError(null)
-                examinerView.setError(null)
-                weightView.setError(null)
-                creditsView.setError(null)
-                dateView.setError(null)
-                semesterView.setError(null)
+
+                titleView.error = null
+                gradeView.error = null
+                examinerView.error = null
+                weightView.error = null
+                creditsView.error = null
+                dateView.error = null
+                semesterView.error = null
 
                 var changesRequired = false
                 if (semester.length < 3) {                                                  //semester sanitization
-                    changesRequired = true;
-                    semesterView.setError("Wrong semester format: Too short. Correct two numbers for the year + W/S")
+                    changesRequired = true
+                    semesterView.error =
+                        "Wrong semester format: Too short. Correct two numbers for the year + W/S"
                 } else if (!(semester.get(2).equals('W') || semester.get(2)
                         .equals('w') || semester.get(2).equals('S') || semester.get(2).equals('s'))
                 ) {
-                    changesRequired = true;
-                    semesterView.setError("Wrong semester format: Term not specified. Correct two numbers for the year + W/S")
+                    changesRequired = true
+                    semesterView.error =
+                        "Wrong semester format: Term not specified. Correct two numbers for the year + W/S"
                 }
 
                 if (weight < 0.0) {             //weight sanitization
-                    changesRequired = true;
-                    weightView.setError("Wrong weight format: Weights can not be negative.")
+                    changesRequired = true
+                    weightView.error = "Wrong weight format: Weights can not be negative."
                 }
 
-
+                val gradedouble = grade.replace(",", ".").toDouble()
                 var gradeString = ""
-                if (grade <= 5.0 && grade >= 1.0 || grade == 0.0) {
-                    if (grade == 0.0) {
+                if (gradedouble <= 5.0 && gradedouble >= 1.0 || gradedouble == 0.0) {
+                    if (gradedouble == 0.0) {
                         gradeString = "B"
                     } else {
-                        gradeString = grade.toString()
+                        gradeString = grade.toString().replace(".",",")
                     }
                 } else {
-                    changesRequired = true;
-                    gradeView.setError("Wrong grade format: Grade must be between 1.0 and 5.0 or equal to 0.")
+                    changesRequired = true
+                    gradeView.error =
+                        "Wrong grade format: Grade must be between 1.0 and 5.0 or equal to 0."
                 }
 
 
                 if (title.length < 1) {             //title sanitization
-                    changesRequired = true;
-                    titleView.setError("Insert a course title.")
+                    changesRequired = true
+                    titleView.error = "Insert a course title."
                 }
 
                 if (credits < 1) {             //title sanitization
-                    changesRequired = true;
-                    creditsView.setError("Invalid amount of credits. Must be greater than 0.")
+                    changesRequired = true
+                    creditsView.error = "Invalid amount of credits. Must be greater than 0."
                 }
 
 
@@ -609,15 +573,15 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                     addExamToList(exam)
                     dialog.dismiss()
                 }
-            })
+            }
         }
 
         dialog.show()
 
         dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
-            .setTextColor(getResources().getColor(R.color.text_primary));
+            .setTextColor(resources.getColor(R.color.text_primary))
         dialog.getButton(AlertDialog.BUTTON_POSITIVE)
-            .setTextColor(getResources().getColor(R.color.text_primary));
+            .setTextColor(resources.getColor(R.color.text_primary))
 
 
     }
@@ -669,7 +633,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             showListButton?.visibility = if (showChart) View.VISIBLE else View.GONE
             showChartButton?.visibility = if (showChart) View.GONE else View.VISIBLE
 
-            val refreshLayout = swipeRefreshLayout ?: return
+            val refreshLayout = swipeRefreshLayout
 
             if (chartsContainer.visibility == View.GONE) {
                 crossFadeViews(refreshLayout, chartsContainer)
@@ -697,9 +661,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater?.inflate(R.menu.menu_activity_grades, menu)
-        barMenuItem = menu?.findItem(R.id.bar_chart_menu)
-        pieMenuItem = menu?.findItem(R.id.pie_chart_menu)
+        inflater.inflate(R.menu.menu_activity_grades, menu)
+        barMenuItem = menu.findItem(R.id.bar_chart_menu)
+        pieMenuItem = menu.findItem(R.id.pie_chart_menu)
         super.onCreateOptionsMenu(menu, inflater)
     }
 
@@ -718,13 +682,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun changeEditMode() {
         with(binding) {
-            globalEditOn = !globalEditOn;
-            if (globalEditOn) {      //save values as the edit mode is switched off.
-                storeExamListInSharedPreferences()
-            }
-
-            // Refresh all values for the ui
-            (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
+            globalEditOn = !globalEditOn
             initUIVisibility()
         }
     }
@@ -734,7 +692,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             frameLayoutAverageGrade?.visibility = View.GONE
             floatingbuttonAddExamGrade?.visibility = View.VISIBLE
         } else {
-
+            storeExamListInSharedPreferences()
+            showExams(exams)
             frameLayoutAverageGrade?.visibility = View.VISIBLE
             floatingbuttonAddExamGrade?.visibility = View.GONE
         }
@@ -796,7 +755,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     fun getGlobalEdit(): Boolean {
-        return globalEditOn;
+        return globalEditOn
     }
 
 

From f7b206e0a5d0d0f611188f57dfae8c9f7bda9e43 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 12 May 2022 13:54:28 +0200
Subject: [PATCH 21/71] prevented wrong updates of credits in the recycler view

---
 .../component/tumui/grades/ExamListAdapter.kt | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 278ab49cca..1087ad04c1 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -5,6 +5,7 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
 import android.view.View
+import android.view.View.OnFocusChangeListener
 import android.view.ViewGroup
 import android.widget.*
 import androidx.appcompat.app.AlertDialog
@@ -43,9 +44,8 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         val exam = itemList[position]
 
 
-
-        initUIDisplayElements(holder, exam,position)
-        initUIEditElements(holder, exam);
+        initUIEditElements(holder, exam)
+        initUIDisplayElements(holder, exam, position)
         return view
     }
 
@@ -53,6 +53,8 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.nameTextView.text = exam.course
         holder.gradeTextView.text = exam.grade
 
+        //   val newPosition=itemList.indexOf(exam)
+
         val gradeColor = exam.getGradeColor(context)
         holder.gradeTextView.background.setTint(gradeColor)
 
@@ -152,20 +154,30 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             }
         })
 
-        holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
-            override fun afterTextChanged(s: Editable?) {
-                Log.d("Insert Credits",exam.course+" Store credits: "+s.toString())
-                exam.credits_new = s.toString().toInt()
-                notifyDataSetChanged()
-                // localGradesFragment.storeExamListInSharedPreferences()
-            }
-
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
+        /* holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
+             override fun afterTextChanged(s: Editable?) {
+                 Log.d("Insert Credits",exam.course+" Store credits: "+s.toString())
+              //  exam.credits_new = s.toString().toInt()
+              //  notifyDataSetChanged()
+                 // localGradesFragment.storeExamListInSharedPreferences()
+             }
+
+             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+             }
+
+             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+             }
+         })*/
+        holder.editTextGradeCredits.setOnFocusChangeListener { v, hasFocus ->
+            if (!hasFocus) {
+                val helper = holder.editTextGradeCredits.text.toString().toInt()
+                if (exam.credits_new != helper) {
+                    Log.d("Focus test: ", "stored: " + exam.course)
+                    exam.credits_new = helper;
+                }
 
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
             }
-        })
+        }
 
         holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { buttonView, isChecked ->
             exam.gradeUsedInAverage = !isChecked

From a5be907480502daf7ada3028390570d02ada0349 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 12 May 2022 15:03:56 +0200
Subject: [PATCH 22/71] fixed ui inconsistencies, reduced method sizes

---
 .../component/tumui/grades/ExamListAdapter.kt | 151 +++++++++---------
 .../component/tumui/grades/GradesFragment.kt  |   4 +-
 .../component/tumui/grades/model/Exam.kt      |   2 +-
 .../res/layout/activity_grades_listview.xml   |   2 +-
 app/src/main/res/values-de/strings.xml        |   2 +-
 app/src/main/res/values/strings.xml           |   2 +-
 6 files changed, 81 insertions(+), 82 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 1087ad04c1..0fb1adfaf6 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -45,16 +45,14 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
 
         initUIEditElements(holder, exam)
-        initUIDisplayElements(holder, exam, position)
+        initUIDisplayElements(holder, exam)
         return view
     }
 
-    private fun initUIDisplayElements(holder: ViewHolder, exam: Exam, position: Int) {
+    private fun initUIDisplayElements(holder: ViewHolder, exam: Exam) {
         holder.nameTextView.text = exam.course
         holder.gradeTextView.text = exam.grade
 
-        //   val newPosition=itemList.indexOf(exam)
-
         val gradeColor = exam.getGradeColor(context)
         holder.gradeTextView.background.setTint(gradeColor)
 
@@ -78,28 +76,29 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
      * Init the ui Elements to change the parameters of the grade
      */
     private fun initUIEditElements(holder: ViewHolder, exam: Exam) {
-
-        holder.checkBoxUseGradeForAverage.isChecked = exam.gradeUsedInAverage
-        adaptUIToCheckboxStatus(exam.gradeUsedInAverage, holder, exam)
-
         if (localGradesFragment.getGlobalEdit()) {
             holder.editGradesContainer.visibility = View.GONE
             holder.gradeTextViewDeleteCustomGrade.visibility = View.GONE
         } else {
             holder.editGradesContainer.visibility = View.VISIBLE
-            if (exam.manuallyAdded) {
-                holder.gradeTextViewDeleteCustomGrade.visibility = View.VISIBLE
-                holder.gradeTextViewDeleteCustomGrade.background.setTint(
-                    ContextCompat.getColor(
-                        context,
-                        R.color.grade_default
-                    )
-                )
-            }
+
+            initListenerDeleteCustomGrade(exam, holder)
+            initListenerEditTexts(exam, holder)
+            initListenerResetGradeParameters(exam, holder)
+            initCheckBoxUsedInAverage(exam, holder)
         }
+    }
 
-        holder.gradeTextViewDeleteCustomGrade.setOnClickListener(object : View.OnClickListener {
-            override fun onClick(p0: View?) {
+
+    /**
+     * Adds a Clicklistener which will show confirmation dialog whether the exam should actually be deleted.
+     */
+    private fun initListenerDeleteCustomGrade(exam: Exam, holder: ViewHolder) {
+        if (exam.manuallyAdded) {
+            holder.gradeTextViewDeleteCustomGrade.visibility = View.VISIBLE
+            adaptUIToCheckboxStatus(holder, exam)
+
+            holder.gradeTextViewDeleteCustomGrade.setOnClickListener {
                 val dialog = AlertDialog.Builder(localGradesFragment.requireContext())
                     .setTitle("Delete Exam")
                     .setMessage(
@@ -122,78 +121,84 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                     localGradesFragment.getResources().getColor(R.color.text_primary)
                 );
             }
+        } else {
+            holder.gradeTextViewDeleteCustomGrade.visibility = View.GONE
+        }
 
-        })
-
-
-        holder.buttonResetGradeParameters.setOnClickListener(object : View.OnClickListener {
-            override fun onClick(p0: View?) {
-                exam.gradeUsedInAverage = false
-                exam.weight = 1.0
-                exam.credits_new = 6
-                adaptUIToCheckboxStatus(false, holder, exam)
-                holder.editTextGradeWeights.setText(exam.weight.toString())
-                holder.editTextGradeCredits.setText(exam.credits_new.toString())
-                notifyDataSetChanged()
-                // localGradesFragment.storeExamListInSharedPreferences()
-
-            }
-
-        })
-        holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
-            override fun afterTextChanged(s: Editable?) {
-                exam.weight = s.toString().toDouble()
-                notifyDataSetChanged()
-                //  localGradesFragment.storeExamListInSharedPreferences()
-            }
+    }
 
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
 
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+    /**
+     * Adds on Focus change listeners which store the value to the exam object if and only if the
+     * user finished editing the exam.
+     */
+    private fun initListenerEditTexts(exam: Exam, holder: ViewHolder) {
+        holder.editTextGradeWeights.setOnFocusChangeListener { _, hasFocus ->
+            if (!hasFocus) {
+                val helper = holder.editTextGradeWeights.text.toString().toDouble()
+                if (exam.weight != helper) {
+                    exam.weight = helper;
+                }
             }
-        })
+        }
 
-        /* holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
-             override fun afterTextChanged(s: Editable?) {
-                 Log.d("Insert Credits",exam.course+" Store credits: "+s.toString())
-              //  exam.credits_new = s.toString().toInt()
-              //  notifyDataSetChanged()
-                 // localGradesFragment.storeExamListInSharedPreferences()
-             }
-
-             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-             }
-
-             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-             }
-         })*/
-        holder.editTextGradeCredits.setOnFocusChangeListener { v, hasFocus ->
+        holder.editTextGradeCredits.setOnFocusChangeListener { _, hasFocus ->
             if (!hasFocus) {
                 val helper = holder.editTextGradeCredits.text.toString().toInt()
                 if (exam.credits_new != helper) {
-                    Log.d("Focus test: ", "stored: " + exam.course)
                     exam.credits_new = helper;
                 }
-
             }
         }
+        holder.editTextGradeWeights.setText(exam.weight.toString())
+        holder.editTextGradeCredits.setText(exam.credits_new.toString())
+    }
+
+
+    /**
+     * Adds a ClickListener to reset one exam to the default values and adapts the UI accordingly
+     */
+    private fun initListenerResetGradeParameters(exam: Exam, holder: ViewHolder) {
+        holder.buttonResetGradeParameters.setOnClickListener(object : View.OnClickListener {
+            override fun onClick(p0: View?) {
+                exam.gradeUsedInAverage = true
+                adaptUIToCheckboxStatus(holder, exam)
+
+                exam.weight = 1.0
+                exam.credits_new = 6
+                holder.editTextGradeWeights.setText(exam.weight.toString())
+                holder.editTextGradeCredits.setText(exam.credits_new.toString())
+            }
+
+        })
+    }
 
-        holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { buttonView, isChecked ->
+    /**
+     * Initialises the state of the checkbox and adapts the ui accordingly
+     */
+    private fun initCheckBoxUsedInAverage(exam: Exam, holder: ViewHolder) {
+        holder.checkBoxUseGradeForAverage.isChecked = exam.gradeUsedInAverage
+        adaptUIToCheckboxStatus(holder, exam)
+        holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { _, isChecked ->
             exam.gradeUsedInAverage = !isChecked
-            adaptUIToCheckboxStatus(isChecked, holder, exam)
-            notifyDataSetChanged()
+            adaptUIToCheckboxStatus(holder, exam)
         }
-        holder.editTextGradeWeights.setText(exam.weight.toString())
-        holder.editTextGradeCredits.setText(exam.credits_new.toString())
     }
 
+    /**
+     * Enables/disables Edittexts, and adapts the color of the grade bar on the right side
+     */
     private fun adaptUIToCheckboxStatus(
-        gradeUsedInAverage: Boolean,
         holder: ViewHolder,
         exam: Exam
     ) {
-        if (gradeUsedInAverage) {
+        if (exam.gradeUsedInAverage) {
+            holder.editTextGradeCredits.isEnabled = true;
+            holder.editTextGradeWeights.isEnabled = true;
+            val gradeColor = exam.getGradeColor(context)
+            holder.gradeTextView.background.setTint(gradeColor)
+            holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
+        } else {
             holder.editTextGradeCredits.isEnabled = false;
             holder.editTextGradeWeights.isEnabled = false;
             holder.gradeTextView.background.setTint(
@@ -208,12 +213,6 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                     R.color.grade_default
                 )
             )
-        } else {
-            holder.editTextGradeCredits.isEnabled = true;
-            holder.editTextGradeWeights.isEnabled = true;
-            val gradeColor = exam.getGradeColor(context)
-            holder.gradeTextView.background.setTint(gradeColor)
-            holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
         }
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 05d2e54b59..7482389c2b 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -365,10 +365,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun calculateAverageGrade(exams: List<Exam>): Double {
         val numberFormat = NumberFormat.getInstance(Locale.GERMAN)
         val grades = exams
-            .filter { it.isPassed && !it.gradeUsedInAverage }
+            .filter { it.isPassed && it.gradeUsedInAverage }
             .map { numberFormat.parse(it.grade).toDouble() * it.credits_new * it.weight }
         val combinedgradefactors = exams
-            .filter { it.isPassed && !it.gradeUsedInAverage }
+            .filter { it.isPassed && it.gradeUsedInAverage }
             .map { it.credits_new.toDouble() * it.weight }
 
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index 0ab70aea05..1ee8fe1bb8 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -39,7 +39,7 @@ data class Exam(
     @PropertyElement(name = "weight")
     var weight: Double = 1.0,
     @PropertyElement(name = "gradeUsedInAverage")
-    var gradeUsedInAverage: Boolean = false,
+    var gradeUsedInAverage: Boolean = true,
     @PropertyElement(name = "subjectcredits")               //must not be "credits" -> otherwise naming collision will occur
     var credits_new: Int = 6,
     @PropertyElement(name = "examManuallyAdded")
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 6a4ef3c45d..7188f955da 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -118,7 +118,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="5"
-                        android:text="@string/hide_grade" />
+                        android:text="@string/use_grade_in_average" />
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/buttonResetGradeParameters"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5a635315ec..e6809bdd50 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -58,7 +58,7 @@
     <string name="date">Datum</string>
     <string name="no_grades">Du hast noch keine Noten, die angezeigt werden könnten.</string>
     <string name="reset_grade">Note Zurücksetzten</string>
-    <string name="hide_grade">Note ausblenden</string>
+    <string name="use_grade_in_average">Note verwenden</string>
     <string name="grade_weight_label">Gewichtung der Note:</string>
     <string name="credits_grade_label">Credits:</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 028838af62..325918b2ca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,7 +85,7 @@
     <string name="credits" translatable="false">ECTS</string>
     <string name="no_grades">You don\'t have any grades yet.</string>
     <string name="reset_grade">Reset Grade</string>
-    <string name="hide_grade">Hide Grade</string>
+    <string name="use_grade_in_average">Use Grade</string>
     <string name="grade_weight_label">Grade Weight:</string>
     <string name="credits_grade_label">Credits:</string>
 

From d337a3e5c950f8fdeabdbc0f029dbefa6dd5ce16 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 12 May 2022 15:56:41 +0200
Subject: [PATCH 23/71] persistently stored exams in shared preferences

---
 app/src/main/AndroidManifest.xml              | 60 ++++++++++---------
 .../in/tumcampusapp/api/app/DateSerializer.kt |  6 +-
 .../component/tumui/grades/ExamListAdapter.kt | 18 +++---
 .../component/tumui/grades/GradesFragment.kt  | 33 ++++------
 .../res/layout/activity_grades_listview.xml   |  1 +
 5 files changed, 57 insertions(+), 61 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d3ff5a74c6..a9c390991b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -54,7 +54,8 @@
 
         <uses-library android:name="android.test.runner" />
 
-        <receiver android:name=".service.ScanResultsAvailableReceiver"
+        <receiver
+            android:name=".service.ScanResultsAvailableReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.net.wifi.SCAN_RESULTS" />
@@ -90,8 +91,8 @@
         <activity
             android:name=".component.ui.onboarding.StartupActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
-            android:exported="true">
+            android:exported="true"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -110,8 +111,8 @@
         <activity
             android:name=".component.other.generic.activity.BaseNavigationActivity"
             android:configChanges="orientation|screenSize"
-            android:launchMode="singleTop"
-            android:exported="true">
+            android:exported="true"
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -130,7 +131,8 @@
             android:name=".component.tumui.grades.GradesActivity"
             android:label="@string/empty_string"
             android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity">
+            android:parentActivityName=".component.ui.overview.MainActivity"
+            android:windowSoftInputMode="stateHidden|adjustNothing">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".component.ui.overview.MainActivity" />
@@ -166,10 +168,10 @@
         <activity
             android:name=".component.ui.transportation.TransportationActivity"
             android:configChanges="orientation|screenSize"
+            android:exported="true"
             android:label="@string/mvv"
             android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity"
-            android:exported="true">
+            android:parentActivityName=".component.ui.overview.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -208,10 +210,10 @@
         <activity
             android:name=".component.tumui.lectures.activity.LecturesPersonalActivity"
             android:configChanges="orientation|screenSize"
+            android:exported="true"
             android:label="@string/my_lectures"
             android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity"
-            android:exported="true">
+            android:parentActivityName=".component.ui.overview.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -256,10 +258,10 @@
         <activity
             android:name=".component.tumui.person.PersonSearchActivity"
             android:configChanges="orientation|screenSize"
+            android:exported="true"
             android:label="@string/person_search"
             android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity"
-            android:exported="true">
+            android:parentActivityName=".component.ui.overview.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -283,10 +285,10 @@
         <activity
             android:name=".component.tumui.roomfinder.RoomFinderActivity"
             android:configChanges="orientation|screenSize"
+            android:exported="true"
             android:label="@string/roomfinder"
             android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity"
-            android:exported="true">
+            android:parentActivityName=".component.ui.overview.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".component.ui.overview.MainActivity" />
@@ -374,8 +376,7 @@
         <activity
             android:name=".component.tumui.calendar.CreateEventActivity"
             android:label="@string/activity_create_event_title"
-            android:parentActivityName=".component.tumui.calendar.CalendarActivity">
-        </activity>
+            android:parentActivityName=".component.tumui.calendar.CalendarActivity"></activity>
 
         <activity
             android:name=".component.ui.chat.activity.ChatRoomsActivity"
@@ -461,8 +462,8 @@
         </activity> <!-- receiver for the mensaWidget -->
         <receiver
             android:name=".component.ui.cafeteria.widget.MensaWidget"
-            android:label="@string/mensa_widget"
-            android:exported="true">
+            android:exported="true"
+            android:label="@string/mensa_widget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -477,8 +478,8 @@
             android:permission="android.permission.BIND_REMOTEVIEWS" /> <!-- receiver for the MVVWidget -->
         <receiver
             android:name=".component.ui.transportation.widget.MVVWidget"
-            android:label="@string/mvv_widget"
-            android:exported="true">
+            android:exported="true"
+            android:label="@string/mvv_widget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="de.tum.in.newtumcampus.intent.action.MVV_WIDGET_FORCE_RELOAD" />
@@ -498,10 +499,10 @@
             android:allowTaskReparenting="false"
             android:configChanges="orientation|screenSize"
             android:excludeFromRecents="true"
+            android:exported="true"
             android:label="@string/mvv_widget_select_station"
             android:launchMode="singleTop"
-            android:taskAffinity=""
-            android:exported="true">
+            android:taskAffinity="">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -516,8 +517,8 @@
         </activity> <!-- receiver for the TimetableWidget -->
         <receiver
             android:name=".component.tumui.calendar.widget.TimetableWidget"
-            android:label="@string/timetable_widget"
-            android:exported="true">
+            android:exported="true"
+            android:label="@string/timetable_widget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -536,15 +537,17 @@
             android:allowTaskReparenting="false"
             android:configChanges="orientation|screenSize"
             android:excludeFromRecents="true"
+            android:exported="true"
             android:label="@string/timetable_widget_select_lectures"
             android:launchMode="singleTop"
-            android:theme="@style/AppTheme.NoDrawerLayout"
-            android:exported="true">
+            android:theme="@style/AppTheme.NoDrawerLayout">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
         </activity> <!-- Used to restart alarm when device has been restarted -->
-        <receiver android:name=".service.StartSyncReceiver" android:exported="true">
+        <receiver
+            android:name=".service.StartSyncReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -577,7 +580,8 @@
             android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <receiver android:name=".service.GeofencingUpdateReceiver" />
-        <receiver android:name=".service.GeofencingStartupReceiver"
+        <receiver
+            android:name=".service.GeofencingStartupReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt b/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
index e363c3ee81..7bf9ae2c9b 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
@@ -17,9 +17,9 @@ class DateSerializer : JsonDeserializer<DateTime>, JsonSerializer<DateTime> {
         "dd.MM.yy",
         "dd.MM.yyyy",
         "yyyy.MM.dd",
-        "dd.MM.yy",
-        "dd.MM.yyyy",
-        "yyyy.MM.dd",
+        "dd-MM-yy",
+        "dd-MM-yyyy",
+        "yyyy-MM-dd",
         "yyyy-MM-dd HH:mm:ss",
         "yyyy-MM-dd'T'HH:mm:ss'Z'"
     )
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 0fb1adfaf6..ac7c1a96c4 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -1,11 +1,7 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Log
 import android.view.View
-import android.view.View.OnFocusChangeListener
 import android.view.ViewGroup
 import android.widget.*
 import androidx.appcompat.app.AlertDialog
@@ -53,8 +49,8 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.nameTextView.text = exam.course
         holder.gradeTextView.text = exam.grade
 
-        val gradeColor = exam.getGradeColor(context)
-        holder.gradeTextView.background.setTint(gradeColor)
+
+        adaptUIToCheckboxStatus(holder,exam)
 
         val date: String = if (exam.date == null) {
             context.getString(R.string.not_specified)
@@ -79,6 +75,8 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         if (localGradesFragment.getGlobalEdit()) {
             holder.editGradesContainer.visibility = View.GONE
             holder.gradeTextViewDeleteCustomGrade.visibility = View.GONE
+
+            //todo init für den chackbox status
         } else {
             holder.editGradesContainer.visibility = View.VISIBLE
 
@@ -96,7 +94,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
     private fun initListenerDeleteCustomGrade(exam: Exam, holder: ViewHolder) {
         if (exam.manuallyAdded) {
             holder.gradeTextViewDeleteCustomGrade.visibility = View.VISIBLE
-            adaptUIToCheckboxStatus(holder, exam)
+           // adaptUIToCheckboxStatus(holder, exam)
 
             holder.gradeTextViewDeleteCustomGrade.setOnClickListener {
                 val dialog = AlertDialog.Builder(localGradesFragment.requireContext())
@@ -138,6 +136,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 val helper = holder.editTextGradeWeights.text.toString().toDouble()
                 if (exam.weight != helper) {
                     exam.weight = helper;
+                    localGradesFragment.storeExamListInSharedPreferences()
                 }
             }
         }
@@ -147,6 +146,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 val helper = holder.editTextGradeCredits.text.toString().toInt()
                 if (exam.credits_new != helper) {
                     exam.credits_new = helper;
+                    localGradesFragment.storeExamListInSharedPreferences()
                 }
             }
         }
@@ -168,6 +168,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 exam.credits_new = 6
                 holder.editTextGradeWeights.setText(exam.weight.toString())
                 holder.editTextGradeCredits.setText(exam.credits_new.toString())
+                localGradesFragment.storeExamListInSharedPreferences()
             }
 
         })
@@ -180,8 +181,9 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.checkBoxUseGradeForAverage.isChecked = exam.gradeUsedInAverage
         adaptUIToCheckboxStatus(holder, exam)
         holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { _, isChecked ->
-            exam.gradeUsedInAverage = !isChecked
+            exam.gradeUsedInAverage = isChecked
             adaptUIToCheckboxStatus(holder, exam)
+            localGradesFragment.storeExamListInSharedPreferences()
         }
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 7482389c2b..6167e0b075 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -59,7 +59,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     private var showBarChartAfterRotate = false
 
-    private var globalEditOn = false
+    private var globalEditOFF = true
     private val exams = mutableListOf<Exam>()
 
     private val examSharedPreferences: String = "ExamList"
@@ -150,11 +150,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     private fun changeNumberOfExams() {
-        //(binding.gradesListView.adapter as ExamListAdapter).
-        //(binding.gradesListView.adapter as ExamListAdapter).itemList=exams
-        //(binding.gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
-
-
         binding.gradesListView.adapter = ExamListAdapter(requireContext(), exams, this)
         storeExamListInSharedPreferences()
     }
@@ -165,8 +160,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
         val examsTitles = exams.map { it.course }
         examsDownloaded.removeAll { examsTitles.contains(it.course) }
-        //  exams.clear()
-        //  storeExamListInSharedPreferences()
+       //  exams.clear()
+       //   storeExamListInSharedPreferences()
 
 
         if (!examsDownloaded.isEmpty()) {
@@ -176,7 +171,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         }
     }
 
-    fun loadExamListFromSharedPreferences() {
+    private fun loadExamListFromSharedPreferences() {
         try {
             val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
             val dateTimeConverter = DateTimeConverter()
@@ -195,10 +190,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         // Exam list could no be loaded - will always e a list, some error occurred - clear to prevent any intermediate error states
     }
 
-    private fun storeExamListInSharedPreferences() {
-
+    fun storeExamListInSharedPreferences() {
         scope.launch { storeExamListInSharedPreferencesThread() }
-
     }
 
     private fun storeExamListInSharedPreferencesThread() {
@@ -244,18 +237,14 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     }
 
+
+    //todo replace in the final version - can be done with exisiting data
     fun storeGradedCourses(exams: List<Exam>) {
         val gradesStore = GradesStore(defaultSharedPreferences)
         val courses = exams.map { it.course }
         gradesStore.store(courses)
     }
 
-    override fun onPause() {
-
-        storeExamListInSharedPreferences()
-        super.onPause()
-    }
-
 
     /**
      * Displays the pie chart and its data set with the provided grade distribution.
@@ -566,7 +555,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                         "",
                         semester,
                         weight,
-                        false,
+                        true,
                         credits,
                         true
                     )
@@ -682,13 +671,13 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun changeEditMode() {
         with(binding) {
-            globalEditOn = !globalEditOn
+            globalEditOFF = !globalEditOFF
             initUIVisibility()
         }
     }
 
     private fun initUIVisibility() {
-        if (!globalEditOn) {
+        if (!globalEditOFF) {
             frameLayoutAverageGrade?.visibility = View.GONE
             floatingbuttonAddExamGrade?.visibility = View.VISIBLE
         } else {
@@ -755,7 +744,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     fun getGlobalEdit(): Boolean {
-        return globalEditOn
+        return globalEditOFF
     }
 
 
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 7188f955da..b7004d0b13 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -149,6 +149,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginBottom="8dp"
                 android:background="@drawable/grade_background"
+                android:backgroundTint="@color/grade_default"
                 android:gravity="center"
                 android:padding="@dimen/material_default_padding"
                 android:src="@drawable/ic_clear"

From 1e0ef3f0e7d1279d581c527cae2e0be2ab88a444 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 12 May 2022 21:11:48 +0200
Subject: [PATCH 24/71] extracted string resources

---
 .../component/tumui/grades/ExamListAdapter.kt |   4 +-
 .../component/tumui/grades/GradesFragment.kt  |   8 +-
 .../main/res/layout-land/activity_grades.xml  |  97 -------
 .../main/res/layout-land/fragment_grades.xml  |   2 +-
 .../res/layout/activity_grades_listview.xml   | 271 +++++++++---------
 .../res/layout/dialog_add_grade_input.xml     | 267 ++++++++---------
 app/src/main/res/layout/fragment_grades.xml   |  31 +-
 app/src/main/res/values-de/strings.xml        |  18 +-
 app/src/main/res/values/strings.xml           |  17 +-
 9 files changed, 318 insertions(+), 397 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index ac7c1a96c4..cd4a61f6d8 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -75,8 +75,6 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         if (localGradesFragment.getGlobalEdit()) {
             holder.editGradesContainer.visibility = View.GONE
             holder.gradeTextViewDeleteCustomGrade.visibility = View.GONE
-
-            //todo init für den chackbox status
         } else {
             holder.editGradesContainer.visibility = View.VISIBLE
 
@@ -240,7 +238,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         var additionalInfoTextView: TextView = itemView.findViewById(R.id.additionalInfoTextView)
 
         var editTextGradeWeights: EditText = itemView.findViewById(R.id.editTextGradeWeight)
-        var editTextGradeCredits: EditText = itemView.findViewById(R.id.editTextCreditsofSubject)
+        var editTextGradeCredits: EditText = itemView.findViewById(R.id.editTextCreditsOfSubject)
         var editGradesContainer: LinearLayout = itemView.findViewById(R.id.editGradesContainer)
         var checkBoxUseGradeForAverage: CheckBox =
             itemView.findViewById(R.id.checkBoxUseGradeForAverage)
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 6167e0b075..2ab91c5805 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -165,7 +165,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
 
         if (!examsDownloaded.isEmpty()) {
-            examsDownloaded.forEach { it.credits_new = 6; it.weight = 1.0; }
+            examsDownloaded.forEach { it.credits_new = 6; it.weight = 1.0; it.gradeUsedInAverage=true}
             exams.addAll(examsDownloaded)
             storeExamListInSharedPreferences()
         }
@@ -415,7 +415,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 visibility = View.VISIBLE
             }
         }
-        binding.floatingbuttonAddExamGrade.setOnClickListener({ openAddGradeDialog() })
+        binding.floatingButtonAddExamGrade.setOnClickListener({ openAddGradeDialog() })
 
 
         binding.filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@@ -679,12 +679,12 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun initUIVisibility() {
         if (!globalEditOFF) {
             frameLayoutAverageGrade?.visibility = View.GONE
-            floatingbuttonAddExamGrade?.visibility = View.VISIBLE
+            floatingButtonAddExamGrade?.visibility = View.VISIBLE
         } else {
             storeExamListInSharedPreferences()
             showExams(exams)
             frameLayoutAverageGrade?.visibility = View.VISIBLE
-            floatingbuttonAddExamGrade?.visibility = View.GONE
+            floatingButtonAddExamGrade?.visibility = View.GONE
         }
     }
 
diff --git a/app/src/main/res/layout-land/activity_grades.xml b/app/src/main/res/layout-land/activity_grades.xml
index cb25ad3676..4d8189404e 100644
--- a/app/src/main/res/layout-land/activity_grades.xml
+++ b/app/src/main/res/layout-land/activity_grades.xml
@@ -1,6 +1,5 @@
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -39,102 +38,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <!--<include
-            layout="@layout/layout_all_errors"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-            <FrameLayout
-                android:id="@+id/chartsContainer"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_margin="@dimen/padding_default">
-
-                <com.github.mikephil.charting.charts.PieChart
-                    android:id="@+id/pieChartView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="visible" />
-
-                <com.github.mikephil.charting.charts.BarChart
-                    android:id="@+id/barChartView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone" />
-
-            </FrameLayout>
-
-            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-                android:id="@+id/swipeRefreshLayout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone">
-
-                <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-                    android:id="@+id/gradesListView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scrollbars="vertical" />
-
-            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-        </FrameLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/averageGradeTextView"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="@dimen/material_small_padding"
-                android:layout_weight="1"
-                android:textSize="@dimen/semilarge_text_size"
-                android:visibility="visible"
-                tools:text="1.0" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/showListButton"
-                style="@style/Widget.MaterialComponents.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_margin="@dimen/material_tiny_padding"
-                android:drawableStart="@drawable/ic_list_bulleted"
-                android:drawablePadding="@dimen/material_small_padding"
-                android:gravity="center"
-                android:onClick="toggleInLandscape"
-                android:text="@string/show_list"
-                android:textColor="@android:color/white"
-                app:backgroundTint="@color/color_primary"
-                app:cornerRadius="@dimen/material_corner_radius" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/showChartButton"
-                style="@style/Widget.MaterialComponents.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_margin="@dimen/material_tiny_padding"
-                android:drawableStart="@drawable/ic_pie_chart"
-                android:drawablePadding="@dimen/material_small_padding"
-                android:gravity="center"
-                android:onClick="toggleInLandscape"
-                android:text="@string/show_chart"
-                android:textColor="@android:color/white"
-                android:visibility="gone"
-                app:backgroundTint="@color/color_primary"
-                app:cornerRadius="@dimen/material_corner_radius" />
-
-        </LinearLayout>-->
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout-land/fragment_grades.xml b/app/src/main/res/layout-land/fragment_grades.xml
index 8c44a3e516..f399815c07 100644
--- a/app/src/main/res/layout-land/fragment_grades.xml
+++ b/app/src/main/res/layout-land/fragment_grades.xml
@@ -8,7 +8,7 @@
     android:orientation="vertical">
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/floatingbuttonAddExamGrade"
+        android:id="@+id/floatingButtonAddExamGrade"
         style="@style/BlueButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index b7004d0b13..f41762e4f2 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -1,176 +1,169 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:layout_marginBottom="@dimen/material_default_padding"
     android:background="@color/default_window_background"
-    android:orientation="vertical"
+    android:baselineAligned="false"
+    android:orientation="horizontal"
     android:paddingStart="@dimen/material_default_padding"
     android:paddingTop="@dimen/material_small_padding"
     android:paddingEnd="@dimen/material_default_padding"
-
     android:paddingBottom="@dimen/material_small_padding">
 
-
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+
+        <TextView
+            android:id="@+id/courseNameTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@color/color_primary"
+            android:textSize="@dimen/large_text_size"
+            android:textStyle="bold"
+            tools:text="@string/course_name" />
+
+        <TextView
+            android:id="@+id/examDateTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            tools:text="@string/text_view_examination_date_label" />
+
+        <TextView
+            android:id="@+id/additionalInfoTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            tools:text="@string/examiner" />
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:id="@+id/editGradesContainer"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:orientation="vertical">
 
 
-            <TextView
-                android:id="@+id/courseNameTextView"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/color_primary"
-                android:textSize="@dimen/large_text_size"
-                android:textStyle="bold"
-                tools:text="Course name" />
+                android:orientation="horizontal"
+                android:weightSum="10">
 
-            <TextView
-                android:id="@+id/examDateTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="visible"
-                tools:text="Exam date" />
+                <TextView
+                    android:id="@+id/textViewCreditsOfSubject"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5"
+                    android:labelFor="@+id/editTextCreditsOfSubject"
+                    android:text="@string/credits" />
 
-            <TextView
-                android:id="@+id/additionalInfoTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="visible"
-                tools:text="Examiner" />
+                <EditText
+                    android:id="@+id/editTextCreditsOfSubject"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5"
+                    android:autofillHints="@string/default_credits"
+                    android:ems="10"
+                    android:inputType="numberSigned" />
+
+
+            </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/editGradesContainer"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
-
+                android:orientation="horizontal"
+                android:weightSum="10">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <TextView
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:weightSum="10">
-
-                    <TextView
-                        android:id="@+id/textViewCreditsosSubject"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="5"
-                        android:labelFor="@+id/editTextCreditsofSubject"
-                        android:text="@string/credits_grade_label" />
-
-                    <EditText
-                        android:id="@+id/editTextCreditsofSubject"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="5"
-                        android:autofillHints="8"
-                        android:ems="10"
-                        android:inputType="numberSigned" />
-
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:weightSum="10">
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="5"
-                        android:labelFor="@+id/editTextGradeWeight"
-                        android:text="@string/grade_weight_label" />
-
-                    <EditText
-                        android:id="@+id/editTextGradeWeight"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="5"
-                        android:autofillHints="1.0"
-                        android:ems="10"
-                        android:inputType="numberDecimal" />
-
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                    android:layout_weight="5"
+                    android:labelFor="@+id/editTextGradeWeight"
+                    android:text="@string/grade_weight_label" />
+
+                <EditText
+                    android:id="@+id/editTextGradeWeight"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:weightSum="10">
-
-                    <CheckBox
-                        android:id="@+id/checkBoxUseGradeForAverage"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="5"
-                        android:text="@string/use_grade_in_average" />
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/buttonResetGradeParameters"
-                        style="@style/BlueButton"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="5"
-                        android:text="@string/reset_grade"
-                        android:textAllCaps="false"
-                        app:cornerRadius="@dimen/material_corner_radius" />
-
-
-                </LinearLayout>
+                    android:layout_weight="5"
+                    android:autofillHints="@string/default_grade"
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+
+
             </LinearLayout>
 
-        </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:weightSum="10">
+
+                <CheckBox
+                    android:id="@+id/checkBoxUseGradeForAverage"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5"
+                    android:text="@string/use_grade_in_average" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/buttonResetGradeParameters"
+                    style="@style/BlueButton"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="5"
+                    android:text="@string/reset_grade"
+                    android:textAllCaps="false"
+                    app:cornerRadius="@dimen/material_corner_radius" />
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
 
-            <ImageView
-                android:id="@+id/gradeTextViewDeleteCustomGrade"
-                android:layout_width="wrap_content"
-                android:layout_height="64dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="10dp"
-                android:layout_marginBottom="8dp"
-                android:background="@drawable/grade_background"
-                android:backgroundTint="@color/grade_default"
-                android:gravity="center"
-                android:padding="@dimen/material_default_padding"
-                android:src="@drawable/ic_clear"
-                android:visibility="gone"
-                app:tint="@android:color/white" />
-
-            <TextView
-                android:id="@+id/gradeTextView"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/grade_background"
-                android:gravity="center_horizontal"
-                android:padding="@dimen/material_default_padding"
-                android:textColor="@color/white"
-                android:textSize="22sp"
-                android:textStyle="bold"
-                tools:text="1,0" />
+            </LinearLayout>
         </LinearLayout>
+
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-</LinearLayout>
\ No newline at end of file
+        <ImageView
+            android:id="@+id/gradeTextViewDeleteCustomGrade"
+            android:layout_width="wrap_content"
+            android:layout_height="64dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="10dp"
+            android:layout_marginBottom="8dp"
+            android:background="@drawable/grade_background"
+            android:backgroundTint="@color/grade_default"
+            android:gravity="center"
+            android:padding="@dimen/material_default_padding"
+            android:src="@drawable/ic_clear"
+            android:visibility="gone"
+            app:tint="@android:color/white" />
+
+        <TextView
+            android:id="@+id/gradeTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="10dp"
+            android:background="@drawable/grade_background"
+            android:gravity="center_horizontal"
+            android:padding="@dimen/material_default_padding"
+            android:textColor="@color/white"
+            android:textSize="22sp"
+            android:textStyle="bold"
+            tools:text="@string/default_grade" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 7ff4741a31..5a07ad47e1 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -1,140 +1,145 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="256dp"
+    android:padding="@dimen/material_large_padding">
+
 
-    <ScrollView
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="256dp"
-        android:padding="@dimen/material_large_padding">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextaddGradeCourseName"
+            android:text="@string/course_name" />
+
+        <EditText
+            android:id="@+id/editTextaddGradeCourseName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/course_name"
+            android:imeOptions="actionGo"
+            android:importantForAutofill="no"
+            android:inputType="textCapWords|textAutoComplete"
+            android:text="@string/thesis"
+            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextAddGrade"
+            android:text="@string/text_view_grade_label" />
 
+        <EditText
+            android:id="@+id/editTextAddGrade"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="1.0"
+            android:ems="10"
+            android:hint="@string/default_grade"
+            android:imeOptions="actionGo"
+            android:importantForAutofill="no"
+            android:inputType="numberDecimal"
+            android:text="@string/default_grade" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextaddGradeExaminer"
+            android:text="@string/text_view_examiner_name" />
+
+        <EditText
+            android:id="@+id/editTextaddGradeExaminer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/text_view_examiner_name"
+            android:imeOptions="actionGo"
+            android:importantForAutofill="no"
+            android:inputType="textCapWords|textAutoComplete"
+            android:text="@string/unknown"
+            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextaddGradeCredits"
+            android:text="@string/text_view_credits_label" />
 
-        <LinearLayout
+        <EditText
+            android:id="@+id/editTextaddGradeCredits"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/material_default_padding"
-                android:labelFor="@+id/editTextaddGradeCourseName"
-                android:text="Course name" />
-
-            <EditText
-                android:id="@+id/editTextaddGradeCourseName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="Course Name"
-                android:text="Thesis"
-                android:imeOptions="actionGo"
-                android:inputType="textCapWords|textAutoComplete"
-                android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/material_default_padding"
-                android:labelFor="@+id/editTextAddGrade"
-                android:text="Grade (0 for passed)" />
-
-            <EditText
-                android:id="@+id/editTextAddGrade"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:autofillHints="1.0"
-                android:ems="10"
-                android:hint="1,0"
-                android:text="1,0"
-                android:imeOptions="actionGo"
-                android:inputType="numberDecimal" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/material_default_padding"
-                android:labelFor="@+id/editTextaddGradeExaminer"
-                android:text="Examiner" />
-
-            <EditText
-                android:id="@+id/editTextaddGradeExaminer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="Examiner name"
-                android:text="@string/unknown"
-                android:imeOptions="actionGo"
-                android:inputType="textCapWords|textAutoComplete"
-                android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/material_default_padding"
-                android:labelFor="@+id/editTextaddGradeCredits"
-                android:text="Credits" />
-
-            <EditText
-                android:id="@+id/editTextaddGradeCredits"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="Credits"
-                android:imeOptions="actionGo"
-                android:inputType="numberSigned"
-                android:text="6"
-                android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
-
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/material_default_padding"
-                android:labelFor="@+id/editTextAddGradeWeight"
-                android:text="Grade weight" />
-
-            <EditText
-                android:id="@+id/editTextAddGradeWeight"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:autofillHints="1.0"
-                android:ems="10"
-                android:hint="Grade Weight"
-                android:imeOptions="actionGo"
-                android:inputType="numberDecimal"
-                android:text="1.0" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/material_default_padding"
-                android:labelFor="@+id/editTextAddGradeDate"
-                android:text="Examination Date" />
-
-            <EditText
-                android:id="@+id/editTextAddGradeDate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:inputType="date"
-                android:hint="dd.mm.yy"
-                android:text="01.01.22"/>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/material_default_padding"
-                android:labelFor="@+id/editTextSemester"
-                android:text="Year of the start of the semester (e.g. 22WS or 21SoSe)" />
-
-            <EditText
-                android:id="@+id/editTextSemester"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="22WS"
-                android:text="22WS"/>
-
-
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>
\ No newline at end of file
+            android:hint="@string/text_view_credits_label"
+            android:imeOptions="actionGo"
+            android:importantForAutofill="no"
+            android:inputType="numberSigned"
+            android:text="@string/default_credits"
+            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextAddGradeWeight"
+            android:text="@string/text_view_grade_weight" />
+
+        <EditText
+            android:id="@+id/editTextAddGradeWeight"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="1.0"
+            android:ems="10"
+            android:hint="@string/text_view_grade_weight"
+            android:imeOptions="actionGo"
+            android:importantForAutofill="no"
+            android:inputType="numberDecimal"
+            android:text="@string/default_grade_weight" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextAddGradeDate"
+            android:text="@string/text_view_examination_date_label" />
+
+        <EditText
+            android:id="@+id/editTextAddGradeDate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:hint="@string/grade_date_format"
+            android:importantForAutofill="no"
+            android:inputType="date"
+            android:text="@string/grade_date_default" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextSemester"
+            android:text="@string/text_view_semester_label" />
+
+        <EditText
+            android:id="@+id/editTextSemester"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:hint="@string/grade_semester_default"
+            android:importantForAutofill="no"
+            android:inputType="text"
+            android:text="@string/grade_semester_default" />
+
+
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index a62b23818c..4f2e13e065 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/gradesLayout"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent">
+    android:id="@+id/gradesLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/floatingbuttonAddExamGrade"
+        android:id="@+id/floatingButtonAddExamGrade"
         style="@style/BlueButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -20,11 +20,10 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
-
-        app:tint="@android:color/white"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="1.0"
-        app:srcCompat="@drawable/ic_add" />
+        app:srcCompat="@drawable/ic_add"
+        app:tint="@android:color/white" />
 
     <LinearLayout
 
@@ -109,18 +108,16 @@
 
         </FrameLayout>
 
-        <FrameLayout
+        <LinearLayout
             android:id="@+id/frameLayoutAverageGrade"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/pop_up_background"
+            android:padding="@dimen/material_default_padding"
             android:visibility="gone"
-            android:padding="@dimen/material_default_padding">
+            android:orientation="vertical">
+
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/averageGradeTextView"
@@ -139,9 +136,9 @@
                     android:text="@string/average_grade_hint"
                     android:textColor="@color/text_light_blue"
                     android:visibility="visible" />
-            </LinearLayout>
 
-        </FrameLayout>
+
+        </LinearLayout>
 
 
     </LinearLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e6809bdd50..bdfe4d1b25 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -57,10 +57,23 @@
     <string name="all_programs">Alle Noten</string>
     <string name="date">Datum</string>
     <string name="no_grades">Du hast noch keine Noten, die angezeigt werden könnten.</string>
-    <string name="reset_grade">Note Zurücksetzten</string>
+    <string name="reset_grade">Note zurücksetzten</string>
     <string name="use_grade_in_average">Note verwenden</string>
     <string name="grade_weight_label">Gewichtung der Note:</string>
-    <string name="credits_grade_label">Credits:</string>
+    <string name="course_name">Course name</string>
+    <string name="thesis">Bachelor Arbeit</string>
+    <string name="text_view_grade_label">Grade (0 für bestanden)</string>
+    <string name="default_grade">1,0</string>
+    <string name="text_view_examiner_name">Name des Prüfers</string>
+    <string name="text_view_credits_label">Credits</string>
+    <string name="default_credits">6</string>
+    <string name="text_view_grade_weight">Notengewichtung</string>
+    <string name="default_grade_weight">1.0</string>
+    <string name="text_view_examination_date_label">Datum der Prüfung</string>
+    <string name="grade_date_format">dd.mm.jj</string>
+    <string name="grade_date_default">01.01.22</string>
+    <string name="text_view_semester_label">Jahr in dem das Semester startet (z.B. 22WS or 21SoSe)</string>
+    <string name="grade_semester_default">22WS</string>
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Kennung</string>
@@ -722,4 +735,5 @@ Signatur: %5$s</string>
     // for opening hours
     <string name="language">de</string>
     <string name="use_existing">Bestehendes verwenden</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 325918b2ca..7f3bece807 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -87,7 +87,20 @@
     <string name="reset_grade">Reset Grade</string>
     <string name="use_grade_in_average">Use Grade</string>
     <string name="grade_weight_label">Grade Weight:</string>
-    <string name="credits_grade_label">Credits:</string>
+    <string name="course_name">Course name</string>
+    <string name="thesis">Thesis</string>
+    <string name="text_view_grade_label">Grade (0 for passed)</string>
+    <string name="default_grade">1,0</string>
+    <string name="text_view_examiner_name">Examiner Name</string>
+    <string name="text_view_credits_label">Credits</string>
+    <string name="default_credits">6</string>
+    <string name="text_view_grade_weight">Grade weight</string>
+    <string name="default_grade_weight">1.0</string>
+    <string name="text_view_examination_date_label">Examination Date</string>
+    <string name="grade_date_format">dd.mm.yy</string>
+    <string name="grade_date_default">01.01.22</string>
+    <string name="text_view_semester_label">Year of the start of the semester (e.g. 22WS or 21SuSe)</string>
+    <string name="grade_semester_default">22WS</string>
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Identification</string>
@@ -775,6 +788,4 @@ Signature: %5$s</string>
     <string name="language">en</string>
     <string name="use_existing">Use existing</string>
 
-
-
 </resources>

From 0464fe537170380110de863e983c94854eb575c8 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 12 May 2022 21:16:58 +0200
Subject: [PATCH 25/71] linted small warnings

---
 .../component/tumui/grades/ExamListAdapter.kt | 22 +++++++++----------
 .../tumui/grades/GradesBackgroundUpdater.kt   |  1 -
 .../component/tumui/grades/GradesFragment.kt  |  8 ++++---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index cd4a61f6d8..6d1e0d1d63 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -108,14 +108,14 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                     .create()
                     .apply {
                         window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
-                    };
+                    }
                 dialog.show()
                 dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(
-                    localGradesFragment.getResources().getColor(R.color.text_primary)
-                );
+                    localGradesFragment.resources.getColor(R.color.text_primary)
+                )
                 dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(
-                    localGradesFragment.getResources().getColor(R.color.text_primary)
-                );
+                    localGradesFragment.resources.getColor(R.color.text_primary)
+                )
             }
         } else {
             holder.gradeTextViewDeleteCustomGrade.visibility = View.GONE
@@ -133,7 +133,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             if (!hasFocus) {
                 val helper = holder.editTextGradeWeights.text.toString().toDouble()
                 if (exam.weight != helper) {
-                    exam.weight = helper;
+                    exam.weight = helper
                     localGradesFragment.storeExamListInSharedPreferences()
                 }
             }
@@ -143,7 +143,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             if (!hasFocus) {
                 val helper = holder.editTextGradeCredits.text.toString().toInt()
                 if (exam.credits_new != helper) {
-                    exam.credits_new = helper;
+                    exam.credits_new = helper
                     localGradesFragment.storeExamListInSharedPreferences()
                 }
             }
@@ -193,14 +193,14 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         exam: Exam
     ) {
         if (exam.gradeUsedInAverage) {
-            holder.editTextGradeCredits.isEnabled = true;
-            holder.editTextGradeWeights.isEnabled = true;
+            holder.editTextGradeCredits.isEnabled = true
+            holder.editTextGradeWeights.isEnabled = true
             val gradeColor = exam.getGradeColor(context)
             holder.gradeTextView.background.setTint(gradeColor)
             holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
         } else {
-            holder.editTextGradeCredits.isEnabled = false;
-            holder.editTextGradeWeights.isEnabled = false;
+            holder.editTextGradeCredits.isEnabled = false
+            holder.editTextGradeWeights.isEnabled = false
             holder.gradeTextView.background.setTint(
                 ContextCompat.getColor(
                     context,
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt
index 348b84f39e..e271bf5400 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt
@@ -1,7 +1,6 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
-import android.util.Log
 import de.tum.`in`.tumcampusapp.api.tumonline.CacheControl
 import de.tum.`in`.tumcampusapp.api.tumonline.TUMOnlineClient
 import de.tum.`in`.tumcampusapp.component.notifications.NotificationScheduler
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 2ab91c5805..6042a081ca 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -34,6 +34,7 @@ import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
 import kotlinx.android.synthetic.main.fragment_grades.*
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ObsoleteCoroutinesApi
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.newSingleThreadContext
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
@@ -63,6 +64,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private val exams = mutableListOf<Exam>()
 
     private val examSharedPreferences: String = "ExamList"
+
     private val scope = CoroutineScope(newSingleThreadContext("storetopreferences"))
 
 
@@ -355,7 +357,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         val numberFormat = NumberFormat.getInstance(Locale.GERMAN)
         val grades = exams
             .filter { it.isPassed && it.gradeUsedInAverage }
-            .map { numberFormat.parse(it.grade).toDouble() * it.credits_new * it.weight }
+            .map { (numberFormat.parse(it.grade.toString())?.toDouble() ?: 1.0) * it.credits_new * it.weight }
         val combinedgradefactors = exams
             .filter { it.isPassed && it.gradeUsedInAverage }
             .map { it.credits_new.toDouble() * it.weight }
@@ -364,7 +366,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         val gradeSum = grades.sum()
         val factorSum = combinedgradefactors.sum()
         if (factorSum<=0){
-            return 0.0;
+            return 0.0
         }
         return gradeSum / factorSum.toDouble()
     }
@@ -415,7 +417,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 visibility = View.VISIBLE
             }
         }
-        binding.floatingButtonAddExamGrade.setOnClickListener({ openAddGradeDialog() })
+        binding.floatingButtonAddExamGrade.setOnClickListener { openAddGradeDialog() }
 
 
         binding.filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {

From c775f3bb293daf13df4ea0659671b0aed5021c0e Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Sun, 15 May 2022 10:31:09 +0200
Subject: [PATCH 26/71] fixed styling issue with the add grade dialog, added
 option for weighted grades in the diagrams.

---
 .../component/tumui/grades/GradesFragment.kt  | 294 ++++++++++--------
 .../grades/GradesNotificationProvider.kt      |   4 +-
 .../main/res/layout-land/fragment_grades.xml  |  12 +
 .../res/layout/dialog_add_grade_input.xml     |  31 +-
 app/src/main/res/layout/fragment_grades.xml   |  18 +-
 app/src/main/res/values-de/strings.xml        |   2 +-
 6 files changed, 223 insertions(+), 138 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 6042a081ca..e5162f4a1a 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -32,9 +32,9 @@ import de.tum.`in`.tumcampusapp.component.tumui.grades.model.ExamList
 import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
+import kotlinx.android.synthetic.main.dialog_add_grade_input.*
 import kotlinx.android.synthetic.main.fragment_grades.*
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ObsoleteCoroutinesApi
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.newSingleThreadContext
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
@@ -61,6 +61,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private var showBarChartAfterRotate = false
 
     private var globalEditOFF = true
+    private var adaptDiagramToWeights = true;
     private val exams = mutableListOf<Exam>()
 
     private val examSharedPreferences: String = "ExamList"
@@ -162,12 +163,14 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
         val examsTitles = exams.map { it.course }
         examsDownloaded.removeAll { examsTitles.contains(it.course) }
-       //  exams.clear()
-       //   storeExamListInSharedPreferences()
+        //  exams.clear()
+        //   storeExamListInSharedPreferences()
 
 
         if (!examsDownloaded.isEmpty()) {
-            examsDownloaded.forEach { it.credits_new = 6; it.weight = 1.0; it.gradeUsedInAverage=true}
+            examsDownloaded.forEach {
+                it.credits_new = 6; it.weight = 1.0; it.gradeUsedInAverage = true
+            }
             exams.addAll(examsDownloaded)
             storeExamListInSharedPreferences()
         }
@@ -259,11 +262,17 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             PieEntry(count.toFloat(), grade)
         }
 
-        val set = PieDataSet(entries, getString(R.string.grades_without_weight)).apply {
+
+        var annotation = ""
+        if (!adaptDiagramToWeights) {
+            annotation = getString(R.string.grades_without_weight)
+        }
+        val set = PieDataSet(entries, annotation).apply {
             setColors(GRADE_COLORS, requireContext())
             setDrawValues(false)
         }
 
+
         with(binding) {
             pieChartView.apply {
                 data = PieData(set)
@@ -297,7 +306,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             BarEntry(index.toFloat(), value.toFloat())
         }
 
-        val set = BarDataSet(entries, getString(R.string.grades_without_weight)).apply {
+        var annotation = ""
+        if (!adaptDiagramToWeights) {
+            annotation = getString(R.string.grades_without_weight)
+        }
+        val set = BarDataSet(entries, annotation).apply {
             setColors(GRADE_COLORS, requireContext())
             valueTextColor = resources.getColor(R.color.text_primary)
         }
@@ -357,7 +370,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         val numberFormat = NumberFormat.getInstance(Locale.GERMAN)
         val grades = exams
             .filter { it.isPassed && it.gradeUsedInAverage }
-            .map { (numberFormat.parse(it.grade.toString())?.toDouble() ?: 1.0) * it.credits_new * it.weight }
+            .map {
+                (numberFormat.parse(it.grade.toString())?.toDouble()
+                    ?: 1.0) * it.credits_new * it.weight
+            }
         val combinedgradefactors = exams
             .filter { it.isPassed && it.gradeUsedInAverage }
             .map { it.credits_new.toDouble() * it.weight }
@@ -365,7 +381,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
         val gradeSum = grades.sum()
         val factorSum = combinedgradefactors.sum()
-        if (factorSum<=0){
+        if (factorSum <= 0) {
             return 0.0
         }
         return gradeSum / factorSum.toDouble()
@@ -381,12 +397,20 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         val gradeDistribution = ArrayMap<String, Int>()
         exams.forEach { exam ->
             // The grade distribution now takes grades with more than one decimal place into account as well
-            var cleanGrade = exam.grade!!
-            if (cleanGrade.contains(longGradeRe)) {
-                cleanGrade = cleanGrade.subSequence(0, 3) as String
+            if (exam.gradeUsedInAverage) {
+                var cleanGrade = exam.grade!!
+                if (cleanGrade.contains(longGradeRe)) {
+                    cleanGrade = cleanGrade.subSequence(0, 3) as String
+                }
+                val count = gradeDistribution[cleanGrade] ?: 0
+
+                if (adaptDiagramToWeights) {
+                    gradeDistribution[cleanGrade] = count + (exam.credits_new * exam.weight).toInt()
+                } else {
+                    gradeDistribution[cleanGrade] = count + 1
+                }
             }
-            val count = gradeDistribution[cleanGrade] ?: 0
-            gradeDistribution[cleanGrade] = count + 1
+
         }
         return gradeDistribution
     }
@@ -418,30 +442,34 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             }
         }
         binding.floatingButtonAddExamGrade.setOnClickListener { openAddGradeDialog() }
+        checkboxUseDiagrams.setOnCheckedChangeListener() { _, isChecked ->
+            adaptDiagramToWeights = isChecked;
+        }
 
+        binding.filterSpinner.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    parent: AdapterView<*>,
+                    view: View?,
+                    position: Int,
+                    id: Long
+                ) {
+                    val filter = filters[position]
+                    spinnerPosition = position
 
-        binding.filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(
-                parent: AdapterView<*>,
-                view: View?,
-                position: Int,
-                id: Long
-            ) {
-                val filter = filters[position]
-                spinnerPosition = position
+                    val examsToShow = when (position) {
+                        0 -> exams
+                        else -> exams.filter { filter.contains(it.programID) }
+                    }
 
-                val examsToShow = when (position) {
-                    0 -> exams
-                    else -> exams.filter { filter.contains(it.programID) }
+                    showExams(examsToShow)
                 }
 
-                showExams(examsToShow)
+                override fun onNothingSelected(parent: AdapterView<*>) = Unit
             }
-
-            override fun onNothingSelected(parent: AdapterView<*>) = Unit
-        }
     }
 
+
     /**
      * Prompt the user to type in a name for the new chat room
      */
@@ -457,124 +485,114 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                         "Manually added Exams can be deleted later on."
             )
             .setView(view)
-            .setPositiveButton(R.string.create, null)
-            .setNegativeButton(android.R.string.cancel, null)
             .create()
             .apply {
                 window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
             }
 
-        dialog.setOnShowListener {
-            val button: Button =
-                dialog.getButton(AlertDialog.BUTTON_POSITIVE)
-            button.setOnClickListener {
-
-                val titleView = view.findViewById<EditText>(R.id.editTextaddGradeCourseName)
-                val gradeView = view.findViewById<EditText>(R.id.editTextAddGrade)
-                val examinerView = view.findViewById<EditText>(R.id.editTextaddGradeExaminer)
-                val weightView = view.findViewById<EditText>(R.id.editTextAddGradeWeight)
-                val creditsView = view.findViewById<EditText>(R.id.editTextaddGradeCredits)
-                val dateView = view.findViewById<EditText>(R.id.editTextAddGradeDate)
-                val semesterView = view.findViewById<EditText>(R.id.editTextSemester)
-
-                val title = titleView.text.toString()
-                val grade = gradeView.text.toString()
-                val examiner = examinerView.text.toString()
-                val credits = Integer.parseInt(creditsView.text.toString())
-                val date = dateView.text.toString()
-                val semester = semesterView.text.toString()
-
-                var weight: Double
-                try {
-                    weight = (weightView.text.toString()).toDouble()
-                } catch (exception: Exception) {
-                    weight = 1.0
-                }
+        dialog.show()
+        dialog.findViewById<Button>(R.id.cancelDialogAddGrade)
+            ?.setOnClickListener { dialog.dismiss() }
+        dialog.findViewById<Button>(R.id.positiveDialogAddGrade)?.setOnClickListener {
+
+            val titleView = view.findViewById<EditText>(R.id.editTextaddGradeCourseName)
+            val gradeView = view.findViewById<EditText>(R.id.editTextAddGrade)
+            val examinerView = view.findViewById<EditText>(R.id.editTextaddGradeExaminer)
+            val weightView = view.findViewById<EditText>(R.id.editTextAddGradeWeight)
+            val creditsView = view.findViewById<EditText>(R.id.editTextaddGradeCredits)
+            val dateView = view.findViewById<EditText>(R.id.editTextAddGradeDate)
+            val semesterView = view.findViewById<EditText>(R.id.editTextSemester)
+
+            val title = titleView.text.toString()
+            val grade = gradeView.text.toString()
+            val examiner = examinerView.text.toString()
+            val credits = Integer.parseInt(creditsView.text.toString())
+            val date = dateView.text.toString()
+            val semester = semesterView.text.toString()
+
+            var weight: Double
+            try {
+                weight = (weightView.text.toString()).toDouble()
+            } catch (exception: Exception) {
+                weight = 1.0
+            }
 
 
 
-                titleView.error = null
-                gradeView.error = null
-                examinerView.error = null
-                weightView.error = null
-                creditsView.error = null
-                dateView.error = null
-                semesterView.error = null
+            titleView.error = null
+            gradeView.error = null
+            examinerView.error = null
+            weightView.error = null
+            creditsView.error = null
+            dateView.error = null
+            semesterView.error = null
 
-                var changesRequired = false
-                if (semester.length < 3) {                                                  //semester sanitization
-                    changesRequired = true
-                    semesterView.error =
-                        "Wrong semester format: Too short. Correct two numbers for the year + W/S"
-                } else if (!(semester.get(2).equals('W') || semester.get(2)
-                        .equals('w') || semester.get(2).equals('S') || semester.get(2).equals('s'))
-                ) {
-                    changesRequired = true
-                    semesterView.error =
-                        "Wrong semester format: Term not specified. Correct two numbers for the year + W/S"
-                }
+            var changesRequired = false
+            if (semester.length < 3) {                                                  //semester sanitization
+                changesRequired = true
+                semesterView.error =
+                    "Wrong semester format: Too short. Correct two numbers for the year + W/S"
+            } else if (!(semester.get(2).equals('W') || semester.get(2)
+                    .equals('w') || semester.get(2).equals('S') || semester.get(2)
+                    .equals('s'))
+            ) {
+                changesRequired = true
+                semesterView.error =
+                    "Wrong semester format: Term not specified. Correct two numbers for the year + W/S"
+            }
 
-                if (weight < 0.0) {             //weight sanitization
-                    changesRequired = true
-                    weightView.error = "Wrong weight format: Weights can not be negative."
-                }
+            if (weight < 0.0) {             //weight sanitization
+                changesRequired = true
+                weightView.error = "Wrong weight format: Weights can not be negative."
+            }
 
-                val gradedouble = grade.replace(",", ".").toDouble()
-                var gradeString = ""
-                if (gradedouble <= 5.0 && gradedouble >= 1.0 || gradedouble == 0.0) {
-                    if (gradedouble == 0.0) {
-                        gradeString = "B"
-                    } else {
-                        gradeString = grade.toString().replace(".",",")
-                    }
+            val gradedouble = grade.replace(",", ".").toDouble()
+            var gradeString = ""
+            if (gradedouble <= 5.0 && gradedouble >= 1.0 || gradedouble == 0.0) {
+                if (gradedouble == 0.0) {
+                    gradeString = "B"
                 } else {
-                    changesRequired = true
-                    gradeView.error =
-                        "Wrong grade format: Grade must be between 1.0 and 5.0 or equal to 0."
+                    gradeString = grade.toString().replace(".", ",")
                 }
+            } else {
+                changesRequired = true
+                gradeView.error =
+                    "Wrong grade format: Grade must be between 1.0 and 5.0 or equal to 0."
+            }
 
 
-                if (title.length < 1) {             //title sanitization
-                    changesRequired = true
-                    titleView.error = "Insert a course title."
-                }
+            if (title.length < 1) {             //title sanitization
+                changesRequired = true
+                titleView.error = "Insert a course title."
+            }
 
-                if (credits < 1) {             //title sanitization
-                    changesRequired = true
-                    creditsView.error = "Invalid amount of credits. Must be greater than 0."
-                }
+            if (credits < 1) {             //title sanitization
+                changesRequired = true
+                creditsView.error = "Invalid amount of credits. Must be greater than 0."
+            }
 
 
-                if (!changesRequired) {
-                    val typeConverter1 =
-                        de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
-                    val exam = Exam(
-                        title,
-                        typeConverter1.read(date),
-                        examiner,
-                        gradeString,
-                        null,
-                        "",
-                        semester,
-                        weight,
-                        true,
-                        credits,
-                        true
-                    )
-                    addExamToList(exam)
-                    dialog.dismiss()
-                }
+            if (!changesRequired) {
+                val typeConverter1 =
+                    de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
+                val exam = Exam(
+                    title,
+                    typeConverter1.read(date),
+                    examiner,
+                    gradeString,
+                    "",
+                    "",
+                    semester,
+                    weight,
+                    true,
+                    credits,
+                    true
+                )
+                addExamToList(exam)
+                dialog.dismiss()
             }
+            //   }
         }
-
-        dialog.show()
-
-        dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
-            .setTextColor(resources.getColor(R.color.text_primary))
-        dialog.getButton(AlertDialog.BUTTON_POSITIVE)
-            .setTextColor(resources.getColor(R.color.text_primary))
-
-
     }
 
     /**
@@ -672,21 +690,35 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      * Toggles between the standard mode and the mode which allows to change grades.
      */
     private fun changeEditMode() {
-        with(binding) {
-            globalEditOFF = !globalEditOFF
-            initUIVisibility()
-        }
+        globalEditOFF = !globalEditOFF
+        initUIVisibility()
     }
 
     private fun initUIVisibility() {
+        //   checkboxUseDiagrams.isChecked=false
+
         if (!globalEditOFF) {
             frameLayoutAverageGrade?.visibility = View.GONE
             floatingButtonAddExamGrade?.visibility = View.VISIBLE
+            chartsContainer.visibility = View.GONE
+            checkboxUseDiagrams?.visibility = View.VISIBLE
+            val scale = resources.displayMetrics.density
+            gradesListView.setPadding(0, (32 * scale + 0.5f).toInt(), 0, 0);
+
         } else {
             storeExamListInSharedPreferences()
             showExams(exams)
             frameLayoutAverageGrade?.visibility = View.VISIBLE
             floatingButtonAddExamGrade?.visibility = View.GONE
+            chartsContainer.visibility = View.VISIBLE
+            checkboxUseDiagrams?.visibility = View.GONE
+            val scale = resources.displayMetrics.density
+            gradesListView.setPadding(0, (256 * scale + 0.5f).toInt(), 0, 0);
+            showExams(exams);
+            /* if(checkboxUseDiagrams.isChecked!=adaptDiagramToWeights){
+                 adaptDiagramToWeights=checkboxUseDiagrams.isChecked;
+                 showExams(exams);
+             }*/
         }
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesNotificationProvider.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesNotificationProvider.kt
index e9471148a6..f2bd2a3a08 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesNotificationProvider.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesNotificationProvider.kt
@@ -23,7 +23,7 @@ class GradesNotificationProvider(
                 .setColor(notificationColorAccent)
     }
 
-    override fun buildNotification(): AppNotification? {
+    override fun buildNotification(): AppNotification {
         val title = context.getString(R.string.my_grades)
         val size = newGrades.size
         val formattedNewGrades = newGrades.joinToString()
@@ -36,7 +36,7 @@ class GradesNotificationProvider(
 
         val deleteIntent = GradeNotificationDeleteReceiver.newIntent(context, newGrades)
         val deletePendingIntent = PendingIntent.getBroadcast(
-                context, DELETE_REQUEST_CODE, deleteIntent, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
+                context, DELETE_REQUEST_CODE, deleteIntent, PendingIntent.FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT)
 
         val notification = getNotificationBuilder()
                 .setContentTitle(title)
diff --git a/app/src/main/res/layout-land/fragment_grades.xml b/app/src/main/res/layout-land/fragment_grades.xml
index f399815c07..845a3783f8 100644
--- a/app/src/main/res/layout-land/fragment_grades.xml
+++ b/app/src/main/res/layout-land/fragment_grades.xml
@@ -21,6 +21,18 @@
         app:layout_constraintVertical_bias="0.8"
         app:srcCompat="@drawable/ic_add"
         app:tint="@android:color/white" />
+    <CheckBox
+        android:id="@+id/checkboxUseDiagrams"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="32dp"
+        android:checked="true"
+        android:text="use weights in diagrams"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 5a07ad47e1..5c99ea9c8f 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -4,7 +4,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="256dp"
+    android:layout_height="100dp"
     android:padding="@dimen/material_large_padding">
 
 
@@ -140,6 +140,35 @@
             android:inputType="text"
             android:text="@string/grade_semester_default" />
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/cancelDialogAddGrade"
+                style="@style/BlueButton"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@string/cancel"
+                android:layout_marginRight="4dp"
+                android:textAllCaps="false"/>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/positiveDialogAddGrade"
+                style="@style/BlueButton"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:layout_marginLeft="8dp"
+                android:text="Übernehmen"
+                android:textAllCaps="false" />
+
+
+        </LinearLayout>
+
 
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index 4f2e13e065..958e06d6d0 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -25,6 +25,8 @@
         app:srcCompat="@drawable/ic_add"
         app:tint="@android:color/white" />
 
+
+
     <LinearLayout
 
         android:layout_width="match_parent"
@@ -67,11 +69,17 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1">
-
+            <CheckBox
+                android:id="@+id/checkboxUseDiagrams"
+                android:layout_width="match_parent"
+                android:layout_height="32dp"
+                android:layout_marginLeft="8dp"
+                android:checked="true"
+                android:text="use weights in diagrams" />
             <FrameLayout
                 android:id="@+id/chartsContainer"
                 android:layout_width="match_parent"
-                android:layout_height="200dp"
+                android:layout_height="256dp"
                 android:background="@color/default_window_background"
                 android:padding="@dimen/material_default_padding"
                 android:visibility="invisible">
@@ -90,6 +98,9 @@
 
             </FrameLayout>
 
+
+
+
             <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:id="@+id/swipeRefreshLayout"
                 android:layout_width="match_parent"
@@ -101,13 +112,14 @@
                     android:layout_height="match_parent"
                     android:clipToPadding="false"
                     android:divider="@color/list_divider"
-                    android:paddingTop="200dp"
+                    android:paddingTop="256dp"
                     android:scrollbars="vertical" />
 
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         </FrameLayout>
 
+
         <LinearLayout
             android:id="@+id/frameLayoutAverageGrade"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index bdfe4d1b25..440834f6ac 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -57,7 +57,7 @@
     <string name="all_programs">Alle Noten</string>
     <string name="date">Datum</string>
     <string name="no_grades">Du hast noch keine Noten, die angezeigt werden könnten.</string>
-    <string name="reset_grade">Note zurücksetzten</string>
+    <string name="reset_grade">zurücksetzten</string>
     <string name="use_grade_in_average">Note verwenden</string>
     <string name="grade_weight_label">Gewichtung der Note:</string>
     <string name="course_name">Course name</string>

From b0265cd464c188b80cc79aba29e6c7f0c0d1a37b Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Sun, 15 May 2022 13:09:34 +0200
Subject: [PATCH 27/71] fixed unclickable checkbox

---
 .../component/tumui/grades/GradesFragment.kt  | 53 ++++++++++---------
 app/src/main/res/layout/fragment_grades.xml   |  4 +-
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index e5162f4a1a..7914b204a7 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -6,10 +6,8 @@ import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
+import android.util.Log
+import android.view.*
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Button
@@ -17,6 +15,8 @@ import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat.getColor
+import androidx.core.view.marginBottom
+import androidx.core.view.marginTop
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.LegendEntry
 import com.github.mikephil.charting.data.*
@@ -109,8 +109,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             initUIVisibility()
         }
 
-        //loadExamListFromSharedPreferences();
-        loadGrades(CacheControl.USE_CACHE)
+        loadExamListFromSharedPreferences();
+        initUIAfterDownloadingExams()
+        //loadGrades(CacheControl.USE_CACHE)
         // Tracks whether the user has used the calendar module before. This is used in determining when to prompt for a
         // Google Play store review
         Utils.setSetting(requireContext(), Const.HAS_VISITED_GRADES, true)
@@ -127,9 +128,13 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     override fun onDownloadSuccessful(response: ExamList) {
         val examsDownloaded: MutableList<Exam> = response.exams.orEmpty().toMutableList()
-
         loadExamListFromSharedPreferences()
         addAllNewItemsToExamList(examsDownloaded)
+        initUIAfterDownloadingExams()
+
+    }
+
+    private fun initUIAfterDownloadingExams() {
         initSpinner(exams)
         showExams(exams)
 
@@ -163,11 +168,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
         val examsTitles = exams.map { it.course }
         examsDownloaded.removeAll { examsTitles.contains(it.course) }
-        //  exams.clear()
-        //   storeExamListInSharedPreferences()
 
 
-        if (!examsDownloaded.isEmpty()) {
+        if (examsDownloaded.isNotEmpty()) {
             examsDownloaded.forEach {
                 it.credits_new = 6; it.weight = 1.0; it.gradeUsedInAverage = true
             }
@@ -184,7 +187,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 .create()
             val listType = object : TypeToken<List<Exam>>() {}.type
             val jsonString = sharedPref.getString(examSharedPreferences, "")
-            if (jsonString != null) {
+            if (jsonString != null && !jsonString.equals("[]")) {
                 exams.clear()
                 exams.addAll(gson.fromJson(jsonString, listType))
                 return
@@ -192,14 +195,16 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         } catch (e: Exception) {
             exams.clear()
         }
+        storeExamListInSharedPreferences()
         // Exam list could no be loaded - will always e a list, some error occurred - clear to prevent any intermediate error states
     }
 
-    fun storeExamListInSharedPreferences() {
+   /* fun storeExamListInSharedPreferences() {
         scope.launch { storeExamListInSharedPreferencesThread() }
     }
-
-    private fun storeExamListInSharedPreferencesThread() {
+*/
+    fun storeExamListInSharedPreferences() {
+        Log.d("Exam Storing", "thread to store exams is successfully started")
         val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
         val dateTimeConverter = DateTimeConverter()
         val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
@@ -209,6 +214,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             putString(examSharedPreferences, jsonlist)
             apply()
         }
+        Log.d("Exam Storing", "thread to store exams is successfully finished")
     }
 
 
@@ -474,10 +480,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      * Prompt the user to type in a name for the new chat room
      */
     private fun openAddGradeDialog() {
-        // Set an EditText view to get user input
         val view = View.inflate(requireContext(), R.layout.dialog_add_grade_input, null)
-
-
         val dialog = AlertDialog.Builder(requireContext())
             .setTitle("Add a New Exam")
             .setMessage(
@@ -591,7 +594,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 addExamToList(exam)
                 dialog.dismiss()
             }
-            //   }
         }
     }
 
@@ -703,8 +705,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             chartsContainer.visibility = View.GONE
             checkboxUseDiagrams?.visibility = View.VISIBLE
             val scale = resources.displayMetrics.density
-            gradesListView.setPadding(0, (32 * scale + 0.5f).toInt(), 0, 0);
-
+            val param = swipeRefreshLayout.layoutParams as ViewGroup.MarginLayoutParams
+            param.setMargins(0,( (32 * scale + 0.5f).toInt()),0,0)
+            swipeRefreshLayout.layoutParams = param
         } else {
             storeExamListInSharedPreferences()
             showExams(exams)
@@ -713,12 +716,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             chartsContainer.visibility = View.VISIBLE
             checkboxUseDiagrams?.visibility = View.GONE
             val scale = resources.displayMetrics.density
-            gradesListView.setPadding(0, (256 * scale + 0.5f).toInt(), 0, 0);
-            showExams(exams);
-            /* if(checkboxUseDiagrams.isChecked!=adaptDiagramToWeights){
-                 adaptDiagramToWeights=checkboxUseDiagrams.isChecked;
-                 showExams(exams);
-             }*/
+            val param = swipeRefreshLayout.layoutParams as ViewGroup.MarginLayoutParams
+            param.setMargins(0,( (256 * scale + 0.5f).toInt()),0,0)
+            swipeRefreshLayout.layoutParams = param
+
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index 958e06d6d0..de07e54530 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -104,6 +104,7 @@
             <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:id="@+id/swipeRefreshLayout"
                 android:layout_width="match_parent"
+                android:layout_marginTop="256dp"
                 android:layout_height="match_parent">
 
                 <se.emilsjolander.stickylistheaders.StickyListHeadersListView
@@ -112,7 +113,8 @@
                     android:layout_height="match_parent"
                     android:clipToPadding="false"
                     android:divider="@color/list_divider"
-                    android:paddingTop="256dp"
+
+
                     android:scrollbars="vertical" />
 
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

From fb4a87ecfa38e1cad4942d54487657bcd3eb113e Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Sun, 15 May 2022 14:51:04 +0200
Subject: [PATCH 28/71] fixed inconsistency in saving exams to the shared
 preferences

---
 .../component/tumui/grades/ExamListAdapter.kt | 15 +++--
 .../component/tumui/grades/GradesFragment.kt  | 62 ++++++++-----------
 app/src/main/res/layout/fragment_grades.xml   |  3 +-
 app/src/main/res/values-de/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 6d1e0d1d63..1ff07b9ab4 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -1,6 +1,7 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
@@ -50,7 +51,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.gradeTextView.text = exam.grade
 
 
-        adaptUIToCheckboxStatus(holder,exam)
+        adaptUIToCheckboxStatus(holder, exam)
 
         val date: String = if (exam.date == null) {
             context.getString(R.string.not_specified)
@@ -92,7 +93,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
     private fun initListenerDeleteCustomGrade(exam: Exam, holder: ViewHolder) {
         if (exam.manuallyAdded) {
             holder.gradeTextViewDeleteCustomGrade.visibility = View.VISIBLE
-           // adaptUIToCheckboxStatus(holder, exam)
+            // adaptUIToCheckboxStatus(holder, exam)
 
             holder.gradeTextViewDeleteCustomGrade.setOnClickListener {
                 val dialog = AlertDialog.Builder(localGradesFragment.requireContext())
@@ -135,6 +136,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 if (exam.weight != helper) {
                     exam.weight = helper
                     localGradesFragment.storeExamListInSharedPreferences()
+                    notifyDataSetChanged()
                 }
             }
         }
@@ -145,6 +147,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 if (exam.credits_new != helper) {
                     exam.credits_new = helper
                     localGradesFragment.storeExamListInSharedPreferences()
+                    notifyDataSetChanged()
                 }
             }
         }
@@ -161,12 +164,13 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             override fun onClick(p0: View?) {
                 exam.gradeUsedInAverage = true
                 adaptUIToCheckboxStatus(holder, exam)
-
+                holder.checkBoxUseGradeForAverage.isChecked = true
                 exam.weight = 1.0
                 exam.credits_new = 6
                 holder.editTextGradeWeights.setText(exam.weight.toString())
                 holder.editTextGradeCredits.setText(exam.credits_new.toString())
                 localGradesFragment.storeExamListInSharedPreferences()
+                notifyDataSetChanged()
             }
 
         })
@@ -178,10 +182,11 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
     private fun initCheckBoxUsedInAverage(exam: Exam, holder: ViewHolder) {
         holder.checkBoxUseGradeForAverage.isChecked = exam.gradeUsedInAverage
         adaptUIToCheckboxStatus(holder, exam)
-        holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { _, isChecked ->
-            exam.gradeUsedInAverage = isChecked
+        holder.checkBoxUseGradeForAverage.setOnClickListener() {
+            exam.gradeUsedInAverage = holder.checkBoxUseGradeForAverage.isChecked
             adaptUIToCheckboxStatus(holder, exam)
             localGradesFragment.storeExamListInSharedPreferences()
+            notifyDataSetChanged()
         }
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 7914b204a7..ecb2364cd8 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -15,8 +15,6 @@ import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat.getColor
-import androidx.core.view.marginBottom
-import androidx.core.view.marginTop
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.LegendEntry
 import com.github.mikephil.charting.data.*
@@ -32,11 +30,7 @@ import de.tum.`in`.tumcampusapp.component.tumui.grades.model.ExamList
 import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
-import kotlinx.android.synthetic.main.dialog_add_grade_input.*
 import kotlinx.android.synthetic.main.fragment_grades.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.newSingleThreadContext
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
@@ -61,13 +55,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private var showBarChartAfterRotate = false
 
     private var globalEditOFF = true
-    private var adaptDiagramToWeights = true;
+    private var adaptDiagramToWeights = true
     private val exams = mutableListOf<Exam>()
 
     private val examSharedPreferences: String = "ExamList"
 
-    private val scope = CoroutineScope(newSingleThreadContext("storetopreferences"))
-
 
     private val grades: Array<String> by lazy {
         resources.getStringArray(R.array.grades)
@@ -108,10 +100,13 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             showChartButton?.setOnClickListener { toggleInLandscape() }
             initUIVisibility()
         }
+        binding.floatingButtonAddExamGrade.setOnClickListener { openAddGradeDialog() }
+        checkboxUseDiagrams.setOnCheckedChangeListener { _, isChecked ->
+            adaptDiagramToWeights = isChecked
+        }
 
-        loadExamListFromSharedPreferences();
-        initUIAfterDownloadingExams()
-        //loadGrades(CacheControl.USE_CACHE)
+
+        loadGrades(CacheControl.USE_CACHE)
         // Tracks whether the user has used the calendar module before. This is used in determining when to prompt for a
         // Google Play store review
         Utils.setSetting(requireContext(), Const.HAS_VISITED_GRADES, true)
@@ -172,7 +167,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
         if (examsDownloaded.isNotEmpty()) {
             examsDownloaded.forEach {
-                it.credits_new = 6; it.weight = 1.0; it.gradeUsedInAverage = true
+                it.credits_new = 6;it.weight = 1.0; it.gradeUsedInAverage = true
             }
             exams.addAll(examsDownloaded)
             storeExamListInSharedPreferences()
@@ -195,15 +190,15 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         } catch (e: Exception) {
             exams.clear()
         }
-        storeExamListInSharedPreferences()
+        // storeExamListInSharedPreferences()
         // Exam list could no be loaded - will always e a list, some error occurred - clear to prevent any intermediate error states
     }
 
-   /* fun storeExamListInSharedPreferences() {
-        scope.launch { storeExamListInSharedPreferencesThread() }
-    }
-*/
-    fun storeExamListInSharedPreferences() {
+    /* fun storeExamListInSharedPreferences() {
+         scope.launch { storeExamListInSharedPreferencesThread() }
+     }
+ */
+   fun storeExamListInSharedPreferences() {
         Log.d("Exam Storing", "thread to store exams is successfully started")
         val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
         val dateTimeConverter = DateTimeConverter()
@@ -214,10 +209,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             putString(examSharedPreferences, jsonlist)
             apply()
         }
-        Log.d("Exam Storing", "thread to store exams is successfully finished")
     }
 
 
+
+
     /**
      * Gson serialiser/deserialiser for converting Joda [DateTime] objects.
      * Source: https://riptutorial.com/android/example/14799/adding-a-custom-converter-to-gson
@@ -447,10 +443,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 visibility = View.VISIBLE
             }
         }
-        binding.floatingButtonAddExamGrade.setOnClickListener { openAddGradeDialog() }
-        checkboxUseDiagrams.setOnCheckedChangeListener() { _, isChecked ->
-            adaptDiagramToWeights = isChecked;
-        }
+
 
         binding.filterSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
@@ -697,30 +690,27 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     private fun initUIVisibility() {
-        //   checkboxUseDiagrams.isChecked=false
-
+        val scale = resources.displayMetrics.density
+        val param = swipeRefreshLayout.layoutParams as ViewGroup.MarginLayoutParams
         if (!globalEditOFF) {
             frameLayoutAverageGrade?.visibility = View.GONE
             floatingButtonAddExamGrade?.visibility = View.VISIBLE
             chartsContainer.visibility = View.GONE
             checkboxUseDiagrams?.visibility = View.VISIBLE
-            val scale = resources.displayMetrics.density
-            val param = swipeRefreshLayout.layoutParams as ViewGroup.MarginLayoutParams
-            param.setMargins(0,( (32 * scale + 0.5f).toInt()),0,0)
-            swipeRefreshLayout.layoutParams = param
+            param.setMargins(0, ((32 * scale + 0.5f).toInt()), 0, 0)
+            gradesListView.setPadding(0, 0, 0, 0)
+
         } else {
-            storeExamListInSharedPreferences()
+            //storeExamListInSharedPreferences()
             showExams(exams)
             frameLayoutAverageGrade?.visibility = View.VISIBLE
             floatingButtonAddExamGrade?.visibility = View.GONE
             chartsContainer.visibility = View.VISIBLE
             checkboxUseDiagrams?.visibility = View.GONE
-            val scale = resources.displayMetrics.density
-            val param = swipeRefreshLayout.layoutParams as ViewGroup.MarginLayoutParams
-            param.setMargins(0,( (256 * scale + 0.5f).toInt()),0,0)
-            swipeRefreshLayout.layoutParams = param
-
+            param.setMargins(0, 0, 0, 0)
+            gradesListView.setPadding(0, ((256 * scale + 0.5f).toInt()), 0, 0)
         }
+        swipeRefreshLayout.layoutParams = param
     }
 
     /**
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index de07e54530..d921569284 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -75,7 +75,7 @@
                 android:layout_height="32dp"
                 android:layout_marginLeft="8dp"
                 android:checked="true"
-                android:text="use weights in diagrams" />
+                android:text="@string/use_weights_in_diagrams" />
             <FrameLayout
                 android:id="@+id/chartsContainer"
                 android:layout_width="match_parent"
@@ -104,7 +104,6 @@
             <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:id="@+id/swipeRefreshLayout"
                 android:layout_width="match_parent"
-                android:layout_marginTop="256dp"
                 android:layout_height="match_parent">
 
                 <se.emilsjolander.stickylistheaders.StickyListHeadersListView
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 440834f6ac..f70b0da3e3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -74,6 +74,7 @@
     <string name="grade_date_default">01.01.22</string>
     <string name="text_view_semester_label">Jahr in dem das Semester startet (z.B. 22WS or 21SoSe)</string>
     <string name="grade_semester_default">22WS</string>
+    <string name="use_weights_in_diagrams">Credits und Gewichte in dem Diagram berücksichtigen</string>
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Kennung</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7f3bece807..c786f0b47f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -101,6 +101,7 @@
     <string name="grade_date_default">01.01.22</string>
     <string name="text_view_semester_label">Year of the start of the semester (e.g. 22WS or 21SuSe)</string>
     <string name="grade_semester_default">22WS</string>
+    <string name="use_weights_in_diagrams">Consider credits and weights in the diagram</string>
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Identification</string>

From e2b73d9cf28753a524ed43c73d96c1eace30467d Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Sun, 15 May 2022 15:01:45 +0200
Subject: [PATCH 29/71] changed stickyListHeaders import to a still maintained
 project to prevent occasionally crashes on closing

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2d4a90fa56..d6a07683e5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -166,7 +166,7 @@ dependencies {
     implementation 'com.squareup.okio:okio:2.10.0'
 
     // UI
-    implementation 'se.emilsjolander:stickylistheaders:2.7.0'
+    implementation 'com.github.mtotschnig:StickyListHeaders:2.7.1'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'me.dm7.barcodescanner:zxing:1.9.13'
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'

From 5758a1f423bd09ea8fb9732418a1024dcd31200e Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Sun, 15 May 2022 16:39:52 +0200
Subject: [PATCH 30/71] added translations, linted; show program spinner only
 if more than one program exits

---
 .../component/tumui/grades/ExamListAdapter.kt |   7 +-
 .../component/tumui/grades/GradesFragment.kt  | 131 +++++++++---------
 app/src/main/res/values-de/strings.xml        |  11 ++
 app/src/main/res/values/strings.xml           |  11 ++
 4 files changed, 87 insertions(+), 73 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 1ff07b9ab4..6abbc493f6 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -93,15 +93,14 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
     private fun initListenerDeleteCustomGrade(exam: Exam, holder: ViewHolder) {
         if (exam.manuallyAdded) {
             holder.gradeTextViewDeleteCustomGrade.visibility = View.VISIBLE
-            // adaptUIToCheckboxStatus(holder, exam)
 
             holder.gradeTextViewDeleteCustomGrade.setOnClickListener {
                 val dialog = AlertDialog.Builder(localGradesFragment.requireContext())
-                    .setTitle("Delete Exam")
+                    .setTitle(context.getString(R.string.delete_exam))
                     .setMessage(
-                        "Should this exam be irrevocably deleted"
+                        context.getString(R.string.delete_exam_dialog_message)
                     )
-                    .setPositiveButton("Delete") { dialogInterface, whichButton ->
+                    .setPositiveButton(R.string.delete) { _, _ ->
 
                         localGradesFragment.deleteExamFromList(exam)
                     }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index ecb2364cd8..090106275a 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -142,7 +142,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         storeGradedCourses(exams)
     }
 
-    fun addExamToList(exam: Exam) {
+    private fun addExamToList(exam: Exam) {
         exams.add(exam)
         changeNumberOfExams()
     }
@@ -182,7 +182,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 .create()
             val listType = object : TypeToken<List<Exam>>() {}.type
             val jsonString = sharedPref.getString(examSharedPreferences, "")
-            if (jsonString != null && !jsonString.equals("[]")) {
+            if (jsonString != null && jsonString != "[]") {
                 exams.clear()
                 exams.addAll(gson.fromJson(jsonString, listType))
                 return
@@ -190,16 +190,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         } catch (e: Exception) {
             exams.clear()
         }
-        // storeExamListInSharedPreferences()
-        // Exam list could no be loaded - will always e a list, some error occurred - clear to prevent any intermediate error states
     }
 
-    /* fun storeExamListInSharedPreferences() {
-         scope.launch { storeExamListInSharedPreferencesThread() }
-     }
- */
-   fun storeExamListInSharedPreferences() {
-        Log.d("Exam Storing", "thread to store exams is successfully started")
+
+    fun storeExamListInSharedPreferences() {
         val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
         val dateTimeConverter = DateTimeConverter()
         val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
@@ -212,8 +206,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
 
-
-
     /**
      * Gson serialiser/deserialiser for converting Joda [DateTime] objects.
      * Source: https://riptutorial.com/android/example/14799/adding-a-custom-converter-to-gson
@@ -245,8 +237,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
 
-    //todo replace in the final version - can be done with exisiting data
-    fun storeGradedCourses(exams: List<Exam>) {
+    private fun storeGradedCourses(exams: List<Exam>) {
         val gradesStore = GradesStore(defaultSharedPreferences)
         val courses = exams.map { it.course }
         gradesStore.store(courses)
@@ -376,17 +367,17 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 (numberFormat.parse(it.grade.toString())?.toDouble()
                     ?: 1.0) * it.credits_new * it.weight
             }
-        val combinedgradefactors = exams
+        val factorSum = exams
             .filter { it.isPassed && it.gradeUsedInAverage }
-            .map { it.credits_new.toDouble() * it.weight }
+            .map { it.credits_new.toDouble() * it.weight }.sum()
 
 
         val gradeSum = grades.sum()
-        val factorSum = combinedgradefactors.sum()
+
         if (factorSum <= 0) {
             return 0.0
         }
-        return gradeSum / factorSum.toDouble()
+        return gradeSum / factorSum
     }
 
     /**
@@ -429,43 +420,47 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             .distinct()
             .map { getString(R.string.study_program_format_string, it) }
 
-        val filters = mutableListOf(getString(R.string.all_programs))
-        filters.addAll(programIds)
+        if (programIds.size < 2) {
+            binding.filterSpinner.visibility = View.GONE
+        } else {
+            val filters = mutableListOf(getString(R.string.all_programs))
+            filters.addAll(programIds)
 
-        val spinnerArrayAdapter = ArrayAdapter(
-            requireContext(), R.layout.simple_spinner_item_actionbar, filters
-        )
+            val spinnerArrayAdapter = ArrayAdapter(
+                requireContext(), R.layout.simple_spinner_item_actionbar, filters
+            )
 
-        with(binding) {
-            filterSpinner.apply {
-                adapter = spinnerArrayAdapter
-                setSelection(spinnerPosition)
-                visibility = View.VISIBLE
+            with(binding) {
+                filterSpinner.apply {
+                    adapter = spinnerArrayAdapter
+                    setSelection(spinnerPosition)
+                    visibility = View.VISIBLE
+                }
             }
-        }
 
 
-        binding.filterSpinner.onItemSelectedListener =
-            object : AdapterView.OnItemSelectedListener {
-                override fun onItemSelected(
-                    parent: AdapterView<*>,
-                    view: View?,
-                    position: Int,
-                    id: Long
-                ) {
-                    val filter = filters[position]
-                    spinnerPosition = position
-
-                    val examsToShow = when (position) {
-                        0 -> exams
-                        else -> exams.filter { filter.contains(it.programID) }
+            binding.filterSpinner.onItemSelectedListener =
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(
+                        parent: AdapterView<*>,
+                        view: View?,
+                        position: Int,
+                        id: Long
+                    ) {
+                        val filter = filters[position]
+                        spinnerPosition = position
+
+                        val examsToShow = when (position) {
+                            0 -> exams
+                            else -> exams.filter { filter.contains(it.programID) }
+                        }
+
+                        showExams(examsToShow)
                     }
 
-                    showExams(examsToShow)
+                    override fun onNothingSelected(parent: AdapterView<*>) = Unit
                 }
-
-                override fun onNothingSelected(parent: AdapterView<*>) = Unit
-            }
+        }
     }
 
 
@@ -475,10 +470,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun openAddGradeDialog() {
         val view = View.inflate(requireContext(), R.layout.dialog_add_grade_input, null)
         val dialog = AlertDialog.Builder(requireContext())
-            .setTitle("Add a New Exam")
+            .setTitle(getString(R.string.add_exam_dialog_title))
             .setMessage(
-                "Grades are normally added automatically. In case special grades should be added, this can be done here. " +
-                        "Manually added Exams can be deleted later on."
+                getString(R.string.add_exam_dialog_message)
             )
             .setView(view)
             .create()
@@ -506,11 +500,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             val date = dateView.text.toString()
             val semester = semesterView.text.toString()
 
-            var weight: Double
-            try {
-                weight = (weightView.text.toString()).toDouble()
+            val weight: Double = try {
+                (weightView.text.toString()).toDouble()
             } catch (exception: Exception) {
-                weight = 1.0
+                1.0
             }
 
 
@@ -527,44 +520,45 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             if (semester.length < 3) {                                                  //semester sanitization
                 changesRequired = true
                 semesterView.error =
-                    "Wrong semester format: Too short. Correct two numbers for the year + W/S"
-            } else if (!(semester.get(2).equals('W') || semester.get(2)
-                    .equals('w') || semester.get(2).equals('S') || semester.get(2)
-                    .equals('s'))
+                    getString(R.string.add_grade_error_wrong_semester)
+            } else if (!(semester.get(2) == 'W' || semester[2] == 'w' || semester.get(2) == 'S' || semester.get(
+                    2
+                ) == 's')
             ) {
                 changesRequired = true
                 semesterView.error =
-                    "Wrong semester format: Term not specified. Correct two numbers for the year + W/S"
+                    getString(R.string.add_grade_error_semester_no_ws)
             }
 
             if (weight < 0.0) {             //weight sanitization
                 changesRequired = true
-                weightView.error = "Wrong weight format: Weights can not be negative."
+                weightView.error = getString(R.string.add_grade_error_invalid_weight)
             }
 
             val gradedouble = grade.replace(",", ".").toDouble()
             var gradeString = ""
-            if (gradedouble <= 5.0 && gradedouble >= 1.0 || gradedouble == 0.0) {
-                if (gradedouble == 0.0) {
-                    gradeString = "B"
+            if (gradedouble in 1.0..5.0 || gradedouble == 0.0) {
+                gradeString = if (gradedouble == 0.0) {
+                    "B"
                 } else {
-                    gradeString = grade.toString().replace(".", ",")
+                    grade.replace(".", ",")
                 }
             } else {
                 changesRequired = true
                 gradeView.error =
-                    "Wrong grade format: Grade must be between 1.0 and 5.0 or equal to 0."
+                    getString(R.string.add_grade_error_invalid_grade_format)
             }
 
 
-            if (title.length < 1) {             //title sanitization
+            if (title.isEmpty()) {             //title sanitization
                 changesRequired = true
-                titleView.error = "Insert a course title."
+                titleView.error = getString(R.string.add_grade_missing_course_title)
             }
 
             if (credits < 1) {             //title sanitization
                 changesRequired = true
-                creditsView.error = "Invalid amount of credits. Must be greater than 0."
+                creditsView.error =
+                    getString(R.string.add_grade_error_invalid_weight_less_than_zero)
             }
 
 
@@ -701,7 +695,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             gradesListView.setPadding(0, 0, 0, 0)
 
         } else {
-            //storeExamListInSharedPreferences()
             showExams(exams)
             frameLayoutAverageGrade?.visibility = View.VISIBLE
             floatingButtonAddExamGrade?.visibility = View.GONE
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f70b0da3e3..1c3ef43510 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -75,6 +75,17 @@
     <string name="text_view_semester_label">Jahr in dem das Semester startet (z.B. 22WS or 21SoSe)</string>
     <string name="grade_semester_default">22WS</string>
     <string name="use_weights_in_diagrams">Credits und Gewichte in dem Diagram berücksichtigen</string>
+    <string name="delete_exam">Prüfung löschen</string>
+    <string name="delete_exam_dialog_message">Soll diese Prüfung unwiderruflich gelöscht werden?</string>
+    <string name="add_grade_error_wrong_semester">Falsches Semesterformat: Zu kurz. Zwei Zahlen für das Jahr + W/S</string>
+    <string name="add_grade_error_semester_no_ws">Falsches Semesterformat: Semester nicht angegeben. Zwei Zahlen für das Jahr + W/S</string>
+    <string name="add_grade_error_invalid_weight">Falsches Gewichtsformat: Gewichte können nicht negativ sein.</string>
+    <string name="add_grade_error_invalid_grade_format">Falsches Notenformat: Die Note muss zwischen 1,0 und 5,0 liegen oder gleich 0 (bestanden) sein.</string>
+    <string name="add_grade_missing_course_title">Ein Kursname muss eingefügt werden.</string>
+    <string name="add_grade_error_invalid_weight_less_than_zero">Ungültige Anzahl an ECTS. Die ECTS-Zahl muss größer als 0 sein.</string>
+    <string name="add_exam_dialog_title">Eine neue Prüfung hinzufügen</string>
+    <string name="add_exam_dialog_message">Die Noten werden normalerweise automatisch hinzugefügt. Falls spezielle Noten hinzugefügt werden sollen, kann dies hier geschehen. Manuell hinzugefügte Prüfungen können später wieder gelöscht werden.</string>
+
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Kennung</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c786f0b47f..641c9d757f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,6 +102,17 @@
     <string name="text_view_semester_label">Year of the start of the semester (e.g. 22WS or 21SuSe)</string>
     <string name="grade_semester_default">22WS</string>
     <string name="use_weights_in_diagrams">Consider credits and weights in the diagram</string>
+    <string name="delete_exam">Delete Exam</string>
+    <string name="delete_exam_dialog_message">Should this exam be irrevocably deleted</string>
+    <string name="add_grade_error_wrong_semester">Wrong semester format: Too short. Correct: two numbers for the year + W/S</string>
+    <string name="add_grade_error_semester_no_ws">Wrong semester format: Term not specified. Correct two numbers for the year + W/S</string>
+    <string name="add_grade_error_invalid_weight">Wrong weight format: Weights can not be negative.</string>
+    <string name="add_grade_error_invalid_grade_format">Wrong grade format: Grade must be between 1.0 and 5.0 or equal to 0.</string>
+    <string name="add_grade_missing_course_title">Insert a course title.</string>
+    <string name="add_grade_error_invalid_weight_less_than_zero">Invalid amount of credits. Must be greater than 0.</string>
+    <string name="add_exam_dialog_title">Add a New Exam</string>
+    <string name="add_exam_dialog_message">Grades are normally added automatically. In case special grades should be added, this can be done here. Manually added Exams can be deleted later on.</string>
+
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Identification</string>

From a01fc20d489efafef760fd71715452948876b30f Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Sat, 21 May 2022 17:44:20 +0200
Subject: [PATCH 31/71] added more intuitive icons, fixed translation

---
 app/build.gradle                              |  2 +-
 .../component/tumui/grades/GradesFragment.kt  | 35 +++++++++++--------
 .../main/res/drawable/ic_baseline_save_24.xml |  5 +++
 .../res/layout/dialog_add_grade_input.xml     |  2 +-
 .../main/res/menu/menu_activity_grades.xml    |  2 +-
 5 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_baseline_save_24.xml

diff --git a/app/build.gradle b/app/build.gradle
index 16fe56a7dd..5fd6634429 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -164,7 +164,7 @@ dependencies {
 
     // UI
 
-    implementation 'com.github.mtotschnig:StickyListHeaders:2.8.0'
+    implementation 'com.github.mtotschnig:StickyListHeaders:2.7.1'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'me.dm7.barcodescanner:zxing:1.9.13'
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 56853fa7c2..d225192393 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -6,7 +6,6 @@ import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
-import android.util.Log
 import android.view.*
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
@@ -284,6 +283,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
                 invalidate()
             }
+
         }
     }
 
@@ -449,13 +449,16 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                         val filter = filters[position]
                         spinnerPosition = position
 
-        with(binding) {
-            filterSpinner.apply {
-                adapter = spinnerArrayAdapter
-                setSelection(spinnerPosition)
-                visibility = View.VISIBLE
-            }
+                        val examsToShow = when (position) {
+                            0 -> exams
+                            else -> exams.filter { filter.contains(it.programID) }
+                        }
 
+                        showExams(examsToShow)
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) = Unit
+                }
         }
     }
 
@@ -503,10 +506,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             }
 
 
-        binding.filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
-                val filter = filters[position]
-
 
             titleView.error = null
             gradeView.error = null
@@ -669,7 +668,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         return when (item.itemId) {
             R.id.bar_chart_menu,
             R.id.pie_chart_menu -> toggleChart().run { true }
-            R.id.edit_grades_menu -> changeEditMode().run { true }
+            R.id.edit_grades_menu -> changeEditMode(item).run { true };
             else -> super.onOptionsItemSelected(item)
 
         }
@@ -678,8 +677,14 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     /**
      * Toggles between the standard mode and the mode which allows to change grades.
      */
-    private fun changeEditMode() {
+    private fun changeEditMode(item: MenuItem) {
+
         globalEditOFF = !globalEditOFF
+        if(globalEditOFF){
+            item.setIcon(R.drawable.ic_outline_edit_24px);
+        }else{
+            item.setIcon(R.drawable.ic_baseline_save_24);
+        }
         initUIVisibility()
     }
 
@@ -687,6 +692,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         val scale = resources.displayMetrics.density
         val param = swipeRefreshLayout.layoutParams as ViewGroup.MarginLayoutParams
         if (!globalEditOFF) {
+
             frameLayoutAverageGrade?.visibility = View.GONE
             floatingButtonAddExamGrade?.visibility = View.VISIBLE
             chartsContainer.visibility = View.GONE
@@ -791,5 +797,4 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             R.color.grade_5_0, R.color.grade_default
         )
     }
-}
-
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_save_24.xml b/app/src/main/res/drawable/ic_baseline_save_24.xml
new file mode 100644
index 0000000000..82070aa2c8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_save_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+</vector>
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 5c99ea9c8f..a2ca053330 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -163,7 +163,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:layout_marginLeft="8dp"
-                android:text="Übernehmen"
+                android:text="@string/save"
                 android:textAllCaps="false" />
 
 
diff --git a/app/src/main/res/menu/menu_activity_grades.xml b/app/src/main/res/menu/menu_activity_grades.xml
index e39b83e69d..d0ad65e2f7 100644
--- a/app/src/main/res/menu/menu_activity_grades.xml
+++ b/app/src/main/res/menu/menu_activity_grades.xml
@@ -22,7 +22,7 @@
 
     <item
         android:id="@+id/edit_grades_menu"
-        android:icon="@drawable/ic_outline_settings_24px"
+        android:icon="@drawable/ic_outline_edit_24px"
         android:orderInCategory="100"
         android:title="@string/edit_grades"
         app:iconTint="@color/color_primary"

From 66cef3c46259f01046b00d10ad78298c4532fe0c Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 29 Apr 2022 16:44:01 +0200
Subject: [PATCH 32/71] Added ui to enter grade parameters

---
 .../res/layout/activity_grades_listview.xml   | 135 ++++++++++++++----
 1 file changed, 109 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 0e93023062..667db156c1 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -4,52 +4,135 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/default_window_background"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:paddingStart="@dimen/material_default_padding"
     android:paddingTop="@dimen/material_small_padding"
     android:paddingEnd="@dimen/material_default_padding"
     android:paddingBottom="@dimen/material_small_padding">
 
+
     <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+
+            <TextView
+                android:id="@+id/courseNameTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="@color/color_primary"
+                android:textSize="@dimen/large_text_size"
+                android:textStyle="bold"
+                tools:text="Course name" />
+
+            <TextView
+                android:id="@+id/examDateTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="visible"
+                tools:text="Exam date" />
+
+            <TextView
+                android:id="@+id/additionalInfoTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="visible"
+                tools:text="Examiner" />
+
+
+        </LinearLayout>
+
 
         <TextView
-            android:id="@+id/courseNameTextView"
-            android:layout_width="match_parent"
+            android:id="@+id/gradeTextView"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/color_primary"
-            android:textSize="@dimen/large_text_size"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="10dp"
+            android:background="@drawable/grade_background"
+            android:gravity="center"
+            android:textColor="@color/white"
+            android:textSize="22sp"
             android:textStyle="bold"
-            tools:text="Course name" />
+            tools:text="1,0" />
 
-        <TextView
-            android:id="@+id/examDateTextView"
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:weightSum="10">
+
+        <Button
+            android:id="@+id/buttonresetGradeParameters"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:text="Exam date" />
+            android:text="Reset Grade" />
+
+        <CheckBox
+            android:id="@+id/checkBox2"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="5"
+            android:text="Note ausblenden" />
+
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:weightSum="10">
 
         <TextView
-            android:id="@+id/additionalInfoTextView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="5"
+            android:labelFor="@+id/editTextCreditsofSubject"
+            android:text="Credits:" />
+
+        <EditText
+            android:id="@+id/editTextCreditsofSubject"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:text="Examiner" />
+            android:autofillHints="8"
+            android:ems="10"
+            android:inputType="numberSigned" />
+
 
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/gradeTextView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="10dp"
-        android:background="@drawable/grade_background"
-        android:gravity="center"
-        android:textColor="@color/white"
-        android:textSize="22sp"
-        android:textStyle="bold"
-        tools:text="1,0" />
+        android:orientation="horizontal"
+        android:weightSum="10">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="5"
+            android:labelFor="@+id/editTextGradeWeight"
+            android:text="Gewichtung der Note:" />
+
+        <EditText
+            android:id="@+id/editTextGradeWeight"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="1.0"
+            android:ems="10"
+            android:inputType="numberDecimal" />
+
+
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file

From 22e80ad3c86a265ada39379732f2da804057d35c Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 29 Apr 2022 17:20:47 +0200
Subject: [PATCH 33/71] Added menu item to enter edit mode

---
 app/src/main/res/menu/menu_activity_grades.xml | 9 +++++++++
 app/src/main/res/values-de/strings.xml         | 1 +
 app/src/main/res/values/strings.xml            | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/app/src/main/res/menu/menu_activity_grades.xml b/app/src/main/res/menu/menu_activity_grades.xml
index 652927b992..e39b83e69d 100644
--- a/app/src/main/res/menu/menu_activity_grades.xml
+++ b/app/src/main/res/menu/menu_activity_grades.xml
@@ -19,4 +19,13 @@
         app:iconTint="@color/color_primary"
         app:showAsAction="ifRoom" />
 
+
+    <item
+        android:id="@+id/edit_grades_menu"
+        android:icon="@drawable/ic_outline_settings_24px"
+        android:orderInCategory="100"
+        android:title="@string/edit_grades"
+        app:iconTint="@color/color_primary"
+        app:showAsAction="ifRoom" />
+
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 805c8bd0ea..54c0dc2990 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -47,6 +47,7 @@
     <!-- Exam/Grades -->
     <string name="average_grade">Durchschnittsnote</string>
     <string name="average_grade_hint">Deinen offiziellen Schnitt findest Du in TUMOnline.</string>
+    <string name="edit_grades">Noten Bearbeiten</string>
     <string name="show_column_chart">Zeige als Balkendiagramm</string>
     <string name="show_pie_chart">Zeige als Tortendiagramm</string>
     <string name="result_extra">Ergebnis:&#160;</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 03e4b9b2aa..cd9aa12d4e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -73,6 +73,7 @@
     <!-- Exam/Grades -->
     <string name="average_grade">Average grade</string>
     <string name="average_grade_hint">Estimated average. Please refer to TUMOnline for the precise one.</string>
+    <string name="edit_grades">Edit Grades</string>
     <string name="show_column_chart">Show Column Chart</string>
     <string name="show_pie_chart">Show Pie Chart</string>
     <string name="result_extra">Result:&#160;</string>
@@ -769,4 +770,5 @@ Signature: %5$s</string>
     // for opening hours
     <string name="language">en</string>
     <string name="use_existing">Use existing</string>
+
 </resources>

From e16fec2051b1da69767accc9191ae1f1768dd3fa Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 29 Apr 2022 18:02:23 +0200
Subject: [PATCH 34/71] Added click listener to edit menu item to toggle edit
 mode

---
 .../component/tumui/grades/GradesFragment.kt  | 108 +++++++++++-------
 .../res/layout/activity_grades_listview.xml   | 107 +++++++++--------
 2 files changed, 124 insertions(+), 91 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index cdf24287b3..68fba7a4f1 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -5,6 +5,7 @@ import android.animation.AnimatorListenerAdapter
 import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
+import android.util.Log
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
@@ -13,6 +14,7 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat.getColor
+import androidx.core.view.isVisible
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.LegendEntry
 import com.github.mikephil.charting.data.*
@@ -26,13 +28,14 @@ import de.tum.`in`.tumcampusapp.component.tumui.grades.model.ExamList
 import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
+import kotlinx.android.synthetic.main.activity_grades_listview.*
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
 import java.text.NumberFormat
 import java.util.*
 
 class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
-        R.layout.fragment_grades,
-        R.string.my_grades
+    R.layout.fragment_grades,
+    R.string.my_grades
 ) {
 
     private var spinnerPosition = 0
@@ -152,7 +155,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 legend.textColor = getColor(resources, R.color.text_primary, null)
 
                 invalidate()
-        }
+            }
 
         }
     }
@@ -196,16 +199,16 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 description = null
                 setTouchEnabled(false)
                 legend.setCustom(
-                        arrayOf(
-                                LegendEntry(
-                                        getString(R.string.grades_without_weight),
-                                        Legend.LegendForm.SQUARE,
-                                        10f,
-                                        0f,
-                                        null,
-                                        ContextCompat.getColor(context, R.color.grade_default)
-                                )
+                    arrayOf(
+                        LegendEntry(
+                            getString(R.string.grades_without_weight),
+                            Legend.LegendForm.SQUARE,
+                            10f,
+                            0f,
+                            null,
+                            ContextCompat.getColor(context, R.color.grade_default)
                         )
+                    )
                 )
 
                 legend.textColor = getColor(resources, R.color.text_primary, null)
@@ -227,8 +230,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun calculateAverageGrade(exams: List<Exam>): Double {
         val numberFormat = NumberFormat.getInstance(Locale.GERMAN)
         val grades = exams
-                .filter { it.isPassed }
-                .map { numberFormat.parse(it.grade).toDouble() }
+            .filter { it.isPassed }
+            .map { numberFormat.parse(it.grade).toDouble() }
 
         val gradeSum = grades.sum()
         return gradeSum / grades.size.toDouble()
@@ -262,15 +265,16 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun initSpinner(exams: List<Exam>) {
         val programIds = exams
-                .map { it.programID }
-                .distinct()
-                .map { getString(R.string.study_program_format_string, it) }
+            .map { it.programID }
+            .distinct()
+            .map { getString(R.string.study_program_format_string, it) }
 
         val filters = mutableListOf(getString(R.string.all_programs))
         filters.addAll(programIds)
 
         val spinnerArrayAdapter = ArrayAdapter(
-                requireContext(), R.layout.simple_spinner_item_actionbar, filters)
+            requireContext(), R.layout.simple_spinner_item_actionbar, filters
+        )
 
         with(binding) {
             filterSpinner?.apply {
@@ -282,7 +286,12 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
 
         binding.filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
+            override fun onItemSelected(
+                parent: AdapterView<*>,
+                view: View?,
+                position: Int,
+                id: Long
+            ) {
                 val filter = filters[position]
                 spinnerPosition = position
 
@@ -325,7 +334,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         }
 
         val averageGrade = calculateAverageGrade(exams)
-        binding.averageGradeTextView.text = String.format("%s: %.2f", getString(R.string.average_grade), averageGrade)
+        binding.averageGradeTextView.text =
+            String.format("%s: %.2f", getString(R.string.average_grade), averageGrade)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -382,7 +392,19 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         return when (item.itemId) {
             R.id.bar_chart_menu,
             R.id.pie_chart_menu -> toggleChart().run { true }
+            R.id.edit_grades_menu -> changeEditMode().run { true }
             else -> super.onOptionsItemSelected(item)
+
+        }
+    }
+
+    /**
+     * Toggles between the standard mode and the mode which allows to change grades.
+     */
+    private fun changeEditMode() {
+        with(binding) {
+            val editIsOn = editGradesContainer.visibility == View.VISIBLE
+            editGradesContainer.isVisible=!editIsOn;
         }
     }
 
@@ -424,21 +446,21 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         // Animate the content view to 100% opacity, and clear any animation
         // listener set on the view.
         fadeIn.animate()
-                .alpha(1f)
-                .setDuration(animationDuration)
-                .setListener(null)
+            .alpha(1f)
+            .setDuration(animationDuration)
+            .setListener(null)
 
         // Animate the loading view to 0% opacity. After the animation ends,
         // set its visibility to GONE as an optimization step (it won't
         // participate in layout passes, etc.)
         fadeOut.animate()
-                .alpha(0f)
-                .setDuration(animationDuration)
-                .setListener(object : AnimatorListenerAdapter() {
-                    override fun onAnimationEnd(animation: Animator) {
-                        fadeOut.visibility = View.GONE
-                    }
-                })
+            .alpha(0f)
+            .setDuration(animationDuration)
+            .setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    fadeOut.visibility = View.GONE
+                }
+            })
     }
 
     companion object {
@@ -451,19 +473,19 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         private val longGradeRe = Regex("[1-4],[0-9][0-9]+")
 
         private val GRADE_COLORS = intArrayOf(
-                R.color.grade_1_0, R.color.grade_1_1, R.color.grade_1_2, R.color.grade_1_3,
-                R.color.grade_1_4, R.color.grade_1_5, R.color.grade_1_6, R.color.grade_1_7,
-                R.color.grade_1_8, R.color.grade_1_9,
-                R.color.grade_2_0, R.color.grade_2_1, R.color.grade_2_2, R.color.grade_2_3,
-                R.color.grade_2_4, R.color.grade_2_5, R.color.grade_2_6, R.color.grade_2_7,
-                R.color.grade_2_8, R.color.grade_2_9,
-                R.color.grade_3_0, R.color.grade_3_1, R.color.grade_3_2, R.color.grade_3_3,
-                R.color.grade_3_4, R.color.grade_3_5, R.color.grade_3_6, R.color.grade_3_7,
-                R.color.grade_3_8, R.color.grade_3_9,
-                R.color.grade_4_0, R.color.grade_4_1, R.color.grade_4_2, R.color.grade_4_3,
-                R.color.grade_4_4, R.color.grade_4_5, R.color.grade_4_6, R.color.grade_4_7,
-                R.color.grade_4_8, R.color.grade_4_9,
-                R.color.grade_5_0, R.color.grade_default
+            R.color.grade_1_0, R.color.grade_1_1, R.color.grade_1_2, R.color.grade_1_3,
+            R.color.grade_1_4, R.color.grade_1_5, R.color.grade_1_6, R.color.grade_1_7,
+            R.color.grade_1_8, R.color.grade_1_9,
+            R.color.grade_2_0, R.color.grade_2_1, R.color.grade_2_2, R.color.grade_2_3,
+            R.color.grade_2_4, R.color.grade_2_5, R.color.grade_2_6, R.color.grade_2_7,
+            R.color.grade_2_8, R.color.grade_2_9,
+            R.color.grade_3_0, R.color.grade_3_1, R.color.grade_3_2, R.color.grade_3_3,
+            R.color.grade_3_4, R.color.grade_3_5, R.color.grade_3_6, R.color.grade_3_7,
+            R.color.grade_3_8, R.color.grade_3_9,
+            R.color.grade_4_0, R.color.grade_4_1, R.color.grade_4_2, R.color.grade_4_3,
+            R.color.grade_4_4, R.color.grade_4_5, R.color.grade_4_6, R.color.grade_4_7,
+            R.color.grade_4_8, R.color.grade_4_9,
+            R.color.grade_5_0, R.color.grade_default
         )
     }
 }
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 667db156c1..06e184576d 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -66,73 +66,84 @@
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:id="@+id/editGradesContainer"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="10">
+        android:orientation="vertical">
 
-        <Button
-            android:id="@+id/buttonresetGradeParameters"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Reset Grade" />
 
-        <CheckBox
-            android:id="@+id/checkBox2"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="5"
-            android:text="Note ausblenden" />
+            android:orientation="horizontal"
+            android:weightSum="10">
 
-    </LinearLayout>
+            <Button
+                android:id="@+id/buttonresetGradeParameters"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="5"
+                android:text="Reset Grade" />
 
+            <CheckBox
+                android:id="@+id/checkBox2"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="5"
+                android:text="Note ausblenden" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="10">
+        </LinearLayout>
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="5"
-            android:labelFor="@+id/editTextCreditsofSubject"
-            android:text="Credits:" />
 
-        <EditText
-            android:id="@+id/editTextCreditsofSubject"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:autofillHints="8"
-            android:ems="10"
-            android:inputType="numberSigned" />
+            android:orientation="horizontal"
+            android:weightSum="10">
 
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="5"
+                android:labelFor="@+id/editTextCreditsofSubject"
+                android:text="Credits:" />
 
-    </LinearLayout>
+            <EditText
+                android:id="@+id/editTextCreditsofSubject"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="5"
+                android:autofillHints="8"
+                android:ems="10"
+                android:inputType="numberSigned" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="10">
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="5"
-            android:labelFor="@+id/editTextGradeWeight"
-            android:text="Gewichtung der Note:" />
+        </LinearLayout>
 
-        <EditText
-            android:id="@+id/editTextGradeWeight"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:autofillHints="1.0"
-            android:ems="10"
-            android:inputType="numberDecimal" />
+            android:orientation="horizontal"
+            android:weightSum="10"
+            android:layout_marginBottom="@dimen/material_default_padding">
 
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="5"
+                android:labelFor="@+id/editTextGradeWeight"
+                android:text="Gewichtung der Note:" />
+
+            <EditText
+                android:id="@+id/editTextGradeWeight"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="5"
+                android:autofillHints="1.0"
+                android:ems="10"
+                android:inputType="numberDecimal" />
 
-    </LinearLayout>
 
+        </LinearLayout>
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file

From 4995b02e1a2fc626512589dc24b34a73e83be9a1 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Wed, 4 May 2022 10:07:43 +0200
Subject: [PATCH 35/71] toggeling edit mode changes now all ui elements

---
 .../component/tumui/grades/ExamListAdapter.kt | 30 +++++++++++++++----
 .../component/tumui/grades/GradesFragment.kt  | 17 ++++++++---
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index f62395fec2..2a6f3c8eca 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -3,6 +3,8 @@ package de.tum.`in`.tumcampusapp.component.tumui.grades
 import android.content.Context
 import android.view.View
 import android.view.ViewGroup
+import android.widget.EditText
+import android.widget.LinearLayout
 import android.widget.TextView
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyListHeadersAdapter
@@ -12,7 +14,10 @@ import org.joda.time.format.DateTimeFormat
 /**
  * Custom UI adapter for a list of exams.
  */
-class ExamListAdapter(context: Context, results: List<Exam>) : SimpleStickyListHeadersAdapter<Exam>(context, results.toMutableList()) {
+class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: GradesFragment) :
+    SimpleStickyListHeadersAdapter<Exam>(context, results.toMutableList()) {
+
+    val localGradesFragment: GradesFragment = gradesFragment
 
     init {
         itemList.sort()
@@ -43,11 +48,20 @@ class ExamListAdapter(context: Context, results: List<Exam>) : SimpleStickyListH
         } else {
             DATE_FORMAT.print(exam.date)
         }
-        holder.examDateTextView.text = String.format("%s: %s", context.getString(R.string.date), date)
+        holder.examDateTextView.text =
+            String.format("%s: %s", context.getString(R.string.date), date)
+
+        holder.additionalInfoTextView.text = String.format(
+            "%s: %s, %s: %s",
+            context.getString(R.string.examiner), exam.examiner,
+            context.getString(R.string.mode), exam.modus
+        )
 
-        holder.additionalInfoTextView.text = String.format("%s: %s, %s: %s",
-                context.getString(R.string.examiner), exam.examiner,
-                context.getString(R.string.mode), exam.modus)
+        if (localGradesFragment.getGlobalEdit()) {
+            holder.editGradesContainer.visibility=View.GONE
+        } else {
+            holder.editGradesContainer.visibility=View.VISIBLE
+        }
 
         return view
     }
@@ -71,9 +85,15 @@ class ExamListAdapter(context: Context, results: List<Exam>) : SimpleStickyListH
         var gradeTextView: TextView = itemView.findViewById(R.id.gradeTextView)
         var examDateTextView: TextView = itemView.findViewById(R.id.examDateTextView)
         var additionalInfoTextView: TextView = itemView.findViewById(R.id.additionalInfoTextView)
+
+        var editTextGradeWeights: EditText = itemView.findViewById(R.id.editTextGradeWeight)
+        var editGradesContainer: LinearLayout = itemView.findViewById(R.id.editGradesContainer)
+
+        //todo hier die Knöpfe definieren
     }
 
     companion object {
         private val DATE_FORMAT = DateTimeFormat.mediumDate()
     }
+
 }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 68fba7a4f1..dd551cb9aa 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -46,6 +46,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     private var showBarChartAfterRotate = false
 
+    private var globaledit = false;
+    private var exams = listOf<Exam>();
+
     private val grades: Array<String> by lazy {
         resources.getStringArray(R.array.grades)
     }
@@ -102,7 +105,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     override fun onDownloadSuccessful(response: ExamList) {
-        val exams = response.exams.orEmpty()
+        exams = response.exams.orEmpty()
 
         initSpinner(exams)
         showExams(exams)
@@ -319,7 +322,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             return
         }
 
-        binding.gradesListView.adapter = ExamListAdapter(requireContext(), exams)
+        binding.gradesListView.adapter = ExamListAdapter(requireContext(), exams, this)
 
         if (!isFetched) {
             // We hide the charts container in the beginning. Then, when we load data for the first
@@ -403,8 +406,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun changeEditMode() {
         with(binding) {
-            val editIsOn = editGradesContainer.visibility == View.VISIBLE
-            editGradesContainer.isVisible=!editIsOn;
+            globaledit = !globaledit;
+
+            // Refresh all values for the ui
+            (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
         }
     }
 
@@ -463,6 +468,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             })
     }
 
+    fun getGlobalEdit(): Boolean {
+        return globaledit;
+    }
+
     companion object {
         private const val KEY_SHOW_BAR_CHART = "showPieChart"
         private const val KEY_SPINNER_POSITION = "spinnerPosition"

From 90a7fe5cada9277a70b80f46aa44228c71a10c79 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 6 May 2022 11:20:18 +0200
Subject: [PATCH 36/71] Exam List is stored as a json object in shared
 preferences

---
 .../component/tumui/grades/ExamListAdapter.kt | 13 ++-
 .../tumui/grades/GradesBackgroundUpdater.kt   |  1 +
 .../component/tumui/grades/GradesFragment.kt  | 93 ++++++++++++++++++-
 .../component/tumui/grades/model/Exam.kt      | 26 +++++-
 .../res/layout/activity_grades_listview.xml   |  1 +
 5 files changed, 127 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 2a6f3c8eca..e4aeaec081 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -1,6 +1,7 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
@@ -11,6 +12,7 @@ import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyList
 import de.tum.`in`.tumcampusapp.component.tumui.grades.model.Exam
 import org.joda.time.format.DateTimeFormat
 
+
 /**
  * Custom UI adapter for a list of exams.
  */
@@ -57,10 +59,15 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             context.getString(R.string.mode), exam.modus
         )
 
+       // exam.weight = "new weight"
+        //holder.textViewCreditsosSubject.text = exam.weight;
+        //storeExam(exam)
+        //holder.editTextGradeWeights.getText().insert(holder.editTextGradeWeights.getSelectionStart(), 0);
         if (localGradesFragment.getGlobalEdit()) {
-            holder.editGradesContainer.visibility=View.GONE
+            holder.editGradesContainer.visibility = View.GONE
         } else {
-            holder.editGradesContainer.visibility=View.VISIBLE
+            holder.editGradesContainer.visibility = View.VISIBLE
+
         }
 
         return view
@@ -88,6 +95,8 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
         var editTextGradeWeights: EditText = itemView.findViewById(R.id.editTextGradeWeight)
         var editGradesContainer: LinearLayout = itemView.findViewById(R.id.editGradesContainer)
+        var textViewCreditsosSubject: TextView =
+            itemView.findViewById(R.id.textViewCreditsosSubject)
 
         //todo hier die Knöpfe definieren
     }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt
index e271bf5400..348b84f39e 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt
@@ -1,6 +1,7 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
+import android.util.Log
 import de.tum.`in`.tumcampusapp.api.tumonline.CacheControl
 import de.tum.`in`.tumcampusapp.api.tumonline.TUMOnlineClient
 import de.tum.`in`.tumcampusapp.component.notifications.NotificationScheduler
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index dd551cb9aa..1f1c4bb9df 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -2,6 +2,7 @@ package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
+import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
@@ -14,11 +15,12 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat.getColor
-import androidx.core.view.isVisible
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.LegendEntry
 import com.github.mikephil.charting.data.*
 import com.github.mikephil.charting.formatter.ValueFormatter
+import com.google.gson.*
+import com.google.gson.reflect.TypeToken
 import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.api.tumonline.CacheControl
@@ -28,10 +30,15 @@ import de.tum.`in`.tumcampusapp.component.tumui.grades.model.ExamList
 import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
-import kotlinx.android.synthetic.main.activity_grades_listview.*
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
+import org.joda.time.DateTime
+import org.joda.time.format.DateTimeFormat
+import org.joda.time.format.DateTimeFormatter
+import java.lang.reflect.Type
 import java.text.NumberFormat
 import java.util.*
+import javax.inject.Inject
+
 
 class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     R.layout.fragment_grades,
@@ -88,7 +95,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             showChartButton?.setOnClickListener { toggleInLandscape() }
         }
 
-        loadGrades(CacheControl.USE_CACHE)
+                loadGrades(CacheControl.USE_CACHE)      //set to BYPASS_CACHE to force a reload
 
         // Tracks whether the user has used the calendar module before. This is used in determining when to prompt for a
         // Google Play store review
@@ -106,6 +113,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     override fun onDownloadSuccessful(response: ExamList) {
         exams = response.exams.orEmpty()
+//todo these exams should be loaded from shared prefrences, not from the cahe -> allows to modify weights
+        storeExamListInSharedPreferences()
+        loadExamListFromSharedPreferences()
 
         initSpinner(exams)
         showExams(exams)
@@ -119,7 +129,82 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         storeGradedCourses(exams)
     }
 
-    private fun storeGradedCourses(exams: List<Exam>) {
+    fun loadExamListFromSharedPreferences() {
+        //    val jsonList = activity?.getSharedPreferences(
+        //        getString(R.string.examlistpreferences), Context.MODE_PRIVATE)
+        //val mPrefs: SharedPreferences = getPreferences(MODE_PRIVATE)
+        // val prefsEditor: Editor = sharedPref.edit()
+
+        //val userListType : Type = TypeToken<ArrayList<Exam>>() {}.type;
+        // val examListType: Type = TypeToken<List<Exam>>(){}.getType();
+
+        //val json = gson.fromJson(jsonList, Array<Exam>::class.java)
+        //prefsEditor.putString("MyObject", json)
+        //prefsEditor.commit()
+
+        //exams= activity?.getPreferences(Context.MODE_PRIVATE)!!.getStringSet("ExamList", emptySet())!!.toList().sorted()
+        // val gson = Gson()
+        val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
+        val dateTimeConverter = DateTimeConverter()
+        val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
+            .create()
+        val listType = object : TypeToken<List<Exam>>() {}.type
+        if (sharedPref != null) {
+            val jsonString = sharedPref.getString("ExamList", "");
+            Log.d("Examlistdebugging: ", jsonString!!)
+            if (jsonString != null) {
+                val helperExams: List<Exam> = gson.fromJson(jsonString, listType)
+                Log.d("Examlistdebugging: ", helperExams.toString())
+            }
+        }
+    }
+
+    fun storeExamListInSharedPreferences() {
+        val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
+       // val gson = GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").create()
+        val dateTimeConverter = DateTimeConverter()
+        val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
+            .create()
+        val jsonlist = gson.toJson(exams)
+        Log.d("Examlistdebugging: ", jsonlist)
+        with(sharedPref.edit()) {
+            putString("ExamList", jsonlist)
+            apply()
+        }
+    }
+
+
+    /**
+     * Gson serialiser/deserialiser for converting Joda [DateTime] objects.
+     * Source: https://riptutorial.com/android/example/14799/adding-a-custom-converter-to-gson
+     */
+    class DateTimeConverter @Inject constructor() : JsonSerializer<DateTime?>,
+        JsonDeserializer<DateTime?> {
+        private val dateTimeFormatter: DateTimeFormatter
+        override fun serialize(
+            src: DateTime?,
+            typeOfSrc: Type?,
+            context: JsonSerializationContext?
+        ): JsonElement {
+            return JsonPrimitive(dateTimeFormatter.print(src))
+        }
+
+        @Throws(JsonParseException::class)
+        override fun deserialize(
+            json: JsonElement,
+            typeOfT: Type?,
+            context: JsonDeserializationContext?
+        ): DateTime? {
+            return if (json.asString == null || json.asString.isEmpty()) {
+                null
+            } else dateTimeFormatter.parseDateTime(json.asString)
+        }
+
+        init {
+            dateTimeFormatter = DateTimeFormat.forPattern("YYYY-MM-dd HH:mm")
+        }
+    }
+    public fun storeGradedCourses(exams: List<Exam>) {
         val gradesStore = GradesStore(defaultSharedPreferences)
         val courses = exams.map { it.course }
         gradesStore.store(courses)
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index 60503dd8f9..add0abb69d 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -1,6 +1,7 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades.model
 
 import android.content.Context
+import android.util.Log
 import androidx.core.content.ContextCompat
 import com.tickaroo.tikxml.annotation.PropertyElement
 import com.tickaroo.tikxml.annotation.Xml
@@ -36,13 +37,36 @@ data class Exam(
     @PropertyElement(name = "studienidentifikator")
     val programID: String,
     @PropertyElement(name = "lv_semester")
-    val semester: String = ""
+    val semester: String = "",
+    @PropertyElement(name = "credits")
+    var weight: String? = "test",
 ) : Comparable<Exam>, SimpleStickyListHeadersAdapter.SimpleStickyListItem {
 
     override fun getHeadName() = semester
 
     override fun getHeaderId() = semester
 
+    /**
+     * Compare all Attributes which were send from tum online,
+     * All added attributes for the individual grades can be neglected
+     */
+    override fun equals(other: Any?): Boolean {
+        if (other !is Exam){
+            return false;
+        }
+        val otherExam=(other as Exam)
+        if (credits.isNullOrEmpty() xor otherExam.credits.isNullOrEmpty()){
+            return false
+        }
+        //val test: String? ="lorem ipsum";
+        //val test1: String? =null;
+        //val test2: String? =null;
+       /* Log.d("Kotlin logic test start: ", test1.equals(test2).toString())
+        Log.d("Kotlin logic test: ", test.equals(test2).toString())
+        Log.d("Kotlin logic test: ", test1.equals(test).toString())*/
+        return otherExam.course.equals(course) && otherExam.programID.equals(programID) && otherExam.semester.equals(semester);
+    }
+
     override fun compareTo(other: Exam): Int {
         return compareByDescending<Exam> { it.semester }
                 .thenByDescending { it.date }
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 06e184576d..4a62974b41 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -103,6 +103,7 @@
 
             <TextView
                 android:layout_width="0dp"
+                android:id="@+id/textViewCreditsosSubject"
                 android:layout_height="wrap_content"
                 android:layout_weight="5"
                 android:labelFor="@+id/editTextCreditsofSubject"

From 7ed75ea61a2b365e4ad7d4f5a8b0640cf26705f3 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 6 May 2022 14:05:32 +0200
Subject: [PATCH 37/71] connected ui to the model - exams are saved permanently
 in shared preferences

---
 .../component/tumui/grades/ExamListAdapter.kt | 63 ++++++++++++++++---
 .../component/tumui/grades/GradesFragment.kt  | 56 +++++++----------
 .../component/tumui/grades/model/Exam.kt      | 23 ++++---
 3 files changed, 94 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index e4aeaec081..f7730a1b81 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -1,6 +1,8 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
+import android.text.Editable
+import android.text.TextWatcher
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
@@ -10,6 +12,8 @@ import android.widget.TextView
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyListHeadersAdapter
 import de.tum.`in`.tumcampusapp.component.tumui.grades.model.Exam
+import kotlinx.android.synthetic.main.activity_grades_listview.view.*
+import org.jetbrains.anko.db.INTEGER
 import org.joda.time.format.DateTimeFormat
 
 
@@ -59,20 +63,66 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             context.getString(R.string.mode), exam.modus
         )
 
-       // exam.weight = "new weight"
-        //holder.textViewCreditsosSubject.text = exam.weight;
-        //storeExam(exam)
-        //holder.editTextGradeWeights.getText().insert(holder.editTextGradeWeights.getSelectionStart(), 0);
+
         if (localGradesFragment.getGlobalEdit()) {
             holder.editGradesContainer.visibility = View.GONE
         } else {
             holder.editGradesContainer.visibility = View.VISIBLE
 
         }
-
+       // localGradesFragment.storeExamListInSharedPreferences()
+initUIElements(holder, exam);
         return view
     }
 
+    private fun initUIElements(holder: ViewHolder, exam: Exam) {
+        holder.editTextGradeWeights.setText(""+exam.weight)
+        holder.editTextGradeCredits.setText(""+exam.credits_new)
+
+        //todo hier noch auf die Werte Setzten, die das feld laut der Exam instanz hat
+        holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+                exam.weight= Integer.parseInt(s.toString())
+                localGradesFragment.storeExamListInSharedPreferences()
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+            }
+        })
+
+        holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+                exam.credits_new= Integer.parseInt(s.toString())
+                localGradesFragment.storeExamListInSharedPreferences()
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+            }
+        })
+    }
+
+   /* fun EditText.afterTextChanged(afterTextChanged: (String) -> Unit) {
+        this.addTextChangedListener(object : TextWatcher {
+            override fun afterTextChanged(editable: Editable?) {
+                exam
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                Log.d("Editable before textChanges",s.toString())
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                Log.d("Editable on textChanges",s.toString())
+            }
+        })
+    }*/
+
     override fun generateHeaderName(item: Exam): String {
         val headerText = super.generateHeaderName(item)
         val year = Integer.parseInt(headerText.substring(0, 2))
@@ -94,11 +144,10 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         var additionalInfoTextView: TextView = itemView.findViewById(R.id.additionalInfoTextView)
 
         var editTextGradeWeights: EditText = itemView.findViewById(R.id.editTextGradeWeight)
+        var editTextGradeCredits: EditText = itemView.findViewById(R.id.editTextCreditsofSubject)
         var editGradesContainer: LinearLayout = itemView.findViewById(R.id.editGradesContainer)
         var textViewCreditsosSubject: TextView =
             itemView.findViewById(R.id.textViewCreditsosSubject)
-
-        //todo hier die Knöpfe definieren
     }
 
     companion object {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 1f1c4bb9df..8041f6a9ba 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -54,7 +54,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private var showBarChartAfterRotate = false
 
     private var globaledit = false;
-    private var exams = listOf<Exam>();
+    private val exams = mutableListOf<Exam>();
 
     private val grades: Array<String> by lazy {
         resources.getStringArray(R.array.grades)
@@ -95,8 +95,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             showChartButton?.setOnClickListener { toggleInLandscape() }
         }
 
-                loadGrades(CacheControl.USE_CACHE)      //set to BYPASS_CACHE to force a reload
-
+        //    loadGrades(CacheControl.USE_CACHE)      //set to BYPASS_CACHE to force a reload
+        loadExamListFromSharedPreferences();
         // Tracks whether the user has used the calendar module before. This is used in determining when to prompt for a
         // Google Play store review
         Utils.setSetting(requireContext(), Const.HAS_VISITED_GRADES, true)
@@ -111,11 +111,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         fetch(apiCall)
     }
 
-    override fun onDownloadSuccessful(response: ExamList) {
-        exams = response.exams.orEmpty()
+    override fun onDownloadSuccessful(response: ExamList) {     //todo compare both datasets in this method exams einfügen und vergleichen wie anosnten nur bei dem downloader
+        //examsDownloaded = response.exams.orEmpty()
 //todo these exams should be loaded from shared prefrences, not from the cahe -> allows to modify weights
-        storeExamListInSharedPreferences()
-        loadExamListFromSharedPreferences()
+        //storeExamListInSharedPreferences()
+        //loadExamListFromSharedPreferences()
 
         initSpinner(exams)
         showExams(exams)
@@ -130,38 +130,29 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     fun loadExamListFromSharedPreferences() {
-        //    val jsonList = activity?.getSharedPreferences(
-        //        getString(R.string.examlistpreferences), Context.MODE_PRIVATE)
-        //val mPrefs: SharedPreferences = getPreferences(MODE_PRIVATE)
-        // val prefsEditor: Editor = sharedPref.edit()
-
-        //val userListType : Type = TypeToken<ArrayList<Exam>>() {}.type;
-        // val examListType: Type = TypeToken<List<Exam>>(){}.getType();
-
-        //val json = gson.fromJson(jsonList, Array<Exam>::class.java)
-        //prefsEditor.putString("MyObject", json)
-        //prefsEditor.commit()
-
-        //exams= activity?.getPreferences(Context.MODE_PRIVATE)!!.getStringSet("ExamList", emptySet())!!.toList().sorted()
-        // val gson = Gson()
-        val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
-        val dateTimeConverter = DateTimeConverter()
-        val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
-            .create()
-        val listType = object : TypeToken<List<Exam>>() {}.type
-        if (sharedPref != null) {
+        try {
+            val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
+            val dateTimeConverter = DateTimeConverter()
+            val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
+                .create()
+            val listType = object : TypeToken<List<Exam>>() {}.type
             val jsonString = sharedPref.getString("ExamList", "");
-            Log.d("Examlistdebugging: ", jsonString!!)
             if (jsonString != null) {
-                val helperExams: List<Exam> = gson.fromJson(jsonString, listType)
-                Log.d("Examlistdebugging: ", helperExams.toString())
+                exams.clear();
+                exams.addAll(gson.fromJson(jsonString, listType))
+                return
             }
+        } catch (e: Exception) {
+            exams.clear();
         }
+
+        // Exam list could no be loaded - will always e a list, some error occured - clear to prevent any intermediate error states
+
     }
 
     fun storeExamListInSharedPreferences() {
         val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
-       // val gson = GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").create()
+        // val gson = GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").create()
         val dateTimeConverter = DateTimeConverter()
         val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
             .create()
@@ -204,7 +195,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             dateTimeFormatter = DateTimeFormat.forPattern("YYYY-MM-dd HH:mm")
         }
     }
-    public fun storeGradedCourses(exams: List<Exam>) {
+
+    fun storeGradedCourses(exams: List<Exam>) {
         val gradesStore = GradesStore(defaultSharedPreferences)
         val courses = exams.map { it.course }
         gradesStore.store(courses)
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index add0abb69d..20ec44b2ff 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -24,8 +24,7 @@ import java.util.*
 data class Exam(
     @PropertyElement(name = "lv_titel")
     val course: String,
-    @PropertyElement(name = "lv_credits")
-    val credits: String? = null,
+
     @PropertyElement(name = "datum", converter = DateTimeConverter::class)
     val date: DateTime? = null,
     @PropertyElement(name = "pruefer_nachname")
@@ -38,8 +37,14 @@ data class Exam(
     val programID: String,
     @PropertyElement(name = "lv_semester")
     val semester: String = "",
-    @PropertyElement(name = "credits")
-    var weight: String? = "test",
+    @PropertyElement(name = "weight")
+    var weight: Int = 0,
+    @PropertyElement(name = "gradeUsedInAverage")
+    var gradeUsedInAverage: Boolean? = false,
+    @PropertyElement(name = "subjectcredits")               //must not be "credits" -> otherwise naming collision will occur
+    var credits_new: Int = 6,
+
+
 ) : Comparable<Exam>, SimpleStickyListHeadersAdapter.SimpleStickyListItem {
 
     override fun getHeadName() = semester
@@ -50,14 +55,14 @@ data class Exam(
      * Compare all Attributes which were send from tum online,
      * All added attributes for the individual grades can be neglected
      */
-    override fun equals(other: Any?): Boolean {
+   /* override fun equals(other: Any?): Boolean {
         if (other !is Exam){
             return false;
         }
         val otherExam=(other as Exam)
-        if (credits.isNullOrEmpty() xor otherExam.credits.isNullOrEmpty()){
-            return false
-        }
+        //if (credits.isNullOrEmpty() xor otherExam.credits.isNullOrEmpty()){
+        //    return false
+        //}
         //val test: String? ="lorem ipsum";
         //val test1: String? =null;
         //val test2: String? =null;
@@ -65,7 +70,7 @@ data class Exam(
         Log.d("Kotlin logic test: ", test.equals(test2).toString())
         Log.d("Kotlin logic test: ", test1.equals(test).toString())*/
         return otherExam.course.equals(course) && otherExam.programID.equals(programID) && otherExam.semester.equals(semester);
-    }
+    }*/
 
     override fun compareTo(other: Exam): Int {
         return compareByDescending<Exam> { it.semester }

From d694ce2fc4f2421f03e54a8d858bc043b0a95fb9 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 6 May 2022 14:31:55 +0200
Subject: [PATCH 38/71] connected checkbox to the exam model

---
 .../component/tumui/grades/ExamListAdapter.kt | 50 ++++++++++---------
 .../component/tumui/grades/model/Exam.kt      |  2 +-
 .../res/layout/activity_grades_listview.xml   |  2 +-
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index f7730a1b81..050a3e6ec6 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -6,9 +6,11 @@ import android.text.TextWatcher
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
+import android.widget.CheckBox
 import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyListHeadersAdapter
 import de.tum.`in`.tumcampusapp.component.tumui.grades.model.Exam
@@ -70,19 +72,18 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             holder.editGradesContainer.visibility = View.VISIBLE
 
         }
-       // localGradesFragment.storeExamListInSharedPreferences()
-initUIElements(holder, exam);
+        // localGradesFragment.storeExamListInSharedPreferences()
+        initUIElements(holder, exam);
         return view
     }
 
     private fun initUIElements(holder: ViewHolder, exam: Exam) {
-        holder.editTextGradeWeights.setText(""+exam.weight)
-        holder.editTextGradeCredits.setText(""+exam.credits_new)
+        holder.editTextGradeWeights.setText(exam.weight.toString())
+        holder.editTextGradeCredits.setText(exam.credits_new.toString())
 
-        //todo hier noch auf die Werte Setzten, die das feld laut der Exam instanz hat
         holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
-                exam.weight= Integer.parseInt(s.toString())
+                exam.weight = s.toString().toDouble()
                 localGradesFragment.storeExamListInSharedPreferences()
             }
 
@@ -95,7 +96,7 @@ initUIElements(holder, exam);
 
         holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
-                exam.credits_new= Integer.parseInt(s.toString())
+                exam.credits_new = s.toString().toInt()
                 localGradesFragment.storeExamListInSharedPreferences()
             }
 
@@ -105,23 +106,26 @@ initUIElements(holder, exam);
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
             }
         })
-    }
 
-   /* fun EditText.afterTextChanged(afterTextChanged: (String) -> Unit) {
-        this.addTextChangedListener(object : TextWatcher {
-            override fun afterTextChanged(editable: Editable?) {
-                exam
-            }
-
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-                Log.d("Editable before textChanges",s.toString())
+        holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { buttonView, isChecked ->
+            exam.gradeUsedInAverage=!isChecked
+
+            if (isChecked){
+                holder.editTextGradeCredits.isEnabled=false;
+                holder.editTextGradeWeights.isEnabled=false;
+                holder.gradeTextView.background.setTint(ContextCompat.getColor(context, R.color.transparent))
+                holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.grade_default))
+            }else{
+                holder.editTextGradeCredits.isEnabled=true;
+                holder.editTextGradeWeights.isEnabled=true;
+                val gradeColor = exam.getGradeColor(context)
+                holder.gradeTextView.background.setTint(gradeColor)
+                holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
             }
+           // texview deaktiveren, idealerweise auch die ein Zeichen um die note Setzten(irgendeine Art von Rand?)
+        }
+    }
 
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                Log.d("Editable on textChanges",s.toString())
-            }
-        })
-    }*/
 
     override fun generateHeaderName(item: Exam): String {
         val headerText = super.generateHeaderName(item)
@@ -146,8 +150,8 @@ initUIElements(holder, exam);
         var editTextGradeWeights: EditText = itemView.findViewById(R.id.editTextGradeWeight)
         var editTextGradeCredits: EditText = itemView.findViewById(R.id.editTextCreditsofSubject)
         var editGradesContainer: LinearLayout = itemView.findViewById(R.id.editGradesContainer)
-        var textViewCreditsosSubject: TextView =
-            itemView.findViewById(R.id.textViewCreditsosSubject)
+        var checkBoxUseGradeForAverage: CheckBox =
+            itemView.findViewById(R.id.checkBoxUseGradeForAverage)
     }
 
     companion object {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index 20ec44b2ff..e4986f466f 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -38,7 +38,7 @@ data class Exam(
     @PropertyElement(name = "lv_semester")
     val semester: String = "",
     @PropertyElement(name = "weight")
-    var weight: Int = 0,
+    var weight: Double = 1.0,
     @PropertyElement(name = "gradeUsedInAverage")
     var gradeUsedInAverage: Boolean? = false,
     @PropertyElement(name = "subjectcredits")               //must not be "credits" -> otherwise naming collision will occur
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 4a62974b41..b9e2ffbdeb 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -86,7 +86,7 @@
                 android:text="Reset Grade" />
 
             <CheckBox
-                android:id="@+id/checkBox2"
+                android:id="@+id/checkBoxUseGradeForAverage"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="5"

From f4abf2dfbbabcdd3f1c3a4e7ffd1a5c81509a580 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 6 May 2022 15:11:10 +0200
Subject: [PATCH 39/71] reordered ui elements for better visibility

---
 .../main/res/drawable/grade_background.xml    |   2 +-
 .../res/layout/activity_grades_listview.xml   | 175 +++++++++---------
 2 files changed, 92 insertions(+), 85 deletions(-)

diff --git a/app/src/main/res/drawable/grade_background.xml b/app/src/main/res/drawable/grade_background.xml
index 7a0aa515a2..8947607ebd 100644
--- a/app/src/main/res/drawable/grade_background.xml
+++ b/app/src/main/res/drawable/grade_background.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <size android:height="60dp" android:width="60dp"/>
+    <size android:height="0dp" android:width="64dp"/>
     <corners android:radius="10dp"/>
     <solid android:color="@color/grade_default"/>
 </shape>
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index b9e2ffbdeb..49022ca12b 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -8,7 +9,9 @@
     android:paddingStart="@dimen/material_default_padding"
     android:paddingTop="@dimen/material_small_padding"
     android:paddingEnd="@dimen/material_default_padding"
-    android:paddingBottom="@dimen/material_small_padding">
+    android:paddingBottom="@dimen/material_small_padding"
+
+    android:layout_marginBottom="@dimen/material_default_padding">
 
 
     <LinearLayout
@@ -46,6 +49,90 @@
                 android:visibility="visible"
                 tools:text="Examiner" />
 
+            <LinearLayout
+                android:id="@+id/editGradesContainer"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="10">
+
+                    <TextView
+                        android:id="@+id/textViewCreditsosSubject"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+                        android:labelFor="@+id/editTextCreditsofSubject"
+                        android:text="Credits:" />
+
+                    <EditText
+                        android:id="@+id/editTextCreditsofSubject"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+                        android:autofillHints="8"
+                        android:ems="10"
+                        android:inputType="numberSigned" />
+
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="10">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+                        android:labelFor="@+id/editTextGradeWeight"
+                        android:text="Gewichtung der Note:" />
+
+                    <EditText
+                        android:id="@+id/editTextGradeWeight"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+                        android:autofillHints="1.0"
+                        android:ems="10"
+                        android:inputType="numberDecimal" />
+
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="10">
+
+                    <CheckBox
+                        android:id="@+id/checkBoxUseGradeForAverage"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+                        android:text="Note ausblenden" />
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/buttonresetGradeParameters"
+                        style="@style/BlueButton"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="5"
+                        android:text="Reset Grade"
+                        android:textAllCaps="false"
+                        app:cornerRadius="@dimen/material_corner_radius" />
+
+
+                </LinearLayout>
+            </LinearLayout>
 
         </LinearLayout>
 
@@ -53,98 +140,18 @@
         <TextView
             android:id="@+id/gradeTextView"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="10dp"
             android:background="@drawable/grade_background"
-            android:gravity="center"
+            android:gravity="center_horizontal"
             android:textColor="@color/white"
             android:textSize="22sp"
             android:textStyle="bold"
+            android:padding="@dimen/material_default_padding"
             tools:text="1,0" />
 
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/editGradesContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:weightSum="10">
-
-            <Button
-                android:id="@+id/buttonresetGradeParameters"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:text="Reset Grade" />
 
-            <CheckBox
-                android:id="@+id/checkBoxUseGradeForAverage"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:text="Note ausblenden" />
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:weightSum="10">
-
-            <TextView
-                android:layout_width="0dp"
-                android:id="@+id/textViewCreditsosSubject"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:labelFor="@+id/editTextCreditsofSubject"
-                android:text="Credits:" />
-
-            <EditText
-                android:id="@+id/editTextCreditsofSubject"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:autofillHints="8"
-                android:ems="10"
-                android:inputType="numberSigned" />
-
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:weightSum="10"
-            android:layout_marginBottom="@dimen/material_default_padding">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:labelFor="@+id/editTextGradeWeight"
-                android:text="Gewichtung der Note:" />
-
-            <EditText
-                android:id="@+id/editTextGradeWeight"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="5"
-                android:autofillHints="1.0"
-                android:ems="10"
-                android:inputType="numberDecimal" />
-
-
-        </LinearLayout>
-    </LinearLayout>
 </LinearLayout>
\ No newline at end of file

From 34b89bde67d9e1aa9dcb2b26e07aae7322d06c91 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 6 May 2022 15:20:57 +0200
Subject: [PATCH 40/71] extracted string ressources

---
 .../component/tumui/grades/ExamListAdapter.kt             | 3 ---
 .../tumcampusapp/component/tumui/grades/GradesFragment.kt | 6 +++---
 app/src/main/res/layout/activity_grades_listview.xml      | 8 ++++----
 app/src/main/res/values-de/strings.xml                    | 4 ++++
 app/src/main/res/values/strings.xml                       | 6 ++++++
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 050a3e6ec6..5180dc17ef 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -3,7 +3,6 @@ package de.tum.`in`.tumcampusapp.component.tumui.grades
 import android.content.Context
 import android.text.Editable
 import android.text.TextWatcher
-import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.CheckBox
@@ -14,8 +13,6 @@ import androidx.core.content.ContextCompat
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyListHeadersAdapter
 import de.tum.`in`.tumcampusapp.component.tumui.grades.model.Exam
-import kotlinx.android.synthetic.main.activity_grades_listview.view.*
-import org.jetbrains.anko.db.INTEGER
 import org.joda.time.format.DateTimeFormat
 
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 8041f6a9ba..7f1df8801d 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -56,6 +56,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private var globaledit = false;
     private val exams = mutableListOf<Exam>();
 
+    private val examSharedPreferences: String="ExamList";
+
     private val grades: Array<String> by lazy {
         resources.getStringArray(R.array.grades)
     }
@@ -152,14 +154,12 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     fun storeExamListInSharedPreferences() {
         val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
-        // val gson = GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").create()
         val dateTimeConverter = DateTimeConverter()
         val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
             .create()
         val jsonlist = gson.toJson(exams)
-        Log.d("Examlistdebugging: ", jsonlist)
         with(sharedPref.edit()) {
-            putString("ExamList", jsonlist)
+            putString(examSharedPreferences, jsonlist)
             apply()
         }
     }
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 49022ca12b..cba4c70e1a 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -68,7 +68,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="5"
                         android:labelFor="@+id/editTextCreditsofSubject"
-                        android:text="Credits:" />
+                        android:text="@string/credits_grade_label" />
 
                     <EditText
                         android:id="@+id/editTextCreditsofSubject"
@@ -93,7 +93,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="5"
                         android:labelFor="@+id/editTextGradeWeight"
-                        android:text="Gewichtung der Note:" />
+                        android:text="@string/grade_weight_label" />
 
                     <EditText
                         android:id="@+id/editTextGradeWeight"
@@ -118,7 +118,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="5"
-                        android:text="Note ausblenden" />
+                        android:text="@string/hide_grade" />
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/buttonresetGradeParameters"
@@ -126,7 +126,7 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="5"
-                        android:text="Reset Grade"
+                        android:text="@string/reset_grade"
                         android:textAllCaps="false"
                         app:cornerRadius="@dimen/material_corner_radius" />
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 54c0dc2990..5a635315ec 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -57,6 +57,10 @@
     <string name="all_programs">Alle Noten</string>
     <string name="date">Datum</string>
     <string name="no_grades">Du hast noch keine Noten, die angezeigt werden könnten.</string>
+    <string name="reset_grade">Note Zurücksetzten</string>
+    <string name="hide_grade">Note ausblenden</string>
+    <string name="grade_weight_label">Gewichtung der Note:</string>
+    <string name="credits_grade_label">Credits:</string>
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Kennung</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd9aa12d4e..028838af62 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -84,6 +84,10 @@
     <string name="date">Date</string>
     <string name="credits" translatable="false">ECTS</string>
     <string name="no_grades">You don\'t have any grades yet.</string>
+    <string name="reset_grade">Reset Grade</string>
+    <string name="hide_grade">Hide Grade</string>
+    <string name="grade_weight_label">Grade Weight:</string>
+    <string name="credits_grade_label">Credits:</string>
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Identification</string>
@@ -771,4 +775,6 @@ Signature: %5$s</string>
     <string name="language">en</string>
     <string name="use_existing">Use existing</string>
 
+
+
 </resources>

From 9cf7c9e354fac097ad982cbd020b923525e257d6 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 6 May 2022 16:11:26 +0200
Subject: [PATCH 41/71] downloading new grades update the existing grade list

---
 .../component/tumui/grades/GradesFragment.kt  | 36 ++++++++++++-------
 .../component/tumui/grades/model/ExamList.kt  |  2 +-
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 7f1df8801d..1dee91cd66 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -6,7 +6,6 @@ import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
-import android.util.Log
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
@@ -30,6 +29,7 @@ import de.tum.`in`.tumcampusapp.component.tumui.grades.model.ExamList
 import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
+import kotlinx.android.synthetic.main.fragment_grades.*
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
@@ -56,7 +56,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private var globaledit = false;
     private val exams = mutableListOf<Exam>();
 
-    private val examSharedPreferences: String="ExamList";
+    private val examSharedPreferences: String = "ExamList";
 
     private val grades: Array<String> by lazy {
         resources.getStringArray(R.array.grades)
@@ -97,8 +97,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             showChartButton?.setOnClickListener { toggleInLandscape() }
         }
 
-        //    loadGrades(CacheControl.USE_CACHE)      //set to BYPASS_CACHE to force a reload
-        loadExamListFromSharedPreferences();
+        loadGrades(CacheControl.USE_CACHE)      //set to BYPASS_CACHE to force a reload
+        //loadExamListFromSharedPreferences();
         // Tracks whether the user has used the calendar module before. This is used in determining when to prompt for a
         // Google Play store review
         Utils.setSetting(requireContext(), Const.HAS_VISITED_GRADES, true)
@@ -113,12 +113,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         fetch(apiCall)
     }
 
-    override fun onDownloadSuccessful(response: ExamList) {     //todo compare both datasets in this method exams einfügen und vergleichen wie anosnten nur bei dem downloader
-        //examsDownloaded = response.exams.orEmpty()
-//todo these exams should be loaded from shared prefrences, not from the cahe -> allows to modify weights
-        //storeExamListInSharedPreferences()
-        //loadExamListFromSharedPreferences()
+    override fun onDownloadSuccessful(response: ExamList) {
+        val examsDownloaded: MutableList<Exam> = response.exams.orEmpty().toMutableList()
 
+        loadExamListFromSharedPreferences()
+        addAllNewItemsToExamList(examsDownloaded)
         initSpinner(exams)
         showExams(exams)
 
@@ -131,6 +130,21 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         storeGradedCourses(exams)
     }
 
+    /**
+     * Adds all exams which are part f the new list to the existing exams list
+     */
+    private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
+
+        val examsTitels = exams.map { it.course }
+        examsDownloaded.removeAll { examsTitels.contains(it.course) }
+
+        if (!examsDownloaded.isEmpty()) {
+            exams.addAll(examsDownloaded)
+            (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
+            storeExamListInSharedPreferences()
+        }
+    }
+
     fun loadExamListFromSharedPreferences() {
         try {
             val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
@@ -138,7 +152,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
                 .create()
             val listType = object : TypeToken<List<Exam>>() {}.type
-            val jsonString = sharedPref.getString("ExamList", "");
+            val jsonString = sharedPref.getString(examSharedPreferences, "");
             if (jsonString != null) {
                 exams.clear();
                 exams.addAll(gson.fromJson(jsonString, listType))
@@ -147,9 +161,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         } catch (e: Exception) {
             exams.clear();
         }
-
         // Exam list could no be loaded - will always e a list, some error occured - clear to prevent any intermediate error states
-
     }
 
     fun storeExamListInSharedPreferences() {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/ExamList.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/ExamList.kt
index df3446c996..cd60a2f853 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/ExamList.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/ExamList.kt
@@ -10,4 +10,4 @@ import com.tickaroo.tikxml.annotation.Xml
  * corresponding request.
  */
 @Xml(name = "rowset")
-data class ExamList(@Element val exams: List<Exam>?)
+data class ExamList(@Element val exams: MutableList<Exam>?)

From e164104a943c30d721e93fa99656bff4c121a8d3 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Fri, 6 May 2022 16:25:25 +0200
Subject: [PATCH 42/71] hidden grades are o displayed correctly after
 initialization

---
 .../component/tumui/grades/ExamListAdapter.kt | 28 ++++++++++++++++---
 .../component/tumui/grades/model/Exam.kt      | 24 +---------------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 5180dc17ef..72ce7ad9dc 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -69,14 +69,19 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             holder.editGradesContainer.visibility = View.VISIBLE
 
         }
-        // localGradesFragment.storeExamListInSharedPreferences()
         initUIElements(holder, exam);
         return view
     }
 
+
+    /**
+     * Init the ui Elements to change the parameters of the grade
+     */
     private fun initUIElements(holder: ViewHolder, exam: Exam) {
         holder.editTextGradeWeights.setText(exam.weight.toString())
         holder.editTextGradeCredits.setText(exam.credits_new.toString())
+        holder.checkBoxUseGradeForAverage.isChecked=exam.gradeUsedInAverage
+        adaptUIToCheckboxStatus(exam.gradeUsedInAverage, holder, exam)
 
         holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
@@ -107,7 +112,8 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { buttonView, isChecked ->
             exam.gradeUsedInAverage=!isChecked
 
-            if (isChecked){
+            adaptUIToCheckboxStatus(isChecked,holder,exam)
+         /*   if (isChecked){
                 holder.editTextGradeCredits.isEnabled=false;
                 holder.editTextGradeWeights.isEnabled=false;
                 holder.gradeTextView.background.setTint(ContextCompat.getColor(context, R.color.transparent))
@@ -118,8 +124,22 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 val gradeColor = exam.getGradeColor(context)
                 holder.gradeTextView.background.setTint(gradeColor)
                 holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
-            }
-           // texview deaktiveren, idealerweise auch die ein Zeichen um die note Setzten(irgendeine Art von Rand?)
+            }*/
+        }
+    }
+
+    private fun adaptUIToCheckboxStatus(gradeUsedInAverage: Boolean, holder: ViewHolder, exam: Exam) {
+        if (gradeUsedInAverage){
+            holder.editTextGradeCredits.isEnabled=false;
+            holder.editTextGradeWeights.isEnabled=false;
+            holder.gradeTextView.background.setTint(ContextCompat.getColor(context, R.color.transparent))
+            holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.grade_default))
+        }else{
+            holder.editTextGradeCredits.isEnabled=true;
+            holder.editTextGradeWeights.isEnabled=true;
+            val gradeColor = exam.getGradeColor(context)
+            holder.gradeTextView.background.setTint(gradeColor)
+            holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
         }
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index e4986f466f..0c9e41cbe5 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -24,7 +24,6 @@ import java.util.*
 data class Exam(
     @PropertyElement(name = "lv_titel")
     val course: String,
-
     @PropertyElement(name = "datum", converter = DateTimeConverter::class)
     val date: DateTime? = null,
     @PropertyElement(name = "pruefer_nachname")
@@ -40,7 +39,7 @@ data class Exam(
     @PropertyElement(name = "weight")
     var weight: Double = 1.0,
     @PropertyElement(name = "gradeUsedInAverage")
-    var gradeUsedInAverage: Boolean? = false,
+    var gradeUsedInAverage: Boolean = false,
     @PropertyElement(name = "subjectcredits")               //must not be "credits" -> otherwise naming collision will occur
     var credits_new: Int = 6,
 
@@ -51,27 +50,6 @@ data class Exam(
 
     override fun getHeaderId() = semester
 
-    /**
-     * Compare all Attributes which were send from tum online,
-     * All added attributes for the individual grades can be neglected
-     */
-   /* override fun equals(other: Any?): Boolean {
-        if (other !is Exam){
-            return false;
-        }
-        val otherExam=(other as Exam)
-        //if (credits.isNullOrEmpty() xor otherExam.credits.isNullOrEmpty()){
-        //    return false
-        //}
-        //val test: String? ="lorem ipsum";
-        //val test1: String? =null;
-        //val test2: String? =null;
-       /* Log.d("Kotlin logic test start: ", test1.equals(test2).toString())
-        Log.d("Kotlin logic test: ", test.equals(test2).toString())
-        Log.d("Kotlin logic test: ", test1.equals(test).toString())*/
-        return otherExam.course.equals(course) && otherExam.programID.equals(programID) && otherExam.semester.equals(semester);
-    }*/
-
     override fun compareTo(other: Exam): Int {
         return compareByDescending<Exam> { it.semester }
                 .thenByDescending { it.date }

From 95a929ab77023449dbb6d6d35704016c19b21f0e Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Mon, 9 May 2022 10:19:58 +0200
Subject: [PATCH 43/71] added ui to manually add exams

---
 .../component/tumui/grades/ExamListAdapter.kt |  98 ++++----
 .../component/tumui/grades/GradesFragment.kt  |  90 +++++++-
 .../component/tumui/grades/model/Exam.kt      | 101 +++++----
 .../main/res/layout-land/fragment_grades.xml  | 213 ++++++++++--------
 .../res/layout/activity_grades_listview.xml   |   2 +-
 .../res/layout/dialog_add_grade_input.xml     | 115 ++++++++++
 app/src/main/res/layout/fragment_grades.xml   | 207 ++++++++++-------
 7 files changed, 547 insertions(+), 279 deletions(-)
 create mode 100644 app/src/main/res/layout/dialog_add_grade_input.xml

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 72ce7ad9dc..8ce7583127 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -5,10 +5,7 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
 import android.view.ViewGroup
-import android.widget.CheckBox
-import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.TextView
+import android.widget.*
 import androidx.core.content.ContextCompat
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyListHeadersAdapter
@@ -42,6 +39,15 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         }
 
         val exam = itemList[position]
+
+
+
+        initUIDisplayElements(holder, exam)
+        initUIEditElements(holder, exam);
+        return view
+    }
+
+    private fun initUIDisplayElements(holder: ViewHolder, exam: Exam) {
         holder.nameTextView.text = exam.course
         holder.gradeTextView.text = exam.grade
 
@@ -61,28 +67,38 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             context.getString(R.string.examiner), exam.examiner,
             context.getString(R.string.mode), exam.modus
         )
+    }
 
 
+    /**
+     * Init the ui Elements to change the parameters of the grade
+     */
+    private fun initUIEditElements(holder: ViewHolder, exam: Exam) {
+        holder.editTextGradeWeights.setText(exam.weight.toString())
+        holder.editTextGradeCredits.setText(exam.credits_new.toString())
+        holder.checkBoxUseGradeForAverage.isChecked = exam.gradeUsedInAverage
+        adaptUIToCheckboxStatus(exam.gradeUsedInAverage, holder, exam)
+
         if (localGradesFragment.getGlobalEdit()) {
             holder.editGradesContainer.visibility = View.GONE
         } else {
             holder.editGradesContainer.visibility = View.VISIBLE
 
         }
-        initUIElements(holder, exam);
-        return view
-    }
 
+        holder.buttonResetGradeParameters.setOnClickListener(object : View.OnClickListener {
+            override fun onClick(p0: View?) {
+                exam.gradeUsedInAverage = false
+                exam.weight = 1.0
+                exam.credits_new = 6
+                adaptUIToCheckboxStatus(false, holder, exam)
+                holder.editTextGradeWeights.setText(exam.weight.toString())
+                holder.editTextGradeCredits.setText(exam.credits_new.toString())
+                localGradesFragment.storeExamListInSharedPreferences()
 
-    /**
-     * Init the ui Elements to change the parameters of the grade
-     */
-    private fun initUIElements(holder: ViewHolder, exam: Exam) {
-        holder.editTextGradeWeights.setText(exam.weight.toString())
-        holder.editTextGradeCredits.setText(exam.credits_new.toString())
-        holder.checkBoxUseGradeForAverage.isChecked=exam.gradeUsedInAverage
-        adaptUIToCheckboxStatus(exam.gradeUsedInAverage, holder, exam)
+            }
 
+        })
         holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 exam.weight = s.toString().toDouble()
@@ -110,33 +126,34 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         })
 
         holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { buttonView, isChecked ->
-            exam.gradeUsedInAverage=!isChecked
-
-            adaptUIToCheckboxStatus(isChecked,holder,exam)
-         /*   if (isChecked){
-                holder.editTextGradeCredits.isEnabled=false;
-                holder.editTextGradeWeights.isEnabled=false;
-                holder.gradeTextView.background.setTint(ContextCompat.getColor(context, R.color.transparent))
-                holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.grade_default))
-            }else{
-                holder.editTextGradeCredits.isEnabled=true;
-                holder.editTextGradeWeights.isEnabled=true;
-                val gradeColor = exam.getGradeColor(context)
-                holder.gradeTextView.background.setTint(gradeColor)
-                holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
-            }*/
+            exam.gradeUsedInAverage = !isChecked
+            adaptUIToCheckboxStatus(isChecked, holder, exam)
         }
     }
 
-    private fun adaptUIToCheckboxStatus(gradeUsedInAverage: Boolean, holder: ViewHolder, exam: Exam) {
-        if (gradeUsedInAverage){
-            holder.editTextGradeCredits.isEnabled=false;
-            holder.editTextGradeWeights.isEnabled=false;
-            holder.gradeTextView.background.setTint(ContextCompat.getColor(context, R.color.transparent))
-            holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.grade_default))
-        }else{
-            holder.editTextGradeCredits.isEnabled=true;
-            holder.editTextGradeWeights.isEnabled=true;
+    private fun adaptUIToCheckboxStatus(
+        gradeUsedInAverage: Boolean,
+        holder: ViewHolder,
+        exam: Exam
+    ) {
+        if (gradeUsedInAverage) {
+            holder.editTextGradeCredits.isEnabled = false;
+            holder.editTextGradeWeights.isEnabled = false;
+            holder.gradeTextView.background.setTint(
+                ContextCompat.getColor(
+                    context,
+                    R.color.transparent
+                )
+            )
+            holder.gradeTextView.setTextColor(
+                ContextCompat.getColor(
+                    context,
+                    R.color.grade_default
+                )
+            )
+        } else {
+            holder.editTextGradeCredits.isEnabled = true;
+            holder.editTextGradeWeights.isEnabled = true;
             val gradeColor = exam.getGradeColor(context)
             holder.gradeTextView.background.setTint(gradeColor)
             holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
@@ -169,6 +186,9 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         var editGradesContainer: LinearLayout = itemView.findViewById(R.id.editGradesContainer)
         var checkBoxUseGradeForAverage: CheckBox =
             itemView.findViewById(R.id.checkBoxUseGradeForAverage)
+        val buttonResetGradeParameters: Button =
+            itemView.findViewById(R.id.buttonResetGradeParameters)
+
     }
 
     companion object {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 1dee91cd66..3b49bdc391 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -4,14 +4,18 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.content.Context
 import android.graphics.Color
+import android.opengl.Visibility
 import android.os.Bundle
 import android.util.ArrayMap
+import android.util.Log
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import android.widget.EditText
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat.getColor
 import com.github.mikephil.charting.components.Legend
@@ -30,6 +34,7 @@ import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
 import kotlinx.android.synthetic.main.fragment_grades.*
+import org.jetbrains.anko.commit
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
@@ -53,11 +58,12 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     private var showBarChartAfterRotate = false
 
-    private var globaledit = false;
+    private var globalEditOn = false;
     private val exams = mutableListOf<Exam>();
 
     private val examSharedPreferences: String = "ExamList";
 
+
     private val grades: Array<String> by lazy {
         resources.getStringArray(R.array.grades)
     }
@@ -95,10 +101,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
             showListButton?.setOnClickListener { toggleInLandscape() }
             showChartButton?.setOnClickListener { toggleInLandscape() }
+            initUIVisibility()
         }
 
-        loadGrades(CacheControl.USE_CACHE)      //set to BYPASS_CACHE to force a reload
         //loadExamListFromSharedPreferences();
+        loadGrades(CacheControl.USE_CACHE)
         // Tracks whether the user has used the calendar module before. This is used in determining when to prompt for a
         // Google Play store review
         Utils.setSetting(requireContext(), Const.HAS_VISITED_GRADES, true)
@@ -130,17 +137,30 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         storeGradedCourses(exams)
     }
 
+    fun addExamToList(exam: Exam) {
+        exams.add(exam)
+        storeExamListInSharedPreferences()
+    }
+
     /**
      * Adds all exams which are part f the new list to the existing exams list
      */
     private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
+        val examsTitles = exams.map { it.course }
+        /*exams.clear()
 
-        val examsTitels = exams.map { it.course }
-        examsDownloaded.removeAll { examsTitels.contains(it.course) }
+        examsDownloaded.removeAll { examsTitles.contains(it.course) }
+        examsDownloaded.get(0).course = "Esotheric Programming"
+        examsDownloaded.get(0).grade = "1,0"
+        examsDownloaded.get(0).examiner = "-"
+
+        examsDownloaded.get(1).course = "Advanced Singing and Clapping"
+        examsDownloaded.get(1).grade = "3,7"
+        examsDownloaded.get(1).examiner = "-"*/
 
         if (!examsDownloaded.isEmpty()) {
+            examsDownloaded.forEach { it.credits_new = 6; it.weight = 1.0; }
             exams.addAll(examsDownloaded)
-            (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
             storeExamListInSharedPreferences()
         }
     }
@@ -173,6 +193,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         with(sharedPref.edit()) {
             putString(examSharedPreferences, jsonlist)
             apply()
+
         }
     }
 
@@ -324,7 +345,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         val grades = exams
             .filter { it.isPassed }
             .map { numberFormat.parse(it.grade).toDouble() }
-
+//todo multiply by it.weight and credits and theen divide by the combined numerb of used numbers
         val gradeSum = grades.sum()
         return gradeSum / grades.size.toDouble()
     }
@@ -375,7 +396,19 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 visibility = View.VISIBLE
             }
         }
-
+        binding.floatingbuttonAddExamGrade?.setOnClickListener(View.OnClickListener { openAddGradeDialog() })
+        /*AlertDialog.Builder(requireContext(), R.layout.dialog_add_grade_input)
+            .setTitle("alarm")
+            .setMessage("important message")
+            .setPositiveButton(R.string.logout) { _, _ -> Log.d("custom dialog","positive button") }
+            .setNegativeButton(R.string.cancel, null)
+            .setCancelable(false)
+            .create()
+            .apply {
+                window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
+            }
+            .show()*/
+        // })
 
         binding.filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(
@@ -399,6 +432,33 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         }
     }
 
+    /**
+     * Prompt the user to type in a name for the new chat room
+     */
+    private fun openAddGradeDialog() {
+        // Set an EditText view to get user input
+        val view = View.inflate(requireContext(), R.layout.dialog_add_grade_input, null)
+        val input = view.findViewById<EditText>(R.id.editTextaddGradeCourseName)
+
+        AlertDialog.Builder(requireContext())
+            .setTitle("Add a new exam manually")
+            .setMessage(
+                "Grades are normally added automatically. In case special grades should be added, this can be done here. " +
+                        "Manually added Exams can be deleted later on.\n\n* required"
+            )
+            .setView(view)
+            .setPositiveButton(R.string.create) { dialogInterface, whichButton ->
+                Log.d("custom dialog", "positive button")
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .setCancelable(false)
+            .create()
+            .apply {
+                window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
+            }
+            .show()
+    }
+
     /**
      * Displays all exams in the list view and chart view. If there are no exams, it displays a
      * placeholder instead.
@@ -495,10 +555,22 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun changeEditMode() {
         with(binding) {
-            globaledit = !globaledit;
+            globalEditOn = !globalEditOn;
 
             // Refresh all values for the ui
             (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
+initUIVisibility()
+        }
+    }
+
+    private fun initUIVisibility() {
+        if (!globalEditOn) {
+            frameLayoutAverageGrade?.visibility  = View.GONE
+            floatingbuttonAddExamGrade?.visibility  = View.VISIBLE
+        }else{
+
+            frameLayoutAverageGrade?.visibility  = View.VISIBLE
+            floatingbuttonAddExamGrade?.visibility  = View.GONE
         }
     }
 
@@ -558,7 +630,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     fun getGlobalEdit(): Boolean {
-        return globaledit;
+        return globalEditOn;
     }
 
     companion object {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index 0c9e41cbe5..0ab70aea05 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -23,13 +23,13 @@ import java.util.*
 @Xml(name = "row")
 data class Exam(
     @PropertyElement(name = "lv_titel")
-    val course: String,
+    var course: String,
     @PropertyElement(name = "datum", converter = DateTimeConverter::class)
     val date: DateTime? = null,
     @PropertyElement(name = "pruefer_nachname")
-    val examiner: String? = null,
+    var examiner: String? = null,
     @PropertyElement(name = "uninotenamekurz")
-    val grade: String? = null,
+    var grade: String? = null,
     @PropertyElement(name = "modus")
     val modus: String? = null,
     @PropertyElement(name = "studienidentifikator")
@@ -42,9 +42,12 @@ data class Exam(
     var gradeUsedInAverage: Boolean = false,
     @PropertyElement(name = "subjectcredits")               //must not be "credits" -> otherwise naming collision will occur
     var credits_new: Int = 6,
+    @PropertyElement(name = "examManuallyAdded")
+    var manuallyAdded: Boolean = false,
 
 
-) : Comparable<Exam>, SimpleStickyListHeadersAdapter.SimpleStickyListItem {
+    ) : Comparable<Exam>, SimpleStickyListHeadersAdapter.SimpleStickyListItem {
+
 
     override fun getHeadName() = semester
 
@@ -52,9 +55,9 @@ data class Exam(
 
     override fun compareTo(other: Exam): Int {
         return compareByDescending<Exam> { it.semester }
-                .thenByDescending { it.date }
-                .thenBy { it.course }
-                .compare(this, other)
+            .thenByDescending { it.date }
+            .thenBy { it.course }
+            .compare(this, other)
     }
 
     private val gradeValue: Double?
@@ -72,54 +75,54 @@ data class Exam(
         // grade colors are assigned to grades like 1,52 as if they were a 1,5
         var resId = R.color.grade_default
         if (grade?.length!! > 2) {
-            resId = GRADE_COLORS[grade.subSequence(0, 3)] ?: R.color.grade_default
+            resId = GRADE_COLORS[grade!!.subSequence(0, 3)] ?: R.color.grade_default
         }
         return ContextCompat.getColor(context, resId)
     }
 
     companion object {
         private val GRADE_COLORS = mapOf(
-                "1,0" to R.color.grade_1_0,
-                "1,1" to R.color.grade_1_1,
-                "1,2" to R.color.grade_1_2,
-                "1,3" to R.color.grade_1_3,
-                "1,4" to R.color.grade_1_4,
-                "1,5" to R.color.grade_1_5,
-                "1,6" to R.color.grade_1_6,
-                "1,7" to R.color.grade_1_7,
-                "1,8" to R.color.grade_1_8,
-                "1,9" to R.color.grade_1_9,
-                "2,0" to R.color.grade_2_0,
-                "2,1" to R.color.grade_2_1,
-                "2,2" to R.color.grade_2_2,
-                "2,3" to R.color.grade_2_3,
-                "2,4" to R.color.grade_2_4,
-                "2,5" to R.color.grade_2_5,
-                "2,6" to R.color.grade_2_6,
-                "2,7" to R.color.grade_2_7,
-                "2,8" to R.color.grade_2_8,
-                "2,9" to R.color.grade_2_9,
-                "3,0" to R.color.grade_3_0,
-                "3,1" to R.color.grade_3_1,
-                "3,2" to R.color.grade_3_2,
-                "3,3" to R.color.grade_3_3,
-                "3,4" to R.color.grade_3_4,
-                "3,5" to R.color.grade_3_5,
-                "3,6" to R.color.grade_3_6,
-                "3,7" to R.color.grade_3_7,
-                "3,8" to R.color.grade_3_8,
-                "3,9" to R.color.grade_3_9,
-                "4,0" to R.color.grade_4_0,
-                "4,1" to R.color.grade_4_1,
-                "4,2" to R.color.grade_4_2,
-                "4,3" to R.color.grade_4_3,
-                "4,4" to R.color.grade_4_4,
-                "4,5" to R.color.grade_4_5,
-                "4,6" to R.color.grade_4_6,
-                "4,7" to R.color.grade_4_7,
-                "4,8" to R.color.grade_4_8,
-                "4,9" to R.color.grade_4_9,
-                "5,0" to R.color.grade_5_0
+            "1,0" to R.color.grade_1_0,
+            "1,1" to R.color.grade_1_1,
+            "1,2" to R.color.grade_1_2,
+            "1,3" to R.color.grade_1_3,
+            "1,4" to R.color.grade_1_4,
+            "1,5" to R.color.grade_1_5,
+            "1,6" to R.color.grade_1_6,
+            "1,7" to R.color.grade_1_7,
+            "1,8" to R.color.grade_1_8,
+            "1,9" to R.color.grade_1_9,
+            "2,0" to R.color.grade_2_0,
+            "2,1" to R.color.grade_2_1,
+            "2,2" to R.color.grade_2_2,
+            "2,3" to R.color.grade_2_3,
+            "2,4" to R.color.grade_2_4,
+            "2,5" to R.color.grade_2_5,
+            "2,6" to R.color.grade_2_6,
+            "2,7" to R.color.grade_2_7,
+            "2,8" to R.color.grade_2_8,
+            "2,9" to R.color.grade_2_9,
+            "3,0" to R.color.grade_3_0,
+            "3,1" to R.color.grade_3_1,
+            "3,2" to R.color.grade_3_2,
+            "3,3" to R.color.grade_3_3,
+            "3,4" to R.color.grade_3_4,
+            "3,5" to R.color.grade_3_5,
+            "3,6" to R.color.grade_3_6,
+            "3,7" to R.color.grade_3_7,
+            "3,8" to R.color.grade_3_8,
+            "3,9" to R.color.grade_3_9,
+            "4,0" to R.color.grade_4_0,
+            "4,1" to R.color.grade_4_1,
+            "4,2" to R.color.grade_4_2,
+            "4,3" to R.color.grade_4_3,
+            "4,4" to R.color.grade_4_4,
+            "4,5" to R.color.grade_4_5,
+            "4,6" to R.color.grade_4_6,
+            "4,7" to R.color.grade_4_7,
+            "4,8" to R.color.grade_4_8,
+            "4,9" to R.color.grade_4_9,
+            "5,0" to R.color.grade_5_0
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_grades.xml b/app/src/main/res/layout-land/fragment_grades.xml
index f863ae1106..8c44a3e516 100644
--- a/app/src/main/res/layout-land/fragment_grades.xml
+++ b/app/src/main/res/layout-land/fragment_grades.xml
@@ -1,127 +1,152 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/gradesLayout"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/gradesLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/floatingbuttonAddExamGrade"
+        style="@style/BlueButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.96"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.8"
+        app:srcCompat="@drawable/ic_add"
+        app:tint="@android:color/white" />
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:elevation="12dp"
-            android:theme="@style/TumToolbar"
-            app:popupTheme="@style/TumToolbarPopUp">
+            android:layout_height="wrap_content">
 
-            <Spinner
-                android:id="@+id/filterSpinner"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:elevation="12dp"
+                android:theme="@style/TumToolbar"
+                app:popupTheme="@style/TumToolbarPopUp">
 
-        </androidx.appcompat.widget.Toolbar>
+                <Spinner
+                    android:id="@+id/filterSpinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
 
-    </com.google.android.material.appbar.AppBarLayout>
+            </androidx.appcompat.widget.Toolbar>
 
-    <include
-        android:id="@+id/layout_all_errors"
-        layout="@layout/layout_all_errors"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
+        </com.google.android.material.appbar.AppBarLayout>
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
+        <include
+            android:id="@+id/layout_all_errors"
+            layout="@layout/layout_all_errors"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent" />
 
         <FrameLayout
-            android:id="@+id/chartsContainer"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="@dimen/padding_default">
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
-            <com.github.mikephil.charting.charts.PieChart
-                android:id="@+id/pieChartView"
+            <FrameLayout
+                android:id="@+id/chartsContainer"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:visibility="visible" />
+                android:layout_margin="@dimen/padding_default">
 
-            <com.github.mikephil.charting.charts.BarChart
-                android:id="@+id/barChartView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone" />
+                <com.github.mikephil.charting.charts.PieChart
+                    android:id="@+id/pieChartView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="visible" />
 
-        </FrameLayout>
+                <com.github.mikephil.charting.charts.BarChart
+                    android:id="@+id/barChartView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="gone" />
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/swipeRefreshLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone">
+            </FrameLayout>
 
-            <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-                android:id="@+id/gradesListView"
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                android:id="@+id/swipeRefreshLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:scrollbars="vertical" />
+                android:visibility="gone">
 
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+                <se.emilsjolander.stickylistheaders.StickyListHeadersListView
+                    android:id="@+id/gradesListView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scrollbars="vertical" />
 
-    </FrameLayout>
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        </FrameLayout>
 
-        <TextView
-            android:id="@+id/averageGradeTextView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/material_small_padding"
-            android:layout_weight="1"
-            android:textSize="@dimen/semilarge_text_size"
-            android:visibility="visible"
-            tools:text="1.0" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/showListButton"
-            style="@style/Widget.MaterialComponents.Button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="@dimen/material_tiny_padding"
-            android:drawableStart="@drawable/ic_list_bulleted"
-            android:drawablePadding="@dimen/material_small_padding"
-            android:gravity="center"
-            android:text="@string/show_list"
-            android:textColor="@android:color/white"
-            app:backgroundTint="@color/color_primary"
-            app:cornerRadius="@dimen/material_corner_radius" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/showChartButton"
-            style="@style/Widget.MaterialComponents.Button"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="@dimen/material_tiny_padding"
-            android:drawableStart="@drawable/ic_pie_chart"
-            android:drawablePadding="@dimen/material_small_padding"
-            android:gravity="center"
-            android:text="@string/show_chart"
-            android:textColor="@android:color/white"
-            android:visibility="gone"
-            app:backgroundTint="@color/color_primary"
-            app:cornerRadius="@dimen/material_corner_radius" />
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/averageGradeTextView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="@dimen/material_small_padding"
+                android:layout_weight="1"
+                android:textSize="@dimen/semilarge_text_size"
+                android:visibility="visible"
+                tools:text="1.0" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/showListButton"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_margin="@dimen/material_tiny_padding"
+                android:drawableStart="@drawable/ic_list_bulleted"
+                android:drawablePadding="@dimen/material_small_padding"
+                android:gravity="center"
+                android:text="@string/show_list"
+                android:textColor="@android:color/white"
+                app:backgroundTint="@color/color_primary"
+                app:cornerRadius="@dimen/material_corner_radius" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/showChartButton"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_margin="@dimen/material_tiny_padding"
+                android:drawableStart="@drawable/ic_pie_chart"
+                android:drawablePadding="@dimen/material_small_padding"
+                android:gravity="center"
+                android:text="@string/show_chart"
+                android:textColor="@android:color/white"
+                android:visibility="gone"
+                app:backgroundTint="@color/color_primary"
+                app:cornerRadius="@dimen/material_corner_radius" />
+
+        </LinearLayout>
 
     </LinearLayout>
-
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index cba4c70e1a..bddff9d63c 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -121,7 +121,7 @@
                         android:text="@string/hide_grade" />
 
                     <com.google.android.material.button.MaterialButton
-                        android:id="@+id/buttonresetGradeParameters"
+                        android:id="@+id/buttonResetGradeParameters"
                         style="@style/BlueButton"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
new file mode 100644
index 0000000000..676c01106d
--- /dev/null
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:padding="@dimen/material_large_padding">
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextaddGradeCourseName"
+            android:text="Course name *" />
+
+        <EditText
+            android:id="@+id/editTextaddGradeCourseName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="Course name"
+            android:imeOptions="actionGo"
+            android:inputType="textCapWords|textAutoComplete"
+            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextAddGrade"
+            android:text="Grade *" />
+
+        <EditText
+            android:id="@+id/editTextAddGrade"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="1.0"
+            android:ems="10"
+            android:hint="1.0"
+            android:imeOptions="actionGo"
+            android:inputType="numberDecimal" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextaddGradeExaminer"
+            android:text="Examiner" />
+
+        <EditText
+            android:id="@+id/editTextaddGradeExaminer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="Examiner name"
+            android:imeOptions="actionGo"
+            android:inputType="textCapWords|textAutoComplete"
+            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextaddGradeCredits"
+            android:text="Credits" />
+
+        <EditText
+            android:id="@+id/editTextaddGradeCredits"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="Credits"
+            android:imeOptions="actionGo"
+            android:inputType="numberSigned"
+            android:text="6"
+            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextAddGradeWeight"
+            android:text="Grade weight" />
+
+        <EditText
+            android:id="@+id/editTextAddGradeWeight"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="1.0"
+            android:ems="10"
+            android:hint="Grade Weight"
+            android:imeOptions="actionGo"
+            android:inputType="numberDecimal"
+            android:text="1.0" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextAddGradeDate"
+            android:text="Examination Date" />
+
+        <EditText
+            android:id="@+id/editTextAddGradeDate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="date" />
+
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index 691ab72c0e..a62b23818c 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -1,115 +1,148 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/gradesLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:elevation="12dp"
-            android:theme="@style/TumToolbar"
-            app:popupTheme="@style/TumToolbarPopUp">
-
-            <Spinner
-                android:id="@+id/filterSpinner"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/gradesLayout"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
 
-        </androidx.appcompat.widget.Toolbar>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/floatingbuttonAddExamGrade"
+        style="@style/BlueButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="16dp"
+        android:clickable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
 
-    </com.google.android.material.appbar.AppBarLayout>
+        app:tint="@android:color/white"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0"
+        app:srcCompat="@drawable/ic_add" />
 
-    <include
-        android:id="@+id/layout_all_errors"
-        layout="@layout/layout_all_errors"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+    <LinearLayout
 
-    <FrameLayout
-        android:id="@+id/contentContainer"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <FrameLayout
-            android:id="@+id/chartsContainer"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="200dp"
-            android:padding="@dimen/material_default_padding"
-            android:background="@color/default_window_background"
-            android:visibility="invisible">
+            android:layout_height="wrap_content">
 
-            <com.github.mikephil.charting.charts.PieChart
-                android:id="@+id/pieChartView"
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="visible" />
+                android:layout_height="?attr/actionBarSize"
+                android:elevation="12dp"
+                android:theme="@style/TumToolbar"
+                app:popupTheme="@style/TumToolbarPopUp">
 
-            <com.github.mikephil.charting.charts.BarChart
-                android:id="@+id/barChartView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone" />
+                <Spinner
+                    android:id="@+id/filterSpinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
 
-        </FrameLayout>
+            </androidx.appcompat.widget.Toolbar>
+
+        </com.google.android.material.appbar.AppBarLayout>
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/swipeRefreshLayout"
+        <include
+            android:id="@+id/layout_all_errors"
+            layout="@layout/layout_all_errors"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent" />
 
-            <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-                android:id="@+id/gradesListView"
+        <FrameLayout
+            android:id="@+id/contentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <FrameLayout
+                android:id="@+id/chartsContainer"
+                android:layout_width="match_parent"
+                android:layout_height="200dp"
+                android:background="@color/default_window_background"
+                android:padding="@dimen/material_default_padding"
+                android:visibility="invisible">
+
+                <com.github.mikephil.charting.charts.PieChart
+                    android:id="@+id/pieChartView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="visible" />
+
+                <com.github.mikephil.charting.charts.BarChart
+                    android:id="@+id/barChartView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="gone" />
+
+            </FrameLayout>
+
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                android:id="@+id/swipeRefreshLayout"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="false"
-                android:divider="@color/list_divider"
-                android:paddingTop="200dp"
-                android:scrollbars="vertical" />
+                android:layout_height="match_parent">
 
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+                <se.emilsjolander.stickylistheaders.StickyListHeadersListView
+                    android:id="@+id/gradesListView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:clipToPadding="false"
+                    android:divider="@color/list_divider"
+                    android:paddingTop="200dp"
+                    android:scrollbars="vertical" />
 
-    </FrameLayout>
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/pop_up_background"
-        android:padding="@dimen/material_default_padding">
+        </FrameLayout>
 
-        <LinearLayout
+        <FrameLayout
+            android:id="@+id/frameLayoutAverageGrade"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:background="@color/pop_up_background"
+            android:visibility="gone"
+            android:padding="@dimen/material_default_padding">
 
-            <TextView
-                android:id="@+id/averageGradeTextView"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/text_light_blue"
-                android:textSize="@dimen/semilarge_text_size"
-                android:textStyle="bold"
-                android:visibility="visible"
-                tools:text="Average grade: 1.0" />
-
-            <TextView
-                android:id="@+id/averageGradeHintTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/text_light_blue"
-                android:visibility="visible"
-                android:text="@string/average_grade_hint"/>
-        </LinearLayout>
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/averageGradeTextView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/text_light_blue"
+                    android:textSize="@dimen/semilarge_text_size"
+                    android:textStyle="bold"
+                    android:visibility="visible"
+                    tools:text="Average grade: 1.0" />
+
+                <TextView
+                    android:id="@+id/averageGradeHintTextView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/average_grade_hint"
+                    android:textColor="@color/text_light_blue"
+                    android:visibility="visible" />
+            </LinearLayout>
+
+        </FrameLayout>
 
-    </FrameLayout>
 
-</LinearLayout>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 97cae1f5f05bbfe5da6b1b7c5519a3a033c01795 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Mon, 9 May 2022 14:52:38 +0200
Subject: [PATCH 44/71] added ui to delete manually added exams

---
 .../component/tumui/grades/ExamListAdapter.kt |  19 +-
 .../component/tumui/grades/GradesFragment.kt  |  53 ++---
 .../res/layout/activity_grades_listview.xml   |  46 ++--
 .../res/layout/dialog_add_grade_input.xml     | 217 +++++++++---------
 4 files changed, 185 insertions(+), 150 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 8ce7583127..07c91d8520 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -81,11 +81,20 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
         if (localGradesFragment.getGlobalEdit()) {
             holder.editGradesContainer.visibility = View.GONE
-        } else {
+            holder.gradeTextViewDeleteCustomGrade.visibility=View.GONE
+        } else {//todo show button only if the exam was added manually - test the parameter
             holder.editGradesContainer.visibility = View.VISIBLE
-
+            holder.gradeTextViewDeleteCustomGrade.visibility=View.VISIBLE
+            holder.gradeTextViewDeleteCustomGrade.background.setTint(
+                ContextCompat.getColor(
+                    context,
+                    R.color.grade_default
+                )
+            )
         }
 
+
+
         holder.buttonResetGradeParameters.setOnClickListener(object : View.OnClickListener {
             override fun onClick(p0: View?) {
                 exam.gradeUsedInAverage = false
@@ -129,6 +138,9 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             exam.gradeUsedInAverage = !isChecked
             adaptUIToCheckboxStatus(isChecked, holder, exam)
         }
+
+
+       // holder.gradeTextViewDeleteCustomGrade.
     }
 
     private fun adaptUIToCheckboxStatus(
@@ -188,6 +200,9 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             itemView.findViewById(R.id.checkBoxUseGradeForAverage)
         val buttonResetGradeParameters: Button =
             itemView.findViewById(R.id.buttonResetGradeParameters)
+        val gradeTextViewDeleteCustomGrade: TextView =
+            itemView.findViewById(R.id.gradeTextViewDeleteCustomGrade)
+
 
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 3b49bdc391..d670fb0812 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -147,8 +147,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
         val examsTitles = exams.map { it.course }
-        /*exams.clear()
-
+        exams.clear()
+/*
         examsDownloaded.removeAll { examsTitles.contains(it.course) }
         examsDownloaded.get(0).course = "Esotheric Programming"
         examsDownloaded.get(0).grade = "1,0"
@@ -390,25 +390,14 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         )
 
         with(binding) {
-            filterSpinner?.apply {
+            filterSpinner.apply {
                 adapter = spinnerArrayAdapter
                 setSelection(spinnerPosition)
                 visibility = View.VISIBLE
             }
         }
-        binding.floatingbuttonAddExamGrade?.setOnClickListener(View.OnClickListener { openAddGradeDialog() })
-        /*AlertDialog.Builder(requireContext(), R.layout.dialog_add_grade_input)
-            .setTitle("alarm")
-            .setMessage("important message")
-            .setPositiveButton(R.string.logout) { _, _ -> Log.d("custom dialog","positive button") }
-            .setNegativeButton(R.string.cancel, null)
-            .setCancelable(false)
-            .create()
-            .apply {
-                window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
-            }
-            .show()*/
-        // })
+        binding.floatingbuttonAddExamGrade.setOnClickListener({ openAddGradeDialog() })
+
 
         binding.filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(
@@ -438,9 +427,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun openAddGradeDialog() {
         // Set an EditText view to get user input
         val view = View.inflate(requireContext(), R.layout.dialog_add_grade_input, null)
-        val input = view.findViewById<EditText>(R.id.editTextaddGradeCourseName)
 
-        AlertDialog.Builder(requireContext())
+
+        val dialog = AlertDialog.Builder(requireContext())
             .setTitle("Add a new exam manually")
             .setMessage(
                 "Grades are normally added automatically. In case special grades should be added, this can be done here. " +
@@ -448,15 +437,23 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             )
             .setView(view)
             .setPositiveButton(R.string.create) { dialogInterface, whichButton ->
-                Log.d("custom dialog", "positive button")
+
+                val name = view.findViewById<EditText>(R.id.editTextaddGradeCourseName).text
+                val grade = view.findViewById<EditText>(R.id.editTextAddGrade).text
+                val examiner = view.findViewById<EditText>(R.id.editTextaddGradeExaminer).text
+                val weight = view.findViewById<EditText>(R.id.editTextAddGradeWeight).text
+                val credits = view.findViewById<EditText>(R.id.editTextaddGradeCredits).text
+                val date = view.findViewById<EditText>(R.id.editTextAddGradeDate).text
+                Log.d("custom dialog", "positive button, Grade: " + grade)
             }
             .setNegativeButton(android.R.string.cancel, null)
-            .setCancelable(false)
             .create()
             .apply {
                 window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
-            }
-            .show()
+            };
+        dialog.show()
+        dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.text_primary));
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.text_primary));
     }
 
     /**
@@ -559,18 +556,18 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
             // Refresh all values for the ui
             (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
-initUIVisibility()
+            initUIVisibility()
         }
     }
 
     private fun initUIVisibility() {
         if (!globalEditOn) {
-            frameLayoutAverageGrade?.visibility  = View.GONE
-            floatingbuttonAddExamGrade?.visibility  = View.VISIBLE
-        }else{
+            frameLayoutAverageGrade?.visibility = View.GONE
+            floatingbuttonAddExamGrade?.visibility = View.VISIBLE
+        } else {
 
-            frameLayoutAverageGrade?.visibility  = View.VISIBLE
-            floatingbuttonAddExamGrade?.visibility  = View.GONE
+            frameLayoutAverageGrade?.visibility = View.VISIBLE
+            floatingbuttonAddExamGrade?.visibility = View.GONE
         }
     }
 
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index bddff9d63c..8b8b03c8bb 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -4,14 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/material_default_padding"
     android:background="@color/default_window_background"
     android:orientation="vertical"
     android:paddingStart="@dimen/material_default_padding"
     android:paddingTop="@dimen/material_small_padding"
     android:paddingEnd="@dimen/material_default_padding"
-    android:paddingBottom="@dimen/material_small_padding"
 
-    android:layout_marginBottom="@dimen/material_default_padding">
+    android:paddingBottom="@dimen/material_small_padding">
 
 
     <LinearLayout
@@ -136,21 +136,39 @@
 
         </LinearLayout>
 
-
-        <TextView
-            android:id="@+id/gradeTextView"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="10dp"
-            android:background="@drawable/grade_background"
-            android:gravity="center_horizontal"
-            android:textColor="@color/white"
-            android:textSize="22sp"
-            android:textStyle="bold"
-            android:padding="@dimen/material_default_padding"
-            tools:text="1,0" />
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/gradeTextViewDeleteCustomGrade"
+                android:layout_width="wrap_content"
+                android:layout_height="64dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/grade_background"
+                android:gravity="center"
+                android:padding="@dimen/material_default_padding"
+                android:tint="@android:color/white"
+                android:layout_marginBottom="8dp"
+                android:drawableStart="@drawable/ic_clear"
+                />
 
+            <TextView
+                android:id="@+id/gradeTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="10dp"
+                android:background="@drawable/grade_background"
+                android:gravity="center_horizontal"
+                android:padding="@dimen/material_default_padding"
+                android:textColor="@color/white"
+                android:textSize="22sp"
+                android:textStyle="bold"
+                tools:text="1,0" />
+        </LinearLayout>
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 676c01106d..629dc3057f 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -1,115 +1,120 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="wrap_content"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:padding="@dimen/material_large_padding">
+    android:layout_height="wrap_content">
 
-
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/material_default_padding"
-            android:labelFor="@+id/editTextaddGradeCourseName"
-            android:text="Course name *" />
-
-        <EditText
-            android:id="@+id/editTextaddGradeCourseName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="Course name"
-            android:imeOptions="actionGo"
-            android:inputType="textCapWords|textAutoComplete"
-            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/material_default_padding"
-            android:labelFor="@+id/editTextAddGrade"
-            android:text="Grade *" />
+        android:layout_height="256dp"
+        android:padding="@dimen/material_large_padding">
 
-        <EditText
-            android:id="@+id/editTextAddGrade"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autofillHints="1.0"
-            android:ems="10"
-            android:hint="1.0"
-            android:imeOptions="actionGo"
-            android:inputType="numberDecimal" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/material_default_padding"
-            android:labelFor="@+id/editTextaddGradeExaminer"
-            android:text="Examiner" />
-
-        <EditText
-            android:id="@+id/editTextaddGradeExaminer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="Examiner name"
-            android:imeOptions="actionGo"
-            android:inputType="textCapWords|textAutoComplete"
-            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
 
-        <TextView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/material_default_padding"
-            android:labelFor="@+id/editTextaddGradeCredits"
-            android:text="Credits" />
-
-        <EditText
-            android:id="@+id/editTextaddGradeCredits"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="Credits"
-            android:imeOptions="actionGo"
-            android:inputType="numberSigned"
-            android:text="6"
-            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
-
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/material_default_padding"
-            android:labelFor="@+id/editTextAddGradeWeight"
-            android:text="Grade weight" />
-
-        <EditText
-            android:id="@+id/editTextAddGradeWeight"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:autofillHints="1.0"
-            android:ems="10"
-            android:hint="Grade Weight"
-            android:imeOptions="actionGo"
-            android:inputType="numberDecimal"
-            android:text="1.0" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/material_default_padding"
-            android:labelFor="@+id/editTextAddGradeDate"
-            android:text="Examination Date" />
-
-        <EditText
-            android:id="@+id/editTextAddGradeDate"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ems="10"
-            android:inputType="date" />
-
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/material_default_padding"
+                android:labelFor="@+id/editTextaddGradeCourseName"
+                android:text="Course name *" />
+
+            <EditText
+                android:id="@+id/editTextaddGradeCourseName"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Course name"
+                android:imeOptions="actionGo"
+                android:inputType="textCapWords|textAutoComplete"
+                android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/material_default_padding"
+                android:labelFor="@+id/editTextAddGrade"
+                android:text="Grade *" />
+
+            <EditText
+                android:id="@+id/editTextAddGrade"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="1.0"
+                android:ems="10"
+                android:hint="1.0"
+                android:imeOptions="actionGo"
+                android:inputType="numberDecimal" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/material_default_padding"
+                android:labelFor="@+id/editTextaddGradeExaminer"
+                android:text="Examiner" />
+
+            <EditText
+                android:id="@+id/editTextaddGradeExaminer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Examiner name"
+                android:imeOptions="actionGo"
+                android:inputType="textCapWords|textAutoComplete"
+                android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/material_default_padding"
+                android:labelFor="@+id/editTextaddGradeCredits"
+                android:text="Credits" />
+
+            <EditText
+                android:id="@+id/editTextaddGradeCredits"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Credits"
+                android:imeOptions="actionGo"
+                android:inputType="numberSigned"
+                android:text="6"
+                android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/material_default_padding"
+                android:labelFor="@+id/editTextAddGradeWeight"
+                android:text="Grade weight" />
+
+            <EditText
+                android:id="@+id/editTextAddGradeWeight"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="1.0"
+                android:ems="10"
+                android:hint="Grade Weight"
+                android:imeOptions="actionGo"
+                android:inputType="numberDecimal"
+                android:text="1.0" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/material_default_padding"
+                android:labelFor="@+id/editTextAddGradeDate"
+                android:text="Examination Date" />
+
+            <EditText
+                android:id="@+id/editTextAddGradeDate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="date" />
+
+
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>
\ No newline at end of file

From 154df3e53fc373d84acb2fc2f356c1b248272430 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Wed, 11 May 2022 08:57:05 +0200
Subject: [PATCH 45/71] added logic to delete manually added exams

---
 .../component/tumui/grades/ExamListAdapter.kt | 26 ++++++++++++++++++-
 .../component/tumui/grades/GradesFragment.kt  |  5 ++++
 .../res/layout/activity_grades_listview.xml   |  6 ++---
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 07c91d8520..277b78ccd9 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -3,9 +3,11 @@ package de.tum.`in`.tumcampusapp.component.tumui.grades
 import android.content.Context
 import android.text.Editable
 import android.text.TextWatcher
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import de.tum.`in`.tumcampusapp.R
 import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyListHeadersAdapter
@@ -93,6 +95,28 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             )
         }
 
+        holder.gradeTextViewDeleteCustomGrade.setOnClickListener(object: View.OnClickListener{
+            override fun onClick(p0: View?) {
+                val dialog = AlertDialog.Builder(localGradesFragment.requireContext())
+                    .setTitle("Delete Exam")
+                    .setMessage(
+                        "Should this exam be irrevocably deleted"
+                    )
+                    .setPositiveButton("Delete") { dialogInterface, whichButton ->
+
+                       localGradesFragment.deleteExamFromList(exam)
+                    }
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .create()
+                    .apply {
+                        window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
+                    };
+                dialog.show()
+                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(localGradesFragment.getResources().getColor(R.color.text_primary));
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(localGradesFragment.getResources().getColor(R.color.text_primary));
+            }
+
+        })
 
 
         holder.buttonResetGradeParameters.setOnClickListener(object : View.OnClickListener {
@@ -200,7 +224,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             itemView.findViewById(R.id.checkBoxUseGradeForAverage)
         val buttonResetGradeParameters: Button =
             itemView.findViewById(R.id.buttonResetGradeParameters)
-        val gradeTextViewDeleteCustomGrade: TextView =
+        val gradeTextViewDeleteCustomGrade: ImageView =
             itemView.findViewById(R.id.gradeTextViewDeleteCustomGrade)
 
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index d670fb0812..d707c40083 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -630,6 +630,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         return globalEditOn;
     }
 
+    fun deleteExamFromList(exam: Exam) {
+        exams.remove(exam)
+        (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
+    }
+
     companion object {
         private const val KEY_SHOW_BAR_CHART = "showPieChart"
         private const val KEY_SPINNER_POSITION = "spinnerPosition"
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 8b8b03c8bb..d4fe5a66d6 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -141,7 +141,7 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <TextView
+            <ImageView
                 android:id="@+id/gradeTextViewDeleteCustomGrade"
                 android:layout_width="wrap_content"
                 android:layout_height="64dp"
@@ -150,9 +150,9 @@
                 android:background="@drawable/grade_background"
                 android:gravity="center"
                 android:padding="@dimen/material_default_padding"
-                android:tint="@android:color/white"
+                app:tint="@android:color/white"
                 android:layout_marginBottom="8dp"
-                android:drawableStart="@drawable/ic_clear"
+                android:src="@drawable/ic_clear"
                 />
 
             <TextView

From 3fcc9399efa463526478e6d5aacf6ace1a64907f Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Wed, 11 May 2022 12:46:22 +0200
Subject: [PATCH 46/71] added logic to manually add exams

---
 .../tumonline/converters/DateTimeConverter.kt |  8 ++-
 .../component/tumui/grades/GradesFragment.kt  | 69 ++++++++++++++++---
 .../res/layout/dialog_add_grade_input.xml     | 29 ++++++--
 3 files changed, 88 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/api/tumonline/converters/DateTimeConverter.kt b/app/src/main/java/de/tum/in/tumcampusapp/api/tumonline/converters/DateTimeConverter.kt
index 15f1d3db5b..ca0d5c991b 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/api/tumonline/converters/DateTimeConverter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/api/tumonline/converters/DateTimeConverter.kt
@@ -9,9 +9,11 @@ import org.joda.time.format.DateTimeFormat
 class DateTimeConverter : TypeConverter<DateTime?> {
 
     private val formats = arrayOf(
-            "yyyy-MM-dd",
-            "yyyy-MM-dd HH:mm",
-            "yyyy-MM-dd HH:mm:ss"
+        "dd.MM.yy",
+        "dd.MM.yyyy",
+        "yyyy-MM-dd",
+        "yyyy-MM-dd HH:mm",
+        "yyyy-MM-dd HH:mm:ss"
     )
 
     override fun read(value: String?): DateTime? {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index d707c40083..be6bdc6dcc 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -4,7 +4,6 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.content.Context
 import android.graphics.Color
-import android.opengl.Visibility
 import android.os.Bundle
 import android.util.ArrayMap
 import android.util.Log
@@ -34,7 +33,6 @@ import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
 import kotlinx.android.synthetic.main.fragment_grades.*
-import org.jetbrains.anko.commit
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
@@ -158,6 +156,31 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         examsDownloaded.get(1).grade = "3,7"
         examsDownloaded.get(1).examiner = "-"*/
 
+        /* val title = "title"
+         val grade = "1,0"
+         val examiner = "examiner"
+         val weight = 1.0
+         val credits = 4
+         val date = "11.03.22"
+
+         val typeConverter1 =
+             de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
+         val exam: Exam = Exam(
+             title,
+             typeConverter1.read(date),
+             examiner,
+             grade,
+             "schriftlich",
+             "31415",
+             "22W",
+             weight,
+             false,
+             credits,
+             true
+         )
+         exams.add(exam)
+         Log.d("new exam", "exam was added")*/
+
         if (!examsDownloaded.isEmpty()) {
             examsDownloaded.forEach { it.credits_new = 6; it.weight = 1.0; }
             exams.addAll(examsDownloaded)
@@ -438,13 +461,35 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             .setView(view)
             .setPositiveButton(R.string.create) { dialogInterface, whichButton ->
 
-                val name = view.findViewById<EditText>(R.id.editTextaddGradeCourseName).text
-                val grade = view.findViewById<EditText>(R.id.editTextAddGrade).text
-                val examiner = view.findViewById<EditText>(R.id.editTextaddGradeExaminer).text
-                val weight = view.findViewById<EditText>(R.id.editTextAddGradeWeight).text
-                val credits = view.findViewById<EditText>(R.id.editTextaddGradeCredits).text
-                val date = view.findViewById<EditText>(R.id.editTextAddGradeDate).text
-                Log.d("custom dialog", "positive button, Grade: " + grade)
+                val title =
+                    view.findViewById<EditText>(R.id.editTextaddGradeCourseName).text.toString()
+                val grade = view.findViewById<EditText>(R.id.editTextAddGrade).text.toString()
+                val examiner =
+                    view.findViewById<EditText>(R.id.editTextaddGradeExaminer).text.toString()
+                val weight =
+                    (view.findViewById<EditText>(R.id.editTextAddGradeWeight).text.toString()).toDouble()
+                val credits =
+                    Integer.parseInt(view.findViewById<EditText>(R.id.editTextaddGradeCredits).text.toString())
+                val date = view.findViewById<EditText>(R.id.editTextAddGradeDate).text.toString()
+                val semester = view.findViewById<EditText>(R.id.editTextSemester).text.toString()
+
+                val typeConverter1 =
+                    de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
+                val exam: Exam = Exam(
+                    title,
+                    typeConverter1.read(date),
+                    examiner,
+                    grade,
+                    null,
+                    "",
+                    semester,
+                    weight,
+                    false,
+                    credits,
+                    true
+                )
+                addExamToList(exam)
+
             }
             .setNegativeButton(android.R.string.cancel, null)
             .create()
@@ -452,8 +497,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
             };
         dialog.show()
-        dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.text_primary));
-        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.text_primary));
+        dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
+            .setTextColor(getResources().getColor(R.color.text_primary));
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE)
+            .setTextColor(getResources().getColor(R.color.text_primary));
     }
 
     /**
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 629dc3057f..5590220b39 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -26,7 +26,8 @@
                 android:id="@+id/editTextaddGradeCourseName"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="Course name"
+                android:hint="Course Name"
+                android:text="Thesis"
                 android:imeOptions="actionGo"
                 android:inputType="textCapWords|textAutoComplete"
                 android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
@@ -36,7 +37,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/material_default_padding"
                 android:labelFor="@+id/editTextAddGrade"
-                android:text="Grade *" />
+                android:text="Grade (comma separated) *" />
 
             <EditText
                 android:id="@+id/editTextAddGrade"
@@ -44,7 +45,8 @@
                 android:layout_height="wrap_content"
                 android:autofillHints="1.0"
                 android:ems="10"
-                android:hint="1.0"
+                android:hint="1,0"
+                android:text="1,0"
                 android:imeOptions="actionGo"
                 android:inputType="numberDecimal" />
 
@@ -60,6 +62,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="Examiner name"
+                android:text="@string/unknown"
                 android:imeOptions="actionGo"
                 android:inputType="textCapWords|textAutoComplete"
                 android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
@@ -112,7 +115,25 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ems="10"
-                android:inputType="date" />
+                android:inputType="date"
+                android:hint="dd.mm.yy"
+                android:text="01.01.22"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/material_default_padding"
+                android:labelFor="@+id/editTextSemester"
+                android:text="Year of the start of the semester (e.g. 22)" />
+
+            <EditText
+                android:id="@+id/editTextSemester"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="date"
+                android:hint="yy"
+                android:text="22"/>
 
 
         </LinearLayout>

From 4bf6c4053625fe3cd4cd38fba77acf5dc5d93cc5 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Wed, 11 May 2022 14:44:12 +0200
Subject: [PATCH 47/71] reduced number of store operations, newly added exams
 are now directly shown

---
 .../component/tumui/grades/ExamListAdapter.kt | 14 ++++++++++---
 .../component/tumui/grades/GradesFragment.kt  | 21 +++++++++++++++----
 .../res/layout/dialog_add_grade_input.xml     |  6 +++---
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 277b78ccd9..cdb10c59f6 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -1,6 +1,7 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
+import android.database.DataSetObserver
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
@@ -127,7 +128,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 adaptUIToCheckboxStatus(false, holder, exam)
                 holder.editTextGradeWeights.setText(exam.weight.toString())
                 holder.editTextGradeCredits.setText(exam.credits_new.toString())
-                localGradesFragment.storeExamListInSharedPreferences()
+               // localGradesFragment.storeExamListInSharedPreferences()
 
             }
 
@@ -135,7 +136,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 exam.weight = s.toString().toDouble()
-                localGradesFragment.storeExamListInSharedPreferences()
+              //  localGradesFragment.storeExamListInSharedPreferences()
             }
 
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
@@ -148,7 +149,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 exam.credits_new = s.toString().toInt()
-                localGradesFragment.storeExamListInSharedPreferences()
+               // localGradesFragment.storeExamListInSharedPreferences()
             }
 
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
@@ -234,4 +235,11 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         private val DATE_FORMAT = DateTimeFormat.mediumDate()
     }
 
+    override fun getCount(): Int {
+        return super.getCount()
+    }
+
+    override fun registerDataSetObserver(observer: DataSetObserver?) {
+        super.registerDataSetObserver(observer)
+    }
 }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index be6bdc6dcc..f4d9449427 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -11,6 +11,7 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
+import android.widget.Adapter
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.EditText
@@ -137,6 +138,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     fun addExamToList(exam: Exam) {
         exams.add(exam)
+        binding.gradesListView.adapter = ExamListAdapter(requireContext(), exams, this)
         storeExamListInSharedPreferences()
     }
 
@@ -145,9 +147,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
         val examsTitles = exams.map { it.course }
-        exams.clear()
-/*
         examsDownloaded.removeAll { examsTitles.contains(it.course) }
+        //  exams.clear()
+        //  storeExamListInSharedPreferences()
+/*
+
         examsDownloaded.get(0).course = "Esotheric Programming"
         examsDownloaded.get(0).grade = "1,0"
         examsDownloaded.get(0).examiner = "-"
@@ -216,7 +220,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         with(sharedPref.edit()) {
             putString(examSharedPreferences, jsonlist)
             apply()
-
         }
     }
 
@@ -258,6 +261,13 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         gradesStore.store(courses)
     }
 
+    override fun onPause() {
+
+        storeExamListInSharedPreferences()
+        super.onPause()
+    }
+
+
     /**
      * Displays the pie chart and its data set with the provided grade distribution.
      *
@@ -475,7 +485,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
                 val typeConverter1 =
                     de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
-                val exam: Exam = Exam(
+                val exam = Exam(
                     title,
                     typeConverter1.read(date),
                     examiner,
@@ -600,6 +610,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun changeEditMode() {
         with(binding) {
             globalEditOn = !globalEditOn;
+            if (globalEditOn) {      //save values as the edit mode is switched off.
+                storeExamListInSharedPreferences()
+            }
 
             // Refresh all values for the ui
             (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 5590220b39..541b95b70d 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -124,7 +124,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/material_default_padding"
                 android:labelFor="@+id/editTextSemester"
-                android:text="Year of the start of the semester (e.g. 22)" />
+                android:text="Year of the start of the semester (e.g. 22WS or 21SoSe)" />
 
             <EditText
                 android:id="@+id/editTextSemester"
@@ -132,8 +132,8 @@
                 android:layout_height="wrap_content"
                 android:ems="10"
                 android:inputType="date"
-                android:hint="yy"
-                android:text="22"/>
+                android:hint="yyWS"
+                android:text="22WS"/>
 
 
         </LinearLayout>

From cd763373846c2ccf390c49eadacfc611b5c875fc Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Wed, 11 May 2022 15:07:19 +0200
Subject: [PATCH 48/71] finished manually adding and deleting exams

---
 .../component/tumui/grades/ExamListAdapter.kt | 44 +++++++++----------
 .../component/tumui/grades/GradesFragment.kt  | 23 ++++++++--
 .../res/layout/activity_grades_listview.xml   |  6 +--
 3 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index cdb10c59f6..9f2bb3da54 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -84,19 +84,21 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
         if (localGradesFragment.getGlobalEdit()) {
             holder.editGradesContainer.visibility = View.GONE
-            holder.gradeTextViewDeleteCustomGrade.visibility=View.GONE
-        } else {//todo show button only if the exam was added manually - test the parameter
+            holder.gradeTextViewDeleteCustomGrade.visibility = View.GONE
+        } else {
             holder.editGradesContainer.visibility = View.VISIBLE
-            holder.gradeTextViewDeleteCustomGrade.visibility=View.VISIBLE
-            holder.gradeTextViewDeleteCustomGrade.background.setTint(
-                ContextCompat.getColor(
-                    context,
-                    R.color.grade_default
+            if (exam.manuallyAdded) {
+                holder.gradeTextViewDeleteCustomGrade.visibility = View.VISIBLE
+                holder.gradeTextViewDeleteCustomGrade.background.setTint(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.grade_default
+                    )
                 )
-            )
+            }
         }
 
-        holder.gradeTextViewDeleteCustomGrade.setOnClickListener(object: View.OnClickListener{
+        holder.gradeTextViewDeleteCustomGrade.setOnClickListener(object : View.OnClickListener {
             override fun onClick(p0: View?) {
                 val dialog = AlertDialog.Builder(localGradesFragment.requireContext())
                     .setTitle("Delete Exam")
@@ -105,7 +107,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                     )
                     .setPositiveButton("Delete") { dialogInterface, whichButton ->
 
-                       localGradesFragment.deleteExamFromList(exam)
+                        localGradesFragment.deleteExamFromList(exam)
                     }
                     .setNegativeButton(android.R.string.cancel, null)
                     .create()
@@ -113,8 +115,12 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                         window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
                     };
                 dialog.show()
-                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(localGradesFragment.getResources().getColor(R.color.text_primary));
-                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(localGradesFragment.getResources().getColor(R.color.text_primary));
+                dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(
+                    localGradesFragment.getResources().getColor(R.color.text_primary)
+                );
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(
+                    localGradesFragment.getResources().getColor(R.color.text_primary)
+                );
             }
 
         })
@@ -128,7 +134,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 adaptUIToCheckboxStatus(false, holder, exam)
                 holder.editTextGradeWeights.setText(exam.weight.toString())
                 holder.editTextGradeCredits.setText(exam.credits_new.toString())
-               // localGradesFragment.storeExamListInSharedPreferences()
+                // localGradesFragment.storeExamListInSharedPreferences()
 
             }
 
@@ -136,7 +142,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 exam.weight = s.toString().toDouble()
-              //  localGradesFragment.storeExamListInSharedPreferences()
+                //  localGradesFragment.storeExamListInSharedPreferences()
             }
 
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
@@ -149,7 +155,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 exam.credits_new = s.toString().toInt()
-               // localGradesFragment.storeExamListInSharedPreferences()
+                // localGradesFragment.storeExamListInSharedPreferences()
             }
 
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
@@ -165,7 +171,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         }
 
 
-       // holder.gradeTextViewDeleteCustomGrade.
+        // holder.gradeTextViewDeleteCustomGrade.
     }
 
     private fun adaptUIToCheckboxStatus(
@@ -227,18 +233,12 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             itemView.findViewById(R.id.buttonResetGradeParameters)
         val gradeTextViewDeleteCustomGrade: ImageView =
             itemView.findViewById(R.id.gradeTextViewDeleteCustomGrade)
-
-
     }
 
     companion object {
         private val DATE_FORMAT = DateTimeFormat.mediumDate()
     }
 
-    override fun getCount(): Int {
-        return super.getCount()
-    }
-
     override fun registerDataSetObserver(observer: DataSetObserver?) {
         super.registerDataSetObserver(observer)
     }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index f4d9449427..7f793d5c49 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -34,6 +34,9 @@ import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
 import kotlinx.android.synthetic.main.fragment_grades.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.newSingleThreadContext
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
@@ -61,6 +64,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private val exams = mutableListOf<Exam>();
 
     private val examSharedPreferences: String = "ExamList";
+    private val scope = CoroutineScope(newSingleThreadContext("storetopreferences"))
 
 
     private val grades: Array<String> by lazy {
@@ -138,6 +142,15 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     fun addExamToList(exam: Exam) {
         exams.add(exam)
+        changeNumberOfExams()
+    }
+
+    fun deleteExamFromList(exam: Exam) {
+        exams.remove(exam)
+        changeNumberOfExams()
+    }
+
+    private fun changeNumberOfExams() {
         binding.gradesListView.adapter = ExamListAdapter(requireContext(), exams, this)
         storeExamListInSharedPreferences()
     }
@@ -212,6 +225,12 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     fun storeExamListInSharedPreferences() {
+
+        scope.launch { storeExamListInSharedPreferencesThread() }
+
+    }
+
+    private fun storeExamListInSharedPreferencesThread() {
         val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
         val dateTimeConverter = DateTimeConverter()
         val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
@@ -690,10 +709,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         return globalEditOn;
     }
 
-    fun deleteExamFromList(exam: Exam) {
-        exams.remove(exam)
-        (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
-    }
 
     companion object {
         private const val KEY_SHOW_BAR_CHART = "showPieChart"
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index d4fe5a66d6..6a4ef3c45d 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -147,13 +147,13 @@
                 android:layout_height="64dp"
                 android:layout_gravity="center_vertical"
                 android:layout_marginLeft="10dp"
+                android:layout_marginBottom="8dp"
                 android:background="@drawable/grade_background"
                 android:gravity="center"
                 android:padding="@dimen/material_default_padding"
-                app:tint="@android:color/white"
-                android:layout_marginBottom="8dp"
                 android:src="@drawable/ic_clear"
-                />
+                android:visibility="gone"
+                app:tint="@android:color/white" />
 
             <TextView
                 android:id="@+id/gradeTextView"

From 4830e78bb1beed44e890566f5854029fe81a1ce7 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Wed, 11 May 2022 17:45:21 +0200
Subject: [PATCH 49/71] started input sanitization, tried to fix recycler
 overwrites

---
 .../component/tumui/grades/ExamListAdapter.kt |  22 ++-
 .../component/tumui/grades/GradesFragment.kt  | 136 +++++++++++++-----
 .../res/layout/dialog_add_grade_input.xml     |   9 +-
 3 files changed, 114 insertions(+), 53 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 9f2bb3da54..278ab49cca 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -1,7 +1,6 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
-import android.database.DataSetObserver
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
@@ -45,12 +44,12 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
 
 
-        initUIDisplayElements(holder, exam)
+        initUIDisplayElements(holder, exam,position)
         initUIEditElements(holder, exam);
         return view
     }
 
-    private fun initUIDisplayElements(holder: ViewHolder, exam: Exam) {
+    private fun initUIDisplayElements(holder: ViewHolder, exam: Exam, position: Int) {
         holder.nameTextView.text = exam.course
         holder.gradeTextView.text = exam.grade
 
@@ -77,8 +76,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
      * Init the ui Elements to change the parameters of the grade
      */
     private fun initUIEditElements(holder: ViewHolder, exam: Exam) {
-        holder.editTextGradeWeights.setText(exam.weight.toString())
-        holder.editTextGradeCredits.setText(exam.credits_new.toString())
+
         holder.checkBoxUseGradeForAverage.isChecked = exam.gradeUsedInAverage
         adaptUIToCheckboxStatus(exam.gradeUsedInAverage, holder, exam)
 
@@ -134,6 +132,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 adaptUIToCheckboxStatus(false, holder, exam)
                 holder.editTextGradeWeights.setText(exam.weight.toString())
                 holder.editTextGradeCredits.setText(exam.credits_new.toString())
+                notifyDataSetChanged()
                 // localGradesFragment.storeExamListInSharedPreferences()
 
             }
@@ -142,6 +141,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 exam.weight = s.toString().toDouble()
+                notifyDataSetChanged()
                 //  localGradesFragment.storeExamListInSharedPreferences()
             }
 
@@ -154,7 +154,9 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
         holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
+                Log.d("Insert Credits",exam.course+" Store credits: "+s.toString())
                 exam.credits_new = s.toString().toInt()
+                notifyDataSetChanged()
                 // localGradesFragment.storeExamListInSharedPreferences()
             }
 
@@ -168,10 +170,10 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { buttonView, isChecked ->
             exam.gradeUsedInAverage = !isChecked
             adaptUIToCheckboxStatus(isChecked, holder, exam)
+            notifyDataSetChanged()
         }
-
-
-        // holder.gradeTextViewDeleteCustomGrade.
+        holder.editTextGradeWeights.setText(exam.weight.toString())
+        holder.editTextGradeCredits.setText(exam.credits_new.toString())
     }
 
     private fun adaptUIToCheckboxStatus(
@@ -238,8 +240,4 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
     companion object {
         private val DATE_FORMAT = DateTimeFormat.mediumDate()
     }
-
-    override fun registerDataSetObserver(observer: DataSetObserver?) {
-        super.registerDataSetObserver(observer)
-    }
 }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 7f793d5c49..c876e29142 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -6,14 +6,13 @@ import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
-import android.util.Log
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import android.widget.Adapter
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import android.widget.Button
 import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
@@ -151,6 +150,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     private fun changeNumberOfExams() {
+        //(binding.gradesListView.adapter as ExamListAdapter).
+        //(binding.gradesListView.adapter as ExamListAdapter).itemList=exams
+        //(binding.gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
+
+
         binding.gradesListView.adapter = ExamListAdapter(requireContext(), exams, this)
         storeExamListInSharedPreferences()
     }
@@ -482,54 +486,113 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
 
         val dialog = AlertDialog.Builder(requireContext())
-            .setTitle("Add a new exam manually")
+            .setTitle("Add a New Exam")
             .setMessage(
                 "Grades are normally added automatically. In case special grades should be added, this can be done here. " +
-                        "Manually added Exams can be deleted later on.\n\n* required"
+                        "Manually added Exams can be deleted later on."
             )
             .setView(view)
-            .setPositiveButton(R.string.create) { dialogInterface, whichButton ->
-
-                val title =
-                    view.findViewById<EditText>(R.id.editTextaddGradeCourseName).text.toString()
-                val grade = view.findViewById<EditText>(R.id.editTextAddGrade).text.toString()
-                val examiner =
-                    view.findViewById<EditText>(R.id.editTextaddGradeExaminer).text.toString()
-                val weight =
-                    (view.findViewById<EditText>(R.id.editTextAddGradeWeight).text.toString()).toDouble()
-                val credits =
-                    Integer.parseInt(view.findViewById<EditText>(R.id.editTextaddGradeCredits).text.toString())
-                val date = view.findViewById<EditText>(R.id.editTextAddGradeDate).text.toString()
-                val semester = view.findViewById<EditText>(R.id.editTextSemester).text.toString()
-
-                val typeConverter1 =
-                    de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
-                val exam = Exam(
-                    title,
-                    typeConverter1.read(date),
-                    examiner,
-                    grade,
-                    null,
-                    "",
-                    semester,
-                    weight,
-                    false,
-                    credits,
-                    true
-                )
-                addExamToList(exam)
-
-            }
+            .setPositiveButton(R.string.create, null)
             .setNegativeButton(android.R.string.cancel, null)
             .create()
             .apply {
                 window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
             };
+
+        dialog.setOnShowListener {
+            val button: Button =
+                (dialog as AlertDialog).getButton(AlertDialog.BUTTON_POSITIVE)
+            button.setOnClickListener(View.OnClickListener { // TODO Do something
+
+                val titleView =
+                    view.findViewById<EditText>(R.id.editTextaddGradeCourseName)
+                val gradeView = view.findViewById<EditText>(R.id.editTextAddGrade)
+                val examinerView =
+                    view.findViewById<EditText>(R.id.editTextaddGradeExaminer)
+                val weightView =
+                    view.findViewById<EditText>(R.id.editTextAddGradeWeight)
+                val creditsView =
+                    view.findViewById<EditText>(R.id.editTextaddGradeCredits)
+                val dateView = view.findViewById<EditText>(R.id.editTextAddGradeDate)
+                val semesterView = view.findViewById<EditText>(R.id.editTextSemester)
+
+                val title =
+                    titleView.text.toString()
+                var grade = gradeView.text.toString()
+                val examiner =
+                    examinerView.text.toString()
+
+                var weight=1.0
+                try {
+                    weight = (weightView.text.toString()).toDouble()
+                } catch (exception: Exception) {
+                    weight = 1.0
+                }
+
+                val credits =
+                    Integer.parseInt(creditsView.text.toString())
+                val date = dateView.text.toString()
+                val semester = semesterView.text.toString()
+
+                /* view.findViewById<EditText>(R.id.editTextSemester).setError("Wrong semester format. Correct two numbers for the year +WS/S")
+                 //todo input sanitization -> highlight wrong fields in red
+                 view.findViewById<EditText>(R.id.editTextSemester).getBackground()
+                     .setTint(getResources().getColor(R.color.grade_3_7))
+ */
+
+                //todo allen den error status wieder wegnehmen
+                semesterView.setError(null)
+                weightView.setError(null)
+                var changesRequired = false
+                if (semester.length < 3) {
+                    changesRequired = true;
+                    semesterView.setError("Wrong semester format: Too short. Correct two numbers for the year + W/S")
+                } else if (!(semester.get(2).equals('W') || semester.get(2)
+                        .equals('w') || semester.get(2).equals('S') || semester.get(2).equals('s'))
+                ) {
+                    changesRequired = true;
+                    semesterView.setError("Wrong semester format: Term not specified. Correct two numbers for the year + W/S")
+                }
+
+                if (weight < 0.0) {
+                    changesRequired = true;
+                    weightView.setError("Wrong weight format: Weights can not be negative.")
+                }
+
+                if (grade.equals("0") || grade.equals("0,0")) {
+                    grade="B"
+                }
+
+                if (!changesRequired) {
+                    val typeConverter1 =
+                        de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
+                    val exam = Exam(
+                        title,
+                        typeConverter1.read(date),
+                        examiner,
+                        grade,
+                        null,
+                        "",
+                        semester,
+                        weight,
+                        false,
+                        credits,
+                        true
+                    )
+                    addExamToList(exam)
+                    dialog.dismiss()
+                }
+            })
+        }
+
         dialog.show()
+
         dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
             .setTextColor(getResources().getColor(R.color.text_primary));
         dialog.getButton(AlertDialog.BUTTON_POSITIVE)
             .setTextColor(getResources().getColor(R.color.text_primary));
+
+
     }
 
     /**
@@ -736,3 +799,4 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         )
     }
 }
+
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 541b95b70d..67b5300dd0 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -20,7 +20,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/material_default_padding"
                 android:labelFor="@+id/editTextaddGradeCourseName"
-                android:text="Course name *" />
+                android:text="Course name" />
 
             <EditText
                 android:id="@+id/editTextaddGradeCourseName"
@@ -37,7 +37,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/material_default_padding"
                 android:labelFor="@+id/editTextAddGrade"
-                android:text="Grade (comma separated) *" />
+                android:text="Grade (0 for passed)" />
 
             <EditText
                 android:id="@+id/editTextAddGrade"
@@ -48,7 +48,7 @@
                 android:hint="1,0"
                 android:text="1,0"
                 android:imeOptions="actionGo"
-                android:inputType="numberDecimal" />
+                android:inputType="" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -131,8 +131,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ems="10"
-                android:inputType="date"
-                android:hint="yyWS"
+                android:hint="22WS"
                 android:text="22WS"/>
 
 

From 971f4df643bedd5bcc1051dc52a2b3664f0312cd Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 12 May 2022 12:23:42 +0200
Subject: [PATCH 50/71] improved input sanitization for remaining attributes

---
 .../in/tumcampusapp/api/app/DateSerializer.kt | 25 ++++++++---
 .../component/tumui/grades/GradesFragment.kt  | 43 +++++++++++++++----
 .../res/layout/dialog_add_grade_input.xml     |  2 +-
 3 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt b/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
index 50ae6cf10c..e363c3ee81 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
@@ -14,9 +14,14 @@ import java.util.*
  */
 class DateSerializer : JsonDeserializer<DateTime>, JsonSerializer<DateTime> {
     private val formatStrings = arrayOf(
-            "yyyy-MM-dd",
-            "yyyy-MM-dd HH:mm:ss",
-            "yyyy-MM-dd'T'HH:mm:ss'Z'"
+        "dd.MM.yy",
+        "dd.MM.yyyy",
+        "yyyy.MM.dd",
+        "dd.MM.yy",
+        "dd.MM.yyyy",
+        "yyyy.MM.dd",
+        "yyyy-MM-dd HH:mm:ss",
+        "yyyy-MM-dd'T'HH:mm:ss'Z'"
     )
 
     private val dateFormats = formatStrings.map {
@@ -34,10 +39,20 @@ class DateSerializer : JsonDeserializer<DateTime>, JsonSerializer<DateTime> {
             } catch (ignored: Exception) {
             }
         }
-        throw JsonParseException("Unparseable date: \"${json?.asString.orEmpty()}\". Supported formats: ${Arrays.toString(formatStrings)}")
+        throw JsonParseException(
+            "Unparseable date: \"${json?.asString.orEmpty()}\". Supported formats: ${
+                Arrays.toString(
+                    formatStrings
+                )
+            }"
+        )
     }
 
-    override fun serialize(time: DateTime, typeOfT: Type, context: JsonSerializationContext): JsonElement {
+    override fun serialize(
+        time: DateTime,
+        typeOfT: Type,
+        context: JsonSerializationContext
+    ): JsonElement {
         return JsonPrimitive(DateTimeUtils.getDateString(time))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index c876e29142..d320e07f43 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -518,11 +518,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
                 val title =
                     titleView.text.toString()
-                var grade = gradeView.text.toString()
+                val grade = gradeView.text.toString().toDouble()
                 val examiner =
                     examinerView.text.toString()
 
-                var weight=1.0
+                var weight = 1.0
                 try {
                     weight = (weightView.text.toString()).toDouble()
                 } catch (exception: Exception) {
@@ -541,10 +541,16 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
  */
 
                 //todo allen den error status wieder wegnehmen
-                semesterView.setError(null)
+                titleView.setError(null)
+                gradeView.setError(null)
+                examinerView.setError(null)
                 weightView.setError(null)
+                creditsView.setError(null)
+                dateView.setError(null)
+                semesterView.setError(null)
+
                 var changesRequired = false
-                if (semester.length < 3) {
+                if (semester.length < 3) {                                                  //semester sanitization
                     changesRequired = true;
                     semesterView.setError("Wrong semester format: Too short. Correct two numbers for the year + W/S")
                 } else if (!(semester.get(2).equals('W') || semester.get(2)
@@ -554,15 +560,36 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                     semesterView.setError("Wrong semester format: Term not specified. Correct two numbers for the year + W/S")
                 }
 
-                if (weight < 0.0) {
+                if (weight < 0.0) {             //weight sanitization
                     changesRequired = true;
                     weightView.setError("Wrong weight format: Weights can not be negative.")
                 }
 
-                if (grade.equals("0") || grade.equals("0,0")) {
-                    grade="B"
+
+                var gradeString = ""
+                if (grade <= 5.0 && grade >= 1.0 || grade == 0.0) {
+                    if (grade == 0.0) {
+                        gradeString = "B"
+                    } else {
+                        gradeString = grade.toString()
+                    }
+                } else {
+                    changesRequired = true;
+                    gradeView.setError("Wrong grade format: Grade must be between 1.0 and 5.0 or equal to 0.")
+                }
+
+
+                if (title.length < 1) {             //title sanitization
+                    changesRequired = true;
+                    titleView.setError("Insert a course title.")
                 }
 
+                if (credits < 1) {             //title sanitization
+                    changesRequired = true;
+                    creditsView.setError("Invalid amount of credits. Must be greater than 0.")
+                }
+
+
                 if (!changesRequired) {
                     val typeConverter1 =
                         de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
@@ -570,7 +597,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                         title,
                         typeConverter1.read(date),
                         examiner,
-                        grade,
+                        gradeString,
                         null,
                         "",
                         semester,
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 67b5300dd0..7ff4741a31 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -48,7 +48,7 @@
                 android:hint="1,0"
                 android:text="1,0"
                 android:imeOptions="actionGo"
-                android:inputType="" />
+                android:inputType="numberDecimal" />
 
             <TextView
                 android:layout_width="match_parent"

From 8f8fa02304216fc01322ecb3d1acaa7fcdad7db5 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 12 May 2022 12:56:50 +0200
Subject: [PATCH 51/71] adapted computation of the average grade

---
 .../component/tumui/grades/GradesFragment.kt  | 195 +++++++-----------
 1 file changed, 77 insertions(+), 118 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index d320e07f43..05d2e54b59 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -59,10 +59,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     private var showBarChartAfterRotate = false
 
-    private var globalEditOn = false;
-    private val exams = mutableListOf<Exam>();
+    private var globalEditOn = false
+    private val exams = mutableListOf<Exam>()
 
-    private val examSharedPreferences: String = "ExamList";
+    private val examSharedPreferences: String = "ExamList"
     private val scope = CoroutineScope(newSingleThreadContext("storetopreferences"))
 
 
@@ -167,40 +167,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         examsDownloaded.removeAll { examsTitles.contains(it.course) }
         //  exams.clear()
         //  storeExamListInSharedPreferences()
-/*
-
-        examsDownloaded.get(0).course = "Esotheric Programming"
-        examsDownloaded.get(0).grade = "1,0"
-        examsDownloaded.get(0).examiner = "-"
-
-        examsDownloaded.get(1).course = "Advanced Singing and Clapping"
-        examsDownloaded.get(1).grade = "3,7"
-        examsDownloaded.get(1).examiner = "-"*/
-
-        /* val title = "title"
-         val grade = "1,0"
-         val examiner = "examiner"
-         val weight = 1.0
-         val credits = 4
-         val date = "11.03.22"
-
-         val typeConverter1 =
-             de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
-         val exam: Exam = Exam(
-             title,
-             typeConverter1.read(date),
-             examiner,
-             grade,
-             "schriftlich",
-             "31415",
-             "22W",
-             weight,
-             false,
-             credits,
-             true
-         )
-         exams.add(exam)
-         Log.d("new exam", "exam was added")*/
+
 
         if (!examsDownloaded.isEmpty()) {
             examsDownloaded.forEach { it.credits_new = 6; it.weight = 1.0; }
@@ -216,19 +183,19 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
                 .create()
             val listType = object : TypeToken<List<Exam>>() {}.type
-            val jsonString = sharedPref.getString(examSharedPreferences, "");
+            val jsonString = sharedPref.getString(examSharedPreferences, "")
             if (jsonString != null) {
-                exams.clear();
+                exams.clear()
                 exams.addAll(gson.fromJson(jsonString, listType))
                 return
             }
         } catch (e: Exception) {
-            exams.clear();
+            exams.clear()
         }
-        // Exam list could no be loaded - will always e a list, some error occured - clear to prevent any intermediate error states
+        // Exam list could no be loaded - will always e a list, some error occurred - clear to prevent any intermediate error states
     }
 
-    fun storeExamListInSharedPreferences() {
+    private fun storeExamListInSharedPreferences() {
 
         scope.launch { storeExamListInSharedPreferencesThread() }
 
@@ -253,7 +220,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     class DateTimeConverter @Inject constructor() : JsonSerializer<DateTime?>,
         JsonDeserializer<DateTime?> {
-        private val dateTimeFormatter: DateTimeFormatter
+        private val dateTimeFormatter: DateTimeFormatter =
+            DateTimeFormat.forPattern("YYYY-MM-dd HH:mm")
+
         override fun serialize(
             src: DateTime?,
             typeOfSrc: Type?,
@@ -273,9 +242,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             } else dateTimeFormatter.parseDateTime(json.asString)
         }
 
-        init {
-            dateTimeFormatter = DateTimeFormat.forPattern("YYYY-MM-dd HH:mm")
-        }
     }
 
     fun storeGradedCourses(exams: List<Exam>) {
@@ -352,7 +318,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
                 // only label grades that are associated with at least one grade
                 data.setValueFormatter(object : ValueFormatter() {
-                    override fun getFormattedValue(value: Float): String? {
+                    override fun getFormattedValue(value: Float): String {
                         if (value > 0.0)
                             return value.toString()
                         return ""
@@ -399,11 +365,19 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun calculateAverageGrade(exams: List<Exam>): Double {
         val numberFormat = NumberFormat.getInstance(Locale.GERMAN)
         val grades = exams
-            .filter { it.isPassed }
-            .map { numberFormat.parse(it.grade).toDouble() }
-//todo multiply by it.weight and credits and theen divide by the combined numerb of used numbers
+            .filter { it.isPassed && !it.gradeUsedInAverage }
+            .map { numberFormat.parse(it.grade).toDouble() * it.credits_new * it.weight }
+        val combinedgradefactors = exams
+            .filter { it.isPassed && !it.gradeUsedInAverage }
+            .map { it.credits_new.toDouble() * it.weight }
+
+
         val gradeSum = grades.sum()
-        return gradeSum / grades.size.toDouble()
+        val factorSum = combinedgradefactors.sum()
+        if (factorSum<=0){
+            return 0.0;
+        }
+        return gradeSum / factorSum.toDouble()
     }
 
     /**
@@ -497,96 +471,86 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             .create()
             .apply {
                 window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
-            };
+            }
 
         dialog.setOnShowListener {
             val button: Button =
-                (dialog as AlertDialog).getButton(AlertDialog.BUTTON_POSITIVE)
-            button.setOnClickListener(View.OnClickListener { // TODO Do something
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE)
+            button.setOnClickListener {
 
-                val titleView =
-                    view.findViewById<EditText>(R.id.editTextaddGradeCourseName)
+                val titleView = view.findViewById<EditText>(R.id.editTextaddGradeCourseName)
                 val gradeView = view.findViewById<EditText>(R.id.editTextAddGrade)
-                val examinerView =
-                    view.findViewById<EditText>(R.id.editTextaddGradeExaminer)
-                val weightView =
-                    view.findViewById<EditText>(R.id.editTextAddGradeWeight)
-                val creditsView =
-                    view.findViewById<EditText>(R.id.editTextaddGradeCredits)
+                val examinerView = view.findViewById<EditText>(R.id.editTextaddGradeExaminer)
+                val weightView = view.findViewById<EditText>(R.id.editTextAddGradeWeight)
+                val creditsView = view.findViewById<EditText>(R.id.editTextaddGradeCredits)
                 val dateView = view.findViewById<EditText>(R.id.editTextAddGradeDate)
                 val semesterView = view.findViewById<EditText>(R.id.editTextSemester)
 
-                val title =
-                    titleView.text.toString()
-                val grade = gradeView.text.toString().toDouble()
-                val examiner =
-                    examinerView.text.toString()
+                val title = titleView.text.toString()
+                val grade = gradeView.text.toString()
+                val examiner = examinerView.text.toString()
+                val credits = Integer.parseInt(creditsView.text.toString())
+                val date = dateView.text.toString()
+                val semester = semesterView.text.toString()
 
-                var weight = 1.0
+                var weight: Double
                 try {
                     weight = (weightView.text.toString()).toDouble()
                 } catch (exception: Exception) {
                     weight = 1.0
                 }
 
-                val credits =
-                    Integer.parseInt(creditsView.text.toString())
-                val date = dateView.text.toString()
-                val semester = semesterView.text.toString()
 
-                /* view.findViewById<EditText>(R.id.editTextSemester).setError("Wrong semester format. Correct two numbers for the year +WS/S")
-                 //todo input sanitization -> highlight wrong fields in red
-                 view.findViewById<EditText>(R.id.editTextSemester).getBackground()
-                     .setTint(getResources().getColor(R.color.grade_3_7))
- */
-
-                //todo allen den error status wieder wegnehmen
-                titleView.setError(null)
-                gradeView.setError(null)
-                examinerView.setError(null)
-                weightView.setError(null)
-                creditsView.setError(null)
-                dateView.setError(null)
-                semesterView.setError(null)
+
+                titleView.error = null
+                gradeView.error = null
+                examinerView.error = null
+                weightView.error = null
+                creditsView.error = null
+                dateView.error = null
+                semesterView.error = null
 
                 var changesRequired = false
                 if (semester.length < 3) {                                                  //semester sanitization
-                    changesRequired = true;
-                    semesterView.setError("Wrong semester format: Too short. Correct two numbers for the year + W/S")
+                    changesRequired = true
+                    semesterView.error =
+                        "Wrong semester format: Too short. Correct two numbers for the year + W/S"
                 } else if (!(semester.get(2).equals('W') || semester.get(2)
                         .equals('w') || semester.get(2).equals('S') || semester.get(2).equals('s'))
                 ) {
-                    changesRequired = true;
-                    semesterView.setError("Wrong semester format: Term not specified. Correct two numbers for the year + W/S")
+                    changesRequired = true
+                    semesterView.error =
+                        "Wrong semester format: Term not specified. Correct two numbers for the year + W/S"
                 }
 
                 if (weight < 0.0) {             //weight sanitization
-                    changesRequired = true;
-                    weightView.setError("Wrong weight format: Weights can not be negative.")
+                    changesRequired = true
+                    weightView.error = "Wrong weight format: Weights can not be negative."
                 }
 
-
+                val gradedouble = grade.replace(",", ".").toDouble()
                 var gradeString = ""
-                if (grade <= 5.0 && grade >= 1.0 || grade == 0.0) {
-                    if (grade == 0.0) {
+                if (gradedouble <= 5.0 && gradedouble >= 1.0 || gradedouble == 0.0) {
+                    if (gradedouble == 0.0) {
                         gradeString = "B"
                     } else {
-                        gradeString = grade.toString()
+                        gradeString = grade.toString().replace(".",",")
                     }
                 } else {
-                    changesRequired = true;
-                    gradeView.setError("Wrong grade format: Grade must be between 1.0 and 5.0 or equal to 0.")
+                    changesRequired = true
+                    gradeView.error =
+                        "Wrong grade format: Grade must be between 1.0 and 5.0 or equal to 0."
                 }
 
 
                 if (title.length < 1) {             //title sanitization
-                    changesRequired = true;
-                    titleView.setError("Insert a course title.")
+                    changesRequired = true
+                    titleView.error = "Insert a course title."
                 }
 
                 if (credits < 1) {             //title sanitization
-                    changesRequired = true;
-                    creditsView.setError("Invalid amount of credits. Must be greater than 0.")
+                    changesRequired = true
+                    creditsView.error = "Invalid amount of credits. Must be greater than 0."
                 }
 
 
@@ -609,15 +573,15 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                     addExamToList(exam)
                     dialog.dismiss()
                 }
-            })
+            }
         }
 
         dialog.show()
 
         dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
-            .setTextColor(getResources().getColor(R.color.text_primary));
+            .setTextColor(resources.getColor(R.color.text_primary))
         dialog.getButton(AlertDialog.BUTTON_POSITIVE)
-            .setTextColor(getResources().getColor(R.color.text_primary));
+            .setTextColor(resources.getColor(R.color.text_primary))
 
 
     }
@@ -669,7 +633,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             showListButton?.visibility = if (showChart) View.VISIBLE else View.GONE
             showChartButton?.visibility = if (showChart) View.GONE else View.VISIBLE
 
-            val refreshLayout = swipeRefreshLayout ?: return
+            val refreshLayout = swipeRefreshLayout
 
             if (chartsContainer.visibility == View.GONE) {
                 crossFadeViews(refreshLayout, chartsContainer)
@@ -697,9 +661,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater?.inflate(R.menu.menu_activity_grades, menu)
-        barMenuItem = menu?.findItem(R.id.bar_chart_menu)
-        pieMenuItem = menu?.findItem(R.id.pie_chart_menu)
+        inflater.inflate(R.menu.menu_activity_grades, menu)
+        barMenuItem = menu.findItem(R.id.bar_chart_menu)
+        pieMenuItem = menu.findItem(R.id.pie_chart_menu)
         super.onCreateOptionsMenu(menu, inflater)
     }
 
@@ -718,13 +682,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun changeEditMode() {
         with(binding) {
-            globalEditOn = !globalEditOn;
-            if (globalEditOn) {      //save values as the edit mode is switched off.
-                storeExamListInSharedPreferences()
-            }
-
-            // Refresh all values for the ui
-            (gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
+            globalEditOn = !globalEditOn
             initUIVisibility()
         }
     }
@@ -734,7 +692,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             frameLayoutAverageGrade?.visibility = View.GONE
             floatingbuttonAddExamGrade?.visibility = View.VISIBLE
         } else {
-
+            storeExamListInSharedPreferences()
+            showExams(exams)
             frameLayoutAverageGrade?.visibility = View.VISIBLE
             floatingbuttonAddExamGrade?.visibility = View.GONE
         }
@@ -796,7 +755,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     fun getGlobalEdit(): Boolean {
-        return globalEditOn;
+        return globalEditOn
     }
 
 

From d996f2f6e6b1bb69d3a0130fab518d1e5e83a9c3 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 12 May 2022 13:54:28 +0200
Subject: [PATCH 52/71] prevented wrong updates of credits in the recycler view

---
 .../component/tumui/grades/ExamListAdapter.kt | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 278ab49cca..1087ad04c1 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -5,6 +5,7 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
 import android.view.View
+import android.view.View.OnFocusChangeListener
 import android.view.ViewGroup
 import android.widget.*
 import androidx.appcompat.app.AlertDialog
@@ -43,9 +44,8 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         val exam = itemList[position]
 
 
-
-        initUIDisplayElements(holder, exam,position)
-        initUIEditElements(holder, exam);
+        initUIEditElements(holder, exam)
+        initUIDisplayElements(holder, exam, position)
         return view
     }
 
@@ -53,6 +53,8 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.nameTextView.text = exam.course
         holder.gradeTextView.text = exam.grade
 
+        //   val newPosition=itemList.indexOf(exam)
+
         val gradeColor = exam.getGradeColor(context)
         holder.gradeTextView.background.setTint(gradeColor)
 
@@ -152,20 +154,30 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             }
         })
 
-        holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
-            override fun afterTextChanged(s: Editable?) {
-                Log.d("Insert Credits",exam.course+" Store credits: "+s.toString())
-                exam.credits_new = s.toString().toInt()
-                notifyDataSetChanged()
-                // localGradesFragment.storeExamListInSharedPreferences()
-            }
-
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
+        /* holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
+             override fun afterTextChanged(s: Editable?) {
+                 Log.d("Insert Credits",exam.course+" Store credits: "+s.toString())
+              //  exam.credits_new = s.toString().toInt()
+              //  notifyDataSetChanged()
+                 // localGradesFragment.storeExamListInSharedPreferences()
+             }
+
+             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+             }
+
+             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+             }
+         })*/
+        holder.editTextGradeCredits.setOnFocusChangeListener { v, hasFocus ->
+            if (!hasFocus) {
+                val helper = holder.editTextGradeCredits.text.toString().toInt()
+                if (exam.credits_new != helper) {
+                    Log.d("Focus test: ", "stored: " + exam.course)
+                    exam.credits_new = helper;
+                }
 
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
             }
-        })
+        }
 
         holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { buttonView, isChecked ->
             exam.gradeUsedInAverage = !isChecked

From 5b9b1dd88ec0430979b3e95feb014224a0f25065 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 12 May 2022 15:03:56 +0200
Subject: [PATCH 53/71] fixed ui inconsistencies, reduced method sizes

---
 .../component/tumui/grades/ExamListAdapter.kt | 151 +++++++++---------
 .../component/tumui/grades/GradesFragment.kt  |   4 +-
 .../component/tumui/grades/model/Exam.kt      |   2 +-
 .../res/layout/activity_grades_listview.xml   |   2 +-
 app/src/main/res/values-de/strings.xml        |   2 +-
 app/src/main/res/values/strings.xml           |   2 +-
 6 files changed, 81 insertions(+), 82 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 1087ad04c1..0fb1adfaf6 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -45,16 +45,14 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
 
         initUIEditElements(holder, exam)
-        initUIDisplayElements(holder, exam, position)
+        initUIDisplayElements(holder, exam)
         return view
     }
 
-    private fun initUIDisplayElements(holder: ViewHolder, exam: Exam, position: Int) {
+    private fun initUIDisplayElements(holder: ViewHolder, exam: Exam) {
         holder.nameTextView.text = exam.course
         holder.gradeTextView.text = exam.grade
 
-        //   val newPosition=itemList.indexOf(exam)
-
         val gradeColor = exam.getGradeColor(context)
         holder.gradeTextView.background.setTint(gradeColor)
 
@@ -78,28 +76,29 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
      * Init the ui Elements to change the parameters of the grade
      */
     private fun initUIEditElements(holder: ViewHolder, exam: Exam) {
-
-        holder.checkBoxUseGradeForAverage.isChecked = exam.gradeUsedInAverage
-        adaptUIToCheckboxStatus(exam.gradeUsedInAverage, holder, exam)
-
         if (localGradesFragment.getGlobalEdit()) {
             holder.editGradesContainer.visibility = View.GONE
             holder.gradeTextViewDeleteCustomGrade.visibility = View.GONE
         } else {
             holder.editGradesContainer.visibility = View.VISIBLE
-            if (exam.manuallyAdded) {
-                holder.gradeTextViewDeleteCustomGrade.visibility = View.VISIBLE
-                holder.gradeTextViewDeleteCustomGrade.background.setTint(
-                    ContextCompat.getColor(
-                        context,
-                        R.color.grade_default
-                    )
-                )
-            }
+
+            initListenerDeleteCustomGrade(exam, holder)
+            initListenerEditTexts(exam, holder)
+            initListenerResetGradeParameters(exam, holder)
+            initCheckBoxUsedInAverage(exam, holder)
         }
+    }
 
-        holder.gradeTextViewDeleteCustomGrade.setOnClickListener(object : View.OnClickListener {
-            override fun onClick(p0: View?) {
+
+    /**
+     * Adds a Clicklistener which will show confirmation dialog whether the exam should actually be deleted.
+     */
+    private fun initListenerDeleteCustomGrade(exam: Exam, holder: ViewHolder) {
+        if (exam.manuallyAdded) {
+            holder.gradeTextViewDeleteCustomGrade.visibility = View.VISIBLE
+            adaptUIToCheckboxStatus(holder, exam)
+
+            holder.gradeTextViewDeleteCustomGrade.setOnClickListener {
                 val dialog = AlertDialog.Builder(localGradesFragment.requireContext())
                     .setTitle("Delete Exam")
                     .setMessage(
@@ -122,78 +121,84 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                     localGradesFragment.getResources().getColor(R.color.text_primary)
                 );
             }
+        } else {
+            holder.gradeTextViewDeleteCustomGrade.visibility = View.GONE
+        }
 
-        })
-
-
-        holder.buttonResetGradeParameters.setOnClickListener(object : View.OnClickListener {
-            override fun onClick(p0: View?) {
-                exam.gradeUsedInAverage = false
-                exam.weight = 1.0
-                exam.credits_new = 6
-                adaptUIToCheckboxStatus(false, holder, exam)
-                holder.editTextGradeWeights.setText(exam.weight.toString())
-                holder.editTextGradeCredits.setText(exam.credits_new.toString())
-                notifyDataSetChanged()
-                // localGradesFragment.storeExamListInSharedPreferences()
-
-            }
-
-        })
-        holder.editTextGradeWeights.addTextChangedListener(object : TextWatcher {
-            override fun afterTextChanged(s: Editable?) {
-                exam.weight = s.toString().toDouble()
-                notifyDataSetChanged()
-                //  localGradesFragment.storeExamListInSharedPreferences()
-            }
+    }
 
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            }
 
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+    /**
+     * Adds on Focus change listeners which store the value to the exam object if and only if the
+     * user finished editing the exam.
+     */
+    private fun initListenerEditTexts(exam: Exam, holder: ViewHolder) {
+        holder.editTextGradeWeights.setOnFocusChangeListener { _, hasFocus ->
+            if (!hasFocus) {
+                val helper = holder.editTextGradeWeights.text.toString().toDouble()
+                if (exam.weight != helper) {
+                    exam.weight = helper;
+                }
             }
-        })
+        }
 
-        /* holder.editTextGradeCredits.addTextChangedListener(object : TextWatcher {
-             override fun afterTextChanged(s: Editable?) {
-                 Log.d("Insert Credits",exam.course+" Store credits: "+s.toString())
-              //  exam.credits_new = s.toString().toInt()
-              //  notifyDataSetChanged()
-                 // localGradesFragment.storeExamListInSharedPreferences()
-             }
-
-             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-             }
-
-             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-             }
-         })*/
-        holder.editTextGradeCredits.setOnFocusChangeListener { v, hasFocus ->
+        holder.editTextGradeCredits.setOnFocusChangeListener { _, hasFocus ->
             if (!hasFocus) {
                 val helper = holder.editTextGradeCredits.text.toString().toInt()
                 if (exam.credits_new != helper) {
-                    Log.d("Focus test: ", "stored: " + exam.course)
                     exam.credits_new = helper;
                 }
-
             }
         }
+        holder.editTextGradeWeights.setText(exam.weight.toString())
+        holder.editTextGradeCredits.setText(exam.credits_new.toString())
+    }
+
+
+    /**
+     * Adds a ClickListener to reset one exam to the default values and adapts the UI accordingly
+     */
+    private fun initListenerResetGradeParameters(exam: Exam, holder: ViewHolder) {
+        holder.buttonResetGradeParameters.setOnClickListener(object : View.OnClickListener {
+            override fun onClick(p0: View?) {
+                exam.gradeUsedInAverage = true
+                adaptUIToCheckboxStatus(holder, exam)
+
+                exam.weight = 1.0
+                exam.credits_new = 6
+                holder.editTextGradeWeights.setText(exam.weight.toString())
+                holder.editTextGradeCredits.setText(exam.credits_new.toString())
+            }
+
+        })
+    }
 
-        holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { buttonView, isChecked ->
+    /**
+     * Initialises the state of the checkbox and adapts the ui accordingly
+     */
+    private fun initCheckBoxUsedInAverage(exam: Exam, holder: ViewHolder) {
+        holder.checkBoxUseGradeForAverage.isChecked = exam.gradeUsedInAverage
+        adaptUIToCheckboxStatus(holder, exam)
+        holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { _, isChecked ->
             exam.gradeUsedInAverage = !isChecked
-            adaptUIToCheckboxStatus(isChecked, holder, exam)
-            notifyDataSetChanged()
+            adaptUIToCheckboxStatus(holder, exam)
         }
-        holder.editTextGradeWeights.setText(exam.weight.toString())
-        holder.editTextGradeCredits.setText(exam.credits_new.toString())
     }
 
+    /**
+     * Enables/disables Edittexts, and adapts the color of the grade bar on the right side
+     */
     private fun adaptUIToCheckboxStatus(
-        gradeUsedInAverage: Boolean,
         holder: ViewHolder,
         exam: Exam
     ) {
-        if (gradeUsedInAverage) {
+        if (exam.gradeUsedInAverage) {
+            holder.editTextGradeCredits.isEnabled = true;
+            holder.editTextGradeWeights.isEnabled = true;
+            val gradeColor = exam.getGradeColor(context)
+            holder.gradeTextView.background.setTint(gradeColor)
+            holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
+        } else {
             holder.editTextGradeCredits.isEnabled = false;
             holder.editTextGradeWeights.isEnabled = false;
             holder.gradeTextView.background.setTint(
@@ -208,12 +213,6 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                     R.color.grade_default
                 )
             )
-        } else {
-            holder.editTextGradeCredits.isEnabled = true;
-            holder.editTextGradeWeights.isEnabled = true;
-            val gradeColor = exam.getGradeColor(context)
-            holder.gradeTextView.background.setTint(gradeColor)
-            holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
         }
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 05d2e54b59..7482389c2b 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -365,10 +365,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun calculateAverageGrade(exams: List<Exam>): Double {
         val numberFormat = NumberFormat.getInstance(Locale.GERMAN)
         val grades = exams
-            .filter { it.isPassed && !it.gradeUsedInAverage }
+            .filter { it.isPassed && it.gradeUsedInAverage }
             .map { numberFormat.parse(it.grade).toDouble() * it.credits_new * it.weight }
         val combinedgradefactors = exams
-            .filter { it.isPassed && !it.gradeUsedInAverage }
+            .filter { it.isPassed && it.gradeUsedInAverage }
             .map { it.credits_new.toDouble() * it.weight }
 
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index 0ab70aea05..1ee8fe1bb8 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -39,7 +39,7 @@ data class Exam(
     @PropertyElement(name = "weight")
     var weight: Double = 1.0,
     @PropertyElement(name = "gradeUsedInAverage")
-    var gradeUsedInAverage: Boolean = false,
+    var gradeUsedInAverage: Boolean = true,
     @PropertyElement(name = "subjectcredits")               //must not be "credits" -> otherwise naming collision will occur
     var credits_new: Int = 6,
     @PropertyElement(name = "examManuallyAdded")
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 6a4ef3c45d..7188f955da 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -118,7 +118,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="5"
-                        android:text="@string/hide_grade" />
+                        android:text="@string/use_grade_in_average" />
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/buttonResetGradeParameters"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5a635315ec..e6809bdd50 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -58,7 +58,7 @@
     <string name="date">Datum</string>
     <string name="no_grades">Du hast noch keine Noten, die angezeigt werden könnten.</string>
     <string name="reset_grade">Note Zurücksetzten</string>
-    <string name="hide_grade">Note ausblenden</string>
+    <string name="use_grade_in_average">Note verwenden</string>
     <string name="grade_weight_label">Gewichtung der Note:</string>
     <string name="credits_grade_label">Credits:</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 028838af62..325918b2ca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,7 +85,7 @@
     <string name="credits" translatable="false">ECTS</string>
     <string name="no_grades">You don\'t have any grades yet.</string>
     <string name="reset_grade">Reset Grade</string>
-    <string name="hide_grade">Hide Grade</string>
+    <string name="use_grade_in_average">Use Grade</string>
     <string name="grade_weight_label">Grade Weight:</string>
     <string name="credits_grade_label">Credits:</string>
 

From e96855c3a102350d5a3e041d9c1d870988c295d2 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 12 May 2022 15:56:41 +0200
Subject: [PATCH 54/71] persistently stored exams in shared preferences

---
 app/src/main/AndroidManifest.xml              | 60 ++++++++++---------
 .../in/tumcampusapp/api/app/DateSerializer.kt |  6 +-
 .../component/tumui/grades/ExamListAdapter.kt | 18 +++---
 .../component/tumui/grades/GradesFragment.kt  | 33 ++++------
 .../res/layout/activity_grades_listview.xml   |  1 +
 5 files changed, 57 insertions(+), 61 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d3ff5a74c6..a9c390991b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -54,7 +54,8 @@
 
         <uses-library android:name="android.test.runner" />
 
-        <receiver android:name=".service.ScanResultsAvailableReceiver"
+        <receiver
+            android:name=".service.ScanResultsAvailableReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.net.wifi.SCAN_RESULTS" />
@@ -90,8 +91,8 @@
         <activity
             android:name=".component.ui.onboarding.StartupActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
-            android:exported="true">
+            android:exported="true"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -110,8 +111,8 @@
         <activity
             android:name=".component.other.generic.activity.BaseNavigationActivity"
             android:configChanges="orientation|screenSize"
-            android:launchMode="singleTop"
-            android:exported="true">
+            android:exported="true"
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -130,7 +131,8 @@
             android:name=".component.tumui.grades.GradesActivity"
             android:label="@string/empty_string"
             android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity">
+            android:parentActivityName=".component.ui.overview.MainActivity"
+            android:windowSoftInputMode="stateHidden|adjustNothing">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".component.ui.overview.MainActivity" />
@@ -166,10 +168,10 @@
         <activity
             android:name=".component.ui.transportation.TransportationActivity"
             android:configChanges="orientation|screenSize"
+            android:exported="true"
             android:label="@string/mvv"
             android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity"
-            android:exported="true">
+            android:parentActivityName=".component.ui.overview.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -208,10 +210,10 @@
         <activity
             android:name=".component.tumui.lectures.activity.LecturesPersonalActivity"
             android:configChanges="orientation|screenSize"
+            android:exported="true"
             android:label="@string/my_lectures"
             android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity"
-            android:exported="true">
+            android:parentActivityName=".component.ui.overview.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -256,10 +258,10 @@
         <activity
             android:name=".component.tumui.person.PersonSearchActivity"
             android:configChanges="orientation|screenSize"
+            android:exported="true"
             android:label="@string/person_search"
             android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity"
-            android:exported="true">
+            android:parentActivityName=".component.ui.overview.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -283,10 +285,10 @@
         <activity
             android:name=".component.tumui.roomfinder.RoomFinderActivity"
             android:configChanges="orientation|screenSize"
+            android:exported="true"
             android:label="@string/roomfinder"
             android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity"
-            android:exported="true">
+            android:parentActivityName=".component.ui.overview.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".component.ui.overview.MainActivity" />
@@ -374,8 +376,7 @@
         <activity
             android:name=".component.tumui.calendar.CreateEventActivity"
             android:label="@string/activity_create_event_title"
-            android:parentActivityName=".component.tumui.calendar.CalendarActivity">
-        </activity>
+            android:parentActivityName=".component.tumui.calendar.CalendarActivity"></activity>
 
         <activity
             android:name=".component.ui.chat.activity.ChatRoomsActivity"
@@ -461,8 +462,8 @@
         </activity> <!-- receiver for the mensaWidget -->
         <receiver
             android:name=".component.ui.cafeteria.widget.MensaWidget"
-            android:label="@string/mensa_widget"
-            android:exported="true">
+            android:exported="true"
+            android:label="@string/mensa_widget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -477,8 +478,8 @@
             android:permission="android.permission.BIND_REMOTEVIEWS" /> <!-- receiver for the MVVWidget -->
         <receiver
             android:name=".component.ui.transportation.widget.MVVWidget"
-            android:label="@string/mvv_widget"
-            android:exported="true">
+            android:exported="true"
+            android:label="@string/mvv_widget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="de.tum.in.newtumcampus.intent.action.MVV_WIDGET_FORCE_RELOAD" />
@@ -498,10 +499,10 @@
             android:allowTaskReparenting="false"
             android:configChanges="orientation|screenSize"
             android:excludeFromRecents="true"
+            android:exported="true"
             android:label="@string/mvv_widget_select_station"
             android:launchMode="singleTop"
-            android:taskAffinity=""
-            android:exported="true">
+            android:taskAffinity="">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -516,8 +517,8 @@
         </activity> <!-- receiver for the TimetableWidget -->
         <receiver
             android:name=".component.tumui.calendar.widget.TimetableWidget"
-            android:label="@string/timetable_widget"
-            android:exported="true">
+            android:exported="true"
+            android:label="@string/timetable_widget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -536,15 +537,17 @@
             android:allowTaskReparenting="false"
             android:configChanges="orientation|screenSize"
             android:excludeFromRecents="true"
+            android:exported="true"
             android:label="@string/timetable_widget_select_lectures"
             android:launchMode="singleTop"
-            android:theme="@style/AppTheme.NoDrawerLayout"
-            android:exported="true">
+            android:theme="@style/AppTheme.NoDrawerLayout">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
         </activity> <!-- Used to restart alarm when device has been restarted -->
-        <receiver android:name=".service.StartSyncReceiver" android:exported="true">
+        <receiver
+            android:name=".service.StartSyncReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -577,7 +580,8 @@
             android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <receiver android:name=".service.GeofencingUpdateReceiver" />
-        <receiver android:name=".service.GeofencingStartupReceiver"
+        <receiver
+            android:name=".service.GeofencingStartupReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt b/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
index e363c3ee81..7bf9ae2c9b 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
@@ -17,9 +17,9 @@ class DateSerializer : JsonDeserializer<DateTime>, JsonSerializer<DateTime> {
         "dd.MM.yy",
         "dd.MM.yyyy",
         "yyyy.MM.dd",
-        "dd.MM.yy",
-        "dd.MM.yyyy",
-        "yyyy.MM.dd",
+        "dd-MM-yy",
+        "dd-MM-yyyy",
+        "yyyy-MM-dd",
         "yyyy-MM-dd HH:mm:ss",
         "yyyy-MM-dd'T'HH:mm:ss'Z'"
     )
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 0fb1adfaf6..ac7c1a96c4 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -1,11 +1,7 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Log
 import android.view.View
-import android.view.View.OnFocusChangeListener
 import android.view.ViewGroup
 import android.widget.*
 import androidx.appcompat.app.AlertDialog
@@ -53,8 +49,8 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.nameTextView.text = exam.course
         holder.gradeTextView.text = exam.grade
 
-        val gradeColor = exam.getGradeColor(context)
-        holder.gradeTextView.background.setTint(gradeColor)
+
+        adaptUIToCheckboxStatus(holder,exam)
 
         val date: String = if (exam.date == null) {
             context.getString(R.string.not_specified)
@@ -79,6 +75,8 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         if (localGradesFragment.getGlobalEdit()) {
             holder.editGradesContainer.visibility = View.GONE
             holder.gradeTextViewDeleteCustomGrade.visibility = View.GONE
+
+            //todo init für den chackbox status
         } else {
             holder.editGradesContainer.visibility = View.VISIBLE
 
@@ -96,7 +94,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
     private fun initListenerDeleteCustomGrade(exam: Exam, holder: ViewHolder) {
         if (exam.manuallyAdded) {
             holder.gradeTextViewDeleteCustomGrade.visibility = View.VISIBLE
-            adaptUIToCheckboxStatus(holder, exam)
+           // adaptUIToCheckboxStatus(holder, exam)
 
             holder.gradeTextViewDeleteCustomGrade.setOnClickListener {
                 val dialog = AlertDialog.Builder(localGradesFragment.requireContext())
@@ -138,6 +136,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 val helper = holder.editTextGradeWeights.text.toString().toDouble()
                 if (exam.weight != helper) {
                     exam.weight = helper;
+                    localGradesFragment.storeExamListInSharedPreferences()
                 }
             }
         }
@@ -147,6 +146,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 val helper = holder.editTextGradeCredits.text.toString().toInt()
                 if (exam.credits_new != helper) {
                     exam.credits_new = helper;
+                    localGradesFragment.storeExamListInSharedPreferences()
                 }
             }
         }
@@ -168,6 +168,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 exam.credits_new = 6
                 holder.editTextGradeWeights.setText(exam.weight.toString())
                 holder.editTextGradeCredits.setText(exam.credits_new.toString())
+                localGradesFragment.storeExamListInSharedPreferences()
             }
 
         })
@@ -180,8 +181,9 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.checkBoxUseGradeForAverage.isChecked = exam.gradeUsedInAverage
         adaptUIToCheckboxStatus(holder, exam)
         holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { _, isChecked ->
-            exam.gradeUsedInAverage = !isChecked
+            exam.gradeUsedInAverage = isChecked
             adaptUIToCheckboxStatus(holder, exam)
+            localGradesFragment.storeExamListInSharedPreferences()
         }
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 7482389c2b..6167e0b075 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -59,7 +59,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     private var showBarChartAfterRotate = false
 
-    private var globalEditOn = false
+    private var globalEditOFF = true
     private val exams = mutableListOf<Exam>()
 
     private val examSharedPreferences: String = "ExamList"
@@ -150,11 +150,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     private fun changeNumberOfExams() {
-        //(binding.gradesListView.adapter as ExamListAdapter).
-        //(binding.gradesListView.adapter as ExamListAdapter).itemList=exams
-        //(binding.gradesListView.adapter as ExamListAdapter).notifyDataSetChanged()
-
-
         binding.gradesListView.adapter = ExamListAdapter(requireContext(), exams, this)
         storeExamListInSharedPreferences()
     }
@@ -165,8 +160,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
         val examsTitles = exams.map { it.course }
         examsDownloaded.removeAll { examsTitles.contains(it.course) }
-        //  exams.clear()
-        //  storeExamListInSharedPreferences()
+       //  exams.clear()
+       //   storeExamListInSharedPreferences()
 
 
         if (!examsDownloaded.isEmpty()) {
@@ -176,7 +171,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         }
     }
 
-    fun loadExamListFromSharedPreferences() {
+    private fun loadExamListFromSharedPreferences() {
         try {
             val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
             val dateTimeConverter = DateTimeConverter()
@@ -195,10 +190,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         // Exam list could no be loaded - will always e a list, some error occurred - clear to prevent any intermediate error states
     }
 
-    private fun storeExamListInSharedPreferences() {
-
+    fun storeExamListInSharedPreferences() {
         scope.launch { storeExamListInSharedPreferencesThread() }
-
     }
 
     private fun storeExamListInSharedPreferencesThread() {
@@ -244,18 +237,14 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     }
 
+
+    //todo replace in the final version - can be done with exisiting data
     fun storeGradedCourses(exams: List<Exam>) {
         val gradesStore = GradesStore(defaultSharedPreferences)
         val courses = exams.map { it.course }
         gradesStore.store(courses)
     }
 
-    override fun onPause() {
-
-        storeExamListInSharedPreferences()
-        super.onPause()
-    }
-
 
     /**
      * Displays the pie chart and its data set with the provided grade distribution.
@@ -566,7 +555,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                         "",
                         semester,
                         weight,
-                        false,
+                        true,
                         credits,
                         true
                     )
@@ -682,13 +671,13 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun changeEditMode() {
         with(binding) {
-            globalEditOn = !globalEditOn
+            globalEditOFF = !globalEditOFF
             initUIVisibility()
         }
     }
 
     private fun initUIVisibility() {
-        if (!globalEditOn) {
+        if (!globalEditOFF) {
             frameLayoutAverageGrade?.visibility = View.GONE
             floatingbuttonAddExamGrade?.visibility = View.VISIBLE
         } else {
@@ -755,7 +744,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     fun getGlobalEdit(): Boolean {
-        return globalEditOn
+        return globalEditOFF
     }
 
 
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 7188f955da..b7004d0b13 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -149,6 +149,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginBottom="8dp"
                 android:background="@drawable/grade_background"
+                android:backgroundTint="@color/grade_default"
                 android:gravity="center"
                 android:padding="@dimen/material_default_padding"
                 android:src="@drawable/ic_clear"

From 98612e9f667728131cdf005b085045b68f17bbf4 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 12 May 2022 21:11:48 +0200
Subject: [PATCH 55/71] extracted string resources

---
 .../component/tumui/grades/ExamListAdapter.kt |   4 +-
 .../component/tumui/grades/GradesFragment.kt  |   8 +-
 .../main/res/layout-land/activity_grades.xml  |  97 -------
 .../main/res/layout-land/fragment_grades.xml  |   2 +-
 .../res/layout/activity_grades_listview.xml   | 271 +++++++++---------
 .../res/layout/dialog_add_grade_input.xml     | 267 ++++++++---------
 app/src/main/res/layout/fragment_grades.xml   |  31 +-
 app/src/main/res/values-de/strings.xml        |  18 +-
 app/src/main/res/values/strings.xml           |  17 +-
 9 files changed, 318 insertions(+), 397 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index ac7c1a96c4..cd4a61f6d8 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -75,8 +75,6 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         if (localGradesFragment.getGlobalEdit()) {
             holder.editGradesContainer.visibility = View.GONE
             holder.gradeTextViewDeleteCustomGrade.visibility = View.GONE
-
-            //todo init für den chackbox status
         } else {
             holder.editGradesContainer.visibility = View.VISIBLE
 
@@ -240,7 +238,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         var additionalInfoTextView: TextView = itemView.findViewById(R.id.additionalInfoTextView)
 
         var editTextGradeWeights: EditText = itemView.findViewById(R.id.editTextGradeWeight)
-        var editTextGradeCredits: EditText = itemView.findViewById(R.id.editTextCreditsofSubject)
+        var editTextGradeCredits: EditText = itemView.findViewById(R.id.editTextCreditsOfSubject)
         var editGradesContainer: LinearLayout = itemView.findViewById(R.id.editGradesContainer)
         var checkBoxUseGradeForAverage: CheckBox =
             itemView.findViewById(R.id.checkBoxUseGradeForAverage)
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 6167e0b075..2ab91c5805 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -165,7 +165,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
 
         if (!examsDownloaded.isEmpty()) {
-            examsDownloaded.forEach { it.credits_new = 6; it.weight = 1.0; }
+            examsDownloaded.forEach { it.credits_new = 6; it.weight = 1.0; it.gradeUsedInAverage=true}
             exams.addAll(examsDownloaded)
             storeExamListInSharedPreferences()
         }
@@ -415,7 +415,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 visibility = View.VISIBLE
             }
         }
-        binding.floatingbuttonAddExamGrade.setOnClickListener({ openAddGradeDialog() })
+        binding.floatingButtonAddExamGrade.setOnClickListener({ openAddGradeDialog() })
 
 
         binding.filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@@ -679,12 +679,12 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun initUIVisibility() {
         if (!globalEditOFF) {
             frameLayoutAverageGrade?.visibility = View.GONE
-            floatingbuttonAddExamGrade?.visibility = View.VISIBLE
+            floatingButtonAddExamGrade?.visibility = View.VISIBLE
         } else {
             storeExamListInSharedPreferences()
             showExams(exams)
             frameLayoutAverageGrade?.visibility = View.VISIBLE
-            floatingbuttonAddExamGrade?.visibility = View.GONE
+            floatingButtonAddExamGrade?.visibility = View.GONE
         }
     }
 
diff --git a/app/src/main/res/layout-land/activity_grades.xml b/app/src/main/res/layout-land/activity_grades.xml
index cb25ad3676..4d8189404e 100644
--- a/app/src/main/res/layout-land/activity_grades.xml
+++ b/app/src/main/res/layout-land/activity_grades.xml
@@ -1,6 +1,5 @@
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -39,102 +38,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <!--<include
-            layout="@layout/layout_all_errors"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-            <FrameLayout
-                android:id="@+id/chartsContainer"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_margin="@dimen/padding_default">
-
-                <com.github.mikephil.charting.charts.PieChart
-                    android:id="@+id/pieChartView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="visible" />
-
-                <com.github.mikephil.charting.charts.BarChart
-                    android:id="@+id/barChartView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone" />
-
-            </FrameLayout>
-
-            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-                android:id="@+id/swipeRefreshLayout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone">
-
-                <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-                    android:id="@+id/gradesListView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scrollbars="vertical" />
-
-            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-        </FrameLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/averageGradeTextView"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="@dimen/material_small_padding"
-                android:layout_weight="1"
-                android:textSize="@dimen/semilarge_text_size"
-                android:visibility="visible"
-                tools:text="1.0" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/showListButton"
-                style="@style/Widget.MaterialComponents.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_margin="@dimen/material_tiny_padding"
-                android:drawableStart="@drawable/ic_list_bulleted"
-                android:drawablePadding="@dimen/material_small_padding"
-                android:gravity="center"
-                android:onClick="toggleInLandscape"
-                android:text="@string/show_list"
-                android:textColor="@android:color/white"
-                app:backgroundTint="@color/color_primary"
-                app:cornerRadius="@dimen/material_corner_radius" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/showChartButton"
-                style="@style/Widget.MaterialComponents.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_margin="@dimen/material_tiny_padding"
-                android:drawableStart="@drawable/ic_pie_chart"
-                android:drawablePadding="@dimen/material_small_padding"
-                android:gravity="center"
-                android:onClick="toggleInLandscape"
-                android:text="@string/show_chart"
-                android:textColor="@android:color/white"
-                android:visibility="gone"
-                app:backgroundTint="@color/color_primary"
-                app:cornerRadius="@dimen/material_corner_radius" />
-
-        </LinearLayout>-->
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout-land/fragment_grades.xml b/app/src/main/res/layout-land/fragment_grades.xml
index 8c44a3e516..f399815c07 100644
--- a/app/src/main/res/layout-land/fragment_grades.xml
+++ b/app/src/main/res/layout-land/fragment_grades.xml
@@ -8,7 +8,7 @@
     android:orientation="vertical">
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/floatingbuttonAddExamGrade"
+        android:id="@+id/floatingButtonAddExamGrade"
         style="@style/BlueButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index b7004d0b13..f41762e4f2 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -1,176 +1,169 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:layout_marginBottom="@dimen/material_default_padding"
     android:background="@color/default_window_background"
-    android:orientation="vertical"
+    android:baselineAligned="false"
+    android:orientation="horizontal"
     android:paddingStart="@dimen/material_default_padding"
     android:paddingTop="@dimen/material_small_padding"
     android:paddingEnd="@dimen/material_default_padding"
-
     android:paddingBottom="@dimen/material_small_padding">
 
-
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+
+        <TextView
+            android:id="@+id/courseNameTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@color/color_primary"
+            android:textSize="@dimen/large_text_size"
+            android:textStyle="bold"
+            tools:text="@string/course_name" />
+
+        <TextView
+            android:id="@+id/examDateTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            tools:text="@string/text_view_examination_date_label" />
+
+        <TextView
+            android:id="@+id/additionalInfoTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            tools:text="@string/examiner" />
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:id="@+id/editGradesContainer"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:orientation="vertical">
 
 
-            <TextView
-                android:id="@+id/courseNameTextView"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/color_primary"
-                android:textSize="@dimen/large_text_size"
-                android:textStyle="bold"
-                tools:text="Course name" />
+                android:orientation="horizontal"
+                android:weightSum="10">
 
-            <TextView
-                android:id="@+id/examDateTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="visible"
-                tools:text="Exam date" />
+                <TextView
+                    android:id="@+id/textViewCreditsOfSubject"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5"
+                    android:labelFor="@+id/editTextCreditsOfSubject"
+                    android:text="@string/credits" />
 
-            <TextView
-                android:id="@+id/additionalInfoTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="visible"
-                tools:text="Examiner" />
+                <EditText
+                    android:id="@+id/editTextCreditsOfSubject"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5"
+                    android:autofillHints="@string/default_credits"
+                    android:ems="10"
+                    android:inputType="numberSigned" />
+
+
+            </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/editGradesContainer"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
-
+                android:orientation="horizontal"
+                android:weightSum="10">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <TextView
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:weightSum="10">
-
-                    <TextView
-                        android:id="@+id/textViewCreditsosSubject"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="5"
-                        android:labelFor="@+id/editTextCreditsofSubject"
-                        android:text="@string/credits_grade_label" />
-
-                    <EditText
-                        android:id="@+id/editTextCreditsofSubject"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="5"
-                        android:autofillHints="8"
-                        android:ems="10"
-                        android:inputType="numberSigned" />
-
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:weightSum="10">
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="5"
-                        android:labelFor="@+id/editTextGradeWeight"
-                        android:text="@string/grade_weight_label" />
-
-                    <EditText
-                        android:id="@+id/editTextGradeWeight"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="5"
-                        android:autofillHints="1.0"
-                        android:ems="10"
-                        android:inputType="numberDecimal" />
-
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                    android:layout_weight="5"
+                    android:labelFor="@+id/editTextGradeWeight"
+                    android:text="@string/grade_weight_label" />
+
+                <EditText
+                    android:id="@+id/editTextGradeWeight"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:weightSum="10">
-
-                    <CheckBox
-                        android:id="@+id/checkBoxUseGradeForAverage"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="5"
-                        android:text="@string/use_grade_in_average" />
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/buttonResetGradeParameters"
-                        style="@style/BlueButton"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="5"
-                        android:text="@string/reset_grade"
-                        android:textAllCaps="false"
-                        app:cornerRadius="@dimen/material_corner_radius" />
-
-
-                </LinearLayout>
+                    android:layout_weight="5"
+                    android:autofillHints="@string/default_grade"
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+
+
             </LinearLayout>
 
-        </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:weightSum="10">
+
+                <CheckBox
+                    android:id="@+id/checkBoxUseGradeForAverage"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5"
+                    android:text="@string/use_grade_in_average" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/buttonResetGradeParameters"
+                    style="@style/BlueButton"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="5"
+                    android:text="@string/reset_grade"
+                    android:textAllCaps="false"
+                    app:cornerRadius="@dimen/material_corner_radius" />
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
 
-            <ImageView
-                android:id="@+id/gradeTextViewDeleteCustomGrade"
-                android:layout_width="wrap_content"
-                android:layout_height="64dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="10dp"
-                android:layout_marginBottom="8dp"
-                android:background="@drawable/grade_background"
-                android:backgroundTint="@color/grade_default"
-                android:gravity="center"
-                android:padding="@dimen/material_default_padding"
-                android:src="@drawable/ic_clear"
-                android:visibility="gone"
-                app:tint="@android:color/white" />
-
-            <TextView
-                android:id="@+id/gradeTextView"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/grade_background"
-                android:gravity="center_horizontal"
-                android:padding="@dimen/material_default_padding"
-                android:textColor="@color/white"
-                android:textSize="22sp"
-                android:textStyle="bold"
-                tools:text="1,0" />
+            </LinearLayout>
         </LinearLayout>
+
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-</LinearLayout>
\ No newline at end of file
+        <ImageView
+            android:id="@+id/gradeTextViewDeleteCustomGrade"
+            android:layout_width="wrap_content"
+            android:layout_height="64dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="10dp"
+            android:layout_marginBottom="8dp"
+            android:background="@drawable/grade_background"
+            android:backgroundTint="@color/grade_default"
+            android:gravity="center"
+            android:padding="@dimen/material_default_padding"
+            android:src="@drawable/ic_clear"
+            android:visibility="gone"
+            app:tint="@android:color/white" />
+
+        <TextView
+            android:id="@+id/gradeTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="10dp"
+            android:background="@drawable/grade_background"
+            android:gravity="center_horizontal"
+            android:padding="@dimen/material_default_padding"
+            android:textColor="@color/white"
+            android:textSize="22sp"
+            android:textStyle="bold"
+            tools:text="@string/default_grade" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 7ff4741a31..5a07ad47e1 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -1,140 +1,145 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="256dp"
+    android:padding="@dimen/material_large_padding">
+
 
-    <ScrollView
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="256dp"
-        android:padding="@dimen/material_large_padding">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextaddGradeCourseName"
+            android:text="@string/course_name" />
+
+        <EditText
+            android:id="@+id/editTextaddGradeCourseName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/course_name"
+            android:imeOptions="actionGo"
+            android:importantForAutofill="no"
+            android:inputType="textCapWords|textAutoComplete"
+            android:text="@string/thesis"
+            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextAddGrade"
+            android:text="@string/text_view_grade_label" />
 
+        <EditText
+            android:id="@+id/editTextAddGrade"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="1.0"
+            android:ems="10"
+            android:hint="@string/default_grade"
+            android:imeOptions="actionGo"
+            android:importantForAutofill="no"
+            android:inputType="numberDecimal"
+            android:text="@string/default_grade" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextaddGradeExaminer"
+            android:text="@string/text_view_examiner_name" />
+
+        <EditText
+            android:id="@+id/editTextaddGradeExaminer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/text_view_examiner_name"
+            android:imeOptions="actionGo"
+            android:importantForAutofill="no"
+            android:inputType="textCapWords|textAutoComplete"
+            android:text="@string/unknown"
+            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextaddGradeCredits"
+            android:text="@string/text_view_credits_label" />
 
-        <LinearLayout
+        <EditText
+            android:id="@+id/editTextaddGradeCredits"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/material_default_padding"
-                android:labelFor="@+id/editTextaddGradeCourseName"
-                android:text="Course name" />
-
-            <EditText
-                android:id="@+id/editTextaddGradeCourseName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="Course Name"
-                android:text="Thesis"
-                android:imeOptions="actionGo"
-                android:inputType="textCapWords|textAutoComplete"
-                android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/material_default_padding"
-                android:labelFor="@+id/editTextAddGrade"
-                android:text="Grade (0 for passed)" />
-
-            <EditText
-                android:id="@+id/editTextAddGrade"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:autofillHints="1.0"
-                android:ems="10"
-                android:hint="1,0"
-                android:text="1,0"
-                android:imeOptions="actionGo"
-                android:inputType="numberDecimal" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/material_default_padding"
-                android:labelFor="@+id/editTextaddGradeExaminer"
-                android:text="Examiner" />
-
-            <EditText
-                android:id="@+id/editTextaddGradeExaminer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="Examiner name"
-                android:text="@string/unknown"
-                android:imeOptions="actionGo"
-                android:inputType="textCapWords|textAutoComplete"
-                android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/material_default_padding"
-                android:labelFor="@+id/editTextaddGradeCredits"
-                android:text="Credits" />
-
-            <EditText
-                android:id="@+id/editTextaddGradeCredits"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="Credits"
-                android:imeOptions="actionGo"
-                android:inputType="numberSigned"
-                android:text="6"
-                android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
-
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/material_default_padding"
-                android:labelFor="@+id/editTextAddGradeWeight"
-                android:text="Grade weight" />
-
-            <EditText
-                android:id="@+id/editTextAddGradeWeight"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:autofillHints="1.0"
-                android:ems="10"
-                android:hint="Grade Weight"
-                android:imeOptions="actionGo"
-                android:inputType="numberDecimal"
-                android:text="1.0" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/material_default_padding"
-                android:labelFor="@+id/editTextAddGradeDate"
-                android:text="Examination Date" />
-
-            <EditText
-                android:id="@+id/editTextAddGradeDate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:inputType="date"
-                android:hint="dd.mm.yy"
-                android:text="01.01.22"/>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/material_default_padding"
-                android:labelFor="@+id/editTextSemester"
-                android:text="Year of the start of the semester (e.g. 22WS or 21SoSe)" />
-
-            <EditText
-                android:id="@+id/editTextSemester"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="22WS"
-                android:text="22WS"/>
-
-
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>
\ No newline at end of file
+            android:hint="@string/text_view_credits_label"
+            android:imeOptions="actionGo"
+            android:importantForAutofill="no"
+            android:inputType="numberSigned"
+            android:text="@string/default_credits"
+            android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextAddGradeWeight"
+            android:text="@string/text_view_grade_weight" />
+
+        <EditText
+            android:id="@+id/editTextAddGradeWeight"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="1.0"
+            android:ems="10"
+            android:hint="@string/text_view_grade_weight"
+            android:imeOptions="actionGo"
+            android:importantForAutofill="no"
+            android:inputType="numberDecimal"
+            android:text="@string/default_grade_weight" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextAddGradeDate"
+            android:text="@string/text_view_examination_date_label" />
+
+        <EditText
+            android:id="@+id/editTextAddGradeDate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:hint="@string/grade_date_format"
+            android:importantForAutofill="no"
+            android:inputType="date"
+            android:text="@string/grade_date_default" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/material_default_padding"
+            android:labelFor="@+id/editTextSemester"
+            android:text="@string/text_view_semester_label" />
+
+        <EditText
+            android:id="@+id/editTextSemester"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:hint="@string/grade_semester_default"
+            android:importantForAutofill="no"
+            android:inputType="text"
+            android:text="@string/grade_semester_default" />
+
+
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index a62b23818c..4f2e13e065 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/gradesLayout"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent">
+    android:id="@+id/gradesLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/floatingbuttonAddExamGrade"
+        android:id="@+id/floatingButtonAddExamGrade"
         style="@style/BlueButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -20,11 +20,10 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
-
-        app:tint="@android:color/white"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="1.0"
-        app:srcCompat="@drawable/ic_add" />
+        app:srcCompat="@drawable/ic_add"
+        app:tint="@android:color/white" />
 
     <LinearLayout
 
@@ -109,18 +108,16 @@
 
         </FrameLayout>
 
-        <FrameLayout
+        <LinearLayout
             android:id="@+id/frameLayoutAverageGrade"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/pop_up_background"
+            android:padding="@dimen/material_default_padding"
             android:visibility="gone"
-            android:padding="@dimen/material_default_padding">
+            android:orientation="vertical">
+
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/averageGradeTextView"
@@ -139,9 +136,9 @@
                     android:text="@string/average_grade_hint"
                     android:textColor="@color/text_light_blue"
                     android:visibility="visible" />
-            </LinearLayout>
 
-        </FrameLayout>
+
+        </LinearLayout>
 
 
     </LinearLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e6809bdd50..bdfe4d1b25 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -57,10 +57,23 @@
     <string name="all_programs">Alle Noten</string>
     <string name="date">Datum</string>
     <string name="no_grades">Du hast noch keine Noten, die angezeigt werden könnten.</string>
-    <string name="reset_grade">Note Zurücksetzten</string>
+    <string name="reset_grade">Note zurücksetzten</string>
     <string name="use_grade_in_average">Note verwenden</string>
     <string name="grade_weight_label">Gewichtung der Note:</string>
-    <string name="credits_grade_label">Credits:</string>
+    <string name="course_name">Course name</string>
+    <string name="thesis">Bachelor Arbeit</string>
+    <string name="text_view_grade_label">Grade (0 für bestanden)</string>
+    <string name="default_grade">1,0</string>
+    <string name="text_view_examiner_name">Name des Prüfers</string>
+    <string name="text_view_credits_label">Credits</string>
+    <string name="default_credits">6</string>
+    <string name="text_view_grade_weight">Notengewichtung</string>
+    <string name="default_grade_weight">1.0</string>
+    <string name="text_view_examination_date_label">Datum der Prüfung</string>
+    <string name="grade_date_format">dd.mm.jj</string>
+    <string name="grade_date_default">01.01.22</string>
+    <string name="text_view_semester_label">Jahr in dem das Semester startet (z.B. 22WS or 21SoSe)</string>
+    <string name="grade_semester_default">22WS</string>
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Kennung</string>
@@ -722,4 +735,5 @@ Signatur: %5$s</string>
     // for opening hours
     <string name="language">de</string>
     <string name="use_existing">Bestehendes verwenden</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 325918b2ca..7f3bece807 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -87,7 +87,20 @@
     <string name="reset_grade">Reset Grade</string>
     <string name="use_grade_in_average">Use Grade</string>
     <string name="grade_weight_label">Grade Weight:</string>
-    <string name="credits_grade_label">Credits:</string>
+    <string name="course_name">Course name</string>
+    <string name="thesis">Thesis</string>
+    <string name="text_view_grade_label">Grade (0 for passed)</string>
+    <string name="default_grade">1,0</string>
+    <string name="text_view_examiner_name">Examiner Name</string>
+    <string name="text_view_credits_label">Credits</string>
+    <string name="default_credits">6</string>
+    <string name="text_view_grade_weight">Grade weight</string>
+    <string name="default_grade_weight">1.0</string>
+    <string name="text_view_examination_date_label">Examination Date</string>
+    <string name="grade_date_format">dd.mm.yy</string>
+    <string name="grade_date_default">01.01.22</string>
+    <string name="text_view_semester_label">Year of the start of the semester (e.g. 22WS or 21SuSe)</string>
+    <string name="grade_semester_default">22WS</string>
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Identification</string>
@@ -775,6 +788,4 @@ Signature: %5$s</string>
     <string name="language">en</string>
     <string name="use_existing">Use existing</string>
 
-
-
 </resources>

From 8027d377bfc6441bb2033b53707e75213d684aa1 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 12 May 2022 21:16:58 +0200
Subject: [PATCH 56/71] linted small warnings

---
 .../component/tumui/grades/ExamListAdapter.kt | 22 +++++++++----------
 .../tumui/grades/GradesBackgroundUpdater.kt   |  1 -
 .../component/tumui/grades/GradesFragment.kt  |  8 ++++---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index cd4a61f6d8..6d1e0d1d63 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -108,14 +108,14 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                     .create()
                     .apply {
                         window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
-                    };
+                    }
                 dialog.show()
                 dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(
-                    localGradesFragment.getResources().getColor(R.color.text_primary)
-                );
+                    localGradesFragment.resources.getColor(R.color.text_primary)
+                )
                 dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(
-                    localGradesFragment.getResources().getColor(R.color.text_primary)
-                );
+                    localGradesFragment.resources.getColor(R.color.text_primary)
+                )
             }
         } else {
             holder.gradeTextViewDeleteCustomGrade.visibility = View.GONE
@@ -133,7 +133,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             if (!hasFocus) {
                 val helper = holder.editTextGradeWeights.text.toString().toDouble()
                 if (exam.weight != helper) {
-                    exam.weight = helper;
+                    exam.weight = helper
                     localGradesFragment.storeExamListInSharedPreferences()
                 }
             }
@@ -143,7 +143,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             if (!hasFocus) {
                 val helper = holder.editTextGradeCredits.text.toString().toInt()
                 if (exam.credits_new != helper) {
-                    exam.credits_new = helper;
+                    exam.credits_new = helper
                     localGradesFragment.storeExamListInSharedPreferences()
                 }
             }
@@ -193,14 +193,14 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         exam: Exam
     ) {
         if (exam.gradeUsedInAverage) {
-            holder.editTextGradeCredits.isEnabled = true;
-            holder.editTextGradeWeights.isEnabled = true;
+            holder.editTextGradeCredits.isEnabled = true
+            holder.editTextGradeWeights.isEnabled = true
             val gradeColor = exam.getGradeColor(context)
             holder.gradeTextView.background.setTint(gradeColor)
             holder.gradeTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
         } else {
-            holder.editTextGradeCredits.isEnabled = false;
-            holder.editTextGradeWeights.isEnabled = false;
+            holder.editTextGradeCredits.isEnabled = false
+            holder.editTextGradeWeights.isEnabled = false
             holder.gradeTextView.background.setTint(
                 ContextCompat.getColor(
                     context,
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt
index 348b84f39e..e271bf5400 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesBackgroundUpdater.kt
@@ -1,7 +1,6 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
-import android.util.Log
 import de.tum.`in`.tumcampusapp.api.tumonline.CacheControl
 import de.tum.`in`.tumcampusapp.api.tumonline.TUMOnlineClient
 import de.tum.`in`.tumcampusapp.component.notifications.NotificationScheduler
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 2ab91c5805..6042a081ca 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -34,6 +34,7 @@ import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
 import kotlinx.android.synthetic.main.fragment_grades.*
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ObsoleteCoroutinesApi
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.newSingleThreadContext
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
@@ -63,6 +64,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private val exams = mutableListOf<Exam>()
 
     private val examSharedPreferences: String = "ExamList"
+
     private val scope = CoroutineScope(newSingleThreadContext("storetopreferences"))
 
 
@@ -355,7 +357,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         val numberFormat = NumberFormat.getInstance(Locale.GERMAN)
         val grades = exams
             .filter { it.isPassed && it.gradeUsedInAverage }
-            .map { numberFormat.parse(it.grade).toDouble() * it.credits_new * it.weight }
+            .map { (numberFormat.parse(it.grade.toString())?.toDouble() ?: 1.0) * it.credits_new * it.weight }
         val combinedgradefactors = exams
             .filter { it.isPassed && it.gradeUsedInAverage }
             .map { it.credits_new.toDouble() * it.weight }
@@ -364,7 +366,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         val gradeSum = grades.sum()
         val factorSum = combinedgradefactors.sum()
         if (factorSum<=0){
-            return 0.0;
+            return 0.0
         }
         return gradeSum / factorSum.toDouble()
     }
@@ -415,7 +417,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 visibility = View.VISIBLE
             }
         }
-        binding.floatingButtonAddExamGrade.setOnClickListener({ openAddGradeDialog() })
+        binding.floatingButtonAddExamGrade.setOnClickListener { openAddGradeDialog() }
 
 
         binding.filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {

From 336d7d06af59e4caf3639f2353a47360a40fb5b6 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Sun, 15 May 2022 10:31:09 +0200
Subject: [PATCH 57/71] fixed styling issue with the add grade dialog, added
 option for weighted grades in the diagrams.

---
 .../component/tumui/grades/GradesFragment.kt  | 294 ++++++++++--------
 .../grades/GradesNotificationProvider.kt      |   4 +-
 .../main/res/layout-land/fragment_grades.xml  |  12 +
 .../res/layout/dialog_add_grade_input.xml     |  31 +-
 app/src/main/res/layout/fragment_grades.xml   |  18 +-
 app/src/main/res/values-de/strings.xml        |   2 +-
 6 files changed, 223 insertions(+), 138 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 6042a081ca..e5162f4a1a 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -32,9 +32,9 @@ import de.tum.`in`.tumcampusapp.component.tumui.grades.model.ExamList
 import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
+import kotlinx.android.synthetic.main.dialog_add_grade_input.*
 import kotlinx.android.synthetic.main.fragment_grades.*
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ObsoleteCoroutinesApi
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.newSingleThreadContext
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
@@ -61,6 +61,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private var showBarChartAfterRotate = false
 
     private var globalEditOFF = true
+    private var adaptDiagramToWeights = true;
     private val exams = mutableListOf<Exam>()
 
     private val examSharedPreferences: String = "ExamList"
@@ -162,12 +163,14 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
         val examsTitles = exams.map { it.course }
         examsDownloaded.removeAll { examsTitles.contains(it.course) }
-       //  exams.clear()
-       //   storeExamListInSharedPreferences()
+        //  exams.clear()
+        //   storeExamListInSharedPreferences()
 
 
         if (!examsDownloaded.isEmpty()) {
-            examsDownloaded.forEach { it.credits_new = 6; it.weight = 1.0; it.gradeUsedInAverage=true}
+            examsDownloaded.forEach {
+                it.credits_new = 6; it.weight = 1.0; it.gradeUsedInAverage = true
+            }
             exams.addAll(examsDownloaded)
             storeExamListInSharedPreferences()
         }
@@ -259,11 +262,17 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             PieEntry(count.toFloat(), grade)
         }
 
-        val set = PieDataSet(entries, getString(R.string.grades_without_weight)).apply {
+
+        var annotation = ""
+        if (!adaptDiagramToWeights) {
+            annotation = getString(R.string.grades_without_weight)
+        }
+        val set = PieDataSet(entries, annotation).apply {
             setColors(GRADE_COLORS, requireContext())
             setDrawValues(false)
         }
 
+
         with(binding) {
             pieChartView.apply {
                 data = PieData(set)
@@ -297,7 +306,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             BarEntry(index.toFloat(), value.toFloat())
         }
 
-        val set = BarDataSet(entries, getString(R.string.grades_without_weight)).apply {
+        var annotation = ""
+        if (!adaptDiagramToWeights) {
+            annotation = getString(R.string.grades_without_weight)
+        }
+        val set = BarDataSet(entries, annotation).apply {
             setColors(GRADE_COLORS, requireContext())
             valueTextColor = resources.getColor(R.color.text_primary)
         }
@@ -357,7 +370,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         val numberFormat = NumberFormat.getInstance(Locale.GERMAN)
         val grades = exams
             .filter { it.isPassed && it.gradeUsedInAverage }
-            .map { (numberFormat.parse(it.grade.toString())?.toDouble() ?: 1.0) * it.credits_new * it.weight }
+            .map {
+                (numberFormat.parse(it.grade.toString())?.toDouble()
+                    ?: 1.0) * it.credits_new * it.weight
+            }
         val combinedgradefactors = exams
             .filter { it.isPassed && it.gradeUsedInAverage }
             .map { it.credits_new.toDouble() * it.weight }
@@ -365,7 +381,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
         val gradeSum = grades.sum()
         val factorSum = combinedgradefactors.sum()
-        if (factorSum<=0){
+        if (factorSum <= 0) {
             return 0.0
         }
         return gradeSum / factorSum.toDouble()
@@ -381,12 +397,20 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         val gradeDistribution = ArrayMap<String, Int>()
         exams.forEach { exam ->
             // The grade distribution now takes grades with more than one decimal place into account as well
-            var cleanGrade = exam.grade!!
-            if (cleanGrade.contains(longGradeRe)) {
-                cleanGrade = cleanGrade.subSequence(0, 3) as String
+            if (exam.gradeUsedInAverage) {
+                var cleanGrade = exam.grade!!
+                if (cleanGrade.contains(longGradeRe)) {
+                    cleanGrade = cleanGrade.subSequence(0, 3) as String
+                }
+                val count = gradeDistribution[cleanGrade] ?: 0
+
+                if (adaptDiagramToWeights) {
+                    gradeDistribution[cleanGrade] = count + (exam.credits_new * exam.weight).toInt()
+                } else {
+                    gradeDistribution[cleanGrade] = count + 1
+                }
             }
-            val count = gradeDistribution[cleanGrade] ?: 0
-            gradeDistribution[cleanGrade] = count + 1
+
         }
         return gradeDistribution
     }
@@ -418,30 +442,34 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             }
         }
         binding.floatingButtonAddExamGrade.setOnClickListener { openAddGradeDialog() }
+        checkboxUseDiagrams.setOnCheckedChangeListener() { _, isChecked ->
+            adaptDiagramToWeights = isChecked;
+        }
 
+        binding.filterSpinner.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(
+                    parent: AdapterView<*>,
+                    view: View?,
+                    position: Int,
+                    id: Long
+                ) {
+                    val filter = filters[position]
+                    spinnerPosition = position
 
-        binding.filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(
-                parent: AdapterView<*>,
-                view: View?,
-                position: Int,
-                id: Long
-            ) {
-                val filter = filters[position]
-                spinnerPosition = position
+                    val examsToShow = when (position) {
+                        0 -> exams
+                        else -> exams.filter { filter.contains(it.programID) }
+                    }
 
-                val examsToShow = when (position) {
-                    0 -> exams
-                    else -> exams.filter { filter.contains(it.programID) }
+                    showExams(examsToShow)
                 }
 
-                showExams(examsToShow)
+                override fun onNothingSelected(parent: AdapterView<*>) = Unit
             }
-
-            override fun onNothingSelected(parent: AdapterView<*>) = Unit
-        }
     }
 
+
     /**
      * Prompt the user to type in a name for the new chat room
      */
@@ -457,124 +485,114 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                         "Manually added Exams can be deleted later on."
             )
             .setView(view)
-            .setPositiveButton(R.string.create, null)
-            .setNegativeButton(android.R.string.cancel, null)
             .create()
             .apply {
                 window?.setBackgroundDrawableResource(R.drawable.rounded_corners_background)
             }
 
-        dialog.setOnShowListener {
-            val button: Button =
-                dialog.getButton(AlertDialog.BUTTON_POSITIVE)
-            button.setOnClickListener {
-
-                val titleView = view.findViewById<EditText>(R.id.editTextaddGradeCourseName)
-                val gradeView = view.findViewById<EditText>(R.id.editTextAddGrade)
-                val examinerView = view.findViewById<EditText>(R.id.editTextaddGradeExaminer)
-                val weightView = view.findViewById<EditText>(R.id.editTextAddGradeWeight)
-                val creditsView = view.findViewById<EditText>(R.id.editTextaddGradeCredits)
-                val dateView = view.findViewById<EditText>(R.id.editTextAddGradeDate)
-                val semesterView = view.findViewById<EditText>(R.id.editTextSemester)
-
-                val title = titleView.text.toString()
-                val grade = gradeView.text.toString()
-                val examiner = examinerView.text.toString()
-                val credits = Integer.parseInt(creditsView.text.toString())
-                val date = dateView.text.toString()
-                val semester = semesterView.text.toString()
-
-                var weight: Double
-                try {
-                    weight = (weightView.text.toString()).toDouble()
-                } catch (exception: Exception) {
-                    weight = 1.0
-                }
+        dialog.show()
+        dialog.findViewById<Button>(R.id.cancelDialogAddGrade)
+            ?.setOnClickListener { dialog.dismiss() }
+        dialog.findViewById<Button>(R.id.positiveDialogAddGrade)?.setOnClickListener {
+
+            val titleView = view.findViewById<EditText>(R.id.editTextaddGradeCourseName)
+            val gradeView = view.findViewById<EditText>(R.id.editTextAddGrade)
+            val examinerView = view.findViewById<EditText>(R.id.editTextaddGradeExaminer)
+            val weightView = view.findViewById<EditText>(R.id.editTextAddGradeWeight)
+            val creditsView = view.findViewById<EditText>(R.id.editTextaddGradeCredits)
+            val dateView = view.findViewById<EditText>(R.id.editTextAddGradeDate)
+            val semesterView = view.findViewById<EditText>(R.id.editTextSemester)
+
+            val title = titleView.text.toString()
+            val grade = gradeView.text.toString()
+            val examiner = examinerView.text.toString()
+            val credits = Integer.parseInt(creditsView.text.toString())
+            val date = dateView.text.toString()
+            val semester = semesterView.text.toString()
+
+            var weight: Double
+            try {
+                weight = (weightView.text.toString()).toDouble()
+            } catch (exception: Exception) {
+                weight = 1.0
+            }
 
 
 
-                titleView.error = null
-                gradeView.error = null
-                examinerView.error = null
-                weightView.error = null
-                creditsView.error = null
-                dateView.error = null
-                semesterView.error = null
+            titleView.error = null
+            gradeView.error = null
+            examinerView.error = null
+            weightView.error = null
+            creditsView.error = null
+            dateView.error = null
+            semesterView.error = null
 
-                var changesRequired = false
-                if (semester.length < 3) {                                                  //semester sanitization
-                    changesRequired = true
-                    semesterView.error =
-                        "Wrong semester format: Too short. Correct two numbers for the year + W/S"
-                } else if (!(semester.get(2).equals('W') || semester.get(2)
-                        .equals('w') || semester.get(2).equals('S') || semester.get(2).equals('s'))
-                ) {
-                    changesRequired = true
-                    semesterView.error =
-                        "Wrong semester format: Term not specified. Correct two numbers for the year + W/S"
-                }
+            var changesRequired = false
+            if (semester.length < 3) {                                                  //semester sanitization
+                changesRequired = true
+                semesterView.error =
+                    "Wrong semester format: Too short. Correct two numbers for the year + W/S"
+            } else if (!(semester.get(2).equals('W') || semester.get(2)
+                    .equals('w') || semester.get(2).equals('S') || semester.get(2)
+                    .equals('s'))
+            ) {
+                changesRequired = true
+                semesterView.error =
+                    "Wrong semester format: Term not specified. Correct two numbers for the year + W/S"
+            }
 
-                if (weight < 0.0) {             //weight sanitization
-                    changesRequired = true
-                    weightView.error = "Wrong weight format: Weights can not be negative."
-                }
+            if (weight < 0.0) {             //weight sanitization
+                changesRequired = true
+                weightView.error = "Wrong weight format: Weights can not be negative."
+            }
 
-                val gradedouble = grade.replace(",", ".").toDouble()
-                var gradeString = ""
-                if (gradedouble <= 5.0 && gradedouble >= 1.0 || gradedouble == 0.0) {
-                    if (gradedouble == 0.0) {
-                        gradeString = "B"
-                    } else {
-                        gradeString = grade.toString().replace(".",",")
-                    }
+            val gradedouble = grade.replace(",", ".").toDouble()
+            var gradeString = ""
+            if (gradedouble <= 5.0 && gradedouble >= 1.0 || gradedouble == 0.0) {
+                if (gradedouble == 0.0) {
+                    gradeString = "B"
                 } else {
-                    changesRequired = true
-                    gradeView.error =
-                        "Wrong grade format: Grade must be between 1.0 and 5.0 or equal to 0."
+                    gradeString = grade.toString().replace(".", ",")
                 }
+            } else {
+                changesRequired = true
+                gradeView.error =
+                    "Wrong grade format: Grade must be between 1.0 and 5.0 or equal to 0."
+            }
 
 
-                if (title.length < 1) {             //title sanitization
-                    changesRequired = true
-                    titleView.error = "Insert a course title."
-                }
+            if (title.length < 1) {             //title sanitization
+                changesRequired = true
+                titleView.error = "Insert a course title."
+            }
 
-                if (credits < 1) {             //title sanitization
-                    changesRequired = true
-                    creditsView.error = "Invalid amount of credits. Must be greater than 0."
-                }
+            if (credits < 1) {             //title sanitization
+                changesRequired = true
+                creditsView.error = "Invalid amount of credits. Must be greater than 0."
+            }
 
 
-                if (!changesRequired) {
-                    val typeConverter1 =
-                        de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
-                    val exam = Exam(
-                        title,
-                        typeConverter1.read(date),
-                        examiner,
-                        gradeString,
-                        null,
-                        "",
-                        semester,
-                        weight,
-                        true,
-                        credits,
-                        true
-                    )
-                    addExamToList(exam)
-                    dialog.dismiss()
-                }
+            if (!changesRequired) {
+                val typeConverter1 =
+                    de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
+                val exam = Exam(
+                    title,
+                    typeConverter1.read(date),
+                    examiner,
+                    gradeString,
+                    "",
+                    "",
+                    semester,
+                    weight,
+                    true,
+                    credits,
+                    true
+                )
+                addExamToList(exam)
+                dialog.dismiss()
             }
+            //   }
         }
-
-        dialog.show()
-
-        dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
-            .setTextColor(resources.getColor(R.color.text_primary))
-        dialog.getButton(AlertDialog.BUTTON_POSITIVE)
-            .setTextColor(resources.getColor(R.color.text_primary))
-
-
     }
 
     /**
@@ -672,21 +690,35 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      * Toggles between the standard mode and the mode which allows to change grades.
      */
     private fun changeEditMode() {
-        with(binding) {
-            globalEditOFF = !globalEditOFF
-            initUIVisibility()
-        }
+        globalEditOFF = !globalEditOFF
+        initUIVisibility()
     }
 
     private fun initUIVisibility() {
+        //   checkboxUseDiagrams.isChecked=false
+
         if (!globalEditOFF) {
             frameLayoutAverageGrade?.visibility = View.GONE
             floatingButtonAddExamGrade?.visibility = View.VISIBLE
+            chartsContainer.visibility = View.GONE
+            checkboxUseDiagrams?.visibility = View.VISIBLE
+            val scale = resources.displayMetrics.density
+            gradesListView.setPadding(0, (32 * scale + 0.5f).toInt(), 0, 0);
+
         } else {
             storeExamListInSharedPreferences()
             showExams(exams)
             frameLayoutAverageGrade?.visibility = View.VISIBLE
             floatingButtonAddExamGrade?.visibility = View.GONE
+            chartsContainer.visibility = View.VISIBLE
+            checkboxUseDiagrams?.visibility = View.GONE
+            val scale = resources.displayMetrics.density
+            gradesListView.setPadding(0, (256 * scale + 0.5f).toInt(), 0, 0);
+            showExams(exams);
+            /* if(checkboxUseDiagrams.isChecked!=adaptDiagramToWeights){
+                 adaptDiagramToWeights=checkboxUseDiagrams.isChecked;
+                 showExams(exams);
+             }*/
         }
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesNotificationProvider.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesNotificationProvider.kt
index e9471148a6..f2bd2a3a08 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesNotificationProvider.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesNotificationProvider.kt
@@ -23,7 +23,7 @@ class GradesNotificationProvider(
                 .setColor(notificationColorAccent)
     }
 
-    override fun buildNotification(): AppNotification? {
+    override fun buildNotification(): AppNotification {
         val title = context.getString(R.string.my_grades)
         val size = newGrades.size
         val formattedNewGrades = newGrades.joinToString()
@@ -36,7 +36,7 @@ class GradesNotificationProvider(
 
         val deleteIntent = GradeNotificationDeleteReceiver.newIntent(context, newGrades)
         val deletePendingIntent = PendingIntent.getBroadcast(
-                context, DELETE_REQUEST_CODE, deleteIntent, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
+                context, DELETE_REQUEST_CODE, deleteIntent, PendingIntent.FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT)
 
         val notification = getNotificationBuilder()
                 .setContentTitle(title)
diff --git a/app/src/main/res/layout-land/fragment_grades.xml b/app/src/main/res/layout-land/fragment_grades.xml
index f399815c07..845a3783f8 100644
--- a/app/src/main/res/layout-land/fragment_grades.xml
+++ b/app/src/main/res/layout-land/fragment_grades.xml
@@ -21,6 +21,18 @@
         app:layout_constraintVertical_bias="0.8"
         app:srcCompat="@drawable/ic_add"
         app:tint="@android:color/white" />
+    <CheckBox
+        android:id="@+id/checkboxUseDiagrams"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="32dp"
+        android:checked="true"
+        android:text="use weights in diagrams"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 5a07ad47e1..5c99ea9c8f 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -4,7 +4,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="256dp"
+    android:layout_height="100dp"
     android:padding="@dimen/material_large_padding">
 
 
@@ -140,6 +140,35 @@
             android:inputType="text"
             android:text="@string/grade_semester_default" />
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/cancelDialogAddGrade"
+                style="@style/BlueButton"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@string/cancel"
+                android:layout_marginRight="4dp"
+                android:textAllCaps="false"/>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/positiveDialogAddGrade"
+                style="@style/BlueButton"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:layout_marginLeft="8dp"
+                android:text="Übernehmen"
+                android:textAllCaps="false" />
+
+
+        </LinearLayout>
+
 
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index 4f2e13e065..958e06d6d0 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -25,6 +25,8 @@
         app:srcCompat="@drawable/ic_add"
         app:tint="@android:color/white" />
 
+
+
     <LinearLayout
 
         android:layout_width="match_parent"
@@ -67,11 +69,17 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1">
-
+            <CheckBox
+                android:id="@+id/checkboxUseDiagrams"
+                android:layout_width="match_parent"
+                android:layout_height="32dp"
+                android:layout_marginLeft="8dp"
+                android:checked="true"
+                android:text="use weights in diagrams" />
             <FrameLayout
                 android:id="@+id/chartsContainer"
                 android:layout_width="match_parent"
-                android:layout_height="200dp"
+                android:layout_height="256dp"
                 android:background="@color/default_window_background"
                 android:padding="@dimen/material_default_padding"
                 android:visibility="invisible">
@@ -90,6 +98,9 @@
 
             </FrameLayout>
 
+
+
+
             <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:id="@+id/swipeRefreshLayout"
                 android:layout_width="match_parent"
@@ -101,13 +112,14 @@
                     android:layout_height="match_parent"
                     android:clipToPadding="false"
                     android:divider="@color/list_divider"
-                    android:paddingTop="200dp"
+                    android:paddingTop="256dp"
                     android:scrollbars="vertical" />
 
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         </FrameLayout>
 
+
         <LinearLayout
             android:id="@+id/frameLayoutAverageGrade"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index bdfe4d1b25..440834f6ac 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -57,7 +57,7 @@
     <string name="all_programs">Alle Noten</string>
     <string name="date">Datum</string>
     <string name="no_grades">Du hast noch keine Noten, die angezeigt werden könnten.</string>
-    <string name="reset_grade">Note zurücksetzten</string>
+    <string name="reset_grade">zurücksetzten</string>
     <string name="use_grade_in_average">Note verwenden</string>
     <string name="grade_weight_label">Gewichtung der Note:</string>
     <string name="course_name">Course name</string>

From 1b6a7b319e64c4804d6b5591a0dd4300b2bf968f Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Sun, 15 May 2022 13:09:34 +0200
Subject: [PATCH 58/71] fixed unclickable checkbox

---
 .../component/tumui/grades/GradesFragment.kt  | 53 ++++++++++---------
 app/src/main/res/layout/fragment_grades.xml   |  4 +-
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index e5162f4a1a..7914b204a7 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -6,10 +6,8 @@ import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
+import android.util.Log
+import android.view.*
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Button
@@ -17,6 +15,8 @@ import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat.getColor
+import androidx.core.view.marginBottom
+import androidx.core.view.marginTop
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.LegendEntry
 import com.github.mikephil.charting.data.*
@@ -109,8 +109,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             initUIVisibility()
         }
 
-        //loadExamListFromSharedPreferences();
-        loadGrades(CacheControl.USE_CACHE)
+        loadExamListFromSharedPreferences();
+        initUIAfterDownloadingExams()
+        //loadGrades(CacheControl.USE_CACHE)
         // Tracks whether the user has used the calendar module before. This is used in determining when to prompt for a
         // Google Play store review
         Utils.setSetting(requireContext(), Const.HAS_VISITED_GRADES, true)
@@ -127,9 +128,13 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     override fun onDownloadSuccessful(response: ExamList) {
         val examsDownloaded: MutableList<Exam> = response.exams.orEmpty().toMutableList()
-
         loadExamListFromSharedPreferences()
         addAllNewItemsToExamList(examsDownloaded)
+        initUIAfterDownloadingExams()
+
+    }
+
+    private fun initUIAfterDownloadingExams() {
         initSpinner(exams)
         showExams(exams)
 
@@ -163,11 +168,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
         val examsTitles = exams.map { it.course }
         examsDownloaded.removeAll { examsTitles.contains(it.course) }
-        //  exams.clear()
-        //   storeExamListInSharedPreferences()
 
 
-        if (!examsDownloaded.isEmpty()) {
+        if (examsDownloaded.isNotEmpty()) {
             examsDownloaded.forEach {
                 it.credits_new = 6; it.weight = 1.0; it.gradeUsedInAverage = true
             }
@@ -184,7 +187,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 .create()
             val listType = object : TypeToken<List<Exam>>() {}.type
             val jsonString = sharedPref.getString(examSharedPreferences, "")
-            if (jsonString != null) {
+            if (jsonString != null && !jsonString.equals("[]")) {
                 exams.clear()
                 exams.addAll(gson.fromJson(jsonString, listType))
                 return
@@ -192,14 +195,16 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         } catch (e: Exception) {
             exams.clear()
         }
+        storeExamListInSharedPreferences()
         // Exam list could no be loaded - will always e a list, some error occurred - clear to prevent any intermediate error states
     }
 
-    fun storeExamListInSharedPreferences() {
+   /* fun storeExamListInSharedPreferences() {
         scope.launch { storeExamListInSharedPreferencesThread() }
     }
-
-    private fun storeExamListInSharedPreferencesThread() {
+*/
+    fun storeExamListInSharedPreferences() {
+        Log.d("Exam Storing", "thread to store exams is successfully started")
         val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
         val dateTimeConverter = DateTimeConverter()
         val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
@@ -209,6 +214,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             putString(examSharedPreferences, jsonlist)
             apply()
         }
+        Log.d("Exam Storing", "thread to store exams is successfully finished")
     }
 
 
@@ -474,10 +480,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      * Prompt the user to type in a name for the new chat room
      */
     private fun openAddGradeDialog() {
-        // Set an EditText view to get user input
         val view = View.inflate(requireContext(), R.layout.dialog_add_grade_input, null)
-
-
         val dialog = AlertDialog.Builder(requireContext())
             .setTitle("Add a New Exam")
             .setMessage(
@@ -591,7 +594,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 addExamToList(exam)
                 dialog.dismiss()
             }
-            //   }
         }
     }
 
@@ -703,8 +705,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             chartsContainer.visibility = View.GONE
             checkboxUseDiagrams?.visibility = View.VISIBLE
             val scale = resources.displayMetrics.density
-            gradesListView.setPadding(0, (32 * scale + 0.5f).toInt(), 0, 0);
-
+            val param = swipeRefreshLayout.layoutParams as ViewGroup.MarginLayoutParams
+            param.setMargins(0,( (32 * scale + 0.5f).toInt()),0,0)
+            swipeRefreshLayout.layoutParams = param
         } else {
             storeExamListInSharedPreferences()
             showExams(exams)
@@ -713,12 +716,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             chartsContainer.visibility = View.VISIBLE
             checkboxUseDiagrams?.visibility = View.GONE
             val scale = resources.displayMetrics.density
-            gradesListView.setPadding(0, (256 * scale + 0.5f).toInt(), 0, 0);
-            showExams(exams);
-            /* if(checkboxUseDiagrams.isChecked!=adaptDiagramToWeights){
-                 adaptDiagramToWeights=checkboxUseDiagrams.isChecked;
-                 showExams(exams);
-             }*/
+            val param = swipeRefreshLayout.layoutParams as ViewGroup.MarginLayoutParams
+            param.setMargins(0,( (256 * scale + 0.5f).toInt()),0,0)
+            swipeRefreshLayout.layoutParams = param
+
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index 958e06d6d0..de07e54530 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -104,6 +104,7 @@
             <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:id="@+id/swipeRefreshLayout"
                 android:layout_width="match_parent"
+                android:layout_marginTop="256dp"
                 android:layout_height="match_parent">
 
                 <se.emilsjolander.stickylistheaders.StickyListHeadersListView
@@ -112,7 +113,8 @@
                     android:layout_height="match_parent"
                     android:clipToPadding="false"
                     android:divider="@color/list_divider"
-                    android:paddingTop="256dp"
+
+
                     android:scrollbars="vertical" />
 
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

From 36159f59e89a2bf3733b0abe095ec7c8dd30cfad Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Sun, 15 May 2022 14:51:04 +0200
Subject: [PATCH 59/71] fixed inconsistency in saving exams to the shared
 preferences

---
 .../component/tumui/grades/ExamListAdapter.kt | 15 +++--
 .../component/tumui/grades/GradesFragment.kt  | 62 ++++++++-----------
 app/src/main/res/layout/fragment_grades.xml   |  3 +-
 app/src/main/res/values-de/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 6d1e0d1d63..1ff07b9ab4 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -1,6 +1,7 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
@@ -50,7 +51,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.gradeTextView.text = exam.grade
 
 
-        adaptUIToCheckboxStatus(holder,exam)
+        adaptUIToCheckboxStatus(holder, exam)
 
         val date: String = if (exam.date == null) {
             context.getString(R.string.not_specified)
@@ -92,7 +93,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
     private fun initListenerDeleteCustomGrade(exam: Exam, holder: ViewHolder) {
         if (exam.manuallyAdded) {
             holder.gradeTextViewDeleteCustomGrade.visibility = View.VISIBLE
-           // adaptUIToCheckboxStatus(holder, exam)
+            // adaptUIToCheckboxStatus(holder, exam)
 
             holder.gradeTextViewDeleteCustomGrade.setOnClickListener {
                 val dialog = AlertDialog.Builder(localGradesFragment.requireContext())
@@ -135,6 +136,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 if (exam.weight != helper) {
                     exam.weight = helper
                     localGradesFragment.storeExamListInSharedPreferences()
+                    notifyDataSetChanged()
                 }
             }
         }
@@ -145,6 +147,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 if (exam.credits_new != helper) {
                     exam.credits_new = helper
                     localGradesFragment.storeExamListInSharedPreferences()
+                    notifyDataSetChanged()
                 }
             }
         }
@@ -161,12 +164,13 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
             override fun onClick(p0: View?) {
                 exam.gradeUsedInAverage = true
                 adaptUIToCheckboxStatus(holder, exam)
-
+                holder.checkBoxUseGradeForAverage.isChecked = true
                 exam.weight = 1.0
                 exam.credits_new = 6
                 holder.editTextGradeWeights.setText(exam.weight.toString())
                 holder.editTextGradeCredits.setText(exam.credits_new.toString())
                 localGradesFragment.storeExamListInSharedPreferences()
+                notifyDataSetChanged()
             }
 
         })
@@ -178,10 +182,11 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
     private fun initCheckBoxUsedInAverage(exam: Exam, holder: ViewHolder) {
         holder.checkBoxUseGradeForAverage.isChecked = exam.gradeUsedInAverage
         adaptUIToCheckboxStatus(holder, exam)
-        holder.checkBoxUseGradeForAverage.setOnCheckedChangeListener { _, isChecked ->
-            exam.gradeUsedInAverage = isChecked
+        holder.checkBoxUseGradeForAverage.setOnClickListener() {
+            exam.gradeUsedInAverage = holder.checkBoxUseGradeForAverage.isChecked
             adaptUIToCheckboxStatus(holder, exam)
             localGradesFragment.storeExamListInSharedPreferences()
+            notifyDataSetChanged()
         }
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 7914b204a7..ecb2364cd8 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -15,8 +15,6 @@ import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat.getColor
-import androidx.core.view.marginBottom
-import androidx.core.view.marginTop
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.LegendEntry
 import com.github.mikephil.charting.data.*
@@ -32,11 +30,7 @@ import de.tum.`in`.tumcampusapp.component.tumui.grades.model.ExamList
 import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
-import kotlinx.android.synthetic.main.dialog_add_grade_input.*
 import kotlinx.android.synthetic.main.fragment_grades.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.newSingleThreadContext
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
@@ -61,13 +55,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private var showBarChartAfterRotate = false
 
     private var globalEditOFF = true
-    private var adaptDiagramToWeights = true;
+    private var adaptDiagramToWeights = true
     private val exams = mutableListOf<Exam>()
 
     private val examSharedPreferences: String = "ExamList"
 
-    private val scope = CoroutineScope(newSingleThreadContext("storetopreferences"))
-
 
     private val grades: Array<String> by lazy {
         resources.getStringArray(R.array.grades)
@@ -108,10 +100,13 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             showChartButton?.setOnClickListener { toggleInLandscape() }
             initUIVisibility()
         }
+        binding.floatingButtonAddExamGrade.setOnClickListener { openAddGradeDialog() }
+        checkboxUseDiagrams.setOnCheckedChangeListener { _, isChecked ->
+            adaptDiagramToWeights = isChecked
+        }
 
-        loadExamListFromSharedPreferences();
-        initUIAfterDownloadingExams()
-        //loadGrades(CacheControl.USE_CACHE)
+
+        loadGrades(CacheControl.USE_CACHE)
         // Tracks whether the user has used the calendar module before. This is used in determining when to prompt for a
         // Google Play store review
         Utils.setSetting(requireContext(), Const.HAS_VISITED_GRADES, true)
@@ -172,7 +167,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
         if (examsDownloaded.isNotEmpty()) {
             examsDownloaded.forEach {
-                it.credits_new = 6; it.weight = 1.0; it.gradeUsedInAverage = true
+                it.credits_new = 6;it.weight = 1.0; it.gradeUsedInAverage = true
             }
             exams.addAll(examsDownloaded)
             storeExamListInSharedPreferences()
@@ -195,15 +190,15 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         } catch (e: Exception) {
             exams.clear()
         }
-        storeExamListInSharedPreferences()
+        // storeExamListInSharedPreferences()
         // Exam list could no be loaded - will always e a list, some error occurred - clear to prevent any intermediate error states
     }
 
-   /* fun storeExamListInSharedPreferences() {
-        scope.launch { storeExamListInSharedPreferencesThread() }
-    }
-*/
-    fun storeExamListInSharedPreferences() {
+    /* fun storeExamListInSharedPreferences() {
+         scope.launch { storeExamListInSharedPreferencesThread() }
+     }
+ */
+   fun storeExamListInSharedPreferences() {
         Log.d("Exam Storing", "thread to store exams is successfully started")
         val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
         val dateTimeConverter = DateTimeConverter()
@@ -214,10 +209,11 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             putString(examSharedPreferences, jsonlist)
             apply()
         }
-        Log.d("Exam Storing", "thread to store exams is successfully finished")
     }
 
 
+
+
     /**
      * Gson serialiser/deserialiser for converting Joda [DateTime] objects.
      * Source: https://riptutorial.com/android/example/14799/adding-a-custom-converter-to-gson
@@ -447,10 +443,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 visibility = View.VISIBLE
             }
         }
-        binding.floatingButtonAddExamGrade.setOnClickListener { openAddGradeDialog() }
-        checkboxUseDiagrams.setOnCheckedChangeListener() { _, isChecked ->
-            adaptDiagramToWeights = isChecked;
-        }
+
 
         binding.filterSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
@@ -697,30 +690,27 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     private fun initUIVisibility() {
-        //   checkboxUseDiagrams.isChecked=false
-
+        val scale = resources.displayMetrics.density
+        val param = swipeRefreshLayout.layoutParams as ViewGroup.MarginLayoutParams
         if (!globalEditOFF) {
             frameLayoutAverageGrade?.visibility = View.GONE
             floatingButtonAddExamGrade?.visibility = View.VISIBLE
             chartsContainer.visibility = View.GONE
             checkboxUseDiagrams?.visibility = View.VISIBLE
-            val scale = resources.displayMetrics.density
-            val param = swipeRefreshLayout.layoutParams as ViewGroup.MarginLayoutParams
-            param.setMargins(0,( (32 * scale + 0.5f).toInt()),0,0)
-            swipeRefreshLayout.layoutParams = param
+            param.setMargins(0, ((32 * scale + 0.5f).toInt()), 0, 0)
+            gradesListView.setPadding(0, 0, 0, 0)
+
         } else {
-            storeExamListInSharedPreferences()
+            //storeExamListInSharedPreferences()
             showExams(exams)
             frameLayoutAverageGrade?.visibility = View.VISIBLE
             floatingButtonAddExamGrade?.visibility = View.GONE
             chartsContainer.visibility = View.VISIBLE
             checkboxUseDiagrams?.visibility = View.GONE
-            val scale = resources.displayMetrics.density
-            val param = swipeRefreshLayout.layoutParams as ViewGroup.MarginLayoutParams
-            param.setMargins(0,( (256 * scale + 0.5f).toInt()),0,0)
-            swipeRefreshLayout.layoutParams = param
-
+            param.setMargins(0, 0, 0, 0)
+            gradesListView.setPadding(0, ((256 * scale + 0.5f).toInt()), 0, 0)
         }
+        swipeRefreshLayout.layoutParams = param
     }
 
     /**
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index de07e54530..d921569284 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -75,7 +75,7 @@
                 android:layout_height="32dp"
                 android:layout_marginLeft="8dp"
                 android:checked="true"
-                android:text="use weights in diagrams" />
+                android:text="@string/use_weights_in_diagrams" />
             <FrameLayout
                 android:id="@+id/chartsContainer"
                 android:layout_width="match_parent"
@@ -104,7 +104,6 @@
             <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:id="@+id/swipeRefreshLayout"
                 android:layout_width="match_parent"
-                android:layout_marginTop="256dp"
                 android:layout_height="match_parent">
 
                 <se.emilsjolander.stickylistheaders.StickyListHeadersListView
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 440834f6ac..f70b0da3e3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -74,6 +74,7 @@
     <string name="grade_date_default">01.01.22</string>
     <string name="text_view_semester_label">Jahr in dem das Semester startet (z.B. 22WS or 21SoSe)</string>
     <string name="grade_semester_default">22WS</string>
+    <string name="use_weights_in_diagrams">Credits und Gewichte in dem Diagram berücksichtigen</string>
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Kennung</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7f3bece807..c786f0b47f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -101,6 +101,7 @@
     <string name="grade_date_default">01.01.22</string>
     <string name="text_view_semester_label">Year of the start of the semester (e.g. 22WS or 21SuSe)</string>
     <string name="grade_semester_default">22WS</string>
+    <string name="use_weights_in_diagrams">Consider credits and weights in the diagram</string>
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Identification</string>

From e2e30ff9c6c08948df9ede2c3f9724072d974269 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Sun, 15 May 2022 16:39:52 +0200
Subject: [PATCH 60/71] added translations, linted; show program spinner only
 if more than one program exits

---
 .../component/tumui/grades/ExamListAdapter.kt |   7 +-
 .../component/tumui/grades/GradesFragment.kt  | 131 +++++++++---------
 app/src/main/res/values-de/strings.xml        |  11 ++
 app/src/main/res/values/strings.xml           |  11 ++
 4 files changed, 87 insertions(+), 73 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 1ff07b9ab4..6abbc493f6 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -93,15 +93,14 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
     private fun initListenerDeleteCustomGrade(exam: Exam, holder: ViewHolder) {
         if (exam.manuallyAdded) {
             holder.gradeTextViewDeleteCustomGrade.visibility = View.VISIBLE
-            // adaptUIToCheckboxStatus(holder, exam)
 
             holder.gradeTextViewDeleteCustomGrade.setOnClickListener {
                 val dialog = AlertDialog.Builder(localGradesFragment.requireContext())
-                    .setTitle("Delete Exam")
+                    .setTitle(context.getString(R.string.delete_exam))
                     .setMessage(
-                        "Should this exam be irrevocably deleted"
+                        context.getString(R.string.delete_exam_dialog_message)
                     )
-                    .setPositiveButton("Delete") { dialogInterface, whichButton ->
+                    .setPositiveButton(R.string.delete) { _, _ ->
 
                         localGradesFragment.deleteExamFromList(exam)
                     }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index ecb2364cd8..090106275a 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -142,7 +142,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         storeGradedCourses(exams)
     }
 
-    fun addExamToList(exam: Exam) {
+    private fun addExamToList(exam: Exam) {
         exams.add(exam)
         changeNumberOfExams()
     }
@@ -182,7 +182,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 .create()
             val listType = object : TypeToken<List<Exam>>() {}.type
             val jsonString = sharedPref.getString(examSharedPreferences, "")
-            if (jsonString != null && !jsonString.equals("[]")) {
+            if (jsonString != null && jsonString != "[]") {
                 exams.clear()
                 exams.addAll(gson.fromJson(jsonString, listType))
                 return
@@ -190,16 +190,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         } catch (e: Exception) {
             exams.clear()
         }
-        // storeExamListInSharedPreferences()
-        // Exam list could no be loaded - will always e a list, some error occurred - clear to prevent any intermediate error states
     }
 
-    /* fun storeExamListInSharedPreferences() {
-         scope.launch { storeExamListInSharedPreferencesThread() }
-     }
- */
-   fun storeExamListInSharedPreferences() {
-        Log.d("Exam Storing", "thread to store exams is successfully started")
+
+    fun storeExamListInSharedPreferences() {
         val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
         val dateTimeConverter = DateTimeConverter()
         val gson = GsonBuilder().registerTypeAdapter(DateTime::class.java, dateTimeConverter)
@@ -212,8 +206,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
 
-
-
     /**
      * Gson serialiser/deserialiser for converting Joda [DateTime] objects.
      * Source: https://riptutorial.com/android/example/14799/adding-a-custom-converter-to-gson
@@ -245,8 +237,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
 
-    //todo replace in the final version - can be done with exisiting data
-    fun storeGradedCourses(exams: List<Exam>) {
+    private fun storeGradedCourses(exams: List<Exam>) {
         val gradesStore = GradesStore(defaultSharedPreferences)
         val courses = exams.map { it.course }
         gradesStore.store(courses)
@@ -376,17 +367,17 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 (numberFormat.parse(it.grade.toString())?.toDouble()
                     ?: 1.0) * it.credits_new * it.weight
             }
-        val combinedgradefactors = exams
+        val factorSum = exams
             .filter { it.isPassed && it.gradeUsedInAverage }
-            .map { it.credits_new.toDouble() * it.weight }
+            .map { it.credits_new.toDouble() * it.weight }.sum()
 
 
         val gradeSum = grades.sum()
-        val factorSum = combinedgradefactors.sum()
+
         if (factorSum <= 0) {
             return 0.0
         }
-        return gradeSum / factorSum.toDouble()
+        return gradeSum / factorSum
     }
 
     /**
@@ -429,43 +420,47 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             .distinct()
             .map { getString(R.string.study_program_format_string, it) }
 
-        val filters = mutableListOf(getString(R.string.all_programs))
-        filters.addAll(programIds)
+        if (programIds.size < 2) {
+            binding.filterSpinner.visibility = View.GONE
+        } else {
+            val filters = mutableListOf(getString(R.string.all_programs))
+            filters.addAll(programIds)
 
-        val spinnerArrayAdapter = ArrayAdapter(
-            requireContext(), R.layout.simple_spinner_item_actionbar, filters
-        )
+            val spinnerArrayAdapter = ArrayAdapter(
+                requireContext(), R.layout.simple_spinner_item_actionbar, filters
+            )
 
-        with(binding) {
-            filterSpinner.apply {
-                adapter = spinnerArrayAdapter
-                setSelection(spinnerPosition)
-                visibility = View.VISIBLE
+            with(binding) {
+                filterSpinner.apply {
+                    adapter = spinnerArrayAdapter
+                    setSelection(spinnerPosition)
+                    visibility = View.VISIBLE
+                }
             }
-        }
 
 
-        binding.filterSpinner.onItemSelectedListener =
-            object : AdapterView.OnItemSelectedListener {
-                override fun onItemSelected(
-                    parent: AdapterView<*>,
-                    view: View?,
-                    position: Int,
-                    id: Long
-                ) {
-                    val filter = filters[position]
-                    spinnerPosition = position
-
-                    val examsToShow = when (position) {
-                        0 -> exams
-                        else -> exams.filter { filter.contains(it.programID) }
+            binding.filterSpinner.onItemSelectedListener =
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(
+                        parent: AdapterView<*>,
+                        view: View?,
+                        position: Int,
+                        id: Long
+                    ) {
+                        val filter = filters[position]
+                        spinnerPosition = position
+
+                        val examsToShow = when (position) {
+                            0 -> exams
+                            else -> exams.filter { filter.contains(it.programID) }
+                        }
+
+                        showExams(examsToShow)
                     }
 
-                    showExams(examsToShow)
+                    override fun onNothingSelected(parent: AdapterView<*>) = Unit
                 }
-
-                override fun onNothingSelected(parent: AdapterView<*>) = Unit
-            }
+        }
     }
 
 
@@ -475,10 +470,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun openAddGradeDialog() {
         val view = View.inflate(requireContext(), R.layout.dialog_add_grade_input, null)
         val dialog = AlertDialog.Builder(requireContext())
-            .setTitle("Add a New Exam")
+            .setTitle(getString(R.string.add_exam_dialog_title))
             .setMessage(
-                "Grades are normally added automatically. In case special grades should be added, this can be done here. " +
-                        "Manually added Exams can be deleted later on."
+                getString(R.string.add_exam_dialog_message)
             )
             .setView(view)
             .create()
@@ -506,11 +500,10 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             val date = dateView.text.toString()
             val semester = semesterView.text.toString()
 
-            var weight: Double
-            try {
-                weight = (weightView.text.toString()).toDouble()
+            val weight: Double = try {
+                (weightView.text.toString()).toDouble()
             } catch (exception: Exception) {
-                weight = 1.0
+                1.0
             }
 
 
@@ -527,44 +520,45 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             if (semester.length < 3) {                                                  //semester sanitization
                 changesRequired = true
                 semesterView.error =
-                    "Wrong semester format: Too short. Correct two numbers for the year + W/S"
-            } else if (!(semester.get(2).equals('W') || semester.get(2)
-                    .equals('w') || semester.get(2).equals('S') || semester.get(2)
-                    .equals('s'))
+                    getString(R.string.add_grade_error_wrong_semester)
+            } else if (!(semester.get(2) == 'W' || semester[2] == 'w' || semester.get(2) == 'S' || semester.get(
+                    2
+                ) == 's')
             ) {
                 changesRequired = true
                 semesterView.error =
-                    "Wrong semester format: Term not specified. Correct two numbers for the year + W/S"
+                    getString(R.string.add_grade_error_semester_no_ws)
             }
 
             if (weight < 0.0) {             //weight sanitization
                 changesRequired = true
-                weightView.error = "Wrong weight format: Weights can not be negative."
+                weightView.error = getString(R.string.add_grade_error_invalid_weight)
             }
 
             val gradedouble = grade.replace(",", ".").toDouble()
             var gradeString = ""
-            if (gradedouble <= 5.0 && gradedouble >= 1.0 || gradedouble == 0.0) {
-                if (gradedouble == 0.0) {
-                    gradeString = "B"
+            if (gradedouble in 1.0..5.0 || gradedouble == 0.0) {
+                gradeString = if (gradedouble == 0.0) {
+                    "B"
                 } else {
-                    gradeString = grade.toString().replace(".", ",")
+                    grade.replace(".", ",")
                 }
             } else {
                 changesRequired = true
                 gradeView.error =
-                    "Wrong grade format: Grade must be between 1.0 and 5.0 or equal to 0."
+                    getString(R.string.add_grade_error_invalid_grade_format)
             }
 
 
-            if (title.length < 1) {             //title sanitization
+            if (title.isEmpty()) {             //title sanitization
                 changesRequired = true
-                titleView.error = "Insert a course title."
+                titleView.error = getString(R.string.add_grade_missing_course_title)
             }
 
             if (credits < 1) {             //title sanitization
                 changesRequired = true
-                creditsView.error = "Invalid amount of credits. Must be greater than 0."
+                creditsView.error =
+                    getString(R.string.add_grade_error_invalid_weight_less_than_zero)
             }
 
 
@@ -701,7 +695,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             gradesListView.setPadding(0, 0, 0, 0)
 
         } else {
-            //storeExamListInSharedPreferences()
             showExams(exams)
             frameLayoutAverageGrade?.visibility = View.VISIBLE
             floatingButtonAddExamGrade?.visibility = View.GONE
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f70b0da3e3..1c3ef43510 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -75,6 +75,17 @@
     <string name="text_view_semester_label">Jahr in dem das Semester startet (z.B. 22WS or 21SoSe)</string>
     <string name="grade_semester_default">22WS</string>
     <string name="use_weights_in_diagrams">Credits und Gewichte in dem Diagram berücksichtigen</string>
+    <string name="delete_exam">Prüfung löschen</string>
+    <string name="delete_exam_dialog_message">Soll diese Prüfung unwiderruflich gelöscht werden?</string>
+    <string name="add_grade_error_wrong_semester">Falsches Semesterformat: Zu kurz. Zwei Zahlen für das Jahr + W/S</string>
+    <string name="add_grade_error_semester_no_ws">Falsches Semesterformat: Semester nicht angegeben. Zwei Zahlen für das Jahr + W/S</string>
+    <string name="add_grade_error_invalid_weight">Falsches Gewichtsformat: Gewichte können nicht negativ sein.</string>
+    <string name="add_grade_error_invalid_grade_format">Falsches Notenformat: Die Note muss zwischen 1,0 und 5,0 liegen oder gleich 0 (bestanden) sein.</string>
+    <string name="add_grade_missing_course_title">Ein Kursname muss eingefügt werden.</string>
+    <string name="add_grade_error_invalid_weight_less_than_zero">Ungültige Anzahl an ECTS. Die ECTS-Zahl muss größer als 0 sein.</string>
+    <string name="add_exam_dialog_title">Eine neue Prüfung hinzufügen</string>
+    <string name="add_exam_dialog_message">Die Noten werden normalerweise automatisch hinzugefügt. Falls spezielle Noten hinzugefügt werden sollen, kann dies hier geschehen. Manuell hinzugefügte Prüfungen können später wieder gelöscht werden.</string>
+
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Kennung</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c786f0b47f..641c9d757f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,6 +102,17 @@
     <string name="text_view_semester_label">Year of the start of the semester (e.g. 22WS or 21SuSe)</string>
     <string name="grade_semester_default">22WS</string>
     <string name="use_weights_in_diagrams">Consider credits and weights in the diagram</string>
+    <string name="delete_exam">Delete Exam</string>
+    <string name="delete_exam_dialog_message">Should this exam be irrevocably deleted</string>
+    <string name="add_grade_error_wrong_semester">Wrong semester format: Too short. Correct: two numbers for the year + W/S</string>
+    <string name="add_grade_error_semester_no_ws">Wrong semester format: Term not specified. Correct two numbers for the year + W/S</string>
+    <string name="add_grade_error_invalid_weight">Wrong weight format: Weights can not be negative.</string>
+    <string name="add_grade_error_invalid_grade_format">Wrong grade format: Grade must be between 1.0 and 5.0 or equal to 0.</string>
+    <string name="add_grade_missing_course_title">Insert a course title.</string>
+    <string name="add_grade_error_invalid_weight_less_than_zero">Invalid amount of credits. Must be greater than 0.</string>
+    <string name="add_exam_dialog_title">Add a New Exam</string>
+    <string name="add_exam_dialog_message">Grades are normally added automatically. In case special grades should be added, this can be done here. Manually added Exams can be deleted later on.</string>
+
 
     <!-- Preferences -->
     <string name="lrz_id">TUM Identification</string>

From b49e51b8ad9fa3899d3e38a3dd4f07be97f8a602 Mon Sep 17 00:00:00 2001
From: Christian <9384305+ctsk@users.noreply.github.com>
Date: Thu, 12 May 2022 13:18:27 +0200
Subject: [PATCH 61/71] Fix Build (#1436)

* Fix ktlint errors

* Help out Kotlins type inference

* Move long test strings from code to seperate json files

* Bump Robolectric version to 4.8
---
 app/build.gradle                              |  5 +-
 .../main/java/de/tum/in/tumcampusapp/App.kt   |  3 +-
 .../in/tumcampusapp/api/app/ApiHelper.java    |  3 +-
 .../api/app/AuthenticationManager.java        |  2 +-
 .../in/tumcampusapp/api/app/BackendHelper.kt  |  6 +-
 .../api/app/TumHttpLoggingInterceptor.java    |  3 +-
 .../ActivityForLoadingInBackground.java       |  2 +-
 .../adapter/SimpleStickyListHeadersAdapter.kt |  2 +-
 .../generic/fragment/FragmentForSearching.kt  |  4 +-
 .../tumui/calendar/CalendarDetailsFragment.kt |  1 -
 .../tumui/calendar/CalendarFragment.kt        | 12 +--
 .../tumui/calendar/CreateEventActivity.kt     |  6 +-
 .../tumui/calendar/model/CalendarItem.kt      |  2 +-
 .../component/tumui/calendar/model/Event.kt   |  1 -
 .../calendar/widget/TimetableWidgetService.kt |  2 +-
 .../tumui/feedback/FeedbackActivity.kt        |  7 +-
 .../tumui/feedback/FeedbackPresenter.kt       |  2 +-
 .../component/tumui/grades/GradesFragment.kt  |  3 +-
 .../activity/LectureDetailsActivity.kt        |  4 +-
 .../activity/LecturesAppointmentsActivity.kt  |  1 -
 .../tumui/person/PersonDetailsActivity.kt     |  4 +-
 .../tumui/roomfinder/RoomFinderFragment.kt    |  2 +-
 .../tumui/tutionfees/TuitionFeesFragment.kt   |  1 -
 .../CafeteriaNotificationSettingsActivity.kt  |  5 +-
 .../CafeteriaDetailsSectionsPagerAdapter.kt   |  2 +-
 .../ui/cafeteria/details/OpenHoursHelper.kt   |  2 +-
 .../cafeteria/fragment/CafeteriaFragment.kt   |  2 +-
 .../ui/chat/AddChatMemberActivity.java        |  2 +-
 .../component/ui/chat/ChatRoomController.java |  4 +-
 .../component/ui/chat/ChatRoomsFragment.kt    |  4 +-
 .../ui/chat/MemberSuggestionsListAdapter.java |  2 +-
 .../ui/chat/activity/ChatActivity.java        |  2 +-
 .../ui/chat/adapter/ChatHistoryAdapter.java   |  6 +-
 .../ui/chat/adapter/ChatRoomListAdapter.java  |  2 +-
 .../component/ui/news/NewsController.kt       |  2 +-
 .../component/ui/news/NewsFragment.kt         |  5 +-
 .../ui/onboarding/CheckTokenFragment.kt       |  3 +-
 .../ui/onboarding/OnboardingExtrasFragment.kt |  1 -
 .../ui/onboarding/OnboardingStartFragment.kt  |  4 +-
 .../ui/onboarding/StartupActivity.kt          |  4 +-
 .../ui/overview/InformationActivity.kt        |  2 -
 .../component/ui/overview/MainFragment.kt     | 15 ++--
 .../ui/studyroom/StudyRoomsFragment.kt        |  1 -
 .../component/ui/ticket/EventCard.kt          |  2 +-
 .../component/ui/ticket/EventsViewModel.kt    |  2 +-
 .../ui/ticket/activity/BuyTicketActivity.kt   |  8 +-
 .../activity/PaymentConfirmationActivity.kt   |  4 +-
 .../ui/ticket/activity/ShowTicketActivity.kt  |  9 +--
 .../ticket/activity/StripePaymentActivity.kt  |  4 -
 .../ticket/fragment/EventDetailsFragment.kt   |  4 +-
 .../ui/ticket/model/EventBetaInfo.kt          |  2 +-
 .../ui/transportation/MVVCardViewHolder.kt    |  2 +-
 .../transportation/widget/MVVWidgetService.kt |  2 +-
 .../ui/tufilm/KinoDetailsFragment.kt          |  3 -
 .../service/FcmReceiverService.kt             | 10 +--
 .../api/MvvDepartureListTest.java             | 75 +++++--------------
 .../api/MvvStationListTest.java               |  8 +-
 .../database/dao/CalendarDaoTest.java         |  2 +-
 .../database/dao/RoomLocationsDaoTest.java    |  2 +-
 app/src/test/resources/mvv/emptyResult.json   |  1 +
 .../test/resources/mvv/multiValueResult1.json |  1 +
 .../test/resources/mvv/multiValueResult2.json |  1 +
 app/src/test/resources/mvv/test.json          |  0
 63 files changed, 110 insertions(+), 180 deletions(-)
 create mode 100644 app/src/test/resources/mvv/emptyResult.json
 create mode 100644 app/src/test/resources/mvv/multiValueResult1.json
 create mode 100644 app/src/test/resources/mvv/multiValueResult2.json
 create mode 100644 app/src/test/resources/mvv/test.json

diff --git a/app/build.gradle b/app/build.gradle
index 6d0e73f2bb..9726823a7d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -187,6 +187,8 @@ dependencies {
     debugImplementation 'com.amitshekhar.android:debug-db:1.0.6'
 
     // Testing
+    testImplementation "commons-io:commons-io:2.11.0"
+
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.5.11'
     testImplementation 'org.assertj:assertj-core:3.17.1'
@@ -196,7 +198,8 @@ dependencies {
     testImplementation 'com.android.support.test:rules:1.0.2'
     testImplementation 'com.android.support.test:runner:1.0.2'
     testImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    testImplementation "org.robolectric:robolectric:4.5.1"
+    testImplementation "org.robolectric:robolectric:4.8"
+
 
     // TicketSale
     implementation 'com.stripe:stripe-android:8.1.0'
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/App.kt b/app/src/main/java/de/tum/in/tumcampusapp/App.kt
index 5b0ac2fb57..08495671ae 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/App.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/App.kt
@@ -6,7 +6,6 @@ import androidx.appcompat.app.AppCompatDelegate
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.squareup.picasso.OkHttp3Downloader
 import com.squareup.picasso.Picasso
-import de.tum.`in`.tumcampusapp.api.app.BackendHelper
 import de.tum.`in`.tumcampusapp.component.notifications.NotificationUtils.setupNotificationChannels
 import de.tum.`in`.tumcampusapp.component.other.settings.ThemeProvider
 import de.tum.`in`.tumcampusapp.di.AppComponent
@@ -33,7 +32,7 @@ open class App : Application() {
         }
         setupStrictMode()
         loadTheme()
-        //BackendHelper.getBackendConnection()
+        // BackendHelper.getBackendConnection()
     }
 
     private fun buildAppComponent() {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/api/app/ApiHelper.java b/app/src/main/java/de/tum/in/tumcampusapp/api/app/ApiHelper.java
index c19aff4f4c..29d4642bdb 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/api/app/ApiHelper.java
+++ b/app/src/main/java/de/tum/in/tumcampusapp/api/app/ApiHelper.java
@@ -80,8 +80,7 @@ private static Interceptor getDeviceInterceptor(final Context c) {
 
         return chain -> {
             Utils.log("Fetching: " + chain.request()
-                                          .url()
-                                          .toString());
+                                          .url());
             Request.Builder newRequest = chain.request()
                                               .newBuilder()
                                               .addHeader("X-DEVICE-ID", AuthenticationManager.getDeviceID(c))
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/api/app/AuthenticationManager.java b/app/src/main/java/de/tum/in/tumcampusapp/api/app/AuthenticationManager.java
index dedcf627ad..a5e46ac9ae 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/api/app/AuthenticationManager.java
+++ b/app/src/main/java/de/tum/in/tumcampusapp/api/app/AuthenticationManager.java
@@ -305,7 +305,7 @@ public void uploadObfuscatedIds(UploadStatus uploadStatus) {
         }
 
         if (doUpload) {
-            Utils.log("uploading obfuscated ids: " + upload.toString());
+            Utils.log("uploading obfuscated ids: " + upload);
             TUMCabeClient.getInstance(mContext)
                          .uploadObfuscatedIds(lrzId, upload)
                          .subscribeOn(Schedulers.io())
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/api/app/BackendHelper.kt b/app/src/main/java/de/tum/in/tumcampusapp/api/app/BackendHelper.kt
index a67cb5cc4d..2dacf5eb4b 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/api/app/BackendHelper.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/api/app/BackendHelper.kt
@@ -1,6 +1,5 @@
 package de.tum.`in`.tumcampusapp.api.app
 
-
 import com.google.protobuf.Empty
 import de.tum.`in`.tumcampusapp.api.backend.CampusGrpc
 import io.grpc.ManagedChannelBuilder
@@ -8,7 +7,6 @@ import io.grpc.Metadata.ASCII_STRING_MARSHALLER
 
 class BackendHelper {
 
-
     // Dummy example code for testing the grpc connection
     companion object {
         private fun getHeaderMetaData(): io.grpc.Metadata {
@@ -18,17 +16,15 @@ class BackendHelper {
             return header
         }
 
-        public fun getBackendConnection() {
+        fun getBackendConnection() {
             var managedChannel = ManagedChannelBuilder.forAddress("api.tum.app", 50052).usePlaintext().build()
             var blockingStub = CampusGrpc.newBlockingStub(managedChannel)
             blockingStub = io.grpc.stub.MetadataUtils.attachHeaders(blockingStub, getHeaderMetaData())
 
-
             var topNews = blockingStub.getTopNews(Empty.getDefaultInstance())
             var link = topNews.link
             println(link)
 
-
             var newsSources = blockingStub.getNewsSources(Empty.getDefaultInstance())
             println(newsSources.getSources(0))
         }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/api/app/TumHttpLoggingInterceptor.java b/app/src/main/java/de/tum/in/tumcampusapp/api/app/TumHttpLoggingInterceptor.java
index f49473823d..c6db310c9d 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/api/app/TumHttpLoggingInterceptor.java
+++ b/app/src/main/java/de/tum/in/tumcampusapp/api/app/TumHttpLoggingInterceptor.java
@@ -5,6 +5,7 @@
 import java.io.EOFException;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.concurrent.TimeUnit;
 
@@ -26,7 +27,7 @@
 
 public final class TumHttpLoggingInterceptor implements Interceptor {
 
-    private static final Charset UTF8 = Charset.forName("UTF-8");
+    private static final Charset UTF8 = StandardCharsets.UTF_8;
     private final Logger logger;
 
     public interface Logger {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/activity/ActivityForLoadingInBackground.java b/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/activity/ActivityForLoadingInBackground.java
index a1869d3fba..48737efabc 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/activity/ActivityForLoadingInBackground.java
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/activity/ActivityForLoadingInBackground.java
@@ -18,7 +18,7 @@
 public abstract class ActivityForLoadingInBackground<S, T> extends ProgressActivity<T> {
 
     private Disposable loadingDisposable;
-    private AtomicBoolean isRunning = new AtomicBoolean(false);
+    private final AtomicBoolean isRunning = new AtomicBoolean(false);
     private S[] lastArg;
 
     /**
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/adapter/SimpleStickyListHeadersAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/adapter/SimpleStickyListHeadersAdapter.kt
index 57010f7dd9..f7a6b26ee3 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/adapter/SimpleStickyListHeadersAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/adapter/SimpleStickyListHeadersAdapter.kt
@@ -72,7 +72,7 @@ abstract class SimpleStickyListHeadersAdapter<T : SimpleStickyListHeadersAdapter
 
     // Header view
     private class HeaderViewHolder {
-        internal var text: TextView? = null
+        var text: TextView? = null
     }
 
     interface SimpleStickyListItem {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/fragment/FragmentForSearching.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/fragment/FragmentForSearching.kt
index 1ca1f375c9..ccce49900f 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/fragment/FragmentForSearching.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/fragment/FragmentForSearching.kt
@@ -56,9 +56,9 @@ abstract class FragmentForSearching<T>(
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater?.inflate(R.menu.menu_search, menu)
+        inflater.inflate(R.menu.menu_search, menu)
 
-        searchItem = checkNotNull(menu?.findItem(R.id.action_search))
+        searchItem = checkNotNull(menu.findItem(R.id.action_search))
         searchView = searchItem.actionView as SearchView
 
         val searchManager = requireContext().searchManager
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarDetailsFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarDetailsFragment.kt
index 5d52b0c0a4..39d1a462d1 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarDetailsFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarDetailsFragment.kt
@@ -123,7 +123,6 @@ class CalendarDetailsFragment : RoundedBottomSheetDialogFragment() {
                 buttonsContainer.visibility = View.GONE
             }
         }
-
     }
 
     private fun openEventInCalendarActivity(calendarItem: CalendarItem) {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarFragment.kt
index 164567e353..9024b3fd8c 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarFragment.kt
@@ -88,7 +88,7 @@ class CalendarFragment : FragmentForAccessingTumOnline<EventsResponse>(
 
         // The week view adds a horizontal bar below the Toolbar. When refreshing, the refresh
         // spinner covers it. Therefore, we adjust the spinner's end position.
-        swipeRefreshLayout?.let {
+        swipeRefreshLayout.let {
             val startOffset = it.progressViewStartOffset
             val endOffset = it.progressViewEndOffset
             it.setProgressViewOffset(false, startOffset, endOffset)
@@ -166,8 +166,8 @@ class CalendarFragment : FragmentForAccessingTumOnline<EventsResponse>(
 
     override fun onPrepareOptionsMenu(menu: Menu) {
         super.onPrepareOptionsMenu(menu)
-        val menuItemExportGoogle = menu?.findItem(R.id.action_export_calendar)
-        val menuItemDeleteCalendar = menu?.findItem(R.id.action_delete_calendar)
+        val menuItemExportGoogle = menu.findItem(R.id.action_export_calendar)
+        val menuItemDeleteCalendar = menu.findItem(R.id.action_delete_calendar)
 
         menuItemExportGoogle?.isEnabled = isFetched
         menuItemDeleteCalendar?.isEnabled = isFetched
@@ -178,10 +178,10 @@ class CalendarFragment : FragmentForAccessingTumOnline<EventsResponse>(
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater?.inflate(R.menu.menu_sync_calendar, menu)
+        inflater.inflate(R.menu.menu_sync_calendar, menu)
 
-        menuItemSwitchView = menu?.findItem(R.id.action_switch_view_mode)
-        menuItemFilterCanceled = menu?.findItem(R.id.action_calendar_filter_canceled)
+        menuItemSwitchView = menu.findItem(R.id.action_switch_view_mode)
+        menuItemFilterCanceled = menu.findItem(R.id.action_calendar_filter_canceled)
 
         refreshWeekView()
         initFilterCheckboxes()
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CreateEventActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CreateEventActivity.kt
index d2d7693735..461d7408a2 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CreateEventActivity.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CreateEventActivity.kt
@@ -48,12 +48,12 @@ class CreateEventActivity : ActivityForAccessingTumOnline<CreateEventResponse>(R
     private var apiCallsFailed = 0
 
     private val repeatHelper = RepeatHelper()
-    
+
     private lateinit var binding: ActivityCreateEventBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        
+
         binding = ActivityCreateEventBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
@@ -83,7 +83,6 @@ class CreateEventActivity : ActivityForAccessingTumOnline<CreateEventResponse>(R
             })
         }
 
-
         val extras = intent.extras
         with(binding) {
             if (extras != null) {
@@ -105,7 +104,6 @@ class CreateEventActivity : ActivityForAccessingTumOnline<CreateEventResponse>(R
         setDateAndTimeListeners()
         initRepeatingSettingsListeners()
 
-
         binding.createEventButton.setOnClickListener {
             if (end.isBefore(start)) {
                 showErrorDialog(getString(R.string.create_event_time_error))
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/model/CalendarItem.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/model/CalendarItem.kt
index c8f88a62c1..1bf3e9ba45 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/model/CalendarItem.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/model/CalendarItem.kt
@@ -83,7 +83,7 @@ data class CalendarItem(
     fun getEventLocation(): String {
         return Pattern.compile("\\([A-Z0-9\\.]+\\)")
                 .matcher(location)
-                .replaceAll("")!!
+                .replaceAll("")
                 .trim { it <= ' ' }
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/model/Event.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/model/Event.kt
index fad137903c..564620be77 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/model/Event.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/model/Event.kt
@@ -15,7 +15,6 @@ import de.tum.`in`.tumcampusapp.utils.DateTimeUtils
 import de.tum.`in`.tumcampusapp.utils.Utils
 import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
-import org.joda.time.LocalDateTime
 
 @Xml(name = "event")
 data class Event(
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/widget/TimetableWidgetService.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/widget/TimetableWidgetService.kt
index b27d7f4e86..27d3eb16a9 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/widget/TimetableWidgetService.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/widget/TimetableWidgetService.kt
@@ -21,7 +21,7 @@ class TimetableWidgetService : RemoteViewsService() {
         return TimetableRemoteViewFactory(this.applicationContext, intent)
     }
 
-    private class TimetableRemoteViewFactory internal constructor(
+    private class TimetableRemoteViewFactory(
         private val applicationContext: Context,
         intent: Intent
     ) : RemoteViewsFactory {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/feedback/FeedbackActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/feedback/FeedbackActivity.kt
index 2857487a80..e6379753ae 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/feedback/FeedbackActivity.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/feedback/FeedbackActivity.kt
@@ -43,12 +43,12 @@ class FeedbackActivity : BaseActivity(R.layout.activity_feedback), FeedbackContr
 
     @Inject
     lateinit var presenter: FeedbackContract.Presenter
-    
+
     private lateinit var binding: ActivityFeedbackBinding
-    
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        
+
         binding = ActivityFeedbackBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
@@ -167,7 +167,6 @@ class FeedbackActivity : BaseActivity(R.layout.activity_feedback), FeedbackContr
                 includeEmailCheckbox.text = getString(R.string.feedback_include_email_tum_id, email)
             }
         }
-
     }
 
     override fun showEmailInput(show: Boolean) {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/feedback/FeedbackPresenter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/feedback/FeedbackPresenter.kt
index 7122ce0bcf..01b320a268 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/feedback/FeedbackPresenter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/feedback/FeedbackPresenter.kt
@@ -115,7 +115,7 @@ class FeedbackPresenter @Inject constructor(
         var photoFile: File? = null
         try {
             photoFile = ImageUtils.createImageFile(context)
-            currentPhotoPath = photoFile!!.absolutePath
+            currentPhotoPath = photoFile.absolutePath
         } catch (e: IOException) {
             Utils.log(e)
         }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 090106275a..2e8846999e 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -107,6 +107,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
 
         loadGrades(CacheControl.USE_CACHE)
+
         // Tracks whether the user has used the calendar module before. This is used in determining when to prompt for a
         // Google Play store review
         Utils.setSetting(requireContext(), Const.HAS_VISITED_GRADES, true)
@@ -243,7 +244,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         gradesStore.store(courses)
     }
 
-
     /**
      * Displays the pie chart and its data set with the provided grade distribution.
      *
@@ -284,7 +284,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
                 invalidate()
             }
-
         }
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/lectures/activity/LectureDetailsActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/lectures/activity/LectureDetailsActivity.kt
index 293b6a20ad..45c9eb3dc7 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/lectures/activity/LectureDetailsActivity.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/lectures/activity/LectureDetailsActivity.kt
@@ -34,10 +34,9 @@ class LectureDetailsActivity : ActivityForAccessingTumOnline<LectureDetailsRespo
 
     private lateinit var binding: ActivityLecturedetailsBinding
 
-
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        
+
         binding = ActivityLecturedetailsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
@@ -115,6 +114,5 @@ class LectureDetailsActivity : ActivityForAccessingTumOnline<LectureDetailsRespo
 
             appointmentsButton.isEnabled = true
         }
-
     }
 }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/lectures/activity/LecturesAppointmentsActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/lectures/activity/LecturesAppointmentsActivity.kt
index 86f55de664..8bd25e31de 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/lectures/activity/LecturesAppointmentsActivity.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/lectures/activity/LecturesAppointmentsActivity.kt
@@ -25,7 +25,6 @@ class LecturesAppointmentsActivity : ActivityForAccessingTumOnline<LectureAppoin
 
     private lateinit var binding: ActivityLecturesappointmentsBinding
 
-
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/person/PersonDetailsActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/person/PersonDetailsActivity.kt
index 5c7e2ed3ed..4b10f5d8e3 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/person/PersonDetailsActivity.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/person/PersonDetailsActivity.kt
@@ -28,12 +28,12 @@ class PersonDetailsActivity : ActivityForAccessingTumOnline<Employee>(R.layout.a
 
     private lateinit var personId: String
     private var employee: Employee? = null
-    
+
     private lateinit var binding: ActivityPersonDetailsBinding
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        
+
         binding = ActivityPersonDetailsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/roomfinder/RoomFinderFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/roomfinder/RoomFinderFragment.kt
index d9a5fc8480..dd3a508dd9 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/roomfinder/RoomFinderFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/roomfinder/RoomFinderFragment.kt
@@ -44,7 +44,7 @@ class RoomFinderFragment : FragmentForSearchingInBackground<List<RoomFinderRoom>
     private val binding by viewBinding(FragmentRoomfinderBinding::bind)
 
     override val layoutAllErrorsBinding get() = binding.layoutAllErrors
-    
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         adapter = RoomFinderListAdapter(requireContext(), recents)
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/tutionfees/TuitionFeesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/tutionfees/TuitionFeesFragment.kt
index 3a5ea10e06..4db6fdf821 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/tutionfees/TuitionFeesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/tutionfees/TuitionFeesFragment.kt
@@ -73,7 +73,6 @@ class TuitionFeesFragment : FragmentForAccessingTumOnline<TuitionList>(
                 }
             }
         }
-
     }
 
     companion object {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/activity/CafeteriaNotificationSettingsActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/activity/CafeteriaNotificationSettingsActivity.kt
index cc7662316e..89f8f4718c 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/activity/CafeteriaNotificationSettingsActivity.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/activity/CafeteriaNotificationSettingsActivity.kt
@@ -18,11 +18,10 @@ import org.joda.time.DateTimeConstants
 class CafeteriaNotificationSettingsActivity : BaseActivity(R.layout.activity_cafeteria_notification_settings) {
 
     private lateinit var binding: ActivityCafeteriaNotificationSettingsBinding
-    
-    
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        
+
         binding = ActivityCafeteriaNotificationSettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaDetailsSectionsPagerAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaDetailsSectionsPagerAdapter.kt
index 55b12e21b2..aa4fe1ca8b 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaDetailsSectionsPagerAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaDetailsSectionsPagerAdapter.kt
@@ -34,7 +34,7 @@ class CafeteriaDetailsSectionsPagerAdapter(fragmentManager: FragmentManager) : F
         CafeteriaDetailsSectionFragment.newInstance(cafeteriaId, dates[position])
 
     override fun getPageTitle(position: Int) =
-        formatter.print(dates[position]).toUpperCase(Locale.getDefault())
+            formatter.print(dates[position]).uppercase(Locale.getDefault())
 
     override fun getItemPosition(`object`: Any): Int = PagerAdapter.POSITION_NONE
 }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/OpenHoursHelper.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/OpenHoursHelper.kt
index 80b136f4fe..b421c6d5a8 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/OpenHoursHelper.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/OpenHoursHelper.kt
@@ -96,7 +96,7 @@ class OpenHoursHelper(private val context: Context) {
             val relativeTime = DateTimeUtils.formatFutureTime(relativeTo, context)
             // Return an assembly
             return context.getString(relation) + " " + relativeTime.substring(0, 1)
-                    .toLowerCase(Locale.getDefault()) + relativeTime.substring(1)
+                    .lowercase(Locale.getDefault()) + relativeTime.substring(1)
         } else {
             // future --> show non-relative opening hours
             return context.getString(R.string.opening_hours) + ": " +
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/fragment/CafeteriaFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/fragment/CafeteriaFragment.kt
index 22e622b69a..09468dd462 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/fragment/CafeteriaFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/fragment/CafeteriaFragment.kt
@@ -192,7 +192,7 @@ class CafeteriaFragment : FragmentForDownloadingExternal(
     override fun onNothingSelected(adapterView: AdapterView<*>?) = Unit
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater?.inflate(R.menu.menu_section_fragment_cafeteria_details, menu)
+        inflater.inflate(R.menu.menu_section_fragment_cafeteria_details, menu)
         super.onCreateOptionsMenu(menu, inflater)
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/AddChatMemberActivity.java b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/AddChatMemberActivity.java
index 979d7680d4..b4b54cebe1 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/AddChatMemberActivity.java
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/AddChatMemberActivity.java
@@ -43,7 +43,7 @@ public class AddChatMemberActivity extends BaseActivity {
 
     // for delayed suggestions
     private Handler delayHandler;
-    private Runnable suggestionRunnable = this::getSuggestions;
+    private final Runnable suggestionRunnable = this::getSuggestions;
 
     private List<ChatMember> suggestions;
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/ChatRoomController.java b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/ChatRoomController.java
index ef86c6cd3d..1374adac5c 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/ChatRoomController.java
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/ChatRoomController.java
@@ -36,7 +36,7 @@
  */
 public class ChatRoomController implements ProvidesCard {
 
-    private Context mContext;
+    private final Context mContext;
     private final ChatRoomDao chatRoomDao;
 
     /**
@@ -188,7 +188,7 @@ private List<String> getNewUnjoined() {
 
         List<String> list = new ArrayList<>(rooms.size());
         for (ChatRoomDbRow room : rooms) {
-            list.add(String.valueOf(room.getSemesterId() + ':' + room.getName()));
+            list.add(room.getSemesterId() + ':' + room.getName());
         }
         return list;
     }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/ChatRoomsFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/ChatRoomsFragment.kt
index fae5985348..1b0e3574d1 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/ChatRoomsFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/ChatRoomsFragment.kt
@@ -92,7 +92,6 @@ class ChatRoomsFragment : FragmentForAccessingTumOnline<LecturesResponse>(
             chatRoomTabs.addTab(chatRoomTabs.newTab().setText(R.string.joined))
             chatRoomTabs.addTab(chatRoomTabs.newTab().setText(R.string.not_joined))
         }
-
     }
 
     override fun onStart() {
@@ -167,7 +166,6 @@ class ChatRoomsFragment : FragmentForAccessingTumOnline<LecturesResponse>(
                 chatRoomsListView.adapter = chatRoomsAdapter
             }
         }
-
     }
 
     /**
@@ -261,7 +259,7 @@ class ChatRoomsFragment : FragmentForAccessingTumOnline<LecturesResponse>(
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater?.inflate(R.menu.menu_activity_chat_rooms, menu)
+        inflater.inflate(R.menu.menu_activity_chat_rooms, menu)
         super.onCreateOptionsMenu(menu, inflater)
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/MemberSuggestionsListAdapter.java b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/MemberSuggestionsListAdapter.java
index 045d5b1185..656398be4e 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/MemberSuggestionsListAdapter.java
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/MemberSuggestionsListAdapter.java
@@ -18,7 +18,7 @@ public class MemberSuggestionsListAdapter extends BaseAdapter implements Filtera
 
     private List<ChatMember> originalData;
     private List<ChatMember> members;
-    private Context mContext;
+    private final Context mContext;
 
     // constructor
     MemberSuggestionsListAdapter(Context context, List<ChatMember> members) {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/activity/ChatActivity.java b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/activity/ChatActivity.java
index 13797d03c6..44ca6e7c83 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/activity/ChatActivity.java
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/activity/ChatActivity.java
@@ -71,7 +71,7 @@ public class ChatActivity extends ActivityForDownloadingExternal
     public static ChatRoom mCurrentOpenChatRoom; // determines whether there will be a notification or not
 
     private ChatMessageViewModel chatMessageViewModel;
-    private CompositeDisposable disposables = new CompositeDisposable();
+    private final CompositeDisposable disposables = new CompositeDisposable();
 
     private ListView messagesListView;
     private ChatHistoryAdapter chatHistoryAdapter;
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/adapter/ChatHistoryAdapter.java b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/adapter/ChatHistoryAdapter.java
index 99939c887b..334e596db9 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/adapter/ChatHistoryAdapter.java
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/adapter/ChatHistoryAdapter.java
@@ -27,10 +27,10 @@ public class ChatHistoryAdapter extends BaseAdapter {
 
     private List<ChatMessage> chatHistoryList = new ArrayList<>();
 
-    private Context mContext;
-    private OnRetrySendListener mRetryListener;
+    private final Context mContext;
+    private final OnRetrySendListener mRetryListener;
 
-    private ChatMember currentChatMember;
+    private final ChatMember currentChatMember;
 
     public ChatHistoryAdapter(Context context, ChatMember member) {
         mContext = context;
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/adapter/ChatRoomListAdapter.java b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/adapter/ChatRoomListAdapter.java
index 97218299b8..84ea7e05e0 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/adapter/ChatRoomListAdapter.java
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/chat/adapter/ChatRoomListAdapter.java
@@ -34,7 +34,7 @@ public class ChatRoomListAdapter extends BaseAdapter implements StickyListHeader
     private final boolean showDateAndNumber;
     private final List<String> filters;
     private List<ChatRoomAndLastMessage> rooms;
-    private Context mContext;
+    private final Context mContext;
 
     // constructor
     public ChatRoomListAdapter(Context context, List<ChatRoomAndLastMessage> results, int mode) {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/news/NewsController.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/news/NewsController.kt
index 94bda70821..283b663580 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/news/NewsController.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/news/NewsController.kt
@@ -75,7 +75,7 @@ class NewsController @Inject constructor(
 
         // Load all news sources
         try {
-            val sources = api.getNewsSources()
+            val sources = api.newsSources
             if (sources != null) {
                 newsSourcesDao.insert(sources)
             }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/news/NewsFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/news/NewsFragment.kt
index d2129c7ade..7be9a1cc6c 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/news/NewsFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/news/NewsFragment.kt
@@ -87,17 +87,16 @@ class NewsFragment : FragmentForDownloadingExternal(
             newsRecyclerView.scrollToPosition(firstVisiblePosition)
         }
 
-
         showLoadingEnded()
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater?.inflate(R.menu.menu_activity_news, menu)
+        inflater.inflate(R.menu.menu_activity_news, menu)
         super.onCreateOptionsMenu(menu, inflater)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item?.itemId) {
+        return when (item.itemId) {
             R.id.action_disable_sources -> {
                 showNewsSourcesDialog()
                 true
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/CheckTokenFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/CheckTokenFragment.kt
index cd1d6f9072..66e2c15625 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/CheckTokenFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/CheckTokenFragment.kt
@@ -62,7 +62,6 @@ class CheckTokenFragment : BaseFragment<Unit>(
             openTumOnlineButton.setOnClickListener { browse(Const.TUM_CAMPUS_URL) }
             nextButton.setOnClickListener { loadIdentitySet() }
         }
-
     }
 
     private fun loadIdentitySet() {
@@ -70,7 +69,7 @@ class CheckTokenFragment : BaseFragment<Unit>(
         toast.show()
 
         compositeDisposable += tumOnlineClient.getIdentity()
-            .map { IdentityResponse.Success(it) as IdentityResponse }
+            .map<IdentityResponse> { IdentityResponse.Success(it) }
             .doOnError(Utils::log)
             .onErrorReturn { IdentityResponse.Failure(it) }
             .subscribeOn(Schedulers.io())
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/OnboardingExtrasFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/OnboardingExtrasFragment.kt
index c17e4d9e44..573c748838 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/OnboardingExtrasFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/OnboardingExtrasFragment.kt
@@ -98,7 +98,6 @@ class OnboardingExtrasFragment : FragmentForLoadingInBackground<ChatMember>(
             privacyPolicyButton.setOnClickListener { browse(getString(R.string.url_privacy_policy)) }
             finishButton.setOnClickListener { startLoading() }
         }
-
     }
 
     override fun onLoadInBackground(): ChatMember? {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/OnboardingStartFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/OnboardingStartFragment.kt
index 97f49dea7b..1bea00a57b 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/OnboardingStartFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/OnboardingStartFragment.kt
@@ -89,7 +89,6 @@ class OnboardingStartFragment : BaseFragment<Unit>(
 
             nextButton.setOnClickListener { onNextPressed() }
         }
-
     }
 
     private fun setCustomCloseIcon() {
@@ -102,7 +101,6 @@ class OnboardingStartFragment : BaseFragment<Unit>(
             toolbar.navigationIcon = closeIcon
             toolbar.setNavigationOnClickListener { requireActivity().finish() }
         }
-
     }
 
     private fun onNextPressed() {
@@ -145,7 +143,7 @@ class OnboardingStartFragment : BaseFragment<Unit>(
 
         compositeDisposable += tumOnlineClient
             .requestToken(publicKey, tokenName)
-            .map { TokenResponse.Success(it) as TokenResponse }
+            .map<TokenResponse> { TokenResponse.Success(it) }
             .doOnError(Utils::log)
             .onErrorReturn { TokenResponse.Failure(it) }
             .subscribeOn(Schedulers.io())
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/StartupActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/StartupActivity.kt
index a6f5fab19a..20818b9966 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/StartupActivity.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/onboarding/StartupActivity.kt
@@ -46,10 +46,10 @@ class StartupActivity : BaseActivity(R.layout.activity_startup) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        
+
         binding = ActivityStartupBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        
+
         injector.downloadComponent().inject(this)
 
         // Only use Crashlytics if we are not compiling debug
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/overview/InformationActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/overview/InformationActivity.kt
index edd032a7d3..e1141d5b07 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/overview/InformationActivity.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/overview/InformationActivity.kt
@@ -55,7 +55,6 @@ class InformationActivity : BaseActivity(R.layout.activity_information) {
                     .show()
         }
 
-
         displayDebugInfo()
     }
 
@@ -107,7 +106,6 @@ class InformationActivity : BaseActivity(R.layout.activity_information) {
             addDebugRow(debugInfos, "Build configuration", BuildConfig.DEBUG.toString())
             debugInfos.visibility = View.VISIBLE
         }
-
     }
 
     private fun addDebugRow(tableLayout: TableLayout, label: String, value: String?) {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/overview/MainFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/overview/MainFragment.kt
index e9e6cd7fe6..3a77bb0d54 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/overview/MainFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/overview/MainFragment.kt
@@ -98,7 +98,6 @@ class MainFragment : BaseFragment<Unit>(
             ItemTouchHelper(ItemTouchHelperCallback()).attachToRecyclerView(cardsRecyclerView)
         }
 
-
         // Start silence Service (if already started it will just invoke a check)
         val service = Intent(requireContext(), SilenceService::class.java)
         requireContext().startService(service)
@@ -128,13 +127,13 @@ class MainFragment : BaseFragment<Unit>(
     }
 
     internal fun refreshCards() {
-        swipeRefreshLayout?.isRefreshing = true
+        swipeRefreshLayout.isRefreshing = true
         onRefresh()
         downloadNewsAlert()
     }
 
     private fun onNewCardsAvailable(cards: List<Card>) {
-        swipeRefreshLayout?.isRefreshing = false
+        swipeRefreshLayout.isRefreshing = false
         cardsAdapter.updateItems(cards)
 
         if (!NetUtils.isConnected(requireContext()) && !isConnectivityChangeReceiverRegistered) {
@@ -201,8 +200,8 @@ class MainFragment : BaseFragment<Unit>(
     private inner class ItemTouchHelperCallback : ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP or ItemTouchHelper.DOWN, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) {
 
         override fun getSwipeDirs(
-                recyclerView: RecyclerView,
-                viewHolder: RecyclerView.ViewHolder
+            recyclerView: RecyclerView,
+            viewHolder: RecyclerView.ViewHolder
         ): Int {
             val cardViewHolder = viewHolder as CardViewHolder
             val card = cardViewHolder.currentCard
@@ -210,9 +209,9 @@ class MainFragment : BaseFragment<Unit>(
         }
 
         override fun onMove(
-                recyclerView: RecyclerView,
-                viewHolder: RecyclerView.ViewHolder,
-                target: RecyclerView.ViewHolder
+            recyclerView: RecyclerView,
+            viewHolder: RecyclerView.ViewHolder,
+            target: RecyclerView.ViewHolder
         ): Boolean {
             cardsAdapter.onItemMove(viewHolder.adapterPosition, target.adapterPosition)
             return true
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/studyroom/StudyRoomsFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/studyroom/StudyRoomsFragment.kt
index e758c6c901..1488dfda79 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/studyroom/StudyRoomsFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/studyroom/StudyRoomsFragment.kt
@@ -82,7 +82,6 @@ class StudyRoomsFragment : FragmentForAccessingTumCabe<List<StudyRoomGroup>>(
             sectionsPagerAdapter.setStudyRoomGroupId(selectedRoomGroupId)
             pager.adapter = sectionsPagerAdapter
         }
-
     }
 
     private fun loadStudyRooms() {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/EventCard.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/EventCard.kt
index 0d171b7755..097a20d1da 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/EventCard.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/EventCard.kt
@@ -36,7 +36,7 @@ class EventCard(context: Context) : Card(CardManager.CARD_EVENT, context, "card_
 
         val event = this.event
         if (event != null) {
-            val ticketCount = event.let { localRepo.getTicketCount(it) } ?: 0
+            val ticketCount = event.let { localRepo.getTicketCount(it) }
             eventViewHolder.bind(event, ticketCount)
         }
     }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/EventsViewModel.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/EventsViewModel.kt
index 66d9076921..f489d0d36c 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/EventsViewModel.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/EventsViewModel.kt
@@ -88,7 +88,7 @@ class EventsViewModel @Inject constructor(
 
     private fun showErrorForDuration(duration: Long): Observable<Result> {
         return Observable.timer(duration, TimeUnit.SECONDS, Schedulers.computation())
-                .map { Result.HideError as Result }
+                .map<Result> { Result.HideError }
                 .startWith(Result.ShowError)
     }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/BuyTicketActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/BuyTicketActivity.kt
index b96fa0b7c6..8a860c5680 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/BuyTicketActivity.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/BuyTicketActivity.kt
@@ -69,15 +69,15 @@ class BuyTicketActivity : BaseActivity(R.layout.activity_buy_ticket), TicketAmou
 
     private val ticketTypeIds: Array<Int>
         get() = ticketTypes?.map { it.id }?.toTypedArray() ?: emptyArray()
-    
+
     private lateinit var binding: ActivityBuyTicketBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        
+
         binding = ActivityBuyTicketBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        
+
         eventId = intent.getIntExtra(Const.KEY_EVENT_ID, 0)
 
         binding.totalPriceTextView.text = Utils.formatPrice(0)
@@ -110,7 +110,6 @@ class BuyTicketActivity : BaseActivity(R.layout.activity_buy_ticket), TicketAmou
         initEventTextViews()
         initTicketAmount()
 
-
         binding.loadingOverlayBinding.loadingLayout.isVisible = false
         binding.paymentButton.setOnClickListener { reserveTicket() }
     }
@@ -231,7 +230,6 @@ class BuyTicketActivity : BaseActivity(R.layout.activity_buy_ticket), TicketAmou
             TransitionManager.beginDelayedTransition(loadingOverlayBinding.loadingLayout)
             paymentButton.isEnabled = show.not()
         }
-
     }
 
     override fun onDestroy() {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/PaymentConfirmationActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/PaymentConfirmationActivity.kt
index 7832d87b66..7145c564cf 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/PaymentConfirmationActivity.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/PaymentConfirmationActivity.kt
@@ -14,13 +14,13 @@ import kotlin.concurrent.schedule
 class PaymentConfirmationActivity : BaseActivity(R.layout.activity_payment_confirmation) {
 
     private lateinit var binding: ActivityPaymentConfirmationBinding
-    
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         binding = ActivityPaymentConfirmationBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        
+
         val eventId = intent.getIntExtra(Const.KEY_EVENT_ID, -1)
         val ticketAmount = intent.getIntExtra(Const.KEY_TICKET_AMOUNT, 1)
         if (eventId == -1) {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/ShowTicketActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/ShowTicketActivity.kt
index 737d38e2d1..b3646fc419 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/ShowTicketActivity.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/ShowTicketActivity.kt
@@ -48,7 +48,7 @@ class ShowTicketActivity : BaseActivity(R.layout.activity_show_ticket) {
         get() {
 
             val redemptions = ticketInfoList.mapNotNull { it.tickets?.first()?.redemption }
-            val lastRedemption = redemptions.maxOrNull ()
+            val lastRedemption = redemptions.maxOrNull()
 
             val formattedDate = lastRedemption?.let {
                 Ticket.getFormattedRedemptionDate(this, it)
@@ -66,10 +66,10 @@ class ShowTicketActivity : BaseActivity(R.layout.activity_show_ticket) {
         }
 
     private lateinit var binding: ActivityShowTicketBinding
-    
+
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        
+
         binding = ActivityShowTicketBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
@@ -110,7 +110,6 @@ class ShowTicketActivity : BaseActivity(R.layout.activity_show_ticket) {
             )
             swipeRefreshLayout.setOnRefreshListener { loadRedemptionStatus() }
         }
-
     }
 
     private fun loadRedemptionStatus() {
@@ -154,7 +153,7 @@ class ShowTicketActivity : BaseActivity(R.layout.activity_show_ticket) {
         binding.eventLocation.text = event.locality
         binding.eventLocation.setOnClickListener { this.showMap(it) }
 
-        binding.ticketList?.adapter = BoughtTicketAdapter(ticketInfoList)
+        binding.ticketList.adapter = BoughtTicketAdapter(ticketInfoList)
     }
 
     private fun showMap(view: View) {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/StripePaymentActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/StripePaymentActivity.kt
index a2badc3dd2..647fa8fbe8 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/StripePaymentActivity.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/StripePaymentActivity.kt
@@ -116,7 +116,6 @@ class StripePaymentActivity : BaseActivity(R.layout.activity_payment_stripe) {
                 view.context.startActivity(browserIntent)
             }
         }
-
     }
 
     private fun updateBuyButton() {
@@ -130,7 +129,6 @@ class StripePaymentActivity : BaseActivity(R.layout.activity_payment_stripe) {
             completePurchaseButton.isEnabled = enabled
             completePurchaseButton.alpha = alpha
         }
-
     }
 
     private fun purchaseTicket() {
@@ -264,7 +262,6 @@ class StripePaymentActivity : BaseActivity(R.layout.activity_payment_stripe) {
                 }
             }
         }
-
     }
 
     private fun initPaymentSession() {
@@ -281,7 +278,6 @@ class StripePaymentActivity : BaseActivity(R.layout.activity_payment_stripe) {
                     loadingLayout.isVisible = isCommunicating
                     TransitionManager.beginDelayedTransition(loadingLayout)
                 }
-
             }
 
             override fun onError(errorCode: Int, errorMessage: String?) {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/fragment/EventDetailsFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/fragment/EventDetailsFragment.kt
index 457d19e14c..c2a32ea515 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/fragment/EventDetailsFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/fragment/EventDetailsFragment.kt
@@ -95,7 +95,7 @@ class EventDetailsFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
                         .load(url)
                         .noPlaceholder()
                         .into(posterView) {
-                            posterProgressBar?.visibility = View.GONE
+                            posterProgressBar.visibility = View.GONE
                         }
             } else {
                 posterProgressBar.visibility = View.GONE
@@ -123,7 +123,6 @@ class EventDetailsFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
             linkButton.setOnClickListener { openEventLink(event) }
             linkButton.visibility = if (event.eventUrl.isNotBlank()) View.VISIBLE else View.GONE
         }
-
     }
 
     private fun openEventLink(event: Event) {
@@ -144,7 +143,6 @@ class EventDetailsFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
 
             swipeRefreshLayout.isRefreshing = false
         }
-
     }
 
     private fun showTicket(event: Event) {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/model/EventBetaInfo.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/model/EventBetaInfo.kt
index af34da147c..732044391e 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/model/EventBetaInfo.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/model/EventBetaInfo.kt
@@ -1,6 +1,6 @@
 package de.tum.`in`.tumcampusapp.component.ui.ticket.model
 
-class EventBetaInfo() : EventItem {
+class EventBetaInfo : EventItem {
 
     override fun equals(other: Any?): Boolean {
         return (other is EventBetaInfo)
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/transportation/MVVCardViewHolder.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/transportation/MVVCardViewHolder.kt
index bb3ea34d4b..8c693e6377 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/transportation/MVVCardViewHolder.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/transportation/MVVCardViewHolder.kt
@@ -22,7 +22,7 @@ class MVVCardViewHolder(
             val stationNameTextView = itemView.findViewById<TextView>(R.id.stationNameTextView)
             val contentContainerLayout = itemView.findViewById<LinearLayout>(R.id.contentContainerLayout)
 
-            if(stationNameTextView.text != station.station){
+            if (stationNameTextView.text != station.station) {
                 stationNameTextView.text = station.station
                 contentContainerLayout.removeAllViews()
             }
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/transportation/widget/MVVWidgetService.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/transportation/widget/MVVWidgetService.kt
index aa9f7d14fd..263ed23f08 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/transportation/widget/MVVWidgetService.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/transportation/widget/MVVWidgetService.kt
@@ -19,7 +19,7 @@ class MVVWidgetService : RemoteViewsService() {
         return MVVRemoteViewFactory(this.applicationContext, intent)
     }
 
-    private inner class MVVRemoteViewFactory internal constructor(private val applicationContext: Context, intent: Intent) : RemoteViewsFactory {
+    private inner class MVVRemoteViewFactory(private val applicationContext: Context, intent: Intent) : RemoteViewsFactory {
         private var departures: List<Departure> = ArrayList()
         private val appWidgetID: Int = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1)
         private val forceLoadDepartures: Boolean = intent.getBooleanExtra(MVVWidget.MVV_WIDGET_FORCE_RELOAD, true)
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/tufilm/KinoDetailsFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/tufilm/KinoDetailsFragment.kt
index f1af39d246..318ad7d02c 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/tufilm/KinoDetailsFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/tufilm/KinoDetailsFragment.kt
@@ -93,7 +93,6 @@ class KinoDetailsFragment : Fragment() {
             locationTextView.text = event.locality
         }
 
-
         kinoViewModel.fetchTicketCount(event.id)
     }
 
@@ -133,7 +132,6 @@ class KinoDetailsFragment : Fragment() {
                     remainingTicketsTextView,
                     getString(R.string.no_tickets_remaining_tufilm_message))
         }
-
     }
 
     private fun showMovieDetails(kino: Kino) {
@@ -163,7 +161,6 @@ class KinoDetailsFragment : Fragment() {
                 startActivity(intent)
             }
         }
-
     }
 
     private fun loadPoster(kino: Kino) {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/service/FcmReceiverService.kt b/app/src/main/java/de/tum/in/tumcampusapp/service/FcmReceiverService.kt
index 57daf67cb7..4772cb3e43 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/service/FcmReceiverService.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/service/FcmReceiverService.kt
@@ -25,7 +25,7 @@ import java.io.IOException
 class FcmReceiverService : FirebaseMessagingService() {
 
     override fun onMessageReceived(message: RemoteMessage) {
-        val data = message.data ?: return
+        val data = message.data
         Utils.log("Notification received: $data")
 
         // Legacy messages need to be handled - maybe some data is missing?
@@ -54,9 +54,9 @@ class FcmReceiverService : FirebaseMessagingService() {
      * See: https://github.com/TCA-Team/TumCampusApp/wiki/GCM-Message-format
      */
     private fun createPushNotificationOfType(
-            type: Int,
-            notificationId: Int,
-            payload: String
+        type: Int,
+        notificationId: Int,
+        payload: String
     ): PushNotification? {
         // Apparently, using the service context can cause issues here:
         // https://stackoverflow.com/questions/48770750/strange-crash-when-starting-notification
@@ -101,7 +101,7 @@ class FcmReceiverService : FirebaseMessagingService() {
         super.onNewToken(token)
         Utils.log("new FCM token received")
         Utils.setSetting(this, Const.FCM_INSTANCE_ID, FirebaseInstallations.getInstance().id)
-        Utils.setSetting(this, Const.FCM_TOKEN_ID, token ?: "")
+        Utils.setSetting(this, Const.FCM_TOKEN_ID, token)
     }
 
     /**
diff --git a/app/src/test/java/de/tum/in/tumcampusapp/component/ui/transportation/api/MvvDepartureListTest.java b/app/src/test/java/de/tum/in/tumcampusapp/component/ui/transportation/api/MvvDepartureListTest.java
index 5b4932a2ab..41a563aaf8 100644
--- a/app/src/test/java/de/tum/in/tumcampusapp/component/ui/transportation/api/MvvDepartureListTest.java
+++ b/app/src/test/java/de/tum/in/tumcampusapp/component/ui/transportation/api/MvvDepartureListTest.java
@@ -5,87 +5,50 @@
 
 import junit.framework.Assert;
 
+import org.apache.commons.io.IOUtils;
 import org.joda.time.DateTime;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
 public class MvvDepartureListTest {
-
-    private static String emptyResultExample = "{ \"parameters\": [ { \"name\":\"serverID\", \"value\":\"WEB3_\" }, { \"name\":\"requestID\", \"value\":\"0\" }, { \"name\":\"sessionID\", \"value\":\"0\" }, { \"name\":\"calcTime\", \"value\":\"62.097\" } ], \"dm\": { \"message\": [ { \"name\":\"code\", \"value\":\"-8020\" }, { \"name\":\"error\", \"value\":\"\" }, { \"name\":\"type\", \"value\":\"\" }, { \"name\":\"module\", \"value\":\"BROKER\" } ], \"input\": { \"input\":\"0\" }, \"points\": null }, \"arr\": { \"input\": { \"input\":\"\" }, \"points\": null }, \"dateTime\": { \"deparr\":\"dep\", \"ttpFrom\":\"20171210\", \"ttpTo\":\"20181208\", \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"hour\":\"23\", \"minute\":\"2\" }, \"dateRange\": [ { \"day\":\"25\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"4\" }, { \"day\":\"26\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"5\" }, { \"day\":\"27\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"6\" }, { \"day\":\"28\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"7\" }, { \"day\":\"29\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"1\" }, { \"day\":\"30\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"2\" }, { \"day\":\"31\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"3\" }, { \"day\":\"01\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"4\" }, { \"day\":\"02\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"5\" }, { \"day\":\"03\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"6\" }, { \"day\":\"04\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"7\" }, { \"day\":\"05\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"1\" }, { \"day\":\"06\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"2\" }, { \"day\":\"07\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"3\" }, { \"day\":\"08\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"4\" } ], \"option\": { \"ptOption\": { \"active\":\"1\", \"maxChanges\":\"11\", \"maxTime\":\"360\", \"maxWait\":\"120\", \"routeType\":\"LEASTTIME\", \"changeSpeed\":\"normal\", \"lineRestriction\":\"400\", \"useProxFootSearch\":\"0\", \"useProxFootSearchOrigin\":\"0\", \"useProxFootSearchDestination\":\"0\", \"bike\":\"0\", \"plane\":\"0\", \"noCrowded\":\"0\", \"noSolidStairs\":\"0\", \"noEscalators\":\"0\", \"noElevators\":\"0\", \"lowPlatformVhcl\":\"0\", \"wheelchair\":\"0\", \"needElevatedPlt\":\"0\", \"assistance\":\"0\", \"SOSAvail\":\"0\", \"noLonelyTransfer\":\"0\", \"illumTransfer\":\"0\", \"overgroundTransfer\":\"0\", \"noInsecurePlaces\":\"0\", \"privateTransport\":\"0\", \"excludedMeans\": [ { \"means\":\"Zug\", \"value\":\"0\", \"selected\":\"0\" }, { \"means\":\"S-Bahn\", \"value\":\"1\", \"selected\":\"0\" }, { \"means\":\"U-Bahn\", \"value\":\"2\", \"selected\":\"0\" }, { \"means\":\"Stadtbahn\", \"value\":\"3\", \"selected\":\"0\" }, { \"means\":\"Straßen-/Trambahn\", \"value\":\"4\", \"selected\":\"0\" }, { \"means\":\"Stadtbus\", \"value\":\"5\", \"selected\":\"0\" }, { \"means\":\"Regionalbus\", \"value\":\"6\", \"selected\":\"0\" }, { \"means\":\"Schnellbus\", \"value\":\"7\", \"selected\":\"0\" }, { \"means\":\"Seil-/Zahnradbahn\", \"value\":\"8\", \"selected\":\"0\" }, { \"means\":\"Schiff\", \"value\":\"9\", \"selected\":\"0\" }, { \"means\":\"AST/Rufbus\", \"value\":\"10\", \"selected\":\"0\" }, { \"means\":\"Sonstige\", \"value\":\"11\", \"selected\":\"0\" }, { \"means\":\"Flugzeug\", \"value\":\"12\", \"selected\":\"0\" }, { \"means\":\"Zug (Nahverkehr)\", \"value\":\"13\", \"selected\":\"0\" }, { \"means\":\"Zug (Fernverkehr)\", \"value\":\"14\", \"selected\":\"0\" }, { \"means\":\"Zug (Fernverkehr mit\", \"value\":\"15\", \"selected\":\"0\" }, { \"means\":\"Zug (Fernverkehr mit\", \"value\":\"16\", \"selected\":\"0\" }, { \"means\":\"Schienenersatzverkeh\", \"value\":\"17\", \"selected\":\"0\" }, { \"means\":\"Zug Shuttle\", \"value\":\"18\", \"selected\":\"0\" }, { \"means\":\"Bürgerbus\", \"value\":\"19\", \"selected\":\"0\" } ], \"activeImp\":\"-1\", \"activeCom\":\"-1\", \"activeSec\":\"-1\" } }, \"servingLines\": { \"lines\": null }, \"departureList\": null }";
-
-    private static String multiValueResultExample1 = "{ \"parameters\": [ { \"name\":\"serverID\", \"value\":\"WEB3_\" }, { \"name\":\"requestID\", \"value\":\"0\" }, { \"name\":\"sessionID\", \"value\":\"0\" }, { \"name\":\"calcTime\", \"value\":\"150.515\" } ], \"dm\": { \"input\": { \"input\":\"Freising, Freising\" }, \"points\": { \"point\": { \"usage\":\"dm\", \"type\":\"any\", \"name\":\"Freising, Freising\", \"stateless\":\"1002680\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"100000\", \"best\":\"0\", \"object\":\"Freising\", \"ref\": { \"id\":\"1002680\", \"gid\":\"de:09178:2680\", \"omc\":\"9178124\", \"placeID\":\"1\", \"place\":\"Freising\", \"coords\":\"11744052.74867,48395426.01341\" }, \"infos\": null, \"hasStaticInfo\":\"1\" } }, \"itdOdvAssignedStops\": { \"stopID\":\"1002680\", \"name\":\"Freising\", \"x\":\"11744052.74867\", \"y\":\"48395426.01341\", \"mapName\":\"WGS84\", \"value\":\"1002680:Freising\", \"place\":\"Freising\", \"nameWithPlace\":\"Freising\", \"distanceTime\":\"0\", \"isTransferStop\":\"0\", \"hasStaticInfo\":\"1\", \"vm\":\"100\", \"gid\":\"de:09178:2680\" } }, \"arr\": { \"input\": { \"input\":\"\" }, \"points\": null }, \"dateTime\": { \"deparr\":\"dep\", \"ttpFrom\":\"20171210\", \"ttpTo\":\"20181208\", \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"hour\":\"23\", \"minute\":\"11\" }, \"dateRange\": [ { \"day\":\"25\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"4\" }, { \"day\":\"26\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"5\" }, { \"day\":\"27\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"6\" }, { \"day\":\"28\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"7\" }, { \"day\":\"29\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"1\" }, { \"day\":\"30\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"2\" }, { \"day\":\"31\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"3\" }, { \"day\":\"01\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"4\" }, { \"day\":\"02\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"5\" }, { \"day\":\"03\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"6\" }, { \"day\":\"04\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"7\" }, { \"day\":\"05\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"1\" }, { \"day\":\"06\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"2\" }, { \"day\":\"07\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"3\" }, { \"day\":\"08\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"4\" } ], \"option\": { \"ptOption\": { \"active\":\"1\", \"maxChanges\":\"11\", \"maxTime\":\"360\", \"maxWait\":\"120\", \"routeType\":\"LEASTTIME\", \"changeSpeed\":\"normal\", \"lineRestriction\":\"400\", \"useProxFootSearch\":\"0\", \"useProxFootSearchOrigin\":\"0\", \"useProxFootSearchDestination\":\"0\", \"bike\":\"0\", \"plane\":\"0\", \"noCrowded\":\"0\", \"noSolidStairs\":\"0\", \"noEscalators\":\"0\", \"noElevators\":\"0\", \"lowPlatformVhcl\":\"0\", \"wheelchair\":\"0\", \"needElevatedPlt\":\"0\", \"assistance\":\"0\", \"SOSAvail\":\"0\", \"noLonelyTransfer\":\"0\", \"illumTransfer\":\"0\", \"overgroundTransfer\":\"0\", \"noInsecurePlaces\":\"0\", \"privateTransport\":\"0\", \"excludedMeans\": [ { \"means\":\"Zug\", \"value\":\"0\", \"selected\":\"0\" }, { \"means\":\"S-Bahn\", \"value\":\"1\", \"selected\":\"0\" }, { \"means\":\"U-Bahn\", \"value\":\"2\", \"selected\":\"0\" }, { \"means\":\"Stadtbahn\", \"value\":\"3\", \"selected\":\"0\" }, { \"means\":\"Straßen-/Trambahn\", \"value\":\"4\", \"selected\":\"0\" }, { \"means\":\"Stadtbus\", \"value\":\"5\", \"selected\":\"0\" }, { \"means\":\"Regionalbus\", \"value\":\"6\", \"selected\":\"0\" }, { \"means\":\"Schnellbus\", \"value\":\"7\", \"selected\":\"0\" }, { \"means\":\"Seil-/Zahnradbahn\", \"value\":\"8\", \"selected\":\"0\" }, { \"means\":\"Schiff\", \"value\":\"9\", \"selected\":\"0\" }, { \"means\":\"AST/Rufbus\", \"value\":\"10\", \"selected\":\"0\" }, { \"means\":\"Sonstige\", \"value\":\"11\", \"selected\":\"0\" }, { \"means\":\"Flugzeug\", \"value\":\"12\", \"selected\":\"0\" }, { \"means\":\"Zug (Nahverkehr)\", \"v" +
-            "alue\":\"13\", \"selected\":\"0\" }, { \"means\":\"Zug (Fernverkehr)\", \"value\":\"14\", \"selected\":\"0\" }, { \"means\":\"Zug (Fernverkehr mit\", \"value\":\"15\", \"selected\":\"0\" }, { \"means\":\"Zug (Fernverkehr mit\", \"value\":\"16\", \"selected\":\"0\" }, { \"means\":\"Schienenersatzverkeh\", \"value\":\"17\", \"selected\":\"0\" }, { \"means\":\"Zug Shuttle\", \"value\":\"18\", \"selected\":\"0\" }, { \"means\":\"Bürgerbus\", \"value\":\"19\", \"selected\":\"0\" } ], \"activeImp\":\"-1\", \"activeCom\":\"-1\", \"activeSec\":\"-1\" } }, \"servingLines\": { \"trainInfo\":\"show\", \"selected\":\"1\", \"lines\": [ { \"mode\": { \"name\":\"S-Bahn S1\", \"number\":\"S1\", \"product\":\"S-Bahn\", \"productId\":\"0\", \"type\":\"1\", \"mtSubcode\":\"0\", \"code\":\"2\", \"destination\":\"Neufahrn\", \"destID\":\"1002660\", \"desc\":\"Regelfahrplan gültig von 11.12.2016 bis 24.08.2017 und ab 25.08.2017 Freising  / FLughafen - Neufahrn - Laim - Ostbahnhof\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"01\", \"line\":\"01001\", \"supplement\":\"B\", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:01001:B:H:s18\", \"operator\":\"DB Regio AG / S-Bahn München\", \"opCode\":\"01\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"attrs\": [  ] } }, \"index\":\"1:0\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 511\", \"number\":\"511\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Erding\", \"destID\":\"1003290\", \"desc\":\"Freising, Berufsschule/Freising    - Schwaig - Oberding/Notzing - Erding, K.-Aigner-Gymn. - Erding\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19511\", \"supplement\":\" \", \"dir\":\"R\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19511: :R:s18\", \"operator\":\"Regionalverkehr Obb.\", \"opCode\":\"1011\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:0\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 601\", \"number\":\"601\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Aufham\", \"destID\":\"1002805\", \"desc\":\"Freising - Kirchdorf - Paunzhausen - Schweitenkirchen/Aufham\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19601\", \"supplement\":\" \", \"dir\":\"R\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19601: :R:s18\", \"operator\":\"Stanglmeier\", \"opCode\":\"1077\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:1\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 602\", \"number\":\"602\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Nandlstadt, Marktstraße\", \"destID\":\"1002958\", \"desc\":\"Freising - Attenkirchen - Au - Rudelzhausen - Mainburg\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19602\", \"supplement\":\" \", \"dir\":\"R\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19602: :R:s18\", \"operator\":\"Bayernbus GmbH\", \"opCode\":\"1025\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:2\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 603\", \"number\":\"603\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Freising, Obervellacher Straße\", \"destID\":\"1002858\", \"desc\":\"Mainburg - Rudelzhausen - Nandlstadt - Zolling - Freising\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19603\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19603: :H:s18\", \"operator\":\"Bayernbus GmbH\", \"opCode\":\"1025\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1" +
-            "\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:3\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 603\", \"number\":\"603\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Rudelzhausen, Abzw.Grünberg\", \"destID\":\"1003227\", \"desc\":\"Freising - Zolling - Nandlstadt - Rudelzhausen - Mainburg\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19603\", \"supplement\":\" \", \"dir\":\"R\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19603: :R:s18\", \"operator\":\"Bayernbus GmbH\", \"opCode\":\"1025\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:4\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 614\", \"number\":\"614\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Haimhausen, Schloß\", \"destID\":\"1006866\", \"desc\":\"Freising - Massenhausen/Hetzenhausen - Deutenhausen/Haimhausen\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19614\", \"supplement\":\" \", \"dir\":\"R\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19614: :R:s18\", \"operator\":\"Knab\", \"opCode\":\"1059\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:5\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 615\", \"number\":\"615\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Viehbach\", \"destID\":\"1002698\", \"desc\":\"Freising - Sickenhausen - Viehbach/Höchenberg\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19615\", \"supplement\":\" \", \"dir\":\"R\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19615: :R:s18\", \"operator\":\"Knab\", \"opCode\":\"1059\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:6\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 616\", \"number\":\"616\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Allershausen, Glonnterrassen\", \"destID\":\"1002663\", \"desc\":\"Freising - Kranzberg - Allershausen - Hohenkammer\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19616\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19616: :H:s18\", \"operator\":\"Boos\", \"opCode\":\"1072\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:7\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 617\", \"number\":\"617\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Berg (b.Rudelzhausen)\", \"destID\":\"1003154\", \"desc\":\"Freising - Wolfersdorf - Oberhaindlfing - Berg\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19617\", \"supplement\":\" \", \"dir\":\"R\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19617: :R:s18\", \"operator\":\"Hadersdorfer\", \"opCode\":\"1073\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:8\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 618\", \"number\":\"618\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Freising, Obervellacher Straße\", \"destID\":\"1002858\", \"desc\":\"Sünzhausen - Gütlsdorf - Jägersdorf - Freising\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19618\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19618: :H:s18\", \"operator\":\"Hadersdorfe" +
-            "r\", \"opCode\":\"1073\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:9\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 618\", \"number\":\"618\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Hirnkirchen\", \"destID\":\"1003114\", \"desc\":\"Freising - Jägersdorf - Gütlsdorf - Sünzhausen\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19618\", \"supplement\":\" \", \"dir\":\"R\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19618: :R:s18\", \"operator\":\"Hadersdorfer\", \"opCode\":\"1073\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:10\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 619\", \"number\":\"619\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Hohenkammer, Schule\", \"destID\":\"1002725\", \"desc\":\"Freising - Schönbichl/Eberspoint - Allershausen - Hohenkammer - Petershausen\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19619\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19619: :H:s18\", \"operator\":\"Boos\", \"opCode\":\"1072\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:11\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 620\", \"number\":\"620\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Freising\", \"destID\":\"1002680\", \"desc\":\"Freising -  Berufsschule - Waldfriedhof - Neustift - Freising\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19620\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19620: :H:s18\", \"operator\":\"PVG\", \"opCode\":\"1081\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:12\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 621\", \"number\":\"621\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Freising\", \"destID\":\"1002680\", \"desc\":\"Freising -  Heiliggeistgasse - Neustift -  Waldfriedhof - Corbin Hotel - Freising\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19621\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19621: :H:s18\", \"operator\":\"PVG\", \"opCode\":\"1081\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:13\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 622\", \"number\":\"622\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Freising\", \"destID\":\"1002680\", \"desc\":\"Freising - Haggertystraße - Freising, P+R-Platz - Haggertystraße - Altstadt - Freising\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19622\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19622: :H:s18\", \"operator\":\"PVG\", \"opCode\":\"1081\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:14\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 630\", \"number\":\"630\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Freising\", \"destID\":\"1002680\", \"desc\":\"Freising -  Prinz-Ludwig-Str. - Kleine Wies - Seniorenzentrum - Freising\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19630\", \"supplement\":\" \", " +
-            "\"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19630: :H:s18\", \"operator\":\"PVG\", \"opCode\":\"1081\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:15\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 631\", \"number\":\"631\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Freising\", \"destID\":\"1002680\", \"desc\":\"Freising -  Seniorenzentrum - Kleine Wies - Prinz-Ludwig-Straße - Freising\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19631\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19631: :H:s18\", \"operator\":\"PVG\", \"opCode\":\"1081\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:16\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 633\", \"number\":\"633\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Marzling, Schule\", \"destID\":\"1003179\", \"desc\":\"Freising, Gutenbergstraße - Freising - Marzling\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19633\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19633: :H:s18\", \"operator\":\"PVG\", \"opCode\":\"1081\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:17\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 633\", \"number\":\"633\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Freising, Gutenbergstraße\", \"destID\":\"1002936\", \"desc\":\"Marzling - Freising - Freising, Gutenbergstraße\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19633\", \"supplement\":\" \", \"dir\":\"R\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19633: :R:s18\", \"operator\":\"PVG\", \"opCode\":\"1081\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:18\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 635\", \"number\":\"635\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Flughafen, Terminal 2\", \"destID\":\"1002726\", \"desc\":\"Freising - Flughafen, MAC/Terminal 1 - Terminal 2\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"11\", \"line\":\"11635\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:11635: :H:s18\", \"operator\":\"Regionalverkehr Obb.\", \"opCode\":\"1011\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:19\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 637\", \"number\":\"637\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Freising\", \"destID\":\"1002680\", \"desc\":\"Freising - Dürnast - Hohenbachern und zurück\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19637\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19637: :H:s18\", \"operator\":\"PVG\", \"opCode\":\"1081\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:20\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 638\", \"number\":\"638\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Freising, Fraunhofer-Institut\", \"destID\":\"1002903\", \"desc\":\"Freising - Weihenstephan - Fraunhofer-Institut\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva" +
-            "\": { \"branch\":\"19\", \"line\":\"19638\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19638: :H:s18\", \"operator\":\"PVG\", \"opCode\":\"1081\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:21\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 639\", \"number\":\"639\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Freising\", \"destID\":\"1002680\", \"desc\":\"Freising - Weihenstephan - Lange Point - Corbin Hotel - Freising\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19639\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19639: :H:s18\", \"operator\":\"PVG\", \"opCode\":\"1081\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:22\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 691\", \"number\":\"691\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Neufahrn\", \"destID\":\"1002660\", \"desc\":\"Freising - Hallbergmoos - Neufahrn\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"11\", \"line\":\"11691\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:11691: :H:s18\", \"operator\":\"Regionalverkehr Obb.\", \"opCode\":\"1011\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:23\" } ] }, \"departureList\": [ { \"stopID\":\"1002680\", \"x\":\"11744052.74867\", \"y\":\"48395426.01341\", \"mapName\":\"WGS84\", \"area\":\"2\", \"platform\":\"1\", \"platformName\":\"1\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"pointType\":\"Gleis\", \"countdown\":\"3\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"weekday\":\"4\", \"hour\":\"23\", \"minute\":\"14\" }, \"servingLine\": { \"key\":\"59276\", \"code\":\"6\", \"number\":\"RB 59276 Regionalbahn\", \"symbol\":\"\", \"motType\":\"0\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Landshut (Bay) Hbf\", \"directionFrom\":\"Freising\", \"trainType\":\"RB\", \"trainName\":\"Regionalbahn\", \"trainNum\":\"59276\", \"name\":\"Regionalbahn\", \"liErgRiProj\": { \"line\":\"90931\", \"project\":\"j18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"ddb\" }, \"destID\":\"80000731\", \"stateless\":\"ddb:90931: :R:j18\" }, \"operator\": { \"code\":\"00\", \"name\":\"DB AG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11744594.24217\", \"y\":\"48395157.42459\", \"mapName\":\"WGS84\", \"area\":\"22\", \"platform\":\"Gl3-S\", \"platformName\":\"Gleis 3\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"3\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"weekday\":\"4\", \"hour\":\"23\", \"minute\":\"14\" }, \"servingLine\": { \"key\":\"241\", \"code\":\"2\", \"number\":\"S1\", \"symbol\":\"S1\", \"motType\":\"1\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Ostbahnhof\", \"directionFrom\":\"Freising\", \"name\":\"S-Bahn\", \"liErgRiProj\": { \"line\":\"01001\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\"B\", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:01001:B:H:s18\" }, \"operator\": { \"code\":\"01\", \"name\":\"DB Regio AG / S-Bahn München\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14143_MVV&seqID=2\", \"infoText\": { \"content\":\"Aufgrund der Vorbereitungsarbeiten zur 2. Stammstrecke kommt es von 11. Juli bis 12. Oktober 2018 in verschiedenen N&auml;chten j" +
-            "eweils von 22:40 bis 4:40 Uhr zu Streckensperrungen auf der Stammstrecke. Weitere Einzelheiten entnehmen sie bitte den Kalendern auf den jeweiligen Plakaten.<br /> Die Z&uuml;ge der Linie S7 und S8 verkehren w&auml;hrend dieser Zeit als einzige durch die Stammstrecke mit allen Unterwegshalten.<br /> Ab Ostbahnhof f&auml;hrt eine S-Bahn im 20-Minuten-Takt bis Pasing durch die Stammstrecke mit allen Unterwegshalten.\", \"subtitle\":\"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14143_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"http://www.s-bahn-muenchen.de/s_muenchen/view/fahrplan/baustellen_stamm.shtml\", \"linkText\":\"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke\", \"linkTextShort\":\"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"http://www.s-bahn-muenchen.de/s_muenchen/view/mdb/s_muenchen/baustellen/stammstreckensperrung/mdb_274133_100_plakat_allgemein_optimized.pdf\", \"linkText\":\"Baustellenkalender und Informationen im Überblick\", \"linkTextShort\":\"Baustellenkalender und Informationen im Überblick\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1002680\", \"x\":\"11743152.11347\", \"y\":\"48394605.64989\", \"mapName\":\"WGS84\", \"area\":\"2\", \"platform\":\"10\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"4\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"weekday\":\"4\", \"hour\":\"23\", \"minute\":\"15\" }, \"servingLine\": { \"key\":\"72\", \"code\":\"3\", \"number\":\"602\", \"symbol\":\"602\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Mainburg, Griesplatz\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19602\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19602: :R:s18\" }, \"operator\": { \"code\":\"1025\", \"name\":\"Bayernbus GmbH\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745036.00514\", \"y\":\"48395931.79824\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"6\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"14\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"weekday\":\"4\", \"hour\":\"23\", \"minute\":\"25\" }, \"servingLine\": { \"key\":\"62\", \"code\":\"3\", \"number\":\"635\", \"symbol\":\"635\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Flughafen, Terminal 2\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"11635\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1002726\", \"stateless\":\"mvv:11635: :H:s18\" }, \"operator\": { \"code\":\"1011\", \"name\":\"Regionalverkehr Obb.\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11744594.24217\", \"y\":\"48395157.42459\", \"mapName\":\"WGS84\", \"area\":\"22\", \"platform\":\"Gl3-S\", \"platformName\":\"Gleis 3\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"23\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"weekday\":\"4\", \"hour\":\"23\", \"minute\":\"34\" }, \"servingLine\": { \"key\":\"243\", \"code\":\"2\", \"number\":\"S1\", \"symbol\":\"S1\", \"motType\":\"1\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Ostbahnhof\", \"directionFrom\":\"Freising\", \"name\":\"S-Bahn\", \"liErgRiProj\": { \"line\":\"01001\", \"project\":\"s18\", \"" +
-            "direction\":\"H\", \"supplement\":\"B\", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:01001:B:H:s18\" }, \"operator\": { \"code\":\"01\", \"name\":\"DB Regio AG / S-Bahn München\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14143_MVV&seqID=2\", \"infoText\": { \"content\":\"Aufgrund der Vorbereitungsarbeiten zur 2. Stammstrecke kommt es von 11. Juli bis 12. Oktober 2018 in verschiedenen N&auml;chten jeweils von 22:40 bis 4:40 Uhr zu Streckensperrungen auf der Stammstrecke. Weitere Einzelheiten entnehmen sie bitte den Kalendern auf den jeweiligen Plakaten.<br /> Die Z&uuml;ge der Linie S7 und S8 verkehren w&auml;hrend dieser Zeit als einzige durch die Stammstrecke mit allen Unterwegshalten.<br /> Ab Ostbahnhof f&auml;hrt eine S-Bahn im 20-Minuten-Takt bis Pasing durch die Stammstrecke mit allen Unterwegshalten.\", \"subtitle\":\"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14143_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"http://www.s-bahn-muenchen.de/s_muenchen/view/fahrplan/baustellen_stamm.shtml\", \"linkText\":\"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke\", \"linkTextShort\":\"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"http://www.s-bahn-muenchen.de/s_muenchen/view/mdb/s_muenchen/baustellen/stammstreckensperrung/mdb_274133_100_plakat_allgemein_optimized.pdf\", \"linkText\":\"Baustellenkalender und Informationen im Überblick\", \"linkTextShort\":\"Baustellenkalender und Informationen im Überblick\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1002680\", \"x\":\"11745036.00514\", \"y\":\"48395931.79824\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"6\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"34\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"weekday\":\"4\", \"hour\":\"23\", \"minute\":\"45\" }, \"servingLine\": { \"key\":\"4\", \"code\":\"3\", \"number\":\"635\", \"symbol\":\"635\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Flughafen, Terminal 2\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"11635\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1002726\", \"stateless\":\"mvv:11635: :H:s18\" }, \"operator\": { \"code\":\"1011\", \"name\":\"Regionalverkehr Obb.\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11744052.74867\", \"y\":\"48395426.01341\", \"mapName\":\"WGS84\", \"area\":\"2\", \"platform\":\"4\", \"platformName\":\"4\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"pointType\":\"Gleis\", \"countdown\":\"39\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"weekday\":\"4\", \"hour\":\"23\", \"minute\":\"50\" }, \"servingLine\": { \"key\":\"4092\", \"code\":\"6\", \"number\":\"RE 4092 Regional-Express\", \"symbol\":\"\", \"motType\":\"0\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Passau Hbf\", \"directionFrom\":\"München Hbf (Gl. 5-36)\", \"trainType\":\"RE\", \"trainName\":\"Regional-Express\", \"trainNum\":\"4092\", \"name\":\"Regional-Express\", \"liErgRiProj\": { \"line\":\"90931\", \"project\":\"j18\", \"direction\":\"R\", \"supplement\":\"" +
-            " \", \"network\":\"ddb\" }, \"destID\":\"80001055\", \"stateless\":\"ddb:90931: :R:j18\" }, \"operator\": { \"code\":\"00\", \"name\":\"DB AG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745318.37567\", \"y\":\"48396175.23257\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"2\", \"platformName\":\"2\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"pointType\":\"Gleis\", \"countdown\":\"46\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"weekday\":\"4\", \"hour\":\"23\", \"minute\":\"57\" }, \"servingLine\": { \"key\":\"4869\", \"code\":\"6\", \"number\":\"RE 4869 Regional-Express\", \"symbol\":\"\", \"motType\":\"0\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"München Hbf (Gl. 5-36)\", \"directionFrom\":\"Nürnberg Hbf\", \"trainType\":\"RE\", \"trainName\":\"Regional-Express\", \"trainNum\":\"4869\", \"name\":\"Regional-Express\", \"liErgRiProj\": { \"line\":\"90930\", \"project\":\"j18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"ddb\" }, \"destID\":\"1000100\", \"stateless\":\"ddb:90930: :H:j18\" }, \"operator\": { \"code\":\"00\", \"name\":\"DB AG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745036.00514\", \"y\":\"48395931.79824\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"6\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"54\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"0\", \"minute\":\"5\" }, \"servingLine\": { \"key\":\"5\", \"code\":\"3\", \"number\":\"635\", \"symbol\":\"635\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Flughafen, Terminal 2\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"11635\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1002726\", \"stateless\":\"mvv:11635: :H:s18\" }, \"operator\": { \"code\":\"1011\", \"name\":\"Regionalverkehr Obb.\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11744594.24217\", \"y\":\"48395157.42459\", \"mapName\":\"WGS84\", \"area\":\"22\", \"platform\":\"Gl3-S\", \"platformName\":\"Gleis 3\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"63\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"0\", \"minute\":\"14\" }, \"servingLine\": { \"key\":\"246\", \"code\":\"2\", \"number\":\"S1\", \"symbol\":\"S1\", \"motType\":\"1\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Ostbahnhof\", \"directionFrom\":\"Freising\", \"name\":\"S-Bahn\", \"liErgRiProj\": { \"line\":\"01001\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\"B\", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:01001:B:H:s18\" }, \"operator\": { \"code\":\"01\", \"name\":\"DB Regio AG / S-Bahn München\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14143_MVV&seqID=2\", \"infoText\": { \"content\":\"Aufgrund der Vorbereitungsarbeiten zur 2. Stammstrecke kommt es von 11. Juli bis 12. Oktober 2018 in verschiedenen N&auml;chten jeweils von 22:40 bis 4:40 Uhr zu Streckensperrungen auf der Stammstrecke. Weitere Einzelheiten entnehmen sie bitte den Kalendern auf den jeweiligen Plakaten.<br /> Die Z&uuml;ge der Linie S7 und S8 verkehren w&auml;hrend dieser Zeit als einzige durch die Stammstrecke mit allen Unterwegshalten.<br /> Ab Ostbahnhof f&auml;hrt eine S-Bahn im 20-Minuten-Takt bis Pasing durch die Stammstrecke mit allen Unterwegshalten.\", \"subtitle\":\"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsTe" +
-            "xt\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14143_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"http://www.s-bahn-muenchen.de/s_muenchen/view/fahrplan/baustellen_stamm.shtml\", \"linkText\":\"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke\", \"linkTextShort\":\"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"http://www.s-bahn-muenchen.de/s_muenchen/view/mdb/s_muenchen/baustellen/stammstreckensperrung/mdb_274133_100_plakat_allgemein_optimized.pdf\", \"linkText\":\"Baustellenkalender und Informationen im Überblick\", \"linkTextShort\":\"Baustellenkalender und Informationen im Überblick\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1002680\", \"x\":\"11745036.00514\", \"y\":\"48395931.79824\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"6\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"74\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"0\", \"minute\":\"25\" }, \"servingLine\": { \"key\":\"63\", \"code\":\"3\", \"number\":\"635\", \"symbol\":\"635\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Flughafen, Terminal 2\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"11635\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1002726\", \"stateless\":\"mvv:11635: :H:s18\" }, \"operator\": { \"code\":\"1011\", \"name\":\"Regionalverkehr Obb.\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11744052.74867\", \"y\":\"48395426.01341\", \"mapName\":\"WGS84\", \"area\":\"2\", \"platform\":\"4\", \"platformName\":\"4\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"pointType\":\"Gleis\", \"countdown\":\"78\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"0\", \"minute\":\"29\" }, \"servingLine\": { \"key\":\"18585\", \"code\":\"6\", \"number\":\"ALX 84121 alex - Die Länderbahn GmbH DLB\", \"symbol\":\"\", \"motType\":\"0\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Regensburg Hbf\", \"directionFrom\":\"München Hbf (Gl. 5-36)\", \"trainType\":\"ALX\", \"trainName\":\"alex - Die Länderbahn GmbH DLB\", \"trainNum\":\"84121\", \"name\":\"alex - Die Länderbahn GmbH DLB\", \"liErgRiProj\": { \"line\":\"90930\", \"project\":\"j18\", \"direction\":\"R\", \"supplement\":\"C\", \"network\":\"ddb\" }, \"destID\":\"80001083\", \"stateless\":\"ddb:90930:C:R:j18\" }, \"operator\": { \"code\":\"A8\", \"name\":\"alex - Länderbahn und Vogtlandbahn GmbH\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745116.71417\", \"y\":\"48395994.92750\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"5\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"290\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"4\", \"minute\":\"1\" }, \"servingLine\": { \"key\":\"49\", \"code\":\"3\", \"number\":\"622\", \"symbol\":\"622\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Freising (S) [P+R] ü. Erdinger Straße\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19622\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19622: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745036.00514\", \"y\":\"48395931.79824\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"6\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdo" +
-            "wn\":\"294\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"4\", \"minute\":\"5\" }, \"servingLine\": { \"key\":\"7\", \"code\":\"3\", \"number\":\"635\", \"symbol\":\"635\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Flughafen, Terminal 2\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"11635\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1002726\", \"stateless\":\"mvv:11635: :H:s18\" }, \"operator\": { \"code\":\"1011\", \"name\":\"Regionalverkehr Obb.\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745116.71417\", \"y\":\"48395994.92750\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"5\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"309\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"4\", \"minute\":\"20\" }, \"servingLine\": { \"key\":\"1\", \"code\":\"3\", \"number\":\"620\", \"symbol\":\"620\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Waldfriedhof ü. Berufsschule\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19620\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19620: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745036.00514\", \"y\":\"48395931.79824\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"6\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"314\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"4\", \"minute\":\"25\" }, \"servingLine\": { \"key\":\"1\", \"code\":\"3\", \"number\":\"635\", \"symbol\":\"635\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Flughafen, Terminal 2\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"11635\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1002726\", \"stateless\":\"mvv:11635: :H:s18\" }, \"operator\": { \"code\":\"1011\", \"name\":\"Regionalverkehr Obb.\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745183.91958\", \"y\":\"48396058.02685\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"4\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"323\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"4\", \"minute\":\"34\" }, \"servingLine\": { \"key\":\"1\", \"code\":\"3\", \"number\":\"621\", \"symbol\":\"621\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Waldfriedhof ü. Neustift\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19621\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19621: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745036.00514\", \"y\":\"48395931.79824\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"6\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"334\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"4\", \"minute\":\"45\" }, \"servingLine\": { \"key\":\"8\", \"code\":\"3\", \"number\":\"635\", \"symbol\":\"635\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Flughafen, Terminal 2\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"11635\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1002726\", \"stateless\":\"mvv:116" +
-            "35: :H:s18\" }, \"operator\": { \"code\":\"1011\", \"name\":\"Regionalverkehr Obb.\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11744594.24217\", \"y\":\"48395157.42459\", \"mapName\":\"WGS84\", \"area\":\"22\", \"platform\":\"Gl3-S\", \"platformName\":\"Gleis 3\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"345\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"4\", \"minute\":\"56\" }, \"servingLine\": { \"key\":\"181\", \"code\":\"2\", \"number\":\"S1\", \"symbol\":\"S1\", \"motType\":\"1\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Ostbahnhof\", \"directionFrom\":\"Freising\", \"name\":\"S-Bahn\", \"liErgRiProj\": { \"line\":\"01001\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\"B\", \"network\":\"mvv\" }, \"destID\":\"1000005\", \"stateless\":\"mvv:01001:B:H:s18\" }, \"operator\": { \"code\":\"01\", \"name\":\"DB Regio AG / S-Bahn München\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14143_MVV&seqID=2\", \"infoText\": { \"content\":\"Aufgrund der Vorbereitungsarbeiten zur 2. Stammstrecke kommt es von 11. Juli bis 12. Oktober 2018 in verschiedenen N&auml;chten jeweils von 22:40 bis 4:40 Uhr zu Streckensperrungen auf der Stammstrecke. Weitere Einzelheiten entnehmen sie bitte den Kalendern auf den jeweiligen Plakaten.<br /> Die Z&uuml;ge der Linie S7 und S8 verkehren w&auml;hrend dieser Zeit als einzige durch die Stammstrecke mit allen Unterwegshalten.<br /> Ab Ostbahnhof f&auml;hrt eine S-Bahn im 20-Minuten-Takt bis Pasing durch die Stammstrecke mit allen Unterwegshalten.\", \"subtitle\":\"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14143_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"http://www.s-bahn-muenchen.de/s_muenchen/view/fahrplan/baustellen_stamm.shtml\", \"linkText\":\"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke\", \"linkTextShort\":\"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"http://www.s-bahn-muenchen.de/s_muenchen/view/mdb/s_muenchen/baustellen/stammstreckensperrung/mdb_274133_100_plakat_allgemein_optimized.pdf\", \"linkText\":\"Baustellenkalender und Informationen im Überblick\", \"linkTextShort\":\"Baustellenkalender und Informationen im Überblick\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1002680\", \"x\":\"11745116.71417\", \"y\":\"48395994.92750\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"5\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"348\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"4\", \"minute\":\"59\" }, \"servingLine\": { \"key\":\"2\", \"code\":\"3\", \"number\":\"620\", \"symbol\":\"620\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Waldfriedhof ü. Berufsschule\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19620\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19620: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745116.71417\", \"y\":\"48395994.92750" +
-            "\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"5\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"349\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"0\" }, \"servingLine\": { \"key\":\"50\", \"code\":\"3\", \"number\":\"622\", \"symbol\":\"622\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Freising (S) [P+R] ü. Erdinger Straße\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19622\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19622: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745036.00514\", \"y\":\"48395931.79824\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"6\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"354\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"5\" }, \"servingLine\": { \"key\":\"9\", \"code\":\"3\", \"number\":\"635\", \"symbol\":\"635\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Flughafen, Terminal 2\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"11635\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1002726\", \"stateless\":\"mvv:11635: :H:s18\" }, \"operator\": { \"code\":\"1011\", \"name\":\"Regionalverkehr Obb.\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11744052.74867\", \"y\":\"48395426.01341\", \"mapName\":\"WGS84\", \"area\":\"2\", \"platform\":\"4\", \"platformName\":\"4\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"pointType\":\"Gleis\", \"countdown\":\"357\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"8\" }, \"servingLine\": { \"key\":\"351\", \"code\":\"6\", \"number\":\"ALX 351 alex - Die Länderbahn GmbH DLB\", \"symbol\":\"\", \"motType\":\"0\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Furth im Wald\", \"directionFrom\":\"München Hbf (Gl. 5-36)\", \"trainType\":\"ALX\", \"trainName\":\"alex - Die Länderbahn GmbH DLB\", \"trainNum\":\"351\", \"name\":\"alex - Die Länderbahn GmbH DLB\", \"liErgRiProj\": { \"line\":\"90930\", \"project\":\"j18\", \"direction\":\"R\", \"supplement\":\"A\", \"network\":\"ddb\" }, \"destID\":\"80000944\", \"stateless\":\"ddb:90930:A:R:j18\" }, \"operator\": { \"code\":\"A8\", \"name\":\"alex - Länderbahn und Vogtlandbahn GmbH\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745251.12515\", \"y\":\"48396121.12617\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"3\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"357\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"8\" }, \"servingLine\": { \"key\":\"1\", \"code\":\"3\", \"number\":\"630\", \"symbol\":\"630\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Kleine Wies\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19630\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19630: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745318.37567\", \"y\":\"48396175.23257\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"2\", \"platformName\":\"2\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"pointType\":\"Gleis\", \"countdown\":\"357\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"8\" }, \"servingLine\": { \"key\":\"59231\", \"code\":\"6\", \"numb" +
-            "er\":\"RB 59231 Regionalbahn\", \"symbol\":\"\", \"motType\":\"0\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"München Hbf (Gl. 5-36)\", \"directionFrom\":\"Landshut (Bay) Hbf\", \"trainType\":\"RB\", \"trainName\":\"Regionalbahn\", \"trainNum\":\"59231\", \"name\":\"Regionalbahn\", \"liErgRiProj\": { \"line\":\"90931\", \"project\":\"j18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"ddb\" }, \"destID\":\"1000100\", \"stateless\":\"ddb:90931: :H:j18\" }, \"operator\": { \"code\":\"00\", \"name\":\"DB AG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745183.91958\", \"y\":\"48396058.02685\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"4\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"359\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"10\" }, \"servingLine\": { \"key\":\"2\", \"code\":\"3\", \"number\":\"621\", \"symbol\":\"621\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Waldfriedhof ü. Neustift\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19621\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19621: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745318.37567\", \"y\":\"48396175.23257\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"2\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"359\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"10\" }, \"servingLine\": { \"key\":\"92\", \"code\":\"3\", \"number\":\"638\", \"symbol\":\"638\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Fraunhofer-Institut ü. Weihenstephan\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19638\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19638: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11744914.87469\", \"y\":\"48395850.59358\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"7\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"374\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"25\" }, \"servingLine\": { \"key\":\"21\", \"code\":\"3\", \"number\":\"633\", \"symbol\":\"633\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Gutenbergstraße\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19633\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19633: :R:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745036.00514\", \"y\":\"48395931.79824\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"6\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"374\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"25\" }, \"servingLine\": { \"key\":\"10\", \"code\":\"3\", \"number\":\"635\", \"symbol\":\"635\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Flughafen, Terminal 2\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"11635\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1002726\", \"stateless\":\"mvv:11635: :H:s18\" }, \"operator\": { \"code\":\"1011\", \"name\":\"Regionalverkehr Obb.\", \"publicCode\":\"\" } }, { \"stopID\"" +
-            ":\"1002680\", \"x\":\"11745116.71417\", \"y\":\"48395994.92750\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"5\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"378\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"29\" }, \"servingLine\": { \"key\":\"3\", \"code\":\"3\", \"number\":\"620\", \"symbol\":\"620\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Waldfriedhof ü. Berufsschule\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19620\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19620: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745251.12515\", \"y\":\"48396121.12617\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"3\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"380\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"31\" }, \"servingLine\": { \"key\":\"1\", \"code\":\"3\", \"number\":\"631\", \"symbol\":\"631\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Kleine Wies ü. Seniorenzentrum\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19631\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19631: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745116.71417\", \"y\":\"48395994.92750\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"5\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"380\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"31\" }, \"servingLine\": { \"key\":\"51\", \"code\":\"3\", \"number\":\"622\", \"symbol\":\"622\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Freising (S) [P+R] ü. Erdinger Straße\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19622\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19622: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745183.91958\", \"y\":\"48396058.02685\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"4\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"383\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"34\" }, \"servingLine\": { \"key\":\"3\", \"code\":\"3\", \"number\":\"621\", \"symbol\":\"621\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Waldfriedhof ü. Neustift\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19621\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19621: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745318.37567\", \"y\":\"48396175.23257\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"2\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"385\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"36\" }, \"servingLine\": { \"key\":\"93\", \"code\":\"3\", \"number\":\"638\", \"symbol\":\"638\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Fraunhofer-Institut ü. Weihenstephan\", \"directionFrom\":\"Fr" +
-            "eising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19638\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19638: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11744594.24217\", \"y\":\"48395157.42459\", \"mapName\":\"WGS84\", \"area\":\"22\", \"platform\":\"Gl3-S\", \"platformName\":\"Gleis 3\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"385\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"36\" }, \"servingLine\": { \"key\":\"336\", \"code\":\"2\", \"number\":\"S1\", \"symbol\":\"S1\", \"motType\":\"1\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Ostbahnhof\", \"directionFrom\":\"Freising\", \"name\":\"S-Bahn\", \"liErgRiProj\": { \"line\":\"01001\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\"B\", \"network\":\"mvv\" }, \"destID\":\"1000005\", \"stateless\":\"mvv:01001:B:H:s18\" }, \"operator\": { \"code\":\"01\", \"name\":\"DB Regio AG / S-Bahn München\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14143_MVV&seqID=2\", \"infoText\": { \"content\":\"Aufgrund der Vorbereitungsarbeiten zur 2. Stammstrecke kommt es von 11. Juli bis 12. Oktober 2018 in verschiedenen N&auml;chten jeweils von 22:40 bis 4:40 Uhr zu Streckensperrungen auf der Stammstrecke. Weitere Einzelheiten entnehmen sie bitte den Kalendern auf den jeweiligen Plakaten.<br /> Die Z&uuml;ge der Linie S7 und S8 verkehren w&auml;hrend dieser Zeit als einzige durch die Stammstrecke mit allen Unterwegshalten.<br /> Ab Ostbahnhof f&auml;hrt eine S-Bahn im 20-Minuten-Takt bis Pasing durch die Stammstrecke mit allen Unterwegshalten.\", \"subtitle\":\"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14143_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"http://www.s-bahn-muenchen.de/s_muenchen/view/fahrplan/baustellen_stamm.shtml\", \"linkText\":\"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke\", \"linkTextShort\":\"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"http://www.s-bahn-muenchen.de/s_muenchen/view/mdb/s_muenchen/baustellen/stammstreckensperrung/mdb_274133_100_plakat_allgemein_optimized.pdf\", \"linkText\":\"Baustellenkalender und Informationen im Überblick\", \"linkTextShort\":\"Baustellenkalender und Informationen im Überblick\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1002680\", \"x\":\"11745251.12515\", \"y\":\"48396121.12617\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"3\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"389\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"40\" }, \"servingLine\": { \"key\":\"2\", \"code\":\"3\", \"number\":\"630\", \"symbol\":\"630\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Kleine Wies\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19630\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mv" +
-            "v:19630: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11744914.87469\", \"y\":\"48395850.59358\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"7\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"389\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"40\" }, \"servingLine\": { \"key\":\"37\", \"code\":\"3\", \"number\":\"633\", \"symbol\":\"633\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Marzling ü. Kammergasse\", \"directionFrom\":\"Freising, Gutenbergstraße\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19633\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19633: :H:s18\" }, \"operator\": { \"code\":\"1081\", \"name\":\"PVG\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11743232.81808\", \"y\":\"48394668.78047\", \"mapName\":\"WGS84\", \"area\":\"2\", \"platform\":\"9\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"392\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"43\" }, \"servingLine\": { \"key\":\"13\", \"code\":\"3\", \"number\":\"691\", \"symbol\":\"691\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Neufahrn (S)\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"11691\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:11691: :H:s18\" }, \"operator\": { \"code\":\"1011\", \"name\":\"Regionalverkehr Obb.\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"MVV-Regionalbus Linien 691, 692, 698 - Erneute Fahrplananpassungen wg.\\nBauarbeiten FS12 bei Hallbergmoos\\nab 09.06.2018 bis vsl. 26.10.2018\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13731_MVV&seqID=1\", \"infoText\": { \"content\":\"Die Bauarbeiten an der FS12 bei Hallbergmoos treten in die n&auml;chste Phase. Auf den Linien<br />691, 692 und 698 kommt es deshalb ab Sa, den 09.06.2018 bis voraussichtlich Fr, den<br />26.10.2018 zu umfangreichen Fahrplananpassungen mit z.T. deutlichen Auswirkungen auf<br />Linienf&uuml;hrung, Abfahrtszeiten und Anschlussbeziehungen.<br /><br />Die Linie 698 Ortsverkehr Hallbergmoos verkehrt im oben genannten Zeitraum im 40-Min.-<br />Takt mit ge&auml;nderter Linienf&uuml;hrung &uuml;ber Ludwigstr. - Theresienstr. - Auenstr. - Maximilianstr. -<br />Predazzoallee - Dornierstr. - Zeppelinstra&szlig;e. Zus&auml;tzlich werden acht Verst&auml;rkerfahrten<br />durchgef&uuml;hrt, die u.a. die Haltestellen Rosenstr., Tannenweg u. Mittermeierweg im s&uuml;dl.<br />Ortsbereich bedienen. Die Fahrten der Linie 698 zwischen Hallbergmoos (S) und dem<br />Gewerbegebiet MABP verkehren ohne &Auml;nderung nach dem Regelfahrplan.<br /><br />Die Linie 692 bef&auml;hrt gegenl&auml;ufig zum Ortsverkehr der Linie 698 im 40-Min.-Takt den<br />Linienweg Dornierstr. - Predazzoallee - Maximilianstr. - Auenstr. - Theresienstr. - Ludwigstra&szlig;e.<br /><br />Die Line 691 verkehrt zwischen Hallbergmoos, Rathaus und Hallbergmoos (S) &uuml;ber Auenstr. -<br />Maximilianstr. - Predazzoallee - Dornierstra&szlig;e. In Richtung Hallbergmoos (S) wird zus&auml;tzlich<br />der Abschnitt Zeppelinstr. - Ludwigstr. befahren. Bei den schult&auml;glichen Verst&auml;rkerfahrten in<br />Richtung Neufahrn erfolgt eine Umkehrung der gewohnten Bedienungsreihenfolge. Statt<br />morgens im n&ouml;rdlichen Ortsbereich von Hallbergmoos, starten die Busse die Bedienung nun<br />im S&uuml;den. D.h. die Abfahrten an den Haltestellen in Hallbergmoos finden somit z.T. einige<br />Minuten fr&uuml;her und zudem auf der gegen&uuml;berliegenden Stra&szlig;enseite statt.\", \"subtitle\":\"MVV-Regio" +
-            "nalbus Linien 691, 692, 698 - Erneute Fahrplananpassungen wg.\\nBauarbeiten FS12 bei Hallbergmoos\\nab 09.06.2018 bis vsl. 26.10.2018\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"13731_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"1\", \"edit\":\"0\" } ] } } }, { \"stopID\":\"1002680\", \"x\":\"11745036.00514\", \"y\":\"48395931.79824\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"6\", \"platformName\":\"\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"countdown\":\"394\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"45\" }, \"servingLine\": { \"key\":\"11\", \"code\":\"3\", \"number\":\"635\", \"symbol\":\"635\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Flughafen, Terminal 2\", \"directionFrom\":\"Freising\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"11635\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1002726\", \"stateless\":\"mvv:11635: :H:s18\" }, \"operator\": { \"code\":\"1011\", \"name\":\"Regionalverkehr Obb.\", \"publicCode\":\"\" } }, { \"stopID\":\"1002680\", \"x\":\"11745318.37567\", \"y\":\"48396175.23257\", \"mapName\":\"WGS84\", \"area\":\"1\", \"platform\":\"2\", \"platformName\":\"2\", \"stopName\":\"Freising\", \"nameWO\":\"Freising\", \"pointType\":\"Gleis\", \"countdown\":\"397\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"48\" }, \"servingLine\": { \"key\":\"18584\", \"code\":\"6\", \"number\":\"ALX 84120 alex - Die Länderbahn GmbH DLB\", \"symbol\":\"\", \"motType\":\"0\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"München Hbf (Gl. 5-36)\", \"directionFrom\":\"Schwandorf\", \"trainType\":\"ALX\", \"trainName\":\"alex - Die Länderbahn GmbH DLB\", \"trainNum\":\"84120\", \"name\":\"alex - Die Länderbahn GmbH DLB\", \"liErgRiProj\": { \"line\":\"90930\", \"project\":\"j18\", \"direction\":\"H\", \"supplement\":\"A\", \"network\":\"ddb\" }, \"destID\":\"1000100\", \"stateless\":\"ddb:90930:A:H:j18\" }, \"operator\": { \"code\":\"A8\", \"name\":\"alex - Länderbahn und Vogtlandbahn GmbH\", \"publicCode\":\"\" } } ] }";
-
-
-    private static String multiValueResultExample2 = "{ \"parameters\": [ { \"name\":\"serverID\", \"value\":\"WEB3_\" }, { \"name\":\"requestID\", \"value\":\"0\" }, { \"name\":\"sessionID\", \"value\":\"0\" }, { \"name\":\"calcTime\", \"value\":\"133.123\" } ], \"dm\": { \"input\": { \"input\":\"Garching (b München), Garching, Forschungszentrum\" }, \"points\": { \"point\": { \"usage\":\"dm\", \"type\":\"any\", \"name\":\"Garching (b München), Garching, Forschungszentrum\", \"stateless\":\"1000460\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"100000\", \"best\":\"0\", \"object\":\"Garching, Forschungszentrum\", \"ref\": { \"id\":\"1000460\", \"gid\":\"de:09184:460\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11671228.33979,48264859.55499\" }, \"infos\": null, \"hasStaticInfo\":\"1\" } }, \"itdOdvAssignedStops\": { \"stopID\":\"1000460\", \"name\":\"Garching, Forschungszentrum\", \"x\":\"11671228.33979\", \"y\":\"48264859.55499\", \"mapName\":\"WGS84\", \"value\":\"1000460:Garching, Forschungszentrum\", \"place\":\"Garching (b München)\", \"nameWithPlace\":\"Garching, Forschungszentrum\", \"distanceTime\":\"0\", \"isTransferStop\":\"0\", \"hasStaticInfo\":\"1\", \"vm\":\"100\", \"gid\":\"de:09184:460\" } }, \"arr\": { \"input\": { \"input\":\"\" }, \"points\": null }, \"dateTime\": { \"deparr\":\"dep\", \"ttpFrom\":\"20171210\", \"ttpTo\":\"20181208\", \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"hour\":\"23\", \"minute\":\"8\" }, \"dateRange\": [ { \"day\":\"25\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"4\" }, { \"day\":\"26\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"5\" }, { \"day\":\"27\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"6\" }, { \"day\":\"28\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"7\" }, { \"day\":\"29\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"1\" }, { \"day\":\"30\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"2\" }, { \"day\":\"31\", \"month\":\"07\", \"year\":\"2018\", \"weekday\":\"3\" }, { \"day\":\"01\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"4\" }, { \"day\":\"02\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"5\" }, { \"day\":\"03\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"6\" }, { \"day\":\"04\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"7\" }, { \"day\":\"05\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"1\" }, { \"day\":\"06\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"2\" }, { \"day\":\"07\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"3\" }, { \"day\":\"08\", \"month\":\"08\", \"year\":\"2018\", \"weekday\":\"4\" } ], \"option\": { \"ptOption\": { \"active\":\"1\", \"maxChanges\":\"11\", \"maxTime\":\"360\", \"maxWait\":\"120\", \"routeType\":\"LEASTTIME\", \"changeSpeed\":\"normal\", \"lineRestriction\":\"400\", \"useProxFootSearch\":\"0\", \"useProxFootSearchOrigin\":\"0\", \"useProxFootSearchDestination\":\"0\", \"bike\":\"0\", \"plane\":\"0\", \"noCrowded\":\"0\", \"noSolidStairs\":\"0\", \"noEscalators\":\"0\", \"noElevators\":\"0\", \"lowPlatformVhcl\":\"0\", \"wheelchair\":\"0\", \"needElevatedPlt\":\"0\", \"assistance\":\"0\", \"SOSAvail\":\"0\", \"noLonelyTransfer\":\"0\", \"illumTransfer\":\"0\", \"overgroundTransfer\":\"0\", \"noInsecurePlaces\":\"0\", \"privateTransport\":\"0\", \"excludedMeans\": [ { \"means\":\"Zug\", \"value\":\"0\", \"selected\":\"0\" }, { \"means\":\"S-Bahn\", \"value\":\"1\", \"selected\":\"0\" }, { \"means\":\"U-Bahn\", \"value\":\"2\", \"selected\":\"0\" }, { \"means\":\"Stadtbahn\", \"value\":\"3\", \"selected\":\"0\" }, { \"means\":\"Straßen-/Trambahn\", \"value\":\"4\", \"selected\":\"0\" }, { \"means\":\"Stadtbus\", \"value\":\"5\", \"selected\":\"0\" }, { \"means\":\"Regionalbus\", \"value\":\"6\", \"selected\":\"0\" }, { \"means\":\"Schnellbus\", \"value\":\"7\", \"selected\":\"0\" }, { \"means\":\"Seil-/Zahnradbahn\", \"value\":\"8\", \"selected\":\"0\" }, { \"means\":\"Schiff\", \"value\":\"9\", \"selected\":\"0\" }, { \"means\":\"AST/Rufbus\", \"value\":\"10\", \"selected\":\"0\" }, { \"m" +
-            "eans\":\"Sonstige\", \"value\":\"11\", \"selected\":\"0\" }, { \"means\":\"Flugzeug\", \"value\":\"12\", \"selected\":\"0\" }, { \"means\":\"Zug (Nahverkehr)\", \"value\":\"13\", \"selected\":\"0\" }, { \"means\":\"Zug (Fernverkehr)\", \"value\":\"14\", \"selected\":\"0\" }, { \"means\":\"Zug (Fernverkehr mit\", \"value\":\"15\", \"selected\":\"0\" }, { \"means\":\"Zug (Fernverkehr mit\", \"value\":\"16\", \"selected\":\"0\" }, { \"means\":\"Schienenersatzverkeh\", \"value\":\"17\", \"selected\":\"0\" }, { \"means\":\"Zug Shuttle\", \"value\":\"18\", \"selected\":\"0\" }, { \"means\":\"Bürgerbus\", \"value\":\"19\", \"selected\":\"0\" } ], \"activeImp\":\"-1\", \"activeCom\":\"-1\", \"activeSec\":\"-1\" } }, \"servingLines\": { \"lines\": [ { \"mode\": { \"name\":\"U-Bahn U6\", \"number\":\"U6\", \"product\":\"U-Bahn\", \"productId\":\"1\", \"type\":\"2\", \"mtSubcode\":\"0\", \"code\":\"1\", \"destination\":\"Klinikum Großhadern\", \"destID\":\"1001540\", \"desc\":\"Garching-Forschungsz. - Fröttmaning - Münchner Freiheit - Odeonspl. - Marienplatz - Sendlinger Tor - Harras - Klinikum Großhadern\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"21\", \"line\":\"21006\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:21006: :H:s18\", \"operator\":\"SWM/MVG, 0800/344226600\", \"opCode\":\"23\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"attrs\": [  ] } }, \"index\":\"2:0\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 230\", \"number\":\"230\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Ismaning, Carl-Zeiss-Ring\", \"destID\":\"1009292\", \"desc\":\"Garching, Forschungszentrum  - Garching   - Ismaning  - Fischerhäuser\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19230\", \"supplement\":\" \", \"dir\":\"R\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19230: :R:s18\", \"operator\":\"VBR GmbH, München\", \"opCode\":\"1097\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:0\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 292\", \"number\":\"292\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Oberschl., Sonnenstraße\", \"destID\":\"1002021\", \"desc\":\"Garching-Forschungszentrum  - Garching  -  Garching-Hochbrück  - Oberschleißheim  - Sonnenstraße\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"19\", \"line\":\"19292\", \"supplement\":\" \", \"dir\":\"H\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:19292: :H:s18\", \"operator\":\"Boos/Hadersdorfer/Scharf\", \"opCode\":\"1172\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:1\" }, { \"mode\": { \"name\":\"MVV-Regionalbus 690\", \"number\":\"690\", \"product\":\"MVV-Regionalbus\", \"productId\":\"4\", \"type\":\"6\", \"mtSubcode\":\"0\", \"code\":\"3\", \"destination\":\"Eching (S) Ost\", \"destID\":\"1002747\", \"desc\":\"Garching, Forschungszentrum - Neufahrn - Eching Ost\", \"timetablePeriod\":\"Fahrplan (2018)\", \"diva\": { \"branch\":\"74\", \"line\":\"74690\", \"supplement\":\" \", \"dir\":\"R\", \"project\":\"s18\", \"network\":\"mvv\", \"stateless\":\"mvv:74690: :R:s18\", \"operator\":\"VGM Boos/Haders./RVO\", \"opCode\":\"1074\", \"vF\":\"20171210\", \"vTo\":\"20181208\", \"isTTB\":\"1\", \"isSTT\":\"1\", \"isROP\":\"1\", \"attrs\": [  ] } }, \"index\":\"6:2\" } ] }, \"departureList\": [ { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"5\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"weekday\":\"4\", \"hour\":\"23\", \"minute\":\"13\" }, \"" +
-            "servingLine\": { \"key\":\"379\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"12\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"weekday\":\"4\", \"hour\":\"23\", \"minute\":\"20\" }, \"servingLine\": { \"key\":\"153\", \"code\":\"3\", \"number\":\"292\", \"symbol\":\"292\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Oberschleißheim, Sonnenstraße\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19292\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19292: :H:s18\" }, \"operator\": { \"code\":\"1172\", \"name\":\"Boos/Hadersdorfer/Scharf\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.0" +
-            "9.2018\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2\", \"infoText\": { \"content\":\"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\\\"Garching-</strong><strong>Hochbr&uuml;ck\\\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\\\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\\\" target=\\\"_blank\\\">Haltestellenpositionen \\\"Garching-Hochbr&uuml;ck\\\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\\\"Gewerbegebiet\\\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \\\"Graf-Zeppelin-Platz\\\" aus.\", \"subtitle\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"13827_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671187.47172\", \"y\":\"48264931.38387\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"2\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"23\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"weekday\":\"4\", \"hour\":\"23\", \"minute\":\"31\" }, \"servingLine\": { \"key\":\"207\", \"code\":\"3\", \"number\":\"230\", \"symbol\":\"230\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Ismaning, Hirtgrasstraße\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19230\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1002087\", \"stateless\":\"mvv:19230: :R:s18\" }, \"operator\": { \"code\":\"1097\", \"name\":\"VBR GmbH, München\", \"publicCode\":\"\" } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"25\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"weekday\":\"4\", \"hour\":\"23\", \"minute\":\"33\" }, \"servingLine\": { \"key\":\"380\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienpla" +
-            "tz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"45\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"25\", \"weekday\":\"4\", \"hour\":\"23\", \"minute\":\"53\" }, \"servingLine\": { \"key\":\"381\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\"" +
-            ", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"65\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"0\", \"minute\":\"13\" }, \"servingLine\": { \"key\":\"382\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"" +
-            "linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"98\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"0\", \"minute\":\"46\" }, \"servingLine\": { \"key\":\"646\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Münchner Freiheit\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1000500\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"148\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"1\", \"minute\":\"36\" }, \"servingLine\": { \"key\":\"651\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\"" +
-            ", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Kieferngarten\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1000430\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"353\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"1\" }, \"servingLine\": { \"key\":\"238\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist d" +
-            "er Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"372\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"20\" }, \"servingLine\": { \"key\":\"103\", \"code\":\"3\", \"number\":\"292\", \"symbol\":\"292\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Oberschleißheim, Sonnenstraße\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19292\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19292: :H:s18\" }, \"operator\": { \"code\":\"1172\", \"name\":\"Boos/Hadersdorfer/Scharf\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2\", \"infoText\": { \"content\":\"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\\\"Garching-</strong><strong>Hochbr&uuml;ck\\\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\\\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\\\" target=\\\"_blank\\\">Haltestellenpositionen \\\"Garching-Hochbr&uuml;ck\\\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestell" +
-            "e <strong>\\\"Gewerbegebiet\\\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \\\"Graf-Zeppelin-Platz\\\" aus.\", \"subtitle\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"13827_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garching, Forschungszentrum\", \"nameWO\":\"Garching, Forschungszentrum\", \"countdown\":\"388\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"36\" }, \"servingLine\": { \"key\":\"2\", \"code\":\"3\", \"number\":\"690\", \"symbol\":\"690\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Eching (S) Ost\", \"directionFrom\":\"Garching, Forschungszentrum\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"74690\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:74690: :R:s18\" }, \"operator\": { \"code\":\"1074\", \"name\":\"VGM Boos/Haders./RVO\", \"publicCode\":\"\" } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"388\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"36\" }, \"servingLine\": { \"key\":\"240\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system" +
-            "\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"392\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"40\" }, \"servingLine\": { \"key\":\"104\", \"code\":\"3\", \"number\":\"292\", \"symbol\":\"292\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Oberschleißheim, Sonnenstraße\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19292\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19292: :H:s18\" }, \"operator\": { \"code\":\"1172\", \"name\":\"Boos/Hadersdorfer/Scharf\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2\", \"infoText\": { \"content\":\"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\\\"Garching-</strong><strong>Hochbr&uuml;ck\\\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\\\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\\\" target=\\\"_blank\\\">Haltestellenpositionen \\\"Garching-Hochbr&uuml;ck\\\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\\\"Gewerbegebiet\\\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \\\"Graf-Zeppelin-Platz\\\" aus.\", \"subtitle\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"13827_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"408\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"56\" }, \"servingLine\": {" +
-            " \"key\":\"242\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garching, Forschungszentrum\", \"nameWO\":\"Garching, Forschungszentrum\", \"countdown\":\"408\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"5\", \"minute\":\"56\" }, \"servingLine\": { \"key\":\"3\", \"code\":\"3\", \"number\":\"690\", \"symbol\":\"690\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Eching (S) Ost\", \"directionFrom\":\"Garching, Forschungszentrum\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"74690\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:74690: :R:s18\" }, \"operator\": { \"code\":\"1074\", \"name\":\"VGM Boos/Haders./RVO\", \"publicCode\":\"\" } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Fors" +
-            "chungsz.\", \"countdown\":\"412\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"6\", \"minute\":\"0\" }, \"servingLine\": { \"key\":\"105\", \"code\":\"3\", \"number\":\"292\", \"symbol\":\"292\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Oberschleißheim, Sonnenstraße\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19292\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19292: :H:s18\" }, \"operator\": { \"code\":\"1172\", \"name\":\"Boos/Hadersdorfer/Scharf\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2\", \"infoText\": { \"content\":\"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\\\"Garching-</strong><strong>Hochbr&uuml;ck\\\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\\\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\\\" target=\\\"_blank\\\">Haltestellenpositionen \\\"Garching-Hochbr&uuml;ck\\\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\\\"Gewerbegebiet\\\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \\\"Graf-Zeppelin-Platz\\\" aus.\", \"subtitle\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"13827_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671187.47172\", \"y\":\"48264931.38387\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"2\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"423\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"6\", \"minute\":\"11\" }, \"servingLine\": { \"key\":\"226\", \"code\":\"3\", \"number\":\"230\", \"symbol\":\"230\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Ismaning, Carl-Zeiss-Ring\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19230\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1009292\", \"stateless\":\"mvv:19230: :R:s18\" }, \"operator\": { \"code\":\"1097\", \"name\":\"VBR GmbH, München\", \"publicCode\":\"\" } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"428\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"6\", \"minute\":\"16\" }, \"servingLine\": { \"key\":\"244\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", " +
-            "\"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garching, Forschungszentrum\", \"nameWO\":\"Garching, Forschungszentrum\", \"countdown\":\"428\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"6\", \"minute\":\"16\" }, \"servingLine\": { \"key\":\"4\", \"code\":\"3\", \"number\":\"690\", \"symbol\":\"690\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Eching (S) Ost\", \"directionFrom\":\"Garching, Forschungszentrum\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"74690\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:74690: :R:s18\" }, \"operator\": { \"code\":\"1074\", \"name\":\"VGM Boos/Haders./RVO\", \"publicCode\":\"\" } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"432\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"6\", \"minute\":\"20\" }, \"servingLine\": { \"key\":\"106\", \"code\":\"3\", \"number\":\"292\", \"sy" +
-            "mbol\":\"292\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Oberschleißheim, Sonnenstraße\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19292\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19292: :H:s18\" }, \"operator\": { \"code\":\"1172\", \"name\":\"Boos/Hadersdorfer/Scharf\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2\", \"infoText\": { \"content\":\"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\\\"Garching-</strong><strong>Hochbr&uuml;ck\\\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\\\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\\\" target=\\\"_blank\\\">Haltestellenpositionen \\\"Garching-Hochbr&uuml;ck\\\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\\\"Gewerbegebiet\\\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \\\"Graf-Zeppelin-Platz\\\" aus.\", \"subtitle\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"13827_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"438\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"6\", \"minute\":\"26\" }, \"servingLine\": { \"key\":\"245\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und T";
-    private static String multiValueResultExample2_episode2 =
-            "ramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671187.47172\", \"y\":\"48264931.38387\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"2\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"443\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"6\", \"minute\":\"31\" }, \"servingLine\": { \"key\":\"254\", \"code\":\"3\", \"number\":\"230\", \"symbol\":\"230\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Ismaning, Hirtgrasstraße\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19230\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1002087\", \"stateless\":\"mvv:19230: :R:s18\" }, \"operator\": { \"code\":\"1097\", \"name\":\"VBR GmbH, München\", \"publicCode\":\"\" } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"448\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"6\", \"minute\":\"36\" }, \"servingLine\": { \"key\":\"247\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen " +
-                    "durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garching, Forschungszentrum\", \"nameWO\":\"Garching, Forschungszentrum\", \"countdown\":\"448\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"6\", \"minute\":\"36\" }, \"servingLine\": { \"key\":\"5\", \"code\":\"3\", \"number\":\"690\", \"symbol\":\"690\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Eching (S) Ost\", \"directionFrom\":\"Garching, Forschungszentrum\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"74690\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:74690: :R:s18\" }, \"operator\": { \"code\":\"1074\", \"name\":\"VGM Boos/Haders./RVO\", \"publicCode\":\"\" } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"452\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"6\", \"minute\":\"40\" }, \"servingLine\": { \"key\":\"107\", \"code\":\"3\", \"number\":\"292\", \"symbol\":\"292\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Oberschleißheim, Sonnenstraße\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19292\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19292: :H:s18\" }, \"operator\": { \"code\":\"1172\", \"name\":\"Boos/Hadersdorfer/Scharf\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2\", \"infoText\": { \"content\":\"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hoch" +
-                    "br&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\\\"Garching-</strong><strong>Hochbr&uuml;ck\\\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\\\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\\\" target=\\\"_blank\\\">Haltestellenpositionen \\\"Garching-Hochbr&uuml;ck\\\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\\\"Gewerbegebiet\\\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \\\"Graf-Zeppelin-Platz\\\" aus.\", \"subtitle\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"13827_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"458\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"6\", \"minute\":\"46\" }, \"servingLine\": { \"key\":\"248\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkUR" +
-                    "L\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671187.47172\", \"y\":\"48264931.38387\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"2\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"463\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"6\", \"minute\":\"51\" }, \"servingLine\": { \"key\":\"227\", \"code\":\"3\", \"number\":\"230\", \"symbol\":\"230\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Ismaning, Carl-Zeiss-Ring\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19230\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1009292\", \"stateless\":\"mvv:19230: :R:s18\" }, \"operator\": { \"code\":\"1097\", \"name\":\"VBR GmbH, München\", \"publicCode\":\"\" } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"468\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"6\", \"minute\":\"56\" }, \"servingLine\": { \"key\":\"250\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonder" +
-                    "seite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garching, Forschungszentrum\", \"nameWO\":\"Garching, Forschungszentrum\", \"countdown\":\"468\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"6\", \"minute\":\"56\" }, \"servingLine\": { \"key\":\"6\", \"code\":\"3\", \"number\":\"690\", \"symbol\":\"690\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Eching (S) Ost\", \"directionFrom\":\"Garching, Forschungszentrum\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"74690\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:74690: :R:s18\" }, \"operator\": { \"code\":\"1074\", \"name\":\"VGM Boos/Haders./RVO\", \"publicCode\":\"\" } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"472\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"7\", \"minute\":\"0\" }, \"servingLine\": { \"key\":\"108\", \"code\":\"3\", \"number\":\"292\", \"symbol\":\"292\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Oberschleißheim, Sonnenstraße\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19292\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19292: :H:s18\" }, \"operator\": { \"code\":\"1172\", \"name\":\"Boos/Hadersdorfer/Scharf\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2\", \"infoText\": { \"content\":\"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\\\"Garching-</strong><strong>Hochbr&uuml;ck\\\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\\\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\\\" target=\\\"_blank\\\">Haltestellenpositionen \\\"Garching-Hochbr&uuml;ck\\\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\\\"Gewerbegebiet\\\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \\\"Graf-Zeppelin-Platz\\\" aus.\", \"subtitle\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"" +
-                    "smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"13827_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"478\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"7\", \"minute\":\"6\" }, \"servingLine\": { \"key\":\"251\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671187.47172\", \"y\":\"48264931.38387\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"2\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"483\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"7\", \"minute\":\"11\" }, \"servingLine\": { \"key\":\"228\", \"code\":\"3\"" +
-                    ", \"number\":\"230\", \"symbol\":\"230\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Ismaning, Carl-Zeiss-Ring\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19230\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1009292\", \"stateless\":\"mvv:19230: :R:s18\" }, \"operator\": { \"code\":\"1097\", \"name\":\"VBR GmbH, München\", \"publicCode\":\"\" } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"488\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"7\", \"minute\":\"16\" }, \"servingLine\": { \"key\":\"253\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garching, Forschungszentrum\", \"nameWO\":\"Garching, Forschungszentrum\", \"" +
-                    "countdown\":\"488\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"7\", \"minute\":\"16\" }, \"servingLine\": { \"key\":\"7\", \"code\":\"3\", \"number\":\"690\", \"symbol\":\"690\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Eching (S) Ost\", \"directionFrom\":\"Garching, Forschungszentrum\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"74690\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:74690: :R:s18\" }, \"operator\": { \"code\":\"1074\", \"name\":\"VGM Boos/Haders./RVO\", \"publicCode\":\"\" } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"492\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"7\", \"minute\":\"20\" }, \"servingLine\": { \"key\":\"109\", \"code\":\"3\", \"number\":\"292\", \"symbol\":\"292\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Oberschleißheim, Sonnenstraße\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19292\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19292: :H:s18\" }, \"operator\": { \"code\":\"1172\", \"name\":\"Boos/Hadersdorfer/Scharf\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2\", \"infoText\": { \"content\":\"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\\\"Garching-</strong><strong>Hochbr&uuml;ck\\\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\\\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\\\" target=\\\"_blank\\\">Haltestellenpositionen \\\"Garching-Hochbr&uuml;ck\\\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\\\"Gewerbegebiet\\\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \\\"Graf-Zeppelin-Platz\\\" aus.\", \"subtitle\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"13827_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"498\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"7\", \"minute\":\"26\" }, \"servingLine\": { \"key\":\"254\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"" +
-                    "line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671187.47172\", \"y\":\"48264931.38387\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"2\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"503\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"7\", \"minute\":\"31\" }, \"servingLine\": { \"key\":\"255\", \"code\":\"3\", \"number\":\"230\", \"symbol\":\"230\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Ismaning, Hirtgrasstraße\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19230\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1002087\", \"stateless\":\"mvv:19230: :R:s18\" }, \"operator\": { \"code\":\"1097\", \"name\":\"VBR GmbH, München\", \"publicCode\":\"\" } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garching, Forschungszentrum\", \"nameWO\":\"Garching, Forschungszentrum\", \"countdown\":\"508\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"7\", \"minute\":\"36\" }, \"servingLine\": { \"key\":\"8\", \"code\":\"3\", \"number\":\"690\", \"symbol\":\"690\"," +
-                    " \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Eching (S) Ost\", \"directionFrom\":\"Garching, Forschungszentrum\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"74690\", \"project\":\"s18\", \"direction\":\"R\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:74690: :R:s18\" }, \"operator\": { \"code\":\"1074\", \"name\":\"VGM Boos/Haders./RVO\", \"publicCode\":\"\" } }, { \"stopID\":\"1000460\", \"x\":\"11671363.37649\", \"y\":\"48264805.98117\", \"mapName\":\"WGS84\", \"area\":\"11\", \"platform\":\"UGarc\", \"platformName\":\"Gleis 2\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"508\", \"dateTime\": { \"year\":\"2018\", \"month\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"7\", \"minute\":\"36\" }, \"servingLine\": { \"key\":\"256\", \"code\":\"1\", \"number\":\"U6\", \"symbol\":\"U6\", \"motType\":\"2\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Klinikum Großhadern\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"U-Bahn\", \"liErgRiProj\": { \"line\":\"21006\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"1001540\", \"stateless\":\"mvv:21006: :H:s18\" }, \"operator\": { \"code\":\"23\", \"name\":\"SWM/MVG, 0800/344226600\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2\", \"infoText\": { \"content\":\"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:\", \"subtitle\":\"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"14107_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ], \"additionalLinks\": [ { \"ID\":\"1\", \"linkURL\":\"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html\", \"linkText\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTextShort\":\"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor\", \"linkTarget\":\"_blank\" }, { \"ID\":\"2\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U3/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" }, { \"ID\":\"3\", \"linkURL\":\"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf\", \"linkText\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTextShort\":\"Sonderfahrplan U6/Pendelzug bei Sperrung\", \"linkTarget\":\"_blank\" } ] } } }, { \"stopID\":\"1000460\", \"x\":\"11671242.32707\", \"y\":\"48264778.65621\", \"mapName\":\"WGS84\", \"area\":\"30\", \"platform\":\"1\", \"platformName\":\"\", \"stopName\":\"Garch.,Forschungsz.\", \"nameWO\":\"Garch.,Forschungsz.\", \"countdown\":\"512\", \"dateTime\": { \"year\":\"2018\", \"mon" +
-                    "th\":\"7\", \"day\":\"26\", \"weekday\":\"5\", \"hour\":\"7\", \"minute\":\"40\" }, \"servingLine\": { \"key\":\"110\", \"code\":\"3\", \"number\":\"292\", \"symbol\":\"292\", \"motType\":\"6\", \"mtSubcode\":\"0\", \"realtime\":\"0\", \"direction\":\"Oberschleißheim, Sonnenstraße\", \"directionFrom\":\"Garch.,Forschungsz.\", \"name\":\"MVV-Regionalbus\", \"liErgRiProj\": { \"line\":\"19292\", \"project\":\"s18\", \"direction\":\"H\", \"supplement\":\" \", \"network\":\"mvv\" }, \"destID\":\"-1\", \"stateless\":\"mvv:19292: :H:s18\" }, \"operator\": { \"code\":\"1172\", \"name\":\"Boos/Hadersdorfer/Scharf\", \"publicCode\":\"\" }, \"stopInfos\": null, \"lineInfos\": { \"lineInfo\": { \"infoLinkText\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"infoLinkURL\":\"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2\", \"infoText\": { \"content\":\"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\\\"Garching-</strong><strong>Hochbr&uuml;ck\\\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\\\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\\\" target=\\\"_blank\\\">Haltestellenpositionen \\\"Garching-Hochbr&uuml;ck\\\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\\\"Gewerbegebiet\\\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \\\"Graf-Zeppelin-Platz\\\" aus.\", \"subtitle\":\"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \\\"Garching-Hochbrück\\\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018\", \"subject\":\"\", \"additionalText\":\"\", \"htmlText\":\"\", \"wmlText\":\"\", \"smsText\":\"\", \"speechText\":\"\" }, \"paramList\": [ { \"type\":\"addInfoParam\", \"name\":\"infoType\", \"value\":\"lineInfo\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"infoID\", \"value\":\"13827_MVV\", \"edit\":\"0\" }, { \"type\":\"system\", \"name\":\"seqID\", \"value\":\"2\", \"edit\":\"0\" } ] } } } ] }";
-
-    private static Gson gson = new GsonBuilder()
+    private static final Gson gson = new GsonBuilder()
             .registerTypeAdapter(DateTime.class, new MvvDateSerializer())
             .create();
 
+    private static String loadJsonResource(String location) throws IOException {
+        InputStream resourceStream = Thread.currentThread()
+                                           .getContextClassLoader()
+                                           .getResourceAsStream(location);
+        return IOUtils.toString(resourceStream, StandardCharsets.UTF_8);
+    }
+
     @Test
-    public void testEmptyValue() {
+    public void testEmptyValue() throws IOException {
+        String emptyResultExample = loadJsonResource("mvv/emptyResult.json");
         MvvDepartureList stationList = gson.fromJson(emptyResultExample, MvvDepartureList.class);
         List<MvvDeparture> departureList = stationList.getDepartureList();
         Assert.assertEquals(null, departureList);
     }
 
     @Test
-    public void testMultiValue1() {
+    public void testMultiValue1() throws IOException {
+        String multiValueResultExample1 = loadJsonResource("mvv/multiValueResult1.json");
         MvvDepartureList stationList = gson.fromJson(multiValueResultExample1, MvvDepartureList.class);
         List<MvvDeparture> departureList = stationList.getDepartureList();
         Assert.assertEquals(40, departureList.size());
     }
 
     @Test
-    public void testMultiValue2() {
-        MvvDepartureList stationList = gson.fromJson(multiValueResultExample2 + multiValueResultExample2_episode2, MvvDepartureList.class);
+    public void testMultiValue2() throws IOException {
+        String multiValueResultExample2 = loadJsonResource("mvv/multiValueResult2.json");
+        MvvDepartureList stationList = gson.fromJson(multiValueResultExample2, MvvDepartureList.class);
         List<MvvDeparture> departureList = stationList.getDepartureList();
         Assert.assertEquals(40, departureList.size());
     }
diff --git a/app/src/test/java/de/tum/in/tumcampusapp/component/ui/transportation/api/MvvStationListTest.java b/app/src/test/java/de/tum/in/tumcampusapp/component/ui/transportation/api/MvvStationListTest.java
index c60e129778..1e039b9501 100644
--- a/app/src/test/java/de/tum/in/tumcampusapp/component/ui/transportation/api/MvvStationListTest.java
+++ b/app/src/test/java/de/tum/in/tumcampusapp/component/ui/transportation/api/MvvStationListTest.java
@@ -13,20 +13,20 @@
 
 public class MvvStationListTest {
 
-    private static String emptyResultExample =
+    private static final String emptyResultExample =
             "{ \"parameters\": [ { \"name\":\"serverID\", \"value\":\"WEB3_\" }, { \"name\":\"requestID\", \"value\":\"0\" }, { \"name\":\"sessionID\", \"value\":\"0\" }, { \"name\":\"calcTime\", \"value\":\"31.622\" } ], \"stopFinder\": { \"message\": [ { \"name\":\"code\", \"value\":\"-8020\" }, { \"name\":\"error\", \"value\":\"\" }, { \"name\":\"type\", \"value\":\"\" }, { \"name\":\"module\", \"value\":\"BROKER\" } ], \"input\": { \"input\":\"0000000000000000000000000000\" }, " +
                     "\"points\": null " +
                     "} }";
 
-    private static String singletonResultExample =
+    private static final String singletonResultExample =
             "{ \"parameters\": [ { \"name\":\"serverID\", \"value\":\"WEB3_\" }, { \"name\":\"requestID\", \"value\":\"0\" }, { \"name\":\"sessionID\", \"value\":\"0\" }, { \"name\":\"calcTime\", \"value\":\"57.516\" } ], \"stopFinder\": { \"message\": [ { \"name\":\"code\", \"value\":\"-8010\" }, { \"name\":\"error\", \"value\":\"\" }, { \"name\":\"type\", \"value\":\"\" }, { \"name\":\"module\", \"value\":\"BROKER\" } ], \"input\": { \"input\":\"Garching, Forschungszentrum\" }, " +
                     "\"points\": {" +
                     " \"point\": { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Garching, Forschungszentrum\", \"stateless\":\"1000460\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"814\", \"best\":\"1\", \"object\":\"Garching, Forschungszentrum\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"2,6\", \"ref\": { \"id\":\"1000460\", \"gid\":\"de:09184:460\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11671228.33979,48264859.55499\" }, \"infos\": null, \"hasStaticInfo\":\"1\" } }, \"itdOdvAssignedStops\": { \"stopID\":\"1000460\", \"name\":\"Garching, Forschungszentrum\", \"x\":\"11671228.33979\", \"y\":\"48264859.55499\", \"mapName\":\"WGS84\", \"value\":\"1000460:Garching, Forschungszentrum\", \"place\":\"Garching (b München)\", \"nameWithPlace\":\"Garching, Forschungszentrum\", \"distanceTime\":\"0\", \"isTransferStop\":\"0\", \"hasStaticInfo\":\"1\", \"vm\":\"100\", \"gid\":\"de:09184:460\" } " +
                     "} }";
 
-    private static String multiValueResultExample = "{ \"parameters\": [ { \"name\":\"serverID\", \"value\":\"WEB3_\" }, { \"name\":\"requestID\", \"value\":\"0\" }, { \"name\":\"sessionID\", \"value\":\"0\" }, { \"name\":\"calcTime\", \"value\":\"34.117\" } ], \"stopFinder\": { \"message\": [ { \"name\":\"code\", \"value\":\"-8011\" }, { \"name\":\"error\", \"value\":\"\" }, { \"name\":\"type\", \"value\":\"\" }, { \"name\":\"module\", \"value\":\"BROKER\" } ], \"input\": { \"input\":\"garching\" }, \"points\": [ { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Gutenbergstraße\", \"stateless\":\"1002075\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"414\", \"best\":\"0\", \"object\":\"Gutenbergstraße\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"6\", \"ref\": { \"id\":\"1002075\", \"gid\":\"de:09184:2075\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11624682.96318,48247612.21449\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Auweg\", \"stateless\":\"1002062\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"484\", \"best\":\"0\", \"object\":\"Auweg\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"6\", \"ref\": { \"id\":\"1002062\", \"gid\":\"de:09184:2062\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11648979.99422,48246672.59669\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Brunnenweg\", \"stateless\":\"1002025\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"421\", \"best\":\"0\", \"object\":\"Brunnenweg\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"6\", \"ref\": { \"id\":\"1002025\", \"gid\":\"de:09184:2025\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11657006.39757,48250482.92242\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Mühlgasse\", \"stateless\":\"1002019\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"432\", \"best\":\"0\", \"object\":\"Mühlgasse\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"6\", \"ref\": { \"id\":\"1002019\", \"gid\":\"de:09184:2019\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11655841.98939,48247412.76250\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Keltenweg\", \"stateless\":\"1002018\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"432\", \"best\":\"0\", \"object\":\"Keltenweg\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"6\", \"ref\": { \"id\":\"1002018\", \"gid\":\"de:09184:2018\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11641128.70342,48250731.32148\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Garching, Forschungszentrum\", \"stateless\":\"1000460\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"444\", \"best\":\"0\", \"object\":\"Garching, Forschungszentrum\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"2,6\", \"ref\": { \"id\":\"1000460\", \"gid\":\"de:09184:460\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11671228.33979,48264859.55499\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Gewerbegebiet\", \"stateless\":\"1002014\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"414\", \"best\":\"0\", \"object\":\"Gewerbegebiet\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"6\", \"ref\": { \"id\":\"1002014\", \"gid\":\"de:09184:2014\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11622551.98320,48249925.50070\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Garching\", \"stateless\":\"1000490\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"666\", \"best\":\"1\", \"object\":\"Garching\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"2,6\", \"ref\": { \"id\":\"1000490\", \"gid\":\"de:09184:490\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11652502.62541,48249417.21671\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Garching-Hochbrück\", \"stateless\":\"1000480\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"510\", \"best\":\"0\", \"object\":\"Garching-Hochbrück\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"2,6\", \"ref\": { \"id\":\"1000480\", \"gid\":\"de:09184:480\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11630771.91332,48247218.20876\" } } ] } }";
+    private static final String multiValueResultExample = "{ \"parameters\": [ { \"name\":\"serverID\", \"value\":\"WEB3_\" }, { \"name\":\"requestID\", \"value\":\"0\" }, { \"name\":\"sessionID\", \"value\":\"0\" }, { \"name\":\"calcTime\", \"value\":\"34.117\" } ], \"stopFinder\": { \"message\": [ { \"name\":\"code\", \"value\":\"-8011\" }, { \"name\":\"error\", \"value\":\"\" }, { \"name\":\"type\", \"value\":\"\" }, { \"name\":\"module\", \"value\":\"BROKER\" } ], \"input\": { \"input\":\"garching\" }, \"points\": [ { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Gutenbergstraße\", \"stateless\":\"1002075\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"414\", \"best\":\"0\", \"object\":\"Gutenbergstraße\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"6\", \"ref\": { \"id\":\"1002075\", \"gid\":\"de:09184:2075\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11624682.96318,48247612.21449\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Auweg\", \"stateless\":\"1002062\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"484\", \"best\":\"0\", \"object\":\"Auweg\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"6\", \"ref\": { \"id\":\"1002062\", \"gid\":\"de:09184:2062\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11648979.99422,48246672.59669\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Brunnenweg\", \"stateless\":\"1002025\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"421\", \"best\":\"0\", \"object\":\"Brunnenweg\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"6\", \"ref\": { \"id\":\"1002025\", \"gid\":\"de:09184:2025\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11657006.39757,48250482.92242\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Mühlgasse\", \"stateless\":\"1002019\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"432\", \"best\":\"0\", \"object\":\"Mühlgasse\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"6\", \"ref\": { \"id\":\"1002019\", \"gid\":\"de:09184:2019\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11655841.98939,48247412.76250\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Keltenweg\", \"stateless\":\"1002018\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"432\", \"best\":\"0\", \"object\":\"Keltenweg\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"6\", \"ref\": { \"id\":\"1002018\", \"gid\":\"de:09184:2018\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11641128.70342,48250731.32148\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Garching, Forschungszentrum\", \"stateless\":\"1000460\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"444\", \"best\":\"0\", \"object\":\"Garching, Forschungszentrum\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"2,6\", \"ref\": { \"id\":\"1000460\", \"gid\":\"de:09184:460\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11671228.33979,48264859.55499\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Gewerbegebiet\", \"stateless\":\"1002014\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"414\", \"best\":\"0\", \"object\":\"Gewerbegebiet\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"6\", \"ref\": { \"id\":\"1002014\", \"gid\":\"de:09184:2014\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11622551.98320,48249925.50070\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Garching\", \"stateless\":\"1000490\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"666\", \"best\":\"1\", \"object\":\"Garching\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"2,6\", \"ref\": { \"id\":\"1000490\", \"gid\":\"de:09184:490\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11652502.62541,48249417.21671\" } }, { \"usage\":\"sf\", \"type\":\"any\", \"name\":\"Garching (b München), Garching-Hochbrück\", \"stateless\":\"1000480\", \"anyType\":\"stop\", \"sort\":\"2\", \"quality\":\"510\", \"best\":\"0\", \"object\":\"Garching-Hochbrück\", \"mainLoc\":\"Garching (b München)\", \"modes\":\"2,6\", \"ref\": { \"id\":\"1000480\", \"gid\":\"de:09184:480\", \"omc\":\"9184119\", \"placeID\":\"1\", \"place\":\"Garching (b München)\", \"coords\":\"11630771.91332,48247218.20876\" } } ] } }";
 
-    private static Gson gson = new GsonBuilder()
+    private static final Gson gson = new GsonBuilder()
             .registerTypeAdapter(MvvStationList.class, new MvvStationListSerializer())
             .create();
 
diff --git a/app/src/test/java/de/tum/in/tumcampusapp/database/dao/CalendarDaoTest.java b/app/src/test/java/de/tum/in/tumcampusapp/database/dao/CalendarDaoTest.java
index 801a334b8d..13b82055b2 100644
--- a/app/src/test/java/de/tum/in/tumcampusapp/database/dao/CalendarDaoTest.java
+++ b/app/src/test/java/de/tum/in/tumcampusapp/database/dao/CalendarDaoTest.java
@@ -63,7 +63,7 @@ private CalendarItem createCalendarItem(String status, DateTime startDate, DateT
         CalendarItem item = new CalendarItem(Integer.toString(nr),
                                              status,
                                              "dummy url",
-                                             "title " + Integer.toString(nr),
+                                             "title " + nr,
                                              "dummy description",
                                              startDate,
                                              endDate,
diff --git a/app/src/test/java/de/tum/in/tumcampusapp/database/dao/RoomLocationsDaoTest.java b/app/src/test/java/de/tum/in/tumcampusapp/database/dao/RoomLocationsDaoTest.java
index 63af76c169..033b253f9a 100644
--- a/app/src/test/java/de/tum/in/tumcampusapp/database/dao/RoomLocationsDaoTest.java
+++ b/app/src/test/java/de/tum/in/tumcampusapp/database/dao/RoomLocationsDaoTest.java
@@ -51,7 +51,7 @@ private CalendarItem createCalendarItem(DateTime startDate, String location) {
         CalendarItem item = new CalendarItem(Integer.toString(nr),
                                              "good",
                                              "dummy url",
-                                             "title " + Integer.toString(nr),
+                                             "title " + nr,
                                              "dummy description",
                                              startDate,
                                              startDate,
diff --git a/app/src/test/resources/mvv/emptyResult.json b/app/src/test/resources/mvv/emptyResult.json
new file mode 100644
index 0000000000..c13cb9deea
--- /dev/null
+++ b/app/src/test/resources/mvv/emptyResult.json
@@ -0,0 +1 @@
+{ "parameters": [ { "name":"serverID", "value":"WEB3_" }, { "name":"requestID", "value":"0" }, { "name":"sessionID", "value":"0" }, { "name":"calcTime", "value":"62.097" } ], "dm": { "message": [ { "name":"code", "value":"-8020" }, { "name":"error", "value":"" }, { "name":"type", "value":"" }, { "name":"module", "value":"BROKER" } ], "input": { "input":"0" }, "points": null }, "arr": { "input": { "input":"" }, "points": null }, "dateTime": { "deparr":"dep", "ttpFrom":"20171210", "ttpTo":"20181208", "year":"2018", "month":"7", "day":"25", "hour":"23", "minute":"2" }, "dateRange": [ { "day":"25", "month":"07", "year":"2018", "weekday":"4" }, { "day":"26", "month":"07", "year":"2018", "weekday":"5" }, { "day":"27", "month":"07", "year":"2018", "weekday":"6" }, { "day":"28", "month":"07", "year":"2018", "weekday":"7" }, { "day":"29", "month":"07", "year":"2018", "weekday":"1" }, { "day":"30", "month":"07", "year":"2018", "weekday":"2" }, { "day":"31", "month":"07", "year":"2018", "weekday":"3" }, { "day":"01", "month":"08", "year":"2018", "weekday":"4" }, { "day":"02", "month":"08", "year":"2018", "weekday":"5" }, { "day":"03", "month":"08", "year":"2018", "weekday":"6" }, { "day":"04", "month":"08", "year":"2018", "weekday":"7" }, { "day":"05", "month":"08", "year":"2018", "weekday":"1" }, { "day":"06", "month":"08", "year":"2018", "weekday":"2" }, { "day":"07", "month":"08", "year":"2018", "weekday":"3" }, { "day":"08", "month":"08", "year":"2018", "weekday":"4" } ], "option": { "ptOption": { "active":"1", "maxChanges":"11", "maxTime":"360", "maxWait":"120", "routeType":"LEASTTIME", "changeSpeed":"normal", "lineRestriction":"400", "useProxFootSearch":"0", "useProxFootSearchOrigin":"0", "useProxFootSearchDestination":"0", "bike":"0", "plane":"0", "noCrowded":"0", "noSolidStairs":"0", "noEscalators":"0", "noElevators":"0", "lowPlatformVhcl":"0", "wheelchair":"0", "needElevatedPlt":"0", "assistance":"0", "SOSAvail":"0", "noLonelyTransfer":"0", "illumTransfer":"0", "overgroundTransfer":"0", "noInsecurePlaces":"0", "privateTransport":"0", "excludedMeans": [ { "means":"Zug", "value":"0", "selected":"0" }, { "means":"S-Bahn", "value":"1", "selected":"0" }, { "means":"U-Bahn", "value":"2", "selected":"0" }, { "means":"Stadtbahn", "value":"3", "selected":"0" }, { "means":"Straßen-/Trambahn", "value":"4", "selected":"0" }, { "means":"Stadtbus", "value":"5", "selected":"0" }, { "means":"Regionalbus", "value":"6", "selected":"0" }, { "means":"Schnellbus", "value":"7", "selected":"0" }, { "means":"Seil-/Zahnradbahn", "value":"8", "selected":"0" }, { "means":"Schiff", "value":"9", "selected":"0" }, { "means":"AST/Rufbus", "value":"10", "selected":"0" }, { "means":"Sonstige", "value":"11", "selected":"0" }, { "means":"Flugzeug", "value":"12", "selected":"0" }, { "means":"Zug (Nahverkehr)", "value":"13", "selected":"0" }, { "means":"Zug (Fernverkehr)", "value":"14", "selected":"0" }, { "means":"Zug (Fernverkehr mit", "value":"15", "selected":"0" }, { "means":"Zug (Fernverkehr mit", "value":"16", "selected":"0" }, { "means":"Schienenersatzverkeh", "value":"17", "selected":"0" }, { "means":"Zug Shuttle", "value":"18", "selected":"0" }, { "means":"Bürgerbus", "value":"19", "selected":"0" } ], "activeImp":"-1", "activeCom":"-1", "activeSec":"-1" } }, "servingLines": { "lines": null }, "departureList": null }
\ No newline at end of file
diff --git a/app/src/test/resources/mvv/multiValueResult1.json b/app/src/test/resources/mvv/multiValueResult1.json
new file mode 100644
index 0000000000..f6c7800d3e
--- /dev/null
+++ b/app/src/test/resources/mvv/multiValueResult1.json
@@ -0,0 +1 @@
+{ "parameters": [ { "name":"serverID", "value":"WEB3_" }, { "name":"requestID", "value":"0" }, { "name":"sessionID", "value":"0" }, { "name":"calcTime", "value":"150.515" } ], "dm": { "input": { "input":"Freising, Freising" }, "points": { "point": { "usage":"dm", "type":"any", "name":"Freising, Freising", "stateless":"1002680", "anyType":"stop", "sort":"2", "quality":"100000", "best":"0", "object":"Freising", "ref": { "id":"1002680", "gid":"de:09178:2680", "omc":"9178124", "placeID":"1", "place":"Freising", "coords":"11744052.74867,48395426.01341" }, "infos": null, "hasStaticInfo":"1" } }, "itdOdvAssignedStops": { "stopID":"1002680", "name":"Freising", "x":"11744052.74867", "y":"48395426.01341", "mapName":"WGS84", "value":"1002680:Freising", "place":"Freising", "nameWithPlace":"Freising", "distanceTime":"0", "isTransferStop":"0", "hasStaticInfo":"1", "vm":"100", "gid":"de:09178:2680" } }, "arr": { "input": { "input":"" }, "points": null }, "dateTime": { "deparr":"dep", "ttpFrom":"20171210", "ttpTo":"20181208", "year":"2018", "month":"7", "day":"25", "hour":"23", "minute":"11" }, "dateRange": [ { "day":"25", "month":"07", "year":"2018", "weekday":"4" }, { "day":"26", "month":"07", "year":"2018", "weekday":"5" }, { "day":"27", "month":"07", "year":"2018", "weekday":"6" }, { "day":"28", "month":"07", "year":"2018", "weekday":"7" }, { "day":"29", "month":"07", "year":"2018", "weekday":"1" }, { "day":"30", "month":"07", "year":"2018", "weekday":"2" }, { "day":"31", "month":"07", "year":"2018", "weekday":"3" }, { "day":"01", "month":"08", "year":"2018", "weekday":"4" }, { "day":"02", "month":"08", "year":"2018", "weekday":"5" }, { "day":"03", "month":"08", "year":"2018", "weekday":"6" }, { "day":"04", "month":"08", "year":"2018", "weekday":"7" }, { "day":"05", "month":"08", "year":"2018", "weekday":"1" }, { "day":"06", "month":"08", "year":"2018", "weekday":"2" }, { "day":"07", "month":"08", "year":"2018", "weekday":"3" }, { "day":"08", "month":"08", "year":"2018", "weekday":"4" } ], "option": { "ptOption": { "active":"1", "maxChanges":"11", "maxTime":"360", "maxWait":"120", "routeType":"LEASTTIME", "changeSpeed":"normal", "lineRestriction":"400", "useProxFootSearch":"0", "useProxFootSearchOrigin":"0", "useProxFootSearchDestination":"0", "bike":"0", "plane":"0", "noCrowded":"0", "noSolidStairs":"0", "noEscalators":"0", "noElevators":"0", "lowPlatformVhcl":"0", "wheelchair":"0", "needElevatedPlt":"0", "assistance":"0", "SOSAvail":"0", "noLonelyTransfer":"0", "illumTransfer":"0", "overgroundTransfer":"0", "noInsecurePlaces":"0", "privateTransport":"0", "excludedMeans": [ { "means":"Zug", "value":"0", "selected":"0" }, { "means":"S-Bahn", "value":"1", "selected":"0" }, { "means":"U-Bahn", "value":"2", "selected":"0" }, { "means":"Stadtbahn", "value":"3", "selected":"0" }, { "means":"Straßen-/Trambahn", "value":"4", "selected":"0" }, { "means":"Stadtbus", "value":"5", "selected":"0" }, { "means":"Regionalbus", "value":"6", "selected":"0" }, { "means":"Schnellbus", "value":"7", "selected":"0" }, { "means":"Seil-/Zahnradbahn", "value":"8", "selected":"0" }, { "means":"Schiff", "value":"9", "selected":"0" }, { "means":"AST/Rufbus", "value":"10", "selected":"0" }, { "means":"Sonstige", "value":"11", "selected":"0" }, { "means":"Flugzeug", "value":"12", "selected":"0" }, { "means":"Zug (Nahverkehr)", "value":"13", "selected":"0" }, { "means":"Zug (Fernverkehr)", "value":"14", "selected":"0" }, { "means":"Zug (Fernverkehr mit", "value":"15", "selected":"0" }, { "means":"Zug (Fernverkehr mit", "value":"16", "selected":"0" }, { "means":"Schienenersatzverkeh", "value":"17", "selected":"0" }, { "means":"Zug Shuttle", "value":"18", "selected":"0" }, { "means":"Bürgerbus", "value":"19", "selected":"0" } ], "activeImp":"-1", "activeCom":"-1", "activeSec":"-1" } }, "servingLines": { "trainInfo":"show", "selected":"1", "lines": [ { "mode": { "name":"S-Bahn S1", "number":"S1", "product":"S-Bahn", "productId":"0", "type":"1", "mtSubcode":"0", "code":"2", "destination":"Neufahrn", "destID":"1002660", "desc":"Regelfahrplan gültig von 11.12.2016 bis 24.08.2017 und ab 25.08.2017 Freising  / FLughafen - Neufahrn - Laim - Ostbahnhof", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"01", "line":"01001", "supplement":"B", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:01001:B:H:s18", "operator":"DB Regio AG / S-Bahn München", "opCode":"01", "vF":"20171210", "vTo":"20181208", "attrs": [  ] } }, "index":"1:0" }, { "mode": { "name":"MVV-Regionalbus 511", "number":"511", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Erding", "destID":"1003290", "desc":"Freising, Berufsschule/Freising    - Schwaig - Oberding/Notzing - Erding, K.-Aigner-Gymn. - Erding", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19511", "supplement":" ", "dir":"R", "project":"s18", "network":"mvv", "stateless":"mvv:19511: :R:s18", "operator":"Regionalverkehr Obb.", "opCode":"1011", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:0" }, { "mode": { "name":"MVV-Regionalbus 601", "number":"601", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Aufham", "destID":"1002805", "desc":"Freising - Kirchdorf - Paunzhausen - Schweitenkirchen/Aufham", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19601", "supplement":" ", "dir":"R", "project":"s18", "network":"mvv", "stateless":"mvv:19601: :R:s18", "operator":"Stanglmeier", "opCode":"1077", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "attrs": [  ] } }, "index":"6:1" }, { "mode": { "name":"MVV-Regionalbus 602", "number":"602", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Nandlstadt, Marktstraße", "destID":"1002958", "desc":"Freising - Attenkirchen - Au - Rudelzhausen - Mainburg", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19602", "supplement":" ", "dir":"R", "project":"s18", "network":"mvv", "stateless":"mvv:19602: :R:s18", "operator":"Bayernbus GmbH", "opCode":"1025", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "attrs": [  ] } }, "index":"6:2" }, { "mode": { "name":"MVV-Regionalbus 603", "number":"603", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Freising, Obervellacher Straße", "destID":"1002858", "desc":"Mainburg - Rudelzhausen - Nandlstadt - Zolling - Freising", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19603", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:19603: :H:s18", "operator":"Bayernbus GmbH", "opCode":"1025", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:3" }, { "mode": { "name":"MVV-Regionalbus 603", "number":"603", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Rudelzhausen, Abzw.Grünberg", "destID":"1003227", "desc":"Freising - Zolling - Nandlstadt - Rudelzhausen - Mainburg", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19603", "supplement":" ", "dir":"R", "project":"s18", "network":"mvv", "stateless":"mvv:19603: :R:s18", "operator":"Bayernbus GmbH", "opCode":"1025", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:4" }, { "mode": { "name":"MVV-Regionalbus 614", "number":"614", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Haimhausen, Schloß", "destID":"1006866", "desc":"Freising - Massenhausen/Hetzenhausen - Deutenhausen/Haimhausen", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19614", "supplement":" ", "dir":"R", "project":"s18", "network":"mvv", "stateless":"mvv:19614: :R:s18", "operator":"Knab", "opCode":"1059", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:5" }, { "mode": { "name":"MVV-Regionalbus 615", "number":"615", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Viehbach", "destID":"1002698", "desc":"Freising - Sickenhausen - Viehbach/Höchenberg", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19615", "supplement":" ", "dir":"R", "project":"s18", "network":"mvv", "stateless":"mvv:19615: :R:s18", "operator":"Knab", "opCode":"1059", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:6" }, { "mode": { "name":"MVV-Regionalbus 616", "number":"616", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Allershausen, Glonnterrassen", "destID":"1002663", "desc":"Freising - Kranzberg - Allershausen - Hohenkammer", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19616", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:19616: :H:s18", "operator":"Boos", "opCode":"1072", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:7" }, { "mode": { "name":"MVV-Regionalbus 617", "number":"617", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Berg (b.Rudelzhausen)", "destID":"1003154", "desc":"Freising - Wolfersdorf - Oberhaindlfing - Berg", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19617", "supplement":" ", "dir":"R", "project":"s18", "network":"mvv", "stateless":"mvv:19617: :R:s18", "operator":"Hadersdorfer", "opCode":"1073", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:8" }, { "mode": { "name":"MVV-Regionalbus 618", "number":"618", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Freising, Obervellacher Straße", "destID":"1002858", "desc":"Sünzhausen - Gütlsdorf - Jägersdorf - Freising", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19618", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:19618: :H:s18", "operator":"Hadersdorfer", "opCode":"1073", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:9" }, { "mode": { "name":"MVV-Regionalbus 618", "number":"618", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Hirnkirchen", "destID":"1003114", "desc":"Freising - Jägersdorf - Gütlsdorf - Sünzhausen", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19618", "supplement":" ", "dir":"R", "project":"s18", "network":"mvv", "stateless":"mvv:19618: :R:s18", "operator":"Hadersdorfer", "opCode":"1073", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:10" }, { "mode": { "name":"MVV-Regionalbus 619", "number":"619", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Hohenkammer, Schule", "destID":"1002725", "desc":"Freising - Schönbichl/Eberspoint - Allershausen - Hohenkammer - Petershausen", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19619", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:19619: :H:s18", "operator":"Boos", "opCode":"1072", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:11" }, { "mode": { "name":"MVV-Regionalbus 620", "number":"620", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Freising", "destID":"1002680", "desc":"Freising -  Berufsschule - Waldfriedhof - Neustift - Freising", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19620", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:19620: :H:s18", "operator":"PVG", "opCode":"1081", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "attrs": [  ] } }, "index":"6:12" }, { "mode": { "name":"MVV-Regionalbus 621", "number":"621", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Freising", "destID":"1002680", "desc":"Freising -  Heiliggeistgasse - Neustift -  Waldfriedhof - Corbin Hotel - Freising", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19621", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:19621: :H:s18", "operator":"PVG", "opCode":"1081", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:13" }, { "mode": { "name":"MVV-Regionalbus 622", "number":"622", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Freising", "destID":"1002680", "desc":"Freising - Haggertystraße - Freising, P+R-Platz - Haggertystraße - Altstadt - Freising", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19622", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:19622: :H:s18", "operator":"PVG", "opCode":"1081", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:14" }, { "mode": { "name":"MVV-Regionalbus 630", "number":"630", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Freising", "destID":"1002680", "desc":"Freising -  Prinz-Ludwig-Str. - Kleine Wies - Seniorenzentrum - Freising", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19630", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:19630: :H:s18", "operator":"PVG", "opCode":"1081", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:15" }, { "mode": { "name":"MVV-Regionalbus 631", "number":"631", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Freising", "destID":"1002680", "desc":"Freising -  Seniorenzentrum - Kleine Wies - Prinz-Ludwig-Straße - Freising", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19631", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:19631: :H:s18", "operator":"PVG", "opCode":"1081", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:16" }, { "mode": { "name":"MVV-Regionalbus 633", "number":"633", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Marzling, Schule", "destID":"1003179", "desc":"Freising, Gutenbergstraße - Freising - Marzling", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19633", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:19633: :H:s18", "operator":"PVG", "opCode":"1081", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:17" }, { "mode": { "name":"MVV-Regionalbus 633", "number":"633", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Freising, Gutenbergstraße", "destID":"1002936", "desc":"Marzling - Freising - Freising, Gutenbergstraße", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19633", "supplement":" ", "dir":"R", "project":"s18", "network":"mvv", "stateless":"mvv:19633: :R:s18", "operator":"PVG", "opCode":"1081", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:18" }, { "mode": { "name":"MVV-Regionalbus 635", "number":"635", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Flughafen, Terminal 2", "destID":"1002726", "desc":"Freising - Flughafen, MAC/Terminal 1 - Terminal 2", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"11", "line":"11635", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:11635: :H:s18", "operator":"Regionalverkehr Obb.", "opCode":"1011", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:19" }, { "mode": { "name":"MVV-Regionalbus 637", "number":"637", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Freising", "destID":"1002680", "desc":"Freising - Dürnast - Hohenbachern und zurück", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19637", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:19637: :H:s18", "operator":"PVG", "opCode":"1081", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:20" }, { "mode": { "name":"MVV-Regionalbus 638", "number":"638", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Freising, Fraunhofer-Institut", "destID":"1002903", "desc":"Freising - Weihenstephan - Fraunhofer-Institut", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19638", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:19638: :H:s18", "operator":"PVG", "opCode":"1081", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:21" }, { "mode": { "name":"MVV-Regionalbus 639", "number":"639", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Freising", "destID":"1002680", "desc":"Freising - Weihenstephan - Lange Point - Corbin Hotel - Freising", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19639", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:19639: :H:s18", "operator":"PVG", "opCode":"1081", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:22" }, { "mode": { "name":"MVV-Regionalbus 691", "number":"691", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Neufahrn", "destID":"1002660", "desc":"Freising - Hallbergmoos - Neufahrn", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"11", "line":"11691", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:11691: :H:s18", "operator":"Regionalverkehr Obb.", "opCode":"1011", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:23" } ] }, "departureList": [ { "stopID":"1002680", "x":"11744052.74867", "y":"48395426.01341", "mapName":"WGS84", "area":"2", "platform":"1", "platformName":"1", "stopName":"Freising", "nameWO":"Freising", "pointType":"Gleis", "countdown":"3", "dateTime": { "year":"2018", "month":"7", "day":"25", "weekday":"4", "hour":"23", "minute":"14" }, "servingLine": { "key":"59276", "code":"6", "number":"RB 59276 Regionalbahn", "symbol":"", "motType":"0", "mtSubcode":"0", "realtime":"0", "direction":"Landshut (Bay) Hbf", "directionFrom":"Freising", "trainType":"RB", "trainName":"Regionalbahn", "trainNum":"59276", "name":"Regionalbahn", "liErgRiProj": { "line":"90931", "project":"j18", "direction":"R", "supplement":" ", "network":"ddb" }, "destID":"80000731", "stateless":"ddb:90931: :R:j18" }, "operator": { "code":"00", "name":"DB AG", "publicCode":"" } }, { "stopID":"1002680", "x":"11744594.24217", "y":"48395157.42459", "mapName":"WGS84", "area":"22", "platform":"Gl3-S", "platformName":"Gleis 3", "stopName":"Freising", "nameWO":"Freising", "countdown":"3", "dateTime": { "year":"2018", "month":"7", "day":"25", "weekday":"4", "hour":"23", "minute":"14" }, "servingLine": { "key":"241", "code":"2", "number":"S1", "symbol":"S1", "motType":"1", "mtSubcode":"0", "realtime":"0", "direction":"Ostbahnhof", "directionFrom":"Freising", "name":"S-Bahn", "liErgRiProj": { "line":"01001", "project":"s18", "direction":"H", "supplement":"B", "network":"mvv" }, "destID":"-1", "stateless":"mvv:01001:B:H:s18" }, "operator": { "code":"01", "name":"DB Regio AG / S-Bahn München", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14143_MVV&seqID=2", "infoText": { "content":"Aufgrund der Vorbereitungsarbeiten zur 2. Stammstrecke kommt es von 11. Juli bis 12. Oktober 2018 in verschiedenen N&auml;chten jeweils von 22:40 bis 4:40 Uhr zu Streckensperrungen auf der Stammstrecke. Weitere Einzelheiten entnehmen sie bitte den Kalendern auf den jeweiligen Plakaten.<br /> Die Z&uuml;ge der Linie S7 und S8 verkehren w&auml;hrend dieser Zeit als einzige durch die Stammstrecke mit allen Unterwegshalten.<br /> Ab Ostbahnhof f&auml;hrt eine S-Bahn im 20-Minuten-Takt bis Pasing durch die Stammstrecke mit allen Unterwegshalten.", "subtitle":"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14143_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"http://www.s-bahn-muenchen.de/s_muenchen/view/fahrplan/baustellen_stamm.shtml", "linkText":"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke", "linkTextShort":"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"http://www.s-bahn-muenchen.de/s_muenchen/view/mdb/s_muenchen/baustellen/stammstreckensperrung/mdb_274133_100_plakat_allgemein_optimized.pdf", "linkText":"Baustellenkalender und Informationen im Ãœberblick", "linkTextShort":"Baustellenkalender und Informationen im Ãœberblick", "linkTarget":"_blank" } ] } } }, { "stopID":"1002680", "x":"11743152.11347", "y":"48394605.64989", "mapName":"WGS84", "area":"2", "platform":"10", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"4", "dateTime": { "year":"2018", "month":"7", "day":"25", "weekday":"4", "hour":"23", "minute":"15" }, "servingLine": { "key":"72", "code":"3", "number":"602", "symbol":"602", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Mainburg, Griesplatz", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19602", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19602: :R:s18" }, "operator": { "code":"1025", "name":"Bayernbus GmbH", "publicCode":"" } }, { "stopID":"1002680", "x":"11745036.00514", "y":"48395931.79824", "mapName":"WGS84", "area":"1", "platform":"6", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"14", "dateTime": { "year":"2018", "month":"7", "day":"25", "weekday":"4", "hour":"23", "minute":"25" }, "servingLine": { "key":"62", "code":"3", "number":"635", "symbol":"635", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Flughafen, Terminal 2", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"11635", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1002726", "stateless":"mvv:11635: :H:s18" }, "operator": { "code":"1011", "name":"Regionalverkehr Obb.", "publicCode":"" } }, { "stopID":"1002680", "x":"11744594.24217", "y":"48395157.42459", "mapName":"WGS84", "area":"22", "platform":"Gl3-S", "platformName":"Gleis 3", "stopName":"Freising", "nameWO":"Freising", "countdown":"23", "dateTime": { "year":"2018", "month":"7", "day":"25", "weekday":"4", "hour":"23", "minute":"34" }, "servingLine": { "key":"243", "code":"2", "number":"S1", "symbol":"S1", "motType":"1", "mtSubcode":"0", "realtime":"0", "direction":"Ostbahnhof", "directionFrom":"Freising", "name":"S-Bahn", "liErgRiProj": { "line":"01001", "project":"s18", "direction":"H", "supplement":"B", "network":"mvv" }, "destID":"-1", "stateless":"mvv:01001:B:H:s18" }, "operator": { "code":"01", "name":"DB Regio AG / S-Bahn München", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14143_MVV&seqID=2", "infoText": { "content":"Aufgrund der Vorbereitungsarbeiten zur 2. Stammstrecke kommt es von 11. Juli bis 12. Oktober 2018 in verschiedenen N&auml;chten jeweils von 22:40 bis 4:40 Uhr zu Streckensperrungen auf der Stammstrecke. Weitere Einzelheiten entnehmen sie bitte den Kalendern auf den jeweiligen Plakaten.<br /> Die Z&uuml;ge der Linie S7 und S8 verkehren w&auml;hrend dieser Zeit als einzige durch die Stammstrecke mit allen Unterwegshalten.<br /> Ab Ostbahnhof f&auml;hrt eine S-Bahn im 20-Minuten-Takt bis Pasing durch die Stammstrecke mit allen Unterwegshalten.", "subtitle":"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14143_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"http://www.s-bahn-muenchen.de/s_muenchen/view/fahrplan/baustellen_stamm.shtml", "linkText":"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke", "linkTextShort":"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"http://www.s-bahn-muenchen.de/s_muenchen/view/mdb/s_muenchen/baustellen/stammstreckensperrung/mdb_274133_100_plakat_allgemein_optimized.pdf", "linkText":"Baustellenkalender und Informationen im Ãœberblick", "linkTextShort":"Baustellenkalender und Informationen im Ãœberblick", "linkTarget":"_blank" } ] } } }, { "stopID":"1002680", "x":"11745036.00514", "y":"48395931.79824", "mapName":"WGS84", "area":"1", "platform":"6", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"34", "dateTime": { "year":"2018", "month":"7", "day":"25", "weekday":"4", "hour":"23", "minute":"45" }, "servingLine": { "key":"4", "code":"3", "number":"635", "symbol":"635", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Flughafen, Terminal 2", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"11635", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1002726", "stateless":"mvv:11635: :H:s18" }, "operator": { "code":"1011", "name":"Regionalverkehr Obb.", "publicCode":"" } }, { "stopID":"1002680", "x":"11744052.74867", "y":"48395426.01341", "mapName":"WGS84", "area":"2", "platform":"4", "platformName":"4", "stopName":"Freising", "nameWO":"Freising", "pointType":"Gleis", "countdown":"39", "dateTime": { "year":"2018", "month":"7", "day":"25", "weekday":"4", "hour":"23", "minute":"50" }, "servingLine": { "key":"4092", "code":"6", "number":"RE 4092 Regional-Express", "symbol":"", "motType":"0", "mtSubcode":"0", "realtime":"0", "direction":"Passau Hbf", "directionFrom":"München Hbf (Gl. 5-36)", "trainType":"RE", "trainName":"Regional-Express", "trainNum":"4092", "name":"Regional-Express", "liErgRiProj": { "line":"90931", "project":"j18", "direction":"R", "supplement":" ", "network":"ddb" }, "destID":"80001055", "stateless":"ddb:90931: :R:j18" }, "operator": { "code":"00", "name":"DB AG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745318.37567", "y":"48396175.23257", "mapName":"WGS84", "area":"1", "platform":"2", "platformName":"2", "stopName":"Freising", "nameWO":"Freising", "pointType":"Gleis", "countdown":"46", "dateTime": { "year":"2018", "month":"7", "day":"25", "weekday":"4", "hour":"23", "minute":"57" }, "servingLine": { "key":"4869", "code":"6", "number":"RE 4869 Regional-Express", "symbol":"", "motType":"0", "mtSubcode":"0", "realtime":"0", "direction":"München Hbf (Gl. 5-36)", "directionFrom":"Nürnberg Hbf", "trainType":"RE", "trainName":"Regional-Express", "trainNum":"4869", "name":"Regional-Express", "liErgRiProj": { "line":"90930", "project":"j18", "direction":"H", "supplement":" ", "network":"ddb" }, "destID":"1000100", "stateless":"ddb:90930: :H:j18" }, "operator": { "code":"00", "name":"DB AG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745036.00514", "y":"48395931.79824", "mapName":"WGS84", "area":"1", "platform":"6", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"54", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"0", "minute":"5" }, "servingLine": { "key":"5", "code":"3", "number":"635", "symbol":"635", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Flughafen, Terminal 2", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"11635", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1002726", "stateless":"mvv:11635: :H:s18" }, "operator": { "code":"1011", "name":"Regionalverkehr Obb.", "publicCode":"" } }, { "stopID":"1002680", "x":"11744594.24217", "y":"48395157.42459", "mapName":"WGS84", "area":"22", "platform":"Gl3-S", "platformName":"Gleis 3", "stopName":"Freising", "nameWO":"Freising", "countdown":"63", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"0", "minute":"14" }, "servingLine": { "key":"246", "code":"2", "number":"S1", "symbol":"S1", "motType":"1", "mtSubcode":"0", "realtime":"0", "direction":"Ostbahnhof", "directionFrom":"Freising", "name":"S-Bahn", "liErgRiProj": { "line":"01001", "project":"s18", "direction":"H", "supplement":"B", "network":"mvv" }, "destID":"-1", "stateless":"mvv:01001:B:H:s18" }, "operator": { "code":"01", "name":"DB Regio AG / S-Bahn München", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14143_MVV&seqID=2", "infoText": { "content":"Aufgrund der Vorbereitungsarbeiten zur 2. Stammstrecke kommt es von 11. Juli bis 12. Oktober 2018 in verschiedenen N&auml;chten jeweils von 22:40 bis 4:40 Uhr zu Streckensperrungen auf der Stammstrecke. Weitere Einzelheiten entnehmen sie bitte den Kalendern auf den jeweiligen Plakaten.<br /> Die Z&uuml;ge der Linie S7 und S8 verkehren w&auml;hrend dieser Zeit als einzige durch die Stammstrecke mit allen Unterwegshalten.<br /> Ab Ostbahnhof f&auml;hrt eine S-Bahn im 20-Minuten-Takt bis Pasing durch die Stammstrecke mit allen Unterwegshalten.", "subtitle":"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14143_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"http://www.s-bahn-muenchen.de/s_muenchen/view/fahrplan/baustellen_stamm.shtml", "linkText":"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke", "linkTextShort":"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"http://www.s-bahn-muenchen.de/s_muenchen/view/mdb/s_muenchen/baustellen/stammstreckensperrung/mdb_274133_100_plakat_allgemein_optimized.pdf", "linkText":"Baustellenkalender und Informationen im Ãœberblick", "linkTextShort":"Baustellenkalender und Informationen im Ãœberblick", "linkTarget":"_blank" } ] } } }, { "stopID":"1002680", "x":"11745036.00514", "y":"48395931.79824", "mapName":"WGS84", "area":"1", "platform":"6", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"74", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"0", "minute":"25" }, "servingLine": { "key":"63", "code":"3", "number":"635", "symbol":"635", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Flughafen, Terminal 2", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"11635", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1002726", "stateless":"mvv:11635: :H:s18" }, "operator": { "code":"1011", "name":"Regionalverkehr Obb.", "publicCode":"" } }, { "stopID":"1002680", "x":"11744052.74867", "y":"48395426.01341", "mapName":"WGS84", "area":"2", "platform":"4", "platformName":"4", "stopName":"Freising", "nameWO":"Freising", "pointType":"Gleis", "countdown":"78", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"0", "minute":"29" }, "servingLine": { "key":"18585", "code":"6", "number":"ALX 84121 alex - Die Länderbahn GmbH DLB", "symbol":"", "motType":"0", "mtSubcode":"0", "realtime":"0", "direction":"Regensburg Hbf", "directionFrom":"München Hbf (Gl. 5-36)", "trainType":"ALX", "trainName":"alex - Die Länderbahn GmbH DLB", "trainNum":"84121", "name":"alex - Die Länderbahn GmbH DLB", "liErgRiProj": { "line":"90930", "project":"j18", "direction":"R", "supplement":"C", "network":"ddb" }, "destID":"80001083", "stateless":"ddb:90930:C:R:j18" }, "operator": { "code":"A8", "name":"alex - Länderbahn und Vogtlandbahn GmbH", "publicCode":"" } }, { "stopID":"1002680", "x":"11745116.71417", "y":"48395994.92750", "mapName":"WGS84", "area":"1", "platform":"5", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"290", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"4", "minute":"1" }, "servingLine": { "key":"49", "code":"3", "number":"622", "symbol":"622", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Freising (S) [P+R] ü. Erdinger Straße", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19622", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19622: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745036.00514", "y":"48395931.79824", "mapName":"WGS84", "area":"1", "platform":"6", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"294", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"4", "minute":"5" }, "servingLine": { "key":"7", "code":"3", "number":"635", "symbol":"635", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Flughafen, Terminal 2", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"11635", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1002726", "stateless":"mvv:11635: :H:s18" }, "operator": { "code":"1011", "name":"Regionalverkehr Obb.", "publicCode":"" } }, { "stopID":"1002680", "x":"11745116.71417", "y":"48395994.92750", "mapName":"WGS84", "area":"1", "platform":"5", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"309", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"4", "minute":"20" }, "servingLine": { "key":"1", "code":"3", "number":"620", "symbol":"620", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Waldfriedhof ü. Berufsschule", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19620", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19620: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745036.00514", "y":"48395931.79824", "mapName":"WGS84", "area":"1", "platform":"6", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"314", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"4", "minute":"25" }, "servingLine": { "key":"1", "code":"3", "number":"635", "symbol":"635", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Flughafen, Terminal 2", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"11635", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1002726", "stateless":"mvv:11635: :H:s18" }, "operator": { "code":"1011", "name":"Regionalverkehr Obb.", "publicCode":"" } }, { "stopID":"1002680", "x":"11745183.91958", "y":"48396058.02685", "mapName":"WGS84", "area":"1", "platform":"4", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"323", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"4", "minute":"34" }, "servingLine": { "key":"1", "code":"3", "number":"621", "symbol":"621", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Waldfriedhof ü. Neustift", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19621", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19621: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745036.00514", "y":"48395931.79824", "mapName":"WGS84", "area":"1", "platform":"6", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"334", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"4", "minute":"45" }, "servingLine": { "key":"8", "code":"3", "number":"635", "symbol":"635", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Flughafen, Terminal 2", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"11635", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1002726", "stateless":"mvv:11635: :H:s18" }, "operator": { "code":"1011", "name":"Regionalverkehr Obb.", "publicCode":"" } }, { "stopID":"1002680", "x":"11744594.24217", "y":"48395157.42459", "mapName":"WGS84", "area":"22", "platform":"Gl3-S", "platformName":"Gleis 3", "stopName":"Freising", "nameWO":"Freising", "countdown":"345", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"4", "minute":"56" }, "servingLine": { "key":"181", "code":"2", "number":"S1", "symbol":"S1", "motType":"1", "mtSubcode":"0", "realtime":"0", "direction":"Ostbahnhof", "directionFrom":"Freising", "name":"S-Bahn", "liErgRiProj": { "line":"01001", "project":"s18", "direction":"H", "supplement":"B", "network":"mvv" }, "destID":"1000005", "stateless":"mvv:01001:B:H:s18" }, "operator": { "code":"01", "name":"DB Regio AG / S-Bahn München", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14143_MVV&seqID=2", "infoText": { "content":"Aufgrund der Vorbereitungsarbeiten zur 2. Stammstrecke kommt es von 11. Juli bis 12. Oktober 2018 in verschiedenen N&auml;chten jeweils von 22:40 bis 4:40 Uhr zu Streckensperrungen auf der Stammstrecke. Weitere Einzelheiten entnehmen sie bitte den Kalendern auf den jeweiligen Plakaten.<br /> Die Z&uuml;ge der Linie S7 und S8 verkehren w&auml;hrend dieser Zeit als einzige durch die Stammstrecke mit allen Unterwegshalten.<br /> Ab Ostbahnhof f&auml;hrt eine S-Bahn im 20-Minuten-Takt bis Pasing durch die Stammstrecke mit allen Unterwegshalten.", "subtitle":"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14143_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"http://www.s-bahn-muenchen.de/s_muenchen/view/fahrplan/baustellen_stamm.shtml", "linkText":"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke", "linkTextShort":"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"http://www.s-bahn-muenchen.de/s_muenchen/view/mdb/s_muenchen/baustellen/stammstreckensperrung/mdb_274133_100_plakat_allgemein_optimized.pdf", "linkText":"Baustellenkalender und Informationen im Ãœberblick", "linkTextShort":"Baustellenkalender und Informationen im Ãœberblick", "linkTarget":"_blank" } ] } } }, { "stopID":"1002680", "x":"11745116.71417", "y":"48395994.92750", "mapName":"WGS84", "area":"1", "platform":"5", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"348", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"4", "minute":"59" }, "servingLine": { "key":"2", "code":"3", "number":"620", "symbol":"620", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Waldfriedhof ü. Berufsschule", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19620", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19620: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745116.71417", "y":"48395994.92750", "mapName":"WGS84", "area":"1", "platform":"5", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"349", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"0" }, "servingLine": { "key":"50", "code":"3", "number":"622", "symbol":"622", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Freising (S) [P+R] ü. Erdinger Straße", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19622", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19622: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745036.00514", "y":"48395931.79824", "mapName":"WGS84", "area":"1", "platform":"6", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"354", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"5" }, "servingLine": { "key":"9", "code":"3", "number":"635", "symbol":"635", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Flughafen, Terminal 2", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"11635", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1002726", "stateless":"mvv:11635: :H:s18" }, "operator": { "code":"1011", "name":"Regionalverkehr Obb.", "publicCode":"" } }, { "stopID":"1002680", "x":"11744052.74867", "y":"48395426.01341", "mapName":"WGS84", "area":"2", "platform":"4", "platformName":"4", "stopName":"Freising", "nameWO":"Freising", "pointType":"Gleis", "countdown":"357", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"8" }, "servingLine": { "key":"351", "code":"6", "number":"ALX 351 alex - Die Länderbahn GmbH DLB", "symbol":"", "motType":"0", "mtSubcode":"0", "realtime":"0", "direction":"Furth im Wald", "directionFrom":"München Hbf (Gl. 5-36)", "trainType":"ALX", "trainName":"alex - Die Länderbahn GmbH DLB", "trainNum":"351", "name":"alex - Die Länderbahn GmbH DLB", "liErgRiProj": { "line":"90930", "project":"j18", "direction":"R", "supplement":"A", "network":"ddb" }, "destID":"80000944", "stateless":"ddb:90930:A:R:j18" }, "operator": { "code":"A8", "name":"alex - Länderbahn und Vogtlandbahn GmbH", "publicCode":"" } }, { "stopID":"1002680", "x":"11745251.12515", "y":"48396121.12617", "mapName":"WGS84", "area":"1", "platform":"3", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"357", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"8" }, "servingLine": { "key":"1", "code":"3", "number":"630", "symbol":"630", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Kleine Wies", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19630", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19630: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745318.37567", "y":"48396175.23257", "mapName":"WGS84", "area":"1", "platform":"2", "platformName":"2", "stopName":"Freising", "nameWO":"Freising", "pointType":"Gleis", "countdown":"357", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"8" }, "servingLine": { "key":"59231", "code":"6", "number":"RB 59231 Regionalbahn", "symbol":"", "motType":"0", "mtSubcode":"0", "realtime":"0", "direction":"München Hbf (Gl. 5-36)", "directionFrom":"Landshut (Bay) Hbf", "trainType":"RB", "trainName":"Regionalbahn", "trainNum":"59231", "name":"Regionalbahn", "liErgRiProj": { "line":"90931", "project":"j18", "direction":"H", "supplement":" ", "network":"ddb" }, "destID":"1000100", "stateless":"ddb:90931: :H:j18" }, "operator": { "code":"00", "name":"DB AG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745183.91958", "y":"48396058.02685", "mapName":"WGS84", "area":"1", "platform":"4", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"359", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"10" }, "servingLine": { "key":"2", "code":"3", "number":"621", "symbol":"621", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Waldfriedhof ü. Neustift", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19621", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19621: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745318.37567", "y":"48396175.23257", "mapName":"WGS84", "area":"1", "platform":"2", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"359", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"10" }, "servingLine": { "key":"92", "code":"3", "number":"638", "symbol":"638", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Fraunhofer-Institut ü. Weihenstephan", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19638", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19638: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11744914.87469", "y":"48395850.59358", "mapName":"WGS84", "area":"1", "platform":"7", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"374", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"25" }, "servingLine": { "key":"21", "code":"3", "number":"633", "symbol":"633", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Gutenbergstraße", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19633", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19633: :R:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745036.00514", "y":"48395931.79824", "mapName":"WGS84", "area":"1", "platform":"6", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"374", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"25" }, "servingLine": { "key":"10", "code":"3", "number":"635", "symbol":"635", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Flughafen, Terminal 2", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"11635", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1002726", "stateless":"mvv:11635: :H:s18" }, "operator": { "code":"1011", "name":"Regionalverkehr Obb.", "publicCode":"" } }, { "stopID":"1002680", "x":"11745116.71417", "y":"48395994.92750", "mapName":"WGS84", "area":"1", "platform":"5", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"378", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"29" }, "servingLine": { "key":"3", "code":"3", "number":"620", "symbol":"620", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Waldfriedhof ü. Berufsschule", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19620", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19620: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745251.12515", "y":"48396121.12617", "mapName":"WGS84", "area":"1", "platform":"3", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"380", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"31" }, "servingLine": { "key":"1", "code":"3", "number":"631", "symbol":"631", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Kleine Wies ü. Seniorenzentrum", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19631", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19631: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745116.71417", "y":"48395994.92750", "mapName":"WGS84", "area":"1", "platform":"5", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"380", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"31" }, "servingLine": { "key":"51", "code":"3", "number":"622", "symbol":"622", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Freising (S) [P+R] ü. Erdinger Straße", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19622", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19622: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745183.91958", "y":"48396058.02685", "mapName":"WGS84", "area":"1", "platform":"4", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"383", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"34" }, "servingLine": { "key":"3", "code":"3", "number":"621", "symbol":"621", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Waldfriedhof ü. Neustift", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19621", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19621: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11745318.37567", "y":"48396175.23257", "mapName":"WGS84", "area":"1", "platform":"2", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"385", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"36" }, "servingLine": { "key":"93", "code":"3", "number":"638", "symbol":"638", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Fraunhofer-Institut ü. Weihenstephan", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19638", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19638: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11744594.24217", "y":"48395157.42459", "mapName":"WGS84", "area":"22", "platform":"Gl3-S", "platformName":"Gleis 3", "stopName":"Freising", "nameWO":"Freising", "countdown":"385", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"36" }, "servingLine": { "key":"336", "code":"2", "number":"S1", "symbol":"S1", "motType":"1", "mtSubcode":"0", "realtime":"0", "direction":"Ostbahnhof", "directionFrom":"Freising", "name":"S-Bahn", "liErgRiProj": { "line":"01001", "project":"s18", "direction":"H", "supplement":"B", "network":"mvv" }, "destID":"1000005", "stateless":"mvv:01001:B:H:s18" }, "operator": { "code":"01", "name":"DB Regio AG / S-Bahn München", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14143_MVV&seqID=2", "infoText": { "content":"Aufgrund der Vorbereitungsarbeiten zur 2. Stammstrecke kommt es von 11. Juli bis 12. Oktober 2018 in verschiedenen N&auml;chten jeweils von 22:40 bis 4:40 Uhr zu Streckensperrungen auf der Stammstrecke. Weitere Einzelheiten entnehmen sie bitte den Kalendern auf den jeweiligen Plakaten.<br /> Die Z&uuml;ge der Linie S7 und S8 verkehren w&auml;hrend dieser Zeit als einzige durch die Stammstrecke mit allen Unterwegshalten.<br /> Ab Ostbahnhof f&auml;hrt eine S-Bahn im 20-Minuten-Takt bis Pasing durch die Stammstrecke mit allen Unterwegshalten.", "subtitle":"S1, S2, S3, S4, S6, S8 - Nächte 11. Juli bis 12. Oktober 2018 (jeweils 22.40 bis 4.40 Uhr) - Vorbereitungsarbeiten zur 2. Stammstrecke", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14143_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"http://www.s-bahn-muenchen.de/s_muenchen/view/fahrplan/baustellen_stamm.shtml", "linkText":"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke", "linkTextShort":"Sonderseite der S-Bahn München zu Bauarbeiten auf der Stammstrecke", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"http://www.s-bahn-muenchen.de/s_muenchen/view/mdb/s_muenchen/baustellen/stammstreckensperrung/mdb_274133_100_plakat_allgemein_optimized.pdf", "linkText":"Baustellenkalender und Informationen im Ãœberblick", "linkTextShort":"Baustellenkalender und Informationen im Ãœberblick", "linkTarget":"_blank" } ] } } }, { "stopID":"1002680", "x":"11745251.12515", "y":"48396121.12617", "mapName":"WGS84", "area":"1", "platform":"3", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"389", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"40" }, "servingLine": { "key":"2", "code":"3", "number":"630", "symbol":"630", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Kleine Wies", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19630", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19630: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11744914.87469", "y":"48395850.59358", "mapName":"WGS84", "area":"1", "platform":"7", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"389", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"40" }, "servingLine": { "key":"37", "code":"3", "number":"633", "symbol":"633", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Marzling ü. Kammergasse", "directionFrom":"Freising, Gutenbergstraße", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19633", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19633: :H:s18" }, "operator": { "code":"1081", "name":"PVG", "publicCode":"" } }, { "stopID":"1002680", "x":"11743232.81808", "y":"48394668.78047", "mapName":"WGS84", "area":"2", "platform":"9", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"392", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"43" }, "servingLine": { "key":"13", "code":"3", "number":"691", "symbol":"691", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Neufahrn (S)", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"11691", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:11691: :H:s18" }, "operator": { "code":"1011", "name":"Regionalverkehr Obb.", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"MVV-Regionalbus Linien 691, 692, 698 - Erneute Fahrplananpassungen wg.\\nBauarbeiten FS12 bei Hallbergmoos\\nab 09.06.2018 bis vsl. 26.10.2018", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13731_MVV&seqID=1", "infoText": { "content":"Die Bauarbeiten an der FS12 bei Hallbergmoos treten in die n&auml;chste Phase. Auf den Linien<br />691, 692 und 698 kommt es deshalb ab Sa, den 09.06.2018 bis voraussichtlich Fr, den<br />26.10.2018 zu umfangreichen Fahrplananpassungen mit z.T. deutlichen Auswirkungen auf<br />Linienf&uuml;hrung, Abfahrtszeiten und Anschlussbeziehungen.<br /><br />Die Linie 698 Ortsverkehr Hallbergmoos verkehrt im oben genannten Zeitraum im 40-Min.-<br />Takt mit ge&auml;nderter Linienf&uuml;hrung &uuml;ber Ludwigstr. - Theresienstr. - Auenstr. - Maximilianstr. -<br />Predazzoallee - Dornierstr. - Zeppelinstra&szlig;e. Zus&auml;tzlich werden acht Verst&auml;rkerfahrten<br />durchgef&uuml;hrt, die u.a. die Haltestellen Rosenstr., Tannenweg u. Mittermeierweg im s&uuml;dl.<br />Ortsbereich bedienen. Die Fahrten der Linie 698 zwischen Hallbergmoos (S) und dem<br />Gewerbegebiet MABP verkehren ohne &Auml;nderung nach dem Regelfahrplan.<br /><br />Die Linie 692 bef&auml;hrt gegenl&auml;ufig zum Ortsverkehr der Linie 698 im 40-Min.-Takt den<br />Linienweg Dornierstr. - Predazzoallee - Maximilianstr. - Auenstr. - Theresienstr. - Ludwigstra&szlig;e.<br /><br />Die Line 691 verkehrt zwischen Hallbergmoos, Rathaus und Hallbergmoos (S) &uuml;ber Auenstr. -<br />Maximilianstr. - Predazzoallee - Dornierstra&szlig;e. In Richtung Hallbergmoos (S) wird zus&auml;tzlich<br />der Abschnitt Zeppelinstr. - Ludwigstr. befahren. Bei den schult&auml;glichen Verst&auml;rkerfahrten in<br />Richtung Neufahrn erfolgt eine Umkehrung der gewohnten Bedienungsreihenfolge. Statt<br />morgens im n&ouml;rdlichen Ortsbereich von Hallbergmoos, starten die Busse die Bedienung nun<br />im S&uuml;den. D.h. die Abfahrten an den Haltestellen in Hallbergmoos finden somit z.T. einige<br />Minuten fr&uuml;her und zudem auf der gegen&uuml;berliegenden Stra&szlig;enseite statt.", "subtitle":"MVV-Regionalbus Linien 691, 692, 698 - Erneute Fahrplananpassungen wg.\\nBauarbeiten FS12 bei Hallbergmoos\\nab 09.06.2018 bis vsl. 26.10.2018", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"13731_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"1", "edit":"0" } ] } } }, { "stopID":"1002680", "x":"11745036.00514", "y":"48395931.79824", "mapName":"WGS84", "area":"1", "platform":"6", "platformName":"", "stopName":"Freising", "nameWO":"Freising", "countdown":"394", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"45" }, "servingLine": { "key":"11", "code":"3", "number":"635", "symbol":"635", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Flughafen, Terminal 2", "directionFrom":"Freising", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"11635", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1002726", "stateless":"mvv:11635: :H:s18" }, "operator": { "code":"1011", "name":"Regionalverkehr Obb.", "publicCode":"" } }, { "stopID":"1002680", "x":"11745318.37567", "y":"48396175.23257", "mapName":"WGS84", "area":"1", "platform":"2", "platformName":"2", "stopName":"Freising", "nameWO":"Freising", "pointType":"Gleis", "countdown":"397", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"48" }, "servingLine": { "key":"18584", "code":"6", "number":"ALX 84120 alex - Die Länderbahn GmbH DLB", "symbol":"", "motType":"0", "mtSubcode":"0", "realtime":"0", "direction":"München Hbf (Gl. 5-36)", "directionFrom":"Schwandorf", "trainType":"ALX", "trainName":"alex - Die Länderbahn GmbH DLB", "trainNum":"84120", "name":"alex - Die Länderbahn GmbH DLB", "liErgRiProj": { "line":"90930", "project":"j18", "direction":"H", "supplement":"A", "network":"ddb" }, "destID":"1000100", "stateless":"ddb:90930:A:H:j18" }, "operator": { "code":"A8", "name":"alex - Länderbahn und Vogtlandbahn GmbH", "publicCode":"" } } ] }
\ No newline at end of file
diff --git a/app/src/test/resources/mvv/multiValueResult2.json b/app/src/test/resources/mvv/multiValueResult2.json
new file mode 100644
index 0000000000..dec1d2b597
--- /dev/null
+++ b/app/src/test/resources/mvv/multiValueResult2.json
@@ -0,0 +1 @@
+{ "parameters": [ { "name":"serverID", "value":"WEB3_" }, { "name":"requestID", "value":"0" }, { "name":"sessionID", "value":"0" }, { "name":"calcTime", "value":"133.123" } ], "dm": { "input": { "input":"Garching (b München), Garching, Forschungszentrum" }, "points": { "point": { "usage":"dm", "type":"any", "name":"Garching (b München), Garching, Forschungszentrum", "stateless":"1000460", "anyType":"stop", "sort":"2", "quality":"100000", "best":"0", "object":"Garching, Forschungszentrum", "ref": { "id":"1000460", "gid":"de:09184:460", "omc":"9184119", "placeID":"1", "place":"Garching (b München)", "coords":"11671228.33979,48264859.55499" }, "infos": null, "hasStaticInfo":"1" } }, "itdOdvAssignedStops": { "stopID":"1000460", "name":"Garching, Forschungszentrum", "x":"11671228.33979", "y":"48264859.55499", "mapName":"WGS84", "value":"1000460:Garching, Forschungszentrum", "place":"Garching (b München)", "nameWithPlace":"Garching, Forschungszentrum", "distanceTime":"0", "isTransferStop":"0", "hasStaticInfo":"1", "vm":"100", "gid":"de:09184:460" } }, "arr": { "input": { "input":"" }, "points": null }, "dateTime": { "deparr":"dep", "ttpFrom":"20171210", "ttpTo":"20181208", "year":"2018", "month":"7", "day":"25", "hour":"23", "minute":"8" }, "dateRange": [ { "day":"25", "month":"07", "year":"2018", "weekday":"4" }, { "day":"26", "month":"07", "year":"2018", "weekday":"5" }, { "day":"27", "month":"07", "year":"2018", "weekday":"6" }, { "day":"28", "month":"07", "year":"2018", "weekday":"7" }, { "day":"29", "month":"07", "year":"2018", "weekday":"1" }, { "day":"30", "month":"07", "year":"2018", "weekday":"2" }, { "day":"31", "month":"07", "year":"2018", "weekday":"3" }, { "day":"01", "month":"08", "year":"2018", "weekday":"4" }, { "day":"02", "month":"08", "year":"2018", "weekday":"5" }, { "day":"03", "month":"08", "year":"2018", "weekday":"6" }, { "day":"04", "month":"08", "year":"2018", "weekday":"7" }, { "day":"05", "month":"08", "year":"2018", "weekday":"1" }, { "day":"06", "month":"08", "year":"2018", "weekday":"2" }, { "day":"07", "month":"08", "year":"2018", "weekday":"3" }, { "day":"08", "month":"08", "year":"2018", "weekday":"4" } ], "option": { "ptOption": { "active":"1", "maxChanges":"11", "maxTime":"360", "maxWait":"120", "routeType":"LEASTTIME", "changeSpeed":"normal", "lineRestriction":"400", "useProxFootSearch":"0", "useProxFootSearchOrigin":"0", "useProxFootSearchDestination":"0", "bike":"0", "plane":"0", "noCrowded":"0", "noSolidStairs":"0", "noEscalators":"0", "noElevators":"0", "lowPlatformVhcl":"0", "wheelchair":"0", "needElevatedPlt":"0", "assistance":"0", "SOSAvail":"0", "noLonelyTransfer":"0", "illumTransfer":"0", "overgroundTransfer":"0", "noInsecurePlaces":"0", "privateTransport":"0", "excludedMeans": [ { "means":"Zug", "value":"0", "selected":"0" }, { "means":"S-Bahn", "value":"1", "selected":"0" }, { "means":"U-Bahn", "value":"2", "selected":"0" }, { "means":"Stadtbahn", "value":"3", "selected":"0" }, { "means":"Straßen-/Trambahn", "value":"4", "selected":"0" }, { "means":"Stadtbus", "value":"5", "selected":"0" }, { "means":"Regionalbus", "value":"6", "selected":"0" }, { "means":"Schnellbus", "value":"7", "selected":"0" }, { "means":"Seil-/Zahnradbahn", "value":"8", "selected":"0" }, { "means":"Schiff", "value":"9", "selected":"0" }, { "means":"AST/Rufbus", "value":"10", "selected":"0" }, { "means":"Sonstige", "value":"11", "selected":"0" }, { "means":"Flugzeug", "value":"12", "selected":"0" }, { "means":"Zug (Nahverkehr)", "value":"13", "selected":"0" }, { "means":"Zug (Fernverkehr)", "value":"14", "selected":"0" }, { "means":"Zug (Fernverkehr mit", "value":"15", "selected":"0" }, { "means":"Zug (Fernverkehr mit", "value":"16", "selected":"0" }, { "means":"Schienenersatzverkeh", "value":"17", "selected":"0" }, { "means":"Zug Shuttle", "value":"18", "selected":"0" }, { "means":"Bürgerbus", "value":"19", "selected":"0" } ], "activeImp":"-1", "activeCom":"-1", "activeSec":"-1" } }, "servingLines": { "lines": [ { "mode": { "name":"U-Bahn U6", "number":"U6", "product":"U-Bahn", "productId":"1", "type":"2", "mtSubcode":"0", "code":"1", "destination":"Klinikum Großhadern", "destID":"1001540", "desc":"Garching-Forschungsz. - Fröttmaning - Münchner Freiheit - Odeonspl. - Marienplatz - Sendlinger Tor - Harras - Klinikum Großhadern", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"21", "line":"21006", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:21006: :H:s18", "operator":"SWM/MVG, 0800/344226600", "opCode":"23", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "attrs": [  ] } }, "index":"2:0" }, { "mode": { "name":"MVV-Regionalbus 230", "number":"230", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Ismaning, Carl-Zeiss-Ring", "destID":"1009292", "desc":"Garching, Forschungszentrum  - Garching   - Ismaning  - Fischerhäuser", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19230", "supplement":" ", "dir":"R", "project":"s18", "network":"mvv", "stateless":"mvv:19230: :R:s18", "operator":"VBR GmbH, München", "opCode":"1097", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:0" }, { "mode": { "name":"MVV-Regionalbus 292", "number":"292", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Oberschl., Sonnenstraße", "destID":"1002021", "desc":"Garching-Forschungszentrum  - Garching  -  Garching-Hochbrück  - Oberschleißheim  - Sonnenstraße", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"19", "line":"19292", "supplement":" ", "dir":"H", "project":"s18", "network":"mvv", "stateless":"mvv:19292: :H:s18", "operator":"Boos/Hadersdorfer/Scharf", "opCode":"1172", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "attrs": [  ] } }, "index":"6:1" }, { "mode": { "name":"MVV-Regionalbus 690", "number":"690", "product":"MVV-Regionalbus", "productId":"4", "type":"6", "mtSubcode":"0", "code":"3", "destination":"Eching (S) Ost", "destID":"1002747", "desc":"Garching, Forschungszentrum - Neufahrn - Eching Ost", "timetablePeriod":"Fahrplan (2018)", "diva": { "branch":"74", "line":"74690", "supplement":" ", "dir":"R", "project":"s18", "network":"mvv", "stateless":"mvv:74690: :R:s18", "operator":"VGM Boos/Haders./RVO", "opCode":"1074", "vF":"20171210", "vTo":"20181208", "isTTB":"1", "isSTT":"1", "isROP":"1", "attrs": [  ] } }, "index":"6:2" } ] }, "departureList": [ { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"5", "dateTime": { "year":"2018", "month":"7", "day":"25", "weekday":"4", "hour":"23", "minute":"13" }, "servingLine": { "key":"379", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"12", "dateTime": { "year":"2018", "month":"7", "day":"25", "weekday":"4", "hour":"23", "minute":"20" }, "servingLine": { "key":"153", "code":"3", "number":"292", "symbol":"292", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Oberschleißheim, Sonnenstraße", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19292", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19292: :H:s18" }, "operator": { "code":"1172", "name":"Boos/Hadersdorfer/Scharf", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2", "infoText": { "content":"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\"Garching-</strong><strong>Hochbr&uuml;ck\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\" target=\"_blank\">Haltestellenpositionen \"Garching-Hochbr&uuml;ck\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\"Gewerbegebiet\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \"Graf-Zeppelin-Platz\" aus.", "subtitle":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"13827_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ] } } }, { "stopID":"1000460", "x":"11671187.47172", "y":"48264931.38387", "mapName":"WGS84", "area":"30", "platform":"2", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"23", "dateTime": { "year":"2018", "month":"7", "day":"25", "weekday":"4", "hour":"23", "minute":"31" }, "servingLine": { "key":"207", "code":"3", "number":"230", "symbol":"230", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Ismaning, Hirtgrasstraße", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19230", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"1002087", "stateless":"mvv:19230: :R:s18" }, "operator": { "code":"1097", "name":"VBR GmbH, München", "publicCode":"" } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"25", "dateTime": { "year":"2018", "month":"7", "day":"25", "weekday":"4", "hour":"23", "minute":"33" }, "servingLine": { "key":"380", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"45", "dateTime": { "year":"2018", "month":"7", "day":"25", "weekday":"4", "hour":"23", "minute":"53" }, "servingLine": { "key":"381", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"65", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"0", "minute":"13" }, "servingLine": { "key":"382", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"98", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"0", "minute":"46" }, "servingLine": { "key":"646", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Münchner Freiheit", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1000500", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"148", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"1", "minute":"36" }, "servingLine": { "key":"651", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Kieferngarten", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1000430", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"353", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"1" }, "servingLine": { "key":"238", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"372", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"20" }, "servingLine": { "key":"103", "code":"3", "number":"292", "symbol":"292", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Oberschleißheim, Sonnenstraße", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19292", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19292: :H:s18" }, "operator": { "code":"1172", "name":"Boos/Hadersdorfer/Scharf", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2", "infoText": { "content":"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\"Garching-</strong><strong>Hochbr&uuml;ck\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\" target=\"_blank\">Haltestellenpositionen \"Garching-Hochbr&uuml;ck\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\"Gewerbegebiet\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \"Graf-Zeppelin-Platz\" aus.", "subtitle":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"13827_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ] } } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garching, Forschungszentrum", "nameWO":"Garching, Forschungszentrum", "countdown":"388", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"36" }, "servingLine": { "key":"2", "code":"3", "number":"690", "symbol":"690", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Eching (S) Ost", "directionFrom":"Garching, Forschungszentrum", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"74690", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:74690: :R:s18" }, "operator": { "code":"1074", "name":"VGM Boos/Haders./RVO", "publicCode":"" } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"388", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"36" }, "servingLine": { "key":"240", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"392", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"40" }, "servingLine": { "key":"104", "code":"3", "number":"292", "symbol":"292", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Oberschleißheim, Sonnenstraße", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19292", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19292: :H:s18" }, "operator": { "code":"1172", "name":"Boos/Hadersdorfer/Scharf", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2", "infoText": { "content":"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\"Garching-</strong><strong>Hochbr&uuml;ck\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\" target=\"_blank\">Haltestellenpositionen \"Garching-Hochbr&uuml;ck\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\"Gewerbegebiet\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \"Graf-Zeppelin-Platz\" aus.", "subtitle":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"13827_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ] } } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"408", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"56" }, "servingLine": { "key":"242", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garching, Forschungszentrum", "nameWO":"Garching, Forschungszentrum", "countdown":"408", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"5", "minute":"56" }, "servingLine": { "key":"3", "code":"3", "number":"690", "symbol":"690", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Eching (S) Ost", "directionFrom":"Garching, Forschungszentrum", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"74690", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:74690: :R:s18" }, "operator": { "code":"1074", "name":"VGM Boos/Haders./RVO", "publicCode":"" } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"412", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"6", "minute":"0" }, "servingLine": { "key":"105", "code":"3", "number":"292", "symbol":"292", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Oberschleißheim, Sonnenstraße", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19292", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19292: :H:s18" }, "operator": { "code":"1172", "name":"Boos/Hadersdorfer/Scharf", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2", "infoText": { "content":"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\"Garching-</strong><strong>Hochbr&uuml;ck\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\" target=\"_blank\">Haltestellenpositionen \"Garching-Hochbr&uuml;ck\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\"Gewerbegebiet\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \"Graf-Zeppelin-Platz\" aus.", "subtitle":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"13827_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ] } } }, { "stopID":"1000460", "x":"11671187.47172", "y":"48264931.38387", "mapName":"WGS84", "area":"30", "platform":"2", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"423", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"6", "minute":"11" }, "servingLine": { "key":"226", "code":"3", "number":"230", "symbol":"230", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Ismaning, Carl-Zeiss-Ring", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19230", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"1009292", "stateless":"mvv:19230: :R:s18" }, "operator": { "code":"1097", "name":"VBR GmbH, München", "publicCode":"" } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"428", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"6", "minute":"16" }, "servingLine": { "key":"244", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garching, Forschungszentrum", "nameWO":"Garching, Forschungszentrum", "countdown":"428", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"6", "minute":"16" }, "servingLine": { "key":"4", "code":"3", "number":"690", "symbol":"690", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Eching (S) Ost", "directionFrom":"Garching, Forschungszentrum", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"74690", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:74690: :R:s18" }, "operator": { "code":"1074", "name":"VGM Boos/Haders./RVO", "publicCode":"" } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"432", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"6", "minute":"20" }, "servingLine": { "key":"106", "code":"3", "number":"292", "symbol":"292", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Oberschleißheim, Sonnenstraße", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19292", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19292: :H:s18" }, "operator": { "code":"1172", "name":"Boos/Hadersdorfer/Scharf", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2", "infoText": { "content":"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\"Garching-</strong><strong>Hochbr&uuml;ck\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\" target=\"_blank\">Haltestellenpositionen \"Garching-Hochbr&uuml;ck\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\"Gewerbegebiet\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \"Graf-Zeppelin-Platz\" aus.", "subtitle":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"13827_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ] } } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"438", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"6", "minute":"26" }, "servingLine": { "key":"245", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671187.47172", "y":"48264931.38387", "mapName":"WGS84", "area":"30", "platform":"2", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"443", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"6", "minute":"31" }, "servingLine": { "key":"254", "code":"3", "number":"230", "symbol":"230", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Ismaning, Hirtgrasstraße", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19230", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"1002087", "stateless":"mvv:19230: :R:s18" }, "operator": { "code":"1097", "name":"VBR GmbH, München", "publicCode":"" } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"448", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"6", "minute":"36" }, "servingLine": { "key":"247", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garching, Forschungszentrum", "nameWO":"Garching, Forschungszentrum", "countdown":"448", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"6", "minute":"36" }, "servingLine": { "key":"5", "code":"3", "number":"690", "symbol":"690", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Eching (S) Ost", "directionFrom":"Garching, Forschungszentrum", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"74690", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:74690: :R:s18" }, "operator": { "code":"1074", "name":"VGM Boos/Haders./RVO", "publicCode":"" } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"452", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"6", "minute":"40" }, "servingLine": { "key":"107", "code":"3", "number":"292", "symbol":"292", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Oberschleißheim, Sonnenstraße", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19292", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19292: :H:s18" }, "operator": { "code":"1172", "name":"Boos/Hadersdorfer/Scharf", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2", "infoText": { "content":"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\"Garching-</strong><strong>Hochbr&uuml;ck\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\" target=\"_blank\">Haltestellenpositionen \"Garching-Hochbr&uuml;ck\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\"Gewerbegebiet\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \"Graf-Zeppelin-Platz\" aus.", "subtitle":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"13827_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ] } } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"458", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"6", "minute":"46" }, "servingLine": { "key":"248", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671187.47172", "y":"48264931.38387", "mapName":"WGS84", "area":"30", "platform":"2", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"463", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"6", "minute":"51" }, "servingLine": { "key":"227", "code":"3", "number":"230", "symbol":"230", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Ismaning, Carl-Zeiss-Ring", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19230", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"1009292", "stateless":"mvv:19230: :R:s18" }, "operator": { "code":"1097", "name":"VBR GmbH, München", "publicCode":"" } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"468", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"6", "minute":"56" }, "servingLine": { "key":"250", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garching, Forschungszentrum", "nameWO":"Garching, Forschungszentrum", "countdown":"468", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"6", "minute":"56" }, "servingLine": { "key":"6", "code":"3", "number":"690", "symbol":"690", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Eching (S) Ost", "directionFrom":"Garching, Forschungszentrum", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"74690", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:74690: :R:s18" }, "operator": { "code":"1074", "name":"VGM Boos/Haders./RVO", "publicCode":"" } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"472", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"7", "minute":"0" }, "servingLine": { "key":"108", "code":"3", "number":"292", "symbol":"292", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Oberschleißheim, Sonnenstraße", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19292", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19292: :H:s18" }, "operator": { "code":"1172", "name":"Boos/Hadersdorfer/Scharf", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2", "infoText": { "content":"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\"Garching-</strong><strong>Hochbr&uuml;ck\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\" target=\"_blank\">Haltestellenpositionen \"Garching-Hochbr&uuml;ck\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\"Gewerbegebiet\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \"Graf-Zeppelin-Platz\" aus.", "subtitle":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"13827_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ] } } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"478", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"7", "minute":"6" }, "servingLine": { "key":"251", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671187.47172", "y":"48264931.38387", "mapName":"WGS84", "area":"30", "platform":"2", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"483", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"7", "minute":"11" }, "servingLine": { "key":"228", "code":"3", "number":"230", "symbol":"230", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Ismaning, Carl-Zeiss-Ring", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19230", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"1009292", "stateless":"mvv:19230: :R:s18" }, "operator": { "code":"1097", "name":"VBR GmbH, München", "publicCode":"" } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"488", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"7", "minute":"16" }, "servingLine": { "key":"253", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garching, Forschungszentrum", "nameWO":"Garching, Forschungszentrum", "countdown":"488", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"7", "minute":"16" }, "servingLine": { "key":"7", "code":"3", "number":"690", "symbol":"690", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Eching (S) Ost", "directionFrom":"Garching, Forschungszentrum", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"74690", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:74690: :R:s18" }, "operator": { "code":"1074", "name":"VGM Boos/Haders./RVO", "publicCode":"" } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"492", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"7", "minute":"20" }, "servingLine": { "key":"109", "code":"3", "number":"292", "symbol":"292", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Oberschleißheim, Sonnenstraße", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19292", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19292: :H:s18" }, "operator": { "code":"1172", "name":"Boos/Hadersdorfer/Scharf", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2", "infoText": { "content":"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\"Garching-</strong><strong>Hochbr&uuml;ck\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\" target=\"_blank\">Haltestellenpositionen \"Garching-Hochbr&uuml;ck\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\"Gewerbegebiet\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \"Graf-Zeppelin-Platz\" aus.", "subtitle":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"13827_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ] } } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"498", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"7", "minute":"26" }, "servingLine": { "key":"254", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671187.47172", "y":"48264931.38387", "mapName":"WGS84", "area":"30", "platform":"2", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"503", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"7", "minute":"31" }, "servingLine": { "key":"255", "code":"3", "number":"230", "symbol":"230", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Ismaning, Hirtgrasstraße", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19230", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"1002087", "stateless":"mvv:19230: :R:s18" }, "operator": { "code":"1097", "name":"VBR GmbH, München", "publicCode":"" } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garching, Forschungszentrum", "nameWO":"Garching, Forschungszentrum", "countdown":"508", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"7", "minute":"36" }, "servingLine": { "key":"8", "code":"3", "number":"690", "symbol":"690", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Eching (S) Ost", "directionFrom":"Garching, Forschungszentrum", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"74690", "project":"s18", "direction":"R", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:74690: :R:s18" }, "operator": { "code":"1074", "name":"VGM Boos/Haders./RVO", "publicCode":"" } }, { "stopID":"1000460", "x":"11671363.37649", "y":"48264805.98117", "mapName":"WGS84", "area":"11", "platform":"UGarc", "platformName":"Gleis 2", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"508", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"7", "minute":"36" }, "servingLine": { "key":"256", "code":"1", "number":"U6", "symbol":"U6", "motType":"2", "mtSubcode":"0", "realtime":"0", "direction":"Klinikum Großhadern", "directionFrom":"Garch.,Forschungsz.", "name":"U-Bahn", "liErgRiProj": { "line":"21006", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"1001540", "stateless":"mvv:21006: :H:s18" }, "operator": { "code":"23", "name":"SWM/MVG, 0800/344226600", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=14107_MVV&seqID=2", "infoText": { "content":"Wegen Bauarbeiten ist der Betrieb der U-Bahnlinien U3 und U6 ab Montag, 23. April 2018 bis vsl. Anfang November 2018 erheblich eingeschr&auml;nkt. Die<strong> U3</strong> ist zwischen M&uuml;nchner Freiheit und Goetheplatz, die<strong> U6</strong> zwischen Odeonsplatz und Implerstra&szlig;e zeitweise unterbrochen. Der Abschnitt Odeonsplatz - Marienplatz - Sendlinger Tor - Goetheplatz wird in diesen F&auml;llen durch einen<strong> Pendelzug im 15-Minuten-Takt</strong> bedient. Bitte planen Sie generell mehr Fahrzeit als gewohnt ein, nutzen Sie auch andere Verbindungen (z. B. mit Bus- und Tramlinien) und rechnen Sie mit erheblichen Kapazit&auml;tsengp&auml;ssen.<br />Die genauen Sperrtermine entnehmen Sie bitte der MVG-Sonderseite zu den Bauma&szlig;nahmen:", "subtitle":"U3/U6 - Einschränkungen wegen Umbaus des U-Bahnhofs Sendlinger Tor", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"14107_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ], "additionalLinks": [ { "ID":"1", "linkURL":"https://www.mvg.de/betriebsaenderungen/2017-04-09-umbau-suse.html", "linkText":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTextShort":"MVG-Sonderseite zum Umbau des U-Bahnhofs Sendlinger Tor", "linkTarget":"_blank" }, { "ID":"2", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u3-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U3/Pendelzug bei Sperrung", "linkTarget":"_blank" }, { "ID":"3", "linkURL":"https://www.mvg.de/dam/mvg/betriebsaenderungen/2017-04-09-umbau-suse/2018-04-23-u6-sonderfahrplan.pdf", "linkText":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTextShort":"Sonderfahrplan U6/Pendelzug bei Sperrung", "linkTarget":"_blank" } ] } } }, { "stopID":"1000460", "x":"11671242.32707", "y":"48264778.65621", "mapName":"WGS84", "area":"30", "platform":"1", "platformName":"", "stopName":"Garch.,Forschungsz.", "nameWO":"Garch.,Forschungsz.", "countdown":"512", "dateTime": { "year":"2018", "month":"7", "day":"26", "weekday":"5", "hour":"7", "minute":"40" }, "servingLine": { "key":"110", "code":"3", "number":"292", "symbol":"292", "motType":"6", "mtSubcode":"0", "realtime":"0", "direction":"Oberschleißheim, Sonnenstraße", "directionFrom":"Garch.,Forschungsz.", "name":"MVV-Regionalbus", "liErgRiProj": { "line":"19292", "project":"s18", "direction":"H", "supplement":" ", "network":"mvv" }, "destID":"-1", "stateless":"mvv:19292: :H:s18" }, "operator": { "code":"1172", "name":"Boos/Hadersdorfer/Scharf", "publicCode":"" }, "stopInfos": null, "lineInfos": { "lineInfo": { "infoLinkText":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "infoLinkURL":"http://EMS-Server.mvv-muenchen.de:8100/cm/XSLT_CM_SHOWADDINFO_REQUEST?infoID=13827_MVV&seqID=2", "infoText": { "content":"<strong>Die Bauma&szlig;nahme wurde um eine Woche nach hinten verlegt.<br /><br /></strong>Aufgrund von Bauarbeiten am Bahnhof Garching-Hochbr&uuml;ck wird die MVV-Regionalbuslinie 292 im Zeitraum von 16.07.2018 bis vsl. 14.09.2018 umgeleitet.<br /><br />Die Haltestelle <strong>\"Garching-</strong><strong>Hochbr&uuml;ck\"</strong> wird in die Daimlerstra&szlig;e verlegt:<br /><a href=\"https://mvv-muenchen.de/fileadmin/mediapool/08-ICS/2018/Muenchen_Bad_Toelz/Haltestellenpositionen_Garching-Hochbrueck_Baustellenzeitraum_09.07._-_14.09.2018.pdf\" target=\"_blank\">Haltestellenpositionen \"Garching-Hochbr&uuml;ck\" w&auml;hrend der Bauphase<br /><br /></a>Die Haltestelle <strong>\"Gewerbegebiet\" </strong>kann in beiden Fahrtrichtungen nicht angefahren werden. Bitte weichen Sie auf die ersatzweise bediente Haltestelle \"Graf-Zeppelin-Platz\" aus.", "subtitle":"Bus 292 - VERSCHOBEN: Barrierefreier Ausbau \"Garching-Hochbrück\": Einschränkungen im Linienverlauf - von 16.07.2018 bis vsl. 14.09.2018", "subject":"", "additionalText":"", "htmlText":"", "wmlText":"", "smsText":"", "speechText":"" }, "paramList": [ { "type":"addInfoParam", "name":"infoType", "value":"lineInfo", "edit":"0" }, { "type":"system", "name":"infoID", "value":"13827_MVV", "edit":"0" }, { "type":"system", "name":"seqID", "value":"2", "edit":"0" } ] } } } ] }
\ No newline at end of file
diff --git a/app/src/test/resources/mvv/test.json b/app/src/test/resources/mvv/test.json
new file mode 100644
index 0000000000..e69de29bb2

From 9b7ac5a588cb69dafa6050aadd929337e922f92c Mon Sep 17 00:00:00 2001
From: Jakob Foerste <github@jfoe.de>
Date: Thu, 12 May 2022 19:33:16 +0200
Subject: [PATCH 62/71] Update appcompat, fragment libraries and fix
 findViewById() in Fragments (#1434)

* Update appcompat, fragment and fix findViewById() in Fragments

* fix formatting

Co-authored-by: Kordian Bruck <kordianbruck@users.noreply.github.com>
---
 app/build.gradle                              |  7 +--
 .../activity/BaseNavigationActivity.kt        |  6 +-
 .../other/generic/fragment/BaseFragment.kt    | 18 +++---
 .../tumui/calendar/CalendarFragment.kt        | 58 ++++++++++---------
 .../openinghour/OpeningHoursListFragment.java |  2 +-
 .../ui/ticket/activity/EventsFragment.kt      |  2 +-
 6 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9726823a7d..fe684737b8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -109,9 +109,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'android.arch.lifecycle:reactivestreams:1.1.1'
     implementation 'android.arch.work:work-runtime-ktx:1.0.1'
-    // Note: Appcompat 1.4 breaks sandwich menu injected into toolbar by DrawerLayout
-    // upgrading this and or androidx.fragment:fragment-ktx will break the toolbar
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     kapt 'androidx.lifecycle:lifecycle-compiler:2.4.1'
     kapt "androidx.room:room-compiler:$room_version"
 
@@ -142,8 +140,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.anko:anko:0.10.8"
     implementation 'androidx.core:core-ktx:1.7.0'
-    // Note: upgrading this and or androidx.appcompat:appcompat will break the toolbar
-    implementation 'androidx.fragment:fragment-ktx:1.2.5'
+    implementation 'androidx.fragment:fragment-ktx:1.4.1'
     // Note: fix for internal androidx libraries using outdated WorkManager causing a crash
     implementation "androidx.work:work-runtime-ktx:2.7.1"
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/activity/BaseNavigationActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/activity/BaseNavigationActivity.kt
index fcbf495051..5440d453df 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/activity/BaseNavigationActivity.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/activity/BaseNavigationActivity.kt
@@ -48,7 +48,7 @@ class BaseNavigationActivity : BaseActivity(
 
     private val fragmentCallbacks = object : FragmentManager.FragmentLifecycleCallbacks() {
         override fun onFragmentStarted(fm: FragmentManager, f: Fragment) {
-            initDrawerToggle()
+            initDrawerToggle(f)
             updateDrawer()
         }
     }
@@ -97,9 +97,9 @@ class BaseNavigationActivity : BaseActivity(
         }
     }
 
-    private fun initDrawerToggle() {
+    private fun initDrawerToggle(fragment: Fragment) {
         val drawerLayout = findViewById<DrawerLayout>(R.id.drawer_layout)
-        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        val toolbar = fragment.requireView().findViewById<Toolbar>(R.id.toolbar)
 
         drawerToggle?.let { drawerLayout.removeDrawerListener(it) }
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/fragment/BaseFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/fragment/BaseFragment.kt
index 36a2413984..b916d33232 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/fragment/BaseFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/fragment/BaseFragment.kt
@@ -48,9 +48,6 @@ abstract class BaseFragment<T>(
     private var apiCall: Call<T>? = null
     private var hadSuccessfulRequest = false
 
-    private val toolbar: Toolbar?
-        get() = requireActivity().findViewById<Toolbar?>(R.id.toolbar)
-
     private val contentView: ViewGroup
         get() = requireActivity().findViewById<ViewGroup>(android.R.id.content).getChildAt(0) as ViewGroup
 
@@ -80,7 +77,11 @@ abstract class BaseFragment<T>(
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setupToolbar()
+
+        view.findViewById<Toolbar>(R.id.toolbar)?.let {
+            setupToolbar(it)
+        }
+
         // If content is refreshable setup the SwipeRefreshLayout
         swipeRefreshLayout?.apply {
             setOnRefreshListener(this@BaseFragment)
@@ -92,13 +93,8 @@ abstract class BaseFragment<T>(
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-        toolbar?.setTitle(titleResId)
-    }
-
-    private fun setupToolbar() {
-        val toolbar = toolbar ?: return
+    private fun setupToolbar(toolbar: Toolbar) {
+        toolbar.setTitle(titleResId)
         baseActivity.setSupportActionBar(toolbar)
 
         baseActivity.supportActionBar?.let {
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarFragment.kt
index 9024b3fd8c..ccc131e8e6 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarFragment.kt
@@ -14,7 +14,6 @@ import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat.checkSelfPermission
 import com.alamkanak.weekview.DateTimeInterpreter
-import com.alamkanak.weekview.WeekView
 import com.alamkanak.weekview.WeekViewDisplayable
 import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding
 import de.tum.`in`.tumcampusapp.R
@@ -49,10 +48,6 @@ class CalendarFragment : FragmentForAccessingTumOnline<EventsResponse>(
         CalendarController(requireContext())
     }
 
-    private val weekView: WeekView<CalendarItem> by lazy {
-        requireActivity().findViewById<WeekView<CalendarItem>>(R.id.weekView)
-    }
-
     private val showDate: DateTime? by lazy {
         val value = arguments?.getLong(Const.EVENT_TIME, -1) ?: -1
         if (value != -1L) DateTime(value) else null
@@ -86,25 +81,28 @@ class CalendarFragment : FragmentForAccessingTumOnline<EventsResponse>(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        // The week view adds a horizontal bar below the Toolbar. When refreshing, the refresh
-        // spinner covers it. Therefore, we adjust the spinner's end position.
-        swipeRefreshLayout.let {
-            val startOffset = it.progressViewStartOffset
-            val endOffset = it.progressViewEndOffset
-            it.setProgressViewOffset(false, startOffset, endOffset)
-        }
+        with(binding) {
+            // The week view adds a horizontal bar below the Toolbar. When refreshing, the refresh
+            // spinner covers it. Therefore, we adjust the spinner's end position.
+            swipeRefreshLayout.let {
+                val startOffset = it.progressViewStartOffset
+                val endOffset = it.progressViewEndOffset
+                it.setProgressViewOffset(false, startOffset, endOffset)
+            }
 
-        weekView.setOnMonthChangeListener { startDate, endDate ->
-            val begin = DateTime(startDate)
-            val end = DateTime(endDate)
-            prepareCalendarItems(begin, end)
-        }
+            weekView.setOnMonthChangeListener { startDate, endDate ->
+                val begin = DateTime(startDate)
+                val end = DateTime(endDate)
+                prepareCalendarItems(begin, end)
+            }
+
+            weekView.setOnEventClickListener { data, _ ->
+                openEvent(data as CalendarItem)
+            }
 
-        weekView.setOnEventClickListener { data, _ ->
-            openEvent(data)
+            todayButton.setOnClickListener { weekView.goToToday() }
         }
 
-        binding.todayButton.setOnClickListener { weekView.goToToday() }
         showDate?.let { openEvent(eventId) }
 
         isWeekMode = Utils.getSettingBool(requireContext(), Const.CALENDAR_WEEK_MODE, false)
@@ -210,7 +208,7 @@ class CalendarFragment : FragmentForAccessingTumOnline<EventsResponse>(
                 return true
             }
             R.id.action_create_event -> {
-                val currentDate = LocalDate(weekView.firstVisibleDate)
+                val currentDate = LocalDate(binding.weekView.firstVisibleDate)
                 val intent = Intent(requireContext(), CreateEventActivity::class.java)
                 intent.putExtra(Const.DATE, currentDate)
                 startActivityForResult(intent, REQUEST_CREATE)
@@ -430,23 +428,23 @@ class CalendarFragment : FragmentForAccessingTumOnline<EventsResponse>(
 
         if (isWeekMode) {
             icon = R.drawable.ic_outline_calendar_view_day_24px
-            weekView.numberOfVisibleDays = 5
+            binding.weekView.numberOfVisibleDays = 5
         } else {
             icon = R.drawable.ic_outline_view_column_24px
-            weekView.numberOfVisibleDays = 1
+            binding.weekView.numberOfVisibleDays = 1
         }
 
         // Go to current date or the one given in the intent
         showDate?.let {
-            weekView.goToDate(it.toGregorianCalendar())
-            weekView.goToHour(it.hourOfDay)
-        } ?: weekView.goToCurrentTime()
+            binding.weekView.goToDate(it.toGregorianCalendar())
+            binding.weekView.goToHour(it.hourOfDay)
+        } ?: binding.weekView.goToCurrentTime()
 
         menuItemSwitchView?.setIcon(icon)
     }
 
     private fun setupDateTimeInterpreter(shortDate: Boolean) {
-        weekView.dateTimeInterpreter = object : DateTimeInterpreter {
+        binding.weekView.dateTimeInterpreter = object : DateTimeInterpreter {
 
             private val timeFormat = DateTimeFormat.forPattern("HH:mm").withLocale(Locale.getDefault())
 
@@ -492,6 +490,12 @@ class CalendarFragment : FragmentForAccessingTumOnline<EventsResponse>(
                 .show()
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        menuItemSwitchView = null
+        menuItemFilterCanceled = null
+    }
+
     companion object {
 
         private const val REQUEST_SYNC = 0
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/openinghour/OpeningHoursListFragment.java b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/openinghour/OpeningHoursListFragment.java
index 92fa9ccd48..83bdfe8904 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/openinghour/OpeningHoursListFragment.java
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/openinghour/OpeningHoursListFragment.java
@@ -83,7 +83,7 @@ public void onSaveInstanceState(@NotNull Bundle outState) {
     public void onViewCreated(@NotNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        listView = requireActivity().findViewById(R.id.listView);
+        listView = view.findViewById(R.id.listView);
         listView.setOnItemClickListener(this);
         listView.setAdapter(adapter);
 
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/EventsFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/EventsFragment.kt
index dec897b14e..901ff0095f 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/EventsFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/EventsFragment.kt
@@ -41,7 +41,7 @@ class EventsFragment : FragmentForDownloadingExternal(
         super.onViewCreated(view, savedInstanceState)
         setupViewPager(binding.viewPager)
 
-        val eventTab = requireActivity().findViewById<TabLayout>(R.id.event_tab)
+        val eventTab = view.findViewById<TabLayout>(R.id.event_tab)
         eventTab.setupWithViewPager(binding.viewPager)
 
         eventTab.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {

From 346da8230b5cdd000234a10f71176be833f383a0 Mon Sep 17 00:00:00 2001
From: Kordian Bruck <k@bruck.me>
Date: Thu, 12 May 2022 20:08:03 +0200
Subject: [PATCH 63/71] Release 3.18

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fe684737b8..aea335f628 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,8 +38,8 @@ android {
         applicationId "de.tum.in.tumcampus"
         minSdkVersion 26
         targetSdkVersion 32
-        versionCode 584
-        versionName "3.18-dev"
+        versionCode 585
+        versionName "3.19-dev"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

From 1898b73c4bd33e1d195bc46b029c379314f41062 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Sat, 21 May 2022 17:44:20 +0200
Subject: [PATCH 64/71] added more intuitive icons, fixed translation

---
 .../component/tumui/grades/GradesFragment.kt     | 16 +++++++++++-----
 .../main/res/drawable/ic_baseline_save_24.xml    |  5 +++++
 .../main/res/layout/dialog_add_grade_input.xml   |  2 +-
 app/src/main/res/menu/menu_activity_grades.xml   |  2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_baseline_save_24.xml

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 2e8846999e..4c129636e9 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -6,7 +6,6 @@ import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
-import android.util.Log
 import android.view.*
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
@@ -284,6 +283,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
                 invalidate()
             }
+
         }
     }
 
@@ -668,7 +668,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         return when (item.itemId) {
             R.id.bar_chart_menu,
             R.id.pie_chart_menu -> toggleChart().run { true }
-            R.id.edit_grades_menu -> changeEditMode().run { true }
+            R.id.edit_grades_menu -> changeEditMode(item).run { true };
             else -> super.onOptionsItemSelected(item)
 
         }
@@ -677,8 +677,14 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     /**
      * Toggles between the standard mode and the mode which allows to change grades.
      */
-    private fun changeEditMode() {
+    private fun changeEditMode(item: MenuItem) {
+
         globalEditOFF = !globalEditOFF
+        if(globalEditOFF){
+            item.setIcon(R.drawable.ic_outline_edit_24px);
+        }else{
+            item.setIcon(R.drawable.ic_baseline_save_24);
+        }
         initUIVisibility()
     }
 
@@ -686,6 +692,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         val scale = resources.displayMetrics.density
         val param = swipeRefreshLayout.layoutParams as ViewGroup.MarginLayoutParams
         if (!globalEditOFF) {
+
             frameLayoutAverageGrade?.visibility = View.GONE
             floatingButtonAddExamGrade?.visibility = View.VISIBLE
             chartsContainer.visibility = View.GONE
@@ -790,5 +797,4 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             R.color.grade_5_0, R.color.grade_default
         )
     }
-}
-
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_save_24.xml b/app/src/main/res/drawable/ic_baseline_save_24.xml
new file mode 100644
index 0000000000..82070aa2c8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_save_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+</vector>
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index 5c99ea9c8f..a2ca053330 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -163,7 +163,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:layout_marginLeft="8dp"
-                android:text="Übernehmen"
+                android:text="@string/save"
                 android:textAllCaps="false" />
 
 
diff --git a/app/src/main/res/menu/menu_activity_grades.xml b/app/src/main/res/menu/menu_activity_grades.xml
index e39b83e69d..d0ad65e2f7 100644
--- a/app/src/main/res/menu/menu_activity_grades.xml
+++ b/app/src/main/res/menu/menu_activity_grades.xml
@@ -22,7 +22,7 @@
 
     <item
         android:id="@+id/edit_grades_menu"
-        android:icon="@drawable/ic_outline_settings_24px"
+        android:icon="@drawable/ic_outline_edit_24px"
         android:orderInCategory="100"
         android:title="@string/edit_grades"
         app:iconTint="@color/color_primary"

From fe89a5d53fe1ce63de83d14e78630934e26e49aa Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 14 Jul 2022 10:47:43 +0200
Subject: [PATCH 65/71] fixed errors from merging

---
 app/build.gradle                              |  3 +-
 app/src/main/AndroidManifest.xml              | 97 +++++--------------
 .../component/tumui/grades/GradesFragment.kt  | 40 +++-----
 3 files changed, 39 insertions(+), 101 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 34d4fd871e..5628100130 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -160,8 +160,7 @@ dependencies {
     implementation 'com.squareup.okio:okio:2.10.0'
 
     // UI
-
-    implementation 'com.github.mtotschnig:StickyListHeaders:2.7.1'
+    implementation 'com.github.mtotschnig:StickyListHeaders:2.8.0'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'me.dm7.barcodescanner:zxing:1.9.13'
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index af06707383..12856aef69 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -54,8 +54,7 @@
 
         <uses-library android:name="android.test.runner" />
 
-        <receiver
-            android:name=".service.ScanResultsAvailableReceiver"
+        <receiver android:name=".service.ScanResultsAvailableReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.net.wifi.SCAN_RESULTS" />
@@ -83,8 +82,8 @@
         <activity
             android:name=".component.ui.onboarding.StartupActivity"
             android:configChanges="orientation|screenSize"
-            android:exported="true"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -103,8 +102,8 @@
         <activity
             android:name=".component.other.generic.activity.BaseNavigationActivity"
             android:configChanges="orientation|screenSize"
-            android:exported="true"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -123,8 +122,7 @@
             android:name=".component.tumui.grades.GradesActivity"
             android:label="@string/empty_string"
             android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity"
-            android:windowSoftInputMode="stateHidden|adjustNothing">
+            android:parentActivityName=".component.ui.overview.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".component.ui.overview.MainActivity" />
@@ -160,10 +158,10 @@
         <activity
             android:name=".component.ui.transportation.TransportationActivity"
             android:configChanges="orientation|screenSize"
-            android:exported="true"
             android:label="@string/mvv"
             android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity">
+            android:parentActivityName=".component.ui.overview.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -202,10 +200,10 @@
         <activity
             android:name=".component.tumui.lectures.activity.LecturesPersonalActivity"
             android:configChanges="orientation|screenSize"
-            android:exported="true"
             android:label="@string/my_lectures"
             android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity">
+            android:parentActivityName=".component.ui.overview.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -247,54 +245,9 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".component.ui.overview.MainActivity" />
         </activity>
-        <activity
-
-            android:name=".component.tumui.person.PersonSearchActivity"
-            android:configChanges="orientation|screenSize"
-            android:exported="true"
-            android:label="@string/person_search"
-            android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable_persons" />
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".component.ui.overview.MainActivity" />
-        </activity>
         <activity
             android:name=".component.tumui.person.PersonDetailsActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/person_information"
-            android:parentActivityName=".component.tumui.person.PersonSearchActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.tum.in.tumcampusapp.component.tumui.person.PersonSearchActivity" />
-        </activity>
-        <activity
-            android:name=".component.tumui.roomfinder.RoomFinderActivity"
-            android:configChanges="orientation|screenSize"
-            android:exported="true"
-            android:label="@string/roomfinder"
-            android:launchMode="singleTop"
-            android:parentActivityName=".component.ui.overview.MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".component.ui.overview.MainActivity" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable_rooms" />
-            android:name=".component.tumui.person.PersonDetailsActivity"
-            android:configChanges="orientation|screenSize"
             android:label="@string/person_information">
         </activity>
         <activity
@@ -374,7 +327,8 @@
         <activity
             android:name=".component.tumui.calendar.CreateEventActivity"
             android:label="@string/activity_create_event_title"
-            android:parentActivityName=".component.tumui.calendar.CalendarActivity"></activity>
+            android:parentActivityName=".component.tumui.calendar.CalendarActivity">
+        </activity>
 
         <activity
             android:name=".component.ui.chat.activity.ChatRoomsActivity"
@@ -460,8 +414,8 @@
         </activity> <!-- receiver for the mensaWidget -->
         <receiver
             android:name=".component.ui.cafeteria.widget.MensaWidget"
-            android:exported="true"
-            android:label="@string/mensa_widget">
+            android:label="@string/mensa_widget"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -476,8 +430,8 @@
             android:permission="android.permission.BIND_REMOTEVIEWS" /> <!-- receiver for the MVVWidget -->
         <receiver
             android:name=".component.ui.transportation.widget.MVVWidget"
-            android:exported="true"
-            android:label="@string/mvv_widget">
+            android:label="@string/mvv_widget"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="de.tum.in.newtumcampus.intent.action.MVV_WIDGET_FORCE_RELOAD" />
@@ -497,10 +451,10 @@
             android:allowTaskReparenting="false"
             android:configChanges="orientation|screenSize"
             android:excludeFromRecents="true"
-            android:exported="true"
             android:label="@string/mvv_widget_select_station"
             android:launchMode="singleTop"
-            android:taskAffinity="">
+            android:taskAffinity=""
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -515,8 +469,8 @@
         </activity> <!-- receiver for the TimetableWidget -->
         <receiver
             android:name=".component.tumui.calendar.widget.TimetableWidget"
-            android:exported="true"
-            android:label="@string/timetable_widget">
+            android:label="@string/timetable_widget"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -535,17 +489,15 @@
             android:allowTaskReparenting="false"
             android:configChanges="orientation|screenSize"
             android:excludeFromRecents="true"
-            android:exported="true"
             android:label="@string/timetable_widget_select_lectures"
             android:launchMode="singleTop"
-            android:theme="@style/AppTheme.NoDrawerLayout">
+            android:theme="@style/AppTheme.NoDrawerLayout"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
         </activity> <!-- Used to restart alarm when device has been restarted -->
-        <receiver
-            android:name=".service.StartSyncReceiver"
-            android:exported="true">
+        <receiver android:name=".service.StartSyncReceiver" android:exported="true">
             <intent-filter>
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -578,8 +530,7 @@
             android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <receiver android:name=".service.GeofencingUpdateReceiver" />
-        <receiver
-            android:name=".service.GeofencingStartupReceiver"
+        <receiver android:name=".service.GeofencingStartupReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 54591282c2..bd2b8782ff 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -3,7 +3,6 @@ package de.tum.`in`.tumcampusapp.component.tumui.grades
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.content.Context
-import android.content.res.Configuration
 import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
@@ -13,7 +12,6 @@ import android.widget.ArrayAdapter
 import android.widget.Button
 import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
-import androidx.core.app.ActivityCompat.recreate
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat.getColor
 import com.github.mikephil.charting.components.Legend
@@ -31,7 +29,6 @@ import de.tum.`in`.tumcampusapp.component.tumui.grades.model.ExamList
 import de.tum.`in`.tumcampusapp.databinding.FragmentGradesBinding
 import de.tum.`in`.tumcampusapp.utils.Const
 import de.tum.`in`.tumcampusapp.utils.Utils
-import kotlinx.android.synthetic.main.fragment_grades.*
 import org.jetbrains.anko.support.v4.defaultSharedPreferences
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
@@ -55,15 +52,12 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     private var showBarChartAfterRotate = false
 
-
     private var globalEditOFF = true
     private var adaptDiagramToWeights = true
     private val exams = mutableListOf<Exam>()
 
     private val examSharedPreferences: String = "ExamList"
 
-    private var currentOrientation: Int? = null
-
 
     private val grades: Array<String> by lazy {
         resources.getStringArray(R.array.grades)
@@ -86,8 +80,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             showBarChartAfterRotate = !state.getBoolean(KEY_SHOW_BAR_CHART, true)
             spinnerPosition = state.getInt(KEY_SPINNER_POSITION, 0)
         }
-
-        currentOrientation = resources.configuration.orientation
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -107,7 +99,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             initUIVisibility()
         }
         binding.floatingButtonAddExamGrade.setOnClickListener { openAddGradeDialog() }
-        checkboxUseDiagrams.setOnCheckedChangeListener { _, isChecked ->
+        binding.checkboxUseDiagrams.setOnCheckedChangeListener { _, isChecked ->
             adaptDiagramToWeights = isChecked
         }
 
@@ -700,31 +692,25 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         val param = swipeRefreshLayout.layoutParams as ViewGroup.MarginLayoutParams
         if (!globalEditOFF) {
 
-            frameLayoutAverageGrade?.visibility = View.GONE
-            floatingButtonAddExamGrade?.visibility = View.VISIBLE
-            chartsContainer.visibility = View.GONE
-            checkboxUseDiagrams?.visibility = View.VISIBLE
+            binding.frameLayoutAverageGrade?.visibility = View.GONE
+            binding.floatingButtonAddExamGrade.visibility = View.VISIBLE
+            binding.chartsContainer.visibility = View.GONE
+            binding.checkboxUseDiagrams.visibility = View.VISIBLE
             param.setMargins(0, ((32 * scale + 0.5f).toInt()), 0, 0)
-            gradesListView.setPadding(0, 0, 0, 0)
+            binding.gradesListView.setPadding(0, 0, 0, 0)
 
         } else {
             showExams(exams)
-            frameLayoutAverageGrade?.visibility = View.VISIBLE
-            floatingButtonAddExamGrade?.visibility = View.GONE
-            chartsContainer.visibility = View.VISIBLE
-            checkboxUseDiagrams?.visibility = View.GONE
+            binding.frameLayoutAverageGrade?.visibility = View.VISIBLE
+            binding.floatingButtonAddExamGrade.visibility = View.GONE
+            binding.chartsContainer.visibility = View.VISIBLE
+            binding.checkboxUseDiagrams.visibility = View.GONE
             param.setMargins(0, 0, 0, 0)
-            gradesListView.setPadding(0, ((256 * scale + 0.5f).toInt()), 0, 0)
+            binding.gradesListView.setPadding(0, ((256 * scale + 0.5f).toInt()), 0, 0)
         }
         swipeRefreshLayout.layoutParams = param
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        if (currentOrientation != newConfig.orientation)
-            recreate(requireActivity())
-    }
-
     /**
      * Toggles between the pie chart and the bar chart.
      */
@@ -810,4 +796,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             R.color.grade_5_0, R.color.grade_default
         )
     }
-}
\ No newline at end of file
+}
+
+

From 6a688e610148db0a2fbbcddf02a62fa33f331784 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Wed, 20 Jul 2022 08:39:40 +0200
Subject: [PATCH 66/71] added questionmark to text

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 26ef29dade..3477e9b3cc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -104,7 +104,7 @@
     <string name="grade_semester_default">22WS</string>
     <string name="use_weights_in_diagrams">Consider credits and weights in the diagram</string>
     <string name="delete_exam">Delete Exam</string>
-    <string name="delete_exam_dialog_message">Should this exam be irrevocably deleted</string>
+    <string name="delete_exam_dialog_message">Should this exam be irrevocably deleted?</string>
     <string name="add_grade_error_wrong_semester">Wrong semester format: Too short. Correct: two numbers for the year + W/S</string>
     <string name="add_grade_error_semester_no_ws">Wrong semester format: Term not specified. Correct two numbers for the year + W/S</string>
     <string name="add_grade_error_invalid_weight">Wrong weight format: Weights can not be negative.</string>

From 4fa596a8f5855d3976c3cfd65e3b4e80f15cf096 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <32565407+tobiasjungmann@users.noreply.github.com>
Date: Wed, 27 Jul 2022 22:58:51 +0200
Subject: [PATCH 67/71] Update
 app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt

Co-authored-by: Fabian Sauter <sauter.fabian@mailbox.org>
---
 .../in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 6abbc493f6..271683dff4 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -88,7 +88,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
 
     /**
-     * Adds a Clicklistener which will show confirmation dialog whether the exam should actually be deleted.
+     * Adds a ClickListener which will show a confirmation dialog whether the exam should actually be deleted.
      */
     private fun initListenerDeleteCustomGrade(exam: Exam, holder: ViewHolder) {
         if (exam.manuallyAdded) {

From 43e7127957f3517c3151263af3a93297e2b5bd1d Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <32565407+tobiasjungmann@users.noreply.github.com>
Date: Wed, 27 Jul 2022 23:07:14 +0200
Subject: [PATCH 68/71] Apply suggestions from code review

Co-authored-by: Fabian Sauter <sauter.fabian@mailbox.org>
---
 .../component/tumui/grades/ExamListAdapter.kt | 20 +++++++++----------
 .../component/tumui/grades/model/Exam.kt      |  3 ++-
 .../main/res/layout-land/fragment_grades.xml  |  2 +-
 .../res/layout/activity_grades_listview.xml   | 11 ----------
 .../res/layout/dialog_add_grade_input.xml     | 10 ----------
 app/src/main/res/layout/fragment_grades.xml   |  9 ---------
 .../main/res/menu/menu_activity_grades.xml    |  2 --
 7 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 271683dff4..db323ce5d5 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -73,7 +73,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
      * Init the ui Elements to change the parameters of the grade
      */
     private fun initUIEditElements(holder: ViewHolder, exam: Exam) {
-        if (localGradesFragment.getGlobalEdit()) {
+        if (localGradesFragment.isEditModeEnabled()) {
             holder.editGradesContainer.visibility = View.GONE
             holder.gradeTextViewDeleteCustomGrade.visibility = View.GONE
         } else {
@@ -131,9 +131,9 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
     private fun initListenerEditTexts(exam: Exam, holder: ViewHolder) {
         holder.editTextGradeWeights.setOnFocusChangeListener { _, hasFocus ->
             if (!hasFocus) {
-                val helper = holder.editTextGradeWeights.text.toString().toDouble()
-                if (exam.weight != helper) {
-                    exam.weight = helper
+                val oldWeight = holder.editTextGradeWeights.text.toString().toDouble()
+                if (exam.weight != oldWeight) {
+                    exam.weight = oldWeight
                     localGradesFragment.storeExamListInSharedPreferences()
                     notifyDataSetChanged()
                 }
@@ -142,9 +142,9 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
         holder.editTextGradeCredits.setOnFocusChangeListener { _, hasFocus ->
             if (!hasFocus) {
-                val helper = holder.editTextGradeCredits.text.toString().toInt()
-                if (exam.credits_new != helper) {
-                    exam.credits_new = helper
+                val oldCredits = holder.editTextGradeCredits.text.toString().toInt()
+                if (exam.credits_new != oldCredits) {
+                    exam.credits_new = oldCredits
                     localGradesFragment.storeExamListInSharedPreferences()
                     notifyDataSetChanged()
                 }
@@ -156,7 +156,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
 
     /**
-     * Adds a ClickListener to reset one exam to the default values and adapts the UI accordingly
+     * Adds a ClickListener to reset one exam to the default values and adapts the UI accordingly.
      */
     private fun initListenerResetGradeParameters(exam: Exam, holder: ViewHolder) {
         holder.buttonResetGradeParameters.setOnClickListener(object : View.OnClickListener {
@@ -176,7 +176,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
     }
 
     /**
-     * Initialises the state of the checkbox and adapts the ui accordingly
+     * Initializes the state of the checkbox and adapts the UI accordingly.
      */
     private fun initCheckBoxUsedInAverage(exam: Exam, holder: ViewHolder) {
         holder.checkBoxUseGradeForAverage.isChecked = exam.gradeUsedInAverage
@@ -190,7 +190,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
     }
 
     /**
-     * Enables/disables Edittexts, and adapts the color of the grade bar on the right side
+     * Enables/disables Edittexts, and adapts the color of the grade bar on the right side.
      */
     private fun adaptUIToCheckboxStatus(
         holder: ViewHolder,
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index 1ee8fe1bb8..c366ef4917 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -40,7 +40,8 @@ data class Exam(
     var weight: Double = 1.0,
     @PropertyElement(name = "gradeUsedInAverage")
     var gradeUsedInAverage: Boolean = true,
-    @PropertyElement(name = "subjectcredits")               //must not be "credits" -> otherwise naming collision will occur
+    // must not be "credits" -> otherwise naming collision will occur
+    @PropertyElement(name = "subjectcredits")
     var credits_new: Int = 6,
     @PropertyElement(name = "examManuallyAdded")
     var manuallyAdded: Boolean = false,
diff --git a/app/src/main/res/layout-land/fragment_grades.xml b/app/src/main/res/layout-land/fragment_grades.xml
index 845a3783f8..99eb46d205 100644
--- a/app/src/main/res/layout-land/fragment_grades.xml
+++ b/app/src/main/res/layout-land/fragment_grades.xml
@@ -161,4 +161,4 @@
         </LinearLayout>
 
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index f41762e4f2..87367796fe 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -21,7 +19,6 @@
         android:layout_weight="1"
         android:orientation="vertical">
 
-
         <TextView
             android:id="@+id/courseNameTextView"
             android:layout_width="match_parent"
@@ -50,8 +47,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -74,8 +69,6 @@
                     android:autofillHints="@string/default_credits"
                     android:ems="10"
                     android:inputType="numberSigned" />
-
-
             </LinearLayout>
 
             <LinearLayout
@@ -99,8 +92,6 @@
                     android:autofillHints="@string/default_grade"
                     android:ems="10"
                     android:inputType="numberDecimal" />
-
-
             </LinearLayout>
 
             <LinearLayout
@@ -125,8 +116,6 @@
                     android:text="@string/reset_grade"
                     android:textAllCaps="false"
                     app:cornerRadius="@dimen/material_corner_radius" />
-
-
             </LinearLayout>
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_add_grade_input.xml b/app/src/main/res/layout/dialog_add_grade_input.xml
index a2ca053330..ef3fc54111 100644
--- a/app/src/main/res/layout/dialog_add_grade_input.xml
+++ b/app/src/main/res/layout/dialog_add_grade_input.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="100dp"
     android:padding="@dimen/material_large_padding">
-
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -85,8 +81,6 @@
             android:inputType="numberSigned"
             android:text="@string/default_credits"
             android:textCursorDrawable="@drawable/cursor_text_field_colorful" />
-
-
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -165,10 +159,6 @@
                 android:layout_marginLeft="8dp"
                 android:text="@string/save"
                 android:textAllCaps="false" />
-
-
         </LinearLayout>
-
-
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index d921569284..0b6fd6ea23 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -26,9 +24,7 @@
         app:tint="@android:color/white" />
 
 
-
     <LinearLayout
-
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
@@ -98,9 +94,6 @@
 
             </FrameLayout>
 
-
-
-
             <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:id="@+id/swipeRefreshLayout"
                 android:layout_width="match_parent"
@@ -130,8 +123,6 @@
             android:visibility="gone"
             android:orientation="vertical">
 
-
-
                 <TextView
                     android:id="@+id/averageGradeTextView"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/menu/menu_activity_grades.xml b/app/src/main/res/menu/menu_activity_grades.xml
index d0ad65e2f7..350b751a34 100644
--- a/app/src/main/res/menu/menu_activity_grades.xml
+++ b/app/src/main/res/menu/menu_activity_grades.xml
@@ -18,8 +18,6 @@
         android:title="@string/show_column_chart"
         app:iconTint="@color/color_primary"
         app:showAsAction="ifRoom" />
-
-
     <item
         android:id="@+id/edit_grades_menu"
         android:icon="@drawable/ic_outline_edit_24px"

From d524dae237bdc4e4ae5cb6a2a73f72c71581beeb Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <32565407+tobiasjungmann@users.noreply.github.com>
Date: Thu, 28 Jul 2022 10:37:47 +0200
Subject: [PATCH 69/71] Apply suggestions from code review in grades Fragment

Co-authored-by: Fabian Sauter <sauter.fabian@mailbox.org>
---
 .../component/tumui/grades/GradesFragment.kt  | 30 +++++--------------
 .../component/tumui/grades/model/Exam.kt      |  1 -
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index bd2b8782ff..76123fc517 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -263,7 +263,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             setDrawValues(false)
         }
 
-
         with(binding) {
             pieChartView.apply {
                 data = PieData(set)
@@ -282,7 +281,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
                 invalidate()
             }
-
         }
     }
 
@@ -372,9 +370,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
         val gradeSum = grades.sum()
 
-        if (factorSum <= 0) {
-            return 0.0
-        }
+        factorSum = max(factorSum , 0.0)
         return gradeSum / factorSum
     }
 
@@ -401,7 +397,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                     gradeDistribution[cleanGrade] = count + 1
                 }
             }
-
         }
         return gradeDistribution
     }
@@ -436,7 +431,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 }
             }
 
-
             binding.filterSpinner.onItemSelectedListener =
                 object : AdapterView.OnItemSelectedListener {
                     override fun onItemSelected(
@@ -463,7 +457,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
 
     /**
-     * Prompt the user to type in a name for the new chat room
+     * Prompt the user to type in a custom exam grade.
      */
     private fun openAddGradeDialog() {
         val view = View.inflate(requireContext(), R.layout.dialog_add_grade_input, null)
@@ -503,9 +497,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             } catch (exception: Exception) {
                 1.0
             }
-
-
-
             titleView.error = null
             gradeView.error = null
             examinerView.error = null
@@ -528,7 +519,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                     getString(R.string.add_grade_error_semester_no_ws)
             }
 
-            if (weight < 0.0) {             //weight sanitization
+            if (weight < 0.0) { // weight sanitization
                 changesRequired = true
                 weightView.error = getString(R.string.add_grade_error_invalid_weight)
             }
@@ -548,12 +539,12 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             }
 
 
-            if (title.isEmpty()) {             //title sanitization
+            if (title.isEmpty()) { // title sanitization
                 changesRequired = true
                 titleView.error = getString(R.string.add_grade_missing_course_title)
             }
 
-            if (credits < 1) {             //title sanitization
+            if (credits < 1) { // title sanitization
                 changesRequired = true
                 creditsView.error =
                     getString(R.string.add_grade_error_invalid_weight_less_than_zero)
@@ -677,7 +668,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      * Toggles between the standard mode and the mode which allows to change grades.
      */
     private fun changeEditMode(item: MenuItem) {
-
         globalEditOFF = !globalEditOFF
         if(globalEditOFF){
             item.setIcon(R.drawable.ic_outline_edit_24px);
@@ -688,17 +678,15 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     private fun initUIVisibility() {
-        val scale = resources.displayMetrics.density
+        val density = resources.displayMetrics.density
         val param = swipeRefreshLayout.layoutParams as ViewGroup.MarginLayoutParams
         if (!globalEditOFF) {
-
             binding.frameLayoutAverageGrade?.visibility = View.GONE
             binding.floatingButtonAddExamGrade.visibility = View.VISIBLE
             binding.chartsContainer.visibility = View.GONE
             binding.checkboxUseDiagrams.visibility = View.VISIBLE
-            param.setMargins(0, ((32 * scale + 0.5f).toInt()), 0, 0)
+            param.setMargins(0, ((32 * density + 0.5f).toInt()), 0, 0)
             binding.gradesListView.setPadding(0, 0, 0, 0)
-
         } else {
             showExams(exams)
             binding.frameLayoutAverageGrade?.visibility = View.VISIBLE
@@ -706,7 +694,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             binding.chartsContainer.visibility = View.VISIBLE
             binding.checkboxUseDiagrams.visibility = View.GONE
             param.setMargins(0, 0, 0, 0)
-            binding.gradesListView.setPadding(0, ((256 * scale + 0.5f).toInt()), 0, 0)
+            binding.gradesListView.setPadding(0, ((256 * density + 0.5f).toInt()), 0, 0)
         }
         swipeRefreshLayout.layoutParams = param
     }
@@ -797,5 +785,3 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         )
     }
 }
-
-
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index c366ef4917..b6db12e637 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -49,7 +49,6 @@ data class Exam(
 
     ) : Comparable<Exam>, SimpleStickyListHeadersAdapter.SimpleStickyListItem {
 
-
     override fun getHeadName() = semester
 
     override fun getHeaderId() = semester

From 80005550a23b1c1fb1d1db52f29d58ccf2d9ea83 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 28 Jul 2022 11:05:11 +0200
Subject: [PATCH 70/71] implemented requested feedback

---
 .../component/tumui/grades/ExamListAdapter.kt |  8 +++-
 .../component/tumui/grades/GradesFragment.kt  | 27 +++++++-----
 .../main/res/layout-land/fragment_grades.xml  |  4 +-
 .../res/layout/activity_grades_listview.xml   |  1 -
 app/src/main/res/layout/fragment_grades.xml   | 44 +++++++++----------
 5 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index db323ce5d5..336b7cf1f3 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -1,10 +1,14 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades
 
 import android.content.Context
-import android.util.Log
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
+import android.widget.TextView
+import android.widget.EditText
+import android.widget.LinearLayout
+import android.widget.CheckBox
+import android.widget.Button
+import android.widget.ImageView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import de.tum.`in`.tumcampusapp.R
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index 76123fc517..e117f3df6b 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -6,6 +6,8 @@ import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
+import android.util.Log
+import android.util.Log.INFO
 import android.view.*
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
@@ -36,6 +38,7 @@ import org.joda.time.format.DateTimeFormatter
 import java.lang.reflect.Type
 import java.text.NumberFormat
 import java.util.*
+import java.util.logging.Level.INFO
 import javax.inject.Inject
 
 
@@ -157,7 +160,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     }
 
     /**
-     * Adds all exams which are part f the new list to the existing exams list
+     * Adds all exams which are part of the new list to the existing exams list.
      */
     private fun addAllNewItemsToExamList(examsDownloaded: MutableList<Exam>) {
         val examsTitles = exams.map { it.course }
@@ -166,7 +169,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
         if (examsDownloaded.isNotEmpty()) {
             examsDownloaded.forEach {
-                it.credits_new = 6;it.weight = 1.0; it.gradeUsedInAverage = true
+                it.credits_new = 5
+                it.weight = 1.0
+                it.gradeUsedInAverage = true
             }
             exams.addAll(examsDownloaded)
             storeExamListInSharedPreferences()
@@ -187,6 +192,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 return
             }
         } catch (e: Exception) {
+            Log.v("Adding Exams", "Error while loading exams. Exam list was cleared.")
             exams.clear()
         }
     }
@@ -363,14 +369,14 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 (numberFormat.parse(it.grade.toString())?.toDouble()
                     ?: 1.0) * it.credits_new * it.weight
             }
-        val factorSum = exams
+        var factorSum = exams
             .filter { it.isPassed && it.gradeUsedInAverage }
             .map { it.credits_new.toDouble() * it.weight }.sum()
 
 
         val gradeSum = grades.sum()
 
-        factorSum = max(factorSum , 0.0)
+        factorSum = Math.max(factorSum, 0.0)
         return gradeSum / factorSum
     }
 
@@ -506,14 +512,13 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             semesterView.error = null
 
             var changesRequired = false
+
+
             if (semester.length < 3) {                                                  //semester sanitization
                 changesRequired = true
                 semesterView.error =
                     getString(R.string.add_grade_error_wrong_semester)
-            } else if (!(semester.get(2) == 'W' || semester[2] == 'w' || semester.get(2) == 'S' || semester.get(
-                    2
-                ) == 's')
-            ) {
+            } else if (!("d{0,2}[ws]".toRegex().containsMatchIn(semester.lowercase()))) {
                 changesRequired = true
                 semesterView.error =
                     getString(R.string.add_grade_error_semester_no_ws)
@@ -669,9 +674,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
      */
     private fun changeEditMode(item: MenuItem) {
         globalEditOFF = !globalEditOFF
-        if(globalEditOFF){
+        if (globalEditOFF) {
             item.setIcon(R.drawable.ic_outline_edit_24px);
-        }else{
+        } else {
             item.setIcon(R.drawable.ic_baseline_save_24);
         }
         initUIVisibility()
@@ -754,7 +759,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             })
     }
 
-    fun getGlobalEdit(): Boolean {
+    fun isEditModeEnabled(): Boolean {
         return globalEditOFF
     }
 
diff --git a/app/src/main/res/layout-land/fragment_grades.xml b/app/src/main/res/layout-land/fragment_grades.xml
index 99eb46d205..395c059ff9 100644
--- a/app/src/main/res/layout-land/fragment_grades.xml
+++ b/app/src/main/res/layout-land/fragment_grades.xml
@@ -21,6 +21,7 @@
         app:layout_constraintVertical_bias="0.8"
         app:srcCompat="@drawable/ic_add"
         app:tint="@android:color/white" />
+
     <CheckBox
         android:id="@+id/checkboxUseDiagrams"
         android:layout_width="match_parent"
@@ -61,7 +62,6 @@
                     android:layout_height="wrap_content" />
 
             </androidx.appcompat.widget.Toolbar>
-
         </com.google.android.material.appbar.AppBarLayout>
 
         <include
@@ -108,7 +108,6 @@
                     android:scrollbars="vertical" />
 
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
         </FrameLayout>
 
         <LinearLayout
@@ -159,6 +158,5 @@
                 app:cornerRadius="@dimen/material_corner_radius" />
 
         </LinearLayout>
-
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_grades_listview.xml b/app/src/main/res/layout/activity_grades_listview.xml
index 87367796fe..2600113e10 100644
--- a/app/src/main/res/layout/activity_grades_listview.xml
+++ b/app/src/main/res/layout/activity_grades_listview.xml
@@ -118,7 +118,6 @@
                     app:cornerRadius="@dimen/material_corner_radius" />
             </LinearLayout>
         </LinearLayout>
-
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/fragment_grades.xml b/app/src/main/res/layout/fragment_grades.xml
index 0b6fd6ea23..7357dbd86a 100644
--- a/app/src/main/res/layout/fragment_grades.xml
+++ b/app/src/main/res/layout/fragment_grades.xml
@@ -65,6 +65,7 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1">
+
             <CheckBox
                 android:id="@+id/checkboxUseDiagrams"
                 android:layout_width="match_parent"
@@ -72,6 +73,7 @@
                 android:layout_marginLeft="8dp"
                 android:checked="true"
                 android:text="@string/use_weights_in_diagrams" />
+
             <FrameLayout
                 android:id="@+id/chartsContainer"
                 android:layout_width="match_parent"
@@ -91,7 +93,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:visibility="gone" />
-
             </FrameLayout>
 
             <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -105,12 +106,9 @@
                     android:layout_height="match_parent"
                     android:clipToPadding="false"
                     android:divider="@color/list_divider"
-
-
                     android:scrollbars="vertical" />
 
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
         </FrameLayout>
 
 
@@ -119,27 +117,27 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/pop_up_background"
+            android:orientation="vertical"
             android:padding="@dimen/material_default_padding"
-            android:visibility="gone"
-            android:orientation="vertical">
+            android:visibility="gone">
 
-                <TextView
-                    android:id="@+id/averageGradeTextView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/text_light_blue"
-                    android:textSize="@dimen/semilarge_text_size"
-                    android:textStyle="bold"
-                    android:visibility="visible"
-                    tools:text="Average grade: 1.0" />
-
-                <TextView
-                    android:id="@+id/averageGradeHintTextView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/average_grade_hint"
-                    android:textColor="@color/text_light_blue"
-                    android:visibility="visible" />
+            <TextView
+                android:id="@+id/averageGradeTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="@color/text_light_blue"
+                android:textSize="@dimen/semilarge_text_size"
+                android:textStyle="bold"
+                android:visibility="visible"
+                tools:text="Average grade: 1.0" />
+
+            <TextView
+                android:id="@+id/averageGradeHintTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/average_grade_hint"
+                android:textColor="@color/text_light_blue"
+                android:visibility="visible" />
 
 
         </LinearLayout>

From 8b5612538b4a5978a29f4549ecda5c959d7d8302 Mon Sep 17 00:00:00 2001
From: Tobias Jungmann <tobias.jungmann@tum.de>
Date: Thu, 28 Jul 2022 12:19:21 +0200
Subject: [PATCH 71/71] linted grade files

---
 .../in/tumcampusapp/api/app/DateSerializer.kt |  1 -
 .../component/tumui/grades/ExamListAdapter.kt | 12 --------
 .../component/tumui/grades/GradesFragment.kt  | 29 ++++---------------
 .../component/tumui/grades/model/Exam.kt      |  7 ++---
 4 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt b/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
index 9e0b2a3019..4a76ebcbf7 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/api/app/DateSerializer.kt
@@ -40,7 +40,6 @@ class DateSerializer : JsonDeserializer<DateTime>, JsonSerializer<DateTime> {
             }
         }
         throw JsonParseException("Unparseable date: \"${json?.asString.orEmpty()}\". Supported formats: ${formatStrings.contentToString()}")
-
     }
 
     override fun serialize(
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
index 336b7cf1f3..6a90606c44 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/ExamListAdapter.kt
@@ -16,7 +16,6 @@ import de.tum.`in`.tumcampusapp.component.other.generic.adapter.SimpleStickyList
 import de.tum.`in`.tumcampusapp.component.tumui.grades.model.Exam
 import org.joda.time.format.DateTimeFormat
 
-
 /**
  * Custom UI adapter for a list of exams.
  */
@@ -44,7 +43,6 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
 
         val exam = itemList[position]
 
-
         initUIEditElements(holder, exam)
         initUIDisplayElements(holder, exam)
         return view
@@ -53,10 +51,7 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
     private fun initUIDisplayElements(holder: ViewHolder, exam: Exam) {
         holder.nameTextView.text = exam.course
         holder.gradeTextView.text = exam.grade
-
-
         adaptUIToCheckboxStatus(holder, exam)
-
         val date: String = if (exam.date == null) {
             context.getString(R.string.not_specified)
         } else {
@@ -72,7 +67,6 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         )
     }
 
-
     /**
      * Init the ui Elements to change the parameters of the grade
      */
@@ -90,7 +84,6 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         }
     }
 
-
     /**
      * Adds a ClickListener which will show a confirmation dialog whether the exam should actually be deleted.
      */
@@ -124,10 +117,8 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         } else {
             holder.gradeTextViewDeleteCustomGrade.visibility = View.GONE
         }
-
     }
 
-
     /**
      * Adds on Focus change listeners which store the value to the exam object if and only if the
      * user finished editing the exam.
@@ -158,7 +149,6 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         holder.editTextGradeCredits.setText(exam.credits_new.toString())
     }
 
-
     /**
      * Adds a ClickListener to reset one exam to the default values and adapts the UI accordingly.
      */
@@ -175,7 +165,6 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
                 localGradesFragment.storeExamListInSharedPreferences()
                 notifyDataSetChanged()
             }
-
         })
     }
 
@@ -224,7 +213,6 @@ class ExamListAdapter(context: Context, results: List<Exam>, gradesFragment: Gra
         }
     }
 
-
     override fun generateHeaderName(item: Exam): String {
         val headerText = super.generateHeaderName(item)
         val year = Integer.parseInt(headerText.substring(0, 2))
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
index e117f3df6b..d0482896c3 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/GradesFragment.kt
@@ -7,7 +7,6 @@ import android.graphics.Color
 import android.os.Bundle
 import android.util.ArrayMap
 import android.util.Log
-import android.util.Log.INFO
 import android.view.*
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
@@ -37,11 +36,9 @@ import org.joda.time.format.DateTimeFormat
 import org.joda.time.format.DateTimeFormatter
 import java.lang.reflect.Type
 import java.text.NumberFormat
-import java.util.*
-import java.util.logging.Level.INFO
+import java.util.Locale
 import javax.inject.Inject
 
-
 class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     R.layout.fragment_grades,
     R.string.my_grades
@@ -61,7 +58,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
     private val examSharedPreferences: String = "ExamList"
 
-
     private val grades: Array<String> by lazy {
         resources.getStringArray(R.array.grades)
     }
@@ -106,7 +102,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             adaptDiagramToWeights = isChecked
         }
 
-
         loadGrades(CacheControl.USE_CACHE)
 
         // Tracks whether the user has used the calendar module before. This is used in determining when to prompt for a
@@ -128,7 +123,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         loadExamListFromSharedPreferences()
         addAllNewItemsToExamList(examsDownloaded)
         initUIAfterDownloadingExams()
-
     }
 
     private fun initUIAfterDownloadingExams() {
@@ -166,7 +160,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         val examsTitles = exams.map { it.course }
         examsDownloaded.removeAll { examsTitles.contains(it.course) }
 
-
         if (examsDownloaded.isNotEmpty()) {
             examsDownloaded.forEach {
                 it.credits_new = 5
@@ -197,7 +190,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         }
     }
 
-
     fun storeExamListInSharedPreferences() {
         val sharedPref = activity?.getPreferences(Context.MODE_PRIVATE) ?: return
         val dateTimeConverter = DateTimeConverter()
@@ -210,7 +202,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         }
     }
 
-
     /**
      * Gson serialiser/deserialiser for converting Joda [DateTime] objects.
      * Source: https://riptutorial.com/android/example/14799/adding-a-custom-converter-to-gson
@@ -238,10 +229,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                 null
             } else dateTimeFormatter.parseDateTime(json.asString)
         }
-
     }
 
-
     private fun storeGradedCourses(exams: List<Exam>) {
         val gradesStore = GradesStore(defaultSharedPreferences)
         val courses = exams.map { it.course }
@@ -259,7 +248,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             PieEntry(count.toFloat(), grade)
         }
 
-
         var annotation = ""
         if (!adaptDiagramToWeights) {
             annotation = getString(R.string.grades_without_weight)
@@ -373,7 +361,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
             .filter { it.isPassed && it.gradeUsedInAverage }
             .map { it.credits_new.toDouble() * it.weight }.sum()
 
-
         val gradeSum = grades.sum()
 
         factorSum = Math.max(factorSum, 0.0)
@@ -461,7 +448,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         }
     }
 
-
     /**
      * Prompt the user to type in a custom exam grade.
      */
@@ -513,8 +499,7 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
 
             var changesRequired = false
 
-
-            if (semester.length < 3) {                                                  //semester sanitization
+            if (semester.length < 3) { // semester sanitization
                 changesRequired = true
                 semesterView.error =
                     getString(R.string.add_grade_error_wrong_semester)
@@ -543,7 +528,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                     getString(R.string.add_grade_error_invalid_grade_format)
             }
 
-
             if (title.isEmpty()) { // title sanitization
                 changesRequired = true
                 titleView.error = getString(R.string.add_grade_missing_course_title)
@@ -555,7 +539,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
                     getString(R.string.add_grade_error_invalid_weight_less_than_zero)
             }
 
-
             if (!changesRequired) {
                 val typeConverter1 =
                     de.tum.`in`.tumcampusapp.api.tumonline.converters.DateTimeConverter()
@@ -663,9 +646,8 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         return when (item.itemId) {
             R.id.bar_chart_menu,
             R.id.pie_chart_menu -> toggleChart().run { true }
-            R.id.edit_grades_menu -> changeEditMode(item).run { true };
+            R.id.edit_grades_menu -> changeEditMode(item).run { true }
             else -> super.onOptionsItemSelected(item)
-
         }
     }
 
@@ -675,9 +657,9 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
     private fun changeEditMode(item: MenuItem) {
         globalEditOFF = !globalEditOFF
         if (globalEditOFF) {
-            item.setIcon(R.drawable.ic_outline_edit_24px);
+            item.setIcon(R.drawable.ic_outline_edit_24px)
         } else {
-            item.setIcon(R.drawable.ic_baseline_save_24);
+            item.setIcon(R.drawable.ic_baseline_save_24)
         }
         initUIVisibility()
     }
@@ -763,7 +745,6 @@ class GradesFragment : FragmentForAccessingTumOnline<ExamList>(
         return globalEditOFF
     }
 
-
     companion object {
         private const val KEY_SHOW_BAR_CHART = "showPieChart"
         private const val KEY_SPINNER_POSITION = "spinnerPosition"
diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
index b6db12e637..9b4dd9a09b 100644
--- a/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
+++ b/app/src/main/java/de/tum/in/tumcampusapp/component/tumui/grades/model/Exam.kt
@@ -1,7 +1,6 @@
 package de.tum.`in`.tumcampusapp.component.tumui.grades.model
 
 import android.content.Context
-import android.util.Log
 import androidx.core.content.ContextCompat
 import com.tickaroo.tikxml.annotation.PropertyElement
 import com.tickaroo.tikxml.annotation.Xml
@@ -44,10 +43,8 @@ data class Exam(
     @PropertyElement(name = "subjectcredits")
     var credits_new: Int = 6,
     @PropertyElement(name = "examManuallyAdded")
-    var manuallyAdded: Boolean = false,
-
-
-    ) : Comparable<Exam>, SimpleStickyListHeadersAdapter.SimpleStickyListItem {
+    var manuallyAdded: Boolean = false
+) : Comparable<Exam>, SimpleStickyListHeadersAdapter.SimpleStickyListItem {
 
     override fun getHeadName() = semester