+
@@ -179,30 +179,32 @@
-
diff --git a/src/bika/coa/browser/utils.py b/src/bika/coa/browser/utils.py
new file mode 100644
index 0000000..921cf79
--- /dev/null
+++ b/src/bika/coa/browser/utils.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+import os
+from senaite.impress.template import TemplateFinder as TF
+
+
+class TemplateFinder(TF):
+
+ def get_templates(self, extensions=[".pt", ".html"]):
+ templates = []
+ for resource in self.resources:
+ name = resource["name"]
+ path = resource["path"]
+ contents = resource["contents"] or []
+ for content in contents:
+ basename, ext = os.path.splitext(content)
+ if ext not in extensions:
+ continue
+ if basename.lower().startswith("example"):
+ continue
+ template = content
+ if name:
+ template = u"{}:{}".format(name, content)
+ template_path = os.path.join(path, content)
+ templates.append((template, template_path))
+ templates.sort(key=lambda x: x[0])
+ return templates
diff --git a/src/bika/coa/configure.zcml b/src/bika/coa/configure.zcml
index da62a60..474db45 100644
--- a/src/bika/coa/configure.zcml
+++ b/src/bika/coa/configure.zcml
@@ -44,6 +44,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bika/coa/reports/MultiGeochemistry.pt b/src/bika/coa/reports/GeoangolBatchMulti.pt
similarity index 92%
rename from src/bika/coa/reports/MultiGeochemistry.pt
rename to src/bika/coa/reports/GeoangolBatchMulti.pt
index cec990c..a470ea8 100644
--- a/src/bika/coa/reports/MultiGeochemistry.pt
+++ b/src/bika/coa/reports/GeoangolBatchMulti.pt
@@ -52,6 +52,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ Please make sure all Samples are on the same batch
+
+
+
+
+
+
+ Certificate of Analysis
+ +
+
+ ![]()
+
+
+ ![]()
+ ![]()
+
+
+
+
+
+
+
+
+ Results
+
+
+
+
+
+
+
+
+
+ Sample ID
+
+
+
+
+
+
+
+
+ Client Sample ID
+
+
+
+
+
+
+
+
+ Sample Type
+
+
+
+
+
+
+
+
+ Sample Point
+
+
+
+
+
+
+
+
+ Date Sampled
+
+
+
+
+
+
+
+
+ Date Received
+
+
+
+
+
+
+
+
+ Date Verified
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ Results Interpretation for
+Department
+ +
+
+
+
+
+ Remarks for
+
+
+
+ +
+
+
+
+
+
+
+
+ + Attachments for +
+|
+
+ Attachment for
+
+
+
+
+
+
+ Filename:
+
+
+ |
+
+
+
+
+
+
+ Managers Responsible
+|
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+ Published by
+
+
+
+ |
+
+
+
+
+
+
+ ![]()
+
+ Result out of client specified range.
+
+
+ Not invoiced
+
+
+
+
+
+ Methods included in the
+
+
+ Analysis results relate only to the samples tested.
+
+
+ This document shall not be reproduced except in full, without the written approval of
+
+
+ Test results are at a
+
+
+ Please make sure all Samples are on the same batch
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ ![]()
+ ![]()
+
+
+
+ Certificate of Analysis
+| Batch | ++ + | +Client Order Number | ++ + | +||
| Container | ++ + | +Date Published | ++ + | +||
| DALRRD number | ++ + | +Facility number | ++ + | +||
| Removal permit | ++ + | +Country of origin | ++ + | +||
| Seal number | ++ + | +Seal intact | ++ + | +||
| Date Received | ++ + | +Date Sampled | ++ + | +||
| Analyzed | +From
+ to
+ |
+ ||||
| Batch Remarks | ++ + | +||||
Results
+
+
+
+
+
+
+
+
+ Sample ID
+
+
+
+
+
+
+
+
+
+
+ Client Sample ID
+
+
+
+
+
+
+
+
+
+
+ Sample Type
+
+
+
+
+
+
+
+
+
+
+ Sample Point
+
+
+
+
+
+
+
+
+
+
+ Sample Condition
+
+
+
+
+
+
+
+
+
+
+ Date Sampled
+
+
+
+
+
+
+
+
+
+
+ Date Received
+
+
+
+
+
+
+
+
+
+
+ Date Verified
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Method
+ Verifier
+ Unit
+ Result
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ ![]()
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+ ![]()
+
+
+
+
+
+
+
+ Publisher+ |
+ + + | +|||
+ Authorised by+ |
+ ||||
|
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+ |||
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt
new file mode 100644
index 0000000..23857e8
--- /dev/null
+++ b/src/bika/coa/reports/GreenhillMulti.pt
@@ -0,0 +1,734 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Disclaimers
+-
+
- + Please refer to our SANAS Schedule of Accreditation for a full list of our accredited methods and matrices. + +
- + The results apply only to the samples / items as received, tested, and described above. + +
- Where customer-provided details will affect the validity of the results, + cannot be held + liable if this information is not received, or supplied incorrectly. + +
- + Where a deviation has been noted, the validity of the results + may be affected - results should be used with this + consideration in mind. + +
- + This test report shall not be reproduced except in full, + and not without written approval of GreenHill Laboratories. + +
- + Our interpretation of the results is for your benefit as + guidance, for which we cannot be held liable if + misinterpreted or misapplied. + +
- + Any opinions and interpretations expressed herein are outside + the scope of accreditation. + +
End of Certificate
+
+
+ Please make sure all Samples are on the same batch
+
+
+
+
+
+
+ Certificate of Analysis
+ +
+
+ ![]()
+
+
+ ![]()
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
|
+
+
+
|
+ |||||||||||||||||||||||
Results
+
+
+
+
+
+
+
+
+ Sample ID
+
+
+
+
+
+
+
+
+
+
+ Client Sample ID
+
+
+
+
+
+
+
+
+
+
+ Sample Type
+
+
+
+
+
+
+
+
+
+
+ Sample Point
+
+
+
+
+
+
+
+
+
+
+ Sample Condition
+
+
+
+
+
+
+
+
+
+
+ Date Sampled
+
+
+
+
+
+
+
+
+
+
+ Date Received
+
+
+
+
+
+
+
+
+
+
+ Date Verified
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Method
+ Verifier
+ Unit
+ Result
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ ![]()
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ Results Interpretation for
+Department
+ +
+
+
+
+
+ Remarks for
+
+
+
+ +
+
+
+
+
+
+
+
+ + Attachments for +
+|
+
+ Attachment for
+
+
+
+
+
+
+ Filename:
+
+
+ |
+
+
+
+
+ Publisher+ |
+ + + | +|||
+ Authorised by+ |
+ ||||
|
+
+
+
+
+
+
+
+
+
+
+
+ |
+ ||||
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bika/coa/reports/HydroChemLocationMulti.pt b/src/bika/coa/reports/HydroChemLocationMulti.pt
new file mode 100644
index 0000000..ec8112d
--- /dev/null
+++ b/src/bika/coa/reports/HydroChemLocationMulti.pt
@@ -0,0 +1,706 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bika/coa/reports/HydroChemLocations2Multi.pt b/src/bika/coa/reports/HydroChemLocations2Multi.pt
new file mode 100644
index 0000000..ecb73a3
--- /dev/null
+++ b/src/bika/coa/reports/HydroChemLocations2Multi.pt
@@ -0,0 +1,699 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bika/coa/reports/MultiBatch.pt b/src/bika/coa/reports/ImexMulti.pt
similarity index 76%
rename from src/bika/coa/reports/MultiBatch.pt
rename to src/bika/coa/reports/ImexMulti.pt
index 89e73a2..cf036e5 100644
--- a/src/bika/coa/reports/MultiBatch.pt
+++ b/src/bika/coa/reports/ImexMulti.pt
@@ -14,7 +14,7 @@
page_height options/page_height|nothing;
content_width options/content_width|nothing;
content_height options/content_height|nothing;
- pages python:view.get_pages(options);
+ pages python:view.get_pages_imex(options);
report_images python:view.get_report_images();
styles python:view.get_coa_styles();
">
@@ -51,6 +51,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Disclaimers
+-
+
- + Please refer to our SANAS Schedule of Accreditation for a full list of our accredited methods and matrices. + +
- + The results apply only to the samples / items as received, tested, and described above. + +
- Where customer-provided details will affect the validity of the results, + cannot be held + liable if this information is not received, or supplied incorrectly. + +
- + Where a deviation has been noted, the validity of the results + may be affected - results should be used with this + consideration in mind. + +
- + This test report shall not be reproduced except in full, + and not without written approval of GreenHill Laboratories. + +
- + Our interpretation of the results is for your benefit as + guidance, for which we cannot be held liable if + misinterpreted or misapplied. + +
- + Any opinions and interpretations expressed herein are outside + the scope of accreditation. + +
+
+ Samples are not from the same Location / not sampled on the same date / not received on the same date
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ ![]()
+ ![]()
+
+
+
+
+
+ Location
+
+ Address
+
+
+
+ Date Received
+
+
+
+ Results
+
+
+
+
+
+
+
+ Sample ID
+
+
+
+
+
+ Client Sample ID
+
+
+
+
+
+ Sample Type
+
+
+
+
+
+ Sample Point
+
+
+
+
+
+
+
+ Specification
+
+
+
+
+
+
+
+
+
+ Date Sampled
+
+
+
+
+
+ Date Verified
+
+
+
+
+
+
+
+
+
+
+
+ Unit
+ Result
+ (Min-Max)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ ![]()
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+ ![]()
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ Results Interpretation for
+Department
+ +
+
+
+
+
+ Remarks for
+
+
+
+ +
+
+
+
+
+
+
+
+ + Attachments for +
+|
+
+ Attachment for
+
+
+
+
+
+
+ Filename:
+
+
+ |
+
+
+
+
+ Publisher
+
+ Date Published
+
+
+
+
+
+
+
+ Managers Responsible
+|
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
End of Certificate
+ +
+
+
+
+ Legend
+
+
+ These methods have been subcontracted to an approved laboratory.
+
+ Result does not comply with the cited specification
+
+ NA Not Applicable
+
+
+ All analyses were carried out at our premises at
+
+
+ Analysis results relate only to the samples tested.
+
+
+ Test results are at a 95% confidence level.
+
+
+ Samples are not from the same Location
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ ![]()
+ ![]()
+
+
+
+
+
+ Location
+
+ Address
+
+
+
+ Date Received
+
+ Date Verified
+
+ +
Results
+
+
+
+
+
+
+
+ Sample ID
+
+
+
+
+
+ Client Sample ID
+
+
+
+
+
+ Date Sampled
+
+
+
+
+
+ Sample Type
+
+
+
+
+
+
+ Specification
+
+
+
+
+
+
+
+
+
+ Sample Point
+
+
+
+
+
+
+
+
+
+
+
+ Unit
+ Result
+ (Min-Max)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ ![]()
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+ ![]()
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ Results Interpretation for
+Department
+ +
+
+
+
+
+ Remarks for
+
+
+
+ +
+
+
+
+
+
+
+
+ + Attachments for +
+|
+
+ Attachment for
+
+
+
+
+
+
+ Filename:
+
+
+ |
+
+
+
+
+ Publisher
+
+ Date Published
+
+
+
+
+
+
+
+ Managers Responsible
+|
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
End of Certificate
+ +
+
+
+
+ Legend
+
+
+ These methods have been subcontracted to an approved laboratory.
+
+ Result does not comply with the cited specification
+
+ NA Not Applicable
+
+
+ All analyses were carried out at our premises at
+
+
+ Analysis results relate only to the samples tested.
+
+
+ Test results are at a 95% confidence level.
+
+
+ + Multiple specifications found for the samples and this COA template cannot be used for them. + Please reselect the samples to be reported on, ensuring they use the same specification +
+
+
+
+
@@ -131,8 +152,7 @@
+ define="primarymodel python:collection[0];">
+ categories_by_poc python:view.get_categories_by_poc(collection);
+ model python:collection[0];
+ specification model/Specification;
+ publication_specification model/PublicationSpecification;
+ spec python:publication_specification or specification;">
+
-
-
+
+
-
-
@@ -437,22 +487,6 @@
-
-
-
@@ -522,13 +556,13 @@
-
-
+
diff --git a/src/bika/coa/reports/MultiSample01.pt b/src/bika/coa/reports/Multi.pt
similarity index 83%
rename from src/bika/coa/reports/MultiSample01.pt
rename to src/bika/coa/reports/Multi.pt
index a203552..a3af904 100644
--- a/src/bika/coa/reports/MultiSample01.pt
+++ b/src/bika/coa/reports/Multi.pt
@@ -51,6 +51,7 @@
+
+
+
+
+
+
+
-
-
-
@@ -518,13 +557,13 @@
-
-
-
+
diff --git a/src/bika/coa/reports/MultiTestItISO17025RowWithCoordinates.pt b/src/bika/coa/reports/MultiTestItISO17025RowWithCoordinates.pt
new file mode 100644
index 0000000..00c1e78
--- /dev/null
+++ b/src/bika/coa/reports/MultiTestItISO17025RowWithCoordinates.pt
@@ -0,0 +1,735 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -188,18 +208,6 @@
-
- Project Title
-
-
-
-
-
- Batch ID
-
-
-
-
Date Published
-
-
-
-
@@ -310,78 +305,138 @@
-
-
+
-
+
-
+
-
+
+
+
+
+
+
|
-
-
- |
-
Results
- +| Sample ID | -- | + | Sample ID | + | |||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
- Client Sample ID
- Sample Type
+ | |||||||||||||||||
| + Client Sample ID + | ++ + | +||||||||||||||||
|
+ Sample Type
+ |
+ + + | +||||||||||||||||
|
Sample Point
- Date Sampled
- Date Received
- Date Verified
|
- - | - | - - + | + | +|||||||||||||
|
+ Date Sampled
+ |
+ + | +||||||||||||||||
|
+ Date Received
+ |
+ + | +||||||||||||||||
|
+ Date Verified
+ |
+ - | +- - | |||||||||||||||
| + + | +Method | +Specification | +LDL | +Unit | +Verifier | +Result | +|||||||||||
| - | + | + + | ++ + | ++ | + | + + | - - | -@@ -408,17 +461,14 @@ | |||||||||
Mutli Batches found
-
- ![]()
-
-
-
+
+
+
@@ -608,36 +642,6 @@
-
-
+
+
+
@@ -221,18 +233,24 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
@@ -311,76 +329,115 @@
-
+
@@ -433,22 +488,6 @@
| Sample ID | -- | + | Sample ID | + | ||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
- Client Sample ID
- Sample Type
+ | ||||||||||
| + Client Sample ID + | ++ + | +|||||||||
|
+ Sample Type
+ |
+ + + | +|||||||||
|
Sample Point
- Date Sampled
- Date Received
- Date Verified
|
- - | - | - - + | + | +||||||
|
+ Date Sampled
+ |
+ + | +|||||||||
|
+ Date Received
+ |
+ + | +|||||||||
|
+ Date Verified
+ |
+ - | +|||||||||
| Method | +Verifier | Unit | Result | |||||||
|
+
+ |
+ | + + | - - | -@@ -408,8 +463,8 @@ | ||||||
- ![]()
-
-
-
+
+
+
@@ -603,37 +642,5 @@
-
-
-
+
+
+
+Certificate of Analysis
+
+
+
+
+|
+
+ |
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+ Test It LAB
+
+
+
+
+ Plot 9D Kwagga Street
+
+
+
+ Quaggafontein
+
+
+
+ Bloemfontein
+
+
+
+ Free State
+
+
+
+ 9301
+
+
+
+
+ South Africa
+
+
+ |
+
+
+Results apply only to the sample as received and the items tested
+Reports shall not be reproduced except in full and with approval of the laboratory
+Results and information may be disclosed during routine assessments and audits
+Hold time and temperature after sampling may affect the validity of results for QM No. 7.2/TM-01 and QM No. 7.2/TM-02
+Uncertainty of measurement is available on request for all methods included in the SANAS Schedule of Accreditation
+The binary simple acceptance decision rule is applied with regard to statements of conformity
+Results are reported against SANS241:2015 for drinking water, Revision of the General Authorisation to Section 39 of the NWA No 36 of 1998 for wastewater and SANBWA Bottled Water Standard for bottled water
+We respect your privacy and personal information
+ Terms and Conditions
+We welcome your feedback or get in touch with us for queries or complaints
+Result Query: Francois le Roux Financial: Sunet van BiljonComplaints: Elsabe Botes
+Outsourced or subcontracted tests are indicated per method
+
+ Is not included in the SANAS Schedule of Accreditation for this laboratory
+Information provided by
+
+ include and is not limited to Sample Type, Sampler, Publication Spesification, Date/Time Sampled.
+
+ ![]()
+ Result out of client specified range
+
+
+
+ + + +
+
+ Important documents and information
++
+
Date Published :
+
++
Signature :
++ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bika/coa/reports/SingleSample01.pt b/src/bika/coa/reports/Single.pt
similarity index 95%
rename from src/bika/coa/reports/SingleSample01.pt
rename to src/bika/coa/reports/Single.pt
index 8891422..bc972d5 100644
--- a/src/bika/coa/reports/SingleSample01.pt
+++ b/src/bika/coa/reports/Single.pt
@@ -6,7 +6,6 @@
contact model/Contact;
report_images python:view.get_report_images();
styles python:view.get_coa_styles();
- accredited_symbol string:★;
coa_num python:view.get_coa_number(model);
footer python:view.get_footer_text();
report_options python:options.get('report_options', {});
@@ -366,9 +365,11 @@
+ +
+
+Certificate of Analysis
+ +
Results for ()
+ +| Sample Type | ++ + | +|||||||
| Sample Point | ++ + | +|||||||
| Sample Latitude | ++ + + + - + + | +|||||||
| Sample Longitude | ++ + + + - + + | +|||||||
| Sampled Date | ++ + | +|||||||
| Sampler | ++ + | +|||||||
| Received Date | ++ + | +|||||||
| Analysis Completed Date | ++ + | +|||||||
| Condition | ++ + | +|||||||
| Report Specification | ++ + | +|||||||
| + Category + | ++ Method + | ++ Result + | ++ Unit + | ++ ≤Lower Limit + | ++ ≥Upper Limit + | ++ + | +
|---|---|---|---|---|---|---|
| + + + + + + + + | + + + + + - + + | + ++ + | ++ + | +
+
+ |
+
+
+ |
+
+
+ |
+
|
+
+ Category Comments
+
+ |
+ ||||||
End of results for ()
+
+
+
+
+
+
+
+
+
+
+ END OF RESULTS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Additional Sample Information |
+ |
|---|---|
|
+ Sample ID
+ |
+
+ Sample ID
+ |
+
|
+ Sample Remarks
+ |
+
+
+
+
+
+
+ |
+
|
+ Interpretation
+ |
+ |
|
+ Department
+
+ |
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ + Attachments for +
+|
+
+ Attachment for
+
+
+
+
+
+
+ Filename:
+
+
+ |
+
+
+
+ END OF REPORT
+
+
+
+
+
diff --git a/src/bika/coa/reports/PatientSingle.pt b/src/bika/coa/reports/PatientSingle.pt
new file mode 100644
index 0000000..79d6577
--- /dev/null
+++ b/src/bika/coa/reports/PatientSingle.pt
@@ -0,0 +1,724 @@
++
+
+
+
+
+
+ Certificate of Analysis
+ +
+
+ ![]()
+
+
+
+
+
+
+
+ Patient
+| Name | ++ | ||
| Medical Record # | ++ | Birth Date | ++ |
| Age / Gender | ++ | ||
+
+
+
+
+
+
+ Summary
+ +| Sample ID | ++ + + | +Date Sampled | ++ |
| Client SID | ++ | Date Received | ++ |
| Sample Type | ++ | Date Verified | ++ |
| Specification | ++ | Date Published | ++ |
| Remarks | +
+
+
+
+ |
+ ||
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Results
+ + +| + Category + | ++ Method + | ++ Verifier + | ++ Date + | ++ Result + | ++ Unit + | ++ Uncertainty + | ++ Range + | ++ + | +
|---|---|---|---|---|---|---|---|---|
|
+
+ |
+ + + + + + - + + | ++ + + + + - + + | ++ + | ++ 23 + | ++ + | ++ + | ++ + 50 - 60 + | +
+
+
+ |
+
|
+
+ Category Comments
+
+ |
+ ||||||||
+
+
+
+
+
+ Results interpretation
+ +Department
+ +
+
+
+
+ QC Results
+
+
+
+
+
+ Remarks
+
+
+
+ +
+
+
+
+
+
+ + Attachments for +
+|
+
+ Attachment for
+
+
+
+
+
+
+ Filename:
+
+
+ |
+
End of Report
++ + +
+
+
+
+
+
+ ![]()
+
+ Result out of specified range.
+
+
+ Not invoiced
+
+
+
+ ![]()
+
+
+ Methods included in the
+
+
+ Analysis remarks are not accredited.
+
+
+ Analysis results relate only to the samples tested.
+
+
+ All information provided by
+
+ Test results are at a
+
+ This document shall not be reproduced except in full, without the written approval of
+
+ | Method | ++ Verifier + | Date | @@ -415,8 +419,8 @@||||
|---|---|---|---|---|---|---|
|
+ |
+ + + + + + - + + | @@ -568,13 +580,13 @@ |
-
-
-
-
+
+
+
@@ -632,8 +644,8 @@
-
+
+
|
diff --git a/src/bika/coa/reports/MultiSampleTransposed.pt b/src/bika/coa/reports/ZimlabsTransposedMulti.pt
similarity index 82%
rename from src/bika/coa/reports/MultiSampleTransposed.pt
rename to src/bika/coa/reports/ZimlabsTransposedMulti.pt
index 682a6a6..8068048 100644
--- a/src/bika/coa/reports/MultiSampleTransposed.pt
+++ b/src/bika/coa/reports/ZimlabsTransposedMulti.pt
@@ -533,8 +533,15 @@
-
-
+ |
+
+ |
|