lbarraga
|
e1ddf41d09
|
#74 added continue string for feed
|
2023-05-07 14:06:20 +02:00 |
|
lbarraga
|
49835108f3
|
subject id and taskid as parameters for getSessionReport
|
2023-05-07 14:05:43 +02:00 |
|
lbarraga
|
4728755c5e
|
#74 homescreen now contains a feed
|
2023-05-07 14:04:20 +02:00 |
|
lbarraga
|
190c3467ec
|
#74 viewmodel of a feed
|
2023-05-07 14:03:46 +02:00 |
|
lbarraga
|
f7b5d5170d
|
#74 made a feed
|
2023-05-07 14:02:56 +02:00 |
|
lbarraga
|
2db431463d
|
sessionreport needs if of subjectId and taskId
|
2023-05-07 14:02:29 +02:00 |
|
lbarraga
|
07ff75476d
|
added getTask to interface
|
2023-05-07 14:00:52 +02:00 |
|
lbarraga
|
1c224446a8
|
added getSubject to interface
|
2023-05-07 14:00:42 +02:00 |
|
lbarraga
|
2c7c96d73a
|
#74 added single getTask so feed kan fetch only one Task
|
2023-05-07 13:59:44 +02:00 |
|
lbarraga
|
dab4506a34
|
#74 added single getSubject so feed kan fetch only one subject
|
2023-05-07 13:59:29 +02:00 |
|
lbarraga
|
bee7101bef
|
#74 added FeedDAO and firebase implementation
|
2023-05-07 13:58:02 +02:00 |
|
lbarraga
|
a0ea97dc52
|
#74 added bind for feedDAO
|
2023-05-07 13:57:05 +02:00 |
|
lbarraga
|
05d93246a6
|
sessionreport now also has a task and subject id
|
2023-05-07 13:56:22 +02:00 |
|
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 |
|
lbarraga
|
1eff33a6db
|
start task now goes to timer selection screen
|
2023-05-07 09:37:07 +02:00 |
|
brreynie
|
33b8a32330
|
Merge pull request #101 from SELab1/refactor
extract StudeezNavGraph out of StudeezApp
|
2023-05-05 11:25:37 +02:00 |
|
brreynie
|
5b8d59cb75
|
resolve merge conflicts when merging to development
|
2023-05-05 11:25:18 +02:00 |
|
Rune Dyselinck
|
d78ec4aead
|
Merge pull request #100 from SELab1/testFix
testen gefixt
|
2023-05-05 11:18:03 +02:00 |
|
brreynie
|
f7a3d68c3e
|
extract StudeezNavGraph out of StudeezApp
|
2023-05-05 11:10:59 +02:00 |
|
lbarraga
|
81fa345453
|
Merge pull request #98 from SELab1/timer_edit
Timer edit
|
2023-05-05 11:02:42 +02:00 |
|
Lukas Barragan Torres
|
13b9c0591f
|
resolve conflicts and merge
|
2023-05-05 11:02:18 +02:00 |
|
Rune Dyselinck
|
47edf650ed
|
testen gefixt
|
2023-05-05 10:48:34 +02:00 |
|
lbarraga
|
620722038d
|
Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/TimerFormRoute.kt
Co-authored-by: Tibo De Peuter <Tibo.DePeuter@UGent.be>
|
2023-05-05 08:27:10 +02:00 |
|
lbarraga
|
0b1ff3f02d
|
removed previous add screen
|
2023-05-05 00:09:52 +02:00 |
|
lbarraga
|
d087783e12
|
timer type select resource
|
2023-05-05 00:06:50 +02:00 |
|
lbarraga
|
6144afe03f
|
TimerEditRoute en TimerAddRoute staan op andere plaatsen
|
2023-05-05 00:06:13 +02:00 |
|
lbarraga
|
2556e1c658
|
TimerFormViewModel ipv TimerEditViewModel
|
2023-05-05 00:05:27 +02:00 |
|
lbarraga
|
51af1f5766
|
edit route en add route staan in dezelfde TimerFormRoute File
|
2023-05-05 00:04:52 +02:00 |
|
lbarraga
|
7f615c94a1
|
GetTimerEditScreen -> GetTimerFormScreen
|
2023-05-05 00:03:53 +02:00 |
|
lbarraga
|
853a2d8c28
|
select timer type string resource and package refactor
|
2023-05-05 00:03:05 +02:00 |
|
lbarraga
|
86c7a0e6a8
|
*EditScreen -> *FormScreen
|
2023-05-05 00:01:01 +02:00 |
|
lbarraga
|
165fe4ca86
|
added edit screen string
|
2023-05-04 22:58:35 +02:00 |
|
lbarraga
|
4015a806be
|
saveTimer -> editTimer
|
2023-05-04 22:57:31 +02:00 |
|
lbarraga
|
534a88db5d
|
changed savedTimer to editTimer
|
2023-05-04 22:56:26 +02:00 |
|
lbarraga
|
b909c7dd15
|
open add route instead of edit screen
|
2023-05-04 22:55:41 +02:00 |
|
lbarraga
|
11e7990ee9
|
added timer add route
|
2023-05-04 22:54:59 +02:00 |
|
lbarraga
|
24fe1b4f78
|
added add screen to routes
|
2023-05-04 22:54:12 +02:00 |
|
brreynie
|
d5fbb2adab
|
Merge pull request #97 from SELab1/tasksoverview
Tasksoverview
|
2023-05-04 22:12:48 +02:00 |
|
brreynie
|
e2ada0b9d4
|
fix mergeconflict when merging tasksoverview
|
2023-05-04 22:12:08 +02:00 |
|
brreynie
|
b6e3c8d5be
|
small string fix
|
2023-05-04 21:38:16 +02:00 |
|
lbarraga
|
a28a425c3c
|
fix string resource inconsistencies
|
2023-05-04 21:37:02 +02:00 |
|
brreynie
|
d80f12dfdf
|
Merge branch 'tasksoverview' of github.ugent.be:SELab1/project2023-groep-14 into tasksoverview
|
2023-05-04 12:36:51 +02:00 |
|
brreynie
|
fec9565f69
|
fix hardcoded fieldname in taskDAO
|
2023-05-04 12:36:28 +02:00 |
|
brreynie
|
9faea56056
|
localisation improvements
|
2023-05-04 12:33:51 +02:00 |
|
Lukas Barragan Torres
|
cfb624b6b6
|
added error for invalid repeats
|
2023-05-04 12:23:58 +02:00 |
|
Lukas Barragan Torres
|
3fc3bee8c2
|
added error label for breaktimeEdit
|
2023-05-04 12:23:26 +02:00 |
|
Lukas Barragan Torres
|
4d064ad319
|
made repeats public
|
2023-05-04 12:23:05 +02:00 |
|
Lukas Barragan Torres
|
0b65c44da1
|
added error inputfield
|
2023-05-04 12:22:42 +02:00 |
|
brreynie
|
e1b60b342d
|
fix stealthbutton and add button to not use hardcoded gray
|
2023-05-04 12:21:04 +02:00 |
|