Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
This commit is contained in:
commit
29245df4f7
File diff suppressed because it is too large
Load Diff
|
|
@ -28,7 +28,6 @@
|
|||
"@ngx-translate/core": "^9.0.1",
|
||||
"@ngx-translate/http-loader": "^2.0.0",
|
||||
"angular-2-data-table": "^0.1.2",
|
||||
"angular-4-data-table-bootstrap-4": "^0.2.0",
|
||||
"angular-google-signin": "^0.1.5",
|
||||
"angular2-datatable": "^0.6.0",
|
||||
"angular2-draggable": "^1.0.7",
|
||||
|
|
@ -68,6 +67,6 @@
|
|||
"protractor": "~5.2.2",
|
||||
"ts-node": "~4.0.1",
|
||||
"tslint": "~5.8.0",
|
||||
"typescript": "^2.4.2"
|
||||
"typescript": "2.4.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,10 +29,10 @@ import './../../assets/xml2json.min.js';
|
|||
declare var X2JS: any;
|
||||
|
||||
var flatten = require('flat');
|
||||
declare var $: any;
|
||||
// declare var $: any;
|
||||
|
||||
|
||||
import * as scroll from '../../assets/jquery.scrollTo.min.js';
|
||||
// import * as scroll from '../../assets/jquery.scrollTo.min.js';
|
||||
|
||||
|
||||
import '../../assets/custom.js';
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
|
|||
|
||||
//import * as $ from '../../../../node_modules/jquery/dist/jquery'
|
||||
|
||||
import * as scroll from '../../../assets/jquery.scrollTo.min.js';
|
||||
//import * as scroll from '../../../assets/jquery.scrollTo.min.js';
|
||||
|
||||
@Component({
|
||||
selector: 'table-of-content',
|
||||
|
|
|
|||
|
|
@ -7,6 +7,150 @@
|
|||
-->
|
||||
</div>
|
||||
|
||||
<!--
|
||||
{{userInfo | json}}
|
||||
-->
|
||||
|
||||
|
||||
<div class="container">
|
||||
<!-- <app-navbar title="Table List"></app-navbar> -->
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<i class="material-icons">assignment</i>
|
||||
</div>
|
||||
<div class="card-content">
|
||||
<h4 class="card-title">Simple Table</h4>
|
||||
<div class="table-responsive">
|
||||
<table class="table">
|
||||
<thead class="text-primary">
|
||||
<tr>
|
||||
<th>First Name</th>
|
||||
<th>Country</th>
|
||||
<th>City</th>
|
||||
<th>Salary</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Dakota Rice</td>
|
||||
<td>Niger</td>
|
||||
<td>Oud-Turnhout</td>
|
||||
<td class="text-primary">$36,738</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Minerva Hooper</td>
|
||||
<td>Curaçao</td>
|
||||
<td>Sinaai-Waas</td>
|
||||
<td class="text-primary">$23,789</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Sage Rodriguez</td>
|
||||
<td>Netherlands</td>
|
||||
<td>Baileux</td>
|
||||
<td class="text-primary">$56,142</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Philip Chaney</td>
|
||||
<td>Korea, South</td>
|
||||
<td>Overland Park</td>
|
||||
<td class="text-primary">$38,735</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Doris Greene</td>
|
||||
<td>Malawi</td>
|
||||
<td>Feldkirchen in Kärnten</td>
|
||||
<td class="text-primary">$63,542</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Mason Porter</td>
|
||||
<td>Chile</td>
|
||||
<td>Gloucester</td>
|
||||
<td class="text-primary">$78,615</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<i class="material-icons">assignment</i>
|
||||
</div>
|
||||
<div class="card-content">
|
||||
<h4 class="card-title">Striped Table</h4>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th></th>
|
||||
<th>Product Name</th>
|
||||
<th>Type</th>
|
||||
<th>Quantity</th>
|
||||
<th class="text-right">Price</th>
|
||||
<th class="text-right">Amount</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>1</td>
|
||||
<td><md-checkbox></md-checkbox></td>
|
||||
<td>Moleskine Agenda</td>
|
||||
<td>Oud-Office</td>
|
||||
<td>25</td>
|
||||
<td class="text-right">€ 49</td>
|
||||
<td class="text-right">€ 1,225</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>2</td>
|
||||
<td><md-checkbox></md-checkbox></td>
|
||||
<td>Stabilo Pen</td>
|
||||
<td>Office</td>
|
||||
<td>35</td>
|
||||
<td class="text-right">€ 10</td>
|
||||
<td class="text-right">€ 300</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>3</td>
|
||||
<td><md-checkbox></md-checkbox></td>
|
||||
<td>A4 Paper Pack</td>
|
||||
<td>Office</td>
|
||||
<td>50</td>
|
||||
<td class="text-right">€ 599.00</td>
|
||||
<td class="text-right">€ 109</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>4</td>
|
||||
<td><md-checkbox></md-checkbox></td>
|
||||
<td>Apple iPad</td>
|
||||
<td>Meeting</td>
|
||||
<td>20</td>
|
||||
<td class="text-right">€ 10.99</td>
|
||||
<td class="text-right">€ 4,999</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>5</td>
|
||||
<td><md-checkbox></md-checkbox></td>
|
||||
<td>Apple iPhone</td>
|
||||
<td>Communication</td>
|
||||
<td>10</td>
|
||||
<td class="text-right">€ 499.00</td>
|
||||
<td class="text-right">€ 5,999</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="5"></td>
|
||||
<td style="font-weight: 500; font-size: 1.25em;" class="text-right">Total</td>
|
||||
<td style="font-size: 26px" class="text-right">€12,999</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -4,7 +4,6 @@ import { DropdownField } from '../../app/form/fields/dropdown/field-dropdown';
|
|||
import { Param } from '../entities/model/param';
|
||||
import { Dataset } from '../entities/model/dataset';
|
||||
import { Project } from '../entities/model/project';
|
||||
import { DataTable, DataTableTranslations, DataTableResource } from 'angular-4-data-table-bootstrap-4';
|
||||
import { Router, ActivatedRoute } from '@angular/router';
|
||||
|
||||
declare var jquery:any;
|
||||
|
|
@ -21,7 +20,7 @@ export class ModalComponent implements OnInit {
|
|||
// public dataSetVisibe:boolean;
|
||||
@Input() datasets: Dataset[];
|
||||
public project: Project;
|
||||
datasetResource :DataTableResource<Dataset>;
|
||||
//datasetResource :DataTableResource<Dataset>;
|
||||
@Input() datasetCount = 0;
|
||||
@ViewChild('modalDmps') modalDmps;
|
||||
|
||||
|
|
@ -107,8 +106,8 @@ export class ModalComponent implements OnInit {
|
|||
}
|
||||
|
||||
afterLoad(){
|
||||
this.datasetResource = new DataTableResource(this.datasets);
|
||||
this.datasetResource.count().then(count => this.datasetCount = count);
|
||||
//this.datasetResource = new DataTableResource(this.datasets);
|
||||
//this.datasetResource.count().then(count => this.datasetCount = count);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import {Injectable} from '@angular/core';
|
||||
|
||||
declare var $ :any;
|
||||
// declare var $ :any;
|
||||
|
||||
import * as jsPDF from '../../../../node_modules/jspdf/dist/jspdf.min';
|
||||
// import * as jsPDF from '../../../../node_modules/jspdf/dist/jspdf.min';
|
||||
|
||||
@Injectable()
|
||||
export class PDFService {
|
||||
|
|
@ -14,13 +14,13 @@ export class PDFService {
|
|||
|
||||
toPDF(elementID : string, filename : string){
|
||||
|
||||
var pdf = new jsPDF();
|
||||
// var pdf = new jsPDF();
|
||||
|
||||
pdf.fromHTML($('#'+elementID).html(), 15, 15, {
|
||||
'width': 270
|
||||
//,'elementHandlers': specialElementHandlers
|
||||
});
|
||||
pdf.save(filename);
|
||||
// pdf.fromHTML($('#'+elementID).html(), 15, 15, {
|
||||
// 'width': 270
|
||||
// //,'elementHandlers': specialElementHandlers
|
||||
// });
|
||||
// pdf.save(filename);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -113,12 +113,6 @@
|
|||
version "2.4.10"
|
||||
resolved "https://registry.yarnpkg.com/@angular/common/-/common-2.4.10.tgz#a3a682d2228fa30ec23dd0eb57c8e887fba26997"
|
||||
|
||||
"@angular/common@^4.0.1":
|
||||
version "4.4.6"
|
||||
resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.4.6.tgz#4b81420724e0828a0e839b95a55eb1a7e83918f2"
|
||||
dependencies:
|
||||
tslib "^1.7.1"
|
||||
|
||||
"@angular/compiler-cli@^5.1.1":
|
||||
version "5.1.1"
|
||||
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.1.1.tgz#579e6846ed493e7202e36eb5cea00cb1a61c927c"
|
||||
|
|
@ -148,12 +142,6 @@
|
|||
version "2.4.10"
|
||||
resolved "https://registry.yarnpkg.com/@angular/core/-/core-2.4.10.tgz#0b8320a65065965d998645b1f5cd3cf769b441ea"
|
||||
|
||||
"@angular/core@^4.0.1":
|
||||
version "4.4.6"
|
||||
resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.4.6.tgz#13031fd10dcfe438875419b38f21120958bc2354"
|
||||
dependencies:
|
||||
tslib "^1.7.1"
|
||||
|
||||
"@angular/forms@5.1.1":
|
||||
version "5.1.1"
|
||||
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.1.1.tgz#e38858a44e7b57b61f375087b76a79d6e2679b14"
|
||||
|
|
@ -164,12 +152,6 @@
|
|||
version "2.4.10"
|
||||
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-2.4.10.tgz#062133aaade1f3b3c962f1593208c541b622fd06"
|
||||
|
||||
"@angular/forms@^4.0.1":
|
||||
version "4.4.6"
|
||||
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-4.4.6.tgz#fe64ace42435c1b80f49034b7c41ce8caf14a44a"
|
||||
dependencies:
|
||||
tslib "^1.7.1"
|
||||
|
||||
"@angular/http@5.1.1":
|
||||
version "5.1.1"
|
||||
resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.1.1.tgz#45aa61ee61f212a34f958c444c999e8c9352ec23"
|
||||
|
|
@ -196,12 +178,6 @@
|
|||
version "2.4.10"
|
||||
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-2.4.10.tgz#8df25dec2b06adc690cc9bc26448deccaebcd8ec"
|
||||
|
||||
"@angular/platform-browser-dynamic@^4.0.1":
|
||||
version "4.4.6"
|
||||
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.6.tgz#4d3d9a6a7bf2cf3de4058a615ae059eff641fa36"
|
||||
dependencies:
|
||||
tslib "^1.7.1"
|
||||
|
||||
"@angular/platform-browser@5.1.1":
|
||||
version "5.1.1"
|
||||
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.1.1.tgz#88a05132d822b760c9108a3eaf0da610f39c2ed9"
|
||||
|
|
@ -212,20 +188,6 @@
|
|||
version "2.4.10"
|
||||
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-2.4.10.tgz#cbf25608148fb4ffef96cc5005ba5d7b3e093906"
|
||||
|
||||
"@angular/platform-browser@^4.2.5":
|
||||
version "4.4.6"
|
||||
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.4.6.tgz#a9839c547e1b654fa1d24a89780c8ba6ab8dcce0"
|
||||
dependencies:
|
||||
tslib "^1.7.1"
|
||||
|
||||
"@angular/platform-server@^4.4.4":
|
||||
version "4.4.6"
|
||||
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-4.4.6.tgz#431248f4891a635c76ad15a17d03e9c87e1a3837"
|
||||
dependencies:
|
||||
parse5 "^3.0.1"
|
||||
tslib "^1.7.1"
|
||||
xhr2 "^0.1.4"
|
||||
|
||||
"@angular/router@5.1.1":
|
||||
version "5.1.1"
|
||||
resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.1.1.tgz#378e69edd28edadaff7b09b6ee407aadf7164220"
|
||||
|
|
@ -333,10 +295,6 @@
|
|||
version "6.0.94"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.94.tgz#70e509b07ed9f961c8f6f4a73a61d922be5029a7"
|
||||
|
||||
"@types/node@~8.0.33":
|
||||
version "8.0.58"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.58.tgz#5b3881c0be3a646874803fee3197ea7f1ed6df90"
|
||||
|
||||
"@types/q@^0.0.32":
|
||||
version "0.0.32"
|
||||
resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
|
||||
|
|
@ -462,21 +420,6 @@ angular-2-data-table@^0.1.2:
|
|||
version "0.1.2"
|
||||
resolved "https://registry.yarnpkg.com/angular-2-data-table/-/angular-2-data-table-0.1.2.tgz#7a2cff8cfc4aa714a97d333098b9116aa428babc"
|
||||
|
||||
angular-4-data-table-bootstrap-4@^0.2.0:
|
||||
version "0.2.0"
|
||||
resolved "https://registry.yarnpkg.com/angular-4-data-table-bootstrap-4/-/angular-4-data-table-bootstrap-4-0.2.0.tgz#b565bef2398954cee925fcef5e03cb747dee307c"
|
||||
dependencies:
|
||||
"@angular/common" "^4.0.1"
|
||||
"@angular/core" "^4.0.1"
|
||||
"@angular/forms" "^4.0.1"
|
||||
"@angular/platform-browser" "^4.2.5"
|
||||
"@angular/platform-browser-dynamic" "^4.0.1"
|
||||
"@angular/platform-server" "^4.4.4"
|
||||
"@types/node" "~8.0.33"
|
||||
rxjs "^5.1.0"
|
||||
ts-node "~3.3.0"
|
||||
zone.js "^0.8.12"
|
||||
|
||||
angular-google-signin@^0.1.5:
|
||||
version "0.1.5"
|
||||
resolved "https://registry.yarnpkg.com/angular-google-signin/-/angular-google-signin-0.1.5.tgz#5506cc59e4c245620eb090e83869c7f4ca17513c"
|
||||
|
|
@ -4467,12 +4410,6 @@ parse-passwd@^1.0.0:
|
|||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
|
||||
|
||||
parse5@^3.0.1:
|
||||
version "3.0.3"
|
||||
resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
|
||||
dependencies:
|
||||
"@types/node" "*"
|
||||
|
||||
parsejson@0.0.3:
|
||||
version "0.0.3"
|
||||
resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
|
||||
|
|
@ -5417,7 +5354,7 @@ rxjs@5.0.1:
|
|||
dependencies:
|
||||
symbol-observable "^1.0.1"
|
||||
|
||||
rxjs@^5.0.1, rxjs@^5.1.0, rxjs@^5.4.2, rxjs@^5.5.2:
|
||||
rxjs@^5.0.1, rxjs@^5.4.2, rxjs@^5.5.2:
|
||||
version "5.5.5"
|
||||
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.5.tgz#e164f11d38eaf29f56f08c3447f74ff02dd84e97"
|
||||
dependencies:
|
||||
|
|
@ -5731,7 +5668,7 @@ source-map-loader@^0.2.0:
|
|||
loader-utils "~0.2.2"
|
||||
source-map "~0.6.1"
|
||||
|
||||
source-map-support@^0.4.0, source-map-support@^0.4.1, source-map-support@^0.4.2, source-map-support@~0.4.0:
|
||||
source-map-support@^0.4.1, source-map-support@^0.4.2, source-map-support@~0.4.0:
|
||||
version "0.4.18"
|
||||
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
|
||||
dependencies:
|
||||
|
|
@ -6143,21 +6080,6 @@ trim-right@^1.0.1:
|
|||
dependencies:
|
||||
glob "^6.0.4"
|
||||
|
||||
ts-node@~3.3.0:
|
||||
version "3.3.0"
|
||||
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-3.3.0.tgz#c13c6a3024e30be1180dd53038fc209289d4bf69"
|
||||
dependencies:
|
||||
arrify "^1.0.0"
|
||||
chalk "^2.0.0"
|
||||
diff "^3.1.0"
|
||||
make-error "^1.1.1"
|
||||
minimist "^1.2.0"
|
||||
mkdirp "^0.5.1"
|
||||
source-map-support "^0.4.0"
|
||||
tsconfig "^6.0.0"
|
||||
v8flags "^3.0.0"
|
||||
yn "^2.0.0"
|
||||
|
||||
ts-node@~4.0.1:
|
||||
version "4.0.1"
|
||||
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-4.0.1.tgz#4d368088b50c382d78285c029784ea0f32a4eb5c"
|
||||
|
|
@ -6181,13 +6103,6 @@ ts-node@~4.0.1:
|
|||
v8flags "^3.0.0"
|
||||
yn "^2.0.0"
|
||||
|
||||
tsconfig@^6.0.0:
|
||||
version "6.0.0"
|
||||
resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-6.0.0.tgz#6b0e8376003d7af1864f8df8f89dd0059ffcd032"
|
||||
dependencies:
|
||||
strip-bom "^3.0.0"
|
||||
strip-json-comments "^2.0.0"
|
||||
|
||||
tsconfig@^7.0.0:
|
||||
version "7.0.0"
|
||||
resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7"
|
||||
|
|
@ -6261,7 +6176,11 @@ typedarray@^0.0.6:
|
|||
version "0.0.6"
|
||||
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
|
||||
|
||||
typescript@^2.1.0-dev.20160920, typescript@^2.4.2, typescript@~2.6.1:
|
||||
typescript@2.4.2:
|
||||
version "2.4.2"
|
||||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844"
|
||||
|
||||
typescript@^2.1.0-dev.20160920, typescript@~2.6.1:
|
||||
version "2.6.2"
|
||||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
|
||||
|
||||
|
|
@ -6709,10 +6628,6 @@ wtf-8@1.0.0:
|
|||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"
|
||||
|
||||
xhr2@^0.1.4:
|
||||
version "0.1.4"
|
||||
resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f"
|
||||
|
||||
xml-char-classes@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
|
||||
|
|
@ -6850,6 +6765,6 @@ zone.js@^0.7.2:
|
|||
version "0.7.8"
|
||||
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.8.tgz#4f3fe8834d44597f2639053a0fa438df34fffded"
|
||||
|
||||
zone.js@^0.8.12, zone.js@^0.8.14, zone.js@^0.8.17:
|
||||
zone.js@^0.8.14, zone.js@^0.8.17:
|
||||
version "0.8.18"
|
||||
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.18.tgz#8cecb3977fcd1b3090562ff4570e2847e752b48d"
|
||||
|
|
|
|||
Loading…
Reference in New Issue