Commit Graph

589 Commits

Author SHA1 Message Date
Graham Jones 0bf9567bfb Added checks for null response in volly error callbacks to stop it crashing if there is no network connection. 2022-01-23 06:43:57 +00:00
Graham Jones 990b9e345c Setting up test framework for logmanager - does not do anything useful yet! 2022-01-23 06:29:43 +00:00
Graham Jones 8c7cd852bb Converted all localDB select queries to async tasks 2022-01-21 22:34:55 +00:00
Graham Jones 40251112b6 Updated getEventsList to use a generic asynctask class for doing queries - seems to work so will convert the other 'get' functions to use it 2022-01-21 20:31:01 +00:00
Graham Jones 29bb02b963 Converted some localDB operations to AsyncTask to avoid hogging the UI thread 2022-01-21 11:50:21 +00:00
Graham Jones 13200e95b5 Added OSD Alarm state and refresh button to EditEventActivity 2022-01-21 10:40:16 +00:00
Graham Jones c052178082 LogManagerActivity now displays remote database events and allows editing 2022-01-19 21:01:03 +00:00
Graham Jones 0469604fef EditEventActivity now retrieves data and saves it back to the remote database 2022-01-19 19:01:48 +00:00
Graham Jones a4a1faf67c getEvent seems to be working... 2022-01-17 23:04:43 +00:00
Graham Jones cd5ef5192a Modified EditEvent to use radiobuttons 2022-01-17 22:26:23 +00:00
Graham Jones 307a268c4a Converted eventType from listview to radiogroup 2022-01-17 19:56:40 +00:00
Graham Jones ff9bb06241 Populating ListViews for Event type and sub-type, but can't get the selected one to highlight. Will change to use spinners instead. 2022-01-17 18:34:49 +00:00
Graham Jones 1c20387753 Added edit event activity. Populates event type and sub-type from file stored on remote server. Needs to actually retrieve the event data from the remote database and save it befor eit is working properly. 2022-01-15 22:16:37 +00:00
Graham Jones 01e07f2e12 Disabled logging data to CSV file now we have the database data logging working 2022-01-10 20:39:31 +00:00
Graham Jones dc5719c64c Added delay to allow activity to bind to server before trying to access server variables. 2022-01-10 20:29:36 +00:00
Graham Jones 783abd93f0 Converted LogManagerControlActivity to use the SdServer LogManager instance rather than a separate one - just in case it causes problems... 2022-01-10 19:40:20 +00:00
Graham Jones fefca589dd Tidied up mute alarms button wording (in English!) to avoid the button expanding when muted. 2022-01-10 19:02:07 +00:00
Graham Jones e1f46efe30 Merge branch 'Logging' of https://github.com/OpenSeizureDetector/Android_Pebble_SD into Logging 2022-01-10 16:42:08 +00:00
Graham Jones 6f883cc318 Added 'Raise Alarm' button on main screen 2022-01-10 16:42:02 +00:00
Graham Jones ef27ba430d Added 'Raise Alarm' button on main screen 2022-01-10 16:31:25 +00:00
Graham Jones ee2e5042ec Store remote event Id in local database uploaded field. 2022-01-09 23:08:00 +00:00
Graham Jones 38f6e3233f Added upload status to event list in local database. Added (non-functioning) click listener ready to open a new activity to edit the remote database event entry. 2022-01-08 22:01:23 +00:00
Graham Jones 276f14afba Added data logging preferences to settings page 2022-01-07 22:05:30 +00:00
Graham Jones 5294353bcf Report seizure function now seems to be working. Added list of events to LogManagerControlActivity. Removed redundant files that look similar to the working code. 2022-01-07 20:02:06 +00:00
Graham Jones f303adef50 Added 'Report Seizure' activity. UI seems to work, but database part that looks for the closest datapoint is not working. 2022-01-05 21:55:50 +00:00
Graham Jones 5d9f920b2c Added activity to view the remote database data - needs to point to a (not yet written) ReactJS based page - just shows the API raw data at the moment. 2022-01-05 19:49:23 +00:00
Graham Jones 58a62d1469 Deleting some unused files to tidy up the repository 2022-01-05 18:13:45 +00:00
Graham Jones 8a2bbd1cfb Added LogManagerControl activity to view and control the status of the LogManager 2022-01-05 18:03:46 +00:00
Graham Jones 93c0fc91cc Fixed two issues: Now uploads raw data as well as processed data and will upload ALARM events in preference to WARNING events (you only get one ALARM event uploaded even if the data goes OK->WARNING->ALARM->WARNING->OK 2022-01-05 10:41:50 +00:00
Graham Jones 68bf89b0ff Added prune database option to limit size of local database 2022-01-04 21:08:33 +00:00
Graham Jones 0715ce4f44 Fixed issue with 12 hour times - now uses 24 hour times. 2022-01-04 20:41:54 +00:00
Graham Jones fbb3563f3a Uploading event followed by associated datapoints sort of working. Issues: Using 12 hour clock for date, for a sequence of warning->alarm->warning it is the first warning that is uploaded not the alarm. 2022-01-04 20:32:03 +00:00
Graham Jones 5ac594e81f Sorted out issue with date formats being different for mysql and sqlite - we can now select from local db based on date range. 2022-01-04 11:53:22 +00:00
Graham Jones 7ffdb3c3dc Setting up basic infrastructure for uploading events and datapoints to remote API server. Next step is to upload the required datapoints for each event, and handle network failures etc. 2022-01-03 18:40:45 +00:00
Graham Jones 361e4a09fd Progressing with uploading datapoints to the server...not working yet... 2021-12-17 05:56:36 +00:00
Graham Jones bec437e858 Started adding code to create a datapoint - getting error 405 "POST Not Allowed", which might be an issue with the API 2021-12-16 21:45:08 +00:00
Graham Jones 6031436cc8 Edded function to create new event in remote database 2021-12-16 20:37:11 +00:00
Graham Jones 20f79264fe Fixed authentication UI - it will now save the token to persistent storage and the logout button deletes the stored token 2021-12-12 22:49:30 +00:00
Graham Jones 32ab7d4229 I think we have authentication working - need to test to make sure it saves the token and not a load of extra http response stuff though. 2021-12-12 15:05:24 +00:00
Graham Jones 0a405af092 Starting on an Autenticate activity to obtain access token - the POST parameters are not working yet.... 2021-12-12 06:21:19 +00:00
Graham Jones 276c9d7d1c Re-enabled logging to local db 2021-12-10 21:39:52 +00:00
Graham Jones 35ba15c3d9 Added compiled version 3.7.0b which includes recent BLE data source code as well as oxygen saturation test code 2021-11-13 19:32:00 +00:00
Graham Jones d2840d5958 Merge branch 'BLE' into O2SAT 2021-11-09 21:22:22 +00:00
Graham Jones 2010ed6117 Updated permissions and changed to more recent BLE api to try to get scanning working. 2021-11-09 21:03:17 +00:00
Graham Jones 5a2a93363c Merge branch 'BLE' into O2SAT 2021-11-09 08:16:01 +00:00
Graham Jones 8f14364a90 Added built test version to try out O2 saturation 2021-11-08 21:12:51 +00:00
Graham Jones d822fcf2e9 First go at adding support for O2 Saturation Data - it expects it to be included in the JSON data string as "O2Sat" in a similar way to heart rate. 2021-11-08 21:10:00 +00:00
Graham Jones 354b692222 Improvements to BLE Scan activity to show more information on what is happening 2021-11-07 19:54:39 +00:00
Graham Jones eb2aff577f Added extra logging around fall detection code. 2021-11-07 15:54:51 +00:00
Graham Jones 0161b93922 Merge branch 'V3.6' of https://github.com/OpenSeizureDetector/Android_Pebble_SD into V3.6 2021-02-12 14:36:31 +00:00