Skip to content

Commit e52ebc2

Browse files
committed
merge develop -> master
2 parents 79d0087 + 7c15a2d commit e52ebc2

38 files changed

+659
-478
lines changed

Fit

Submodule Fit updated 1 file

Jupyter/activities.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
"import snakemd\n",
1818
"\n",
1919
"import fitfile\n",
20-
"from garmindb import ConfigManager, GarminConnectConfigManager\n",
20+
"from garmindb import GarminConnectConfigManager\n",
2121
"from garmindb.garmindb import GarminDb, Attributes, ActivitiesDb, Activities, StepsActivities, ActivityLaps, ActivityRecords\n",
2222
"from idbutils.list_and_dict import list_not_none\n",
2323
"\n",
2424
"from jupyter_funcs import format_number\n",
2525
"\n",
2626
"gc_config = GarminConnectConfigManager()\n",
27-
"db_params_dict = ConfigManager.get_db_params()\n",
27+
"db_params_dict = gc_config.get_db_params()\n",
2828
"\n",
2929
"\n",
3030
"garmin_db = GarminDb(db_params_dict)\n",

Jupyter/activities_dashboard.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"source": [
1616
"import datetime\n",
1717
"from ipywidgets import fixed, Layout, interactive\n",
18-
"from garmindb import ConfigManager, GarminConnectConfigManager\n",
18+
"from garmindb import GarminConnectConfigManager\n",
1919
"from garmindb.garmindb import GarminDb, Attributes, ActivitiesDb, Activities, ActivityLaps, ActivityRecords\n",
2020
"from maps import ActivityMap\n",
2121
"from collections import ChainMap\n",
@@ -71,7 +71,7 @@
7171
"outputs": [],
7272
"source": [
7373
"gc_config = GarminConnectConfigManager()\n",
74-
"db_params_dict = ConfigManager.get_db_params()\n",
74+
"db_params_dict = gc_config.get_db_params()\n",
7575
"garmin_db = GarminDb(db_params_dict)\n",
7676
"garmin_act_db = ActivitiesDb(db_params_dict)\n",
7777
"measurement_system = Attributes.measurements_type(garmin_db)\n",
@@ -362,7 +362,7 @@
362362
"name": "python",
363363
"nbconvert_exporter": "python",
364364
"pygments_lexer": "ipython3",
365-
"version": "3.11.4"
365+
"version": "3.11.7"
366366
}
367367
},
368368
"nbformat": 4,

Jupyter/activity.ipynb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"import snakemd\n",
1818
"\n",
1919
"import fitfile\n",
20-
"from garmindb import ConfigManager\n",
20+
"from garmindb import GarminConnectConfigManager\n",
2121
"from garmindb.garmindb import GarminDb, Attributes, Device, ActivitiesDb, Activities, ActivityLaps, ActivityRecords, ActivitiesDevices\n",
2222
"from idbutils import Location\n",
2323
"\n",
@@ -29,7 +29,9 @@
2929
"\n",
3030
"doc = snakemd.new_doc()\n",
3131
"\n",
32-
"db_params_dict = ConfigManager.get_db_params()\n",
32+
"gc_config = GarminConnectConfigManager()\n",
33+
"db_params_dict = gc_config.get_db_params()\n",
34+
"\n",
3335
"garmin_db = GarminDb(db_params_dict)\n",
3436
"garmin_act_db = ActivitiesDb(db_params_dict)\n",
3537
"measurement_system = Attributes.measurements_type(garmin_db)\n",

Jupyter/checkup.ipynb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818
"\n",
1919
"import fitfile\n",
2020
"import garmindb\n",
21-
"from garmindb import ConfigManager\n",
21+
"from garmindb import GarminConnectConfigManager\n",
2222
"from garmindb.garmindb import GarminDb, Device, DeviceInfo, ActivitiesDb, Activities, ActivityLaps, ActivityRecords, StepsActivities\n",
2323
"\n",
2424
"doc = snakemd.new_doc()\n",
2525
"\n",
26-
"db_params_dict = ConfigManager.get_db_params()\n",
26+
"gc_config = GarminConnectConfigManager()\n",
27+
"db_params_dict = gc_config.get_db_params()\n",
2728
"\n",
2829
"garmin_db = GarminDb(db_params_dict)\n",
2930
"\n",

Jupyter/course.ipynb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"import snakemd\n",
1818
"\n",
1919
"import fitfile\n",
20-
"from garmindb import ConfigManager\n",
20+
"from garmindb import GarminConnectConfigManager\n",
2121
"from garmindb.garmindb import GarminDb, Attributes, ActivitiesDb, Activities, ActivityLaps, ActivityRecords, StepsActivities\n",
2222
"\n",
2323
"from jupyter_funcs import format_number\n",
@@ -29,7 +29,8 @@
2929
"\n",
3030
"doc.add_heading(f\"Analysis for Course {course_id}\", 2)\n",
3131
"\n",
32-
"db_params_dict = ConfigManager.get_db_params()\n",
32+
"gc_config = GarminConnectConfigManager()\n",
33+
"db_params_dict = gc_config.get_db_params()\n",
3334
"\n",
3435
"garmin_db = GarminDb(db_params_dict)\n",
3536
"measurement_system = Attributes.measurements_type(garmin_db)\n",
@@ -83,7 +84,7 @@
8384
"name": "python",
8485
"nbconvert_exporter": "python",
8586
"pygments_lexer": "ipython3",
86-
"version": "3.11.4"
87+
"version": "3.11.7"
8788
},
8889
"orig_nbformat": 4
8990
},

Jupyter/daily.ipynb

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"from IPython.display import display, Markdown\n",
1818
"import snakemd\n",
1919
"\n",
20-
"from garmindb import ConfigManager\n",
20+
"from garmindb import GarminConnectConfigManager\n",
2121
"from garmindb.garmindb import GarminSummaryDb, DaysSummary\n",
2222
"\n",
2323
"from jupyter_funcs import format_number\n",
@@ -39,7 +39,8 @@
3939
" graph.graph_date(date)\n",
4040
"\n",
4141
"\n",
42-
"db_params_dict = ConfigManager.get_db_params()\n",
42+
"gc_config = GarminConnectConfigManager()\n",
43+
"db_params_dict = gc_config.get_db_params()\n",
4344
"garmin_sum_db = GarminSummaryDb(db_params_dict)\n",
4445
"\n",
4546
"graph = Graph()"
@@ -52,7 +53,7 @@
5253
"outputs": [],
5354
"source": [
5455
"\n",
55-
"__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 1))\n"
56+
"__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 1))"
5657
]
5758
},
5859
{
@@ -70,7 +71,7 @@
7071
"metadata": {},
7172
"outputs": [],
7273
"source": [
73-
"__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 3))\n"
74+
"__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 3))"
7475
]
7576
},
7677
{
@@ -79,7 +80,7 @@
7980
"metadata": {},
8081
"outputs": [],
8182
"source": [
82-
"__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 4))\n"
83+
"__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 4))"
8384
]
8485
},
8586
{
@@ -88,7 +89,7 @@
8889
"metadata": {},
8990
"outputs": [],
9091
"source": [
91-
"__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 5))\n"
92+
"__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 5))"
9293
]
9394
},
9495
{
@@ -97,7 +98,7 @@
9798
"metadata": {},
9899
"outputs": [],
99100
"source": [
100-
"__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 6))\n"
101+
"__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 6))"
101102
]
102103
},
103104
{
@@ -106,7 +107,7 @@
106107
"metadata": {},
107108
"outputs": [],
108109
"source": [
109-
"__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 7))\n"
110+
"__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 7))"
110111
]
111112
}
112113
],
@@ -128,7 +129,7 @@
128129
"name": "python",
129130
"nbconvert_exporter": "python",
130131
"pygments_lexer": "ipython3",
131-
"version": "3.11.4"
132+
"version": "3.11.7"
132133
},
133134
"orig_nbformat": 4
134135
},

0 commit comments

Comments
 (0)