| author | ymh <ymh.work@gmail.com> |
| Tue, 04 Dec 2018 18:17:56 +0100 | |
| changeset 191 | 3f71ad81a5a9 |
| parent 174 | ac1a026edd58 |
| permissions | -rw-r--r-- |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
1 |
import React, { Component } from 'react'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
2 |
import { connect } from 'react-redux'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
3 |
import { bindActionCreators } from 'redux'; |
|
171
03334a31130a
Add translation with react-i18next
ymh <ymh.work@gmail.com>
parents:
168
diff
changeset
|
4 |
import { Trans } from 'react-i18next'; |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
5 |
import Navbar from './Navbar'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
6 |
import NoteInput from './NoteInput'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
7 |
import NotesList from './NotesList'; |
|
46
4aa24724e5b3
Move session form to dedicated component.
Alexandre Segura <mex.zktk@gmail.com>
parents:
35
diff
changeset
|
8 |
import SessionForm from './SessionForm'; |
|
63
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
9 |
import SessionSummary from './SessionSummary'; |
|
162
1fd73fdaf4c6
Add ReadOnlySession component and message when session list is empty
salimr <riwad.salim@yahoo.fr>
parents:
161
diff
changeset
|
10 |
import ProtocolSummary from './ProtocolSummary'; |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
11 |
import * as sessionsActions from '../actions/sessionsActions'; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
12 |
import * as notesActions from '../actions/notesActions'; |
|
137
279e1dffa213
session is now created with current group and protocol
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
13 |
import { getSession, getSessionNotes } from '../selectors/coreSelectors'; |
|
138
a1fb2ced3049
propagate annotations categories from session protocol definition
ymh <ymh.work@gmail.com>
parents:
137
diff
changeset
|
14 |
import { extractAnnotationCategories, defaultAnnotationsCategories } from '../constants'; |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
15 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
16 |
class Session extends Component { |
|
162
1fd73fdaf4c6
Add ReadOnlySession component and message when session list is empty
salimr <riwad.salim@yahoo.fr>
parents:
161
diff
changeset
|
17 |
|
|
165
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
18 |
state = { |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
19 |
screenSummary: 0, |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
20 |
} |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
21 |
|
|
162
1fd73fdaf4c6
Add ReadOnlySession component and message when session list is empty
salimr <riwad.salim@yahoo.fr>
parents:
161
diff
changeset
|
22 |
onClickReadOnly = (e) => { |
|
1fd73fdaf4c6
Add ReadOnlySession component and message when session list is empty
salimr <riwad.salim@yahoo.fr>
parents:
161
diff
changeset
|
23 |
e.preventDefault(); |
|
1fd73fdaf4c6
Add ReadOnlySession component and message when session list is empty
salimr <riwad.salim@yahoo.fr>
parents:
161
diff
changeset
|
24 |
this.props.history.push('/read-only/' + this.props.match.params.id); |
|
1fd73fdaf4c6
Add ReadOnlySession component and message when session list is empty
salimr <riwad.salim@yahoo.fr>
parents:
161
diff
changeset
|
25 |
} |
|
1fd73fdaf4c6
Add ReadOnlySession component and message when session list is empty
salimr <riwad.salim@yahoo.fr>
parents:
161
diff
changeset
|
26 |
|
|
165
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
27 |
toggleScreenSummary = (e) => { |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
28 |
if (this.state.screenSummary === 0) { |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
29 |
e.preventDefault() |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
30 |
this.setState({screenSummary: 1}) |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
31 |
} |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
32 |
|
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
33 |
if (this.state.screenSummary === 1) { |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
34 |
e.preventDefault() |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
35 |
this.setState({screenSummary: 0}) |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
36 |
} |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
37 |
} |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
38 |
|
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
39 |
screenSummary = () => { |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
40 |
|
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
41 |
if (this.state.screenSummary === 0) { |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
42 |
return ( |
| 174 | 43 |
<React.Fragment> |
44 |
<div onClick={this.toggleScreenSummary} className ="text-primary btn"><Trans i18nKey="session.protocol_display">Afficher le protocole d'annotation</Trans></div> |
|
45 |
<SessionSummary notes={this.props.notes} /> |
|
46 |
</React.Fragment> |
|
|
165
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
47 |
); |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
48 |
} |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
49 |
|
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
50 |
if (this.state.screenSummary === 1) { |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
51 |
return ( |
| 174 | 52 |
<React.Fragment> |
53 |
<div onClick={this.toggleScreenSummary} className ="text-primary btn"><Trans i18nKey="session.summary_display">Afficher le résumé de la session</Trans></div> |
|
54 |
<ProtocolSummary annotationCategories={this.props.annotationCategories} /> |
|
55 |
</React.Fragment> |
|
|
165
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
56 |
); |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
57 |
} |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
58 |
} |
|
62e5be0df812
Add ProtocolSummary component
salimr <riwad.salim@yahoo.fr>
parents:
162
diff
changeset
|
59 |
|
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
60 |
render() { |
|
162
1fd73fdaf4c6
Add ReadOnlySession component and message when session list is empty
salimr <riwad.salim@yahoo.fr>
parents:
161
diff
changeset
|
61 |
|
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
62 |
return ( |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
63 |
<div> |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
64 |
<Navbar history={this.props.history} /> |
|
35
97106bacb24e
Improve session page design.
Alexandre Segura <mex.zktk@gmail.com>
parents:
34
diff
changeset
|
65 |
<div className="session-container"> |
|
63
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
66 |
<div className="session-notes"> |
| 174 | 67 |
<div className="notes-affix"> |
68 |
<div> |
|
69 |
<a onClick={this.onClickReadOnly} href="/read-only"><span className="material-icons text-primary">remove_red_eye</span></a> |
|
70 |
</div> |
|
71 |
<div className="notes-affix-summary"> |
|
72 |
{this.screenSummary()} |
|
73 |
</div> |
|
74 |
</div> |
|
|
63
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
75 |
<div className="notes-list"> |
|
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
76 |
<SessionForm session={this.props.currentSession} /> |
|
125
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
77 |
<NotesList |
|
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
78 |
notes={this.props.notes} |
|
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
79 |
deleteNote={this.props.notesActions.deleteNote} |
|
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
80 |
updateNote={this.props.notesActions.updateNote} |
|
138
a1fb2ced3049
propagate annotations categories from session protocol definition
ymh <ymh.work@gmail.com>
parents:
137
diff
changeset
|
81 |
annotationCategories={this.props.annotationCategories} |
|
125
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
82 |
/> |
|
63
4088f8dc6b52
Improve session page layout, introduce summary.
Alexandre Segura <mex.zktk@gmail.com>
parents:
62
diff
changeset
|
83 |
</div> |
|
161
a642639dbc07
Split scss files and adapt session page design
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
84 |
</div> |
|
a642639dbc07
Split scss files and adapt session page design
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
85 |
<section className="editor-fixed pl-5"> |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
138
diff
changeset
|
86 |
<div className="container-fluid"> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
138
diff
changeset
|
87 |
<div className="row"> |
|
161
a642639dbc07
Split scss files and adapt session page design
salimr <riwad.salim@yahoo.fr>
parents:
151
diff
changeset
|
88 |
<div className="col-lg-10 offset-md-2"> |
|
125
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
89 |
<NoteInput |
|
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
90 |
session={this.props.currentSession} |
|
c653f49fabfb
remove unecessary dependencies to Redux
ymh <ymh.work@gmail.com>
parents:
76
diff
changeset
|
91 |
addNote={this.props.notesActions.addNote} |
|
138
a1fb2ced3049
propagate annotations categories from session protocol definition
ymh <ymh.work@gmail.com>
parents:
137
diff
changeset
|
92 |
annotationCategories={this.props.annotationCategories}/> |
|
143
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
138
diff
changeset
|
93 |
</div> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
138
diff
changeset
|
94 |
</div> |
|
cfcbf4bc66f1
Remove react-bootstrap from components except Modal, Collapse and Dropdown
salimr <riwad.salim@yahoo.fr>
parents:
138
diff
changeset
|
95 |
</div> |
|
35
97106bacb24e
Improve session page design.
Alexandre Segura <mex.zktk@gmail.com>
parents:
34
diff
changeset
|
96 |
</section> |
|
97106bacb24e
Improve session page design.
Alexandre Segura <mex.zktk@gmail.com>
parents:
34
diff
changeset
|
97 |
</div> |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
98 |
</div> |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
99 |
); |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
100 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
101 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
102 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
103 |
function mapStateToProps(state, props) { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
104 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
105 |
const sessionId = props.match.params.id; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
106 |
|
|
137
279e1dffa213
session is now created with current group and protocol
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
107 |
const currentSession = getSession(sessionId, state); |
|
279e1dffa213
session is now created with current group and protocol
ymh <ymh.work@gmail.com>
parents:
129
diff
changeset
|
108 |
const currentNotes = getSessionNotes(sessionId, state); |
|
168
ea92f4fe783d
- move SlateEditor and dependencies to its own folder
ymh <ymh.work@gmail.com>
parents:
165
diff
changeset
|
109 |
const annotationCategories = currentSession?extractAnnotationCategories(currentSession.protocol):defaultAnnotationsCategories; |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
110 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
111 |
return { |
|
30
4d93f4ed95bc
Update session in PouchDB.
Alexandre Segura <mex.zktk@gmail.com>
parents:
29
diff
changeset
|
112 |
currentSession, |
|
62
b2514a9bcd49
migrate to redux-offline + various optimisation
ymh <ymh.work@gmail.com>
parents:
59
diff
changeset
|
113 |
notes: currentNotes, |
|
138
a1fb2ced3049
propagate annotations categories from session protocol definition
ymh <ymh.work@gmail.com>
parents:
137
diff
changeset
|
114 |
annotationCategories |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
115 |
}; |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
116 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
117 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
118 |
function mapDispatchToProps(dispatch) { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
119 |
return { |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
120 |
sessionsActions: bindActionCreators(sessionsActions, dispatch), |
| 173 | 121 |
notesActions: bindActionCreators(notesActions, dispatch) |
|
12
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
122 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
123 |
} |
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
124 |
|
|
48ddaa42b810
Draft implementation of sessions.
Alexandre Segura <mex.zktk@gmail.com>
parents:
diff
changeset
|
125 |
export default connect(mapStateToProps, mapDispatchToProps)(Session); |