1.2.7

SchoolPower · Sep 21, 2018 · 0c3e5dc · 0c3e5dc
1 parent 687233c
commit 0c3e5dc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId 'com.carbonylgroup.schoolpower'
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 19
-        versionName '1.2.6'
+        versionCode 20
+        versionName '1.2.7'
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
     }
     buildTypes {

diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":19,"versionName":"1.2.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":20,"versionName":"1.2.7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
diff --git a/app/src/main/java/com/carbonylgroup/schoolpower/data/AssignmentItem.kt b/app/src/main/java/com/carbonylgroup/schoolpower/data/AssignmentItem.kt
@@ -81,7 +81,7 @@ class AssignmentItem(json: JSONObject) : Serializable {
                     Pair("late", getStatusIfExists(json, "late")),
                     Pair("missing", getStatusIfExists(json, "missing")),
                     Pair("exempt", getStatusIfExists(json, "exempt")),
-                    Pair("excludeInFinalGrade", !getStatusIfExists(json, "includeInFinalGrade", true))
+                    Pair("excludeInFinalGrade", !getStatusIfExists(json, "includeInFinalGrade", true) && !includeInFinalGrade)
             )
 
         } catch (e: JSONException) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":19,"versionName":"1.2.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":20,"versionName":"1.2.7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]