MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Discard pagination service. Listen to url changes on page param instead.

This commit is contained in:
krommydas kyriakos 2017-12-08 19:12:31 +02:00
parent c27ca22877
commit 2f86c38e21
7 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dmp-frontend/src/app/form/dynamic-form.component.html
View File

@ -1,4 +1,4 @@
<div class="ui-g dynamic-form">
<div class="ui-g dynamic-form">
<ng-sidebar-container class="ui-g" style="height: 100vh;">
<ng-sidebar mode="push" style="height: 100vh;" position="right" [(opened)]="visibleSidebar">
<table-of-content [model]="dataModel"></table-of-content>
@ -9,7 +9,7 @@
<button type="button" class="btn btn-primary" (click)="submit();">Save and Finalize</button>
<progress-bar class="ui-g" *ngIf="progressbar" [formGroup]=form></progress-bar>
<div class="ui-g-12">
<p-steps [model]="stepperItems" [activeIndex]="this.paginationService.getCurrentIndex()" (activeIndex)="this.paginationService.setCurrentIndex($event)"
<p-steps [model]="stepperItems" [(activeIndex)]="this.currentPage"
[readonly]="false"></p-steps>
</div>
<div class="ui-g-12">
@ -20,7 +20,7 @@
<form *ngIf="form" novalidate [formGroup]="form" (ngSubmit)="onSubmit()">
<div *ngFor="let section of dataModel.sections; let i = index;">
<df-section *ngIf='this.paginationService.isElementVisible(section.page)' [section]="section" [form]="form.get('sections').get(''+i)"
<df-section *ngIf='this.shouldDisplaySection(section)' [section]="section" [form]="form.get('sections').get(''+i)"
[path]="i+1" [pathName]="'sections.'+i"></df-section>
</div>
</form>

44
dmp-frontend/src/app/form/dynamic-form.component.ts
View File

@ -1,8 +1,8 @@
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 { DatasetModel } from '../models/DatasetModel';
import { Rule } from '../models/Rule';
import { Section } from '../models/Section';
import { JsonSerializer } from '../utilities/JsonSerializer';
import { Component, Input, OnInit, AfterViewChecked, ViewChild, forwardRef, ViewEncapsulation } from '@angular/core';
@ -67,12 +67,12 @@ export class DynamicFormComponent implements OnInit {
visibleSidebar: boolean = false;
private progressbar: boolean = false;
private currentPage: number;
private fragment: string;
constructor(private serverService: ServerService, private router: Router, private pdfService: PDFService,
private _location: Location, private route: ActivatedRoute, private tokenService: TokenService
, private visibilityRulesService: VisibilityRulesService
, private paginationService:PaginationService
) {
this.datasetId = route.snapshot.params['id'];
}
@ -88,12 +88,25 @@ export class DynamicFormComponent implements OnInit {
response => {
this.dataModel = new JsonSerializer<DatasetModel>().fromJSONObject(response, DatasetModel);
this.pages = this.getPages(this.dataModel);
this.createPagination();
//this.createPagination();
this.form = this.dataModel.buildForm();
this.visibilityRulesService.formGroup = this.form;
let rules: Rule[] = new JsonSerializer<Rule>().fromJSONArray(response.rules, Rule);
this.visibilityRulesService.buildVisibilityRules(rules)
this.progressbar = true;
this.progressbar = true;
this.route.fragment.subscribe((fragment: string) => {
if (fragment && document.querySelector('#' + fragment)) {
document.querySelector('#' + fragment).scrollIntoView();
this.visibleSidebar = true;
}
});
this.route.queryParams.subscribe((params) => {
if (params && "page" in params && !isNaN(params["page"]))
this.currentPage = Number.parseInt(params["page"]);
//this.visibleSidebar = true;
});
},
error => {
console.log("Could not load dmp");
@ -127,16 +140,19 @@ export class DynamicFormComponent implements OnInit {
return pageSet;
}
createPagination() {
this.pages.forEach(item => {
this.stepperItems.push({
label: '',
command: (event: any) => {
this.paginationService.setCurrentIndex(event.index)
}
})
})
shouldDisplaySection(section: Section): Boolean {
return section.page == this.currentPage;
}
//createPagination() {
// this.pages.forEach(item => {
// this.stepperItems.push({
// label: '',
// command: (event: any) => {
// this.paginationService.setCurrentIndex(event.index)
// }
// })
// })
//}
/* scrollToElemID(elemID) {
scroll("#" + elemID);
}

16
dmp-frontend/src/app/form/tableOfContents/base-table-of-content.component.ts
View File

@ -1,18 +1,10 @@
import { PaginationService } from '../pagination/pagination-service';
import { ActivatedRouteSnapshot, Router, ActivatedRoute } from '@angular/router';
import { ActivatedRouteSnapshot, Router, ActivatedRoute } from '@angular/router';
export class BaseTableOfContent {
constructor(public router: Router, public route: ActivatedRoute, public paginationService: PaginationService) {
this.route.fragment.subscribe((fragment: string) => {
setTimeout(function() {
if (fragment) document.querySelector('#' + fragment).scrollIntoView();
}, );
})
}
constructor(public router: Router, public route: ActivatedRoute) { }
scrollToId(elementId, page: number) {
this.paginationService.setCurrentIndex(page-1);
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, queryParams: { page: page } });
}
}

7
dmp-frontend/src/app/form/tableOfContents/table-of-content-field/table-of-content-field.component.ts
View File

@ -1,5 +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 { CompositeField } from '../../../models/CompositeField';
import { Field } from '../../../models/Field';
@ -18,7 +17,7 @@ export class TableOfContentsFieldComponent extends BaseTableOfContent{
@Input() index:number;
@Input() public path:string;
@Input() public page: number;
constructor(public router: Router, public route: ActivatedRoute,private visibilityRulesService: VisibilityRulesService,public paginationService:PaginationService) {
super(router, route,paginationService)
constructor(public router: Router, public route: ActivatedRoute,private visibilityRulesService: VisibilityRulesService) {
super(router, route)
}
}

7
dmp-frontend/src/app/form/tableOfContents/table-of-content-fieldset/table-of-content-fieldset.component.ts
View File

@ -1,5 +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 { CompositeField } from '../../../models/CompositeField';
import { FieldGroup } from '../../../models/FieldGroup';
@ -21,7 +20,7 @@ export class TableOfContentsFieldSetComponent extends BaseTableOfContent {
@Input() index: number;
@Input() public path: string;
@Input() public page: number;
constructor(public router: Router, public route: ActivatedRoute,private visibilityRulesService: VisibilityRulesService,public paginationService:PaginationService) {
super(router, route,paginationService)
constructor(public router: Router, public route: ActivatedRoute,private visibilityRulesService: VisibilityRulesService) {
super(router, route)
}
}

7
dmp-frontend/src/app/form/tableOfContents/table-of-content-group/table-of-content-group.component.ts
View File

@ -1,5 +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 { FieldGroup } from '../../../models/FieldGroup';
import { Section } from '../../../models/Section';
@ -23,8 +22,8 @@ export class TableOfContentsGroupComponent extends BaseTableOfContent {
setPage:EventEmitter<number> = new EventEmitter<number>();
*/
constructor(public router: Router, public route: ActivatedRoute,private visibilityRulesService: VisibilityRulesService,public paginationService:PaginationService) {
super(router, route,paginationService)
constructor(public router: Router, public route: ActivatedRoute,private visibilityRulesService: VisibilityRulesService) {
super(router, route)
}

7
dmp-frontend/src/app/form/tableOfContents/table-of-content-section/table-of-content-section.component.ts
View File

@ -1,5 +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 { Section } from '../../../models/Section';
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
@ -19,8 +18,8 @@ export class TableOfContentsSectionComponent extends BaseTableOfContent implemen
@Input() index: number;
@Input() public path: string;
@Input() public page: number;
constructor(public router: Router,public route:ActivatedRoute,private visibilityRulesService: VisibilityRulesService,public paginationService:PaginationService){
super(router,route,paginationService)
constructor(public router: Router,public route:ActivatedRoute,private visibilityRulesService: VisibilityRulesService){
super(router,route)
}
ngOnInit() {