no message
This commit is contained in:
parent
5cb2d081c5
commit
a9c05943e0
|
@ -28,7 +28,7 @@ public class CheckBoxData extends FieldData<CheckBoxData>{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CheckBoxData fromXml(Element item) {
|
public CheckBoxData fromXml(Element item) {
|
||||||
this.label = item.getAttribute("label");
|
this.label = item!=null?item.getAttribute("label"):""; //TODO
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { PaginationService } from './form/pagination/pagination-service';
|
||||||
import {
|
import {
|
||||||
TableOfContentsFieldComponent,
|
TableOfContentsFieldComponent,
|
||||||
} from './form/tableOfContents/table-of-content-field/table-of-content-field.component';
|
} from './form/tableOfContents/table-of-content-field/table-of-content-field.component';
|
||||||
|
@ -51,7 +52,6 @@ import { HomepageComponent } from './homepage/homepage.component';
|
||||||
import { ConfirmationComponent } from './widgets/confirmation/confirmation.component';
|
import { ConfirmationComponent } from './widgets/confirmation/confirmation.component';
|
||||||
|
|
||||||
|
|
||||||
import { PaginationService } from './services/pagination.service';
|
|
||||||
import { EestoreService } from './services/eestore.service';
|
import { EestoreService } from './services/eestore.service';
|
||||||
import { GlobalInterceptor } from './services/interceptor';
|
import { GlobalInterceptor } from './services/interceptor';
|
||||||
import { PDFService } from './services/transformers/pdf.service';
|
import { PDFService } from './services/transformers/pdf.service';
|
||||||
|
@ -164,7 +164,7 @@ import {RadioButtonModule} from 'primeng/primeng';
|
||||||
useClass: GlobalInterceptor,
|
useClass: GlobalInterceptor,
|
||||||
multi: true,
|
multi: true,
|
||||||
},
|
},
|
||||||
ServerService, VisibilityRulesService, GlobalVariables, AuthGuard, PaginationService, TokenService, LocalStorageService, RestBase, EestoreService, NativeLoginService, PDFService
|
ServerService, VisibilityRulesService,PaginationService, GlobalVariables, AuthGuard, TokenService, LocalStorageService, RestBase, EestoreService, NativeLoginService, PDFService
|
||||||
],
|
],
|
||||||
bootstrap: [AppComponent]
|
bootstrap: [AppComponent]
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="fieldset-component" [id]="compositeField.id" [formGroup]="form">
|
<div *ngIf="visibilityRulesService.isElementVisible(pathName,compositeField.id)" class="fieldset-component" [id]="compositeField.id" [formGroup]="form">
|
||||||
<h4 *ngIf="compositeField.title">{{compositeField.title}}</h4>
|
<h4 *ngIf="compositeField.title">{{compositeField.title}}</h4>
|
||||||
<div class="content-left-margin">
|
<div class="content-left-margin">
|
||||||
<h4 *ngIf="compositeField.description">{{compositeField.description}}</h4>
|
<h4 *ngIf="compositeField.description">{{compositeField.description}}</h4>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { VisibilityRulesService } from '../../visibility-rules/visibility-rules.service';
|
||||||
import { CompositeField } from '../../models/CompositeField';
|
import { CompositeField } from '../../models/CompositeField';
|
||||||
import { FormGroup } from '@angular/forms';
|
import { FormGroup } from '@angular/forms';
|
||||||
import { Section } from '../../entities/model/section';
|
import { Section } from '../../entities/model/section';
|
||||||
|
@ -17,7 +18,7 @@ import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
|
||||||
@Input() pathName:string;
|
@Input() pathName:string;
|
||||||
@Input() path:string;
|
@Input() path:string;
|
||||||
|
|
||||||
constructor(){}
|
constructor(private visibilityRulesService:VisibilityRulesService){}
|
||||||
|
|
||||||
ngOnInit(){
|
ngOnInit(){
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="group-component" [id]="group.id" [formGroup]="form">
|
<div *ngIf="visibilityRulesService.isElementVisible(pathName,group.id)" class="group-component" [id]="group.id" [formGroup]="form">
|
||||||
<h4>{{path + ' ' + group.title}}</h4>
|
<h4>{{path + ' ' + group.title}}</h4>
|
||||||
<div class="content-left-margin">
|
<div class="content-left-margin">
|
||||||
<h5 *ngIf="group.description">{{group.description}}</h5>
|
<h5 *ngIf="group.description">{{group.description}}</h5>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { VisibilityRulesService } from '../../visibility-rules/visibility-rules.service';
|
||||||
import { FieldGroup } from '../../models/FieldGroup';
|
import { FieldGroup } from '../../models/FieldGroup';
|
||||||
import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
|
import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
|
||||||
import { FormGroup, Validators, FormControl } from '@angular/forms';
|
import { FormGroup, Validators, FormControl } from '@angular/forms';
|
||||||
|
@ -20,7 +21,7 @@ export class DynamicFormGroupComponent implements OnInit {
|
||||||
@Input() path:string;
|
@Input() path:string;
|
||||||
|
|
||||||
|
|
||||||
constructor() {
|
constructor(private visibilityRulesService:VisibilityRulesService) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<p-panel class="section-component" [toggleable]="true">
|
<p-panel *ngIf="visibilityRulesService.isElementVisible(pathName,section.id)" class="section-component" [toggleable]="true">
|
||||||
<p-header>
|
<p-header>
|
||||||
<div class="ui-helper-clearfix">
|
<div class="ui-helper-clearfix">
|
||||||
<h2>{{path}} {{section.title}}</h2>
|
<h2>{{path}} {{section.title}}</h2>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { VisibilityRulesService } from '../../visibility-rules/visibility-rules.service';
|
||||||
import { FormGroup } from '@angular/forms';
|
import { FormGroup } from '@angular/forms';
|
||||||
import { Section } from '../../entities/model/section';
|
import { Section } from '../../entities/model/section';
|
||||||
import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
|
import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
|
||||||
|
@ -15,7 +16,7 @@ export class DynamicFormSectionComponent implements OnInit {
|
||||||
@Input() form: FormGroup;
|
@Input() form: FormGroup;
|
||||||
@Input() pathName: string;
|
@Input() pathName: string;
|
||||||
@Input() path: string;
|
@Input() path: string;
|
||||||
constructor() { }
|
constructor(private visibilityRulesService:VisibilityRulesService) { }
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|
||||||
|
|
|
@ -9,14 +9,14 @@
|
||||||
<button type="button" class="btn btn-primary" (click)="submit();">Save and Finalize</button>
|
<button type="button" class="btn btn-primary" (click)="submit();">Save and Finalize</button>
|
||||||
<progress-bar class="ui-g" *ngIf="progressbar" [formGroup]=form></progress-bar>
|
<progress-bar class="ui-g" *ngIf="progressbar" [formGroup]=form></progress-bar>
|
||||||
<div class="ui-g-12">
|
<div class="ui-g-12">
|
||||||
<p-steps [model]="stepperItems" [(activeIndex)]="activeStepperIndex" [readonly]="false"></p-steps>
|
<p-steps [model]="stepperItems" [activeIndex]="this.paginationService.getCurrentIndex()" (activeIndex)="this.paginationService.setCurrentIndex($event)"[readonly]="false"></p-steps>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-12 form-body-container" id="form-container">
|
<div class="col-md-12 form-body-container" id="form-container">
|
||||||
|
|
||||||
<form *ngIf="form" novalidate [formGroup]="form" (ngSubmit)="onSubmit()">
|
<form *ngIf="form" novalidate [formGroup]="form" (ngSubmit)="onSubmit()">
|
||||||
|
|
||||||
<div *ngFor="let section of dataModel.sections; let i = index;">
|
<div *ngFor="let section of dataModel.sections; let i = index;">
|
||||||
<df-section [section]="section" [form]="form.get('sections').get(''+i)" [path]="i+1" [pathName]="'sections.'+i"></df-section>
|
<df-section *ngIf='this.paginationService.isElementVisible(section.page)' [section]="section" [form]="form.get('sections').get(''+i)" [path]="i+1" [pathName]="'sections.'+i"></df-section>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { PaginationService } from './pagination/pagination-service';
|
||||||
import { VisibilityRulesService } from '../visibility-rules/visibility-rules.service';
|
import { VisibilityRulesService } from '../visibility-rules/visibility-rules.service';
|
||||||
import { TestModel } from '../testModel/testmodel';
|
import { TestModel } from '../testModel/testmodel';
|
||||||
import { DatasetModel } from '../models/DatasetModel';
|
import { DatasetModel } from '../models/DatasetModel';
|
||||||
|
@ -13,7 +14,6 @@ import 'rxjs/add/operator/switchMap';
|
||||||
//import { FieldBase } from '../../app/form/fields/field-base';
|
//import { FieldBase } from '../../app/form/fields/field-base';
|
||||||
import { FieldControlService } from '../../app/services/field-control.service';
|
import { FieldControlService } from '../../app/services/field-control.service';
|
||||||
import { ServerService } from '../../app/services/server.service';
|
import { ServerService } from '../../app/services/server.service';
|
||||||
import { PaginationService } from '../../app/services/pagination.service';
|
|
||||||
import { TokenService, TokenProvider } from '../services/login/token.service';
|
import { TokenService, TokenProvider } from '../services/login/token.service';
|
||||||
import { ModalComponent } from '../modal/modal.component';
|
import { ModalComponent } from '../modal/modal.component';
|
||||||
|
|
||||||
|
@ -69,8 +69,11 @@ export class DynamicFormComponent implements OnInit {
|
||||||
private progressbar: boolean = false;
|
private progressbar: boolean = false;
|
||||||
|
|
||||||
private fragment: string;
|
private fragment: string;
|
||||||
constructor(private qcs: FieldControlService, private serverService: ServerService, private router: Router, private pdfService: PDFService,
|
constructor(private serverService: ServerService, private router: Router, private pdfService: PDFService,
|
||||||
private _location: Location, private route: ActivatedRoute, private pagerService: PaginationService, private tokenService: TokenService, private visibilityRulesService: VisibilityRulesService) {
|
private _location: Location, private route: ActivatedRoute, private tokenService: TokenService
|
||||||
|
, private visibilityRulesService: VisibilityRulesService
|
||||||
|
, private paginationService:PaginationService
|
||||||
|
) {
|
||||||
this.datasetId = route.snapshot.params['id'];
|
this.datasetId = route.snapshot.params['id'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -129,7 +132,7 @@ export class DynamicFormComponent implements OnInit {
|
||||||
this.stepperItems.push({
|
this.stepperItems.push({
|
||||||
label: '',
|
label: '',
|
||||||
command: (event: any) => {
|
command: (event: any) => {
|
||||||
this.activeStepperIndex = item - 1;
|
this.paginationService.setCurrentIndex(event.index)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
import { Injectable } from '@angular/core'
|
||||||
|
@Injectable()
|
||||||
|
export class PaginationService {
|
||||||
|
|
||||||
|
private currentPageIndex: number;
|
||||||
|
|
||||||
|
public setCurrentIndex(currentPageIndex: number): void {
|
||||||
|
this.currentPageIndex = currentPageIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
public getCurrentIndex():number{
|
||||||
|
return this.currentPageIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
public isElementVisible(elementPage: number):boolean {
|
||||||
|
return elementPage - 1 == this.currentPageIndex ; //TODO
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,13 +1,18 @@
|
||||||
import { ActivatedRouteSnapshot,Router,ActivatedRoute } from '@angular/router';
|
import { PaginationService } from '../pagination/pagination-service';
|
||||||
|
import { ActivatedRouteSnapshot, Router, ActivatedRoute } from '@angular/router';
|
||||||
|
|
||||||
export class BaseTableOfContent{
|
export class BaseTableOfContent {
|
||||||
constructor(public router: Router,public route:ActivatedRoute){
|
constructor(public router: Router, public route: ActivatedRoute, public paginationService: PaginationService) {
|
||||||
this.route.fragment.subscribe((fragment: string) => {
|
this.route.fragment.subscribe((fragment: string) => {
|
||||||
if(fragment)document.querySelector('#' + fragment).scrollIntoView();
|
setTimeout(function() {
|
||||||
|
if (fragment) document.querySelector('#' + fragment).scrollIntoView();
|
||||||
|
}, );
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
scrollToId(elementId) {
|
scrollToId(elementId, page: number) {
|
||||||
this.router.navigate([this.route.snapshot.url[0]+"/"+this.route.snapshot.url[1]], { fragment: elementId });
|
this.paginationService.setCurrentIndex(page-1);
|
||||||
}
|
this.router.navigate([this.route.snapshot.url[0] + "/" + this.route.snapshot.url[1]], { fragment: elementId });
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -1,2 +1,2 @@
|
||||||
<a (click)="scrollToId(model.id)">{{path+' '+model.title}}</a>
|
<a (click)="scrollToId(model.id,page)">{{path+' '+model.title}}</a>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { PaginationService } from '../../pagination/pagination-service';
|
||||||
import { VisibilityRulesService } from '../../../visibility-rules/visibility-rules.service';
|
import { VisibilityRulesService } from '../../../visibility-rules/visibility-rules.service';
|
||||||
import { BaseTableOfContent } from '../base-table-of-content.component';
|
import { BaseTableOfContent } from '../base-table-of-content.component';
|
||||||
import { CompositeField } from '../../../models/CompositeField';
|
import { CompositeField } from '../../../models/CompositeField';
|
||||||
|
@ -16,8 +17,8 @@ export class TableOfContentsFieldComponent extends BaseTableOfContent{
|
||||||
@Input() model:Field;
|
@Input() model:Field;
|
||||||
@Input() index:number;
|
@Input() index:number;
|
||||||
@Input() public path:string;
|
@Input() public path:string;
|
||||||
|
@Input() public page: number;
|
||||||
constructor(public router: Router, public route: ActivatedRoute,private visibilityRulesService: VisibilityRulesService) {
|
constructor(public router: Router, public route: ActivatedRoute,private visibilityRulesService: VisibilityRulesService,public paginationService:PaginationService) {
|
||||||
super(router, route)
|
super(router, route,paginationService)
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -3,7 +3,7 @@
|
||||||
<ul>
|
<ul>
|
||||||
<div *ngFor="let field of model.fields let i = index">
|
<div *ngFor="let field of model.fields let i = index">
|
||||||
<li *ngIf="visibilityRulesService.isElementVisible(null,field.id)">
|
<li *ngIf="visibilityRulesService.isElementVisible(null,field.id)">
|
||||||
<table-of-contents-field [model]="field" [index]="i" [path]="path">
|
<table-of-contents-field [page]='page' [model]="field" [index]="i" [path]="path">
|
||||||
</table-of-contents-field>
|
</table-of-contents-field>
|
||||||
</li>
|
</li>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { PaginationService } from '../../pagination/pagination-service';
|
||||||
import { VisibilityRulesService } from '../../../visibility-rules/visibility-rules.service';
|
import { VisibilityRulesService } from '../../../visibility-rules/visibility-rules.service';
|
||||||
import { BaseTableOfContent } from '../base-table-of-content.component';
|
import { BaseTableOfContent } from '../base-table-of-content.component';
|
||||||
import { CompositeField } from '../../../models/CompositeField';
|
import { CompositeField } from '../../../models/CompositeField';
|
||||||
|
@ -19,8 +20,8 @@ export class TableOfContentsFieldSetComponent extends BaseTableOfContent {
|
||||||
@Input() model: CompositeField;
|
@Input() model: CompositeField;
|
||||||
@Input() index: number;
|
@Input() index: number;
|
||||||
@Input() public path: string;
|
@Input() public path: string;
|
||||||
|
@Input() public page: number;
|
||||||
constructor(public router: Router, public route: ActivatedRoute,private visibilityRulesService: VisibilityRulesService) {
|
constructor(public router: Router, public route: ActivatedRoute,private visibilityRulesService: VisibilityRulesService,public paginationService:PaginationService) {
|
||||||
super(router, route)
|
super(router, route,paginationService)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<a (click)="scrollToId(model.id)">{{path+' '+model.title}}</a>
|
<a (click)="scrollToId(model.id,page)">{{path+' '+model.title}}</a>
|
||||||
|
|
||||||
<div *ngFor="let fieldsetModel of model.compositeFields let i = index">
|
<div *ngFor="let fieldsetModel of model.compositeFields let i = index">
|
||||||
<table-of-contents-fieldset [model]="fieldsetModel" [index]="i" [path]="path+'.'+(i+1)"> </table-of-contents-fieldset>
|
<table-of-contents-fieldset [page]='page' [model]="fieldsetModel" [index]="i" [path]="path+'.'+(i+1)"> </table-of-contents-fieldset>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { PaginationService } from '../../pagination/pagination-service';
|
||||||
import { VisibilityRulesService } from '../../../visibility-rules/visibility-rules.service';
|
import { VisibilityRulesService } from '../../../visibility-rules/visibility-rules.service';
|
||||||
import { BaseTableOfContent } from '../base-table-of-content.component';
|
import { BaseTableOfContent } from '../base-table-of-content.component';
|
||||||
import { FieldGroup } from '../../../models/FieldGroup';
|
import { FieldGroup } from '../../../models/FieldGroup';
|
||||||
|
@ -17,13 +18,13 @@ export class TableOfContentsGroupComponent extends BaseTableOfContent {
|
||||||
@Input() model: FieldGroup;
|
@Input() model: FieldGroup;
|
||||||
@Input() index: number;
|
@Input() index: number;
|
||||||
@Input() public path: string;
|
@Input() public path: string;
|
||||||
|
@Input() public page: number;
|
||||||
/* @Output()
|
/* @Output()
|
||||||
setPage:EventEmitter<number> = new EventEmitter<number>();
|
setPage:EventEmitter<number> = new EventEmitter<number>();
|
||||||
|
|
||||||
*/
|
*/
|
||||||
constructor(public router: Router, public route: ActivatedRoute,private visibilityRulesService: VisibilityRulesService) {
|
constructor(public router: Router, public route: ActivatedRoute,private visibilityRulesService: VisibilityRulesService,public paginationService:PaginationService) {
|
||||||
super(router, route)
|
super(router, route,paginationService)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
<!-- All contents in the first page -->
|
<!-- All contents in the first page -->
|
||||||
<a (click)="scrollToId(model.id)">{{path+' '+model.title}}</a>
|
<a (click)="scrollToId(model.id,page)">{{path+' '+model.title}}</a>
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<li *ngFor="let groupModel of model.fieldGroups let i = index">
|
<li *ngFor="let groupModel of model.fieldGroups let i = index">
|
||||||
<table-of-contents-group [model]="groupModel" [index]="i" [path]="path+'.'+(i+1)"> </table-of-contents-group>
|
<table-of-contents-group [page]='page' [model]="groupModel" [index]="i" [path]="path+'.'+(i+1)"> </table-of-contents-group>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<!-- All contents in the first page -->
|
<!-- All contents in the first page -->
|
||||||
<ul>
|
<ul>
|
||||||
<li *ngFor="let sectionModel of model.sections let i = index">
|
<li *ngFor="let sectionModel of model.sections let i = index">
|
||||||
<table-of-contents-section [model]="sectionModel" [index]="i" [path]="path+'.'+(i+1)"> </table-of-contents-section>
|
<table-of-contents-section [page]='page' [model]="sectionModel" [index]="i" [path]="path+'.'+(i+1)"> </table-of-contents-section>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { PaginationService } from '../../pagination/pagination-service';
|
||||||
import { VisibilityRulesService } from '../../../visibility-rules/visibility-rules.service';
|
import { VisibilityRulesService } from '../../../visibility-rules/visibility-rules.service';
|
||||||
import { BaseTableOfContent } from '../base-table-of-content.component';
|
import { BaseTableOfContent } from '../base-table-of-content.component';
|
||||||
import { Section } from '../../../models/Section';
|
import { Section } from '../../../models/Section';
|
||||||
|
@ -17,9 +18,9 @@ export class TableOfContentsSectionComponent extends BaseTableOfContent implemen
|
||||||
@Input() model: Section;
|
@Input() model: Section;
|
||||||
@Input() index: number;
|
@Input() index: number;
|
||||||
@Input() public path: string;
|
@Input() public path: string;
|
||||||
|
@Input() public page: number;
|
||||||
constructor(public router: Router,public route:ActivatedRoute,private visibilityRulesService: VisibilityRulesService){
|
constructor(public router: Router,public route:ActivatedRoute,private visibilityRulesService: VisibilityRulesService,public paginationService:PaginationService){
|
||||||
super(router,route)
|
super(router,route,paginationService)
|
||||||
}
|
}
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
<ul>
|
<ul>
|
||||||
<li *ngFor="let section of model.sections let i = index">
|
<li *ngFor="let section of model.sections let i = index">
|
||||||
<!-- && field.label for sections without field label as data summery -->
|
<!-- && field.label for sections without field label as data summery -->
|
||||||
<table-of-contents-section [model]="section" [index]="i+1" [path]="i+1"> </table-of-contents-section>
|
<table-of-contents-section [page]='section.page' [model]="section" [index]="i+1" [path]="i+1"> </table-of-contents-section>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
|
@ -14,7 +14,12 @@ export class VisibilityRulesService {
|
||||||
if (!this.fieldsPathMemory[id] && pathKey) this.fieldsPathMemory[id] = pathKey;
|
if (!this.fieldsPathMemory[id] && pathKey) this.fieldsPathMemory[id] = pathKey;
|
||||||
let visibilityRule = this.visibilityRuleContext.getRulesFromKey(id);
|
let visibilityRule = this.visibilityRuleContext.getRulesFromKey(id);
|
||||||
if (!visibilityRule) return true;
|
if (!visibilityRule) return true;
|
||||||
return this.checkElementVisibility(visibilityRule);
|
if (this.checkElementVisibility(visibilityRule)) {
|
||||||
|
return true
|
||||||
|
} else {
|
||||||
|
if (pathKey) this.formGroup.get(pathKey + '.value').patchValue(null)
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public checkElementVisibility(visibilityRule: VisibilityRule): boolean {
|
public checkElementVisibility(visibilityRule: VisibilityRule): boolean {
|
||||||
|
|
Loading…
Reference in New Issue