diff --git a/dmp-frontend/src/app/datasets/dataset.component.css b/dmp-frontend/src/app/datasets/dataset.component.css
index 44ba4eb62..02c0d5c92 100644
--- a/dmp-frontend/src/app/datasets/dataset.component.css
+++ b/dmp-frontend/src/app/datasets/dataset.component.css
@@ -44,4 +44,6 @@ tr.hover:hover > * {
.hidden-keepspace{
visibility: hidden;
-}
\ No newline at end of file
+}
+
+
diff --git a/dmp-frontend/src/app/datasets/dataset.component.ts b/dmp-frontend/src/app/datasets/dataset.component.ts
index 84a57561b..69aa4a209 100644
--- a/dmp-frontend/src/app/datasets/dataset.component.ts
+++ b/dmp-frontend/src/app/datasets/dataset.component.ts
@@ -37,6 +37,7 @@ export class DatasetsComponent implements OnInit {
//required by the table
public filterQuery = "";
+ public statusFilter = "";
public rowsOnPage = 10;
public sortBy = "label";
public sortOrder = "asc";
@@ -110,6 +111,15 @@ export class DatasetsComponent implements OnInit {
)
}
+ ngAfterViewInit(){
+
+ $( function() {
+ $('#status-filter').append("");
+ //$('#status-filter').value=;
+ })
+
+ }
+
createEmptyDataset(){
return {
id: null,
diff --git a/dmp-frontend/src/app/datasets/dataset.html b/dmp-frontend/src/app/datasets/dataset.html
index ff2f5c9d8..d7763f690 100644
--- a/dmp-frontend/src/app/datasets/dataset.html
+++ b/dmp-frontend/src/app/datasets/dataset.html
@@ -8,11 +8,17 @@
|
+
+
- |
|
+
+
+
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.ts b/dmp-frontend/src/app/form/dynamic-form.component.ts
index 7692fd4e6..1bc148088 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.ts
+++ b/dmp-frontend/src/app/form/dynamic-form.component.ts
@@ -198,7 +198,6 @@ export class DynamicFormComponent implements OnInit {
*/
createPDF(elementID : string, pdffilename : string){
- debugger;
this.pdfService.toPDF(elementID, pdffilename);
}
diff --git a/dmp-frontend/src/app/pipes/dataset-table-filter.pipe.ts b/dmp-frontend/src/app/pipes/dataset-table-filter.pipe.ts
index 98abedbe7..58e20341f 100644
--- a/dmp-frontend/src/app/pipes/dataset-table-filter.pipe.ts
+++ b/dmp-frontend/src/app/pipes/dataset-table-filter.pipe.ts
@@ -16,7 +16,7 @@ export class DatasetTableFilterPipe implements PipeTransform {
if (row.id == null) row.id = "";
return (
- row.label.indexOf(query) > -1
+ row.label.toLowerCase().indexOf(query.toLowerCase()) > -1
//|| row.version == query
//|| row.id.indexOf(query) > -1
)
diff --git a/dmp-frontend/src/app/pipes/dmp-table-filter.pipe.ts b/dmp-frontend/src/app/pipes/dmp-table-filter.pipe.ts
index 9b5f08f0b..f9965b845 100644
--- a/dmp-frontend/src/app/pipes/dmp-table-filter.pipe.ts
+++ b/dmp-frontend/src/app/pipes/dmp-table-filter.pipe.ts
@@ -16,7 +16,7 @@ export class DmpTableFilterPipe implements PipeTransform {
if (row.id == null) row.id = "";
return (
- row.label.indexOf(query) > -1 ||
+ row.label.toLowerCase().indexOf(query.toLowerCase()) > -1 ||
//row.version == query ||
row.id.indexOf(query) > -1
diff --git a/dmp-frontend/src/app/pipes/project-table-filter.pipe.ts b/dmp-frontend/src/app/pipes/project-table-filter.pipe.ts
index e1b667b5d..472783144 100644
--- a/dmp-frontend/src/app/pipes/project-table-filter.pipe.ts
+++ b/dmp-frontend/src/app/pipes/project-table-filter.pipe.ts
@@ -13,10 +13,10 @@ export class ProjectTableFilterPipe implements PipeTransform {
return _.filter(array, row => {
if(onlyMyProjects){
- return (row.label.indexOf(query) > -1) && (row.creationUser.id==userid);
+ return (row.label.toLowerCase().indexOf(query.toLowerCase()) > -1) && (row.creationUser.id==userid);
}
else{
- return row.label.indexOf(query) > -1;
+ return row.label.toLowerCase().indexOf(query.toLowerCase()) > -1;
}
});
diff --git a/dmp-frontend/src/app/services/rest-base.ts b/dmp-frontend/src/app/services/rest-base.ts
index e8972ef1a..cb190b3ef 100644
--- a/dmp-frontend/src/app/services/rest-base.ts
+++ b/dmp-frontend/src/app/services/rest-base.ts
@@ -18,7 +18,7 @@ export class RestBase {
protocol: string = "http";
- hostname: string ="localhost"
+ hostname: string ="dionysus.di.uoa.gr"
port: number = 8080;
webappname: string = "dmp-backend";
@@ -28,14 +28,6 @@ export class RestBase {
port: number = 8080;
webappname: string = "dmp-backend";
*/
-
-
- /*
- protocol: string = "http";
- hostname: string = "dionysus.di.uoa.gr" ;
- port: number = 8080;
- webappname: string = "dmp-backend";
- */
proxyPath : string = this.protocol+"://"+this.hostname+":"+this.port+"/"+this.webappname+"/proxy/";