-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(ionic/forms): render table header as text
- Loading branch information
Showing
9 changed files
with
132 additions
and
11 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /** | ||
| * @license | ||
| * Copyright (C) Gnucoop soc. coop. | ||
| * | ||
| * This file is part of the Advanced JSON forms (ajf). | ||
| * | ||
| * Advanced JSON forms (ajf) is free software: you can redistribute it and/or | ||
| * modify it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the License, | ||
| * or (at your option) any later version. | ||
| * | ||
| * Advanced JSON forms (ajf) is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero | ||
| * General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with Advanced JSON forms (ajf). | ||
| * If not, see http://www.gnu.org/licenses/. | ||
| * | ||
| */ | ||
|
|
||
| import {AjfFormsModule as CoreFormsModule} from '@ajf/core/forms'; | ||
| import {AjfFormsModule} from '@ajf/ionic/forms'; | ||
| import {NgModule} from '@angular/core'; | ||
|
|
||
| import {IonicTableFieldE2E} from './table-field-e2e'; | ||
|
|
||
| @NgModule({ | ||
| imports: [ | ||
| AjfFormsModule, | ||
| CoreFormsModule, | ||
| ], | ||
| declarations: [ | ||
| IonicTableFieldE2E, | ||
| ], | ||
| }) | ||
| export class IonicTableFieldE2eModule { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <h1>Ionic Table Field Example</h1> | ||
| <section> | ||
| <ajf-form [form]="form"></ajf-form> | ||
| </section> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| import {AjfForm, AjfFormSerializer} from '@ajf/core/forms'; | ||
| import {Component, ViewEncapsulation} from '@angular/core'; | ||
|
|
||
| const formSchema: any = { | ||
| nodes: [{ | ||
| parent: 0, | ||
| id: 7, | ||
| name: 'table1', | ||
| label: 'Ionic Table Field Example', | ||
| nodeType: 3, | ||
| nodes: [{ | ||
| id: 701, | ||
| parent: 7, | ||
| name: 'row', | ||
| rows: [['value1', 'value2', 'value3'], ['value4', 'value5', 'value6']], | ||
| label: '2.1', | ||
| editable: true, | ||
| nodeType: 0, | ||
| fieldType: 11, | ||
| rowLabels: [ | ||
| 'Row 1', | ||
| 'Row 2', | ||
| ], | ||
| columnLabels: ['Label 1', 'Label 2', 'Label 3'] | ||
| }] | ||
| }] | ||
| }; | ||
|
|
||
| @Component({ | ||
| selector: 'ion-table-field-e2e', | ||
| templateUrl: 'table-field-e2e.html', | ||
| styles: [` | ||
| .ajf-slider-container { | ||
| min-height: 400px; | ||
| }`], | ||
| encapsulation: ViewEncapsulation.None | ||
| }) | ||
| export class IonicTableFieldE2E { | ||
| formSchema: string = JSON.stringify(formSchema); | ||
| form: AjfForm; | ||
|
|
||
| constructor() { | ||
| this.form = AjfFormSerializer.fromJson(formSchema); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import {browser, by, element, ExpectedConditions, Key} from 'protractor'; | ||
|
|
||
| describe('ajf-table-field', () => { | ||
| beforeEach(async () => await browser.get('/ion-table-field')); | ||
|
|
||
| it('should show a table field', async () => { | ||
| expect(await element(by.className('ajf-table-field')).isPresent()).toBe(true); | ||
| const cells = await element.all(by.tagName('td')).getWebElements(); | ||
| expect(cells.length).toBe(12); | ||
| cells.forEach(async cell => console.log(await cell.getText())); | ||
| expect(await cells[0].getText()).toBe('2.1'); | ||
| expect(await cells[4].getText()).toBe('Row 1'); | ||
| expect(await cells[8].getText()).toBe('Row 2'); | ||
| }); | ||
|
|
||
| it('should show table header', async () => { | ||
| const cells = await element.all(by.tagName('td')).getWebElements(); | ||
| cells.forEach(async cell => console.log(await cell.getText())); | ||
| expect(await cells[1].getText()).toBe('Label 1'); | ||
| expect(await cells[2].getText()).toBe('Label 2'); | ||
| expect(await cells[3].getText()).toBe('Label 3'); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters