CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

build: Use prettier for typescript

Browse Source 
Stop ignoring .ts files in prettier and fix existing issues.
This commit is contained in:
Ralph Hopman
2025-01-15 11:59:30 +00:00
committed by Adam Saghy
parent 9d6cf1514a
commit cac1d11ad7
1812 changed files with 22516 additions and 16862 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/accounting/search-journal-entry/journal-entry.datasource.ts
+11 -6
View File
@@ -11,7 +11,6 @@ import { AccountingService } from '../accounting.service';
* Journal entries custom data source to implement server side filtering, pagination and sorting.
*/
export class JournalEntriesDataSource implements DataSource<any> {
/** Journal entries behavior subject to represent loaded journal entries page. */
private journalEntriesSubject = new BehaviorSubject<any[]>([]);
/** Records subject to represent total number of filtered journal entry records. */
@@ -22,7 +21,7 @@ export class JournalEntriesDataSource implements DataSource<any> {
/**
* @param {AccountingService} accountingService Accounting Service
*/
constructor(private accountingService: AccountingService) { }
constructor(private accountingService: AccountingService) {}
/**
* Gets journal entries on the basis of provided parameters and emits the value.
@@ -32,10 +31,17 @@ export class JournalEntriesDataSource implements DataSource<any> {
* @param {number} pageIndex Page number.
* @param {number} limit Number of entries within the page.
*/
getJournalEntries(filterBy: any, orderBy: string = '', sortOrder: string = '', pageIndex: number = 0, limit: number = 10) {
getJournalEntries(
filterBy: any,
orderBy: string = '',
sortOrder: string = '',
pageIndex: number = 0,
limit: number = 10
) {
this.journalEntriesSubject.next([]);
orderBy = (orderBy === 'debit' || orderBy === 'credit') ? 'amount' : orderBy;
this.accountingService.getJournalEntries(filterBy, orderBy, sortOrder, pageIndex * limit, limit)
orderBy = orderBy === 'debit' || orderBy === 'credit' ? 'amount' : orderBy;
this.accountingService
.getJournalEntries(filterBy, orderBy, sortOrder, pageIndex * limit, limit)
.subscribe((journalEntries: any) => {
this.recordsSubject.next(journalEntries.totalFilteredRecords);
this.journalEntriesSubject.next(journalEntries.pageItems);
@@ -56,5 +62,4 @@ export class JournalEntriesDataSource implements DataSource<any> {
this.journalEntriesSubject.complete();
this.recordsSubject.complete();
}
}
src/app/accounting/search-journal-entry/search-journal-entry.component.spec.ts
+2 -3
View File
@@ -8,9 +8,8 @@ describe('SearchJournalEntryComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ SearchJournalEntryComponent ]
})
.compileComponents();
declarations: [SearchJournalEntryComponent]
}).compileComponents();
}));
beforeEach(() => {
src/app/accounting/search-journal-entry/search-journal-entry.component.ts
+73 -41
View File
@@ -7,7 +7,7 @@ import { ActivatedRoute } from '@angular/router';
/** rxjs Imports */
import { merge } from 'rxjs';
import { tap, startWith, map, distinctUntilChanged, debounceTime} from 'rxjs/operators';
import { tap, startWith, map, distinctUntilChanged, debounceTime } from 'rxjs/operators';
/** Custom Services */
import { AccountingService } from '../accounting.service';
@@ -25,7 +25,6 @@ import { Dates } from 'app/core/utils/dates';
styleUrls: ['./search-journal-entry.component.scss']
})
export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
/** Minimum transaction date allowed. */
minDate = new Date(2000, 0, 1);
/** Maximum transaction date allowed. */
@@ -56,7 +55,7 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
},
{
option: 'System Entries',
value: false // Bug: unable to implement from server side
value: false // Bug: unable to implement from server side
}
];
/** Transaction date from form control. */
@@ -70,7 +69,20 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
/** Submitted on date to form control. */
submittedOnDateTo = new UntypedFormControl();
/** Columns to be displayed in journal entries table. */
displayedColumns: string[] = ['id', 'officeName', 'transactionId', 'transactionDate', 'glAccountType', 'createdByUserName', 'submittedOnDate', 'glAccountCode', 'glAccountName', 'currency', 'debit', 'credit'];
displayedColumns: string[] = [
'id',
'officeName',
'transactionId',
'transactionDate',
'glAccountType',
'createdByUserName',
'submittedOnDate',
'glAccountCode',
'glAccountName',
'currency',
'debit',
'credit'
];
/** Data source for journal entries table. */
dataSource: JournalEntriesDataSource;
/** Journal entries filter. */
@@ -93,7 +105,10 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
},
{
type: 'fromDate',
value: this.dateUtils.formatDate(new Date(new Date().setMonth(new Date().getMonth() - 1)), this.settingsService.dateFormat)
value: this.dateUtils.formatDate(
new Date(new Date().setMonth(new Date().getMonth() - 1)),
this.settingsService.dateFormat
)
},
{
type: 'toDate',
@@ -128,17 +143,16 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
* @param {ActivatedRoute} route Activated Route.
* @param {SettingsService} settingsService Settings Service.
*/
constructor(private accountingService: AccountingService,
private settingsService: SettingsService,
private dateUtils: Dates,
private route: ActivatedRoute) {
this.route.data.subscribe((data: {
offices: any,
glAccounts: any
}) => {
this.officeData = data.offices;
this.glAccountData = data.glAccounts;
});
constructor(
private accountingService: AccountingService,
private settingsService: SettingsService,
private dateUtils: Dates,
private route: ActivatedRoute
) {
this.route.data.subscribe((data: { offices: any; glAccounts: any }) => {
this.officeData = data.offices;
this.glAccountData = data.glAccounts;
});
}
/**
@@ -159,7 +173,7 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
ngAfterViewInit() {
this.officeName.valueChanges
.pipe(
map(value => value.id ? value.id : ''),
map((value) => (value.id ? value.id : '')),
debounceTime(500),
distinctUntilChanged(),
tap((filterValue) => {
@@ -170,7 +184,7 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
this.glAccount.valueChanges
.pipe(
map(value => value ? value : ''),
map((value) => (value ? value : '')),
debounceTime(500),
distinctUntilChanged(),
tap((filterValue) => {
@@ -209,12 +223,15 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
)
.subscribe();
this.submittedOnDateFrom.valueChanges
this.submittedOnDateFrom.valueChanges
.pipe(
debounceTime(500),
distinctUntilChanged(),
tap((filterValue) => {
this.applyFilter(this.dateUtils.formatDate(filterValue, this.settingsService.dateFormat), 'submittedOnDateFrom');
this.applyFilter(
this.dateUtils.formatDate(filterValue, this.settingsService.dateFormat),
'submittedOnDateFrom'
);
})
)
.subscribe();
@@ -224,17 +241,18 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
debounceTime(500),
distinctUntilChanged(),
tap((filterValue) => {
this.applyFilter(this.dateUtils.formatDate(filterValue, this.settingsService.dateFormat), 'submittedOnDateTo');
this.applyFilter(
this.dateUtils.formatDate(filterValue, this.settingsService.dateFormat),
'submittedOnDateTo'
);
})
)
.subscribe();
this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0);
this.sort.sortChange.subscribe(() => (this.paginator.pageIndex = 0));
merge(this.sort.sortChange, this.paginator.page)
.pipe(
tap(() => this.loadJournalEntriesPage())
)
.pipe(tap(() => this.loadJournalEntriesPage()))
.subscribe();
}
@@ -245,7 +263,13 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
if (!this.sort.direction) {
delete this.sort.active;
}
this.dataSource.getJournalEntries(this.filterJournalEntriesBy, this.sort.active, this.sort.direction, this.paginator.pageIndex, this.paginator.pageSize);
this.dataSource.getJournalEntries(
this.filterJournalEntriesBy,
this.sort.active,
this.sort.direction,
this.paginator.pageIndex,
this.paginator.pageSize
);
}
/**
@@ -255,7 +279,7 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
*/
applyFilter(filterValue: string, property: string) {
this.paginator.pageIndex = 0;
const findIndex = this.filterJournalEntriesBy.findIndex(filter => filter.type === property);
const findIndex = this.filterJournalEntriesBy.findIndex((filter) => filter.type === property);
this.filterJournalEntriesBy[findIndex].value = filterValue;
this.loadJournalEntriesPage();
}
@@ -273,24 +297,24 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
* Sets filtered offices for autocomplete.
*/
setFilteredOffices() {
this.filteredOfficeData = this.officeName.valueChanges
.pipe(
startWith(''),
map((office: any) => typeof office === 'string' ? office : office.name),
map((officeName: string) => officeName ? this.filterOfficeAutocompleteData(officeName) : this.officeData)
);
this.filteredOfficeData = this.officeName.valueChanges.pipe(
startWith(''),
map((office: any) => (typeof office === 'string' ? office : office.name)),
map((officeName: string) => (officeName ? this.filterOfficeAutocompleteData(officeName) : this.officeData))
);
}
/**
* Sets filtered gl accounts for autocomplete.
*/
setFilteredGlAccounts() {
this.filteredGLAccountData = this.glAccount.valueChanges
.pipe(
startWith(''),
map((glAccount: any) => typeof glAccount === 'string' ? glAccount : glAccount.name + ' (' + glAccount.glCode + ')'),
map((glAccount: string) => glAccount ? this.filterGLAccountAutocompleteData(glAccount) : this.glAccountData)
);
this.filteredGLAccountData = this.glAccount.valueChanges.pipe(
startWith(''),
map((glAccount: any) =>
typeof glAccount === 'string' ? glAccount : glAccount.name + ' (' + glAccount.glCode + ')'
),
map((glAccount: string) => (glAccount ? this.filterGLAccountAutocompleteData(glAccount) : this.glAccountData))
);
}
/**
@@ -308,7 +332,9 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
* @returns {any} Filtered gl accounts.
*/
private filterGLAccountAutocompleteData(glAccount: string): any {
return this.glAccountData.filter((option: any) => (option.name + ' (' + option.glCode + ')').toLowerCase().includes(glAccount.toLowerCase()));
return this.glAccountData.filter((option: any) =>
(option.name + ' (' + option.glCode + ')').toLowerCase().includes(glAccount.toLowerCase())
);
}
/**
@@ -316,6 +342,12 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
*/
getJournalEntries() {
this.dataSource = new JournalEntriesDataSource(this.accountingService);
this.dataSource.getJournalEntries(this.filterJournalEntriesBy, this.sort.active, this.sort.direction, this.paginator.pageIndex, this.paginator.pageSize);
this.dataSource.getJournalEntries(
this.filterJournalEntriesBy,
this.sort.active,
this.sort.direction,
this.paginator.pageIndex,
this.paginator.pageSize
);
}
}