From f1dbe240a460caf402f8294e8f83df51c5b6a8a6 Mon Sep 17 00:00:00 2001 From: Nikolaos Laskaris Date: Mon, 6 Nov 2017 18:25:23 +0200 Subject: [PATCH] changes on projects --- dmp-frontend/.angular-cli.json | 4 +- dmp-frontend/package-lock.json | 32 ++++- dmp-frontend/package.json | 2 + dmp-frontend/src/app/app.module.ts | 2 + .../src/app/datasets/dataset.component.ts | 2 +- .../src/app/datasets/dataset.module.ts | 36 ------ dmp-frontend/src/app/dmps/dmps.html | 2 +- .../src/app/pipes/various/status-to-string.ts | 1 - dmp-frontend/src/app/projects/project.html | 26 ++-- .../src/app/projects/project.module.ts | 33 ----- .../src/app/projects/projects.component.ts | 120 +++++++++--------- .../src/app/services/server.service.ts | 6 +- .../user-workspace.component.ts | 2 +- .../bootstrap-datetimepicker.min.css | 5 + .../bootstrap-datetimepicker.min.js | 2 + .../src/assets/date-picker/moment.min.js | 1 + dmp-frontend/src/index.html | 4 +- 17 files changed, 121 insertions(+), 159 deletions(-) delete mode 100644 dmp-frontend/src/app/datasets/dataset.module.ts delete mode 100644 dmp-frontend/src/app/projects/project.module.ts create mode 100644 dmp-frontend/src/assets/date-picker/bootstrap-datetimepicker.min.css create mode 100644 dmp-frontend/src/assets/date-picker/bootstrap-datetimepicker.min.js create mode 100644 dmp-frontend/src/assets/date-picker/moment.min.js diff --git a/dmp-frontend/.angular-cli.json b/dmp-frontend/.angular-cli.json index fa49c8f03..9a6dc38ba 100644 --- a/dmp-frontend/.angular-cli.json +++ b/dmp-frontend/.angular-cli.json @@ -19,14 +19,14 @@ "testTsconfig": "tsconfig.spec.json", "prefix": "app", "styles": [ - "./../node_modules/bootstrap/dist/css/bootstrap.min.css", + "./../node_modules/bootstrap/dist/css/bootstrap.min.css", "styles.css" ], "scripts": [ "./../node_modules/jquery/dist/jquery.min.js", "./../node_modules/bootstrap/dist/js/bootstrap.min.js", "./assets/xml2json.min.js", - "./assets/jquery.scrollTo.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 bb0dd8802..cefbed627 100644 --- a/dmp-frontend/package-lock.json +++ b/dmp-frontend/package-lock.json @@ -526,6 +526,12 @@ "graceful-fs": "4.1.11" } }, + "moment": { + "version": "2.18.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz", + "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=", + "dev": true + }, "ms": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", @@ -2220,6 +2226,11 @@ } } }, + "date-fns": { + "version": "1.29.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.29.0.tgz", + "integrity": "sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw==" + }, "date-now": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", @@ -5404,10 +5415,9 @@ "dev": true }, "moment": { - "version": "2.18.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz", - "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=", - "dev": true + "version": "2.19.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz", + "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc=" }, "ms": { "version": "2.0.0", @@ -5490,6 +5500,20 @@ "resolved": "https://registry.npmjs.org/ng-sidebar/-/ng-sidebar-6.0.4.tgz", "integrity": "sha1-QtxRdV6FPBiBs7iFg1T0yEWpbzM=" }, + "ng2-datepicker": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ng2-datepicker/-/ng2-datepicker-2.1.3.tgz", + "integrity": "sha512-09Hwrf9IHsWzp/2FPSGo00P/XtiHSsHLBCeFCK1LG1nuuhNZbQ7LXLR+e+znhjPJyTkhelmODkhmy5DByYWpcA==", + "requires": { + "date-fns": "1.29.0", + "ngx-slimscroll": "3.4.1" + } + }, + "ngx-slimscroll": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/ngx-slimscroll/-/ngx-slimscroll-3.4.1.tgz", + "integrity": "sha512-PMbOai2OeXCFCHnPigYXquN6fAUeAc+CC3AhHugt9wIp8xUB6lIt8OqOWS3IPRRaeKQWyxFCuDfiPKY8n2QuOQ==" + }, "ngx-webstorage": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/ngx-webstorage/-/ngx-webstorage-1.8.0.tgz", diff --git a/dmp-frontend/package.json b/dmp-frontend/package.json index 1f0489d05..f5be48943 100644 --- a/dmp-frontend/package.json +++ b/dmp-frontend/package.json @@ -31,7 +31,9 @@ "core-js": "^2.4.1", "flat": "^4.0.0", "jquery": "^3.2.1", + "moment": "^2.19.1", "ng-sidebar": "^6.0.4", + "ng2-datepicker": "^2.1.3", "ngx-webstorage": "^1.8.0", "rxjs": "^5.4.2", "zone.js": "^0.8.17" diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts index ada17b51e..e9768810f 100644 --- a/dmp-frontend/src/app/app.module.ts +++ b/dmp-frontend/src/app/app.module.ts @@ -58,6 +58,7 @@ import { ProjectsComponent } from './projects/projects.component'; import { ProjectRoutingModule } from './projects/project-routing.module'; import { ProjectDetailComponent } from './projects/project.detail'; import { ModalComponent } from './modal/modal.component'; +import { NgDatepickerModule } from 'ng2-datepicker'; import { StatusToString } from './pipes/various/status-to-string'; import { SidebarModule } from 'ng-sidebar'; @@ -106,6 +107,7 @@ import { UserWorkspaceComponent } from './user-workspace/user-workspace.componen AppRoutingModule, AngularDraggableModule, DataTableModule, + NgDatepickerModule, SidebarModule.forRoot() ], diff --git a/dmp-frontend/src/app/datasets/dataset.component.ts b/dmp-frontend/src/app/datasets/dataset.component.ts index 89c47d5f9..1cd55a7d0 100644 --- a/dmp-frontend/src/app/datasets/dataset.component.ts +++ b/dmp-frontend/src/app/datasets/dataset.component.ts @@ -192,7 +192,7 @@ export class DatasetsComponent implements OnInit { this.SaveDataset(); } - describeDataset(item) {debugger; + describeDataset(item) { this.ngZone.run(() => this.router.navigate(['dynamic-form', {id: item.profile.id, datasetId:item.id}])); } diff --git a/dmp-frontend/src/app/datasets/dataset.module.ts b/dmp-frontend/src/app/datasets/dataset.module.ts deleted file mode 100644 index 0b1ab1cdc..000000000 --- a/dmp-frontend/src/app/datasets/dataset.module.ts +++ /dev/null @@ -1,36 +0,0 @@ -/* -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import {DataTableModule} from 'angular2-datatable'; -import { DatasetTableFilterPipe } from '../pipes/dataset-table-filter.pipe'; -import { DatasetStatusFilterPipe } from '../pipes/dataset-status-filter.pipe'; - - -import { DatasetsComponent } from './dataset.component'; - -import { DatasetRoutingModule } from './dataset-routing.module'; -//import { ProjectDetailComponent } from './project.detail'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - DatasetRoutingModule, - DataTableModule - ], - declarations: [ - DatasetsComponent, - StatusToString, - DatasetTableFilterPipe, - DatasetStatusFilterPipe - //ProjectDetailComponent - ], - providers: [ ], - exports: [ - DatasetsComponent - ] -}) -export class DatasetsModule {} - -*/ \ No newline at end of file diff --git a/dmp-frontend/src/app/dmps/dmps.html b/dmp-frontend/src/app/dmps/dmps.html index 9ca0e3866..8135a164c 100644 --- a/dmp-frontend/src/app/dmps/dmps.html +++ b/dmp-frontend/src/app/dmps/dmps.html @@ -123,7 +123,7 @@
- +
- - + -