diff --git a/package-lock.json b/package-lock.json index 3f8ff3b..00e509b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -595,6 +595,14 @@ "@types/jasmine": "*" } }, + "@types/moment-timezone": { + "version": "0.5.12", + "resolved": "https://registry.npmjs.org/@types/moment-timezone/-/moment-timezone-0.5.12.tgz", + "integrity": "sha512-hnHH2+Efg2vExr/dSz+IX860nSiyk9Sk4pJF2EmS11lRpMcNXeB4KBW5xcgw2QPsb9amTXdsVNEe5IoJXiT0uw==", + "requires": { + "moment": ">=2.14.0" + } + }, "@types/node": { "version": "8.9.5", "resolved": "http://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", @@ -6408,6 +6416,14 @@ "minimist": "0.0.8" } }, + "moment-timezone": { + "version": "0.5.25", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.25.tgz", + "integrity": "sha512-DgEaTyN/z0HFaVcVbSyVCUU6HeFdnNC3vE4c9cgu2dgMTvjBUBdBzWfasTBmAW45u5OIMeCJtU8yNjM22DHucw==", + "requires": { + "moment": ">= 2.9.0" + } + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", diff --git a/package.json b/package.json index d55366f..3befa66 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,10 @@ "@angular/platform-browser-dynamic": "^6.1.0", "@angular/router": "^6.1.0", "@ng-bootstrap/ng-bootstrap": "^3.3.1", + "@types/moment-timezone": "^0.5.12", "bootstrap": "^4.1.3", "core-js": "^2.5.4", + "moment-timezone": "^0.5.25", "rxjs": "~6.2.0", "rxjs-compat": "6.0.0", "zone.js": "~0.8.26" diff --git a/src/app/core/account.service.ts b/src/app/core/account.service.ts index 0c70e94..b313dc1 100644 --- a/src/app/core/account.service.ts +++ b/src/app/core/account.service.ts @@ -590,13 +590,6 @@ export class AccountService { return this.apiService.deleteAccount(id); } - getPeriodStart(): Date { - let date = new Date(); - date.setDate(1); - date.setHours(0, 0, 0, 0); - return date; - } - createDefaultAccounts(tree: AccountTree): Observable { let assetAccount = tree.getAccountByName('Assets', 1); let equityAccount = tree.getAccountByName('Equity', 1); diff --git a/src/app/core/api.service.ts b/src/app/core/api.service.ts index e61996f..33c241a 100644 --- a/src/app/core/api.service.ts +++ b/src/app/core/api.service.ts @@ -22,7 +22,7 @@ export class ApiService { private httpOptions = { headers: new HttpHeaders({ 'content-type': 'application/json', - 'accept-version': '^1.0.1' + 'accept-version': '^1.3.0' }) }; private orgId: string; @@ -231,6 +231,11 @@ export class ApiService { .pipe(catchError(this.handleError)); } + putOrg(org: Org): Observable { + return this.http.put(this.url + '/orgs/' + this.orgId, org, this.httpOptions) + .pipe(catchError(this.handleError)); + } + getPricesNearestInTime(date: Date): Observable { let query = '/orgs/' + this.orgId + '/prices?nearestDate=' + date.getTime(); return this.http.get(this.url + query, this.httpOptions) diff --git a/src/app/core/org.service.ts b/src/app/core/org.service.ts index 007ec77..b54478d 100644 --- a/src/app/core/org.service.ts +++ b/src/app/core/org.service.ts @@ -59,6 +59,14 @@ export class OrgService { }); } + updateOrg(org: Org): Observable { + return this.apiService.putOrg(org) + .do(org => { + this.org = org; + this.sessionService.switchOrg(this.org); + }) + } + getInvites(): Observable { return this.apiService.getInvites(); } diff --git a/src/app/core/websocket.service.ts b/src/app/core/websocket.service.ts index 747ab54..eb7ff8e 100644 --- a/src/app/core/websocket.service.ts +++ b/src/app/core/websocket.service.ts @@ -10,7 +10,7 @@ import 'rxjs/add/operator/retryWhen'; import 'rxjs/add/operator/repeatWhen'; import 'rxjs/add/operator/delay'; -var version = '^1.0.1'; +var version = '^1.3.0'; @Injectable() export class WebSocketService { diff --git a/src/app/dashboard/dashboard.html b/src/app/dashboard/dashboard.html index aa10f7b..26eb95a 100644 --- a/src/app/dashboard/dashboard.html +++ b/src/app/dashboard/dashboard.html @@ -56,7 +56,7 @@
- {{recentTx.tx.date | date:"M/d"}} + {{recentTx.tx.date | datetz:"M/D":org.timezone}}
{{recentTx.tx.description}} diff --git a/src/app/dashboard/dashboard.ts b/src/app/dashboard/dashboard.ts index d669570..86905b8 100644 --- a/src/app/dashboard/dashboard.ts +++ b/src/app/dashboard/dashboard.ts @@ -7,6 +7,7 @@ import { SessionService } from '../core/session.service'; import { Transaction, Split } from '../shared/transaction'; import { Org } from '../shared/org'; import { Account, AccountTree } from '../shared/account'; +import { DateUtil } from '../shared/dateutil'; import { TxListPage } from '../transaction/list'; import { IncomeReport } from '../reports/income'; import { Observable } from 'rxjs/Observable'; @@ -46,11 +47,12 @@ export class DashboardPage implements OnInit { ngOnInit() { this.sessionService.setLoading(true); this.log.debug('dashboard init'); - let periodStart = this.accountService.getPeriodStart(); this.org = this.orgService.getCurrentOrg(); this.log.debug('org', this.org); + let periodStart = DateUtil.getPeriodStart(this.org.timezone); + let tree$ = this.accountService.getAccountTreeWithPeriodBalance(periodStart); tree$.do(tree => { diff --git a/src/app/org/neworg.html b/src/app/org/neworg.html index fd9aa45..9db3078 100644 --- a/src/app/org/neworg.html +++ b/src/app/org/neworg.html @@ -33,6 +33,14 @@
+
+ + +
diff --git a/src/app/org/neworg.ts b/src/app/org/neworg.ts index 4ce4e38..f2a0d9a 100644 --- a/src/app/org/neworg.ts +++ b/src/app/org/neworg.ts @@ -12,6 +12,7 @@ import { OrgService } from '../core/org.service'; import { Org } from '../shared/org'; import { AppError } from '../shared/error'; import { Util } from '../shared/util'; +import { DateUtil } from '../shared/dateutil'; @Component({ selector: 'app-neworg', @@ -22,16 +23,22 @@ export class NewOrgPage { public error: AppError; public joinOrgForm: FormGroup; public joinOrgError: AppError; + public timezones: string[]; + public defaultTz: string; constructor( private log: Logger, private orgService: OrgService, private fb: FormBuilder ) { + this.timezones = DateUtil.getTimezones(); + this.defaultTz = DateUtil.getDefaultTimezone(); + this.form = fb.group({ 'name': ['', Validators.required], 'currency': ['USD', Validators.required], 'precision': [2, Validators.required], + 'timezone': [this.defaultTz, Validators.required], 'createDefaultAccounts': [true, Validators.required] }); diff --git a/src/app/org/org.html b/src/app/org/org.html index a376751..68cb22f 100644 --- a/src/app/org/org.html +++ b/src/app/org/org.html @@ -1,7 +1,42 @@

Organization

-

Choose Organization

+

Current Organization

+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+

{{updateOrgError.message}}

+ +
+ +

Switch Organization

@@ -15,7 +50,7 @@

{{chooseOrgError.message}}

- +
@@ -103,6 +138,16 @@
+
+ +
+ +
+
diff --git a/src/app/org/org.ts b/src/app/org/org.ts index e5e570c..188aeb9 100644 --- a/src/app/org/org.ts +++ b/src/app/org/org.ts @@ -14,6 +14,7 @@ import { Org } from '../shared/org'; import { Invite } from '../shared/invite'; import { AppError } from '../shared/error'; import { Util } from '../shared/util'; +import { DateUtil } from '../shared/dateutil'; @Component({ selector: 'app-org', @@ -30,7 +31,11 @@ export class OrgPage { public inviteFormError: AppError; public newOrgForm: FormGroup; public newOrgError: AppError; + public updateOrgForm: FormGroup; + public updateOrgError: AppError; public invites: Invite[]; + public timezones: string[]; + public defaultTz: string; constructor( private log: Logger, @@ -38,8 +43,18 @@ export class OrgPage { private fb: FormBuilder ) { + this.timezones = DateUtil.getTimezones(); + this.defaultTz = DateUtil.getDefaultTimezone(); + this.invites = null; + this.updateOrgForm = fb.group({ + 'name': ['', Validators.required], + 'currency': [{value: '', disabled: true}, Validators.required], + 'precision': [{value: null, disabled: true}, Validators.required], + 'timezone': ['', Validators.required] + }); + this.chooseOrgForm = fb.group({ 'id': [null, Validators.required] }); @@ -56,6 +71,7 @@ export class OrgPage { 'name': ['', Validators.required], 'currency': ['', Validators.required], 'precision': [null, Validators.required], + 'timezone': [this.defaultTz, Validators.required], 'createDefaultAccounts': [true, Validators.required] }); } @@ -63,12 +79,22 @@ export class OrgPage { ngOnInit() { this.currentOrg = this.orgService.getCurrentOrg(); + this.updateOrgForm.setValue( + { + name: this.currentOrg.name, + currency: this.currentOrg.currency, + precision: this.currentOrg.precision, + timezone: this.currentOrg.timezone + } + ); + this.chooseOrgForm.setValue({id: this.currentOrg.id}); this.newOrgForm.setValue( { name: '', currency: this.currentOrg.currency, precision: this.currentOrg.precision, + timezone: this.defaultTz, createDefaultAccounts: true } ); @@ -139,6 +165,22 @@ export class OrgPage { ); } + updateOrgSubmit() { + let org = this.currentOrg; + org.name = this.updateOrgForm.get('name').value; + org.timezone = this.updateOrgForm.get('timezone').value; + + this.orgService.updateOrg(org) + .subscribe( + org => { + this.log.debug(org); + }, + error => { + this.updateOrgError = error; + } + ); + } + deleteInvite(invite: Invite) { this.orgService.deleteInvite(invite.id).subscribe(() => { this.invites = this.invites.filter(inv => { diff --git a/src/app/price/price-modal.ts b/src/app/price/price-modal.ts index 3911c53..6b768bc 100644 --- a/src/app/price/price-modal.ts +++ b/src/app/price/price-modal.ts @@ -11,8 +11,11 @@ import { AbstractControl } from '@angular/forms'; import { Util } from '../shared/util'; +import { DateUtil } from '../shared/dateutil'; import { PriceService } from '../core/price.service'; import { Price } from '../shared/price'; +import { SessionService } from '../core/session.service'; +import { Org } from '../shared/org'; import { Observable } from 'rxjs/Observable'; @Component({ @@ -23,15 +26,18 @@ import { Observable } from 'rxjs/Observable'; export class PriceModal { public form: FormGroup; public error: AppError; + public org: Org; private originalDate: Date; constructor( public activeModal: NgbActiveModal, private log: Logger, private priceService: PriceService, + private sessionService: SessionService, private fb: FormBuilder ) { - let dateString = Util.getLocalDateString(new Date()); + this.org = this.sessionService.getOrg(); + let dateString = DateUtil.getLocalDateString(new Date(), this.org.timezone); this.form = fb.group({ 'id': [null], @@ -47,7 +53,7 @@ export class PriceModal { this.form.patchValue({ id: data.id, currency: data.currency, - date: Util.getLocalDateString(data.date), + date: DateUtil.getLocalDateString(data.date, this.org.timezone), price: data.price }); } @@ -56,18 +62,11 @@ export class PriceModal { this.error = null; let date = this.form.value.id ? this.originalDate : new Date(); - let formDate = Util.getDateFromLocalDateString(this.form.value.date); + let formDate = DateUtil.getDateFromLocalDateString(this.form.value.date, this.org.timezone); - if(formDate.getTime()) { + if(formDate.getTime() && !DateUtil.isSameDay(date, formDate, this.org.timezone)) { // make the time be at the very end of the day - formDate.setHours(23, 59, 59, 999); - } - - let sameDay = formDate.getFullYear() === date.getFullYear() && - formDate.getMonth() === date.getMonth() && - formDate.getDate() === date.getDate(); - - if(formDate.getTime() && !sameDay) { + DateUtil.setEndOfDay(formDate, this.org.timezone); date = formDate; } diff --git a/src/app/price/pricedb.html b/src/app/price/pricedb.html index 4dbda5d..620d461 100644 --- a/src/app/price/pricedb.html +++ b/src/app/price/pricedb.html @@ -17,7 +17,7 @@
- {{price.date | date:"M/d/y"}} + {{price.date | datetz:"M/D/YYYY":org.timezone}}
{{price.price * multiplier | currencyFormat:org.precision:org.currency}} diff --git a/src/app/price/pricedb.ts b/src/app/price/pricedb.ts index c792023..8a130bb 100644 --- a/src/app/price/pricedb.ts +++ b/src/app/price/pricedb.ts @@ -13,7 +13,6 @@ import { PriceService } from '../core/price.service'; import { Price } from '../shared/price'; import { Org } from '../shared/org'; import { AppError } from '../shared/error'; -import { Util } from '../shared/util'; import { Observable } from 'rxjs/Observable'; import 'rxjs/add/observable/forkJoin'; import { NgbModal, ModalDismissReasons } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/app/reconcile/reconcile-modal.html b/src/app/reconcile/reconcile-modal.html index 1284eba..7b91ae1 100644 --- a/src/app/reconcile/reconcile-modal.html +++ b/src/app/reconcile/reconcile-modal.html @@ -14,7 +14,7 @@
-
{{item.tx.date | date:"M/d/y"}}
+
{{item.tx.date | datetz:"M/D/YYYY":org.timezone}}
{{item.tx.description}}
{{item.amount | currencyFormat:account.precision:account.currency}}
@@ -26,7 +26,7 @@
-
{{item.tx.date | date:"M/d/y"}}
+
{{item.tx.date | datetz:"M/D/YYYY":org.timezone}}
{{item.tx.description}}
{{item.amount | currencyFormat:account.precision:account.currency}}
diff --git a/src/app/reconcile/reconcile-modal.ts b/src/app/reconcile/reconcile-modal.ts index 1b21dcd..6e55a6f 100644 --- a/src/app/reconcile/reconcile-modal.ts +++ b/src/app/reconcile/reconcile-modal.ts @@ -45,6 +45,7 @@ export class ReconcileModal { public balance: number; public reconciled: number; public error: AppError; + public org: Org; constructor( public activeModal: NgbActiveModal, @@ -52,7 +53,9 @@ export class ReconcileModal { private txService: TransactionService, private sessionService: SessionService, private fb: FormBuilder - ) {} + ) { + this.org = this.sessionService.getOrg(); + } setData(account: Account, rec: Reconciliation) { this.account = account; diff --git a/src/app/reconcile/reconcile.html b/src/app/reconcile/reconcile.html index 72f47eb..bd98d85 100644 --- a/src/app/reconcile/reconcile.html +++ b/src/app/reconcile/reconcile.html @@ -53,7 +53,7 @@

Past Reconciliations

- Period: {{rec.startDate | date:"M/d/y"}} - {{rec.endDate | date:"M/d/y"}}
+ Period: {{rec.startDate | datetz:"M/D/YYYY":org.timezone}} - {{rec.endDate | datetz:"M/D/YYYY":org.timezone}}
Beginning Balance: {{rec.startBalance | currencyFormat:account.precision:account.currency}}
Ending Balance: {{rec.endBalance | currencyFormat:account.precision:account.currency}}
Delete diff --git a/src/app/reconcile/reconcile.ts b/src/app/reconcile/reconcile.ts index 81e531b..d44ad3c 100644 --- a/src/app/reconcile/reconcile.ts +++ b/src/app/reconcile/reconcile.ts @@ -14,8 +14,10 @@ import { OrgService } from '../core/org.service'; import { TransactionService } from '../core/transaction.service'; import { Account, AccountApi, AccountTree } from '../shared/account'; import { Transaction } from '../shared/transaction'; +import { Org } from '../shared/org'; import { AppError } from '../shared/error'; import { Util } from '../shared/util'; +import { DateUtil } from '../shared/dateutil'; import { NgbModal, ModalDismissReasons } from '@ng-bootstrap/ng-bootstrap'; import { ReconcileModal } from './reconcile-modal'; import { Reconciliation } from './reconciliation'; @@ -37,6 +39,7 @@ export class ReconcilePage { public pastReconciliations: Reconciliation[]; public unreconciledTxs: Transaction[]; public error: AppError; + public org: Org; private accountTree: AccountTree; @ViewChild('confirmDeleteModal') confirmDeleteModal: ElementRef; @@ -50,7 +53,7 @@ export class ReconcilePage { private modalService: NgbModal, private sessionService: SessionService) { - let org = this.orgService.getCurrentOrg(); + this.org = this.orgService.getCurrentOrg(); this.accountForm = fb.group({ 'accountId': [null, Validators.required] }); @@ -85,8 +88,8 @@ export class ReconcilePage { let value = this.newReconcile.getRawValue(); let rec = new Reconciliation(); - rec.startDate = Util.getDateFromLocalDateString(value.startDate); - rec.endDate = Util.getDateFromLocalDateString(value.endDate); + rec.startDate = DateUtil.getDateFromLocalDateString(value.startDate, this.org.timezone); + rec.endDate = DateUtil.getDateFromLocalDateString(value.endDate, this.org.timezone); rec.startBalance = Math.round(parseFloat(value.startBalance) * Math.pow(10, this.account.precision)); rec.endBalance = Math.round(parseFloat(value.endBalance) * Math.pow(10, this.account.precision)); @@ -104,7 +107,7 @@ export class ReconcilePage { this.newReconcile.patchValue( { - startDate: Util.getLocalDateString(rec.endDate), + startDate: DateUtil.getLocalDateString(rec.endDate, this.org.timezone), startBalance: rec.endBalance / Math.pow(10, this.account.precision), endBalance: 0, endDate: '' @@ -201,7 +204,7 @@ export class ReconcilePage { if(!dates.length) { if(firstStartDate) { - this.newReconcile.patchValue({startDate: Util.getLocalDateString(firstStartDate)}); + this.newReconcile.patchValue({startDate: DateUtil.getLocalDateString(firstStartDate, this.org.timezone)}); } return; } @@ -226,7 +229,7 @@ export class ReconcilePage { this.newReconcile.patchValue( { - startDate: Util.getLocalDateString(lastRec.endDate), + startDate: DateUtil.getLocalDateString(lastRec.endDate, this.org.timezone), startBalance: lastRec.endBalance / Math.pow(10, this.account.precision) } ); @@ -270,7 +273,7 @@ export class ReconcilePage { if(lastRec) { this.newReconcile.patchValue( { - startDate: Util.getLocalDateString(lastRec.endDate), + startDate: DateUtil.getLocalDateString(lastRec.endDate, this.org.timezone), startBalance: lastRec.endBalance / Math.pow(10, this.account.precision) } ); diff --git a/src/app/reports/balancesheet.html b/src/app/reports/balancesheet.html index 9355de6..9d052b6 100644 --- a/src/app/reports/balancesheet.html +++ b/src/app/reports/balancesheet.html @@ -1,4 +1,4 @@ -

Balance Sheet
{{date | date:"shortDate"}} (options)

+

Balance Sheet
{{date.getTime() - 1 | datetz:"M/D/YYYY":org.timezone}} (options)

diff --git a/src/app/reports/balancesheet.ts b/src/app/reports/balancesheet.ts index a8e40db..281bbab 100644 --- a/src/app/reports/balancesheet.ts +++ b/src/app/reports/balancesheet.ts @@ -17,7 +17,7 @@ import { ValidationErrors } from '@angular/forms'; import { AppError } from '../shared/error'; -import { Util } from '../shared/util'; +import { DateUtil } from '../shared/dateutil'; @Component({ selector: 'app-balancesheet', @@ -62,15 +62,16 @@ export class BalanceSheetReport { } } + this.org = this.orgService.getCurrentOrg(); + this.form = fb.group({ - date: [Util.getLocalDateString(this.date), Validators.required], + date: [DateUtil.getLocalDateStringExcl(this.date, this.org.timezone), Validators.required], priceSource: [this.priceSource, Validators.required] }); } ngOnInit() { this.sessionService.setLoading(true); - this.org = this.orgService.getCurrentOrg(); this.amounts = {}; this.assetAccount = null; @@ -133,7 +134,7 @@ export class BalanceSheetReport { this.treeSubscription.unsubscribe(); //this.dataService.setLoading(true); this.showOptionsForm = false; - this.date = Util.getDateFromLocalDateString(this.form.value.date); + this.date = DateUtil.getDateFromLocalDateStringExcl(this.form.value.date, this.org.timezone); this.priceSource = this.form.value.priceSource; let reportData = this.configService.get('reportData'); diff --git a/src/app/reports/income.html b/src/app/reports/income.html index df557d4..198c887 100644 --- a/src/app/reports/income.html +++ b/src/app/reports/income.html @@ -1,4 +1,4 @@ -

Income Statement
{{startDate | date:"shortDate"}} - {{endDate.getTime() - 1 | date:"shortDate"}} (edit)

+

Income Statement
{{startDate | datetz:"M/D/YYYY":org.timezone}} - {{endDate.getTime() - 1 | datetz:"M/D/YYYY":org.timezone}} (edit)

diff --git a/src/app/reports/income.ts b/src/app/reports/income.ts index cc614b8..c02dcdd 100644 --- a/src/app/reports/income.ts +++ b/src/app/reports/income.ts @@ -18,7 +18,7 @@ import { ValidationErrors } from '@angular/forms'; import { AppError } from '../shared/error'; -import { Util } from '../shared/util'; +import { DateUtil } from '../shared/dateutil'; @Component({ selector: 'app-income', @@ -44,11 +44,16 @@ export class IncomeReport { private orgService: OrgService, private configService: ConfigService, private sessionService: SessionService) { + } + + ngOnInit() { + this.sessionService.setLoading(true); + this.org = this.orgService.getCurrentOrg(); + this.startDate = new Date(); - this.startDate.setDate(1); - this.startDate.setHours(0, 0, 0, 0); - this.endDate = new Date(this.startDate); - this.endDate.setMonth(this.startDate.getMonth() + 1); + DateUtil.setFirstOfMonth(this.startDate, this.org.timezone); + DateUtil.setBeginOfDay(this.startDate, this.org.timezone); + this.endDate = DateUtil.getOneMonthLater(this.startDate, this.org.timezone); let reportData = this.configService.get('reportData'); @@ -63,15 +68,10 @@ export class IncomeReport { } } - this.form = fb.group({ - startDate: [Util.getLocalDateString(this.startDate), Validators.required], - endDate: [Util.getLocalDateString(new Date(this.endDate.getTime() - 1)), Validators.required] + this.form = this.fb.group({ + startDate: [DateUtil.getLocalDateString(this.startDate, this.org.timezone), Validators.required], + endDate: [DateUtil.getLocalDateStringExcl(this.endDate, this.org.timezone), Validators.required] }); - } - - ngOnInit() { - this.sessionService.setLoading(true); - this.org = this.orgService.getCurrentOrg(); this.treeSubscription = this.accountService.getAccountTreeWithPeriodBalance(this.startDate, this.endDate) .subscribe(tree => { @@ -91,9 +91,8 @@ export class IncomeReport { this.treeSubscription.unsubscribe(); //this.dataService.setLoading(true); this.showDateForm = false; - this.startDate = Util.getDateFromLocalDateString(this.form.value.startDate); - this.endDate = Util.getDateFromLocalDateString(this.form.value.endDate); - this.endDate.setDate(this.endDate.getDate() + 1); + this.startDate = DateUtil.getDateFromLocalDateString(this.form.value.startDate, this.org.timezone); + this.endDate = DateUtil.getDateFromLocalDateStringExcl(this.form.value.endDate, this.org.timezone); let reportData = this.configService.get('reportData'); diff --git a/src/app/shared/datetz.pipe.ts b/src/app/shared/datetz.pipe.ts new file mode 100644 index 0000000..213483f --- /dev/null +++ b/src/app/shared/datetz.pipe.ts @@ -0,0 +1,14 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import * as moment from 'moment-timezone/builds/moment-timezone-with-data-2012-2022.min'; +//import * as moment from 'moment-timezone'; + +@Pipe({name: 'datetz'}) +export class DateTzPipe implements PipeTransform { + constructor() { + } + + transform(date: Date, format: string, tz: string): string { + let m = moment(date).tz(tz || moment.tz.guess()); + return m.format(format); + } +} \ No newline at end of file diff --git a/src/app/shared/dateutil.ts b/src/app/shared/dateutil.ts new file mode 100644 index 0000000..719a13c --- /dev/null +++ b/src/app/shared/dateutil.ts @@ -0,0 +1,175 @@ +import * as moment from 'moment-timezone/builds/moment-timezone-with-data-2012-2022.min'; +//import * as moment from 'moment-timezone'; + +const defaultTz = moment.tz.guess(); + +export class DateUtil { + static getLocalDateString(input: Date, tz: string) { + let m = moment(input).tz(tz || defaultTz); + + let year = m.format('YYYY'); + let month = m.format('MM'); + let date = m.format('DD'); + + if(month.length < 2) { + month = '0' + month; + } + + if(date.length < 2) { + date = '0' + date; + } + + return year + '-' + month + '-' + date; + } + + static getLocalDateStringExcl(input: Date, tz: string) { + let m = moment(input.getTime() - 1).tz(tz || defaultTz); + + let year = m.format('YYYY'); + let month = m.format('MM'); + let date = m.format('DD'); + + if(month.length < 2) { + month = '0' + month; + } + + if(date.length < 2) { + date = '0' + date; + } + + return year + '-' + month + '-' + date; + } + + static getDateFromLocalDateString(input: string, tz: string) { + let parts = input.split('-'); + + let m = moment().tz(tz || defaultTz); + m.hours(0); + m.minutes(0); + m.seconds(0); + m.milliseconds(0); + m.year(parseInt(parts[0])); + m.month(parseInt(parts[1]) - 1); + m.date(parseInt(parts[2])); + + return m.toDate(); + } + + static getDateFromLocalDateStringExcl(input: string, tz: string) { + let parts = input.split('-'); + + let m = moment().tz(tz || defaultTz); + m.hours(0); + m.minutes(0); + m.seconds(0); + m.milliseconds(0); + m.year(parseInt(parts[0])); + m.month(parseInt(parts[1]) - 1); + m.date(parseInt(parts[2]) + 1); + + return m.toDate(); + } + + static setFirstOfMonth(input: Date, tz: string) { + let m = moment(input).tz(tz || defaultTz); + + m.date(1); + input.setTime(m.valueOf()); + } + + static setBeginOfDay(input: Date, tz: string) { + let m = moment(input).tz(tz || defaultTz); + + m.hours(0); + m.minutes(0); + m.seconds(0); + m.milliseconds(0); + input.setTime(m.valueOf()); + } + + static setEndOfDay(input: Date, tz: string) { + let m = moment(input).tz(tz || defaultTz); + + m.hours(23); + m.minutes(59); + m.seconds(59); + m.milliseconds(999); + input.setTime(m.valueOf()); + } + + static getOneMonthLater(input: Date, tz: string): Date { + let m = moment(input).tz(tz || defaultTz); + + m.month(m.month() + 1); + + return m.toDate(); + } + + static computeTransactionDate(formDate: Date, txDate: Date, tz: string): Date { + if(!formDate || !formDate.getTime()) { + return txDate; + } + + let formMoment = moment(formDate).tz(tz || defaultTz); + let txMoment = moment(txDate).tz(tz || defaultTz); + + // make the time be at the very end of the day + formMoment.hours(23); + formMoment.minutes(59); + formMoment.seconds(59); + formMoment.milliseconds(999); + + let sameDay = formMoment.year() === txMoment.year() && + formMoment.month() === txMoment.month() && + formMoment.date() === txMoment.date(); + + if(sameDay) { + return txDate; + } + + if(formDate < txDate) { + // make time end of day for past dates + formMoment.hours(23); + formMoment.minutes(59); + formMoment.seconds(59); + formMoment.milliseconds(999); + } else { + // make time beginning of day for future dates + formMoment.hours(0); + formMoment.minutes(0); + formMoment.seconds(0); + formMoment.milliseconds(0); + } + + return formMoment.toDate(); + } + + static isSameDay(date1: Date, date2: Date, tz: string) { + let m1 = moment(date1).tz(tz || defaultTz); + let m2 = moment(date2).tz(tz || defaultTz); + + return m1.year() === m2.year() && + m1.month() === m2.month() && + m1.date() === m2.date(); + } + + static getPeriodStart(tz: string): Date { + let m = moment().tz(tz || defaultTz); + m.date(1); + m.hours(0); + m.minutes(0); + m.seconds(0); + m.milliseconds(0); + + return m.toDate(); + } + + static getTimezones(): string[] { + let timezones = ['']; + return timezones.concat(moment.tz.names()); + } + + static getDefaultTimezone(): string { + return defaultTz; + } +} \ No newline at end of file diff --git a/src/app/shared/org.ts b/src/app/shared/org.ts index 365b0d5..e5026d9 100644 --- a/src/app/shared/org.ts +++ b/src/app/shared/org.ts @@ -5,6 +5,7 @@ export class Org { name: string; currency: string; precision: number; + timezone: string; constructor(options: any = {}) { this.id = options.id; this.inserted = options.inserted ? new Date(options.inserted) : null; @@ -12,5 +13,6 @@ export class Org { this.name = options.name; this.currency = options.currency; this.precision = options.precision && parseInt(options.precision); + this.timezone = options.timezone; } } \ No newline at end of file diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index d7634d3..443284f 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -3,11 +3,12 @@ import { DecimalPipe } from '@angular/common'; import { CurrencyFormatPipe } from './currency-format.pipe'; import { AccountNamePipe } from './account-name.pipe'; import { AccountBalancePipe } from './account-balance.pipe'; +import { DateTzPipe } from './datetz.pipe'; @NgModule({ imports: [], - declarations: [CurrencyFormatPipe, AccountNamePipe, AccountBalancePipe], - exports: [CurrencyFormatPipe, AccountNamePipe, AccountBalancePipe], + declarations: [CurrencyFormatPipe, AccountNamePipe, AccountBalancePipe, DateTzPipe], + exports: [CurrencyFormatPipe, AccountNamePipe, AccountBalancePipe, DateTzPipe], providers: [DecimalPipe, CurrencyFormatPipe] }) export class SharedModule { } \ No newline at end of file diff --git a/src/app/shared/util.ts b/src/app/shared/util.ts index 57ca01e..d1152c4 100644 --- a/src/app/shared/util.ts +++ b/src/app/shared/util.ts @@ -1,30 +1,4 @@ export class Util { - static getLocalDateString(input: Date) { - let year = input.getFullYear().toString(); - let month = (input.getMonth() + 1).toString(); - let date = input.getDate().toString(); - - if(month.length < 2) { - month = '0' + month; - } - - if(date.length < 2) { - date = '0' + date; - } - - return year + '-' + month + '-' + date; - } - - static getDateFromLocalDateString(input: string) { - let parts = input.split('-'); - let date = new Date(); - date.setHours(0, 0, 0, 0); - date.setFullYear(parseInt(parts[0])); - date.setMonth(parseInt(parts[1]) - 1, parseInt(parts[2])); - - return date; - } - static newGuid() { let arr = new Uint8Array(16); window.crypto.getRandomValues(arr); diff --git a/src/app/transaction/advancededit.ts b/src/app/transaction/advancededit.ts index b09d891..3c27720 100644 --- a/src/app/transaction/advancededit.ts +++ b/src/app/transaction/advancededit.ts @@ -15,6 +15,7 @@ import { AbstractControl } from '@angular/forms'; import { Util } from '../shared/util'; +import { DateUtil } from '../shared/dateutil'; import { OrgService } from '../core/org.service'; import { TransactionService } from '../core/transaction.service'; @@ -50,7 +51,7 @@ export class AdvancedEdit { this.org = this.orgService.getCurrentOrg(); - let dateString = Util.getLocalDateString(item.tx.date); + let dateString = DateUtil.getLocalDateString(item.tx.date, this.org.timezone); this.form = new FormGroup({ date: new FormControl(dateString), @@ -110,20 +111,9 @@ export class AdvancedEdit { this.error = null; let date = this.item.tx.id ? this.item.tx.date : new Date(); - let formDate = Util.getDateFromLocalDateString(this.form.value.date); + let formDate = DateUtil.getDateFromLocalDateString(this.form.value.date, this.org.timezone); - if(formDate.getTime()) { - // make the time be at the very end of the day - formDate.setHours(23, 59, 59, 999); - } - - let sameDay = formDate.getFullYear() === date.getFullYear() && - formDate.getMonth() === date.getMonth() && - formDate.getDate() === date.getDate(); - - if(formDate.getTime() && !sameDay) { - date = formDate; - } + date = DateUtil.computeTransactionDate(formDate, date, this.org.timezone); let tx = new Transaction({ id: this.item.tx.id, diff --git a/src/app/transaction/list.html b/src/app/transaction/list.html index a9c553e..f3fccd8 100644 --- a/src/app/transaction/list.html +++ b/src/app/transaction/list.html @@ -35,7 +35,7 @@
- {{item.tx.date | date:"M/d/y"}} + {{item.tx.date | datetz:"M/D/YYYY":org.timezone}}
diff --git a/src/app/transaction/list.ts b/src/app/transaction/list.ts index 0d2db3d..6a48a19 100644 --- a/src/app/transaction/list.ts +++ b/src/app/transaction/list.ts @@ -2,6 +2,7 @@ import { Component, Input, OnInit, ViewChild, ElementRef, AfterViewChecked, Rend import { Logger } from '../core/logger'; import { ActivatedRoute } from '@angular/router'; import { TransactionService } from '../core/transaction.service'; +import { OrgService } from '../core/org.service'; import { AccountService } from '../core/account.service'; import { Account, AccountTree } from '../shared/account'; import { Transaction, Split} from '../shared/transaction'; @@ -17,11 +18,13 @@ import { } from '@angular/forms'; import { NgbModal, ModalDismissReasons } from '@ng-bootstrap/ng-bootstrap'; import { Util } from '../shared/util'; +import { DateUtil } from '../shared/dateutil'; import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/mergeMap'; import { AdvancedEdit } from './advancededit'; import { TxItem } from './txitem'; import { Subject } from 'rxjs'; +import { Org } from '../shared/org'; @Component({ selector: 'app-txlist', @@ -34,6 +37,7 @@ export class TxListPage implements OnInit, AfterViewChecked { public account: Account; public items: TxItem[]; public error: AppError; + public org: Org; private accountId: string; private accountTree: AccountTree; private balance: number; @@ -54,6 +58,7 @@ export class TxListPage implements OnInit, AfterViewChecked { private log: Logger, private route: ActivatedRoute, private txService: TransactionService, + private orgService: OrgService, private accountService: AccountService, private fb: FormBuilder, private renderer: Renderer, @@ -70,6 +75,7 @@ export class TxListPage implements OnInit, AfterViewChecked { ngOnInit() { this.accountId = this.route.snapshot.paramMap.get('id'); //+this.route.snapshot.paramMap.get('id'); + this.org = this.orgService.getCurrentOrg(); this.accountService.getAccountTree().subscribe(tree => { this.account = tree.accountMap[this.accountId]; @@ -88,7 +94,7 @@ export class TxListPage implements OnInit, AfterViewChecked { splits: [] }); - newTx.date.setHours(23, 59, 59, 999); + DateUtil.setEndOfDay(newTx.date, this.org.timezone); newTx.splits.push(new Split({ accountId: this.account.id @@ -403,7 +409,7 @@ export class TxListPage implements OnInit, AfterViewChecked { item.editing = true; - let dateString = Util.getLocalDateString(item.tx.date); + let dateString = DateUtil.getLocalDateString(item.tx.date, this.org.timezone); this.log.debug(item); let debit = this.getDebit(item); @@ -622,9 +628,9 @@ export class TxListPage implements OnInit, AfterViewChecked { } let date = item.tx.id ? item.tx.date : new Date(); - let formDate = Util.getDateFromLocalDateString(item.form.value.date); + let formDate = DateUtil.getDateFromLocalDateString(item.form.value.date, this.org.timezone); - date = this.computeTransactionDate(formDate, date); + date = DateUtil.computeTransactionDate(formDate, date, this.org.timezone); let tx = new Transaction({ id: item.tx.id, @@ -707,7 +713,7 @@ export class TxListPage implements OnInit, AfterViewChecked { splits: [] }); - newTx.date.setHours(23, 59, 59, 999); + DateUtil.setEndOfDay(newTx.date, this.org.timezone); newTx.splits.push(new Split({ accountId: this.account.id @@ -731,23 +737,6 @@ export class TxListPage implements OnInit, AfterViewChecked { } } - computeTransactionDate(formDate: Date, txDate: Date): Date { - if(formDate.getTime()) { - // make the time be at the very end of the day - formDate.setHours(23, 59, 59, 999); - } - - let sameDay = formDate.getFullYear() === txDate.getFullYear() && - formDate.getMonth() === txDate.getMonth() && - formDate.getDate() === txDate.getDate(); - - if(formDate.getTime() && !sameDay) { - txDate = formDate; - } - - return txDate; - } - deleteTransaction(item) { this.modalService.open(this.confirmDeleteModal).result.then((result) => { this.log.debug('delete'); @@ -842,11 +831,11 @@ export class TxListPage implements OnInit, AfterViewChecked { autocomplete(item: TxItem, tx: Transaction) { this.log.debug('chose tx', tx); - let formDate = Util.getDateFromLocalDateString(item.form.value.date); + let formDate = DateUtil.getDateFromLocalDateString(item.form.value.date, this.org.timezone); item.tx = new Transaction( { id: item.tx.id, - date: this.computeTransactionDate(formDate, new Date()), + date: DateUtil.computeTransactionDate(formDate, new Date(), this.org.timezone), description: tx.description, splits: tx.splits } diff --git a/src/app/transaction/new.ts b/src/app/transaction/new.ts index 9e81642..05b3c08 100644 --- a/src/app/transaction/new.ts +++ b/src/app/transaction/new.ts @@ -14,9 +14,11 @@ import { TransactionService } from '../core/transaction.service'; import { OrgService } from '../core/org.service'; import { Account, AccountApi, AccountTree } from '../shared/account'; import { Util } from '../shared/util'; +import { DateUtil } from '../shared/dateutil'; import { AppError } from '../shared/error'; import { Transaction, Split } from '../shared/transaction'; import { Logger } from '../core/logger'; +import { Org } from '../shared/org'; @Component({ selector: 'app-txnew', @@ -45,6 +47,7 @@ export class NewTransactionPage { public openingBalances: Account; public accountTree: AccountTree; public accountMap: any; + public org; @ViewChild('acc') acc: any; @ViewChild('amount') amount: ElementRef @@ -57,12 +60,10 @@ export class NewTransactionPage { private orgService: OrgService, private fb: FormBuilder, private log: Logger) { - this.numAccountsShown = 3; + this.org = this.orgService.getCurrentOrg(); - let org = this.orgService.getCurrentOrg(); - - let dateString = Util.getLocalDateString(new Date()); + let dateString = DateUtil.getLocalDateString(new Date(), this.org.timezone); this.form = this.fb.group({ type: ['', Validators.required], firstAccountPrimary: [null, Validators.required], @@ -226,20 +227,9 @@ export class NewTransactionPage { this.error = null; let date = new Date(); - let formDate = Util.getDateFromLocalDateString(this.form.value.date); + let formDate = DateUtil.getDateFromLocalDateString(this.form.value.date, this.org.timezone); - if (formDate.getTime()) { - // make the time be at the very end of the day - formDate.setHours(23, 59, 59, 999); - } - - let sameDay = formDate.getFullYear() === date.getFullYear() && - formDate.getMonth() === date.getMonth() && - formDate.getDate() === date.getDate(); - - if (formDate.getTime() && !sameDay) { - date = formDate; - } + date = DateUtil.computeTransactionDate(formDate, date, this.org.timezone); let tx = new Transaction({ id: Util.newGuid(),