Merge additional branch to master

Author: Ihor Khomiak

app/common/utils.ts

@@ -1,18 +1,11 @@
 export class Utils {
 
-    public static dateToYMDWithMonthName(date) {
-        const monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-        const d = date.getDate();
-        const m = monthNames[date.getMonth()];
-        const y = date.getFullYear();
-        return y + ' ' + m + ' ' + (d <= 9 ? '0' + d : d);
-    }
-
     public static dateToYMD(date) {
-        const d = date.getDate();
-        const y = date.getFullYear();
-        const m = (date.getMonth()+1);
-        return y + '-' + (m <= 9 ? '0' + m : m) + '-' + (d <= 9 ? '0' + d : d);
+        let strArray=['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+        let d = date.getDate();
+        let m = strArray[date.getMonth()];
+        let y = date.getFullYear();
+        return '' + (d <= 9 ? '0' + d : d) + ' ' + m + ' ' + y;
     }
 
     public static formatDateString(dateString: string): string {

app/components/chart/chart.component.css

@@ -1,4 +1,4 @@
-.main-container {
-    height: 100%;
-    width: 100%;
+.main-container {
+    height: 100%;
+    width: 100%;
 }

app/components/cost/costs.component.ts

@@ -23,6 +23,7 @@ export class CostsComponent implements OnInit {
     @Input() set dateRange(value: any) {
         this._dateRange = value;
         if(value['startDate']) {
+            console.log(JSON.stringify(value));
             this.filterData(value);
         }
     }
@@ -63,7 +64,7 @@ export class CostsComponent implements OnInit {
         let cost: Cost = new Cost();
         cost.quantity = Number(textField.text);
         cost.type = "No Type";
-        cost.changesDate = Utils.dateToYMD(new Date());
+        cost.changesDate = (new Date()).toISOString();
         cost.changesMonth = Utils.getMonthAndYear(new Date());
         cost.isFavorite = false;
 

app/components/cost/edit/cost-edit.component.ts

@@ -4,8 +4,8 @@ import { RouterExtensions } from 'nativescript-angular/router';
 
 import { CostService } from '../../../services/cost.service';
 import { Cost } from '../../../common/protocol';
-import { Utils } from '../../../common/utils';
 import { DatePicker } from 'tns-core-modules/ui/date-picker/date-picker';
+import { Utils } from '../../../common/utils';
 
 @Component({
     selector: "cost-edit",
@@ -46,7 +46,7 @@ export class CostEditComponent implements OnInit {
     }
 
     onDoneButtonTap(): void {
-        this.costForUpdate.changesDate = (new Date(this.costDate)).toDateString();
+        this.costForUpdate.changesDate = (new Date(this.costDate)).toISOString();
         this.costForUpdate.changesMonth = Utils.getMonthAndYear(new Date(this.costDate));
 
         this.costService.updateCost(this.costForUpdate).then(result => {

app/components/list/list.component.ts

@@ -36,9 +36,9 @@ export class ListComponent {
     private getDateValue(item) {
         let currentDate: Date = new Date(Date.now());
         let itemDate: Date = new Date(item.changesDate);
-        // if(currentDate.toDateString() === itemDate.toDateString()) {
-        //     return ("0" + itemDate.getHours()).slice(-2) + ":" + ("0" + itemDate.getMinutes()).slice(-2);
-        // }
-        return Utils.dateToYMDWithMonthName(itemDate);
+        if(currentDate.toDateString() === itemDate.toDateString()) {
+            return ("0" + itemDate.getHours()).slice(-2) + ":" + ("0" + itemDate.getMinutes()).slice(-2);
+        }
+        return Utils.dateToYMD(itemDate);
     }
 }

app/services/cost.service.ts

@@ -5,11 +5,11 @@ import firebase = require('nativescript-plugin-firebase');
 import { Cost } from '../common/protocol';
 import { Config } from "../common/config";
 import { Utils } from "../common/utils";
-import { Observable } from "tns-core-modules/ui/editable-text-base/editable-text-base";
 
 @Injectable()
 export class CostService {
     private _costs: ObservableArray<any> = new ObservableArray();
+    private userid = Config.getUserToken();
     private listeners;
 
     get costs(): ObservableArray<any> {
@@ -21,10 +21,9 @@ export class CostService {
         return new Promise(function(success, error) {
             firebase.addValueEventListener(
                 (result) => {
-                    console.log('objectToArray: ', JSON.stringify(result));
                     that._costs = new ObservableArray(that.objectToArray(result.value));
                     return success();
-                }, `/${Config.getUserToken()}/costs`).then(
+                }, `/${this.userid}/costs`).then(
                 listenerWrapper => that.listeners = listenerWrapper.listeners
             );
         }.bind(this));
@@ -41,21 +40,18 @@ export class CostService {
             ranges: [
                 {
                     type: firebase.QueryRangeType.START_AT,
-                    value: Utils.dateToYMD(new Date(dateRange.startDate))
+                    value: (new Date(dateRange.startDate)).toISOString()
                 },
                 {
                     type: firebase.QueryRangeType.END_AT,
-                    value: Utils.dateToYMD(new Date(dateRange.endDate))
+                    value: Utils.increaseDateByOneDay(dateRange.endDate)
                 }
             ]
         };
 
-        console.log(JSON.stringify(parameters));
-
         return new Promise(function(success, error) {
             firebase.query(
                 result => {
-                    console.log('objectToArray: ', JSON.stringify(result));
                     that._costs = new ObservableArray(that.objectToArray(result.value));
                     return success();
                 }, 
@@ -70,18 +66,18 @@ export class CostService {
     }
 
     addCost(newCost: Cost) {
-        firebase.push(`/${Config.getUserToken()}/costs`, newCost).then(result => {
+        firebase.push(`/${this.userid}/costs`, newCost).then(result => {
             newCost.id = result.key;
             this._costs.unshift(newCost);
         });
     }
 
     updateCost(costForUpdate: Cost) {
-        return firebase.update(`/${Config.getUserToken()}/costs/${costForUpdate.id}`, costForUpdate);
+        return firebase.update(`/${this.userid}/costs/${costForUpdate.id}`, costForUpdate);
     }
 
     deleteCost(costForDelete: Cost) {
-        firebase.remove(`/${Config.getUserToken()}/costs/${costForDelete.id}`).then(result => {
+        firebase.remove(`/${this.userid}/costs/${costForDelete.id}`).then(result => {
             const index = this._costs.indexOf(costForDelete);
             this._costs.splice(index, 1);
             alert(costForDelete.quantity + " removed!");
@@ -91,7 +87,7 @@ export class CostService {
     removeListeners() {
         firebase.removeEventListeners(
             this.listeners,
-            `/${Config.getUserToken()}/costs`
+            `/${this.userid}/costs`
         );
     }
 

package.json

@@ -39,4 +39,4 @@
     "nativescript-dev-typescript": "~0.5.0",
     "typescript": "~2.2.1"
   }
-}
+}