merge develop -> master

tcgoetz · Mar 20, 2024 · e52ebc2 · e52ebc2
2 parents 79d0087 + 7c15a2d
commit e52ebc2
Show file tree

Hide file tree

Showing 38 changed files with 659 additions and 478 deletions.
diff --git a/Fit b/Fit
diff --git a/Jupyter/activities.ipynb b/Jupyter/activities.ipynb
@@ -17,14 +17,14 @@
     "import snakemd\n",
     "\n",
     "import fitfile\n",
-    "from garmindb import ConfigManager, GarminConnectConfigManager\n",
+    "from garmindb import GarminConnectConfigManager\n",
     "from garmindb.garmindb import GarminDb, Attributes, ActivitiesDb, Activities, StepsActivities, ActivityLaps, ActivityRecords\n",
     "from idbutils.list_and_dict import list_not_none\n",
     "\n",
     "from jupyter_funcs import format_number\n",
     "\n",
     "gc_config = GarminConnectConfigManager()\n",
-    "db_params_dict = ConfigManager.get_db_params()\n",
+    "db_params_dict = gc_config.get_db_params()\n",
     "\n",
     "\n",
     "garmin_db = GarminDb(db_params_dict)\n",

diff --git a/Jupyter/activities_dashboard.ipynb b/Jupyter/activities_dashboard.ipynb
@@ -15,7 +15,7 @@
    "source": [
     "import datetime\n",
     "from ipywidgets import fixed, Layout, interactive\n",
-    "from garmindb import ConfigManager, GarminConnectConfigManager\n",
+    "from garmindb import GarminConnectConfigManager\n",
     "from garmindb.garmindb import GarminDb, Attributes, ActivitiesDb, Activities, ActivityLaps, ActivityRecords\n",
     "from maps import ActivityMap\n",
     "from collections import ChainMap\n",
@@ -71,7 +71,7 @@
    "outputs": [],
    "source": [
     "gc_config = GarminConnectConfigManager()\n",
-    "db_params_dict = ConfigManager.get_db_params()\n",
+    "db_params_dict = gc_config.get_db_params()\n",
     "garmin_db = GarminDb(db_params_dict)\n",
     "garmin_act_db = ActivitiesDb(db_params_dict)\n",
     "measurement_system = Attributes.measurements_type(garmin_db)\n",
@@ -362,7 +362,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.4"
+   "version": "3.11.7"
   }
  },
  "nbformat": 4,

diff --git a/Jupyter/activity.ipynb b/Jupyter/activity.ipynb
@@ -17,7 +17,7 @@
     "import snakemd\n",
     "\n",
     "import fitfile\n",
-    "from garmindb import ConfigManager\n",
+    "from garmindb import GarminConnectConfigManager\n",
     "from garmindb.garmindb import GarminDb, Attributes, Device, ActivitiesDb, Activities, ActivityLaps, ActivityRecords, ActivitiesDevices\n",
     "from idbutils import Location\n",
     "\n",
@@ -29,7 +29,9 @@
     "\n",
     "doc = snakemd.new_doc()\n",
     "\n",
-    "db_params_dict = ConfigManager.get_db_params()\n",
+    "gc_config = GarminConnectConfigManager()\n",
+    "db_params_dict = gc_config.get_db_params()\n",
+    "\n",
     "garmin_db = GarminDb(db_params_dict)\n",
     "garmin_act_db = ActivitiesDb(db_params_dict)\n",
     "measurement_system = Attributes.measurements_type(garmin_db)\n",

diff --git a/Jupyter/checkup.ipynb b/Jupyter/checkup.ipynb
@@ -18,12 +18,13 @@
     "\n",
     "import fitfile\n",
     "import garmindb\n",
-    "from garmindb import ConfigManager\n",
+    "from garmindb import GarminConnectConfigManager\n",
     "from garmindb.garmindb import GarminDb, Device, DeviceInfo, ActivitiesDb, Activities, ActivityLaps, ActivityRecords, StepsActivities\n",
     "\n",
     "doc = snakemd.new_doc()\n",
     "\n",
-    "db_params_dict = ConfigManager.get_db_params()\n",
+    "gc_config = GarminConnectConfigManager()\n",
+    "db_params_dict = gc_config.get_db_params()\n",
     "\n",
     "garmin_db = GarminDb(db_params_dict)\n",
     "\n",

diff --git a/Jupyter/course.ipynb b/Jupyter/course.ipynb
@@ -17,7 +17,7 @@
     "import snakemd\n",
     "\n",
     "import fitfile\n",
-    "from garmindb import ConfigManager\n",
+    "from garmindb import GarminConnectConfigManager\n",
     "from garmindb.garmindb import GarminDb, Attributes, ActivitiesDb, Activities, ActivityLaps, ActivityRecords, StepsActivities\n",
     "\n",
     "from jupyter_funcs import format_number\n",
@@ -29,7 +29,8 @@
     "\n",
     "doc.add_heading(f\"Analysis for Course {course_id}\", 2)\n",
     "\n",
-    "db_params_dict = ConfigManager.get_db_params()\n",
+    "gc_config = GarminConnectConfigManager()\n",
+    "db_params_dict = gc_config.get_db_params()\n",
     "\n",
     "garmin_db = GarminDb(db_params_dict)\n",
     "measurement_system = Attributes.measurements_type(garmin_db)\n",
@@ -83,7 +84,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.4"
+   "version": "3.11.7"
   },
   "orig_nbformat": 4
  },

diff --git a/Jupyter/daily.ipynb b/Jupyter/daily.ipynb
@@ -17,7 +17,7 @@
     "from IPython.display import display, Markdown\n",
     "import snakemd\n",
     "\n",
-    "from garmindb import ConfigManager\n",
+    "from garmindb import GarminConnectConfigManager\n",
     "from garmindb.garmindb import GarminSummaryDb, DaysSummary\n",
     "\n",
     "from jupyter_funcs import format_number\n",
@@ -39,7 +39,8 @@
     "    graph.graph_date(date)\n",
     "\n",
     "\n",
-    "db_params_dict = ConfigManager.get_db_params()\n",
+    "gc_config = GarminConnectConfigManager()\n",
+    "db_params_dict = gc_config.get_db_params()\n",
     "garmin_sum_db = GarminSummaryDb(db_params_dict)\n",
     "\n",
     "graph = Graph()"
@@ -52,7 +53,7 @@
    "outputs": [],
    "source": [
     "\n",
-    "__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 1))\n"
+    "__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 1))"
    ]
   },
   {
@@ -70,7 +71,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 3))\n"
+    "__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 3))"
    ]
   },
   {
@@ -79,7 +80,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 4))\n"
+    "__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 4))"
    ]
   },
   {
@@ -88,7 +89,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 5))\n"
+    "__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 5))"
    ]
   },
   {
@@ -97,7 +98,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 6))\n"
+    "__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 6))"
    ]
   },
   {
@@ -106,7 +107,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 7))\n"
+    "__render_day(garmin_sum_db, graph, datetime.date.today() - datetime.timedelta(days = 7))"
    ]
   }
  ],
@@ -128,7 +129,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.4"
+   "version": "3.11.7"
   },
   "orig_nbformat": 4
  },