Skip to content

Commit e325f3b

Browse files
Browse forms statistics overview.
1 parent 8041f5d commit e325f3b

File tree

5 files changed

+56
-31
lines changed

5 files changed

+56
-31
lines changed

src/components/Paginator.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,13 @@ export class Paginator extends React.Component {
4444

4545
let items = [];
4646
let firstDisplayedPage = this.state.activePage > 5 ? this.state.activePage - 4 : 1;
47-
let lastDisplayedPage = this.state.activePage < this.state.numberOfPages - 5 ? this.state.activePage + 4 : this.state.numberOfPages;
47+
let lastDisplayedPage;
48+
if (this.state.activePage < this.state.numberOfPages - 4) {
49+
lastDisplayedPage = firstDisplayedPage + 9;
50+
} else {
51+
lastDisplayedPage = this.state.numberOfPages;
52+
}
53+
4854
for (let pageNumber = firstDisplayedPage; pageNumber <= lastDisplayedPage; pageNumber++) {
4955
items.push(
5056
<Pagination.Item key={pageNumber} active={pageNumber === this.state.activePage}

src/components/context/ContextLine.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ import ListGroup from "react-bootstrap/ListGroup";
1111
export class ContextLine extends React.Component {
1212
constructor(props) {
1313
super(props);
14-
}
15-
16-
state = {
17-
formInfo: null,
18-
processed: false,
19-
processing: false
14+
this.state = {
15+
formInfo: null,
16+
processing: false,
17+
processed: false
18+
}
2019
}
2120

2221
requestFormInfo(endpoint) {
@@ -45,9 +44,8 @@ export class ContextLine extends React.Component {
4544
}
4645

4746
render() {
48-
4947
let optionalProcessButton;
50-
if (this.props.context.processed || this.state.processed) {
48+
if (this.props.context.processed) {
5149
// the context is processed
5250
optionalProcessButton = <div></div>;
5351
} else {

src/components/context/ContextList.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ export class ContextList extends React.Component {
2323

2424
requestPaginatedContexts(offset, limit) {
2525
this.setState({loading: true})
26-
console.log(offset)
27-
console.log(limit + ".")
2826
API.get("/rest/contexts/paginated", {
2927
params: {
3028
"connectionName": this.props.connectionName,
@@ -51,7 +49,7 @@ export class ContextList extends React.Component {
5149
}
5250

5351
let i = 0;
54-
const contexts = this.state.contexts.filter((context) => {
52+
let contexts = this.state.contexts.filter((context) => {
5553
if (this.props.filterProcessed) {
5654
return !context.processed
5755
} else {
@@ -66,6 +64,12 @@ export class ContextList extends React.Component {
6664
clickHandler={this.props.updateActiveContextUri}/>);
6765
});
6866

67+
if (contexts && contexts.length == 0) {
68+
contexts = <Alert variant={"light"} className={"h-10"}>
69+
The list is empty.
70+
</Alert>
71+
}
72+
6973
let paginator;
7074
if (this.state.contexts) {
7175
paginator = <Paginator totalItems={this.state.totalItems}

src/components/context/ContextOverview.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,17 @@ export class ContextOverview extends React.Component {
7979
<br/>
8080
<Button variant="outline-primary" type="submit"
8181
onClick={() => this.requestProcessBatch()}>
82-
Update all non-processed contexts (can take long time and cannot be stopped)
82+
Process all non-processed contexts (can take long time and cannot be stopped)
8383
</Button>
8484
{' '}
8585
<Button variant="outline-primary" type="submit"
8686
onClick={() => this.requestProcessBatch(10)}>
87-
Update 10 non-processed contexts
87+
Process 10 new
88+
</Button>
89+
{' '}
90+
<Button variant="outline-primary" type="submit"
91+
onClick={() => this.requestProcessBatch(200)}>
92+
Process 200 new
8893
</Button>
8994
<hr/>
9095
<ToggleButton variant="outline-primary" style={{marginBottom: "0"}} type="checkbox"

src/components/form/FormGenOverview.js

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import API from "../../api";
77
import Button from "react-bootstrap/Button";
88

99

10-
export const DEFAULT_CONTEXT = "http://vfn.cz/ontologies/study-manager/formGen1601802887303";
11-
1210
export class FormGenOverview extends React.Component {
1311

1412
constructor(props) {
@@ -40,16 +38,22 @@ export class FormGenOverview extends React.Component {
4038
}
4139

4240
render() {
43-
let formsUploads;
41+
let totalContexts;
42+
let processedContexts;
4443
let recognizedVersions;
4544
let recognizedInstances;
45+
let nonEmptyContexts;
4646
if (this.state.contextsStats) {
47-
formsUploads = this.state.contextsStats.formUploads
47+
totalContexts = this.state.contextsStats.totalContexts
48+
processedContexts = this.state.contextsStats.processedContexts
4849
recognizedVersions = this.state.contextsStats.recognizedVersions;
4950
recognizedInstances = this.state.contextsStats.recognizedInstaces;
51+
nonEmptyContexts = this.state.contextsStats.nonEmptyContexts;
5052
} else {
51-
formsUploads = "?";
53+
totalContexts = "?";
54+
processedContexts = "?";
5255
recognizedVersions = "?";
56+
nonEmptyContexts = "?";
5357
recognizedInstances = "?";
5458
}
5559

@@ -61,27 +65,35 @@ export class FormGenOverview extends React.Component {
6165
Processed Forms: {this.props.match.params.connectionName}
6266
</h4>
6367
<br/>
64-
<span>Total form uploads (including re-uploads): <b>{formsUploads}</b></span>
65-
<br/>
66-
<span>Total form instances: <b>{recognizedInstances}</b></span>
67-
<br/>
68-
<span>Recognized form versions: <b>{recognizedVersions}</b></span>
69-
<br/>
68+
<Row>
69+
<Col xs={6}>
70+
<div>
71+
<span>Total contexts: <b>{totalContexts}</b></span>
72+
<br/>
73+
<span>Processed contexts: <b>{processedContexts}</b></span>
74+
<br/>
75+
<span>Non-empty form contexts: <b>{nonEmptyContexts}</b></span>
76+
<br/>
77+
</div>
78+
</Col>
79+
<Col xs={6}>
80+
<span>Recognized form instances: <b>{recognizedInstances}</b></span>
81+
<br/>
82+
<span>Recognized form versions: <b>{recognizedVersions}</b></span>
83+
<br/>
84+
</Col>
85+
</Row>
86+
7087
<hr/>
7188
<Button variant="outline-primary" type="submit"
7289
onClick={() => this.requestProcessBatch()}>
73-
Show instances
90+
Show forms
7491
</Button>
7592
{' '}
7693
<Button variant="outline-primary" type="submit"
7794
onClick={() => this.requestProcessBatch()}>
7895
Show versions
7996
</Button>
80-
{' '}
81-
<Button variant="outline-primary" type="submit"
82-
onClick={() => this.requestProcessBatch()}>
83-
Show all uploads
84-
</Button>
8597

8698
<br/><br/>
8799
</Container>

0 commit comments

Comments
 (0)