Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
portal-backend
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
HBP Medical Informatics Platform
portal-backend
Commits
8b6cf7f3
Commit
8b6cf7f3
authored
9 years ago
by
Mirco Nasuti
Browse files
Options
Downloads
Patches
Plain Diff
Bugfix : Add mock data for model -> dataset -> data/header
parent
22e4dcd1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/org/hbp/mip/controllers/ModelsApi.java
+18
-2
18 additions, 2 deletions
src/main/java/org/hbp/mip/controllers/ModelsApi.java
src/main/java/org/hbp/mip/model/Dataset.java
+11
-3
11 additions, 3 deletions
src/main/java/org/hbp/mip/model/Dataset.java
with
29 additions
and
5 deletions
src/main/java/org/hbp/mip/controllers/ModelsApi.java
+
18
−
2
View file @
8b6cf7f3
...
...
@@ -17,8 +17,7 @@ import org.springframework.stereotype.Controller;
import
org.springframework.web.bind.annotation.*
;
import
java.security.Principal
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.*
;
import
static
org
.
springframework
.
http
.
MediaType
.
APPLICATION_JSON_VALUE
;
...
...
@@ -141,6 +140,23 @@ public class ModelsApi {
Model
model
=
(
Model
)
query
.
uniqueResult
();
session
.
getTransaction
().
commit
();
// Inject mock data
List
<
Object
>
values
=
new
LinkedList
<>();
values
.
add
(
18422
);
values
.
add
(
16972
);
values
.
add
(
17330
);
values
.
add
(
16398
);
values
.
add
(
21614
);
values
.
add
(
21386
);
values
.
add
(
20474
);
values
.
add
(
19867
);
values
.
add
(
20398
);
values
.
add
(
19741
);
values
.
add
(
18595
);
values
.
add
(
18018
);
model
.
getDataset
().
getData
().
put
(
"MidTemp"
,
values
);
model
.
getDataset
().
getHeader
().
add
(
"MidTemp"
);
return
new
ResponseEntity
<
Model
>(
HttpStatus
.
OK
).
ok
(
model
);
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/org/hbp/mip/model/Dataset.java
+
11
−
3
View file @
8b6cf7f3
...
...
@@ -10,9 +10,7 @@ import io.swagger.annotations.ApiModel;
import
io.swagger.annotations.ApiModelProperty
;
import
javax.persistence.*
;
import
java.util.Date
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.*
;
@Entity
@Table
(
name
=
"`dataset`"
)
...
...
@@ -24,6 +22,8 @@ public class Dataset {
private
Date
date
=
null
;
@ElementCollection
(
fetch
=
FetchType
.
EAGER
)
private
List
<
String
>
header
=
new
LinkedList
<
String
>();
@Transient
private
Map
<
String
,
List
<
Object
>>
data
=
new
HashMap
<>();
public
Dataset
()
{
}
...
...
@@ -67,6 +67,13 @@ public class Dataset {
this
.
header
=
header
;
}
public
Map
<
String
,
List
<
Object
>>
getData
()
{
return
data
;
}
public
void
setData
(
Map
<
String
,
List
<
Object
>>
data
)
{
this
.
data
=
data
;
}
@Override
public
String
toString
()
{
...
...
@@ -76,6 +83,7 @@ public class Dataset {
sb
.
append
(
" code: "
).
append
(
code
).
append
(
"\n"
);
sb
.
append
(
" date: "
).
append
(
date
).
append
(
"\n"
);
sb
.
append
(
" header: "
).
append
(
header
).
append
(
"\n"
);
sb
.
append
(
" data: "
).
append
(
data
).
append
(
"\n"
);
sb
.
append
(
"}\n"
);
return
sb
.
toString
();
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment