diff --git a/dmp-frontend/.angular-cli.json b/dmp-frontend/.angular-cli.json index 9e16abc32..fa49c8f03 100644 --- a/dmp-frontend/.angular-cli.json +++ b/dmp-frontend/.angular-cli.json @@ -25,7 +25,8 @@ "scripts": [ "./../node_modules/jquery/dist/jquery.min.js", "./../node_modules/bootstrap/dist/js/bootstrap.min.js", - "./assets/xml2json.min.js" + "./assets/xml2json.min.js", + "./assets/jquery.scrollTo.min.js" ], "environmentSource": "environments/environment.ts", "environments": { diff --git a/dmp-frontend/package-lock.json b/dmp-frontend/package-lock.json index bf3c5c5d4..27d9d0aaa 100644 --- a/dmp-frontend/package-lock.json +++ b/dmp-frontend/package-lock.json @@ -248,9 +248,9 @@ } }, "@types/node": { - "version": "6.0.88", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.88.tgz", - "integrity": "sha512-bYDPZTX0/s1aihdjLuAgogUAT5M+TpoWChEMea2p0yOcfn5bu3k6cJb9cp6nw268XeSNIGGr+4+/8V5K6BGzLQ==" + "version": "6.0.90", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.90.tgz", + "integrity": "sha512-tXoGRVdi7wZX7P1VWoV9Wfk0uYDOAHdEYXAttuWgSrN76Q32wQlSrMX0Rgyv3RTEaQY2ZLQrzYHVM2e8rfo8sA==" }, "@types/q": { "version": "0.0.32", @@ -589,6 +589,11 @@ "lodash": "4.17.4" } }, + "angular2-draggable": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/angular2-draggable/-/angular2-draggable-1.0.7.tgz", + "integrity": "sha1-NeH4HIzPPdljDyMmVYuILMEvDyk=" + }, "ansi-escapes": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz", @@ -3182,6 +3187,14 @@ "pinkie-promise": "2.0.1" } }, + "flat": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/flat/-/flat-4.0.0.tgz", + "integrity": "sha512-ji/WMv2jdsE+LaznpkIF9Haax0sdpTBozrz/Dtg4qSRMfbs8oVg4ypJunIRYPiMLvH/ed6OflXbnbTIKJhtgeg==", + "requires": { + "is-buffer": "1.1.5" + } + }, "flatten": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", @@ -4103,8 +4116,7 @@ "is-buffer": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", - "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=", - "dev": true + "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=" }, "is-builtin-module": { "version": "1.0.0", @@ -5941,7 +5953,7 @@ "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz", "integrity": "sha1-Be/1fw70V3+xRKefi5qWemzERRA=", "requires": { - "@types/node": "6.0.88" + "@types/node": "6.0.90" } }, "parsejson": { @@ -6677,7 +6689,7 @@ "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=", "dev": true, "requires": { - "@types/node": "6.0.88", + "@types/node": "6.0.90", "@types/q": "0.0.32", "@types/selenium-webdriver": "2.53.42", "blocking-proxy": "0.0.5", diff --git a/dmp-frontend/package.json b/dmp-frontend/package.json index 5dc879ded..238b93fad 100644 --- a/dmp-frontend/package.json +++ b/dmp-frontend/package.json @@ -24,9 +24,11 @@ "angular-2-data-table": "^0.1.2", "angular-4-data-table-bootstrap-4": "^0.2.0", "angular-google-signin": "^0.1.5", + "angular2-draggable": "^1.0.7", "angular2-datatable": "^0.6.0", "bootstrap": "^3.3.7", "core-js": "^2.4.1", + "flat": "^4.0.0", "jquery": "^3.2.1", "ngx-webstorage": "^1.8.0", "rxjs": "^5.4.2", @@ -38,7 +40,7 @@ "@angular/language-service": "^4.3.6", "@types/jasmine": "~2.5.53", "@types/jasminewd2": "~2.0.2", - "@types/node": "^6.0.88", + "@types/node": "^6.0.90", "angular-ide": "^0.9.31", "codelyzer": "~3.1.1", "jasmine-core": "~2.6.2", diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts index 5b20cd5a0..2d7b67aee 100644 --- a/dmp-frontend/src/app/app.module.ts +++ b/dmp-frontend/src/app/app.module.ts @@ -31,6 +31,8 @@ import { GlobalInterceptor } from './services/interceptor'; import { DatasetsModule } from './datasets/dataset.module'; import { DmpModule } from './dmps/dmp.module'; import { TabModule } from './tabs/tab.module'; +import { AngularDraggableModule } from 'angular2-draggable'; + import { HTTP_INTERCEPTORS } from '@angular/common/http'; @@ -56,11 +58,11 @@ import { HTTP_INTERCEPTORS } from '@angular/common/http'; DmpModule, DatasetsModule, AppRoutingModule, + AngularDraggableModule, DataTableModule ], - providers: [ - { + providers: [{ provide: HTTP_INTERCEPTORS, useClass: GlobalInterceptor, multi: true, 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 }}
- +