lbarraga
|
83fba0de70
|
#74 added a feedEntry dataclass
|
2023-05-07 13:55:44 +02:00 |
|
lbarraga
|
45f28592ab
|
sessionreport now has the id of the task
|
2023-05-07 10:08:02 +02:00 |
|
Lukas Barragan Torres
|
13b9c0591f
|
resolve conflicts and merge
|
2023-05-05 11:02:18 +02:00 |
|
brreynie
|
e2ada0b9d4
|
fix mergeconflict when merging tasksoverview
|
2023-05-04 22:12:08 +02:00 |
|
brreynie
|
fec9565f69
|
fix hardcoded fieldname in taskDAO
|
2023-05-04 12:36:28 +02:00 |
|
Lukas Barragan Torres
|
4d064ad319
|
made repeats public
|
2023-05-04 12:23:05 +02:00 |
|
lbarraga
|
46109ac4ff
|
Resolved merge conflicts (call with friends)
|
2023-05-04 00:12:04 +02:00 |
|
brreynie
|
6765229d37
|
#13 and #17 form for creating, editing and deleting tasks
|
2023-05-03 23:18:53 +02:00 |
|
|
|
ee7914d0c9
|
Merge pull request #93 from SELab1/custom_timer
Custom timer
|
2023-05-03 22:09:06 +02:00 |
|
brreynie
|
71590bd5a2
|
#23 toggle task completed and #24 delete task
|
2023-05-03 14:58:41 +02:00 |
|
Lukas Barragan Torres
|
e0f46d676b
|
changed Time increase and decrease functions
|
2023-05-03 13:53:35 +02:00 |
|
brreynie
|
b7a74a13d7
|
#22 style task entry
|
2023-05-03 11:38:36 +02:00 |
|
brreynie
|
056947e1db
|
#22 get tasks from firestore
|
2023-05-02 22:57:35 +02:00 |
|
brreynie
|
7ad1047091
|
#21 further styling subject
|
2023-05-02 21:11:27 +02:00 |
|
lbarraga
|
bfde19caaf
|
making some fields public
|
2023-05-01 17:52:40 +02:00 |
|
lbarraga
|
dafa8cc606
|
extra constructor HMS that takes total seconds
|
2023-05-01 17:51:51 +02:00 |
|
brreynie
|
c33aad5496
|
#21 begin styling subject
|
2023-05-01 15:15:54 +02:00 |
|
lbarraga
|
3c73c5a853
|
added visitor to TimerInfo
|
2023-05-01 13:21:53 +02:00 |
|
lbarraga
|
7046a2a985
|
HMS now takes ints and has totalseconds and tostring functions
|
2023-05-01 13:16:48 +02:00 |
|
lbarraga
|
2c62e13caa
|
timepicker button met popup-klok functionaliteit
|
2023-05-01 13:16:31 +02:00 |
|
lbarraga
|
ddbac51c9d
|
#30 added edit screen to destinations
|
2023-05-01 12:58:22 +02:00 |
|
lbarraga
|
93a282026e
|
added visitor to TimerInfo
|
2023-05-01 12:56:50 +02:00 |
|
lbarraga
|
1d6de333e4
|
HMS now takes ints and has totalseconds and tostring functions
|
2023-05-01 12:53:35 +02:00 |
|
lbarraga
|
5b0cff2376
|
timepicker button met popup-klok functionaliteit
|
2023-05-01 12:51:46 +02:00 |
|
|
|
024ce85266
|
#26 select time for custom timer
|
2023-04-29 17:55:20 +02:00 |
|
brreynie
|
d03775000a
|
#21 basic subject list
|
2023-04-29 12:28:30 +02:00 |
|
Rune Dyselinck
|
94336348c5
|
merge dev
|
2023-04-28 15:50:44 +02:00 |
|
Rune Dyselinck
|
e421430f0b
|
mediaplayer in AbstractSessionScreen + InvisibleSessionManagerTest.kt fixed
|
2023-04-28 14:42:37 +02:00 |
|
Rune Dyselinck
|
46d60e100b
|
mediaplayer out of view
|
2023-04-28 13:38:17 +02:00 |
|
|
|
2fb90b15c3
|
Update app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalTimer.kt
|
2023-04-28 12:32:26 +02:00 |
|
lbarraga
|
75429b2638
|
Merge branch 'development' into session_recap
|
2023-04-28 12:13:47 +02:00 |
|
Lukas Barragan Torres
|
351547f111
|
visitor
|
2023-04-26 11:35:26 +02:00 |
|
Lukas Barragan Torres
|
c3a9826001
|
remove getView from functional timer and add when in sessionRoute
|
2023-04-26 11:05:08 +02:00 |
|
lbarraga
|
ae685070ae
|
#76 sessionreportstate om een sessionreport mee te geven van scherm naar scherm
|
2023-04-25 18:07:06 +02:00 |
|
lbarraga
|
b0c4f44833
|
#76 total studytime toevoegen aan een functionaltimer
|
2023-04-25 18:05:33 +02:00 |
|
Lukas Barragan Torres
|
7fe7416388
|
added getview function
|
2023-04-25 15:20:28 +02:00 |
|
Rune Dyselinck
|
ea4e7a4790
|
timer can run when invisible (but no sound)
|
2023-04-24 21:35:48 +02:00 |
|
Rune Dyselinck
|
e20e972b88
|
localdatetime version
|
2023-04-24 19:52:36 +02:00 |
|
brreynie
|
295f3b730a
|
Merge pull request #81 from SELab1/sessionscreen_ui
Sessionscreen UI
|
2023-04-18 23:02:09 +02:00 |
|
Rune Dyselinck
|
3a68712cd9
|
nieuwe SessionScreen.kt UI werkt met studystate en alle timer types
|
2023-04-18 21:22:18 +02:00 |
|
lbarraga
|
58d0d4fe91
|
Merge pull request #82 from SELab1/session_report
Session report
|
2023-04-18 16:08:45 +02:00 |
|
rdyselin
|
9d2c53d4e6
|
Merge branch 'development' into sessionscreen_ui
|
2023-04-18 15:41:04 +02:00 |
|
Lukas Barragan Torres
|
31e07d2784
|
#76 added sessionReport
|
2023-04-18 15:38:19 +02:00 |
|
Lukas Barragan Torres
|
1e767d22a4
|
#76 added sessionDAO
|
2023-04-18 15:34:41 +02:00 |
|
brreynie
|
9fd3df68f0
|
Merge pull request #79 from SELab1/localisation
created studystate for functional timer to improve localisation
|
2023-04-18 15:18:33 +02:00 |
|
Rune Dyselinck
|
18d11ffbbd
|
Timer speelt notificatie bij het start en einde van een pauze
|
2023-04-18 15:15:41 +02:00 |
|
reyniersbram
|
826acc1186
|
created studystate for functional timer to improve localisation
|
2023-04-18 14:58:16 +02:00 |
|
|
|
3a2d13b3d6
|
Disable anonymous user
|
2023-04-18 14:28:55 +02:00 |
|
brreynie
|
86bc8d9e1a
|
Merge pull request #77 from SELab1/timerselection
Timerselection
|
2023-04-18 13:35:50 +02:00 |
|
Lukas Barragan Torres
|
d8b95f5d5b
|
change name of SelectedTimerRepo to SelectedTimerState
|
2023-04-18 13:33:37 +02:00 |
|
