tdpeuter/2023SELab1-project-Studeez
tdpeuter/2023SELab1-project-Studeez
Archived
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

sessionreport now has the id of the task

Browse source
This commit is contained in:
lbarraga 2023-05-07 10:08:02 +02:00
parent 1eff33a6db
commit 45f28592ab
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/be/ugent/sel/studeez/data/local/models/SessionReport.kt
View file

@ -6,5 +6,6 @@ import com.google.firebase.firestore.DocumentId
data class SessionReport( data class SessionReport(
@DocumentId val id: String = "", @DocumentId val id: String = "",
val studyTime: Int = 0, val studyTime: Int = 0,
val endTime: Timestamp = Timestamp(0, 0) val endTime: Timestamp = Timestamp(0, 0),
val taskId: String
) )

6
app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalTimer.kt
View file

@ -2,6 +2,7 @@ package be.ugent.sel.studeez.data.local.models.timer_functional
import be.ugent.sel.studeez.data.local.models.SessionReport import be.ugent.sel.studeez.data.local.models.SessionReport
import com.google.firebase.Timestamp import com.google.firebase.Timestamp
import com.google.firebase.firestore.DocumentReference
abstract class FunctionalTimer(initialValue: Int) { abstract class FunctionalTimer(initialValue: Int) {
var time: Time = Time(initialValue) var time: Time = Time(initialValue)
@ -17,10 +18,11 @@ abstract class FunctionalTimer(initialValue: Int) {
abstract fun hasCurrentCountdownEnded(): Boolean abstract fun hasCurrentCountdownEnded(): Boolean
fun getSessionReport(): SessionReport { fun getSessionReport(taskId: String): SessionReport {
return SessionReport( return SessionReport(
studyTime = totalStudyTime, studyTime = totalStudyTime,
endTime = Timestamp.now() endTime = Timestamp.now(),
taskId = taskId
) )
} }

2
app/src/main/java/be/ugent/sel/studeez/screens/session/SessionViewModel.kt
View file

@ -30,7 +30,7 @@ class SessionViewModel @Inject constructor(
} }
fun endSession(openAndPopUp: (String, String) -> Unit) { fun endSession(openAndPopUp: (String, String) -> Unit) {
sessionReportState.sessionReport = getTimer().getSessionReport() sessionReportState.sessionReport = getTimer().getSessionReport(task.id)
openAndPopUp(StudeezDestinations.SESSION_RECAP, StudeezDestinations.SESSION_SCREEN) openAndPopUp(StudeezDestinations.SESSION_RECAP, StudeezDestinations.SESSION_SCREEN)
} }
} }