diff --git a/src/app/pay-in/pay-in.component.html b/src/app/pay-in/pay-in.component.html index aa47d51..9251c3e 100644 --- a/src/app/pay-in/pay-in.component.html +++ b/src/app/pay-in/pay-in.component.html @@ -1,5 +1,6 @@ -(); @ViewChild('filterDialog', {static: true}) filterDialog: PopupIncomeFilterComponent; + @ViewChild('grid', {static: true}) grid: GridComponent; private privateLoadDataNow = false; @@ -44,7 +45,9 @@ export class PayInComponent implements OnInit { public showBalance = true; public showOffsetBalance = true; - public pageable = true; + @Input() public pageable = true; + + public gridSelection: number[] = []; public sortable: SortSettings = { mode: 'single' }; @@ -312,4 +315,10 @@ export class PayInComponent implements OnInit { this.incomeFormGroup.get('LoanNumber').disable({onlySelf: true, emitEvent: false}); } } + + public ScrollTo(row: number): void { + this.grid.scrollTo({ row}); + this.grid.focusCell(row + 1, 1 ); + this.gridSelection = [row]; + } } diff --git a/src/app/service/funder.name.service.ts b/src/app/service/funder.name.service.ts index 9703a8c..85d8a1a 100644 --- a/src/app/service/funder.name.service.ts +++ b/src/app/service/funder.name.service.ts @@ -17,7 +17,7 @@ export class FunderNameService extends BehaviorSubject { private fetch(): Observable{ this.loading = true; - return this.http.get(this.config.getUrl('funder-list/')).pipe( + return this.http.get(this.config.getUrl('lender-list/')).pipe( tap(() => this.loading = false) ); } diff --git a/src/app/upload-detail/upload-detail.component.html b/src/app/upload-detail/upload-detail.component.html index 6e4d7e7..f761365 100644 --- a/src/app/upload-detail/upload-detail.component.html +++ b/src/app/upload-detail/upload-detail.component.html @@ -53,42 +53,7 @@
No result analyzed
- - - - - - {{ ua.Funders[0] }} - - - - - - - - - - - - -

- Paris is the capital and most populous city of France. It has an area of 105 square kilometres (41 square miles) and a population in 2013 of 2,229,621 within its administrative limits. The city is both a commune and department, and forms the centre and headquarters of the Île-de-France, or Paris Region, which has an area of 12,012 square kilometres (4,638 square miles) and a population in 2014 of 12,005,077, comprising 18.2 percent of the population of France. -

- - - - -

- Tallinn is the capital and largest city of Estonia. It is situated on the northern coast of the country, on the shore of the Gulf of Finland, 80 km (50 mi) south of Helsinki, east of Stockholm and west of Saint Petersburg. From the 13th century until 1918 (and briefly during the Nazi occupation of Estonia from 1941 to 1944), the city was known as Reval. Tallinn occupies an area of 159.2 km2 (61.5 sq mi) and has a population of 443,894. Approximately 32% of Estonia's total population lives in Tallinn. -

-

- Tallinn was founded in 1248, but the earliest human settlements are over 5,000 years old, making it one of the oldest capital cities of Northern Europe. Due to its strategic location, the city became a major trade hub, especially from the 14th to the 16th century, when it grew in importance as part of the Hanseatic League. -

- - - -
@@ -103,11 +68,12 @@ (sizeChange)="onPayInSizeChange($event)" [(size)]="PayInSize">
-
diff --git a/src/app/upload-detail/upload-detail.component.ts b/src/app/upload-detail/upload-detail.component.ts index 3d29205..90dbb68 100644 --- a/src/app/upload-detail/upload-detail.component.ts +++ b/src/app/upload-detail/upload-detail.component.ts @@ -6,6 +6,8 @@ import {UploadMetaModel} from '../models/uploadMetaModel'; import {FloatingActionButtonComponent} from '@progress/kendo-angular-buttons'; import {DrawerSelectEvent, TabStripComponent} from '@progress/kendo-angular-layout'; import {PayInAAARowModel} from '../models/Pay.In.AAA.Row.model'; +import {CellCloseEvent} from '@progress/kendo-angular-grid'; +import {PayInComponent} from '../pay-in/pay-in.component'; @@ -21,6 +23,8 @@ export class UploadDetailComponent implements OnInit, AfterViewInit { @ViewChild('fab', {static: true}) fab: FloatingActionButtonComponent; @ViewChild('pdf', {static: false}) pdf: ElementRef; @ViewChild('tabs', {static: true}) tab: TabStripComponent; + @ViewChild('PayIn', {static: false}) payIn: PayInComponent; + // 'http://africau.edu/images/default/sample.pdf'; public uploadAsPicUrl = ''; public uploadAsPdfUrl = ''; @@ -167,4 +171,9 @@ export class UploadDetailComponent implements OnInit, AfterViewInit { this.resizeSplitter = true; this.fabOffset = {x: '10px', y: s}; } + + public onCellClick(event: CellCloseEvent): void{ + console.log('cell-click', event.dataItem, event, this.payIn); + this.payIn.ScrollTo(2); + } }