Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenAIRE-EUDAT-DMP-service-pilot
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
135
Issues
135
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dmp
OpenAIRE-EUDAT-DMP-service-pilot
Commits
cd1d81c3
Commit
cd1d81c3
authored
Jan 20, 2020
by
George Kalampokis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only Dataset Description Templates listing will show non-finalized templates (ref
#227
)
parent
95d713b2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
1 deletion
+15
-1
dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java
...va/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java
+8
-0
dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java
...ava/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java
+5
-1
dmp-frontend/src/app/core/query/dataset-profile/dataset-profile-criteria.ts
...pp/core/query/dataset-profile/dataset-profile-criteria.ts
+1
-0
dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts
...aset-profile/listing/dataset-profile-listing.component.ts
+1
-0
No files found.
dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java
View file @
cd1d81c3
...
...
@@ -32,6 +32,7 @@ public class DatasetProfileCriteria extends Criteria<DatasetProfile> {
private
List
<
UUID
>
groupIds
;
private
Short
filter
;
private
UUID
userId
;
private
boolean
finalized
;
public
boolean
getAllVersions
()
{
return
allVersions
;
}
public
void
setAllVersions
(
boolean
allVersions
)
{
this
.
allVersions
=
allVersions
;
}
...
...
@@ -52,4 +53,11 @@ public class DatasetProfileCriteria extends Criteria<DatasetProfile> {
public
void
setUserId
(
UUID
userId
)
{
this
.
userId
=
userId
;
}
public
boolean
getFinalized
()
{
return
finalized
;
}
public
void
setFinalized
(
boolean
finalized
)
{
this
.
finalized
=
finalized
;
}
}
dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java
View file @
cd1d81c3
...
...
@@ -52,7 +52,11 @@ public class DatasetProfileDaoImpl extends DatabaseAccess<DatasetProfile> implem
builder
.
notEqual
(
root
.
get
(
"id"
),
criteria
.
getUserId
())));
}
}
query
.
where
(((
builder
,
root
)
->
builder
.
notEqual
(
root
.
get
(
"status"
),
DatasetProfile
.
Status
.
DELETED
.
getValue
())));
if
(
criteria
.
getFinalized
())
{
query
.
where
(((
builder
,
root
)
->
builder
.
equal
(
root
.
get
(
"status"
),
DatasetProfile
.
Status
.
FINALIZED
.
getValue
())));
}
else
{
query
.
where
(((
builder
,
root
)
->
builder
.
notEqual
(
root
.
get
(
"status"
),
DatasetProfile
.
Status
.
DELETED
.
getValue
())));
}
return
query
;
}
...
...
dmp-frontend/src/app/core/query/dataset-profile/dataset-profile-criteria.ts
View file @
cd1d81c3
...
...
@@ -4,4 +4,5 @@ export class DatasetProfileCriteria extends BaseCriteria {
public
id
:
String
;
public
groupIds
:
string
[];
public
allVersions
:
boolean
;
public
finalized
:
boolean
=
true
;
}
dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.ts
View file @
cd1d81c3
...
...
@@ -148,6 +148,7 @@ export class DatasetDataSource extends DataSource<DatasetListingModel> {
if
(
this
.
_sort
.
active
)
{
fields
=
this
.
_sort
.
direction
===
'
asc
'
?
[
'
+
'
+
this
.
_sort
.
active
]
:
[
'
-
'
+
this
.
_sort
.
active
];
}
const
request
=
new
DataTableRequest
<
DatasetProfileCriteria
>
(
startIndex
,
this
.
_paginator
.
pageSize
,
{
fields
:
fields
});
request
.
criteria
=
this
.
_criteria
.
criteria
;
request
.
criteria
.
finalized
=
false
;
if
(
this
.
itemId
)
{
request
.
criteria
.
groupIds
=
[
this
.
itemId
];
request
.
criteria
.
allVersions
=
true
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment