shinichi
|
84cbcb4a6d
|
send data to doctor
|
2020-10-19 14:35:51 +02:00 |
|
fabjuuuh
|
960327a3e3
|
Merge remote-tracking branch 'origin/develop' into dataOnTabs
|
2020-10-19 14:05:55 +02:00 |
|
Sem van der Hoeven
|
c50f898ec0
|
Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop
|
2020-10-19 13:32:33 +02:00 |
|
Sem van der Hoeven
|
fb443a33d7
|
add send message
|
2020-10-19 13:32:26 +02:00 |
|
Sem van der Hoeven
|
8249632d00
|
add set resistance
|
2020-10-19 13:31:29 +02:00 |
|
shinichi
|
134bf235c3
|
multiple clients works
|
2020-10-19 13:24:38 +02:00 |
|
shinichi
|
2ecc90ff2c
|
doctor can now disconnect
|
2020-10-19 12:52:35 +02:00 |
|
shinichi
|
4a238d9207
|
Auto stash before checking out "HEAD"
|
2020-10-19 12:07:00 +02:00 |
|
fabjuuuh
|
62525f3a23
|
Merge remote-tracking branch 'origin/develop' into dataOnTabs
|
2020-10-19 11:14:57 +02:00 |
|
shinichi
|
cc046d6611
|
wip
|
2020-10-16 16:24:07 +02:00 |
|
fabjuuuh
|
5751bbed81
|
Progress with structure to send data
|
2020-10-16 16:23:50 +02:00 |
|
shinichi
|
e8a4901f09
|
fix
|
2020-10-16 15:15:09 +02:00 |
|
fabjuuuh
|
0427fa89aa
|
Merge remote-tracking branch 'origin/develop' into newDoctor
|
2020-10-16 15:04:16 +02:00 |
|
fabjuuuh
|
173dbf2745
|
update
|
2020-10-16 15:02:26 +02:00 |
|
shinichi
|
fd9b321292
|
doctor can see patients who logged on before
|
2020-10-16 15:02:19 +02:00 |
|
fabjuuuh
|
e3c580c8c2
|
Merge remote-tracking branch 'origin/develop' into newDoctor
|
2020-10-16 12:51:42 +02:00 |
|
shinichi
|
540a640bc6
|
removed debuggers
|
2020-10-16 12:49:06 +02:00 |
|
fabjuuuh
|
aadbbc16a9
|
Workinng on communication
|
2020-10-16 12:48:14 +02:00 |
|
shinichi
|
9ef51ddeca
|
connecting to doctor after works
|
2020-10-16 12:18:03 +02:00 |
|
shinichi
|
5bacfdc8ce
|
added so only one doctor can login to server
|
2020-10-16 11:25:35 +02:00 |
|
shinichi
|
6ec09ec995
|
error catching
|
2020-10-16 10:51:45 +02:00 |
|
shinichi
|
94be6fd22d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-10-14 16:28:41 +02:00 |
|
shinichi
|
dc2b2f06ae
|
move styles to sharedproject and disposed client
|
2020-10-14 16:28:37 +02:00 |
|
Sem van der Hoeven
|
30c5d5a2a3
|
add message to server switch
|
2020-10-14 15:58:06 +02:00 |
|
fabjuuuh
|
6e534c318b
|
Merge branch 'develop' into newDoctor
|
2020-10-14 15:21:03 +02:00 |
|
Sem van der Hoeven
|
c5c74a3d7a
|
moved dataparser to util
|
2020-10-14 14:59:00 +02:00 |
|
Sem van der Hoeven
|
91a20e0af7
|
set doctor of communication when doctor logs in
|
2020-10-14 14:49:53 +02:00 |
|
fabjuuuh
|
af5dca25f4
|
Remove Tabs when disconnect
|
2020-10-14 14:35:14 +02:00 |
|
Sem van der Hoeven
|
b519f33cb5
|
added new user when username not in file
|
2020-10-14 13:21:12 +02:00 |
|
fabjuuuh
|
25176dbaeb
|
Connections shit
|
2020-10-14 13:05:56 +02:00 |
|
Sem van der Hoeven
|
25d0bda483
|
added new reference
|
2020-10-09 12:52:14 +02:00 |
|
Sem van der Hoeven
|
adf6073e42
|
added client project reference to server
|
2020-10-09 12:01:48 +02:00 |
|
fabjuuuh
|
a043cdc723
|
Merge branch 'develop' into dokter
|
2020-10-09 10:56:48 +02:00 |
|
shinichi
|
7bf5bdb1ce
|
delete
|
2020-10-07 18:34:04 +02:00 |
|
fabjuuuh
|
acbe3e9d55
|
Connect new tab
|
2020-10-07 14:56:04 +02:00 |
|
Sem van der Hoeven
|
bff4718d3f
|
added route to client vr scene
|
2020-10-07 12:51:09 +02:00 |
|
Sem van der Hoeven
|
f5eb59694e
|
added comments
|
2020-10-07 12:22:10 +02:00 |
|
Sem van der Hoeven
|
475159bbb2
|
fix conflicts
|
2020-10-07 11:24:19 +02:00 |
|
Sem van der Hoeven
|
c2b4b259a3
|
comment
|
2020-10-07 11:23:09 +02:00 |
|
shinichi
|
09db19246e
|
quick fix
|
2020-10-02 15:53:50 +02:00 |
|
Sem van der Hoeven
|
d420bdc2a4
|
merge conflicts 7: conflictnado
|
2020-10-02 11:49:48 +02:00 |
|
Sem van der Hoeven
|
fedf8c0e5b
|
added client server login with hashed passwords and usernames
|
2020-10-02 11:43:07 +02:00 |
|
shinichi
|
a5e679e6fb
|
server now gets response when resistance is set
|
2020-09-30 19:40:37 +02:00 |
|
Sem van der Hoeven
|
3e5f6e46c4
|
progress on validation
|
2020-09-30 16:22:57 +02:00 |
|
shinichi
|
adea08cfb7
|
server can set resistance
|
2020-09-30 16:22:26 +02:00 |
|
shinichi
|
bd8994ad5b
|
added start and stop session
|
2020-09-30 15:12:10 +02:00 |
|
shinichi
|
a65c36b8d1
|
fix bug and more efficient code
|
2020-09-30 14:24:38 +02:00 |
|
shinichi
|
82f2d6b71c
|
saving bike and bpm data in separate files
|
2020-09-30 14:17:26 +02:00 |
|
shinichi
|
6f1ab57fe4
|
saving in binairy format
took forever
|
2020-09-30 13:00:13 +02:00 |
|
fabjuuuh
|
68a43fb930
|
Save Raw data
|
2020-09-25 16:38:16 +02:00 |
|