sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
399 Commits 15 Branches 0 Tags
c50f898ec03fa0f78d03083738a01fb97f9e7f41
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
shinichi 134bf235c3 multiple clients works 2020-10-19 13:24:38 +02:00
shinichi bc738d0fa3 Merge remote-tracking branch 'origin/develop' into develop 2020-10-19 12:52:39 +02:00
shinichi 2ecc90ff2c doctor can now disconnect 2020-10-19 12:52:35 +02:00
shinichi d98c32a508 Merge remote-tracking branch 'origin/develop' into develop 2020-10-19 12:24:09 +02:00
shinichi dcf6c3c6d0 client can see if doctor connected 2020-10-19 12:23:52 +02:00
shinichi 4a238d9207 Auto stash before checking out "HEAD" 2020-10-19 12:07:00 +02:00
shinichi 163d2321cc username back added to tabs 2020-10-19 11:49:34 +02:00
shinichi c9e913474c Merge remote-tracking branch 'origin/develop' into develop 2020-10-19 11:26:18 +02:00
shinichi 63b5c6ab73 removed unnecessary code 2020-10-19 11:26:09 +02:00
shinichi b748bcf5c8 binded commands 2020-10-19 11:19:57 +02:00
shinichi e9e3381960 icon works 2020-10-16 16:32:17 +02:00
shinichi 75ff7fe336 Merge remote-tracking branch 'origin/develop' into develop 2020-10-16 16:24:13 +02:00
shinichi cc046d6611 wip 2020-10-16 16:24:07 +02:00
shinichi e8a4901f09 fix 2020-10-16 15:15:09 +02:00
shinichi fd9b321292 doctor can see patients who logged on before 2020-10-16 15:02:19 +02:00
shinichi 6fb9d0efaa Merge branch 'doctor-client-connecting' into develop 2020-10-16 12:49:18 +02:00
shinichi 540a640bc6 removed debuggers 2020-10-16 12:49:06 +02:00
shinichi 777ed65707 Merge branch 'develop' into doctor-client-connecting 2020-10-16 12:19:04 +02:00
shinichi 44abffd7e7 closing windows works 2020-10-16 12:18:46 +02:00
shinichi 9ef51ddeca connecting to doctor after works 2020-10-16 12:18:03 +02:00
shinichi ac11f6c53b Merge remote-tracking branch 'origin/develop' into develop 2020-10-16 11:25:39 +02:00
shinichi 5bacfdc8ce added so only one doctor can login to server 2020-10-16 11:25:35 +02:00
shinichi df37c9bd58 made doctor window fancy 2020-10-16 11:18:29 +02:00
shinichi 6ec09ec995 error catching 2020-10-16 10:51:45 +02:00
shinichi 813545c2da Merge branch 'ValueConverters' into develop 2020-10-16 10:41:52 +02:00
shinichi 29037f1774 status is now shown by image 2020-10-16 10:41:38 +02:00
shinichi 5280e70feb wip 2020-10-16 10:13:59 +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
shinichi bbb0220c11 Merge branch 'window-restyle' into develop 2020-10-14 15:54:02 +02:00
shinichi adf8435822 got rid of navigation ui 2020-10-14 15:53:52 +02:00
shinichi ed19714338 Merge branch 'develop' into window-restyle 2020-10-14 15:30:00 +02:00
shinichi c13cdf64b6 window works 2020-10-14 15:29:19 +02:00
shinichi 756c646b93 before removing shadows 2020-10-14 14:55:58 +02:00
shinichi 6bec8f1651 wip 2020-10-14 14:35:02 +02:00
shinichi 56de6cfa24 wip 2020-10-14 12:05:28 +02:00
shinichi 3822508b4c added empty resource files 2020-10-14 09:53:49 +02:00
shinichi 2e5dbeee14 added icon 2020-10-14 09:34:47 +02:00
shinichi ee8333e6af try login failed popup to align 
plz someone fix
 2020-10-14 08:55:31 +02:00
shinichi 6ed069d0f3 Merge branch 'try-refactor-to-page' into develop 2020-10-14 08:43:11 +02:00
shinichi fd4fcd0e51 Merge branch 'develop' into try-refactor-to-page 2020-10-14 08:42:53 +02:00
shinichi 073aa8c79a now pages 
background image doesn't work so it is lime
 2020-10-14 08:42:40 +02:00
shinichi 9761d189ec background image 
i give up
 2020-10-09 17:05:11 +02:00
shinichi c8a812508f added folder for future use 2020-10-09 16:29:18 +02:00
shinichi 5fcf0d177b wip 2020-10-09 16:22:28 +02:00
shinichi 278a5adb5e change doctor password field to passwordbox 2020-10-09 16:03:49 +02:00
shinichi 528f515e0b Merge remote-tracking branch 'origin/develop' into develop 2020-10-09 15:37:30 +02:00
shinichi b4088f5d30 edited focusable 2020-10-09 15:37:23 +02:00
shinichi e410e9ec88 login failed popup shows 2020-10-09 15:07:27 +02:00
shinichi 50a2ae9521 added popup not binded yet 2020-10-09 12:18:34 +02:00
shinichi dffeb39337 mainView is now binded 2020-10-09 11:40:52 +02:00
shinichi 2cb3fd5ec3 ble and simulation stop when window closes 2020-10-09 11:33:26 +02:00
shinichi 124eee5f12 implemented stop for BLEHandler and BikeSimulator 2020-10-09 11:16:51 +02:00
shinichi 143f7e4d88 Merge branch 'move-Client-to-ClientApp' into develop 2020-10-07 21:21:19 +02:00
shinichi e09f4f1325 changed names 2020-10-07 21:21:12 +02:00
shinichi a23b268dc9 login working 
uuuuggglyyyyyyyyyyyyyy :(
 2020-10-07 19:45:20 +02:00
shinichi 7bf5bdb1ce delete 2020-10-07 18:34:04 +02:00
shinichi 46083b3912 copy 2020-10-07 17:56:21 +02:00
shinichi 187beaf6c1 Merge branch 'develop' into Client-GUI 2020-10-07 16:42:17 +02:00
shinichi 04b0051e72 Merge branch 'develop' into Client-GUI 2020-10-07 16:32:42 +02:00
shinichi 91bb0d65b7 added status 2020-10-07 16:31:44 +02:00
shinichi d7dfe32cc3 wip 2020-10-07 15:49:57 +02:00
shinichi 6159f3f57b added login logic and text 2020-10-07 15:14:39 +02:00
shinichi 6e2b3a80b3 wip 2020-10-07 13:17:40 +02:00
shinichi 71ff5dfc81 Merge branch 'fix-getBPMgraphdata' into develop 2020-10-07 11:55:56 +02:00
shinichi 472c514275 removed debugging 2020-10-07 11:55:49 +02:00
shinichi 7c943f4f73 fix 2020-10-07 11:54:47 +02:00
shinichi 5d14d53df5 wip 2020-10-02 16:29:11 +02:00
shinichi 09db19246e quick fix 2020-10-02 15:53:50 +02:00
shinichi eb2738168b Merge remote-tracking branch 'origin/develop' into develop 2020-10-02 15:38:00 +02:00
shinichi d85c5ff935 added function to get BPM graph data 2020-10-02 15:37:57 +02:00
shinichi 505c4907d0 Merge branch 'set-resistance' into develop 2020-09-30 19:40:46 +02:00
shinichi a5e679e6fb server now gets response when resistance is set 2020-09-30 19:40:37 +02:00
shinichi adea08cfb7 server can set resistance 2020-09-30 16:22:26 +02:00
shinichi 599b79ceee correctly implemented IHandler 2020-09-30 15:26:34 +02:00
shinichi bd8994ad5b added start and stop session 2020-09-30 15:12:10 +02:00
shinichi 45edbe5936 Merge branch 'binairy-writer' into develop 2020-09-30 14:25:29 +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
shinichi 04e29402f7 Merge remote-tracking branch 'origin/client' into client 2020-09-25 16:38:45 +02:00
shinichi 78bb7f6a6c added possibility for multiple DataReceivers 2020-09-25 16:38:22 +02:00
shinichi a353d6839e added some flair 2020-09-25 15:50:20 +02:00
shinichi 21203fd3ff login implemented 2020-09-25 15:33:39 +02:00
shinichi 9c3b2c3f9b Auto stash before merge of "client" and "origin/client" 2020-09-25 15:00:43 +02:00
shinichi d0071bd13c bug fix 2020-09-25 13:22:16 +02:00
shinichi 8204f22fe7 better printing on client side 2020-09-25 13:18:19 +02:00
shinichi 22558e3289 print received data on client side 2020-09-25 13:11:14 +02:00
shinichi 360ec4175f OnRead for client updated 2020-09-25 13:04:39 +02:00
shinichi 506a074f36 Merge branch 'OnRead-rewrite' into client 2020-09-25 12:58:20 +02:00
shinichi 96f2e6e973 rewrote OnRead 2020-09-25 12:58:12 +02:00
shinichi 2139fcf2b2 removed clientId 2020-09-25 12:51:54 +02:00
shinichi dded1a5b24 johan's code 
senior meeting
 2020-09-25 12:43:01 +02:00
shinichi fb57a1779c comments and some small fixes 2020-09-23 15:37:37 +02:00
shinichi 8c6cb443e3 deleted stuff 2020-09-23 15:22:45 +02:00
shinichi 81dcebb5e8 added client id to protocol 2020-09-23 15:11:13 +02:00
shinichi c782301cf2 connection from bike/simulator to client to server 2020-09-23 15:05:09 +02:00
shinichi d5eadbe529 forgot to stage 2020-09-23 14:32:07 +02:00
shinichi d67c8448ad client and server connect 2020-09-23 14:31:37 +02:00
shinichi 5f7f1c8510 connected to bike? 2020-09-23 14:12:33 +02:00