-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #64 from feup-infolab/lazaroDevelop
Lazaro develop
- Loading branch information
Showing
9 changed files
with
308 additions
and
188 deletions.
There are no files selected for viewing
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| <app-example></app-example> | ||
| <router-outlet></router-outlet> |
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
Empty file.
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,33 @@ | ||
|
|
||
| <div *ngIf="load" style="margin: 35px"> | ||
| <json-schema-form | ||
| *ngIf="load" | ||
| [form]= "form" | ||
| [options]='jsonFormOptions' | ||
| [framework]="'bootstrap-4'" | ||
| (onSubmit)="onSubmit($event)" | ||
| (formSchema)="showFormSchemaFn($event)" | ||
| (formLayout)="showFormLayoutFn($event)" | ||
| (isValid)="isValid($event)"> | ||
| </json-schema-form> | ||
|
|
||
| <div class="example-button-row"> | ||
| <button mat-raised-button color="primary" (click)="goBack()">Go back</button> | ||
| </div> | ||
| </div> | ||
|
|
||
|
|
||
|
|
||
|
|
||
| <!-- | ||
| <json-schema-form | ||
| loadExternalAssets="true" | ||
| [schema]="schema" | ||
| [(data)]='data' | ||
| [layout]='layout' | ||
| [options]="jsonFormOptions" | ||
| [framework]="'material-design'"> | ||
| (onChanges)="onChanges($event)" | ||
| (onSubmit)="onSubmit($event)" | ||
| (validationErrors)="validationErrors($event)"> | ||
| </json-schema-form>--> |
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,25 @@ | ||
| import { async, ComponentFixture, TestBed } from '@angular/core/testing'; | ||
|
|
||
| import { EditEntityComponent } from './edit-entity.component'; | ||
|
|
||
| describe('EditEntityComponent', () => { | ||
| let component: EditEntityComponent; | ||
| let fixture: ComponentFixture<EditEntityComponent>; | ||
|
|
||
| beforeEach(async(() => { | ||
| TestBed.configureTestingModule({ | ||
| declarations: [ EditEntityComponent ] | ||
| }) | ||
| .compileComponents(); | ||
| })); | ||
|
|
||
| beforeEach(() => { | ||
| fixture = TestBed.createComponent(EditEntityComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
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,204 @@ | ||
| import { Component, OnInit } from '@angular/core'; | ||
| import {MyServiceService} from "../service/my-service.service"; | ||
| import {ActivatedRoute} from "@angular/router"; | ||
| import { Location } from '@angular/common'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-edit-entity', | ||
| templateUrl: './edit-entity.component.html', | ||
| styleUrls: ['./edit-entity.component.css'] | ||
| }) | ||
| export class EditEntityComponent implements OnInit { | ||
|
|
||
| constructor( | ||
| private location: Location, | ||
| private route: ActivatedRoute, | ||
| private service: MyServiceService) { | ||
| } | ||
| uid = ''; | ||
| name = 'Angular 7'; | ||
| jsonFormOptions = { | ||
| loadExternalAssets: true, | ||
| }; | ||
| schema = {}; | ||
| data = {}; | ||
| submittedFormData; | ||
| load = false; | ||
| form = { | ||
| schema: {}, | ||
| data: {}, | ||
| layout: [] | ||
| }; | ||
|
|
||
| onEnter(uid: string) { | ||
| //this.uid = uid; | ||
| // this.form.data = {}; | ||
| // this.form.layout = []; | ||
| // this.form.schema = {}; | ||
| //this.getSchemaNode(this.uid); | ||
| } | ||
| goBack() { | ||
| this.location.back(); | ||
| } | ||
| ngOnInit() { | ||
| this.route.paramMap.subscribe(params => { | ||
| this.uid = params.get('uid'); | ||
| console.log(this.uid); | ||
| this.load = false; | ||
| this.getSchemaNode(this.uid); | ||
| }); | ||
| } | ||
|
|
||
| getDataNode(uid) { | ||
| this.service.getDataNode(uid) | ||
| .subscribe(result => { | ||
| this.form.data = result; | ||
| console.log(result); | ||
| this.load = true; | ||
| }); | ||
| } | ||
|
|
||
| getSchemaNode(uid) { | ||
| this.service.getSchemaNode(uid) | ||
| .subscribe(returnedSchema => { | ||
| this.form.layout = []; | ||
| console.log(returnedSchema); | ||
| this.form.schema = this.refactorSchema(returnedSchema); | ||
| this.form.layout = ['*']; | ||
| // const button1 = { | ||
| // type: 'submit', | ||
| // title: 'Submit', | ||
| // onClick(evt) { | ||
| // sen | ||
| // evt.preventDefault(); | ||
| // alert('Thank you!'); | ||
| // } | ||
| // this.getDataNode(this.uid); | ||
| this.load = true; | ||
| }); | ||
| } | ||
|
|
||
| refactorSchema(jsonSchema) { | ||
| const ref = jsonSchema.$ref; | ||
| const path = ref.split('/'); | ||
| const schemaName = path[2]; | ||
| const properties = {}; | ||
| properties[this.uid] = { | ||
| $ref: ref, | ||
| title: 'Editing' | ||
| }; | ||
| jsonSchema.properties = properties; | ||
| jsonSchema.desc = "Description"; | ||
|
|
||
| delete jsonSchema.$ref; | ||
| const schemaEntity = jsonSchema.definitions[schemaName]; | ||
|
|
||
| delete schemaEntity.properties.uid; | ||
| jsonSchema.type = 'object'; | ||
| return jsonSchema; | ||
|
|
||
| } | ||
|
|
||
| sendNode(data) { | ||
| this.service.sendNode(data) | ||
| .subscribe(result => { | ||
| this.form.data = result; | ||
| console.log(result); | ||
| }); | ||
| } | ||
|
|
||
| onSubmit(a: any) { | ||
| console.log(a); | ||
| this.sendNode(a); | ||
| } | ||
|
|
||
| showFormSchemaFn($event) { | ||
| // console.log($event); it shows schema of node | ||
| } | ||
|
|
||
| showFormLayoutFn($event) { | ||
| console.log($event); | ||
| } | ||
|
|
||
| isValid($event) { | ||
| // console.log('isvalid ' + $event); | ||
| } | ||
|
|
||
| yourValidationErrorsFn($event) { | ||
| console.log('error' + $event); | ||
|
|
||
| } | ||
| } | ||
|
|
||
|
|
||
| // inline ref schema | ||
| // const schema3 = { | ||
| // $schema: 'http://json-schema.org/draft-07/schema#', | ||
| // type: 'object', | ||
| // properties: { | ||
| // bb2ca7ccfab44ee49c4594adfde91734: { | ||
| // $ref: '#/definitions/E52_Time_SpanSchema', | ||
| // title: 'Editing E52_Time_Span <a href=\"/bb2ca7ccfab44ee49c4594adfde91734\">teste</a>' | ||
| // } | ||
| // }, | ||
| // | ||
| // definitions: { | ||
| // DataObjectSchema: { | ||
| // additionalProperties: false, | ||
| // properties: { | ||
| // name: { | ||
| // title: 'name', | ||
| // type: 'string' | ||
| // }, | ||
| // uid: { | ||
| // title: 'uid', | ||
| // type: 'string' | ||
| // } | ||
| // }, | ||
| // required: ['name'], | ||
| // type: 'object' | ||
| // }, | ||
| // E52_Time_SpanSchema: { | ||
| // additionalProperties: false, | ||
| // properties: { | ||
| // date: { | ||
| // format: 'date', | ||
| // title: 'date', | ||
| // type: 'string' | ||
| // }, | ||
| // has_value: { | ||
| // items: { | ||
| // $ref: '#/definitions/DataObjectSchema', | ||
| // type: 'object' | ||
| // }, | ||
| // type: 'array' | ||
| // }, | ||
| // uid: { | ||
| // title: 'uid', | ||
| // type: 'string' | ||
| // }, | ||
| // name: { | ||
| // title: 'name', | ||
| // type: 'string' | ||
| // } | ||
| // }, | ||
| // required: ['date', 'name'], | ||
| // type: 'object' | ||
| // } | ||
| // } | ||
| // }; | ||
|
|
||
| // data | ||
| // { | ||
| // 'fruits': [ 'apple' ], | ||
| // 'vegetables': [ | ||
| // { | ||
| // 'veggieName': 'potato', | ||
| // 'veggieLike': true | ||
| // }, | ||
| // { | ||
| // 'veggieName': 'broccoli', | ||
| // 'veggieLike': false | ||
| // } | ||
| // ] | ||
| // } |
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
Oops, something went wrong.