gCubeSystem
/
information-system-gui
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debugging...

This commit is contained in:
Maria Teresa Paratore 2024-03-10 13:28:10 +01:00
parent 038368257a
commit a5784ae14f
2 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/webapp/app/facet-composer/facet-composer.component.html
View File

@ -17,8 +17,7 @@
<div [formGroup]="myForm"> <div [formGroup]="myForm">
<div formArrayName="facetArray">
<div formArrayName="facetBlocks">
<div [formGroupName] ="ind" *ngFor="let fct of typeSpec.facetSpecs; let ind=index;" > <div [formGroupName] ="ind" *ngFor="let fct of typeSpec.facetSpecs; let ind=index;" >
<mat-expansion-panel> <mat-expansion-panel>
<mat-expansion-panel-header> <mat-expansion-panel-header>
@ -33,11 +32,10 @@
<p>{{typeSpec.facetSpecs[ind].description}}</p> <p>{{typeSpec.facetSpecs[ind].description}}</p>
<!-- OK SO FAR --> <!-- OK SO FAR -->
<div formArrayName="facetPropsBlock" style="border: 1px solid rgb(84, 193, 255); padding: 10px; margin: 5px;"> <div formArrayName="propertyArray" style="border: 1px solid rgb(84, 193, 255); padding: 10px; margin: 5px;">
<div [formGroupName] ="i" *ngFor="let prop of typeSpec.facetSpecs[ind].guiProps; let i=index" > <div [formGroupName] ="i" *ngFor="let prop of typeSpec.facetSpecs[ind].guiProps; let i=index" >
<label for="{{prop.name}}">{{i}}.{{prop.label}}</label> <label for="{{prop.name}}">{{i}}.{{prop.label}}</label>
<input formControlName="{{prop.name}}" id="{{prop.name}}" type="{{prop.type}}"/> <input formControlName="{{prop.name}}" id="{{prop.name}}" type="{{prop.type}}"/>
</div> </div>
</div> </div>

68
src/main/webapp/app/facet-composer/facet-composer.component.ts
View File

@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/member-ordering */
/* eslint-disable @typescript-eslint/explicit-function-return-type */ /* eslint-disable @typescript-eslint/explicit-function-return-type */
/* eslint-disable no-console */ /* eslint-disable no-console */
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
@ -32,6 +33,7 @@ export class FacetComposerComponent implements OnInit {
titlePath: string; titlePath: string;
myForm: FormGroup ; //form complessiva myForm: FormGroup ; //form complessiva
propertyGroup: FormGroup; //form complessiva
typeSpec: ITypeSpecification; typeSpec: ITypeSpecification;
@ -42,76 +44,80 @@ export class FacetComposerComponent implements OnInit {
this.titleType = data.type.name; this.titleType = data.type.name;
this.titlePath = data.context.path; this.titlePath = data.context.path;
this.typeSpec = {} as ITypeSpecification; this.typeSpec = {} as ITypeSpecification;
this.myForm = this.fb.group({ this.myForm = this.fb.group({
'facetBlocks': this.fb.array([ facetArray: this.fb.array([this.addFacetGroup()])
this.fb.group({ });
'relation':'', this.propertyGroup = this.fb.group({
'facetPropsBlock':this.fb.array([]), propertyGroup: [],
//TODO: PROVA-> 'facetPropsBlock':this.fb.array([this.fb.group({}]),
})
]),
}); });
} }
get facetBlocks() { private addFacetGroup(): FormGroup {
return this.myForm.get('facetBlocks') as FormArray; return this.fb.group({
relation: [],
propertyArray: this.fb.array([])
});
} }
get facetPropsBlock(): FormArray { addFacet(): void {
return this.myForm.get('facetPropsBlock') as FormArray; this.facetArray.push(this.addFacetGroup());
} }
/*
addFacetBlocks() { removeFacet(index: number): void {
const fc = {} as IFacetComposer; this.facetArray.removeAt(index);
this.facetBlocks.push(this.fb.group(fc));
} }
addFacetProps() { get facetArray(): FormArray {
const fp = {} as IFacetProps; return <FormArray>this.myForm.get('facetArray');
this.facetPropsBlock.push(this.fb.control(fp));
} }
*/
addProperty(index:number): void {
(<FormArray>(<FormGroup>this.facetArray.controls[index]).controls.propertyArray).push(this.propertyGroup);
}
ngOnInit(): void { ngOnInit(): void {
alert("facetPropsBlock");
alert(this.facetPropsBlock);
this.guiService.getFormStructure(this.titlePath,this.titleType).subscribe(res => { this.guiService.getFormStructure(this.titlePath,this.titleType).subscribe(res => {
this.typeSpec = res; this.typeSpec = res;
this.prepareControls(res); this.prepareControls(res);
}); });
} }
prepareControls(spec:ITypeSpecification){ prepareControls(spec:ITypeSpecification){
for (let i=0; i<spec.facetSpecs.length; i++){ for (let i=0; i<spec.facetSpecs.length; i++){
this.facetBlocks.push(this.fb.group({ this.facetArray.push(this.fb.group({
'relation': [spec.facetSpecs[i].relation,Validators.required] 'relation': [spec.facetSpecs[i].relation,Validators.required]
})); }));
for(let j=0; j<spec.facetSpecs[i].guiProps.length; j++){ for(let j=0; j<spec.facetSpecs[i].guiProps.length; j++){
const props = spec.facetSpecs[i].guiProps[j]; const props = spec.facetSpecs[i].guiProps[j];
alert(this.facetPropsBlock);
//const name = props.name; //const name = props.name;
if(props.validations.length===0){
this.facetPropsBlock.push( //this.myForm.addControl('new', new FormControl('', Validators.required));
const propGroup = this.facetArray.at(i).get('propertyArray')?.get('propertyGroup');
if(props.validations.length===0 && propGroup!=null){
// this.testForm.addControl('new', new FormControl('', Validators.required));
this.propertyGroup.addControl(String(j),
this.fb.control({ this.fb.control({
j : ['',null] j : ['',null]
}) })
); );
}else{ }else{
this.facetPropsBlock.push( this.propertyGroup.addControl(String(j),
this.fb.control({ this.fb.control({
j : ['',Validators.required], j : ['',null]
}) })
); );
} }
} }
this.facetBlocks.push(this.facetPropsBlock);
} }
} }