Inconsistences when applying Worksheet Templates (#499)

* When a worksheet template is used, slot positions are not applied correctly

* Redux

* Add reference samples in accordance with Worksheet Template Layout

* Added get_analyses_at and get_container_at

* Added doctest for WorksheetTemplate assignment to Worksheet

* Simplify the logic that adds a duplicate from a WST in a Worksheet

* Cleanup and redux

* Removed pdb

* Revisited and sanitized AddDuplicates logic

* Remove setWorksheetTemplate and delegate the action to applyWorksheetTemplate

* Addition of Reference Analyses test and sanitize

* Ensure consistency when adding reference analyses in a worksheet

* Added more tests when adding/removing reference analyses in a WS

* Small fixes

* Fix refgroupid for duplicates

* All duplicates/references from same slot must have same group ID

* Always keep the order by position of the ws layout, just in case

* Let worksheet machinery to deal in which slot a duplicate must be added

* Changelog

* Organize imports and some PEP8

* Missing imports

* Fix test TestAddDuplicateAnalysis.test_LIMS2001

* RST formatting only

* PEP8

* Minor refactoring

* rst formatting only

* Refactored list of allowed analyses types

* Additional test added

Author: xispa

CHANGES.rst

@@ -15,6 +15,9 @@ Changelog
 
 **Fixed**
 
+- #499 Wrong slots when adding analyses manually in Worksheet with a WST assigned
+- #499 When a Worksheet Template is used, slot positions are not applied correctly
+- #499 Applying a WS template which references a Duplicate raises an Error
 - #513 ShowPrices doctest is failing
 - #488 JS Errors in bika.lims.analysisrequest.js
 

bika/lims/browser/worksheet/views/add_duplicate.py

@@ -47,9 +47,8 @@ def __call__(self):
             ar_uid = self.request.get('ar_uid', '')
             src_slot = [slot['position'] for slot in self.context.getLayout() if
                         slot['container_uid'] == ar_uid and slot['type'] == 'a'][0]
-            position = self.request.get('position', '')
             self.request['context_uid'] = self.context.UID()
-            self.context.addDuplicateAnalyses(src_slot, position)
+            self.context.addDuplicateAnalyses(src_slot)
             self.request.response.redirect(self.context.absolute_url() + "/manage_results")
         else:
             self.ARs = AnalysisRequestsView(self.context, self.request)

bika/lims/browser/worksheet/views/add_worksheet.py

@@ -59,7 +59,6 @@ def __call__(self):
             return
 
         wst = rc.lookupObject(template)
-        ws.setWorksheetTemplate(wst)
         ws.applyWorksheetTemplate(wst)
 
         if ws.getLayout():

bika/lims/content/duplicateanalysis.py

@@ -116,6 +116,8 @@ def getSiblings(self, retracted=False):
     @security.public
     def setAnalysis(self, analysis):
         # Copy all the values from the schema
+        if not analysis:
+            return
         discard = ['id', ]
         keys = analysis.Schema().keys()
         for key in keys:

bika/lims/content/reflexrule.py

@@ -391,7 +391,7 @@ def _createWorksheet(base, worksheettemplate, analyst):
         Analyst=analyst,
         )
     if worksheettemplate:
-        ws.setWorksheetTemplate(worksheettemplate)
+        ws.applyWorksheetTemplate(worksheettemplate)
     return ws