Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
purescript-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Grégoire Locqueville
purescript-gargantext
Commits
c656128e
Commit
c656128e
authored
Dec 01, 2020
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-right-panel-in-docs' into dev-doc-table-score
parents
02161d28
11dea9a2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
10 deletions
+12
-10
Styles.css
dist/styles/Styles.css
+1
-0
Styles.sass
dist/styles/Styles.sass
+1
-0
package.json
package.json
+1
-1
DocsTable.purs
src/Gargantext/Components/DocsTable.purs
+4
-5
NgramsTable.purs
src/Gargantext/Components/NgramsTable.purs
+1
-1
Components.purs
src/Gargantext/Components/NgramsTable/Components.purs
+4
-3
No files found.
dist/styles/Styles.css
View file @
c656128e
...
...
@@ -32,6 +32,7 @@
.table
tr
td
.active
{
font-weight
:
bold
;
text-decoration
:
underline
;
}
.table
tr
td
.column-tag
{
align-items
:
center
;
...
...
dist/styles/Styles.sass
View file @
c656128e
...
...
@@ -32,6 +32,7 @@
td
.active
font-weight
:
bold
text-decoration
:
underline
.column-tag
align-items
:
center
.doc-chooser
...
...
package.json
View file @
c656128e
{
"name"
:
"Gargantext"
,
"version"
:
"0.0.
1.94.1
"
,
"version"
:
"0.0.
2.0
"
,
"scripts"
:
{
"rebase-set"
:
"spago package-set-upgrade && spago psc-package-insdhall"
,
"rebuild-set"
:
"spago psc-package-insdhall"
,
...
...
src/Gargantext/Components/DocsTable.purs
View file @
c656128e
...
...
@@ -378,7 +378,7 @@ pagePaintRawCpt = R.hooksComponentWithModule thisModule "pagePaintRawCpt" cpt wh
corpusDocument
| Just cid <- mCorpusId = Routes.CorpusDocument sid cid listId
| otherwise = Routes.Document sid listId
colNames = T.ColumnName <$> [ "
Tag", "Date", "Title", "Source", "Score"
]
colNames = T.ColumnName <$> [ "
Show", "Tag", "Date", "Title", "Source", "Score"
]
wrapColElts = const identity
getCategory (lc /\ _) {_id, category} = fromMaybe category (lc ^. at _id)
rows reload lc@(_ /\ setLocalCategories) = row <$> A.toUnfoldable documents
...
...
@@ -386,10 +386,9 @@ pagePaintRawCpt = R.hooksComponentWithModule thisModule "pagePaintRawCpt" cpt wh
row dv@(DocumentsView r) =
{ row:
T.makeRow [ -- H.div {} [ H.a { className, style, on: {click: click Favorite} } [] ]
H.div { className: "column-tag flex" } [
caroussel { category: cat, nodeId, row: dv, session, setLocalCategories } []
, docChooser { listId, mCorpusId, nodeId: r._id, selected, sidePanelTriggers, tableReload: reload } []
]
H.div { className: "column-tag flex" } [ docChooser { listId, mCorpusId, nodeId: r._id, selected, sidePanelTriggers, tableReload: reload } []
]
, H.div { className: "column-tag flex" } [ caroussel { category: cat, nodeId, row: dv, session, setLocalCategories } [] ]
--, H.input { type: "checkbox", defaultValue: checked, on: {click: click Trash} }
-- TODO show date: Year-Month-Day only
, H.div { className: tClassName } [ R2.showText r.date ]
...
...
src/Gargantext/Components/NgramsTable.purs
View file @
c656128e
...
...
@@ -463,7 +463,7 @@ loadedNgramsTableCpt = R.hooksComponentWithModule thisModule "loadedNgramsTable"
Just TermDesc -> sortWith \x -> Down $ x ^. _NgramsElement <<< _ngrams
_ -> identity -- the server ordering is enough here
colNames = T.ColumnName <$> ["Select", "Map", "Stop", "Terms", "Score"] -- see convOrderBy
colNames = T.ColumnName <$> ["S
how", "S
elect", "Map", "Stop", "Terms", "Score"] -- see convOrderBy
-- This is used to *decorate* the Select header with the checkbox.
wrapColElts scProps (T.ColumnName "Select") = const [NTC.selectionCheckbox scProps]
wrapColElts _ (T.ColumnName "Score") = (_ <> [H.text ("(" <> show scoreType <> ")")])
...
...
src/Gargantext/Components/NgramsTable/Components.purs
View file @
c656128e
...
...
@@ -200,10 +200,10 @@ renderNgramsItemCpt = R.hooksComponentWithModule thisModule "renderNgramsItem" c
} _ = do
pure $ Tbl.makeRow [
H.div { className: "ngrams-selector" } [
H.span { className: "ngrams-chooser fa fa-eye"
H.span { className: "ngrams-chooser fa fa-eye
-slash
"
, on: { click: onClick } } []
, selected
]
, selected
, checkbox T.MapTerm
, checkbox T.StopTerm
, H.div {} [
...
...
@@ -236,7 +236,8 @@ renderNgramsItemCpt = R.hooksComponentWithModule thisModule "renderNgramsItem" c
H.input { checked: Set.member ngrams ngramsSelection
, className: "checkbox"
, on: { change: const $ dispatch $ ToggleSelect ngrams }
, type: "checkbox" }
, type: "checkbox"
}
checkbox termList' =
let chkd = termList == termList'
termList'' = if chkd then T.CandidateTerm else termList'
...
...
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