Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
gy4443
chemotion_eln_server
Commits
2ff9a282
Commit
2ff9a282
authored
Oct 14, 2015
by
Marco Sehrer
Browse files
Use api per-page respond parameters for pagination
parent
bd29be25
Changes
7
Hide whitespace changes
Inline
Side-by-side
app/api/chemotion/reaction_api.rb
View file @
2ff9a282
...
...
@@ -26,7 +26,7 @@ module Chemotion
params
do
optional
:collection_id
,
type:
Integer
,
desc:
"Collection id"
end
paginate
per_page:
5
,
max_per_page:
25
,
offset:
0
paginate
per_page:
7
,
max_per_page:
25
,
offset:
0
get
do
scope
=
if
params
[
:collection_id
]
...
...
app/api/chemotion/sample_api.rb
View file @
2ff9a282
...
...
@@ -46,7 +46,7 @@ module Chemotion
params
do
optional
:collection_id
,
type:
Integer
,
desc:
"Collection id"
end
paginate
per_page:
5
,
max_per_page:
25
,
offset:
0
paginate
per_page:
7
,
max_per_page:
25
,
offset:
0
get
do
scope
=
if
params
[
:collection_id
]
...
...
app/assets/javascripts/components/ElementsTable.js
View file @
2ff9a282
...
...
@@ -37,14 +37,19 @@ export default class ElementsTable extends React.Component {
}
onChangeUI
(
state
)
{
let
type
=
this
.
props
.
type
;
let
page
=
state
.
pagination
&&
state
.
pagination
[
type
]
&&
state
.
pagination
[
type
].
page
;
if
(
page
)
{
this
.
setState
({
activePage
:
parseInt
(
page
)
});
const
type
=
this
.
props
.
type
;
const
pagination
=
state
.
pagination
&&
state
.
pagination
[
type
];
if
(
pagination
)
{
const
{
page
,
perPage
}
=
pagination
;
if
(
page
)
{
this
.
setState
({
activePage
:
parseInt
(
page
),
pageSize
:
parseInt
(
perPage
)
});
}
}
//console.log('ElementsType: ' + type + '#activePage ' + page);
let
{
checkedIds
,
uncheckedIds
,
checkedAll
}
=
state
[
this
.
props
.
type
];
...
...
app/assets/javascripts/components/fetchers/ReactionsFetcher.js
View file @
2ff9a282
...
...
@@ -30,7 +30,8 @@ export default class ReactionsFetcher {
elements
:
json
.
reactions
.
map
((
r
)
=>
new
Reaction
(
r
)),
totalElements
:
response
.
headers
.
get
(
'
X-Total
'
),
page
:
response
.
headers
.
get
(
'
X-Page
'
),
pages
:
response
.
headers
.
get
(
'
X-Total-Pages
'
)
pages
:
response
.
headers
.
get
(
'
X-Total-Pages
'
),
perPage
:
response
.
headers
.
get
(
'
X-Per-Page
'
)
}
})
}).
catch
((
errorMessage
)
=>
{
...
...
app/assets/javascripts/components/fetchers/SamplesFetcher.js
View file @
2ff9a282
...
...
@@ -30,7 +30,8 @@ export default class SamplesFetcher {
elements
:
json
.
samples
.
map
((
s
)
=>
new
Sample
(
s
)),
totalElements
:
response
.
headers
.
get
(
'
X-Total
'
),
page
:
response
.
headers
.
get
(
'
X-Page
'
),
pages
:
response
.
headers
.
get
(
'
X-Total-Pages
'
)
pages
:
response
.
headers
.
get
(
'
X-Total-Pages
'
),
perPage
:
response
.
headers
.
get
(
'
X-Per-Page
'
)
}
})
}).
catch
((
errorMessage
)
=>
{
...
...
app/assets/javascripts/components/fetchers/ScreensFetcher.js
View file @
2ff9a282
...
...
@@ -28,7 +28,8 @@ export default class ScreensFetcher {
elements
:
json
.
screens
.
map
(
s
=>
new
Screen
(
s
)),
totalElements
:
response
.
headers
.
get
(
'
X-Total
'
),
page
:
response
.
headers
.
get
(
'
X-Page
'
),
pages
:
response
.
headers
.
get
(
'
X-Total-Pages
'
)
pages
:
response
.
headers
.
get
(
'
X-Total-Pages
'
),
perPage
:
response
.
headers
.
get
(
'
X-Per-Page
'
)
}
})
}).
catch
((
errorMessage
)
=>
{
...
...
app/assets/javascripts/components/fetchers/WellplatesFetcher.js
View file @
2ff9a282
...
...
@@ -28,7 +28,8 @@ export default class WellplatesFetcher {
elements
:
json
.
wellplates
.
map
((
w
)
=>
new
Wellplate
(
w
)),
totalElements
:
response
.
headers
.
get
(
'
X-Total
'
),
page
:
response
.
headers
.
get
(
'
X-Page
'
),
pages
:
response
.
headers
.
get
(
'
X-Total-Pages
'
)
pages
:
response
.
headers
.
get
(
'
X-Total-Pages
'
),
perPage
:
response
.
headers
.
get
(
'
X-Per-Page
'
)
}
})
}).
catch
((
errorMessage
)
=>
{
...
...
Write
Preview
Supports
Markdown
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