From 3e4f615cc2f0c7ad6ed0de0c77f1441aaa2ee215 Mon Sep 17 00:00:00 2001
From: Nikolaos Laskaris <laskarisn@di.uoa.gr>
Date: Wed, 29 Nov 2017 18:15:47 +0200
Subject: [PATCH] uppercase service fixes

---
 .../src/app/datasets/dataset.component.css    |  4 ++-
 .../src/app/datasets/dataset.component.ts     | 10 ++++++
 dmp-frontend/src/app/datasets/dataset.html    |  8 ++++-
 dmp-frontend/src/app/dmps/dmp.component.css   | 34 ++++++++++++++++++-
 dmp-frontend/src/app/dmps/dmps.html           | 22 +++++++++---
 .../src/app/form/dynamic-form.component.ts    |  1 -
 .../app/pipes/dataset-table-filter.pipe.ts    |  2 +-
 .../src/app/pipes/dmp-table-filter.pipe.ts    |  2 +-
 .../app/pipes/project-table-filter.pipe.ts    |  4 +--
 dmp-frontend/src/app/services/rest-base.ts    | 10 +-----
 10 files changed, 76 insertions(+), 21 deletions(-)

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("<option value='' style='text-color: #cccccc' selected disabled hidden>Filter by status</option>");
+      //$('#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 @@
             <th colspan="1">
                 <input class="form-control" [(ngModel)]="filterQuery" placeholder='Search in Labels' />
             </th>
+
+
             <th colspan="1">
                 <!-- <input class="form-control" [(ngModel)]="versionFilter" placeholder='Filter' /> -->                    
-                <select class="form-control" [id]="statusid" [(ngModel)]="statusFilter" [name]="statusDropDown" #datasetfield >
+                
+                
+
+                <select [ngClass]="{'semi-visible': statusFilter==''}" class="form-control" id="status-filter" [(ngModel)]="statusFilter" [name]="statusDropDown" #datasetfield>
                     <option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option>
                 </select>
+                
             </th>
             <th>
                 <button class="btn btn-default" (click)="getDatasets('false')">
diff --git a/dmp-frontend/src/app/dmps/dmp.component.css b/dmp-frontend/src/app/dmps/dmp.component.css
index eba7fc2dc..9c846c48e 100644
--- a/dmp-frontend/src/app/dmps/dmp.component.css
+++ b/dmp-frontend/src/app/dmps/dmp.component.css
@@ -69,8 +69,40 @@ tr.hover:hover > * {
 }
 
 
+/*THE BELOW CSS ARE FOR HORIZONTALLY -COLLAPSING DIVS */
 
-
+  .collapse {
+    display: none;
+    visibility: hidden;
+  }
+  .collapse.in {
+    display: block;
+    visibility: visible;
+  }
+  tr.collapse.in {
+    display: table-row;
+  }
+  tbody.collapse.in {
+    display: table-row-group;
+  }
+  .collapsing {
+    position: relative;
+    height: 0;
+    overflow: hidden;
+    -webkit-transition-property: height, visibility;
+    transition-property: height, visibility;
+    -webkit-transition-duration: 0.35s;
+    transition-duration: 0.35s;
+    -webkit-transition-timing-function: ease;
+    transition-timing-function: ease;
+  }
+  .collapsing.width {
+    -webkit-transition-property: width, visibility;
+    transition-property: width, visibility;
+    width: 0;
+    height: auto;
+  }
+/* END OF HORIZONTALLY -COLLAPSING DIVS */
 
 
 /* 
diff --git a/dmp-frontend/src/app/dmps/dmps.html b/dmp-frontend/src/app/dmps/dmps.html
index b9258ceff..5b276d119 100644
--- a/dmp-frontend/src/app/dmps/dmps.html
+++ b/dmp-frontend/src/app/dmps/dmps.html
@@ -16,12 +16,26 @@
             <button type="button" class="btn btn-info btnMoreFilters" data-toggle="collapse" data-target="#demo" (click)="clickFilters($event.target)">More filters</button>
             <div id="demo" class="collapse">
                 <input style="margin-top: 5px;" class="form-control" type="number" [(ngModel)]="versionFilter" placeholder='Version' />
-                <select style="margin-top: 5px;" class="form-control" [id]="statusid" [(ngModel)]="statusFilter" [name]="statusDropDown"
-                    #datasetfield>
-                        <option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option>
-                    </select>
+                <select style="margin-top: 5px;" class="form-control" [id]="statusid" [(ngModel)]="statusFilter" [name]="statusDropDown" #datasetfield>
+                    <option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option>
+                </select>
             </div>
         </th>
+        
+        <!--
+        <th style="display: table-row;" class="container rowFilterTopBorder" colspan="3">
+            <button style="display: table-cell;" type="button" class="btn btn-info btnMoreFilters" data-toggle="collapse" data-target="#more-filters" (click)="clickFilters($event.target)">More filters</button>
+            <div style="display: table-cell;" id="more-filters" class="collapse width">
+                <div style="display: table-row;">
+                    <input style="display: table-cell; width:45%; margin-top: 5px;" class="form-control contentwrapper" type="number" [(ngModel)]="versionFilter" placeholder='Version' />
+                    <select style="display: table-cell; width:45%; margin-top: 5px;" class="form-control contentwrapper" [id]="statusid" [(ngModel)]="statusFilter" [name]="statusDropDown" #datasetfield>
+                        <option *ngFor="let opt of statusDropDown.options" [value]="opt.key">{{opt.value}}</option>
+                    </select>
+                </div>
+            </div>
+        </th>
+        -->
+
     </tr>
 
     <tr>
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/";