1.2.0

config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.ionicframework.wheremoney264323" version="1.1.0" xmlns="http://www.w3.org/ns/widgets"
+<widget id="com.ionicframework.wheremoney264323" version="1.2.0" xmlns="http://www.w3.org/ns/widgets"
         xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Где деньги</name>
     <description>Контроль ваших финансов</description>

src/components/transaction-action/transaction-action.component.scss

@@ -3,6 +3,7 @@ transaction-action-component {
   bottom: 75px;
   right: 0;
   left: 0;
+  z-index: 5;
   text-align: right;
   .button {
     height: 5.5rem;

src/components/transaction-form/transaction-form.component.ts

@@ -180,10 +180,10 @@ export class TransactionForm {
             if(this.eventType === EVENTS.ADD_TRANSACTION) {
                 let sum = data.sum;
                 if(this.type === '0') {
+                    sum = parseInt('-' + sum);
                     if(data.inBudget) {
                         this.budgetService.updateRestBudget(sum);
                     }
-                    sum = parseInt('-' + sum);
                 }
                 this.userService.updateBalance(sum);
             }

src/components/transaction-item/transaction-item.component.html

@@ -1,5 +1,4 @@
 <div class="fadeIn animated">
-    <div *ngIf="transaction.showLabelDate" class="b-transaction-date"><ion-icon name="ios-calendar-outline"></ion-icon> {{ dateCreated }}</div>
     <div class="b-transaction-item {{ transactionClass }}">
         <div class="transaction-item__data">
             <div class="transaction-item__icon">

src/components/transaction-item/transaction-item.component.scss

@@ -81,3 +81,13 @@ transaction-item-component {
     font-size: 2.2rem;
   }
 }
+
+
+.controls-item {
+  .button {
+    width: 60px;
+    ion-icon {
+      font-size: 2.2em;
+    }
+  }
+}

src/components/transaction-item/transaction-item.component.ts

@@ -24,7 +24,6 @@ export class TransactionItem {
     @Input() transaction: TransactionInterface;
 
 
-    public dateCreated: string;
     public categoryName: string;
     public sum: string;
     public transactionClass: string;
@@ -41,35 +40,10 @@ export class TransactionItem {
      */
     public ngAfterContentInit(): void {
         this.categoryName = this.transaction.name;
-        this.createDate();
         this.createSum();
     }
 
 
-    /**
-     *
-     */
-    private createDate(): void {
-        let created = this.transaction.created;
-        let dayMs = 1000 * 60 * 60 * 24;
-        if (created) {
-            let date = Utils.dateFormatting(created);
-            if(date == Utils.dateFormatting(new Date())) {
-                this.dateCreated = 'сегодня';
-            }
-            else if(Utils.dateFormatting(created - dayMs) === Utils.dateFormatting(+new Date() - (dayMs * 2))) {
-                this.dateCreated = 'вчера';
-            }
-            else if(Utils.dateFormatting(created - dayMs) === Utils.dateFormatting(+new Date() - (dayMs * 3))) {
-                this.dateCreated = 'позавчера';
-            }
-            else {
-                this.dateCreated = date;
-            }
-        }
-    }
-
-
     /**
      *
      */

src/interfaces/transaction.interface.ts

@@ -11,6 +11,7 @@
 
 
 export interface TransactionInterface {
+    id: number,
     category_id: number,
     name: string,
     created: number;
@@ -19,5 +20,7 @@ export interface TransactionInterface {
     sum: number,
     type: number,
     showLabelDate: boolean,
-    inBudget: boolean
+    dateCreated: string,
+    inBudget: boolean,
+    canDeleted: boolean
 }

src/pages/activity/activity.html

@@ -39,11 +39,21 @@
 <ion-content>
 
     <div class="container-activity-list" *ngIf="totalCount > 0">
-        <div class="grid-row">
-            <div class="grid-column-12 grid-padding grid-left" *ngFor="let transaction of transactions;">
-                <transaction-item-component [transaction]="transaction"></transaction-item-component>
+        <ion-list>
+            <div *ngFor="let transaction of transactions; let position = index;">
+                <div *ngIf="transaction.showLabelDate" class="b-transaction-date"><ion-icon name="ios-calendar-outline"></ion-icon> {{ transaction.dateCreated }}</div>
+                <ion-item-sliding>
+                    <ion-item>
+                        <transaction-item-component [transaction]="transaction"></transaction-item-component>
+                    </ion-item>
+                    <ion-item-options *ngIf="position < 5 && transaction.canDeleted" class="controls-item" side="right">
+                        <button ion-button icon-only color="remove" (click)="deleteTransaction($event, transaction.id, position)">
+                            <ion-icon name="ios-close"></ion-icon>
+                        </button>
+                    </ion-item-options>
+                </ion-item-sliding>
             </div>
-        </div>
+        </ion-list>
 
     </div>
 

src/pages/activity/activity.ts

@@ -11,11 +11,15 @@
 
 
 import { Component } from '@angular/core';
+import { Utils } from "../../libs/Utils";
 
 import { DateService } from "../../services/date.service";
 import { TransactionService } from "../../services/transaction.service";
+import { BudgetService } from "../../services/budget.service";
 import { UserService } from "../../services/user.service";
-import { Utils } from "../../libs/Utils";
+import { NotifyService } from "../../services/notify.service";
+
+import { TransactionInterface } from "../../interfaces/transaction.interface";
 
 
 @Component({
@@ -47,10 +51,14 @@ export class ActivityPage {
      *
      * @param dateService
      * @param transactionService
+     * @param notifyService
+     * @param budgetService
      * @param userService
      */
     constructor(private dateService: DateService,
                 private transactionService: TransactionService,
+                private notifyService: NotifyService,
+                private budgetService: BudgetService,
                 private userService: UserService) {
 
         this.title = 'Активность';
@@ -90,7 +98,7 @@ export class ActivityPage {
         this.offset += this.stepOffset;
         this.getTransactions().then(
             (transactions)=> {
-                this.transactions = this.setShowLabelDate(Array.prototype.concat(this.transactions, transactions));
+                this.transactions = this.iteratorTransactions(Array.prototype.concat(this.transactions, transactions));
                 infiniteScroll.complete();
             },
             (error) => {
@@ -133,14 +141,13 @@ export class ActivityPage {
     }
 
 
-
     /**
      *
      */
     private renderTransactions(): void {
         this.getTransactions().then(
             (transactions)=> {
-                this.transactions = this.setShowLabelDate(Array.prototype.concat(this.transactions, transactions));
+                this.transactions = this.iteratorTransactions(Array.prototype.concat(this.transactions, transactions));
             },
             (error) => {
                 console.error(error);
@@ -174,21 +181,93 @@ export class ActivityPage {
     /**
      *
      * @param transactions
-     * @returns {any[]}
+     * @returns {TransactionInterface[]}
      */
-    private setShowLabelDate(transactions: any[]): any[] {
-        let date = null;
+    private iteratorTransactions(transactions: TransactionInterface[]): TransactionInterface[] {
+        let savedDate = null;
         return transactions.map((transaction) => {
-            let clearDate = new Date(transaction.created).setHours(0, 0, 0, 0);
-            if(clearDate != date) {
-                date = clearDate;
-                transaction.showLabelDate = true;
-            }
+            this.createDate(transaction);
+            this.setCanDeleted(transaction);
+            this.setShowLabelDate(transaction, savedDate, (newDate) => savedDate = newDate);
             return transaction;
         });
     }
 
 
+    /**
+     *
+     * @param transaction
+     * @param savedDate
+     * @param changeDate
+     */
+    private setShowLabelDate(transaction: TransactionInterface, savedDate, changeDate): void {
+        let clearDate = new Date(transaction.created).setHours(0, 0, 0, 0);
+        if(clearDate != savedDate) {
+            changeDate(clearDate);
+            transaction.showLabelDate = true;
+        }
+    }
+
+    /**
+     *
+     * @param transaction
+     */
+    public setCanDeleted(transaction: TransactionInterface): void {
+        transaction.canDeleted = this.dateService.dateIsToday(new Date(transaction.created));
+    }
+
+
+    /**
+     *
+     * @param transaction
+     */
+    private createDate(transaction: TransactionInterface): void {
+        const created = transaction.created;
+        const dayMs = 1000 * 60 * 60 * 24;
+
+        if (created) {
+            let date = Utils.dateFormatting(created);
+            if(date == Utils.dateFormatting(new Date())) {
+                transaction.dateCreated = 'сегодня';
+            }
+            else if(Utils.dateFormatting(created - dayMs) === Utils.dateFormatting(+new Date() - (dayMs * 2))) {
+                transaction.dateCreated = 'вчера';
+            }
+            else if(Utils.dateFormatting(created - dayMs) === Utils.dateFormatting(+new Date() - (dayMs * 3))) {
+                transaction.dateCreated = 'позавчера';
+            }
+            else {
+                transaction.dateCreated = date;
+            }
+        }
+    }
+
+
+    /**
+     *
+     * @param event
+     * @param id
+     * @param position
+     */
+    public deleteTransaction(event: any, id: number, position: number): void {
+        event.stopPropagation();
+        this.transactionService.deleteTransaction(id).then((message: string) => {
+            const currentTransaction = this.transactions[position];
+            if(currentTransaction.inBudget && currentTransaction.type == 0) {
+                this.budgetService.updateRestBudget(currentTransaction.sum);
+            }
+
+            this.userService.updateBalance(currentTransaction.sum).then(() => this.updateBalance());
+
+            const copyTransactions = this.transactions.slice();
+            copyTransactions.splice(position, 1);
+            this.transactions = this.iteratorTransactions(copyTransactions);
+            this.notifyService.show(message);
+        });
+    }
+
+
+
     /**
      *
      */

src/pages/settings/settings.ts

@@ -42,7 +42,7 @@ export class SettingPage {
         private budgetService: BudgetService) {
 
         this.title = 'Настройки';
-        this.version = '1.1.0';
+        this.version = '1.2.0';
         this.settings = {
             budget: {
                 value: '10000'

src/pages/stats/stats.scss

@@ -15,8 +15,11 @@ page-stats {
     font-size: 1.3rem;
     text-transform: uppercase;
     .total-sum-s {
-      margin-left: 5px;
+      background: $secondColorContent;
+      padding: 8px 15px;
+      margin-left: 10px;
       font-size: 1.7rem;
+      border-radius: 30px;
     }
   }
 }

src/pages/templates/templates.html

@@ -17,18 +17,18 @@
     <div *ngIf="totalCount > 0">
         <div class="container-templates-list">
             <ion-list>
-                <ion-item-sliding *ngFor="let template of templates; let i = index;">
+                <ion-item-sliding *ngFor="let template of templates; let position = index;">
                     <ion-item>
                         <transaction-item-component [transaction]="template"></transaction-item-component>
                     </ion-item>
-                    <ion-item-options class="controls-template" side="right">
+                    <ion-item-options class="controls-item" side="right">
                         <button ion-button icon-only color="create" (click)="createTransaction($event, template.templateId)">
                             <ion-icon name="ios-add"></ion-icon>
                         </button>
                         <button ion-button icon-only color="update" (click)="updateTemplate($event, template)">
                             <ion-icon name="ios-refresh"></ion-icon>
                         </button>
-                        <button ion-button icon-only color="remove" (click)="deleteTemplate($event, template.templateId, i)">
+                        <button ion-button icon-only color="remove" (click)="deleteTemplate($event, template.templateId, position)">
                             <ion-icon name="ios-close"></ion-icon>
                         </button>
                     </ion-item-options>

src/pages/templates/templates.scss

@@ -7,14 +7,6 @@ page-templates {
   }
 }
 
-.controls-template {
-  .button {
-    width: 60px;
-    ion-icon {
-      font-size: 2.2em;
-    }
-  }
-}
 
 .container-templates-list {
   margin: 16px 0;

src/services/budget.service.ts

@@ -89,8 +89,8 @@ export class BudgetService {
             const { year, week } = this.dateService.getWeekNumber();
 
             this.getBudget(year, week).then((budget: any) => {
-                const rest = budget.rest - value;
-                const promise = this.sqlService.query(`UPDATE budget SET rest = ${rest} WHERE week=${week}`);
+                const rest = budget.rest + value;
+                const promise = this.sqlService.query(`UPDATE budget SET rest = ${rest} WHERE year = ${year} AND week=${week}`);
                 promise.then(
                     (data) => {
                         resolve(data);

src/services/date.service.ts

@@ -90,4 +90,15 @@ export class DateService {
     public getDateLastDayInMonth(date: Date): Date {
         return new Date(date.getFullYear(), date.getMonth() + 1, 0, 23, 59, 59, 59);
     }
+
+    /**
+     *
+     * @param date
+     * @returns {boolean}
+     */
+    public dateIsToday(date: Date): boolean {
+        const today = new Date();
+        return today.toDateString() == date.toDateString();
+    }
+
 }