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

Jump to bottom

Fix column sorting in Worksheet listing #1566

Merged
merged 3 commits into from
Apr 4, 2020
Merged

Fix column sorting in Worksheet listing #1566

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
04d3f89
Add metadata column names as indexes
ramonski Apr 3, 2020
96d7d46
Changelog updated
ramonski Apr 3, 2020
7e7c848
Use metadata colum names as keys for the listing
ramonski Apr 3, 2020
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
1 change: 1 addition & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Changelog

**Fixed**

- #1566 Fix column sorting in Worksheet listing
- #1563 Fix Client Contacts can create Samples without Contact
- #1560 Fix missing Add Dynamic Analysis Specifications Button for Lab Managers

Expand Down
25 changes: 14 additions & 11 deletions bika/lims/browser/worksheet/views/folder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,23 +93,22 @@ def __init__(self, context, request):
})

self.columns = collections.OrderedDict((
("Progress", {
("getProgressPercentage", {
"title": _("Progress")}),
("Title", {
"title": _("Worksheet"),
"index": "getId"}),
("Analyst", {
"title": _("Analyst"),
"index": "getAnalyst"}),
("Template", {
("getWorksheetTemplateTitle", {
"title": _("Template"),
"attr": "getWorksheetTemplateTitle",
"replace_url": "getWorksheetTemplateURL"}),
("NumRegularSamples", {
("getNumberOfRegularSamples", {
"title": _("Samples")}),
("NumQCAnalyses", {
("getNumberOfQCAnalyses", {
"title": _("QC Analyses")}),
("NumRegularAnalyses", {
("getNumberOfRegularAnalyses", {
"title": _("Routine Analyses")}),
("CreationDate", {
"title": _("Created"),
Expand Down Expand Up @@ -309,15 +308,19 @@ def folderitem(self, obj, item, index):
item["replace"]["Title"] = get_link(title_link, value=title)

# Total QC Analyses
item["NumQCAnalyses"] = str(obj.getNumberOfQCAnalyses)
item["getNumberOfQCAnalyses"] = str(
obj.getNumberOfQCAnalyses)
# Total Routine Analyses
item["NumRegularAnalyses"] = str(obj.getNumberOfRegularAnalyses)
item["getNumberOfRegularAnalyses"] = str(
obj.getNumberOfRegularAnalyses)
# Total Number of Samples
item["NumRegularSamples"] = str(obj.getNumberOfRegularSamples)
item["getNumberOfRegularSamples"] = str(
obj.getNumberOfRegularSamples)

# Progress
progress_perc = obj.getProgressPercentage
item["replace"]["Progress"] = get_progress_bar_html(progress_perc)
progress = obj.getProgressPercentage
progress_bar_html = get_progress_bar_html(progress)
item["replace"]["getProgressPercentage"] = progress_bar_html

review_state = item["review_state"]
if self.can_reassign and review_state == "open":
Expand Down