Added floating
This commit is contained in:
Nikolaos Laskaris
commit
859c9ed87f
|
|
@ -581,12 +581,6 @@
|
|||
"typescript": "2.3.4"
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"angular2-draggable": {
|
||||
"version": "1.0.7",
|
||||
"resolved": "https://registry.npmjs.org/angular2-draggable/-/angular2-draggable-1.0.7.tgz",
|
||||
"integrity": "sha1-NeH4HIzPPdljDyMmVYuILMEvDyk="
|
||||
=======
|
||||
"angular2-datatable": {
|
||||
"version": "0.6.0",
|
||||
"resolved": "https://registry.npmjs.org/angular2-datatable/-/angular2-datatable-0.6.0.tgz",
|
||||
|
|
@ -594,7 +588,11 @@
|
|||
"requires": {
|
||||
"lodash": "4.17.4"
|
||||
}
|
||||
>>>>>>> 573e1fd92cc726405b415b5214ed96fa1a0ce420
|
||||
},
|
||||
"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",
|
||||
|
|
|
|||
|
|
@ -24,11 +24,8 @@
|
|||
"angular-2-data-table": "^0.1.2",
|
||||
"angular-4-data-table-bootstrap-4": "^0.2.0",
|
||||
"angular-google-signin": "^0.1.5",
|
||||
<<<<<<< HEAD
|
||||
"angular2-draggable": "^1.0.7",
|
||||
=======
|
||||
"angular2-datatable": "^0.6.0",
|
||||
>>>>>>> 573e1fd92cc726405b415b5214ed96fa1a0ce420
|
||||
"bootstrap": "^3.3.7",
|
||||
"core-js": "^2.4.1",
|
||||
"flat": "^4.0.0",
|
||||
|
|
|
|||
|
|
@ -92,27 +92,10 @@ export class DatasetsComponent implements OnInit {
|
|||
console.log(this.dmpIdforDatasets);debugger;
|
||||
this.serverService.getDatasetForDmp({ "id": this.dmpIdforDatasets }).subscribe(
|
||||
response => {
|
||||
<<<<<<< HEAD
|
||||
|
||||
console.log("response");
|
||||
console.log(response);
|
||||
response.forEach(resp => {
|
||||
|
||||
let dt = new Dataset();
|
||||
dt.id = resp.id;
|
||||
dt.name = resp.label;
|
||||
dt.uriDataset = resp.uri;
|
||||
dt.dmp = resp.dmp.label;
|
||||
dt.profile = resp.profile.label;
|
||||
dt.profileId = resp.profile.id;
|
||||
this.datasets.push(dt);
|
||||
var params = { limit: 8, offset: 0, sortAsc: false }
|
||||
this.afterLoad();
|
||||
this.datasetResource.query(params).then(datasets => this.datasets = datasets);
|
||||
});
|
||||
=======
|
||||
this.tableData = response;
|
||||
>>>>>>> 573e1fd92cc726405b415b5214ed96fa1a0ce420
|
||||
|
||||
|
||||
}
|
||||
);
|
||||
|
||||
|
|
@ -132,21 +115,8 @@ export class DatasetsComponent implements OnInit {
|
|||
)
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
reloadDatasets(params) {
|
||||
this.datasetResource = new DataTableResource(this.datasets);
|
||||
this.datasetResource.query(params).then(datasets => this.datasets = datasets);
|
||||
}
|
||||
|
||||
afterLoad() {
|
||||
this.datasetResource = new DataTableResource(this.datasets);
|
||||
this.datasetResource.count().then(count => this.datasetCount = count);
|
||||
}
|
||||
|
||||
selectDataset(item) {debugger;
|
||||
=======
|
||||
selectDataset(item) {
|
||||
>>>>>>> 573e1fd92cc726405b415b5214ed96fa1a0ce420
|
||||
this.ngZone.run(() => this.router.navigate(['dynamic-form', {id: item.profileId, datasetId:item.id, datasetProperties:item.properties}]));
|
||||
}
|
||||
|
||||
|
|
@ -177,19 +147,9 @@ export class DatasetsComponent implements OnInit {
|
|||
}
|
||||
);
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
// special params:
|
||||
translations = <DataTableTranslations>{
|
||||
indexColumn: 'Index column',
|
||||
expandColumn: 'Expand column',
|
||||
selectColumn: 'Select column',
|
||||
paginationLimit: 'Max results',
|
||||
paginationRange: 'Result range'
|
||||
};
|
||||
=======
|
||||
|
||||
>>>>>>> 573e1fd92cc726405b415b5214ed96fa1a0ce420
|
||||
|
||||
|
||||
getDatasetForDmpMethod(dmpid) {
|
||||
this.serverService.getDatasetForDmp({ "id": dmpid }).subscribe(
|
||||
|
|
|
|||
|
|
@ -1,50 +1,9 @@
|
|||
<div style="margin: auto; max-width: 1000px; margin-top:50px">
|
||||
<<<<<<< HEAD
|
||||
<data-table id="films-grid" headerTitle="Datasets" [items]="datasets" [itemCount]="datasetCount" (reload)="reloadDatasets($event)"
|
||||
[limit]="8" [sortBy]="'rating'" [sortAsc]="false" [substituteRows]="false"
|
||||
[translations]="translations" >
|
||||
|
||||
<data-table-column [property]="'name'" [header]="'Label'" [sortable]="true">
|
||||
</data-table-column>
|
||||
<data-table-column [property]="'dmp'" [header]="'DMP'" [sortable]="true">
|
||||
</data-table-column>
|
||||
<data-table-column [property]="'profile'" [header]="'Profile'" [sortable]="true">
|
||||
</data-table-column>
|
||||
<data-table-column [property]="'uriDataset'" [header]="'Uri'" [sortable]="true">
|
||||
</data-table-column>
|
||||
<!-- <data-table-column [property]="'definition'" [header]="'Definition'" [sortable]="true">
|
||||
</data-table-column> -->
|
||||
<data-table-column header="Actions">
|
||||
<template #dataTableHeader let-item="item">
|
||||
<i>Actions</i>
|
||||
</template>
|
||||
<template #dataTableCell let-item="item">
|
||||
<a class="editGridColumn" (click) = "editRow(item)"><i class="fa fa-pencil fa-fw"></i></a> <!--data-toggle="modal" data-target="#exampleModalDmps" -->
|
||||
</template>
|
||||
</data-table-column>
|
||||
<data-table-column header="Edit">
|
||||
<template #dataTableHeader let-item="item">
|
||||
<i>Edit</i>
|
||||
</template>
|
||||
<template #dataTableCell let-item="item">
|
||||
<a class="editGridColumn" (click) = "selectDataset(item)"><i class="fa fa-pencil fa-fw"></i></a> <!--data-toggle="modal" data-target="#exampleModalDmps" -->
|
||||
</template>
|
||||
</data-table-column>
|
||||
</data-table>
|
||||
<div style="margin-top: 10px">
|
||||
<button type="button" class="btn btn-info" (click) = "newDataset(item)" >New Dataset</button> <!-- data-toggle="modal" data-target="#newDatasetModal" -->
|
||||
<!-- <b>Selected:</b>
|
||||
<span *ngIf="projectsTable.selectedRow == null"><i>No item selected</i></span>
|
||||
<span [textContent]="projectsTable.selectedRow && projectsTable.selectedRow.item.name"></span> -->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
=======
|
||||
|
||||
|
||||
|
||||
<table class="table table-striped" [mfData]="tableData | dmpTableFilter : filterQuery"
|
||||
#mf="mfDataTable" [mfRowsOnPage]="rowsOnPage" [(mfSortBy)]="sortBy" [(mfSortOrder)]="sortOrder">
|
||||
|
||||
<table class="table table-striped" [mfData]="tableData | dmpTableFilter : filterQuery" #mf="mfDataTable" [mfRowsOnPage]="rowsOnPage" [(mfSortBy)]="sortBy" [(mfSortOrder)]="sortOrder">
|
||||
<thead>
|
||||
<tr>
|
||||
<th colspan="1">
|
||||
|
|
@ -111,6 +70,9 @@
|
|||
</table>
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 573e1fd92cc726405b415b5214ed96fa1a0ce420
|
||||
=======
|
||||
>>>>>>> 573e1fd92cc726405b415b5214ed96fa1a0ce420
|
||||
|
||||
<div class="modal fade" id="newDatasetModal" tabindex="-1" role="dialog" aria-labelledby="newDatasetModalLabel" aria-hidden="true">
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@
|
|||
</div>
|
||||
<div class="form-group">
|
||||
<label for="label-name" class="form-control-label">Previous:</label>
|
||||
<input type="text" class="form-control" id="label-previous" [(ngModel)]= "dmp.previous" name = "previous">
|
||||
<input type="text" class="form-control" id="label-previous" [(ngModel)]="dmp.previous" name="previous">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="abbreviation-text" class="form-control-label">Version:</label>
|
||||
|
|
|
|||
|
|
@ -16,18 +16,13 @@ export class RestBase {
|
|||
}
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
/*
|
||||
=======
|
||||
>>>>>>> 573e1fd92cc726405b415b5214ed96fa1a0ce420
|
||||
|
||||
|
||||
protocol: string = "http";
|
||||
hostname: string ="dl010.madgik.di.uoa.gr" ;//"localhost";//"dl010.madgik.di.uoa.gr";//
|
||||
port: number = 8080;//8080;//
|
||||
webappname: string = "dmp-backend";//"dmp-backend-new";//
|
||||
<<<<<<< HEAD
|
||||
*/
|
||||
=======
|
||||
>>>>>>> 573e1fd92cc726405b415b5214ed96fa1a0ce420
|
||||
|
||||
|
||||
|
||||
/*protocol: string = "http";
|
||||
|
|
|
|||
Loading…
Reference in New Issue