Commit 855d2787 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

Merge branch 'dev' into dev-node-corpus-add-text-cells

parents e8ade662 8ed698b7
...@@ -215,12 +215,12 @@ doc2view :: Document -> DocumentsView ...@@ -215,12 +215,12 @@ doc2view :: Document -> DocumentsView
doc2view ( Document { id doc2view ( Document { id
, created: date , created: date
, hyperdata: HyperdataRowDocument { authors , hyperdata: HyperdataRowDocument { authors
, title , title
, source , source
, publication_year , publication_year
, publication_month , publication_month
, publication_day , publication_day
} }
, category , category
, score , score
} }
...@@ -242,14 +242,14 @@ contact2view :: Contact -> DocumentsView ...@@ -242,14 +242,14 @@ contact2view :: Contact -> DocumentsView
contact2view (Contact { c_id contact2view (Contact { c_id
, c_created: date , c_created: date
, c_hyperdata: HyperdataRowContact { firstname , c_hyperdata: HyperdataRowContact { firstname
, lastname , lastname
, labs , labs
} }
, c_score , c_score
} }
) = DocumentsView { id: c_id ) = DocumentsView { id: c_id
, date , date: ""
, title : firstname <> lastname , title : firstname <> " " <> lastname
, source: labs , source: labs
, score: c_score , score: c_score
, authors: labs , authors: labs
...@@ -263,11 +263,11 @@ contact2view (Contact { c_id ...@@ -263,11 +263,11 @@ contact2view (Contact { c_id
err2view message = err2view message =
DocumentsView { id: 1 DocumentsView { id: 1
, date: "2020-01-01" , date: ""
, title : "SearchNoResult" , title : "SearchNoResult"
, source: "Source" , source: ""
, score: 1 , score: 1
, authors: "Authors" , authors: ""
, category: decodeCategory 1 , category: decodeCategory 1
, pairs: [] , pairs: []
, delete: false , delete: false
...@@ -315,7 +315,8 @@ pageCpt = R.hooksComponentWithModule thisModule "page" cpt ...@@ -315,7 +315,8 @@ pageCpt = R.hooksComponentWithModule thisModule "page" cpt
where where
setParams f = setPath $ \p@{params: ps} -> p {params = f ps} setParams f = setPath $ \p@{params: ps} -> p {params = f ps}
params = (fst path).params /\ setParams params = (fst path).params /\ setParams
colNames = T.ColumnName <$> [ "", "Date", "Title", "Source", "Authors", "Delete" ] -- colNames = T.ColumnName <$> [ "", "Date", "Title", "Source", "Authors", "Delete" ]
colNames = T.ColumnName <$> [ "", "Search", "Result", "", "", "" ]
wrapColElts = const identity wrapColElts = const identity
-- TODO: how to interprete other scores? -- TODO: how to interprete other scores?
gi Favorite = "fa fa-star-empty" gi Favorite = "fa fa-star-empty"
...@@ -335,15 +336,16 @@ pageCpt = R.hooksComponentWithModule thisModule "page" cpt ...@@ -335,15 +336,16 @@ pageCpt = R.hooksComponentWithModule thisModule "page" cpt
T.makeRow [ T.makeRow [
H.div {} [ H.a { className: gi category, on: {click: markClick} } [] ] H.div {} [ H.a { className: gi category, on: {click: markClick} } [] ]
-- TODO show date: Year-Month-Day only -- TODO show date: Year-Month-Day only
, maybeStricken delete [ H.text $ publicationDate dv ] -- , maybeStricken delete [ H.text $ publicationDate dv ]
, maybeStricken delete [ H.a {target: "_blank", href: documentUrl id} [ H.text title ] ] , maybeStricken delete [ H.a {target: "_blank", href: documentUrl id} [ H.text title ] ]
, maybeStricken delete [ H.text source ] , maybeStricken delete [ H.text source ]
, maybeStricken delete [ H.text authors ] -- , maybeStricken delete [ H.text authors ]
-- , maybeStricken $ intercalate [comma] (pairUrl <$> pairs) -- , maybeStricken $ intercalate [comma] (pairUrl <$> pairs)
, H.input { defaultChecked: isChecked id {-, H.input { defaultChecked: isChecked id
, on: { click: toggleClick } , on: { click: toggleClick }
, type: "checkbox" , type: "checkbox"
} }
-}
] ]
, delete: true } , delete: true }
where where
......
...@@ -70,7 +70,7 @@ sidebar props = R.createElement sidebarCpt props [] ...@@ -70,7 +70,7 @@ sidebar props = R.createElement sidebarCpt props []
sideTabNav :: R.State SidePanelState -> Array SideTab -> R.Element sideTabNav :: R.State SidePanelState -> Array SideTab -> R.Element
sideTabNav (sidePanel /\ setSidePanel) sideTabs = sideTabNav (sidePanel /\ setSidePanel) sideTabs =
R.fragment [ H.div { className: "text-primary center"} [H.text "SideTab"] R.fragment [ H.div { className: "text-primary center"} [H.text ""]
, H.div {className: "nav nav-tabs"} (liItem <$> sideTabs) , H.div {className: "nav nav-tabs"} (liItem <$> sideTabs)
-- , H.div {className: "center"} [ H.text "Doc sideTabs"] -- , H.div {className: "center"} [ H.text "Doc sideTabs"]
] ]
......
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