Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2883 display status instead of collaboration in set work list #2888

Merged
merged 3 commits into from
Apr 13, 2022
Merged

#2883 display status instead of collaboration in set work list #2888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8885020
#2883 display status instead of collaboration in set work list
benwbrum Nov 16, 2021
aa6c3e0
Merge branch 'development' into 2883-status-of-works-in-sets
saracarl Apr 13, 2022
4c0008e
add work stats as a hover in doc set views
saracarl Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions app/views/document_sets/index.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ br
thead
tr
th =t('.work')
th =t('.collaboration')
th =t('.status')
-@collection.document_sets.each do |document_set|
th
=document_set.title
Expand All @@ -57,9 +57,19 @@ br
tr
td
=work.title

-work_stats(work)
td
i
=work.restrict_scribes ? t('.restricted') : t('.unrestricted')
span(title="#{pluralize(work.work_statistic.total_pages, 'page')}: #{@wording}")
.progress
-unless @collection.subjects_disabled
span(style="width:#{@progress_annotated}%")
span(style="width:#{@progress_completed - @progress_annotated}%")
span(style="width:#{@progress_review}%")
-else
span(style="width:#{@progress_completed}%")
span(style="width:#{@progress_review}%")

-ids = work.document_sets.ids
-@collection.document_sets.each do |document_set|
td
Expand Down
16 changes: 13 additions & 3 deletions app/views/document_sets/settings.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
thead
tr
th =t('.work')
th =t('.collaboration')
th =t('.status')
th =t('.add')
tbody
-@works.each do |work|
Expand All @@ -37,8 +37,18 @@
span
ocr
td
i
=work.restrict_scribes ? t('.restricted') : t('.unrestricted')
-work_stats(work)
span(title="#{pluralize(work.work_statistic.total_pages, 'page')}: #{@wording}")
.progress
-unless @collection.subjects_disabled
span(style="width:#{@progress_annotated}%")
span(style="width:#{@progress_completed - @progress_annotated}%")
span(style="width:#{@progress_review}%")

-else
span(style="width:#{@progress_completed}%")
span(style="width:#{@progress_review}%")

td.document_set
=check_box_tag("work[#{work.id}]", "work[#{work.id}]", false, {"title" => t('.add_work_title_to_document_set', work_title: work.title)})
br
Expand Down