Change stat 'cost to year end' to 'Average cost per year'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nix-bucks",
   "private": true,
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "nix-bucks"
-version = "0.1.0"
+version = "0.1.1"
 description = "A simple budgeting app"
-authors = ["Marcos Gutiérrez <[email protected]"]
+authors = ["Marcos Gutiérrez Alonso <[email protected]>"]
 license = "GPL-3.0"
 repository = "https://github.com/margual56/nix-bucks"
 edition = "2021"

src-tauri/src/getters.rs

@@ -16,10 +16,15 @@ pub fn monthly_cost(app: tauri::State<Wrapper>) -> String {
 }
 
 #[tauri::command]
-pub fn eoy_cost(app: tauri::State<Wrapper>) -> String {
+pub fn yearly_cost(app: tauri::State<Wrapper>) -> String {
     format_money(-app.0.lock().unwrap().yearly_costs())
 }
 
+#[tauri::command]
+pub fn eoy_cost(app: tauri::State<Wrapper>) -> String {
+    format_money(-app.0.lock().unwrap().eoy_costs())
+}
+
 #[tauri::command]
 pub fn eoy_income(app: tauri::State<Wrapper>) -> String {
     format_money(app.0.lock().unwrap().yearly_income())

src-tauri/src/lib.rs

@@ -234,6 +234,26 @@ impl App {
 
     /// Returns the total cost of all subscriptions in a whole year.
     pub fn yearly_costs(&self) -> f32 {
+        let mut cost = 0.0;
+
+        for subscription in self.subscriptions.clone().into_values() {
+            cost += subscription.cost()
+                / subscription
+                    .recurrence()
+                    .times_in_a_year()
+                    .unwrap_or(1.0 / 12.0);
+        }
+
+        for expense in self.fixed_expenses.clone().into_values() {
+            if expense.date().year_ce().1 == Utc::now().year_ce().1 {
+                cost += expense.cost();
+            }
+        }
+
+        cost
+    }
+
+    pub fn eoy_costs(&self) -> f32 {
         cost_to_year_end(
             self.subscriptions.clone().into_values().collect(),
             self.fixed_expenses.clone().into_values().collect(),
@@ -260,7 +280,7 @@ impl App {
         }
 
         for subscription in self.subscriptions.values() {
-            amount -= subscription.cost();
+            amount -= subscription.cost_per_month();
         }
 
         amount
@@ -274,6 +294,6 @@ impl App {
     }
 
     pub fn yearly_balance(&self) -> f32 {
-        self.yearly_income() - self.yearly_costs()
+        self.yearly_income() - self.eoy_costs()
     }
 }

src-tauri/src/main.rs

@@ -76,6 +76,7 @@ fn main() {
             get_punctual_incomes,
             get_punctual_expenses,
             monthly_cost,
+            yearly_cost,
             eoy_cost,
             eoy_income,
             eoy_balance,

src-tauri/src/utils/recurrence.rs

@@ -86,6 +86,14 @@ impl Recurrence {
             SimpleRecurrence::Year => Self::Year(days, months, years),
         }
     }
+
+    pub fn times_in_a_year(self) -> Option<f32> {
+        match self {
+            Self::Day(days) => Some(365.0 / days as f32),
+            Self::Month(_, months) => Some(12.0 / months as f32),
+            Self::Year(_, _, years) => Some(1.0 / years as f32),
+        }
+    }
 }
 
 impl Display for Recurrence {

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "nix-bucks",
-    "version": "0.1.0"
+    "version": "0.1.1"
   },
   "tauri": {
     "allowlist": {
@@ -39,7 +39,7 @@
         "resizable": true,
         "title": "Nix Bucks",
         "width": 1300,
-        "height": 700
+        "height": 750
       }
     ]
   }

src/lib/Stats.svelte

@@ -1,11 +1,11 @@
 <script lang="ts">
     import { invoke } from "@tauri-apps/api/tauri";
 	import { onMount } from 'svelte';
-    import { monthly_cost, eoy_cost, eoy_income, eoy_balance, eom_balance } from "./store.ts";
+    import { monthly_cost, yearly_cost, eoy_income, eoy_balance, eom_balance } from "./store.ts";
 
     onMount(async () => {
         $monthly_cost = await invoke("monthly_cost");
-        $eoy_cost = await invoke("eoy_cost");
+        $yearly_cost = await invoke("yearly_cost");
         $eoy_income = await invoke("eoy_income");
         $eoy_balance = await invoke("eoy_balance");
         $eom_balance = await invoke("eom_balance");
@@ -21,9 +21,9 @@
     <p class="amount" class:negative={$monthly_cost.includes("-")}>{$monthly_cost}</p>
   </div>
   <div class="card">
-    <img src="/icon-arrowup.svg" alt="" width="32" height="32" />
-    <p class="title">Total cost by the end of year</p>
-    <p class="amount" class:negative={$eoy_cost.includes("-")}>{$eoy_cost}</p>
+    <img src="/src/assets/icon-arrowup.svg" alt="" width="32" height="32" />
+    <p class="title">Total average cost per year</p>
+    <p class="amount" class:negative={$yearly_cost.includes("-")}>{$yearly_cost}</p>
   </div>
   <div class="card">
     <img src="/icon-arrowup.svg" alt="" width="32" height="32" />

src/lib/dialogs/NewFixedExpenseDialog.svelte

@@ -6,7 +6,7 @@
 
 <script lang="ts">
     import { invoke } from "@tauri-apps/api";
-    import { p_expenses, monthly_cost, eoy_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
+    import { p_expenses, monthly_cost, yearly_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
     import { formatDate } from "../../App.svelte";
 
     let concept = "";
@@ -31,7 +31,7 @@
             $p_expenses = [...$p_expenses, new_p_expense];
             
             $monthly_cost = await invoke("monthly_cost");
-            $eoy_cost = await invoke("eoy_cost");
+            $yearly_cost= await invoke("yearly_cost");
             $eoy_income = await invoke("eoy_income");
             $eoy_balance = await invoke("eoy_balance");
             $eom_balance = await invoke("eom_balance");

src/lib/dialogs/NewIncomeDialog.svelte

@@ -6,7 +6,7 @@
 
 <script lang="ts">
     import { invoke } from "@tauri-apps/api";
-    import { incomes, monthly_cost, eoy_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
+    import { incomes, monthly_cost, yearly_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
     import type { Subscription } from "../../App.svelte";
     import type { Writable } from "svelte/store";
 
@@ -38,7 +38,7 @@
             $incomes = [...$incomes, (new_income as Subscription)];
             
             $monthly_cost = await invoke("monthly_cost");
-            $eoy_cost = await invoke("eoy_cost");
+            $yearly_cost= await invoke("yearly_cost");
             $eoy_income = await invoke("eoy_income");
             $eoy_balance = await invoke("eoy_balance");
             $eom_balance = await invoke("eom_balance");

src/lib/dialogs/NewPunctualIncomeDialog.svelte

@@ -6,7 +6,7 @@
 
 <script lang="ts">
     import { invoke } from "@tauri-apps/api";
-    import { p_incomes, monthly_cost, eoy_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
+    import { p_incomes, monthly_cost, yearly_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
     import { formatDate } from "../../App.svelte";
 
     let concept = "";
@@ -30,7 +30,7 @@
             $p_incomes = [...$p_incomes, new_p_income];
             
             $monthly_cost = await invoke("monthly_cost");
-            $eoy_cost = await invoke("eoy_cost");
+            $yearly_cost= await invoke("yearly_cost");
             $eoy_income = await invoke("eoy_income");
             $eoy_balance = await invoke("eoy_balance");
             $eom_balance = await invoke("eom_balance");

src/lib/dialogs/NewSubscriptionDialog.svelte

@@ -7,7 +7,7 @@
 <script lang="ts">
     import { invoke } from "@tauri-apps/api";
     import type { Subscription } from "../../App.svelte";
-    import { subscriptions, monthly_cost, eoy_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
+    import { subscriptions, monthly_cost, yearly_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
 
     let selected = 'Month';
 
@@ -37,7 +37,7 @@
             $subscriptions = [...$subscriptions, (new_subscription as Subscription)];
             
             $monthly_cost = await invoke("monthly_cost");
-            $eoy_cost = await invoke("eoy_cost");
+            $yearly_cost= await invoke("yearly_cost");
             $eoy_income = await invoke("eoy_income");
             $eoy_balance = await invoke("eoy_balance");
             $eom_balance = await invoke("eom_balance");

src/lib/store.ts

@@ -21,6 +21,7 @@ export const p_incomes: Writable<Punctual[]> = writable([]);
 export const p_expenses: Writable<Punctual[]> = writable([]);
 
 export const monthly_cost: Writable<string> = writable("Loading...");
+export const yearly_cost: Writable<string> = writable("Loading...");
 export const eoy_cost: Writable<string> = writable("Loading...");
 export const eoy_income: Writable<string> = writable("Loading...");
 export const eoy_balance: Writable<string> = writable("Loading...");

src/lib/tables/FixedExpenseTable.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
     import { openModal } from "../dialogs/NewFixedExpenseDialog.svelte";
-    import { p_expenses, monthly_cost, eoy_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
+    import { p_expenses, monthly_cost, yearly_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
     import { onMount } from "svelte";
     import { invoke }  from "@tauri-apps/api/tauri";
     import type { Punctual } from "../../App.svelte";
@@ -14,8 +14,8 @@
             invoke("monthly_cost").then((value) => {
                 $monthly_cost = (value as string);
             });
-            invoke("eoy_cost").then((value) => {
-                $eoy_cost = (value as string);
+            invoke("yearly_cost").then((value) => {
+                $yearly_cost = value
             });
 
             invoke("eoy_income").then((value) => {

src/lib/tables/IncomeTable.svelte

@@ -4,7 +4,7 @@
     import { invoke } from "@tauri-apps/api/tauri";
     
     import type { Subscription } from "../../App.svelte";
-    import { incomes, monthly_cost, eoy_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
+    import { incomes, monthly_cost, yearly_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
 
     onMount(async () => {
         $incomes = (await invoke("get_incomes") as Subscription[]);
@@ -13,7 +13,7 @@
     function delete_income(uuid: string) {
         invoke("delete_uuid", {uuid: uuid}).then(async () => {
             $monthly_cost = await invoke("monthly_cost");
-            $eoy_cost = await invoke("eoy_cost");
+            $yearly_cost= await invoke("yearly_cost");
             $eoy_income = await invoke("eoy_income");
             $eoy_balance = await invoke("eoy_balance");
             $eom_balance = await invoke("eom_balance");

src/lib/tables/PunctualIncomeTable.svelte

@@ -2,7 +2,7 @@
     import { openModal } from "../dialogs/NewPunctualIncomeDialog.svelte";
     import { invoke } from "@tauri-apps/api/tauri";
     import type { Punctual } from "../../App.svelte";
-    import { p_incomes, monthly_cost, eoy_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
+    import { p_incomes, monthly_cost, yearly_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
     import { onMount } from "svelte";
 
     onMount(async () => {
@@ -12,7 +12,7 @@
     async function delete_p_income(uuid: string) {
         invoke("delete_uuid", {uuid: uuid}).then(async () => {
             $monthly_cost = await invoke("monthly_cost");
-            $eoy_cost = await invoke("eoy_cost");
+            $yearly_cost= await invoke("yearly_cost");
             $eoy_income = await invoke("eoy_income");
             $eoy_balance = await invoke("eoy_balance");
             $eom_balance = await invoke("eom_balance");

src/lib/tables/SubscriptionsTable.svelte

@@ -2,7 +2,7 @@
     import { openModal } from "../dialogs/NewSubscriptionDialog.svelte";
     import { onMount } from "svelte";
     import { invoke } from "@tauri-apps/api/tauri";
-    import { type Subscription, subscriptions, monthly_cost, eoy_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
+    import { type Subscription, subscriptions, monthly_cost, yearly_cost, eoy_income, eoy_balance, eom_balance } from "../store.ts";
 
     onMount(async () => {
         $subscriptions = (await invoke("get_subscriptions") as Subscription[]);
@@ -11,7 +11,7 @@
     async function delete_subscription(uuid: string) {
         await invoke("delete_uuid", {uuid: uuid}).then(async () => {
             $monthly_cost = await invoke("monthly_cost");
-            $eoy_cost = await invoke("eoy_cost");
+            $yearly_cost = await invoke("yearly_cost");
             $eoy_income = await invoke("eoy_income");
             $eoy_balance = await invoke("eoy_balance");
             $eom_balance = await invoke("eom_balance");