MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

uppercase service fixes

This commit is contained in:
Nikolaos Laskaris 2017-11-29 18:15:47 +02:00
parent 5626204bbc
commit 3e4f615cc2
10 changed files with 76 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/datasets/dataset.component.css
View File

@ -45,3 +45,5 @@ tr.hover:hover > * {
.hidden-keepspace{
visibility: hidden;
}

10
dmp-frontend/src/app/datasets/dataset.component.ts
View File

@ -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,

8
dmp-frontend/src/app/datasets/dataset.html
View File

@ -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')">

34
dmp-frontend/src/app/dmps/dmp.component.css
View File

@ -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 */
/*

18
dmp-frontend/src/app/dmps/dmps.html
View File

@ -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>
<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>

1
dmp-frontend/src/app/form/dynamic-form.component.ts
View File

@ -198,7 +198,6 @@ export class DynamicFormComponent implements OnInit {
*/
createPDF(elementID : string, pdffilename : string){
debugger;
this.pdfService.toPDF(elementID, pdffilename);
}

2
dmp-frontend/src/app/pipes/dataset-table-filter.pipe.ts
View File

@ -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
)

2
dmp-frontend/src/app/pipes/dmp-table-filter.pipe.ts
View File

@ -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

4
dmp-frontend/src/app/pipes/project-table-filter.pipe.ts
View File

@ -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;
}
});

10
dmp-frontend/src/app/services/rest-base.ts
View File

@ -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";
@ -30,14 +30,6 @@ export class RestBase {
*/
/*
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/";
loginPath : string = this.protocol+"://"+this.hostname+":"+this.port+"/"+this.webappname+"/login/";
restPath: string = this.protocol+"://"+this.hostname+":"+this.port+"/"+this.webappname+"/rest/";