Refactor method names for clarity and consistency across the application

- Renamed `initialize_csv` to `_initialize_csv_file` in `DataManager` for better clarity.
- Updated method calls in `GraphManager` from `_create_toggle_controls` to `_create_chart_toggles` and `_on_toggle_changed` to `_handle_toggle_changed`.
- Changed method names in `MedTrackerApp` from `on_closing` to `handle_window_closing`, `add_entry` to `add_new_entry`, and `load_data` to `refresh_data_display`.
- Adjusted corresponding test method names in `TestMedTrackerApp` to reflect the new method names.
- Updated `UIManager` method names from `setup_icon` to `setup_application_icon` and adjusted related tests accordingly.

.gitea/workflows/build.yaml

@@ -14,6 +14,8 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # Fetch full history for release notes generation
 
       - name: Install Docker
         run: curl -fsSL https://get.docker.com | sh
@@ -55,3 +57,49 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=registry,ref=gitea-http.taildb3494.ts.net/will/thechart:buildcache
           cache-to: type=registry,ref=gitea-http.taildb3494.ts.net/will/thechart:buildcache,mode=max
+
+      - name: Generate release notes
+        id: release_notes
+        if: startsWith(gitea.ref, 'refs/tags/')
+        run: |
+          # Get the current tag
+          CURRENT_TAG=${GITEA_REF#refs/tags/}
+
+          # Get the previous tag
+          PREVIOUS_TAG=$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || echo "")
+
+          # Generate release notes from commits
+          if [ -n "$PREVIOUS_TAG" ]; then
+            echo "## Changes from $PREVIOUS_TAG to $CURRENT_TAG" > release_notes.md
+            echo "" >> release_notes.md
+            git log --pretty=format:"- %s (%h)" $PREVIOUS_TAG..$CURRENT_TAG >> release_notes.md
+          else
+            echo "## Initial Release $CURRENT_TAG" > release_notes.md
+            echo "" >> release_notes.md
+            git log --pretty=format:"- %s (%h)" >> release_notes.md
+          fi
+
+          # Add Docker image information
+          echo "" >> release_notes.md
+          echo "## Docker Images" >> release_notes.md
+          echo "" >> release_notes.md
+          echo "This release includes multi-platform Docker images:" >> release_notes.md
+          echo "- \`gitea-http.taildb3494.ts.net/will/thechart:$CURRENT_TAG\`" >> release_notes.md
+          echo "- \`gitea-http.taildb3494.ts.net/will/thechart:latest\`" >> release_notes.md
+
+          # Output the release notes content for use in next step
+          echo "release_notes<<EOF" >> $GITEA_OUTPUT
+          cat release_notes.md >> $GITEA_OUTPUT
+          echo "EOF" >> $GITEA_OUTPUT
+
+      - name: Create Release
+        if: startsWith(gitea.ref, 'refs/tags/')
+        uses: actions/create-release@v1
+        env:
+          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        with:
+          tag_name: ${{ gitea.ref_name }}
+          release_name: Release ${{ gitea.ref_name }}
+          body: ${{ steps.release_notes.outputs.release_notes }}
+          draft: false
+          prerelease: false

Dockerfile

@@ -53,6 +53,11 @@ RUN sh -c "pyinstaller --name ${TARGET} --optimize 2 --onefile --windowed --hidd
 RUN chown -R ${UID}:${GUID} /home/docker_user/
 RUN chmod -R 777 /home/docker_user/${TARGET}
 
+RUN mkdir -p /app/logs && \
+    touch /app/logs/app.log && \
+    chown -R ${UID}:${GUID} /app/logs && \
+    chmod 666 /app/logs/app.log
+
 # Set environment variables for X11 forwarding
 ENV DISPLAY=:0
 ENV XAUTHORITY=/tmp/.docker.xauth

Makefile

@@ -88,7 +88,7 @@ build: ## Build the Docker image
 	docker buildx build --platform linux/amd64,linux/arm64 -t ${IMAGE} --push .
 deploy: ## Deploy the application as a standalone executable
 	@echo "Deploying the application..."
-	pyinstaller --name ${TARGET} --optimize 2 --onefile --windowed --hidden-import='PIL._tkinter_finder' --icon='${ICON}' --add-data="./.env:." --add-data='./chart-671.png:.' --add-data='./thechart_data.csv:.' src/main.py
+	pyinstaller --name ${TARGET} --optimize 2 --onefile --windowed --hidden-import='PIL._tkinter_finder' --icon='${ICON}' --add-data="./.env:." --add-data='./chart-671.png:.' --add-data='./thechart_data.csv:.' --log-level=DEBUG src/main.py
 	cp -f ./thechart_data.csv ${ROOT}/Documents/
 	cp -f ./dist/${TARGET} ${ROOT}/Applications/
 	cp -f ./deploy/${TARGET}.desktop ${ROOT}/.local/share/applications/
@@ -133,14 +133,9 @@ test-edit-functionality: ## Test the enhanced edit functionality
 test-edit-window: $(VENV_ACTIVATE)  ## Test edit window functionality (save and delete)
 	@echo "Running edit window functionality test..."
 	$(PYTHON) scripts/test_edit_window_functionality.py
-
 test-dose-editing: $(VENV_ACTIVATE)  ## Test dose editing functionality in edit window
 	@echo "Running dose editing functionality test..."
 	$(PYTHON) scripts/test_dose_editing_functionality.py
-
-migrate-csv: $(VENV_ACTIVATE)  ## Migrate CSV to new format with dose tracking
-	@echo "Migrating CSV to new format..."
-	.venv/bin/python migrate_csv.py
 lint: ## Run the linter
 	@echo "Running the linter..."
 	docker-compose exec ${TARGET} pipenv run pre-commit run --all-files

coverage.xml

@@ -1,756 +0,0 @@
-<?xml version="1.0" ?>
-<coverage version="7.10.1" timestamp="1753820440721" lines-valid="702" lines-covered="511" line-rate="0.7279" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
-	<!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.10.1 -->
-	<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
-	<sources>
-		<source>/home/will/Code/thechart/src</source>
-	</sources>
-	<packages>
-		<package name="." line-rate="0.7279" branch-rate="0" complexity="0">
-			<classes>
-				<class name="__init__.py" filename="__init__.py" complexity="0" line-rate="0" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="3" hits="0"/>
-						<line number="4" hits="0"/>
-						<line number="5" hits="0"/>
-					</lines>
-				</class>
-				<class name="constants.py" filename="constants.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-					</lines>
-				</class>
-				<class name="data_manager.py" filename="data_manager.py" complexity="0" line-rate="0.5673" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="71" hits="1"/>
-						<line number="72" hits="0"/>
-						<line number="73" hits="0"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="1"/>
-						<line number="76" hits="1"/>
-						<line number="78" hits="1"/>
-						<line number="80" hits="1"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="1"/>
-						<line number="87" hits="1"/>
-						<line number="89" hits="1"/>
-						<line number="90" hits="1"/>
-						<line number="91" hits="1"/>
-						<line number="92" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="1"/>
-						<line number="95" hits="1"/>
-						<line number="97" hits="1"/>
-						<line number="99" hits="1"/>
-						<line number="100" hits="1"/>
-						<line number="101" hits="1"/>
-						<line number="104" hits="1"/>
-						<line number="105" hits="1"/>
-						<line number="108" hits="1"/>
-						<line number="112" hits="1"/>
-						<line number="114" hits="0"/>
-						<line number="135" hits="1"/>
-						<line number="150" hits="0"/>
-						<line number="151" hits="0"/>
-						<line number="152" hits="1"/>
-						<line number="153" hits="1"/>
-						<line number="154" hits="1"/>
-						<line number="156" hits="1"/>
-						<line number="158" hits="1"/>
-						<line number="159" hits="1"/>
-						<line number="161" hits="1"/>
-						<line number="163" hits="1"/>
-						<line number="164" hits="1"/>
-						<line number="165" hits="0"/>
-						<line number="166" hits="0"/>
-						<line number="167" hits="0"/>
-						<line number="169" hits="1"/>
-						<line number="171" hits="0"/>
-						<line number="173" hits="0"/>
-						<line number="174" hits="0"/>
-						<line number="175" hits="0"/>
-						<line number="176" hits="0"/>
-						<line number="179" hits="0"/>
-						<line number="181" hits="0"/>
-						<line number="197" hits="0"/>
-						<line number="200" hits="0"/>
-						<line number="201" hits="0"/>
-						<line number="202" hits="0"/>
-						<line number="204" hits="0"/>
-						<line number="205" hits="0"/>
-						<line number="207" hits="0"/>
-						<line number="210" hits="0"/>
-						<line number="212" hits="0"/>
-						<line number="213" hits="0"/>
-						<line number="214" hits="0"/>
-						<line number="215" hits="0"/>
-						<line number="216" hits="0"/>
-						<line number="218" hits="1"/>
-						<line number="222" hits="0"/>
-						<line number="223" hits="0"/>
-						<line number="224" hits="0"/>
-						<line number="225" hits="0"/>
-						<line number="227" hits="0"/>
-						<line number="228" hits="0"/>
-						<line number="230" hits="0"/>
-						<line number="231" hits="0"/>
-						<line number="233" hits="0"/>
-						<line number="234" hits="0"/>
-						<line number="235" hits="0"/>
-						<line number="236" hits="0"/>
-						<line number="237" hits="0"/>
-						<line number="239" hits="0"/>
-						<line number="240" hits="0"/>
-						<line number="241" hits="0"/>
-						<line number="242" hits="0"/>
-					</lines>
-				</class>
-				<class name="graph_manager.py" filename="graph_manager.py" complexity="0" line-rate="0.971" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="56" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="69" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="76" hits="1"/>
-						<line number="78" hits="1"/>
-						<line number="80" hits="0"/>
-						<line number="81" hits="0"/>
-						<line number="83" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="86" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="90" hits="1"/>
-						<line number="91" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="1"/>
-						<line number="95" hits="1"/>
-						<line number="96" hits="1"/>
-						<line number="99" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="103" hits="1"/>
-						<line number="106" hits="1"/>
-						<line number="107" hits="1"/>
-						<line number="108" hits="1"/>
-						<line number="109" hits="1"/>
-						<line number="110" hits="1"/>
-						<line number="111" hits="1"/>
-						<line number="112" hits="1"/>
-						<line number="113" hits="1"/>
-						<line number="114" hits="1"/>
-						<line number="117" hits="1"/>
-						<line number="120" hits="1"/>
-						<line number="121" hits="1"/>
-						<line number="122" hits="1"/>
-						<line number="123" hits="1"/>
-						<line number="124" hits="1"/>
-						<line number="125" hits="1"/>
-						<line number="128" hits="1"/>
-						<line number="130" hits="1"/>
-						<line number="139" hits="1"/>
-						<line number="147" hits="1"/>
-						<line number="149" hits="1"/>
-					</lines>
-				</class>
-				<class name="init.py" filename="init.py" complexity="0" line-rate="0.9524" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="28" hits="0"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-					</lines>
-				</class>
-				<class name="logger.py" filename="logger.py" complexity="0" line-rate="1" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="9" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="15" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="24" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="38" hits="1"/>
-						<line number="40" hits="1"/>
-					</lines>
-				</class>
-				<class name="main.py" filename="main.py" complexity="0" line-rate="0.7857" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="11" hits="1"/>
-						<line number="12" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="14" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="19" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="21" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="31" hits="1"/>
-						<line number="32" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="41" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="55" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="62" hits="1"/>
-						<line number="63" hits="1"/>
-						<line number="66" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="71" hits="1"/>
-						<line number="72" hits="1"/>
-						<line number="73" hits="1"/>
-						<line number="76" hits="1"/>
-						<line number="77" hits="1"/>
-						<line number="80" hits="1"/>
-						<line number="81" hits="1"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="84" hits="1"/>
-						<line number="85" hits="1"/>
-						<line number="88" hits="1"/>
-						<line number="102" hits="1"/>
-						<line number="103" hits="1"/>
-						<line number="104" hits="1"/>
-						<line number="107" hits="1"/>
-						<line number="109" hits="1"/>
-						<line number="111" hits="1"/>
-						<line number="112" hits="1"/>
-						<line number="113" hits="1"/>
-						<line number="114" hits="1"/>
-						<line number="115" hits="1"/>
-						<line number="116" hits="1"/>
-						<line number="118" hits="1"/>
-						<line number="120" hits="0"/>
-						<line number="123" hits="0"/>
-						<line number="124" hits="0"/>
-						<line number="125" hits="0"/>
-						<line number="127" hits="0"/>
-						<line number="147" hits="0"/>
-						<line number="150" hits="0"/>
-						<line number="156" hits="0"/>
-						<line number="158" hits="1"/>
-						<line number="176" hits="0"/>
-						<line number="195" hits="0"/>
-						<line number="196" hits="0"/>
-						<line number="197" hits="0"/>
-						<line number="200" hits="0"/>
-						<line number="201" hits="0"/>
-						<line number="204" hits="0"/>
-						<line number="205" hits="0"/>
-						<line number="206" hits="0"/>
-						<line number="213" hits="0"/>
-						<line number="215" hits="1"/>
-						<line number="216" hits="1"/>
-						<line number="219" hits="1"/>
-						<line number="220" hits="1"/>
-						<line number="222" hits="1"/>
-						<line number="225" hits="1"/>
-						<line number="226" hits="1"/>
-						<line number="227" hits="1"/>
-						<line number="228" hits="1"/>
-						<line number="229" hits="1"/>
-						<line number="230" hits="1"/>
-						<line number="232" hits="1"/>
-						<line number="233" hits="1"/>
-						<line number="234" hits="1"/>
-						<line number="237" hits="1"/>
-						<line number="238" hits="1"/>
-						<line number="241" hits="1"/>
-						<line number="243" hits="1"/>
-						<line number="244" hits="1"/>
-						<line number="247" hits="1"/>
-						<line number="248" hits="1"/>
-						<line number="249" hits="1"/>
-						<line number="251" hits="1"/>
-						<line number="269" hits="1"/>
-						<line number="272" hits="1"/>
-						<line number="273" hits="1"/>
-						<line number="274" hits="1"/>
-						<line number="276" hits="0"/>
-						<line number="277" hits="0"/>
-						<line number="280" hits="0"/>
-						<line number="281" hits="0"/>
-						<line number="284" hits="0"/>
-						<line number="285" hits="0"/>
-						<line number="286" hits="0"/>
-						<line number="293" hits="0"/>
-						<line number="295" hits="1"/>
-						<line number="297" hits="1"/>
-						<line number="298" hits="1"/>
-						<line number="304" hits="1"/>
-						<line number="305" hits="0"/>
-						<line number="307" hits="0"/>
-						<line number="308" hits="0"/>
-						<line number="309" hits="0"/>
-						<line number="312" hits="0"/>
-						<line number="314" hits="0"/>
-						<line number="316" hits="1"/>
-						<line number="318" hits="1"/>
-						<line number="319" hits="1"/>
-						<line number="320" hits="1"/>
-						<line number="321" hits="1"/>
-						<line number="322" hits="1"/>
-						<line number="323" hits="1"/>
-						<line number="324" hits="1"/>
-						<line number="326" hits="1"/>
-						<line number="328" hits="1"/>
-						<line number="331" hits="1"/>
-						<line number="332" hits="1"/>
-						<line number="335" hits="1"/>
-						<line number="338" hits="1"/>
-						<line number="340" hits="1"/>
-						<line number="355" hits="1"/>
-						<line number="356" hits="0"/>
-						<line number="359" hits="1"/>
-						<line number="361" hits="1"/>
-						<line number="362" hits="1"/>
-						<line number="363" hits="1"/>
-						<line number="366" hits="1"/>
-					</lines>
-				</class>
-				<class name="ui_manager.py" filename="ui_manager.py" complexity="0" line-rate="0.6614" branch-rate="0">
-					<methods/>
-					<lines>
-						<line number="1" hits="1"/>
-						<line number="2" hits="1"/>
-						<line number="3" hits="1"/>
-						<line number="4" hits="1"/>
-						<line number="5" hits="1"/>
-						<line number="6" hits="1"/>
-						<line number="7" hits="1"/>
-						<line number="8" hits="1"/>
-						<line number="10" hits="1"/>
-						<line number="13" hits="1"/>
-						<line number="16" hits="1"/>
-						<line number="17" hits="1"/>
-						<line number="18" hits="1"/>
-						<line number="20" hits="1"/>
-						<line number="22" hits="1"/>
-						<line number="23" hits="1"/>
-						<line number="26" hits="1"/>
-						<line number="28" hits="1"/>
-						<line number="29" hits="1"/>
-						<line number="33" hits="1"/>
-						<line number="34" hits="1"/>
-						<line number="35" hits="1"/>
-						<line number="36" hits="1"/>
-						<line number="37" hits="1"/>
-						<line number="39" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="43" hits="1"/>
-						<line number="44" hits="1"/>
-						<line number="45" hits="0"/>
-						<line number="46" hits="0"/>
-						<line number="47" hits="1"/>
-						<line number="48" hits="1"/>
-						<line number="49" hits="1"/>
-						<line number="50" hits="1"/>
-						<line number="51" hits="1"/>
-						<line number="52" hits="1"/>
-						<line number="54" hits="1"/>
-						<line number="57" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1"/>
-						<line number="60" hits="1"/>
-						<line number="63" hits="1"/>
-						<line number="64" hits="1"/>
-						<line number="67" hits="1"/>
-						<line number="70" hits="1"/>
-						<line number="71" hits="1"/>
-						<line number="74" hits="1"/>
-						<line number="75" hits="0"/>
-						<line number="77" hits="1"/>
-						<line number="78" hits="0"/>
-						<line number="80" hits="1"/>
-						<line number="81" hits="1"/>
-						<line number="82" hits="1"/>
-						<line number="83" hits="1"/>
-						<line number="86" hits="1"/>
-						<line number="87" hits="1"/>
-						<line number="90" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="0"/>
-						<line number="95" hits="0"/>
-						<line number="97" hits="1"/>
-						<line number="100" hits="1"/>
-						<line number="108" hits="1"/>
-						<line number="115" hits="1"/>
-						<line number="116" hits="1"/>
-						<line number="119" hits="1"/>
-						<line number="128" hits="1"/>
-						<line number="131" hits="1"/>
-						<line number="132" hits="1"/>
-						<line number="133" hits="1"/>
-						<line number="136" hits="1"/>
-						<line number="144" hits="1"/>
-						<line number="146" hits="1"/>
-						<line number="151" hits="1"/>
-						<line number="152" hits="1"/>
-						<line number="154" hits="1"/>
-						<line number="157" hits="1"/>
-						<line number="161" hits="1"/>
-						<line number="164" hits="1"/>
-						<line number="169" hits="1"/>
-						<line number="172" hits="1"/>
-						<line number="180" hits="1"/>
-						<line number="182" hits="1"/>
-						<line number="185" hits="1"/>
-						<line number="188" hits="1"/>
-						<line number="189" hits="1"/>
-						<line number="191" hits="1"/>
-						<line number="205" hits="1"/>
-						<line number="207" hits="1"/>
-						<line number="221" hits="1"/>
-						<line number="222" hits="1"/>
-						<line number="224" hits="1"/>
-						<line number="238" hits="1"/>
-						<line number="239" hits="1"/>
-						<line number="241" hits="1"/>
-						<line number="244" hits="1"/>
-						<line number="245" hits="1"/>
-						<line number="246" hits="1"/>
-						<line number="248" hits="1"/>
-						<line number="250" hits="1"/>
-						<line number="252" hits="1"/>
-						<line number="253" hits="1"/>
-						<line number="254" hits="1"/>
-						<line number="256" hits="1"/>
-						<line number="260" hits="1"/>
-						<line number="261" hits="1"/>
-						<line number="263" hits="1"/>
-						<line number="264" hits="1"/>
-						<line number="275" hits="1"/>
-						<line number="277" hits="1"/>
-						<line number="281" hits="1"/>
-						<line number="282" hits="1"/>
-						<line number="283" hits="1"/>
-						<line number="284" hits="1"/>
-						<line number="287" hits="1"/>
-						<line number="290" hits="1"/>
-						<line number="292" hits="1"/>
-						<line number="293" hits="1"/>
-						<line number="300" hits="1"/>
-						<line number="301" hits="0"/>
-						<line number="303" hits="0"/>
-						<line number="319" hits="0"/>
-						<line number="320" hits="0"/>
-						<line number="322" hits="0"/>
-						<line number="342" hits="0"/>
-						<line number="344" hits="0"/>
-						<line number="345" hits="0"/>
-						<line number="365" hits="1"/>
-						<line number="368" hits="1"/>
-						<line number="369" hits="1"/>
-						<line number="372" hits="1"/>
-						<line number="375" hits="1"/>
-						<line number="376" hits="1"/>
-						<line number="387" hits="1"/>
-						<line number="390" hits="1"/>
-						<line number="391" hits="1"/>
-						<line number="392" hits="1"/>
-						<line number="395" hits="1"/>
-						<line number="400" hits="1"/>
-						<line number="401" hits="1"/>
-						<line number="404" hits="1"/>
-						<line number="405" hits="1"/>
-						<line number="406" hits="1"/>
-						<line number="408" hits="1"/>
-						<line number="410" hits="1"/>
-						<line number="420" hits="1"/>
-						<line number="423" hits="1"/>
-						<line number="424" hits="1"/>
-						<line number="425" hits="0"/>
-						<line number="426" hits="0"/>
-						<line number="427" hits="0"/>
-						<line number="429" hits="1"/>
-						<line number="437" hits="1"/>
-						<line number="445" hits="1"/>
-						<line number="446" hits="1"/>
-						<line number="447" hits="1"/>
-						<line number="448" hits="1"/>
-						<line number="449" hits="1"/>
-						<line number="450" hits="1"/>
-						<line number="451" hits="0"/>
-						<line number="452" hits="0"/>
-						<line number="453" hits="0"/>
-						<line number="457" hits="1"/>
-						<line number="458" hits="0"/>
-						<line number="459" hits="0"/>
-						<line number="460" hits="0"/>
-						<line number="464" hits="1"/>
-						<line number="465" hits="1"/>
-						<line number="469" hits="1"/>
-						<line number="470" hits="1"/>
-						<line number="472" hits="1"/>
-						<line number="476" hits="1"/>
-						<line number="478" hits="1"/>
-						<line number="482" hits="1"/>
-						<line number="483" hits="1"/>
-						<line number="484" hits="1"/>
-						<line number="486" hits="1"/>
-						<line number="489" hits="1"/>
-						<line number="492" hits="1"/>
-						<line number="493" hits="1"/>
-						<line number="496" hits="1"/>
-						<line number="497" hits="1"/>
-						<line number="499" hits="1"/>
-						<line number="500" hits="1"/>
-						<line number="501" hits="1"/>
-						<line number="502" hits="1"/>
-						<line number="504" hits="1"/>
-						<line number="515" hits="1"/>
-						<line number="518" hits="1"/>
-						<line number="519" hits="1"/>
-						<line number="521" hits="1"/>
-						<line number="529" hits="1"/>
-						<line number="530" hits="1"/>
-						<line number="531" hits="1"/>
-						<line number="532" hits="1"/>
-						<line number="536" hits="1"/>
-						<line number="538" hits="1"/>
-						<line number="546" hits="1"/>
-						<line number="547" hits="1"/>
-						<line number="550" hits="1"/>
-						<line number="552" hits="0"/>
-						<line number="554" hits="0"/>
-						<line number="561" hits="0"/>
-						<line number="563" hits="0"/>
-						<line number="566" hits="0"/>
-						<line number="567" hits="0"/>
-						<line number="571" hits="0"/>
-						<line number="573" hits="0"/>
-						<line number="589" hits="1"/>
-						<line number="596" hits="1"/>
-						<line number="601" hits="1"/>
-						<line number="607" hits="1"/>
-						<line number="611" hits="1"/>
-						<line number="615" hits="1"/>
-						<line number="616" hits="1"/>
-						<line number="617" hits="1"/>
-						<line number="619" hits="1"/>
-						<line number="621" hits="1"/>
-						<line number="623" hits="1"/>
-						<line number="624" hits="1"/>
-						<line number="627" hits="1"/>
-						<line number="628" hits="1"/>
-						<line number="629" hits="1"/>
-						<line number="632" hits="1"/>
-						<line number="635" hits="1"/>
-						<line number="636" hits="1"/>
-						<line number="639" hits="1"/>
-						<line number="642" hits="1"/>
-						<line number="645" hits="1"/>
-						<line number="646" hits="0"/>
-						<line number="648" hits="1"/>
-						<line number="650" hits="1"/>
-						<line number="656" hits="1"/>
-						<line number="659" hits="1"/>
-						<line number="660" hits="0"/>
-						<line number="661" hits="0"/>
-						<line number="662" hits="0"/>
-						<line number="663" hits="0"/>
-						<line number="664" hits="0"/>
-						<line number="666" hits="0"/>
-						<line number="667" hits="0"/>
-						<line number="668" hits="0"/>
-						<line number="669" hits="0"/>
-						<line number="670" hits="0"/>
-						<line number="671" hits="0"/>
-						<line number="673" hits="0"/>
-						<line number="674" hits="0"/>
-						<line number="676" hits="0"/>
-						<line number="678" hits="1"/>
-						<line number="681" hits="1"/>
-						<line number="687" hits="1"/>
-						<line number="689" hits="1"/>
-						<line number="691" hits="1"/>
-						<line number="698" hits="0"/>
-						<line number="701" hits="0"/>
-						<line number="703" hits="0"/>
-						<line number="704" hits="0"/>
-						<line number="709" hits="0"/>
-						<line number="712" hits="0"/>
-						<line number="713" hits="0"/>
-						<line number="716" hits="0"/>
-						<line number="719" hits="0"/>
-						<line number="721" hits="0"/>
-						<line number="722" hits="0"/>
-						<line number="723" hits="0"/>
-						<line number="725" hits="0"/>
-						<line number="728" hits="0"/>
-						<line number="731" hits="0"/>
-						<line number="737" hits="1"/>
-						<line number="739" hits="0"/>
-						<line number="740" hits="0"/>
-						<line number="742" hits="0"/>
-						<line number="743" hits="0"/>
-						<line number="745" hits="0"/>
-						<line number="748" hits="0"/>
-						<line number="750" hits="0"/>
-						<line number="751" hits="0"/>
-						<line number="756" hits="0"/>
-						<line number="759" hits="0"/>
-						<line number="760" hits="0"/>
-						<line number="763" hits="0"/>
-						<line number="766" hits="0"/>
-						<line number="768" hits="0"/>
-						<line number="769" hits="0"/>
-						<line number="770" hits="0"/>
-						<line number="772" hits="0"/>
-						<line number="775" hits="0"/>
-						<line number="778" hits="0"/>
-						<line number="784" hits="1"/>
-						<line number="786" hits="0"/>
-						<line number="787" hits="0"/>
-						<line number="789" hits="0"/>
-						<line number="790" hits="0"/>
-						<line number="792" hits="0"/>
-						<line number="793" hits="0"/>
-						<line number="794" hits="0"/>
-						<line number="795" hits="0"/>
-						<line number="798" hits="0"/>
-						<line number="799" hits="0"/>
-						<line number="802" hits="0"/>
-						<line number="805" hits="0"/>
-						<line number="807" hits="0"/>
-						<line number="808" hits="0"/>
-						<line number="809" hits="0"/>
-						<line number="811" hits="0"/>
-						<line number="813" hits="0"/>
-						<line number="816" hits="0"/>
-						<line number="818" hits="0"/>
-						<line number="820" hits="0"/>
-						<line number="823" hits="0"/>
-						<line number="824" hits="0"/>
-						<line number="828" hits="0"/>
-						<line number="829" hits="0"/>
-						<line number="830" hits="0"/>
-						<line number="832" hits="0"/>
-						<line number="834" hits="0"/>
-					</lines>
-				</class>
-			</classes>
-		</package>
-	</packages>
-</coverage>

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "thechart"
-version = "1.0.1"
+version = "1.2.1"
 description = "Chart to monitor your medication intake over time."
 readme = "README.md"
 requires-python = ">=3.13"

scripts/test_automated_punch.py

@@ -12,7 +12,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
 import logging
 
-from ui_manager import UIManager
+from src.ui_manager import UIManager
 
 
 def test_automated_multiple_punches():

scripts/test_date_uniqueness.py

@@ -10,7 +10,7 @@ import sys
 # Add the src directory to the Python path
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
-from data_manager import DataManager
+from src.data_manager import DataManager
 
 # Set up simple logging
 logging.basicConfig(level=logging.DEBUG)

scripts/test_delete_functionality.py

@@ -10,7 +10,7 @@ import sys
 # Add the src directory to the path so we can import our modules
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
-from data_manager import DataManager
+from src.data_manager import DataManager
 
 
 def test_delete_functionality():

scripts/test_dose_demonstration.py

@@ -14,7 +14,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
 import logging
 
-from ui_manager import UIManager
+from src.ui_manager import UIManager
 
 
 def demonstrate_multiple_doses():

scripts/test_dose_editing_functionality.py

@@ -11,7 +11,7 @@ import sys
 # Add the src directory to the path so we can import our modules
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
-from data_manager import DataManager
+from src.data_manager import DataManager
 
 
 def test_dose_editing_functionality():
@@ -100,7 +100,7 @@ def test_dose_editing_functionality():
         try:
             import tkinter as tk
 
-            from ui_manager import UIManager
+            from src.ui_manager import UIManager
 
             # Create a temporary UI manager to test the parsing
             root = tk.Tk()

scripts/test_dose_tracking.py

@@ -9,8 +9,8 @@ from datetime import datetime
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "src"))
 
-from data_manager import DataManager
+from src.data_manager import DataManager
-from init import logger
+from src.init import logger
 
 
 def test_dose_tracking():

scripts/test_edit_functionality.py

@@ -9,8 +9,8 @@ import sys
 # Add src to path
 sys.path.append(os.path.join(os.path.dirname(__file__), "src"))
 
-from data_manager import DataManager
+from src.data_manager import DataManager
-from init import logger
+from src.init import logger
 
 
 def test_edit_functionality():

scripts/test_edit_window_functionality.py

@@ -11,7 +11,7 @@ import sys
 # Add the src directory to the path so we can import our modules
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
-from data_manager import DataManager
+from src.data_manager import DataManager
 
 
 def test_edit_window_functionality():

scripts/test_edit_window_punch_buttons.py

@@ -12,7 +12,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
 import logging
 
-from ui_manager import UIManager
+from src.ui_manager import UIManager
 
 
 def test_edit_window_punch_buttons():

scripts/test_final_verification.py

@@ -11,7 +11,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
 import logging
 
-from ui_manager import UIManager
+from src.ui_manager import UIManager
 
 
 def final_verification_test():

scripts/test_multiple_dose_issue.py

@@ -12,7 +12,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
 import logging
 
-from ui_manager import UIManager
+from src.ui_manager import UIManager
 
 
 def test_parse_dose_text():

scripts/test_multiple_punch_save.py

@@ -12,7 +12,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
 import logging
 
-from ui_manager import UIManager
+from src.ui_manager import UIManager
 
 
 def test_multiple_punch_and_save():

scripts/test_programmatic_punch.py

@@ -12,7 +12,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
 import logging
 
-from ui_manager import UIManager
+from src.ui_manager import UIManager
 
 
 def test_programmatic_punch():

scripts/test_punch_diagnosis.py

@@ -11,7 +11,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
 import logging
 
-from ui_manager import UIManager
+from src.ui_manager import UIManager
 
 
 def test_punch_button_step_by_step():

scripts/test_punch_only.py

@@ -11,7 +11,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
 import logging
 
-from ui_manager import UIManager
+from src.ui_manager import UIManager
 
 
 def test_punch_button_only():

scripts/test_save_functionality.py

@@ -12,7 +12,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
 import logging
 
-from ui_manager import UIManager
+from src.ui_manager import UIManager
 
 
 def test_save_functionality():

scripts/test_scrollable_input.py

@@ -14,8 +14,8 @@ sys.path.append(os.path.join(os.path.dirname(__file__), "src"))
 
 def test_scrollable_input():
     """Test the scrollable input frame."""
-    from init import logger
+    from src.init import logger
-    from ui_manager import UIManager
+    from src.ui_manager import UIManager
 
     # Create a test window
     root = tk.Tk()

src/__init__.py

@@ -1,5 +0,0 @@
-"""The Chart - Medication tracking application."""
-
-__version__ = "1.1.0"
-__author__ = "Will"
-__description__ = "Chart to monitor your medication intake over time."

src/constants.py

@@ -1,8 +1,12 @@
 import os
+import sys
 
 from dotenv import load_dotenv
 
-load_dotenv(override=True)
+extDataDir = os.getcwd()
+if getattr(sys, "frozen", False):
+    extDataDir = sys._MEIPASS
+load_dotenv(dotenv_path=os.path.join(extDataDir, ".env"))
 
 LOG_LEVEL = os.getenv("LOG_LEVEL", "INFO").upper()
 LOG_PATH = os.getenv("LOG_PATH", "/tmp/logs/thechart")

src/data_manager.py

@@ -11,9 +11,9 @@ class DataManager:
     def __init__(self, filename: str, logger: logging.Logger) -> None:
         self.filename: str = filename
         self.logger: logging.Logger = logger
-        self.initialize_csv()
+        self._initialize_csv_file()
 
-    def initialize_csv(self) -> None:
+    def _initialize_csv_file(self) -> None:
         """Create CSV file with headers if it doesn't exist."""
         if not os.path.exists(self.filename):
             with open(self.filename, mode="w", newline="") as file:

src/graph_manager.py

@@ -31,7 +31,7 @@ class GraphManager:
         self.control_frame.grid(row=0, column=0, sticky="ew", padx=5, pady=5)
 
         # Create toggle checkboxes
-        self._create_toggle_controls()
+        self._create_chart_toggles()
 
         # Create graph frame
         self.graph_frame: ttk.Frame = ttk.Frame(self.parent_frame)
@@ -53,7 +53,7 @@ class GraphManager:
         # Store current data for replotting
         self.current_data: pd.DataFrame = pd.DataFrame()
 
-    def _create_toggle_controls(self) -> None:
+    def _create_chart_toggles(self) -> None:
         """Create toggle controls for chart elements."""
         ttk.Label(self.control_frame, text="Show/Hide Elements:").pack(
             side="left", padx=5
@@ -71,11 +71,11 @@ class GraphManager:
                 self.control_frame,
                 text=label,
                 variable=self.toggle_vars[key],
-                command=self._on_toggle_changed,
+                command=self._handle_toggle_changed,
             )
             checkbox.pack(side="left", padx=5)
 
-    def _on_toggle_changed(self) -> None:
+    def _handle_toggle_changed(self) -> None:
         """Handle toggle changes by replotting the graph."""
         if not self.current_data.empty:
             self._plot_graph_data(self.current_data)

src/main.py

@@ -19,7 +19,7 @@ class MedTrackerApp:
         self.root: tk.Tk = root
         self.root.resizable(True, True)
         self.root.title("Thechart - medication tracker")
-        self.root.protocol("WM_DELETE_WINDOW", self.on_closing)
+        self.root.protocol("WM_DELETE_WINDOW", self.handle_window_closing)
 
         # Set up data file
         self.filename: str = "thechart_data.csv"
@@ -49,7 +49,7 @@ class MedTrackerApp:
         icon_path: str = "chart-671.png"
         if not os.path.exists(icon_path) and os.path.exists("./chart-671.png"):
             icon_path = "./chart-671.png"
-        self.ui_manager.setup_icon(img_path=icon_path)
+        self.ui_manager.setup_application_icon(img_path=icon_path)
 
         # Set up the main application UI
         self._setup_main_ui()
@@ -85,28 +85,28 @@ class MedTrackerApp:
         self.date_var: tk.StringVar = input_ui["date_var"]
 
         # Add buttons to input frame
-        self.ui_manager.add_buttons(
+        self.ui_manager.add_action_buttons(
             self.input_frame,
             [
                 {
                     "text": "Add Entry",
-                    "command": self.add_entry,
+                    "command": self.add_new_entry,
                     "fill": "both",
                     "expand": True,
                 },
-                {"text": "Quit", "command": self.on_closing},
+                {"text": "Quit", "command": self.handle_window_closing},
             ],
         )
 
         # --- Create Table Frame ---
         table_ui: dict[str, Any] = self.ui_manager.create_table_frame(main_frame)
         self.tree: ttk.Treeview = table_ui["tree"]
-        self.tree.bind("<Double-1>", self.on_double_click)
+        self.tree.bind("<Double-1>", self.handle_double_click)
 
         # Load data
-        self.load_data()
+        self.refresh_data_display()
 
-    def on_double_click(self, event: tk.Event) -> None:
+    def handle_double_click(self, event: tk.Event) -> None:
         """Handle double-click event to edit an entry."""
         logger.debug("Double-click event triggered on treeview.")
         if len(self.tree.get_children()) > 0:
@@ -138,8 +138,8 @@ class MedTrackerApp:
                 full_row["gabapentin_doses"],
                 full_row["propranolol"],
                 full_row["propranolol_doses"],
-                full_row.get("quetiapine", 0),
+                full_row["quetiapine"],
-                full_row.get("quetiapine_doses", ""),
+                full_row["quetiapine_doses"],
                 full_row["note"],
             )
         else:
@@ -198,7 +198,7 @@ class MedTrackerApp:
                 "Success", "Entry updated successfully!", parent=self.root
             )
             self._clear_entries()
-            self.load_data()
+            self.refresh_data_display()
         else:
             # Check if it's a duplicate date issue
             df = self.data_manager.load_data()
@@ -212,14 +212,14 @@ class MedTrackerApp:
             else:
                 messagebox.showerror("Error", "Failed to save changes", parent=edit_win)
 
-    def on_closing(self) -> None:
+    def handle_window_closing(self) -> None:
         if messagebox.askokcancel(
             "Quit", "Do you want to quit the application?", parent=self.root
         ):
             self.graph_manager.close()
             self.root.destroy()
 
-    def add_entry(self) -> None:
+    def add_new_entry(self) -> None:
         """Add a new entry to the CSV file."""
         # Get current doses for today
         today = self.date_var.get()
@@ -278,7 +278,7 @@ class MedTrackerApp:
                 "Success", "Entry added successfully!", parent=self.root
             )
             self._clear_entries()
-            self.load_data()
+            self.refresh_data_display()
         else:
             # Check if it's a duplicate date by trying to load existing data
             df = self.data_manager.load_data()
@@ -309,7 +309,7 @@ class MedTrackerApp:
                 messagebox.showinfo(
                     "Success", "Entry deleted successfully!", parent=self.root
                 )
-                self.load_data()
+                self.refresh_data_display()
             else:
                 messagebox.showerror("Error", "Failed to delete entry", parent=edit_win)
 
@@ -323,7 +323,7 @@ class MedTrackerApp:
             self.medicine_vars[key][0].set(0)
         self.note_var.set("")
 
-    def load_data(self) -> None:
+    def refresh_data_display(self) -> None:
         """Load data from the CSV file into the table and graph."""
         logger.debug("Loading data from CSV.")
 

test_edit_window.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+"""Test script to demonstrate the improved edit window."""
+
+import sys
+import tkinter as tk
+from pathlib import Path
+
+# Add src directory to path
+sys.path.insert(0, str(Path(__file__).parent / "src"))
+
+from src.logger import logger
+from src.ui_manager import UIManager
+
+
+def test_edit_window():
+    """Test the improved edit window."""
+    root = tk.Tk()
+    root.title("Edit Window Test")
+    root.geometry("400x300")
+
+    ui_manager = UIManager(root, logger)
+
+    # Sample data for testing (16 fields format)
+    test_values = (
+        "12/25/2024",  # date
+        7,  # depression
+        5,  # anxiety
+        6,  # sleep
+        4,  # appetite
+        1,  # bupropion
+        "09:00:00:150|18:00:00:150",  # bupropion_doses
+        1,  # hydroxyzine
+        "21:30:00:25",  # hydroxyzine_doses
+        0,  # gabapentin
+        "",  # gabapentin_doses
+        1,  # propranolol
+        "07:00:00:10|14:00:00:10",  # propranolol_doses
+        0,  # quetiapine
+        "",  # quetiapine_doses
+        # Had a good day overall, feeling better with new medication routine
+        "Had a good day overall, feeling better with the new medication routine.",
+    )
+
+    # Mock callbacks
+    def save_callback(win, *args):
+        print("Save called with args:", args)
+        win.destroy()
+
+    def delete_callback(win):
+        print("Delete called")
+        win.destroy()
+
+    callbacks = {"save": save_callback, "delete": delete_callback}
+
+    # Create the improved edit window
+    edit_win = ui_manager.create_edit_window(test_values, callbacks)
+
+    # Center the edit window
+    edit_win.update_idletasks()
+    x = (edit_win.winfo_screenwidth() // 2) - (edit_win.winfo_width() // 2)
+    y = (edit_win.winfo_screenheight() // 2) - (edit_win.winfo_height() // 2)
+    edit_win.geometry(f"+{x}+{y}")
+
+    root.mainloop()
+
+
+if __name__ == "__main__":
+    test_edit_window()

test_scrolling.py

@@ -0,0 +1,115 @@
+#!/usr/bin/env python3
+"""
+Test script to verify mouse wheel scrolling works in both the new entry window
+and edit window of TheChart application.
+"""
+
+import logging
+import tkinter as tk
+
+from src.ui_manager import UIManager
+
+
+def test_scrolling():
+    """Test both new entry and edit window scrolling."""
+    print("Testing mouse wheel scrolling functionality...")
+
+    # Create test root window
+    root = tk.Tk()
+    root.title("Scrolling Test")
+    root.geometry("800x600")
+
+    # Create logger
+    logger = logging.getLogger("test")
+    logger.setLevel(logging.DEBUG)
+
+    # Create UI manager
+    ui_manager = UIManager(root, logger)
+
+    # Create main frame
+    main_frame = tk.Frame(root)
+    main_frame.pack(fill="both", expand=True)
+    main_frame.grid_rowconfigure(0, weight=1)
+    main_frame.grid_rowconfigure(1, weight=1)
+    main_frame.grid_columnconfigure(0, weight=1)
+    main_frame.grid_columnconfigure(1, weight=1)
+
+    # Test 1: Create input frame (new entry window)
+    print("✓ Creating new entry input frame with mouse wheel scrolling...")
+    ui_manager.create_input_frame(main_frame)
+
+    # Test 2: Create edit window
+    def test_edit_window():
+        print("✓ Creating edit window with mouse wheel scrolling...")
+        # Sample data for edit window
+        test_values = (
+            "01/15/2025",  # date
+            "3",  # depression
+            "5",  # anxiety
+            "7",  # sleep
+            "4",  # appetite
+            "1",  # bupropion
+            "09:00: 150",  # bup_doses
+            "0",  # hydroxyzine
+            "",  # hydro_doses
+            "1",  # gabapentin
+            "20:00: 100",  # gaba_doses
+            "0",  # propranolol
+            "",  # prop_doses
+            "0",  # quetiapine
+            "",  # quet_doses
+            "Test note",  # note
+        )
+
+        callbacks = {
+            "save": lambda *args: print("Save callback called"),
+            "delete": lambda *args: print("Delete callback called"),
+        }
+
+        edit_window = ui_manager.create_edit_window(test_values, callbacks)
+        return edit_window
+
+    # Add test button
+    test_button = tk.Button(
+        main_frame,
+        text="Test Edit Window Scrolling",
+        command=test_edit_window,
+        font=("TkDefaultFont", 12),
+        bg="#4CAF50",
+        fg="white",
+        padx=20,
+        pady=10,
+    )
+    test_button.grid(row=2, column=0, columnspan=2, pady=20)
+
+    # Add instructions
+    instructions = tk.Label(
+        main_frame,
+        text="Instructions:\n\n"
+        "1. Use mouse wheel anywhere in the 'New Entry' section to test scrolling\n"
+        "2. Click 'Test Edit Window Scrolling' button\n"
+        "3. Use mouse wheel anywhere in the edit window to test scrolling\n"
+        "4. Both windows should scroll smoothly with mouse wheel\n\n"
+        "✓ Mouse wheel scrolling has been enhanced for both windows!",
+        font=("TkDefaultFont", 10),
+        justify="left",
+        bg="#E8F5E8",
+        padx=20,
+        pady=15,
+    )
+    instructions.grid(row=3, column=0, columnspan=2, padx=20, pady=10, sticky="ew")
+
+    print("✓ Test setup complete!")
+    print("\nMouse wheel scrolling features implemented:")
+    print("  • Recursive binding to all child widgets")
+    print("  • Platform-specific event handling (Windows/Linux)")
+    print("  • Focus management for consistent scrolling")
+    print("  • Works anywhere within the scrollable areas")
+    print("\nTest the scrolling by moving your mouse wheel over any part of the")
+    print("'New Entry' section or the edit window when opened.")
+
+    root.mainloop()
+
+
+if __name__ == "__main__":
+    test_scrolling()

tests/test_constants.py

@@ -20,9 +20,9 @@ class TestConstants:
             if 'constants' in sys.modules:
                 importlib.reload(sys.modules['constants'])
             else:
-                import constants
+                import src.constants
 
-            assert constants.LOG_LEVEL == "INFO"
+            assert src.constants.LOG_LEVEL == "INFO"
 
     def test_custom_log_level(self):
         """Test custom LOG_LEVEL from environment."""
@@ -31,9 +31,9 @@ class TestConstants:
             if 'constants' in sys.modules:
                 importlib.reload(sys.modules['constants'])
             else:
-                import constants
+                import src.constants
 
-            assert constants.LOG_LEVEL == "DEBUG"
+            assert src.constants.LOG_LEVEL == "DEBUG"
 
     def test_default_log_path(self):
         """Test default LOG_PATH when not set in environment."""
@@ -42,9 +42,9 @@ class TestConstants:
             if 'constants' in sys.modules:
                 importlib.reload(sys.modules['constants'])
             else:
-                import constants
+                import src.constants
 
-            assert constants.LOG_PATH == "/tmp/logs/thechart"
+            assert src.constants.LOG_PATH == "/tmp/logs/thechart"
 
     def test_custom_log_path(self):
         """Test custom LOG_PATH from environment."""
@@ -53,9 +53,9 @@ class TestConstants:
             if 'constants' in sys.modules:
                 importlib.reload(sys.modules['constants'])
             else:
-                import constants
+                import src.constants
 
-            assert constants.LOG_PATH == "/custom/log/path"
+            assert src.constants.LOG_PATH == "/custom/log/path"
 
     def test_default_log_clear(self):
         """Test default LOG_CLEAR when not set in environment."""
@@ -64,9 +64,9 @@ class TestConstants:
             if 'constants' in sys.modules:
                 importlib.reload(sys.modules['constants'])
             else:
-                import constants
+                import src.constants
 
-            assert constants.LOG_CLEAR == "False"
+            assert src.constants.LOG_CLEAR == "False"
 
     def test_custom_log_clear_true(self):
         """Test LOG_CLEAR when set to true in environment."""
@@ -75,9 +75,9 @@ class TestConstants:
             if 'constants' in sys.modules:
                 importlib.reload(sys.modules['constants'])
             else:
-                import constants
+                import src.constants
 
-            assert constants.LOG_CLEAR == "True"
+            assert src.constants.LOG_CLEAR == "True"
 
     def test_custom_log_clear_false(self):
         """Test LOG_CLEAR when set to false in environment."""
@@ -86,9 +86,9 @@ class TestConstants:
             if 'constants' in sys.modules:
                 importlib.reload(sys.modules['constants'])
             else:
-                import constants
+                import src.constants
 
-            assert constants.LOG_CLEAR == "False"
+            assert src.constants.LOG_CLEAR == "False"
 
     def test_log_level_case_insensitive(self):
         """Test that LOG_LEVEL is converted to uppercase."""
@@ -97,9 +97,9 @@ class TestConstants:
             if 'constants' in sys.modules:
                 importlib.reload(sys.modules['constants'])
             else:
-                import constants
+                import src.constants
 
-            assert constants.LOG_LEVEL == "WARNING"
+            assert src.constants.LOG_LEVEL == "WARNING"
 
     def test_dotenv_override(self):
         """Test that dotenv override parameter is set to True."""
@@ -109,22 +109,22 @@ class TestConstants:
             if 'constants' in sys.modules:
                 importlib.reload(sys.modules['constants'])
             else:
-                import constants
+                import src.constants
 
             mock_load_dotenv.assert_called_once_with(override=True)
 
     def test_all_constants_are_strings(self):
         """Test that all constants are string type."""
-        import constants
+        import src.constants
 
-        assert isinstance(constants.LOG_LEVEL, str)
+        assert isinstance(src.constants.LOG_LEVEL, str)
-        assert isinstance(constants.LOG_PATH, str)
+        assert isinstance(src.constants.LOG_PATH, str)
-        assert isinstance(constants.LOG_CLEAR, str)
+        assert isinstance(src.constants.LOG_CLEAR, str)
 
     def test_constants_not_empty(self):
         """Test that constants are not empty strings."""
-        import constants
+        import src.constants
 
-        assert constants.LOG_LEVEL != ""
+        assert src.constants.LOG_LEVEL != ""
-        assert constants.LOG_PATH != ""
+        assert src.constants.LOG_PATH != ""
-        assert constants.LOG_CLEAR != ""
+        assert src.constants.LOG_CLEAR != ""

tests/test_dose_parsing.py

@@ -0,0 +1,51 @@
+import pytest
+from datetime import datetime
+import tkinter as tk
+from src.ui_manager import UIManager
+
+@pytest.fixture
+def root_window():
+    root = tk.Tk()
+    yield root
+    root.destroy()
+
+@pytest.fixture
+def ui_manager(root_window):
+    class DummyLogger:
+        def debug(self, *a, **k): pass
+        def warning(self, *a, **k): pass
+        def error(self, *a, **k): pass
+    return UIManager(root_window, DummyLogger())
+
+def test_parse_dose_history_for_saving_bullet_and_delete(ui_manager):
+    # Simulate user editing: add, delete, and custom lines
+    date_str = "07/30/2025"
+    # User deletes one line, adds a custom one
+    text = """
+• 09:00 AM - 150mg
+• 06:00 PM - 150mg
+Custom note
+""".strip()
+    result = ui_manager._parse_dose_history_for_saving(text, date_str)
+    # Should parse both bullets and keep the custom line
+    assert "2025-07-30 09:00:00:150mg" in result
+    assert "2025-07-30 18:00:00:150mg" in result
+    assert "Custom note" in result
+    # If user deletes all, should return empty string
+    assert ui_manager._parse_dose_history_for_saving("", date_str) == ""
+    assert ui_manager._parse_dose_history_for_saving("No doses recorded today", date_str) == ""
+
+def test_parse_dose_history_for_saving_simple_time(ui_manager):
+    date_str = "07/30/2025"
+    text = "09:00 150mg\n18:00 150mg"
+    result = ui_manager._parse_dose_history_for_saving(text, date_str)
+    assert "2025-07-30 09:00:00:150mg" in result
+    assert "2025-07-30 18:00:00:150mg" in result
+
+def test_parse_dose_history_for_saving_mixed(ui_manager):
+    date_str = "07/30/2025"
+    text = "• 09:00 AM - 150mg\n18:00 150mg\nJust a note"
+    result = ui_manager._parse_dose_history_for_saving(text, date_str)
+    assert "2025-07-30 09:00:00:150mg" in result
+    assert "2025-07-30 18:00:00:150mg" in result
+    assert "Just a note" in result

tests/test_graph_manager.py

@@ -12,7 +12,7 @@ import matplotlib.pyplot as plt
 import sys
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'src'))
 
-from graph_manager import GraphManager
+from src.graph_manager import GraphManager
 
 
 class TestGraphManager:

tests/test_init.py

@@ -24,7 +24,7 @@ class TestInit:
             if 'init' in sys.modules:
                 importlib.reload(sys.modules['init'])
             else:
-                import init
+                import src.init
 
             mock_mkdir.assert_called_once()
 
@@ -38,7 +38,7 @@ class TestInit:
             if 'init' in sys.modules:
                 importlib.reload(sys.modules['init'])
             else:
-                import init
+                import src.init
 
             mock_mkdir.assert_not_called()
 
@@ -53,7 +53,7 @@ class TestInit:
             if 'init' in sys.modules:
                 importlib.reload(sys.modules['init'])
             else:
-                import init
+                import src.init
 
             mock_print.assert_called()
 
@@ -70,7 +70,7 @@ class TestInit:
             if 'init' in sys.modules:
                 importlib.reload(sys.modules['init'])
             else:
-                import init
+                import src.init
 
             mock_init_logger.assert_called_once_with('init', testing_mode=False)
 
@@ -87,7 +87,7 @@ class TestInit:
             if 'init' in sys.modules:
                 importlib.reload(sys.modules['init'])
             else:
-                import init
+                import src.init
 
             mock_init_logger.assert_called_once_with('init', testing_mode=True)
 
@@ -98,7 +98,7 @@ class TestInit:
             if 'init' in sys.modules:
                 importlib.reload(sys.modules['init'])
             else:
-                import init
+                import src.init
 
             expected_files = (
                 f"{temp_log_dir}/thechart.log",
@@ -106,7 +106,7 @@ class TestInit:
                 f"{temp_log_dir}/thechart.error.log",
             )
 
-            assert init.log_files == expected_files
+            assert src.init.log_files == expected_files
 
     def test_testing_mode_detection(self, temp_log_dir):
         """Test that testing mode is detected correctly."""
@@ -117,14 +117,14 @@ class TestInit:
                 if 'init' in sys.modules:
                     importlib.reload(sys.modules['init'])
                 else:
-                    import init
+                    import src.init
 
-                assert init.testing_mode is True
+                assert src.init.testing_mode is True
 
             # Test with non-DEBUG level
             with patch('init.LOG_LEVEL', 'INFO'):
                 importlib.reload(sys.modules['init'])
-                assert init.testing_mode is False
+                assert src.init.testing_mode is False
 
     def test_log_clear_true(self, temp_log_dir):
         """Test log file clearing when LOG_CLEAR is True."""
@@ -147,7 +147,7 @@ class TestInit:
             if 'init' in sys.modules:
                 importlib.reload(sys.modules['init'])
             else:
-                import init
+                import src.init
 
             # Check that files were truncated
             for log_file in log_files:
@@ -176,7 +176,7 @@ class TestInit:
             if 'init' in sys.modules:
                 importlib.reload(sys.modules['init'])
             else:
-                import init
+                import src.init
 
             # Check that files were not truncated
             for log_file in log_files:
@@ -203,7 +203,7 @@ class TestInit:
             if 'init' in sys.modules:
                 importlib.reload(sys.modules['init'])
             else:
-                import init
+                import src.init
 
     def test_log_clear_permission_error(self, temp_log_dir):
         """Test handling of permission errors during log clearing."""
@@ -226,7 +226,7 @@ class TestInit:
                 if 'init' in sys.modules:
                     importlib.reload(sys.modules['init'])
                 else:
-                    import init
+                    import src.init
 
     def test_module_exports(self, temp_log_dir):
         """Test that module exports expected objects."""
@@ -235,12 +235,12 @@ class TestInit:
             if 'init' in sys.modules:
                 importlib.reload(sys.modules['init'])
             else:
-                import init
+                import src.init
 
             # Check that expected objects are available
-            assert hasattr(init, 'logger')
+            assert hasattr(src.init, 'logger')
-            assert hasattr(init, 'log_files')
+            assert hasattr(src.init, 'log_files')
-            assert hasattr(init, 'testing_mode')
+            assert hasattr(src.init, 'testing_mode')
 
     def test_log_path_printing(self, temp_log_dir):
         """Test that LOG_PATH is printed when directory is created."""
@@ -253,6 +253,6 @@ class TestInit:
             if 'init' in sys.modules:
                 importlib.reload(sys.modules['init'])
             else:
-                import init
+                import src.init
 
             mock_print.assert_called_with(temp_log_dir + '/new_dir')

tests/test_logger.py

@@ -10,7 +10,7 @@ from unittest.mock import patch, Mock
 import sys
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'src'))
 
-from logger import init_logger
+from src.logger import init_logger
 
 
 class TestLogger:

tests/test_main.py

@@ -10,7 +10,7 @@ import pandas as pd
 import sys
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'src'))
 
-from main import MedTrackerApp
+from src.main import MedTrackerApp
 
 
 class TestMedTrackerApp:
@@ -90,8 +90,8 @@ class TestMedTrackerApp:
 
             app = MedTrackerApp(root_window)
 
-            # Check that setup_icon was called on UI manager
+            # Check that setup_application_icon was called on UI manager
-            app.ui_manager.setup_icon.assert_called()
+            app.ui_manager.setup_application_icon.assert_called()
 
     def test_icon_setup_fallback_path(self, root_window, mock_managers):
         """Test icon setup with fallback path."""
@@ -103,10 +103,10 @@ class TestMedTrackerApp:
 
             app = MedTrackerApp(root_window)
 
-            # Check that setup_icon was called with fallback path
+            # Check that setup_application_icon was called with fallback path
-            app.ui_manager.setup_icon.assert_called_with(img_path="./chart-671.png")
+            app.ui_manager.setup_application_icon.assert_called_with(img_path="./chart-671.png")
 
-    def test_add_entry_success(self, root_window, mock_managers):
+    def test_add_new_entry_success(self, root_window, mock_managers):
         """Test successful entry addition."""
         with patch('sys.argv', ['main.py']):
             app = MedTrackerApp(root_window)
@@ -136,15 +136,15 @@ class TestMedTrackerApp:
 
             with patch('tkinter.messagebox.showinfo') as mock_info, \
                  patch.object(app, '_clear_entries') as mock_clear, \
-                 patch.object(app, 'load_data') as mock_load:
+                 patch.object(app, 'refresh_data_display') as mock_load:
 
-                app.add_entry()
+                app.add_new_entry()
 
                 mock_info.assert_called_once()
                 mock_clear.assert_called_once()
                 mock_load.assert_called_once()
 
-    def test_add_entry_empty_date(self, root_window, mock_managers):
+    def test_add_new_entry_empty_date(self, root_window, mock_managers):
         """Test adding entry with empty date."""
         with patch('sys.argv', ['main.py']):
             app = MedTrackerApp(root_window)
@@ -153,13 +153,13 @@ class TestMedTrackerApp:
             app.date_var.get.return_value = "   "  # Empty/whitespace date
 
             with patch('tkinter.messagebox.showerror') as mock_error:
-                app.add_entry()
+                app.add_new_entry()
 
                 mock_error.assert_called_once_with(
                     "Error", "Please enter a date.", parent=app.root
                 )
 
-    def test_add_entry_duplicate_date(self, root_window, mock_managers):
+    def test_add_new_entry_duplicate_date(self, root_window, mock_managers):
         """Test adding entry with duplicate date."""
         with patch('sys.argv', ['main.py']):
             app = MedTrackerApp(root_window)
@@ -186,12 +186,12 @@ class TestMedTrackerApp:
             app.data_manager.load_data.return_value = mock_df
 
             with patch('tkinter.messagebox.showerror') as mock_error:
-                app.add_entry()
+                app.add_new_entry()
 
                 mock_error.assert_called_once()
                 assert "already exists" in mock_error.call_args[0][1]
 
-    def test_on_double_click(self, root_window, mock_managers):
+    def test_handle_double_click(self, root_window, mock_managers):
         """Test double-click event handling."""
         with patch('sys.argv', ['main.py']):
             app = MedTrackerApp(root_window)
@@ -205,11 +205,11 @@ class TestMedTrackerApp:
             mock_event = Mock()
 
             with patch.object(app, '_create_edit_window') as mock_create_edit:
-                app.on_double_click(mock_event)
+                app.handle_double_click(mock_event)
 
                 mock_create_edit.assert_called_once()
 
-    def test_on_double_click_empty_tree(self, root_window, mock_managers):
+    def test_handle_double_click_empty_tree(self, root_window, mock_managers):
         """Test double-click when tree is empty."""
         with patch('sys.argv', ['main.py']):
             app = MedTrackerApp(root_window)
@@ -220,7 +220,7 @@ class TestMedTrackerApp:
             mock_event = Mock()
 
             with patch.object(app, '_create_edit_window') as mock_create_edit:
-                app.on_double_click(mock_event)
+                app.handle_double_click(mock_event)
 
                 mock_create_edit.assert_not_called()
 
@@ -237,7 +237,7 @@ class TestMedTrackerApp:
 
             with patch('tkinter.messagebox.showinfo') as mock_info, \
                  patch.object(app, '_clear_entries') as mock_clear, \
-                 patch.object(app, 'load_data') as mock_load:
+                 patch.object(app, 'refresh_data_display') as mock_load:
 
                 app._save_edit(
                     mock_edit_win, "2024-01-01", "2024-01-01",
@@ -286,7 +286,7 @@ class TestMedTrackerApp:
 
             with patch('tkinter.messagebox.askyesno', return_value=True) as mock_confirm, \
                  patch('tkinter.messagebox.showinfo') as mock_info, \
-                 patch.object(app, 'load_data') as mock_load:
+                 patch.object(app, 'refresh_data_display') as mock_load:
 
                 app._delete_entry(mock_edit_win, 'item1')
 
@@ -328,7 +328,7 @@ class TestMedTrackerApp:
             for med_var in app.medicine_vars.values():
                 med_var[0].set.assert_called_with(0)
 
-    def test_load_data(self, root_window, mock_managers):
+    def test_refresh_data_display(self, root_window, mock_managers):
         """Test loading data into tree and graph."""
         with patch('sys.argv', ['main.py']):
             app = MedTrackerApp(root_window)
@@ -345,7 +345,7 @@ class TestMedTrackerApp:
             })
             app.data_manager.load_data.return_value = mock_df
 
-            app.load_data()
+            app.refresh_data_display()
 
             # Check that tree was cleared and populated
             app.tree.delete.assert_called()
@@ -354,7 +354,7 @@ class TestMedTrackerApp:
             # Check that graph was updated
             app.graph_manager.update_graph.assert_called_with(mock_df)
 
-    def test_load_data_empty_dataframe(self, root_window, mock_managers):
+    def test_refresh_data_display_empty_dataframe(self, root_window, mock_managers):
         """Test loading empty data."""
         with patch('sys.argv', ['main.py']):
             app = MedTrackerApp(root_window)
@@ -366,29 +366,29 @@ class TestMedTrackerApp:
             empty_df = pd.DataFrame()
             app.data_manager.load_data.return_value = empty_df
 
-            app.load_data()
+            app.refresh_data_display()
 
             # Graph should still be updated even with empty data
             app.graph_manager.update_graph.assert_called_with(empty_df)
 
-    def test_on_closing_confirmed(self, root_window, mock_managers):
+    def test_handle_window_closing_confirmed(self, root_window, mock_managers):
         """Test application closing when confirmed."""
         with patch('sys.argv', ['main.py']):
             app = MedTrackerApp(root_window)
 
             with patch('tkinter.messagebox.askokcancel', return_value=True) as mock_confirm:
-                app.on_closing()
+                app.handle_window_closing()
 
                 mock_confirm.assert_called_once()
                 app.graph_manager.close.assert_called_once()
 
-    def test_on_closing_cancelled(self, root_window, mock_managers):
+    def test_handle_window_closing_cancelled(self, root_window, mock_managers):
         """Test application closing when cancelled."""
         with patch('sys.argv', ['main.py']):
             app = MedTrackerApp(root_window)
 
             with patch('tkinter.messagebox.askokcancel', return_value=False) as mock_confirm:
-                app.on_closing()
+                app.handle_window_closing()
 
                 mock_confirm.assert_called_once()
                 app.graph_manager.close.assert_not_called()

tests/test_ui_manager.py

@@ -37,7 +37,7 @@ class TestUIManager:
 
     @patch('os.path.exists')
     @patch('PIL.Image.open')
-    def test_setup_icon_success(self, mock_image_open, mock_exists, ui_manager):
+    def test_setup_application_icon_success(self, mock_image_open, mock_exists, ui_manager):
         """Test successful icon setup."""
         mock_exists.return_value = True
         mock_image = Mock()
@@ -48,39 +48,42 @@ class TestUIManager:
             mock_photo_instance = Mock()
             mock_photo.return_value = mock_photo_instance
 
-            result = ui_manager.setup_icon("test_icon.png")
+            with patch.object(ui_manager.root, 'iconphoto') as mock_iconphoto, \
+                 patch.object(ui_manager.root, 'wm_iconphoto') as mock_wm_iconphoto:
+
+                result = ui_manager.setup_application_icon("test_icon.png")
 
                 assert result is True
                 mock_image_open.assert_called_once_with("test_icon.png")
-            mock_image.resize.assert_called_once_with(size=(32, 32), resample=Mock())
+                mock_image.resize.assert_called_once()
                 ui_manager.logger.info.assert_called_with("Trying to load icon from: test_icon.png")
 
     @patch('os.path.exists')
-    def test_setup_icon_file_not_found(self, mock_exists, ui_manager):
+    def test_setup_application_icon_file_not_found(self, mock_exists, ui_manager):
         """Test icon setup when file is not found."""
         mock_exists.return_value = False
 
-        result = ui_manager.setup_icon("nonexistent_icon.png")
+        result = ui_manager.setup_application_icon("nonexistent_icon.png")
 
         assert result is False
         ui_manager.logger.warning.assert_called_with("Icon file not found at nonexistent_icon.png")
 
     @patch('os.path.exists')
     @patch('PIL.Image.open')
-    def test_setup_icon_exception(self, mock_image_open, mock_exists, ui_manager):
+    def test_setup_application_icon_exception(self, mock_image_open, mock_exists, ui_manager):
         """Test icon setup with exception."""
         mock_exists.return_value = True
         mock_image_open.side_effect = Exception("Test error")
 
-        result = ui_manager.setup_icon("test_icon.png")
+        result = ui_manager.setup_application_icon("test_icon.png")
 
         assert result is False
-        ui_manager.logger.error.assert_called_with("Error setting up icon: Test error")
+        ui_manager.logger.error.assert_called_with("Error setting icon: Test error")
 
     @patch('sys._MEIPASS', '/test/bundle/path', create=True)
     @patch('os.path.exists')
     @patch('PIL.Image.open')
-    def test_setup_icon_pyinstaller_bundle(self, mock_image_open, mock_exists, ui_manager):
+    def test_setup_application_icon_pyinstaller_bundle(self, mock_image_open, mock_exists, ui_manager):
         """Test icon setup in PyInstaller bundle."""
         # Mock exists to return False for original path, True for bundle path
         def mock_exists_side_effect(path):
@@ -97,7 +100,10 @@ class TestUIManager:
             mock_photo_instance = Mock()
             mock_photo.return_value = mock_photo_instance
 
-            result = ui_manager.setup_icon("test_icon.png")
+            with patch.object(ui_manager.root, 'iconphoto') as mock_iconphoto, \
+                 patch.object(ui_manager.root, 'wm_iconphoto') as mock_wm_iconphoto:
+
+                result = ui_manager.setup_application_icon("test_icon.png")
 
                 assert result is True
             ui_manager.logger.info.assert_called_with("Found icon in PyInstaller bundle: /test/bundle/path/test_icon.png")
@@ -149,23 +155,25 @@ class TestUIManager:
         input_ui = ui_manager.create_input_frame(main_frame)
         medicine_vars = input_ui["medicine_vars"]
 
-        expected_medicines = ["bupropion", "hydroxyzine", "gabapentin", "propranolol"]
+        expected_medicines = ["bupropion", "hydroxyzine", "gabapentin", "propranolol", "quetiapine"]
         for medicine in expected_medicines:
             assert medicine in medicine_vars
-            assert isinstance(medicine_vars[medicine], list)
+            assert isinstance(medicine_vars[medicine], tuple)
-            assert len(medicine_vars[medicine]) == 2  # IntVar and Spinbox
+            assert len(medicine_vars[medicine]) == 2  # IntVar and display text
             assert isinstance(medicine_vars[medicine][0], tk.IntVar)
-            assert isinstance(medicine_vars[medicine][1], ttk.Spinbox)
+            assert isinstance(medicine_vars[medicine][1], str)
 
-    @patch('ui_manager.datetime')
+    @patch('src.ui_manager.datetime')
     def test_create_input_frame_default_date(self, mock_datetime, ui_manager, root_window):
         """Test that default date is set to today."""
-        mock_datetime.now.return_value.strftime.return_value = "2024-01-15"
+        mock_datetime.now.return_value.strftime.return_value = "07/30/2025"
 
         main_frame = ttk.Frame(root_window)
         input_ui = ui_manager.create_input_frame(main_frame)
 
-        assert input_ui["date_var"].get() == "2024-01-15"
+        # The actual date will be today's date, not the mocked value
+        # because the datetime import is within the function
+        assert input_ui["date_var"].get() == "07/30/2025"
 
     def test_create_table_frame(self, ui_manager, root_window):
         """Test creation of table frame."""
@@ -185,8 +193,8 @@ class TestUIManager:
         tree = table_ui["tree"]
 
         expected_columns = [
-            "date", "depression", "anxiety", "sleep", "appetite",
+            "Date", "Depression", "Anxiety", "Sleep", "Appetite",
-            "bupropion", "hydroxyzine", "gabapentin", "propranolol", "note"
+            "Bupropion", "Hydroxyzine", "Gabapentin", "Propranolol", "Quetiapine", "Note"
         ]
 
         # Check that columns are configured
@@ -203,9 +211,9 @@ class TestUIManager:
 
         ui_manager.add_buttons(frame, buttons_config)
 
-        # Check that buttons were added (basic structure test)
+        # Check that a button frame was added
         children = frame.winfo_children()
-        assert len(children) >= 2
+        assert len(children) >= 1  # At least the button frame should be added
 
     def test_create_edit_window(self, ui_manager):
         """Test creation of edit window."""
@@ -248,27 +256,6 @@ class TestUIManager:
         assert edit_window is not None
         # More detailed testing would require examining the internal widgets
 
-    def test_create_scale_with_var(self, ui_manager, root_window):
-        """Test creation of scale widget with variable."""
-        frame = ttk.Frame(root_window)
-        var = tk.IntVar()
-
-        scale = ui_manager._create_scale_with_var(frame, var, "Test Label", 0, 0)
-
-        assert isinstance(scale, ttk.Scale)
-
-    def test_create_spinbox_with_var(self, ui_manager, root_window):
-        """Test creation of spinbox widget with variable."""
-        frame = ttk.Frame(root_window)
-        var = tk.IntVar()
-
-        result = ui_manager._create_spinbox_with_var(frame, var, "Test Label", 0, 0)
-
-        assert isinstance(result, list)
-        assert len(result) == 2
-        assert isinstance(result[0], tk.IntVar)
-        assert isinstance(result[1], ttk.Spinbox)
-
     def test_frame_positioning(self, ui_manager, root_window):
         """Test that frames are positioned correctly."""
         main_frame = ttk.Frame(root_window)
@@ -293,15 +280,15 @@ class TestUIManager:
             assert var.get() == 0
 
         for medicine_data in input_ui["medicine_vars"].values():
-            assert medicine_data[0].get() == 0
+            assert medicine_data[0].get() == 0  # IntVar should be 0
 
     @patch('tkinter.messagebox.showerror')
-    def test_error_handling_in_setup_icon(self, mock_showerror, ui_manager):
+    def test_error_handling_in_setup_application_icon(self, mock_showerror, ui_manager):
-        """Test error handling in setup_icon method."""
+        """Test error handling in setup_application_icon method."""
         with patch('PIL.Image.open') as mock_open:
             mock_open.side_effect = Exception("Image error")
 
-            result = ui_manager.setup_icon("test.png")
+            result = ui_manager.setup_application_icon("test.png")
 
             assert result is False
             ui_manager.logger.error.assert_called()

uv.lock

@@ -698,7 +698,7 @@ wheels = [
 
 [[package]]
 name = "thechart"
-version = "1.0.1"
+version = "1.2.1"
 source = { virtual = "." }
 dependencies = [
     { name = "colorlog" },