Fixes bug on sort by label
This commit is contained in:
parent
323b74048e
commit
70d2d456ee
|
@ -2,7 +2,7 @@ import { DatasetProfileModel } from './dataset-profile';
|
||||||
|
|
||||||
export interface DatasetListingModel {
|
export interface DatasetListingModel {
|
||||||
id: string;
|
id: string;
|
||||||
label: String;
|
label: string;
|
||||||
dmp: String;
|
dmp: String;
|
||||||
dmpId: String;
|
dmpId: String;
|
||||||
grant: String;
|
grant: String;
|
||||||
|
|
|
@ -3,7 +3,7 @@ import { DmpAssociatedProfileModel } from '../dmp-profile/dmp-associated-profile
|
||||||
|
|
||||||
export interface DmpListingModel {
|
export interface DmpListingModel {
|
||||||
id: string;
|
id: string;
|
||||||
label: String;
|
label: string;
|
||||||
description: String;
|
description: String;
|
||||||
status: DmpStatus;
|
status: DmpStatus;
|
||||||
grant: String;
|
grant: String;
|
||||||
|
|
|
@ -4,7 +4,7 @@ import { DatasetProfileModel } from '../dataset/dataset-profile';
|
||||||
|
|
||||||
export class RecentActivityModel {
|
export class RecentActivityModel {
|
||||||
id: string;
|
id: string;
|
||||||
title: String;
|
title: string;
|
||||||
description: String;
|
description: String;
|
||||||
created: Date;
|
created: Date;
|
||||||
modified: Date;
|
modified: Date;
|
||||||
|
|
|
@ -69,7 +69,7 @@ export class DraftsComponent extends BaseComponent implements OnInit {
|
||||||
// const fields: Array<string> = [];
|
// const fields: Array<string> = [];
|
||||||
// fields.push('-modified');
|
// fields.push('-modified');
|
||||||
this.formGroup.get('order').setValue(this.order.MODIFIED);
|
this.formGroup.get('order').setValue(this.order.MODIFIED);
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
const dmpDataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, 5, { fields: fields });
|
const dmpDataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, 5, { fields: fields });
|
||||||
dmpDataTableRequest.criteria = new DatasetCriteria();
|
dmpDataTableRequest.criteria = new DatasetCriteria();
|
||||||
dmpDataTableRequest.criteria.status = DmpStatus.Draft;
|
dmpDataTableRequest.criteria.status = DmpStatus.Draft;
|
||||||
|
@ -301,7 +301,7 @@ export class DraftsComponent extends BaseComponent implements OnInit {
|
||||||
refresh(): void {
|
refresh(): void {
|
||||||
// const fields: Array<string> = [];
|
// const fields: Array<string> = [];
|
||||||
// fields.push('-modified');
|
// fields.push('-modified');
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
this.startIndex = 0;
|
this.startIndex = 0;
|
||||||
const dmpDataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, 5, { fields: fields });
|
const dmpDataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, 5, { fields: fields });
|
||||||
dmpDataTableRequest.criteria = new DatasetCriteria();
|
dmpDataTableRequest.criteria = new DatasetCriteria();
|
||||||
|
@ -317,7 +317,7 @@ export class DraftsComponent extends BaseComponent implements OnInit {
|
||||||
public loadMore() {
|
public loadMore() {
|
||||||
this.startIndex = this.startIndex + this.pageSize;
|
this.startIndex = this.startIndex + this.pageSize;
|
||||||
// const fields: Array<string> = ["-modified"];
|
// const fields: Array<string> = ["-modified"];
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
const request = new DataTableRequest<DatasetCriteria>(this.startIndex, this.pageSize, { fields: fields });
|
const request = new DataTableRequest<DatasetCriteria>(this.startIndex, this.pageSize, { fields: fields });
|
||||||
request.criteria = new DatasetCriteria();
|
request.criteria = new DatasetCriteria();
|
||||||
request.criteria.status = DmpStatus.Draft;
|
request.criteria.status = DmpStatus.Draft;
|
||||||
|
|
|
@ -76,7 +76,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
if (this.isAuthenticated()) {
|
if (this.isAuthenticated()) {
|
||||||
this.formGroup.get('order').setValue(this.order.MODIFIED);
|
this.formGroup.get('order').setValue(this.order.MODIFIED);
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
// const fields: Array<string> = ["-modified"];
|
// const fields: Array<string> = ["-modified"];
|
||||||
const allDataTableRequest: DataTableMultiTypeRequest<RecentActivityCriteria> = new DataTableMultiTypeRequest(0, 0, 5, { fields: fields });
|
const allDataTableRequest: DataTableMultiTypeRequest<RecentActivityCriteria> = new DataTableMultiTypeRequest(0, 0, 5, { fields: fields });
|
||||||
allDataTableRequest.criteria = new RecentActivityCriteria();
|
allDataTableRequest.criteria = new RecentActivityCriteria();
|
||||||
|
@ -458,7 +458,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
|
||||||
}
|
}
|
||||||
|
|
||||||
refresh(): void {
|
refresh(): void {
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
// const fields: Array<string> = ["-modified"];
|
// const fields: Array<string> = ["-modified"];
|
||||||
this.startIndex = 0;
|
this.startIndex = 0;
|
||||||
const allDataTableRequest: DataTableMultiTypeRequest<RecentActivityCriteria> = new DataTableMultiTypeRequest(0, 0, this.pageSize, { fields: fields });
|
const allDataTableRequest: DataTableMultiTypeRequest<RecentActivityCriteria> = new DataTableMultiTypeRequest(0, 0, this.pageSize, { fields: fields });
|
||||||
|
@ -481,7 +481,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
|
||||||
}
|
}
|
||||||
|
|
||||||
public loadMore() {
|
public loadMore() {
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
// const fields: Array<string> = ["-modified"];
|
// const fields: Array<string> = ["-modified"];
|
||||||
const request = new DataTableMultiTypeRequest<RecentActivityCriteria>(this.dmpOffset, this.datasetOffset, this.pageSize, { fields: fields });
|
const request = new DataTableMultiTypeRequest<RecentActivityCriteria>(this.dmpOffset, this.datasetOffset, this.pageSize, { fields: fields });
|
||||||
request.criteria = new RecentActivityCriteria();
|
request.criteria = new RecentActivityCriteria();
|
||||||
|
@ -532,7 +532,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
|
||||||
index2++;
|
index2++;
|
||||||
}
|
}
|
||||||
} else if (order === 'label') {
|
} else if (order === 'label') {
|
||||||
if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].title < arr2[index2].title))) {
|
if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].title.localeCompare(arr2[index2].title)))) {
|
||||||
merged[current] = arr1[index1];
|
merged[current] = arr1[index1];
|
||||||
index1++;
|
index1++;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -66,7 +66,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen
|
||||||
if (this.isAuthenticated()) {
|
if (this.isAuthenticated()) {
|
||||||
// const fields: Array<string> = ["-modified"];
|
// const fields: Array<string> = ["-modified"];
|
||||||
this.formGroup.get('order').setValue(this.order.MODIFIED);
|
this.formGroup.get('order').setValue(this.order.MODIFIED);
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
const datasetDataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, this.pageSize, { fields: fields });
|
const datasetDataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, this.pageSize, { fields: fields });
|
||||||
datasetDataTableRequest.criteria = new DatasetCriteria();
|
datasetDataTableRequest.criteria = new DatasetCriteria();
|
||||||
datasetDataTableRequest.criteria.like = "";
|
datasetDataTableRequest.criteria.like = "";
|
||||||
|
@ -88,7 +88,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen
|
||||||
|
|
||||||
refresh(): void {
|
refresh(): void {
|
||||||
// const fields: Array<string> = ["-modified"];
|
// const fields: Array<string> = ["-modified"];
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
this.startIndex = 0;
|
this.startIndex = 0;
|
||||||
const datasetDataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, this.pageSize, { fields: fields });
|
const datasetDataTableRequest: DataTableRequest<DatasetCriteria> = new DataTableRequest(0, this.pageSize, { fields: fields });
|
||||||
datasetDataTableRequest.criteria = new DatasetCriteria();
|
datasetDataTableRequest.criteria = new DatasetCriteria();
|
||||||
|
@ -105,7 +105,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen
|
||||||
public loadMore() {
|
public loadMore() {
|
||||||
this.startIndex = this.startIndex + this.pageSize;
|
this.startIndex = this.startIndex + this.pageSize;
|
||||||
// const fields: Array<string> = ["-modified"];
|
// const fields: Array<string> = ["-modified"];
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
const request = new DataTableRequest<DatasetCriteria>(this.startIndex, this.pageSize, { fields: fields });
|
const request = new DataTableRequest<DatasetCriteria>(this.startIndex, this.pageSize, { fields: fields });
|
||||||
|
|
||||||
request.criteria = new DatasetCriteria();
|
request.criteria = new DatasetCriteria();
|
||||||
|
@ -366,7 +366,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen
|
||||||
index2++;
|
index2++;
|
||||||
}
|
}
|
||||||
} else if (order === 'label') {
|
} else if (order === 'label') {
|
||||||
if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label < arr2[index2].label))) {
|
if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label.localeCompare(arr2[index2].label)))) {
|
||||||
merged[current] = arr1[index1];
|
merged[current] = arr1[index1];
|
||||||
index1++;
|
index1++;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -68,7 +68,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
|
||||||
if (this.isAuthenticated()) {
|
if (this.isAuthenticated()) {
|
||||||
// const fields: Array<string> = ["-modified"];
|
// const fields: Array<string> = ["-modified"];
|
||||||
this.formGroup.get('order').setValue(this.order.MODIFIED);
|
this.formGroup.get('order').setValue(this.order.MODIFIED);
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
const dmpDataTableRequest: DataTableRequest<DmpCriteria> = new DataTableRequest(0, 5, { fields: fields });
|
const dmpDataTableRequest: DataTableRequest<DmpCriteria> = new DataTableRequest(0, 5, { fields: fields });
|
||||||
dmpDataTableRequest.criteria = new DmpCriteria();
|
dmpDataTableRequest.criteria = new DmpCriteria();
|
||||||
dmpDataTableRequest.criteria.like = "";
|
dmpDataTableRequest.criteria.like = "";
|
||||||
|
@ -345,7 +345,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
|
||||||
|
|
||||||
refresh(): void {
|
refresh(): void {
|
||||||
// const fields: Array<string> = ["-modified"];
|
// const fields: Array<string> = ["-modified"];
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
this.startIndex = 0;
|
this.startIndex = 0;
|
||||||
const dmpDataTableRequest: DataTableRequest<DmpCriteria> = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields });
|
const dmpDataTableRequest: DataTableRequest<DmpCriteria> = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields });
|
||||||
dmpDataTableRequest.criteria = new DmpCriteria();
|
dmpDataTableRequest.criteria = new DmpCriteria();
|
||||||
|
@ -362,7 +362,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
|
||||||
public loadMore() {
|
public loadMore() {
|
||||||
this.startIndex = this.startIndex + this.pageSize;
|
this.startIndex = this.startIndex + this.pageSize;
|
||||||
// const fields: Array<string> = ["-modified"];
|
// const fields: Array<string> = ["-modified"];
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
const request = new DataTableRequest<DmpCriteria>(this.startIndex, this.pageSize, { fields: fields });
|
const request = new DataTableRequest<DmpCriteria>(this.startIndex, this.pageSize, { fields: fields });
|
||||||
|
|
||||||
request.criteria = new DmpCriteria();
|
request.criteria = new DmpCriteria();
|
||||||
|
@ -405,7 +405,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
|
||||||
index2++;
|
index2++;
|
||||||
}
|
}
|
||||||
} else if (order === 'label') {
|
} else if (order === 'label') {
|
||||||
if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label < arr2[index2].label))) {
|
if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label.localeCompare(arr2[index2].label)))) {
|
||||||
merged[current] = arr1[index1];
|
merged[current] = arr1[index1];
|
||||||
index1++;
|
index1++;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -152,7 +152,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
|
||||||
// let fields: Array<string> = new Array();
|
// let fields: Array<string> = new Array();
|
||||||
// fields.push('-modified');
|
// fields.push('-modified');
|
||||||
//if (this.sort && this.sort.active) { fields = this.sort.direction === 'asc' ? ['+' + this.sort.active] : ['-' + this.sort.active]; }
|
//if (this.sort && this.sort.active) { fields = this.sort.direction === 'asc' ? ['+' + this.sort.active] : ['-' + this.sort.active]; }
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
const request = new DataTableRequest<DatasetCriteria>(this.startIndex, this.pageSize, { fields: fields });
|
const request = new DataTableRequest<DatasetCriteria>(this.startIndex, this.pageSize, { fields: fields });
|
||||||
this.criteria.isPublic = this.isPublic;
|
this.criteria.isPublic = this.isPublic;
|
||||||
request.criteria = this.criteria;
|
request.criteria = this.criteria;
|
||||||
|
@ -168,7 +168,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
|
||||||
public loadMore() {
|
public loadMore() {
|
||||||
this.startIndex = this.startIndex + this.pageSize;
|
this.startIndex = this.startIndex + this.pageSize;
|
||||||
// const fields: Array<string> = ["-modified"];
|
// const fields: Array<string> = ["-modified"];
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
const request = new DataTableRequest<DatasetCriteria>(this.startIndex, this.pageSize, { fields: fields });
|
const request = new DataTableRequest<DatasetCriteria>(this.startIndex, this.pageSize, { fields: fields });
|
||||||
this.criteria.isPublic = this.isPublic;
|
this.criteria.isPublic = this.isPublic;
|
||||||
request.criteria = this.criteria;
|
request.criteria = this.criteria;
|
||||||
|
@ -306,7 +306,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
|
||||||
index2++;
|
index2++;
|
||||||
}
|
}
|
||||||
} else if (order === 'label') {
|
} else if (order === 'label') {
|
||||||
if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label < arr2[index2].label))) {
|
if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label.localeCompare(arr2[index2].label)))) {
|
||||||
merged[current] = arr1[index1];
|
merged[current] = arr1[index1];
|
||||||
index1++;
|
index1++;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -185,7 +185,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
|
||||||
// let fields: Array<string> = new Array();
|
// let fields: Array<string> = new Array();
|
||||||
// if (this.sort && this.sort.active) { fields = this.sort.direction === 'asc' ? ['+' + this.sort.active] : ['-' + this.sort.active]; }
|
// if (this.sort && this.sort.active) { fields = this.sort.direction === 'asc' ? ['+' + this.sort.active] : ['-' + this.sort.active]; }
|
||||||
// fields.push('-modified');
|
// fields.push('-modified');
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
|
|
||||||
const request = new DataTableRequest<DmpCriteria>(this.startIndex, this.pageSize, { fields: fields });
|
const request = new DataTableRequest<DmpCriteria>(this.startIndex, this.pageSize, { fields: fields });
|
||||||
this.setPublicCriteria();
|
this.setPublicCriteria();
|
||||||
|
@ -209,7 +209,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
|
||||||
public loadMore() {
|
public loadMore() {
|
||||||
this.startIndex = this.startIndex + this.pageSize;
|
this.startIndex = this.startIndex + this.pageSize;
|
||||||
// const fields: Array<string> = ["-modified"];
|
// const fields: Array<string> = ["-modified"];
|
||||||
const fields: Array<string> = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value];
|
const fields: Array<string> = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value];
|
||||||
const request = new DataTableRequest<DmpCriteria>(this.startIndex, this.pageSize, { fields: fields });
|
const request = new DataTableRequest<DmpCriteria>(this.startIndex, this.pageSize, { fields: fields });
|
||||||
this.setPublicCriteria();
|
this.setPublicCriteria();
|
||||||
request.criteria = this.criteria;
|
request.criteria = this.criteria;
|
||||||
|
@ -406,7 +406,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
|
||||||
index2++;
|
index2++;
|
||||||
}
|
}
|
||||||
} else if (order === 'label') {
|
} else if (order === 'label') {
|
||||||
if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label < arr2[index2].label))) {
|
if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label.localeCompare(arr2[index2].label)))) {
|
||||||
merged[current] = arr1[index1];
|
merged[current] = arr1[index1];
|
||||||
index1++;
|
index1++;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue