Skip to content

Commit 2135132

Browse files
committed
Merge branch 'master' of https://github.com/senaite/senaite.core into analyses-view-refactor
2 parents b7479eb + 5b365e4 commit 2135132

File tree

214 files changed

+135458
-125392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+135458
-125392
lines changed

CHANGES.rst

+104-50
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,91 @@
11
Changelog
22
=========
33

4-
1.2.2 (unreleased)
4+
5+
1.2.3 (unreleased)
56
------------------
67

78
**Added**
89

10+
- #666 Added Unpublished filter in Analysis Requests list
911

10-
**Removed**
12+
**Changed**
1113

14+
- #660 Better style for reference widgets
15+
- #627 Unassigned filter on Analysis Requests view does not work
16+
- #659 Display the Unit in Profile Analyses Listing
17+
- #636 Do not display "Advanced..." item in object's workflow actions menu
18+
- #652 Added Sample Type, Partition ID and Date Sampled in Code_128_1x48mm sticker
19+
- #655 Updated German Translations
20+
- #647 Refactored bika.lims.bikalisting.js + several functional fixtures
21+
- #637 Deassociate Analysis Request portal type from `worksheetanalysis_workflow`
1222

13-
**Changed**
23+
**Removed**
1424

1525
- #621 AnalysesView code refactoring
1626

1727
**Fixed**
1828

19-
- #620 Client batch list is not filtered by state
29+
- #653 Points in QC Charts are not displayed in accordance with capture date
30+
- #662 Viewing Cancelled AR's fails
31+
- #550 Wrong Listings of Analyses called from Dashboard
32+
- #666 "Rejected" filter is displayed in AR lists regardless of Setup setting
33+
- #666 "To be preserved" filter is displayed in AR lists regardless of Setup setting
34+
- #666 "Scheduled sampling" is displayed in AR lists regardless of Setup setting
35+
- #666 "To be sampled" filter is displayed in AR lists regardless of Setup setting
36+
- #664 Improved async transition loading and workflow button rendering in listing tables
37+
- #658 Worksheet listing view shows old- invalid Analysts
38+
- #663 AR Report Listing shows all Reports
39+
- #654 Default's Multi Analysis Request report gives a Traceback
40+
- #649 Specification fields decimal-mark validator not working for new opened categories
41+
- #637 Analysis Requests are never transitioned to assigned/unassigned
42+
- #641 Broken Analyses list on ReferenceSample in Supplier
43+
- #640 Broken Reference Sample Results view
2044

2145
**Security**
2246

2347

48+
1.2.2 (2018-02-09)
49+
------------------
50+
51+
**Added**
52+
53+
- #594 Add button in Sample View for the createion of Analysis Requests
54+
- #607 Ability to choose sticker template based on sample type
55+
- #480 Sample panel in dashboard
56+
- #617 Instrument import interface: 2-Dimensional-CSV
57+
- #617 Instrument import interface: Agilent Masshunter
58+
- #617 Instrument import interface: Shimadzu GCMS-QP2010 SE
59+
- #617 Instrument import interface: Shimadzu GCMS-TQ8030 GC/MS/MS
60+
- #617 Instrument import interface: Shimadzu ICPE-9000 Multitype
61+
- #617 Instrument import interface: Shimadzu HPLC-PDA Nexera-I
62+
- #617 Instrument import interface: Shimadzu LC MS/MS Nexera X2
63+
- #537 Instrument import interface: Sysmex XT-4000i
64+
- #536 Instrument import interface: Sysmex XT-1800i
65+
- #607 Barcode and labelling depending on Sample Type
66+
- #618 When previewing stickers the number of copies to print for each sticker can be modified.
67+
- #618 The default number of sticker copies can be set and edited in the setup Sticker's tab.
68+
69+
**Changed**
70+
71+
- #619 Changed listing tables search logic to operate on catalog metadata
72+
- #621 Change Errors to Warnings when importing instrument results
73+
74+
**Fixed**
75+
76+
- #639 Analysis Requests from inside Batch are not filtered correctly
77+
- #591 Fixed workflow publish recursion error that reached max depth
78+
- #634 Fix undefined Symbols in Sample Transition Guards
79+
- #616 Fix character encodings in analysisservice duplication
80+
- #624 TypeError: "Can't pickle objects in acquisition wrappers" (WorksheetTemplate)
81+
- #530 Calculated results do not get updated when importing instrument results
82+
- #614 Fix accreditation category titles
83+
- #611 Advanced filter bar: filter Analysis Requests by Service name not working
84+
- #622 (Re-)Installation always adds another identifier type
85+
- #620 Client batch list is not filtered by state
86+
- #628 Hide Department on lab contact inherited from Person
87+
- #631 Traceback on stickers display
88+
2489

2590
1.2.1 (2018-01-26)
2691
------------------
@@ -979,13 +1044,12 @@ Changelog
9791044
- LIMS-1328: Instrument calibration test graphs do not work on multiple samples
9801045
- LIMS-1347: Analysis/AR background colour to be different to for Receive and To be Sampled
9811046
- LIMS-1353: Analyses don't sort in Attachment look-up
982-
983-
- #eview for Results reports
984-
- Single/Multi-AR preview
985-
- Allows to cancel the pre-publish/publish process
986-
- Allows to make visible/invisible the QC analyses
987-
- Allows to add new custom-made templates
988-
- JS machinery allowed for pdf reporting
1047+
- Preview for Results reports
1048+
- Single/Multi-AR preview
1049+
- Allows to cancel the pre-publish/publish process
1050+
- Results reports. Allows to make visible/invisible the QC analyses
1051+
- Results reports. Allows to add new custom-made templates
1052+
- Results reports. JS machinery allowed for pdf reporting
9891053

9901054

9911055
3.1.4 (2014-07-23)
@@ -1040,16 +1104,11 @@ Changelog
10401104
- LIMS-1245: off-by-one in part indicators in ar_add
10411105
- LIMS-1240: Hide "copy to new" from Analyst users
10421106
- LIMS-1059: Added worksheet rejection workflow
1043-
1044-
RejectAnalysis (Analysis subclass (has IAnalysis!)) workflow transition.
1045-
1046-
Does not retract individual Analysis objects - instead, forces their state
1047-
back to "Received", and assigns them onto newly created WS.
1048-
1049-
Sets attributes on src and dst worksheets:
1050-
WS instance rejected worksheet attribute: .replaced_by = UID
1051-
WS instance replacement worksheet attribute: .replaces_rejected_worksheet:UID
1052-
1107+
- RejectAnalysis (Analysis subclass (has IAnalysis!)) workflow transition.
1108+
- Does not retract individual Analysis objects
1109+
- Sets attributes on src and dst worksheets:
1110+
- WS instance rejected worksheet attribute: .replaced_by = UID
1111+
- WS instance replacement worksheet attribute: .replaces_rejected_worksheet:UID
10531112
- Fixed some i18n and encoding snags, and updated translations.
10541113

10551114

@@ -1084,19 +1143,17 @@ Changelog
10841143
- Enhancements to AR Batching
10851144
- Enhancements to Results Reports
10861145
- Instrument management module
1087-
- Calibration certificates, maintenance, Instrument QC
1088-
- Method, Instrument and Analysis integrity
1089-
- Instrument interfaces
1090-
- Agilent MS 'Masshunter Quant'
1091-
- Thermo Gallery
1092-
- Foss Winescan FT 120, Auto
1093-
- Invoices
1094-
- Per AR, Analysis per Invoice line.
1095-
- Per Supply Order, inventory item per Invoice line
1096-
- Invoices by email
1097-
- Invoice 'batches' for selected time period, ARs aand Orders per Invoice line
1098-
- Invoice batch export to accounts systems
1099-
- #ice lists. Analysis Services and Supplies
1146+
- Calibration certificates, maintenance, Instrument QC
1147+
- Method, Instrument and Analysis integrity
1148+
- Instrument import interface: Agilent MS 'Masshunter Quant'
1149+
- Instrument import interface: Thermo Gallery
1150+
- Instrument import interface: Foss Winescan FT 120, Auto
1151+
- Invoices per AR, Analysis per Invoice line.
1152+
- Invoices per Supply Order, inventory item per Invoice line
1153+
- Invoices by email
1154+
- Invoice 'batches' for selected time period, ARs aand Orders per Invoice line
1155+
- Invoice batch export to accounts systems
1156+
- Price lists. Analysis Services and Supplies
11001157

11011158

11021159
3.1.3036 (2014-05-30)
@@ -1118,8 +1175,8 @@ assigned. These defaults can be changed in BikaSetup > Security.
11181175
----------------
11191176

11201177
- Fix some out-dated dependencies that prevented the app from loading.
1121-
- Development of the current bika 3.0 code has slowed, and our efforts have been focused on
1122-
the 3.01a branch for some time.
1178+
- Development of the current bika 3.0 code has slowed, and our efforts have been
1179+
focused on the 3.01a branch for some time.
11231180

11241181

11251182
3.0rc3.5.1 (2013-10-25)
@@ -1132,8 +1189,7 @@ assigned. These defaults can be changed in BikaSetup > Security.
11321189
3.0rc3.5 (2013-10-24)
11331190
---------------------
11341191

1135-
- Requires Plone 4.3. For information on upgrading Plone, visit
1136-
http://plone.org/documentation/manual/upgrade-guide
1192+
- Requires Plone 4.3.
11371193
- Fix a serious error saving Analysis results.
11381194
- Improve upgrade handling in genericsetup profile
11391195
- Fix errors in setupdata loader
@@ -1171,7 +1227,7 @@ assigned. These defaults can be changed in BikaSetup > Security.
11711227
- Removed ReferenceManufacturer (use of generic Manufacturer instead)
11721228
- Removed ReferenceSupplier (use Supplier instead)
11731229
- Improve service/calculation interim field widgets
1174-
Allows service to include custom fields (without calculation selected)
1230+
- Allows service to include custom fields (without calculation selected)
11751231
- Fix services display table categorisation in Analysis Specification views
11761232
- Stop focusing the search gadget input when page load completes. (revert)
11771233
- Limit access to Import tab (BIKA: Manage Bika)
@@ -1219,12 +1275,11 @@ assigned. These defaults can be changed in BikaSetup > Security.
12191275
- Added remarks for individual analyses
12201276
- Improved Javascript i18n handling
12211277
- Improved default permissions
1222-
- New reports
1223-
- Added 'Analysis summary per department' (merge of 'Analyses lab department weekly' and 'Analyses request summary by date range'
1224-
- Added 'Analyses performed as % of total' report
1225-
- Added Analyses per lab department report
1226-
- Added 'Samples received vs. samples reported' report
1227-
- Added Daily Samples Received report
1278+
- Added 'Analysis summary per department' (merge of 'Analyses lab department weekly' and 'Analyses request summary by date range'
1279+
- Added 'Analyses performed as % of total' report
1280+
- Added Analyses per lab department report
1281+
- Added 'Samples received vs. samples reported' report
1282+
- Added Daily Samples Received report
12281283
- Many many bugfixes.
12291284

12301285

@@ -1339,8 +1394,8 @@ assigned. These defaults can be changed in BikaSetup > Security.
13391394
2.3.3 Bug fix release
13401395
---------------------
13411396

1342-
- Inclusion of BikaMembers 0.0.3. No changes to bika code, version bumped
1343-
to facilitate release of new BikaMembers version.
1397+
- Inclusion of BikaMembers 0.0.3. No changes to bika code, version bumped to
1398+
facilitate release of new BikaMembers version.
13441399

13451400

13461401
2.3
@@ -1458,8 +1513,8 @@ assigned. These defaults can be changed in BikaSetup > Security.
14581513
- Implement generic instrument data import tool
14591514
- Login portlet added
14601515
- Modifications required to support interlab
1461-
Permit analysis parent (sample) to be in 'released' state.
1462-
Reference SampleID on AnalysisRequest-
1516+
- Permit analysis parent (sample) to be in 'released' state.
1517+
- Reference SampleID on AnalysisRequest-
14631518
- 1566324: Logged in page redirected to welcome page.
14641519
- 1573299: LiveSearch - Added permissions to InvoiceLineItem.
14651520
- 1573083: Status Drop Down - Invoicing
@@ -1483,7 +1538,6 @@ title of the Cultivar, not the UID. This will impact anybode that customised
14831538
the *analysisrequed_add.cpy* controller script and the
14841539
*validate_analysisrequest_add_form.vpy* validation script.
14851540

1486-
14871541
- 1423182: IndexError on surfing to LIMS pages without being logged on
14881542
- 1423238: Orders - Dispatch date
14891543
- 1429992: AR edit tab - Cultivar uneditable

CONTRIBUTORS.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ contributions descending.
1313
- Ramon Bartl, [email protected]
1414
- Anneline Sweetname, [email protected]
1515
- Godfrey Leibbrandt, [email protected]
16+
- Juan Gallostra, [email protected]
1617
- Mike Metcalfe, [email protected]
1718
- Jurie-Jan Botha, [email protected]
18-
- Juan Gallostra, [email protected]
1919
- Inus Scheepers, [email protected]
2020
- Oliver Roch, [email protected]
2121
- Alexander Karlsson, [email protected]
2222
- Anton Feun, [email protected]
2323
- Jayadeep Karnati, [email protected]
2424
25+
- Lunga Baliwe, [email protected]
2526
- Dhruv Khattar, [email protected]
2627
- Javis Sullivan, [email protected]
2728
- Pieter van der Merwe, [email protected]

LICENSE-3RD-PARTY.rst

-43
This file was deleted.

LICENSE.rst

-21
This file was deleted.

RELEASE_NOTES.rst

+20
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
Release notes
22
=============
33

4+
Update from 1.2.2 to 1.2.3
5+
--------------------------
6+
7+
- IMPORTANT: Plan the upgrade with enough time
8+
This update might take long depending on the number of Analysis Requests
9+
registered in the system because a new index and column 'assigned_state' has
10+
been added in Analysis Requests catalog, that require the catalog to be
11+
reindexed (see #637).
12+
13+
14+
Update from 1.2.1 to 1.2.2
15+
--------------------------
16+
17+
- IMPORTANT: Plan the upgrade with enough time
18+
This update might take long depending on the number of Batches registered in
19+
the system, because an index from their catalog needs to be reindexed (#574).
20+
Also, a new index that affects the Worksheets that have a Worksheet Template
21+
assigned has been added and needs to be indexed.
22+
23+
424
Update from 1.2.0 to 1.2.1
525
--------------------------
626

bika/lims/adapters/configure.zcml

+13
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,17 @@
114114
preserveOriginal="True"
115115
/>
116116

117+
<!-- Stickers -->
118+
<!-- IGetStickerTemplates adapters -->
119+
<adapter
120+
factory="bika.lims.adapters.stickers.GetSampleStickers"
121+
for="bika.lims.interfaces.ISample"
122+
provides="bika.lims.interfaces.IGetStickerTemplates"
123+
/>
124+
<adapter
125+
factory="bika.lims.adapters.stickers.GetSampleStickers"
126+
for="bika.lims.interfaces.IAnalysisRequest"
127+
provides="bika.lims.interfaces.IGetStickerTemplates"
128+
/>
129+
117130
</configure>

0 commit comments

Comments
 (0)