Merge pull request #22 from dartungar/dev

Dev

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "mood-tracker",
 	"name": "Mood Tracker",
-	"version": "0.3.1",
+	"version": "0.3.2",
 	"minAppVersion": "1.1.0",
 	"description": "Track your moods & emotions easily. Visualize tracked history and browse the past entries.",
 	"author": "dartungar",

src/main.ts

@@ -1,12 +1,6 @@
 import {
-	App,
-	Editor,
-	MarkdownView,
-	Modal,
 	Notice,
 	Plugin,
-	PluginSettingTab,
-	Setting,
 } from "obsidian";
 import {
 	DEFAULT_SETTINGS,
@@ -18,7 +12,6 @@ import { MoodTrackerService } from "./services/moodTrackerEntryService";
 import { PersistenceService } from "./services/persistenceService";
 import { IMoodTrackerEntry } from "./entities/MoodTrackerEntry";
 import { MoodTrackerStatsModal } from "./statsModal/moodTrackerStatsModal";
-import { getAverageMoodRatingByDay } from "./statsModal/statsHelpers";
 import { EmotionSection } from "./entities/IEmotionSection";
 
 import type moment from "moment";
@@ -83,7 +76,6 @@ export default class MoodTrackerPlugin extends Plugin {
 
 	async loadEntries() {
 		this.entries = (await this.persistenceService.getEntries()) ?? [];
-
 	}
 
 	async saveEntries(): Promise<void> {
@@ -95,12 +87,12 @@ export default class MoodTrackerPlugin extends Plugin {
 		await this.saveEntries();
 	}
 
-	public showNotice(message: string, durationMs: number = 5000) {
+	public showNotice(message: string, durationMs = 5000) {
 		new Notice(message, durationMs);
 	}
 
 	async loadSettings() {
-		let loadedData: MoodTrackerSettings | any = Object.assign(
+		const loadedData: MoodTrackerSettings | any = Object.assign(
 			{},
 			DEFAULT_SETTINGS,
 			await this.loadData()

src/services/persistenceService.ts

@@ -1,8 +1,5 @@
 import { MoodTrackerEntry } from "src/entities/MoodTrackerEntry";
 import MoodTrackerPlugin from "src/main";
-import fs from "fs/promises";
-import type moment from "moment";
-
 
 
 export class PersistenceService {
@@ -14,7 +11,7 @@ export class PersistenceService {
     }
 
     public async getEntries(): Promise<MoodTrackerEntry[] | undefined> {
-        let adapter = this.plugin.app.vault.adapter;
+        const adapter = this.plugin.app.vault.adapter;
 
         await this.createDataFileIfNotExists();
 
@@ -37,7 +34,7 @@ export class PersistenceService {
     }
 
     public async saveEntries(): Promise<void> {
-        let adapter = this.plugin.app.vault.adapter;
+        const adapter = this.plugin.app.vault.adapter;
 
         await this.createDataFileIfNotExists();
 
@@ -54,7 +51,7 @@ export class PersistenceService {
     }
 
     private async createDataFileIfNotExists(): Promise<void> {
-        let adapter = this.plugin.app.vault.adapter;
+        const adapter = this.plugin.app.vault.adapter;
 
         if (!await adapter.exists(this.plugin.settings.folderPath)) {
             this.plugin.showNotice(`Mood Tracker: folder "${this.plugin.settings.folderPath}" not found, creating it...`);

src/statsModal/StatsComponent.svelte

@@ -13,7 +13,6 @@
     let moodRatingLabelDict: { [key: number]: string } = {};
     let timer: any;
 
-
     let rawData: IMoodTrackerEntry[] = this.plugin?.entries ?? [];
     let processedData: IDayStats[] = []; 
 
@@ -78,7 +77,6 @@
     }
 
     function subtractDays(date: Date, days: number) {
-        console.log("substract days", date, days);
         const dateCopy = new Date(date);
 
         dateCopy.setDate(dateCopy.getDate() - days);

src/statsModal/moodTrackerStatsModal.ts

@@ -1,5 +1,5 @@
 import { App, Modal } from "obsidian";
-import  StatsComponent from "./StatsComponent.svelte";
+import StatsComponent from "./StatsComponent.svelte";
 import store from "src/store";
 import MoodTrackerPlugin from "src/main";
 
@@ -11,11 +11,14 @@ export class MoodTrackerStatsModal extends Modal {
         super(app);
     }
 
-    onOpen() {
+    async onOpen() {
         store.plugin.set(this.plugin);
 
         this.modalEl.addClass("mood-tracker-modal");
 
+        // reload data in case data file was synced / modified
+        await this.plugin.loadEntries();
+
         this.component = new StatsComponent({
             target: this.contentEl,
             props: {

src/statsModal/statsHelpers.ts

@@ -3,13 +3,12 @@ import { IMoodTrackerEntry } from "src/entities/MoodTrackerEntry";
 
 export function generateDatasetForDateRange(entries: IMoodTrackerEntry[], start: Date | string, end: Date | string): IDayStats[] {
     // TODO: generate data only if there are entries for the date range
-    console.log("generateDatasetForDateRange", start, end);
     const dayStats = getAverageMoodRatingByDay(entries);
-    var days = generateStringDatesForDateRange(start, end);
+    const days = generateStringDatesForDateRange(start, end);
 
 
-    var dataset: IDayStats[] = days.map(day => {
-        var stat = dayStats.find(x => x.date == day);
+    const dataset: IDayStats[] = days.map(day => {
+        const stat = dayStats.find(x => x.date == day);
 
         return {
             date: day, 
@@ -53,7 +52,6 @@ function generateStringDatesForDateRange(start: Date | string, end: Date | strin
     const endDate = new Date(end);
     const currentDate = new Date();
     const endDateCorrected = endDate.getFullYear() > currentDate.getFullYear() ? currentDate : endDate; 
-    console.log("generating string dates", startDateCorrected, endDateCorrected );
 
     while (startDateCorrected <= endDateCorrected) {
       const formattedDate = startDateCorrected.toISOString().split('T')[0];
@@ -89,11 +87,9 @@ export function generateStringDatesForNdays(n: number): string[] {
         dates.push(dateString);
     }
 
-    // print the array of dates to the console
     return dates;
 }
 
 export function dateToNormalizedString(date: Date): string {
-    console.log("date to normalized string", date);
     return date.toISOString().split('T')[0];
 }