diff --git a/tconnectsync/api/common.py b/tconnectsync/api/common.py index 2425f66..2a6fbe8 100644 --- a/tconnectsync/api/common.py +++ b/tconnectsync/api/common.py @@ -13,7 +13,7 @@ def parse_date(date): def parse_ymd_date(date): if type(date) == str: - return date + date = arrow.get(date) return (date or datetime.datetime.now()).strftime('%Y-%m-%d') def parsed_date_to_arrow(date): @@ -122,11 +122,11 @@ def split_days_range(start_a, end_a, days: int = 5) -> List[Tuple[str, str]]: if (cur - cur_s).days >= days-1: ranges.append((cur_s, cur)) cur_s = cur + datetime.timedelta(days=1) - + cur += datetime.timedelta(days=1) if len(ranges) > 0 and (end - ranges[-1][-1]).days > 0: ranges.append((cur_s, end)) - + return ranges class ApiException(Exception): diff --git a/tconnectsync/sync/tandemsource/process.py b/tconnectsync/sync/tandemsource/process.py index 18e7e47..6ee7fdd 100644 --- a/tconnectsync/sync/tandemsource/process.py +++ b/tconnectsync/sync/tandemsource/process.py @@ -91,6 +91,6 @@ class ProcessTimeRange: else: logger.info("Skipping %s, is not enabled from features %s" % (updater_class.__name__, self.features)) - + logger.info("Processed %d events" % processed_count) return processed_count diff --git a/tconnectsync/sync/tandemsource/process_alarm.py b/tconnectsync/sync/tandemsource/process_alarm.py index 0acb5ec..4d5763b 100644 --- a/tconnectsync/sync/tandemsource/process_alarm.py +++ b/tconnectsync/sync/tandemsource/process_alarm.py @@ -62,7 +62,7 @@ class ProcessAlarm: if type(event) == eventtypes.LidAlarmActivated: return NightscoutEntry.alarm( created_at = event.eventTimestamp.format(), - reason = event.alarmid, + reason = "%s" % event.alarmid.name, pump_event_id = "%s" % event.eventId ) elif type(event) == eventtypes.LidMalfunctionActivated: diff --git a/tconnectsync/sync/tandemsource/process_cartridge.py b/tconnectsync/sync/tandemsource/process_cartridge.py index deef702..0af4971 100644 --- a/tconnectsync/sync/tandemsource/process_cartridge.py +++ b/tconnectsync/sync/tandemsource/process_cartridge.py @@ -88,7 +88,7 @@ class ProcessCartridge: def cannula_to_nsentry(self, cannulaFilled): return NightscoutEntry.sitechange( created_at = cannulaFilled.eventTimestamp.format(), - reason = "Cannula Filled" + (" (%du primed)" % round(cannulaFilled.primesize) if cannulaFilled.primesize else ""), + reason = "Cannula Filled" + (" (%du primed)" % round(cannulaFilled.primesize, 2) if cannulaFilled.primesize else ""), pump_event_id = "%s" % cannulaFilled.eventId )