From b4d7c831e970e9df0e7815d58373d09fff95d1fa Mon Sep 17 00:00:00 2001
From: Billy Brawner <billybrawner@gmail.com>
Date: Sat, 1 Sep 2018 10:38:56 -0500
Subject: [PATCH] Remove category types

---
 .../add-edit-category.component.html             |  4 ----
 .../add-edit-category.component.ts               |  2 --
 src/app/budget-database.ts                       |  6 ++++--
 src/app/category-list/category-list.component.ts | 16 +++++++---------
 src/app/category.ts                              |  2 --
 src/app/category.type.ts                         |  4 ----
 6 files changed, 11 insertions(+), 23 deletions(-)
 delete mode 100644 src/app/category.type.ts

diff --git a/src/app/add-edit-category/add-edit-category.component.html b/src/app/add-edit-category/add-edit-category.component.html
index edf6464..f0013fa 100644
--- a/src/app/add-edit-category/add-edit-category.component.html
+++ b/src/app/add-edit-category/add-edit-category.component.html
@@ -21,10 +21,6 @@
   <mat-form-field>
     <input matInput type="number" [(ngModel)]="currentCategory.amount" placeholder="Amount" required>
   </mat-form-field>
-  <mat-radio-group [(ngModel)]="currentCategory.type">
-    <mat-radio-button [value]="categoryType.LIMIT">Limit</mat-radio-button>
-    <mat-radio-button [value]="categoryType.GOAL">Goal</mat-radio-button>
-  </mat-radio-group>
   <!--
   <mat-form-field>
     <input type="color" matInput [(ngModel)]="currentCategory.color" placeholder="Color">
diff --git a/src/app/add-edit-category/add-edit-category.component.ts b/src/app/add-edit-category/add-edit-category.component.ts
index 09f1909..0e3b43a 100644
--- a/src/app/add-edit-category/add-edit-category.component.ts
+++ b/src/app/add-edit-category/add-edit-category.component.ts
@@ -1,7 +1,6 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { CategoryService } from '../category.service'
 import { Category } from '../category'
-import { CategoryType } from '../category.type'
 import { Location } from '@angular/common';
 
 @Component({
@@ -13,7 +12,6 @@ export class AddEditCategoryComponent implements OnInit {
 
   @Input() title: string;
   @Input() currentCategory: Category;
-  public categoryType = CategoryType;
 
   constructor(
     private categoryService: CategoryService,
diff --git a/src/app/budget-database.ts b/src/app/budget-database.ts
index 17a2a52..8c87ecd 100644
--- a/src/app/budget-database.ts
+++ b/src/app/budget-database.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import Dexie from 'dexie';
 import { Category } from './category'
-import { CategoryType } from './category.type';
 import { Transaction } from './transaction'
 import { TransactionType } from './transaction.type';
 
@@ -22,6 +21,10 @@ export class BudgetDatabase extends Dexie {
       transactions: `++id, title, description, amount, date, category_id, type`,
       categories: `++id, name, amount, repeat, color, type`
     })
+    this.version(3).stores({
+      transactions: `++id, title, description, amount, date, category_id, type`,
+      categories: `++id, name, amount, repeat, color`
+    })
     this.transactions.mapToClass(Transaction)
     this.categories.mapToClass(Category)
   }
@@ -43,5 +46,4 @@ export interface ICategory{
   amount: number;
   repeat: string;
   color: string;
-  type: CategoryType;
 }
diff --git a/src/app/category-list/category-list.component.ts b/src/app/category-list/category-list.component.ts
index 4b350c3..4ba2e02 100644
--- a/src/app/category-list/category-list.component.ts
+++ b/src/app/category-list/category-list.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { Category } from '../category'
-import { CategoryType } from '../category.type'
 
 @Component({
   selector: 'app-category-list',
@@ -53,14 +52,13 @@ export class CategoryListComponent implements OnInit {
       categoryBalance = 0
     }
 
-    if (category.type === CategoryType.LIMIT) {
-      // If the category is a limit, then a negative balance needs to be turned into positive 
-      // and vice-versa for the completion to be properly calculated
-      if (categoryBalance < 0) {
-        categoryBalance = Math.abs(categoryBalance)
-      } else {
-        categoryBalance -= (categoryBalance * 2)
-      }
+    // Invert the negative/positive values for calculating progress
+    // since the limit for a category is saved as a positive but the
+    // balance is used in the calculation. 
+    if (categoryBalance < 0) {
+      categoryBalance = Math.abs(categoryBalance)
+    } else {
+      categoryBalance -= (categoryBalance * 2)
     }
 
     return categoryBalance / category.amount * 100;
diff --git a/src/app/category.ts b/src/app/category.ts
index e7f31ff..e694475 100644
--- a/src/app/category.ts
+++ b/src/app/category.ts
@@ -1,5 +1,4 @@
 import { ICategory } from './budget-database'
-import { CategoryType } from './category.type'
 
 export class Category implements ICategory {
   id: number;
@@ -7,5 +6,4 @@ export class Category implements ICategory {
   amount: number;
   repeat: string;
   color: string;
-  type: CategoryType = CategoryType.LIMIT;
 }
diff --git a/src/app/category.type.ts b/src/app/category.type.ts
deleted file mode 100644
index ea10f02..0000000
--- a/src/app/category.type.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum CategoryType {
-    LIMIT,
-    GOAL
-}