Commit c656128e authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

Merge branch 'dev-right-panel-in-docs' into dev-doc-table-score

parents 02161d28 11dea9a2
......@@ -32,6 +32,7 @@
.table tr td .active {
font-weight: bold;
text-decoration: underline;
}
.table tr td .column-tag {
align-items: center;
......
......@@ -32,6 +32,7 @@
td
.active
font-weight: bold
text-decoration: underline
.column-tag
align-items: center
.doc-chooser
......
{
"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",
......
......@@ -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 ]
......
......@@ -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 <$> ["Show", "Select", "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 <> ")")])
......
......@@ -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'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment