-
+
-Sign out
+Sign out
\ No newline at end of file
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.html b/dmp-frontend/src/app/form/dynamic-form.component.html
index f9d128b70..b907376e2 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.html
+++ b/dmp-frontend/src/app/form/dynamic-form.component.html
@@ -36,17 +36,36 @@
Form value: {{ form.value | json }}
-
+
+
+
+
+
Table of contents:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.ts b/dmp-frontend/src/app/form/dynamic-form.component.ts
index 754335fe2..a66e0dff5 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.ts
+++ b/dmp-frontend/src/app/form/dynamic-form.component.ts
@@ -13,9 +13,22 @@ import { GroupBase } from './dynamic-form-group/group-base';
import { PaginationService } from '../../app/services/pagination.service';
import { TokenService, TokenProvider } from '../services/token.service';
+import { AngularDraggableModule } from 'angular2-draggable';
+
import './../../assets/xml2json.min.js';
declare var X2JS: any;
+
+var flatten = require('flat');
+
+
+import * as $ from '../../../node_modules/jquery/dist/jquery'
+
+import * as scroll from '../../assets/jquery.scrollTo.min.js';
+
+
+
+
@Component({
selector: 'dynamic-form',
templateUrl: './dynamic-form.component.html',
@@ -31,11 +44,14 @@ export class DynamicFormComponent implements OnInit {
@Input() pagination: any = {};
id:string;
datasetId:string;
- datasetProperties:string;
+ //datasetProperties:string;
private fragment: string;
xml2jsonOBJ: any;
+
+
+
constructor(private qcs: FieldControlService, private serverService: ServerService, private dataModelService: dataModelBuilder, private router: Router,
private route: ActivatedRoute, private pagerService: PaginationService, private tokenService : TokenService) {
this.form = this.qcs.toFormGroup(new Array(), new Array());
@@ -57,10 +73,10 @@ export class DynamicFormComponent implements OnInit {
let sub = this.route.params.subscribe(params => {
this.id = params.id;
this.datasetId = params.datasetId;
- this.datasetProperties = params.datasetProperties
+ //this.datasetProperties = params.datasetProperties
});
- this.serverService.getDatsetsProfile(this.id).subscribe(
+ this.serverService.getDatasetProfileByID(this.id).subscribe(
response => {
@@ -132,8 +148,53 @@ export class DynamicFormComponent implements OnInit {
}
);
+
+ this.serverService.getDatasetByID(this.datasetId).subscribe(
+ (data) => {
+
+ if(data.properties){
+ console.log("Found already submitted form, loading that one!");
+
+ //console.log(data.properties)
+ //console.log(JSON.parse(data.properties))
+
+ let formValues = JSON.parse(data.properties);
+
+ var flatList = flatten(formValues);
+
+ this.patchForm(flatList);
+
+ }
+
+ },
+ (err) => {
+
+ });
+
+
}
+
+ scrollToElemID(elemID){
+ scroll("#"+elemID);
+ }
+
+
+ private patchForm(flatList : any){
+
+ for (var prop in flatList) {
+ if (flatList.hasOwnProperty(prop)) {
+ if(prop.endsWith('.id')||prop.endsWith('.answer')||prop.endsWith('.value')) continue;
+ //console.log("updating value of "+prop +" to "+flatList[prop].valueOf())
+ this.form.get(prop).setValue(flatList[prop].valueOf());
+ }
+ }
+ //this.form.get("namingConventionGroup.nonamingConventionA213").setValue("TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT");
+ }
+
+
+
+
ngAfterViewChecked(): void { //navigate to certain section of the page
try {
document.querySelector('#' + this.fragment).scrollIntoView();
@@ -141,6 +202,30 @@ export class DynamicFormComponent implements OnInit {
}
onSubmit() {
+
+
+ this.serverService.getDatasetByID(this.datasetId).subscribe(
+ (data) => {
+
+ //is xml, so transform them to xml (it's json)
+ //data.properties = this.xml2jsonOBJ.json2xml_str(JSON.stringify(this.form.value));
+ data.properties = JSON.stringify(this.form.value);
+
+ this.serverService.setDataset(data).subscribe( (data) => {
+ console.log("Updated dataset");
+
+ //VALE EDW NA SE PIGAINEI PISW KAI NA SOU VGAZEI ENA MHNYMA SUCCESS... (to success tha to valw egw an thes)
+
+ },
+ (err) => {
+
+ });
+ },
+ (err) => {
+
+ });
+
+
this.payLoad = JSON.stringify(this.form.value);
}
diff --git a/dmp-frontend/src/app/form/tableOfContents/toc.component.html b/dmp-frontend/src/app/form/tableOfContents/toc.component.html
index 1377a1088..40eeacfc3 100644
--- a/dmp-frontend/src/app/form/tableOfContents/toc.component.html
+++ b/dmp-frontend/src/app/form/tableOfContents/toc.component.html
@@ -4,15 +4,16 @@