From 3e0a0a3ce6184a32a118f91c7a4ae0296e797aec Mon Sep 17 00:00:00 2001 From: Luthando Date: Wed, 26 Apr 2023 16:36:48 +0200 Subject: [PATCH 001/126] Official green coa branch --- src/bika/coa/reports/Multigreen.pt | 674 +++++++++++++++++++++++++++++ src/bika/coa/reportview.py | 57 +++ 2 files changed, 731 insertions(+) create mode 100644 src/bika/coa/reports/Multigreen.pt diff --git a/src/bika/coa/reports/Multigreen.pt b/src/bika/coa/reports/Multigreen.pt new file mode 100644 index 0000000..a48f29d --- /dev/null +++ b/src/bika/coa/reports/Multigreen.pt @@ -0,0 +1,674 @@ + + + +
+
Custom Report Options
+ +
+
+
+ +
+ +
+ + Number of attachments rendered within one row per Analysis Request + +
+
+ + + + + + + + + +
+

Please make sure all Samples are on the same batch

+
+ + + + + +
+ +
+ +

+
+
+ + +
+ +
+ + + + + + + +
+
+ + + + + + + + + + + + + +
+
+ +
+
+
+
+
+
+ +
+ + +
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ +
+ 		+ + + + +
+ +
+
+
+
+
+
+
+
+ +
+ + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + +
+

Certificate of Analysis

+ 		+

+

+

Batch

+ 		+

+

+

+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Container +
+
Sample Type +
+
Date Received +
+
Date Sampled +
+
AnalyzedFrom +
+
To +
+
Batch Remarks +
+
+ + + + + +
+
+

Results

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Sample ID +
+
+
Client Sample ID
+
Sample Type
+
Sample Condition
+
Date Sampled
+
Date Received
+
Date Verified
+ 		+
+
+
+
+
+
+
+ + MethodUnitResult
+ + + + + + + + + + + + + + + + + + - + + + + + + + +
+ + +
+
+ + + + + + + +

Legend

+ + + + + + + + + + + + + +
+ + + Accredited methods +
+ ^ + + South African Veterinary Council registered +
+ + + Subcontracted methods +
+ + + + + +

Additional Information

+ + + +
+
+
+ + + + + +
+

+ 		+ + +
+ +
+ + + + + + + + + + + + +
+

Publisher

+ 		+

+

+

Date Time Published

+ 		+

+

+ + + + + +

Authorised by

+

Pending response

+ + + + +
+
+

Disclaimers

+
    +
  1. The results apply only to the samples / items as received, tested, and described above.
    2. +
  2. Where customer-provided details will affect the validity of the results, cannot be held liable if this information is not received, or supplied incorrectly.
    3. +
  3. This test report shall not be reproduced except in full, and not without written approval of .
    4. +
  4. Our interpretation of the results is for your benefit as guidance, for which we cannot be held liable if misinterpreted or misapplied.
    5. +
  5. + + + + + + + + + + + + + +
    + + + Accredited methods +
    + ^ + + South African Veterinary Council registered +
    + + + Subcontracted methods +
    +
    6. +
+
+
+
+ + + + +

End of Certificate

+ + + + +
+ + +
+
+ + + + + +
+ + + + + + +
+
+ Lab Name + • Lab ZIP + Lab City + • Lab Country +
+
+ Phone: + Lab Phone Number + • + Lab Email + + • + Lab URL + +
+
+
+ + + diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index facab79..895db9f 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -466,6 +466,63 @@ def get_date_string(self,num_date): #----------------zlabs end------------------------------------------------- +#------------------------GHill begin------------------------------------- + + def get_worksheet_dates(self,samples): + earliest_creation_date = "" + all_dates = [] + for sample in samples: + for analysis in sample.Analyses: + worksheet = analysis.getWorksheet() + date_worksheet_created = worksheet.created() + if date_worksheet_created: + all_dates.append(date_worksheet_created) + all_dates.sort() + if len(all_dates) > 1: + earliest_creation_date = all_dates[0].strftime('%d/%m/20%y') + if len(all_dates) == 1: + earliest_creation_date = all_dates[0].strftime('%d/%m/20%y') + return earliest_creation_date + + + def get_common_row_data_green(self, collection, poc, category): + model = collection[0] + analyses = self.get_analyses_by(collection, poc=poc, category=category) + common_data = [] + for analysis in analyses: + datum = [analysis.Title(), "-", model.get_formatted_unit(analysis), "-"] + if analysis.Method: + datum[1] = analysis.Method.Title() + instruments = analysis.getAnalysisService().getInstruments() + # TODO: Use getInstruments + instr_list = [] + if instruments: + for i, instrument in enumerate(instruments): + title = instrument.Title() + if title in instr_list: + continue + instr_list.append(title) + datum[3] = " ".join(instr_list) + first_datum = datum[0] + if self.is_analysis_method_accreditted(analysis): + if self.is_analysis_method_subcontracted(analysis): + datum[0] = ["Accredited and Subcontracted",first_datum] + else: + datum[0] = ["Accredited",first_datum] + else: + if self.is_analysis_method_subcontracted(analysis): + datum[0] = ["Subcontracted",first_datum] + else: + datum[0] = ["",first_datum] + common_data.append(datum) + unique_data = self.uniquify_items(common_data) + return unique_data + + def get_datetime_string(self,num_date): + return str(num_date.day()) + " " + num_date.Month() + " " + str(num_date.year()) + " " + str(num_date.Time()[:5]) + +#------------------------GHill end--------------------------------------- + def get_common_row_data_by_poc(self, collection, poc): model = collection[0] all_analyses = self.get_analyses_by_poc(collection) From bab66207dd15e09652ec1e750008df3bfa6f28ea Mon Sep 17 00:00:00 2001 From: Luthando Date: Thu, 27 Apr 2023 16:52:31 +0200 Subject: [PATCH 002/126] Replaced COA headers with divs instead of tables --- src/bika/coa/reports/Multigreen.pt | 33 ++++++++---------------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/src/bika/coa/reports/Multigreen.pt b/src/bika/coa/reports/Multigreen.pt index a48f29d..ee8a381 100644 --- a/src/bika/coa/reports/Multigreen.pt +++ b/src/bika/coa/reports/Multigreen.pt @@ -278,30 +278,15 @@ - - - - - - - - - - - - -
-

Certificate of Analysis

- 		-

-

-

Batch

- 		-

-

-

-

- +
+

+

+
+

+

+
+

+

From 08794d3f1d9c6109d842d94ea25e50f75e12b9f4 Mon Sep 17 00:00:00 2001 From: Luthando Date: Thu, 27 Apr 2023 18:33:38 +0200 Subject: [PATCH 003/126] Cosmetics complete --- src/bika/coa/reports/Multigreen.pt | 136 ++++++++++++++--------------- 1 file changed, 67 insertions(+), 69 deletions(-) diff --git a/src/bika/coa/reports/Multigreen.pt b/src/bika/coa/reports/Multigreen.pt index ee8a381..0d865d9 100644 --- a/src/bika/coa/reports/Multigreen.pt +++ b/src/bika/coa/reports/Multigreen.pt @@ -53,13 +53,12 @@ + + + + +
+ +
+ +

Certificate of Analysis

+

+

+
+ + +
+
+ + + + + + +
+
+ + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Client + +
+ +
Contact + +
+ +
Physical Address + +
+
+
+
+
+ +
Email Address + +
+ +
Date Published
Published by + + + () + +
+ 		+ + + + + +
+ +
+
+
+
+
+ Supervisor: +
+
+
+
+
+
+ +
+ + +
+ +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ 		+ + + + +
+ +
+
+
+ +
+
+ + + + +
+
+ +
+

+
This Analysis Request has been invalidated due to erroneously published results
+ + This Analysis request has been replaced by + + +
+ +
+

+
Provisional report
+
+ +
+
+ + + + +
+
+

Results

+ + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Sample ID +
+
+ Client Sample ID + +
+
+
Sample Type
+ 		+
+
+
Sample Point
+ 		+
+
+
Date Sampled
+ 		+
+
+
Date Received
+ 		+
+
+
Date Verified
+ 		+
+
+ + MethodVerifierUnitResult
+ + + + + + + + + + - + + + + + + +
+ + +
+
+ + + + + +
+
+

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 + + schedule of Accreditation for this Laboratory. Analysis remarks are not + accredited + +
+
+ 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 % confidence level +
+
+
+ + + + +
+ + +
+
+ + + From e3136f581da5fdf7e93cc171f0bc9cbd5dac91b5 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 12 Jun 2023 13:27:40 +0200 Subject: [PATCH 044/126] Added Verifiers as authorised users --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 26 ++++++++++++--- src/bika/coa/reportview.py | 33 +++++++++++++++++--- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index d63e270..7f0aff0 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -560,7 +560,7 @@ primarymodel python:collection[0]; Verifier python:view.get_verifier(collection)">
- +
- - + + + -

Publisher

@@ -570,14 +570,30 @@
+

Authorised by

 -

+

+
+ +
+
+ +
+
+ +
+
+ +
+ +
diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index 4fc2023..fd28ceb 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -230,7 +230,8 @@ def get_verifier_by_analysis(self, model): roles = ploneapi.user.get_roles(username=user_name) date_verified = self.to_localized_time(model.getDateVerified()) contact = api.get_user_contact(user_obj) - verifier = {"fullname": "", "role": "", "email": "", "verifier": ""} + verifier = {"fullname": "", "role": "", "email": "", "verifier": "", + "signature": "", "jobtile": "", "default_department": "",} if not contact: return verifier @@ -238,11 +239,16 @@ def get_verifier_by_analysis(self, model): verifier["role"] = roles[0] verifier["date_verified"] = date_verified verifier["email"] = contact.getEmailAddress() - + verifier["jobtile"] = contact.getJobTitle() + if contact.getDefaultDepartment(): + default_department = contact.getDefaultDepartment().Title() + verifier["default_department"] = default_department if contact.getSalutation(): verifier["verifier"] = "{}. {}".format(contact.getSalutation(), contact.getFullname()) else: verifier["verifier"] = "{}".format(contact.getFullname()) + if contact.getSignature(): + verifier["signature"] = '{}/Signature'.format(contact.absolute_url()) return verifier @@ -786,7 +792,7 @@ def get_verifier(self, collection): return verifier verifier["fullname"] = contact.getFullname() - verifier["role"] = roles[0] + verifier["role"] = roles[0] verifier["date_verified"] = date_verified verifier["email"] = contact.getEmailAddress() @@ -808,7 +814,8 @@ def get_verifier_by_analysis(self, model): roles = ploneapi.user.get_roles(username=user_name) date_verified = self.to_localized_time(model.getDateVerified()) contact = api.get_user_contact(user_obj) - verifier = {"fullname": "", "role": "", "email": "", "verifier": ""} + verifier = {"fullname": "", "role": "", "email": "", "verifier": "", + "signature": "", "jobtile": "", "default_department": "",} if not contact: return verifier @@ -816,14 +823,20 @@ def get_verifier_by_analysis(self, model): verifier["role"] = roles[0] verifier["date_verified"] = date_verified verifier["email"] = contact.getEmailAddress() - + verifier["jobtile"] = contact.getJobTitle() + if contact.getDefaultDepartment(): + default_department = contact.getDefaultDepartment().Title() + verifier["default_department"] = default_department if contact.getSalutation(): verifier["verifier"] = "{}. {}".format(contact.getSalutation(), contact.getFullname()) else: verifier["verifier"] = "{}".format(contact.getFullname()) + if contact.getSignature(): + verifier["signature"] = '{}/Signature'.format(contact.absolute_url()) return verifier + def get_publisher(self): publisher = { "today":"{}".format(DateTime().strftime("%Y-%m-%d")), @@ -930,3 +943,13 @@ def get_coa_styles(self): css = map(lambda logo_style: "{}:{};".format(*logo_style), logo_style.items()) styles["logo_styles"] = " ".join(css) return styles + + def get_verifiers(self, collection): + analyses = self.get_analyses_by(collection) + verifiers = [] + for analysis in analyses: + verifier = self.get_verifier_by_analysis(analysis) + if verifier in verifiers: + continue + verifiers.append(verifier) + return verifiers From 9b8dcaf4ac031548417df89fc8cd224ced416c87 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 12 Jun 2023 13:43:26 +0200 Subject: [PATCH 045/126] Renamed COA template names --- src/bika/coa/reports/{MultiBatch.pt => AWTCBatchMulti.pt} | 0 .../reports/{MultiGeochemistryBatch.pt => GeoAngolBatchMulti.pt} | 0 src/bika/coa/reports/{MultiGeochemistry.pt => GeoAngolMulti.pt} | 0 .../{MultiSampleTransposed.pt => ZimlabsTransposedMulti.pt} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename src/bika/coa/reports/{MultiBatch.pt => AWTCBatchMulti.pt} (100%) rename src/bika/coa/reports/{MultiGeochemistryBatch.pt => GeoAngolBatchMulti.pt} (100%) rename src/bika/coa/reports/{MultiGeochemistry.pt => GeoAngolMulti.pt} (100%) rename src/bika/coa/reports/{MultiSampleTransposed.pt => ZimlabsTransposedMulti.pt} (100%) diff --git a/src/bika/coa/reports/MultiBatch.pt b/src/bika/coa/reports/AWTCBatchMulti.pt similarity index 100% rename from src/bika/coa/reports/MultiBatch.pt rename to src/bika/coa/reports/AWTCBatchMulti.pt diff --git a/src/bika/coa/reports/MultiGeochemistryBatch.pt b/src/bika/coa/reports/GeoAngolBatchMulti.pt similarity index 100% rename from src/bika/coa/reports/MultiGeochemistryBatch.pt rename to src/bika/coa/reports/GeoAngolBatchMulti.pt diff --git a/src/bika/coa/reports/MultiGeochemistry.pt b/src/bika/coa/reports/GeoAngolMulti.pt similarity index 100% rename from src/bika/coa/reports/MultiGeochemistry.pt rename to src/bika/coa/reports/GeoAngolMulti.pt diff --git a/src/bika/coa/reports/MultiSampleTransposed.pt b/src/bika/coa/reports/ZimlabsTransposedMulti.pt similarity index 100% rename from src/bika/coa/reports/MultiSampleTransposed.pt rename to src/bika/coa/reports/ZimlabsTransposedMulti.pt From 308947b70a046f8cc5eef225210f2c25b5fe4b1d Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 12 Jun 2023 14:01:02 +0200 Subject: [PATCH 046/126] Applied Verifiers in GreenhillMulti.pt --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 5 +- src/bika/coa/reports/GreenhillMulti.pt | 85 ++++++++++---------- src/bika/coa/reportview.py | 4 +- 3 files changed, 51 insertions(+), 43 deletions(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index 7f0aff0..df961d4 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -565,9 +565,12 @@

Publisher

- +

+ +

+ diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index a39f57c..e6ce610 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -550,48 +550,51 @@

- - - - -
-
-

Managers Responsible

- - - - - - - - - -
-
- -
-
- -   - -
-
- -
-
- -
- 		-
Published by
-
- -
-
-
-
- + + +
+ + + + + + + + + + + + + + +
+

Publisher

+ 		+

+

+

+

+

Authorised by

+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ Date: Mon, 12 Jun 2023 14:30:30 +0200 Subject: [PATCH 047/126] Fixed error --- src/bika/coa/reportview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index b076834..1109b9c 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -849,7 +849,7 @@ def get_publisher(self): return publisher publisher["email"] = '{}'.format(user.getEmailAddress()) - publisher["jobtile"] = contact.getJobTitle() + publisher["jobtile"] = user.getJobTitle() if user.getSalutation(): publisher["publisher"] = '{}. {}'.format(user.getSalutation(), user.getFullname()) else: From fd567c091b00165ee7a8510c6caafb03b722455e Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 12 Jun 2023 14:57:33 +0200 Subject: [PATCH 048/126] Minor fixes --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 11 ++++------- src/bika/coa/reports/GreenhillMulti.pt | 9 +++------ src/bika/coa/reportview.py | 17 ++++++++++------- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index df961d4..ba5c054 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -565,11 +565,8 @@

Publisher

- -

- - -

+ +

@@ -581,14 +578,14 @@
-
- +
diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index e6ce610..863c83d 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -560,11 +560,8 @@

Publisher

- -

- - -

+ +

@@ -583,7 +580,7 @@

- +
diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index 1109b9c..56bec25 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -231,7 +231,7 @@ def get_verifier_by_analysis(self, model): date_verified = self.to_localized_time(model.getDateVerified()) contact = api.get_user_contact(user_obj) verifier = {"fullname": "", "role": "", "email": "", "verifier": "", - "signature": "", "jobtile": "", "default_department": "",} + "signature": "", "jobtitle": "", "default_department": "",} if not contact: return verifier @@ -239,7 +239,7 @@ def get_verifier_by_analysis(self, model): verifier["role"] = roles[0] verifier["date_verified"] = date_verified verifier["email"] = contact.getEmailAddress() - verifier["jobtile"] = contact.getJobTitle() + verifier["jobtitle"] = contact.getJobTitle() if contact.getDefaultDepartment(): default_department = contact.getDefaultDepartment().Title() verifier["default_department"] = default_department @@ -815,7 +815,7 @@ def get_verifier_by_analysis(self, model): date_verified = self.to_localized_time(model.getDateVerified()) contact = api.get_user_contact(user_obj) verifier = {"fullname": "", "role": "", "email": "", "verifier": "", - "signature": "", "jobtile": "", "default_department": "",} + "signature": "", "jobtitle": "", "default_department": "",} if not contact: return verifier @@ -823,7 +823,7 @@ def get_verifier_by_analysis(self, model): verifier["role"] = roles[0] verifier["date_verified"] = date_verified verifier["email"] = contact.getEmailAddress() - verifier["jobtile"] = contact.getJobTitle() + verifier["jobtitle"] = contact.getJobTitle() if contact.getDefaultDepartment(): default_department = contact.getDefaultDepartment().Title() verifier["default_department"] = default_department @@ -840,7 +840,7 @@ def get_verifier_by_analysis(self, model): def get_publisher(self): publisher = { "today":"{}".format(DateTime().strftime("%Y-%m-%d")), - "email": "", "jobtile": ""} + "email": "", "jobtitle": ""} current_user = api.get_current_user() user = api.get_user_contact(current_user) publisher["user_url"] = "" @@ -849,13 +849,16 @@ def get_publisher(self): return publisher publisher["email"] = '{}'.format(user.getEmailAddress()) - publisher["jobtile"] = user.getJobTitle() + publisher["jobtitle"] = user.getJobTitle() if user.getSalutation(): publisher["publisher"] = '{}. {}'.format(user.getSalutation(), user.getFullname()) else: publisher["publisher"] = '{}'.format(user.getFullname()) - if user.Signature: + if user.getSignature(): publisher["user_url"] = user.absolute_url() + jobtitle = publisher["jobtitle"] + fullname = publisher["publisher"] + publisher["publisher_job"] = "{} - {}".format(fullname, jobtitle) return publisher From 3ae260545a4198e20d7d9a675ad7d20394de762a Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 12 Jun 2023 15:08:48 +0200 Subject: [PATCH 049/126] Typo --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index ba5c054..28797d8 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -578,7 +578,7 @@
-
From 0438df5a49e3af24c3a9ccb50e75b278303c9dce Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 12 Jun 2023 15:23:19 +0200 Subject: [PATCH 050/126] Take out date_verified --- src/bika/coa/reportview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index 56bec25..41e9345 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -821,7 +821,7 @@ def get_verifier_by_analysis(self, model): verifier["fullname"] = contact.getFullname() verifier["role"] = roles[0] - verifier["date_verified"] = date_verified + # verifier["date_verified"] = date_verified verifier["email"] = contact.getEmailAddress() verifier["jobtitle"] = contact.getJobTitle() if contact.getDefaultDepartment(): From 35fa45f24f9320ea7210b2463a421b25a1084882 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 12 Jun 2023 15:50:27 +0200 Subject: [PATCH 051/126] Override and TemplateFinder resources --- src/bika/coa/browser/overrides.zcml | 4 ++++ src/bika/coa/browser/utils.py | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 src/bika/coa/browser/utils.py diff --git a/src/bika/coa/browser/overrides.zcml b/src/bika/coa/browser/overrides.zcml index 1f480a0..6ab74d9 100644 --- a/src/bika/coa/browser/overrides.zcml +++ b/src/bika/coa/browser/overrides.zcml @@ -49,5 +49,9 @@ layer="bika.lims.interfaces.IBikaLIMS" /> + + diff --git a/src/bika/coa/browser/utils.py b/src/bika/coa/browser/utils.py new file mode 100644 index 0000000..1d29c58 --- /dev/null +++ b/src/bika/coa/browser/utils.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- + +from operator import attrgetter +from plone.resource.utils import iterDirectoriesOfType +from senaite.impress.template import TemplateFinder as TF + + +class TemplateFinder(TF): + + @property + def resources(self): + out = [] + directories = iterDirectoriesOfType(self.type) + sorted_directories = sorted(directories, key=attrgetter('__name__')) + for resource in sorted_directories: + out.append({ + "name": resource.__name__, + "path": resource.directory, + "contents": resource.listDirectory(), + }) + return out From 68fb7bd5dc783d5df8d76b033ff297f5486704ec Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 12 Jun 2023 16:36:06 +0200 Subject: [PATCH 052/126] Sort on get_templates and not resources --- src/bika/coa/browser/utils.py | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/bika/coa/browser/utils.py b/src/bika/coa/browser/utils.py index 1d29c58..921cf79 100644 --- a/src/bika/coa/browser/utils.py +++ b/src/bika/coa/browser/utils.py @@ -1,21 +1,27 @@ # -*- coding: utf-8 -*- -from operator import attrgetter -from plone.resource.utils import iterDirectoriesOfType +import os from senaite.impress.template import TemplateFinder as TF class TemplateFinder(TF): - @property - def resources(self): - out = [] - directories = iterDirectoriesOfType(self.type) - sorted_directories = sorted(directories, key=attrgetter('__name__')) - for resource in sorted_directories: - out.append({ - "name": resource.__name__, - "path": resource.directory, - "contents": resource.listDirectory(), - }) - return out + 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 From 63ca40de411abd30a2fdb0a2e66268aeb1be5043 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 12 Jun 2023 21:25:05 +0200 Subject: [PATCH 053/126] Fix error, from previous commit --- src/bika/coa/reportview.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index 41e9345..f56aec2 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -840,7 +840,7 @@ def get_verifier_by_analysis(self, model): def get_publisher(self): publisher = { "today":"{}".format(DateTime().strftime("%Y-%m-%d")), - "email": "", "jobtitle": ""} + "email": "", "jobtitle": "", "publisher_job": "",} current_user = api.get_current_user() user = api.get_user_contact(current_user) publisher["user_url"] = "" @@ -850,15 +850,15 @@ def get_publisher(self): publisher["email"] = '{}'.format(user.getEmailAddress()) publisher["jobtitle"] = user.getJobTitle() + jobtitle = publisher["jobtitle"] + fullname = publisher["publisher"] + publisher["publisher_job"] = "{} - {}".format(fullname, jobtitle) if user.getSalutation(): publisher["publisher"] = '{}. {}'.format(user.getSalutation(), user.getFullname()) else: publisher["publisher"] = '{}'.format(user.getFullname()) if user.getSignature(): publisher["user_url"] = user.absolute_url() - jobtitle = publisher["jobtitle"] - fullname = publisher["publisher"] - publisher["publisher_job"] = "{} - {}".format(fullname, jobtitle) return publisher From 4338adff30b774e1b4f0171fe1de637aac431b0a Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 12 Jun 2023 22:28:46 +0200 Subject: [PATCH 054/126] Missing from last commit --- src/bika/coa/reportview.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index f56aec2..56b0f14 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -850,13 +850,13 @@ def get_publisher(self): publisher["email"] = '{}'.format(user.getEmailAddress()) publisher["jobtitle"] = user.getJobTitle() - jobtitle = publisher["jobtitle"] - fullname = publisher["publisher"] - publisher["publisher_job"] = "{} - {}".format(fullname, jobtitle) if user.getSalutation(): publisher["publisher"] = '{}. {}'.format(user.getSalutation(), user.getFullname()) else: publisher["publisher"] = '{}'.format(user.getFullname()) + fullname = publisher["publisher"] + jobtitle = publisher["jobtitle"] + publisher["publisher_job"] = "{} - {}".format(fullname, jobtitle) if user.getSignature(): publisher["user_url"] = user.absolute_url() From 5e7238f1e7a628537493bb24fc0a0081a5ceef50 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 12 Jun 2023 22:56:11 +0200 Subject: [PATCH 055/126] Date seperator --- src/bika/coa/reportview.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index 56b0f14..3b7f770 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -413,11 +413,11 @@ def get_verified_dates(self,samples): all_dates.append(date_verified) all_dates.sort() if len(all_dates) > 1: - verified_from = all_dates[0].strftime('%d/%m/%Y') - verified_to = all_dates[-1].strftime('%d/%m/%Y') + verified_from = all_dates[0].strftime('%d-%m-%Y') + verified_to = all_dates[-1].strftime('%d-%m-%Y') if len(all_dates) == 1: - verified_from = all_dates[0].strftime('%d/%m/%Y') - verified_to = all_dates[0].strftime('%d/%m/%Y') + verified_from = all_dates[0].strftime('%d-%m-%Y') + verified_to = all_dates[0].strftime('%d-%m-%Y') return [verified_from,verified_to] def get_analyzed_dates(self,samples): @@ -506,7 +506,7 @@ def get_received_dates(self, samples): all_dates.append(date_received) all_dates.sort() if len(all_dates) > 0: - earliest_creation_date = all_dates[0].strftime('%d/%m/%Y') + earliest_creation_date = all_dates[0].strftime('%d-%m-%Y') else: return None return earliest_creation_date From e34b988767b13cd5750f9bb94e34e23853a71689 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 12 Jun 2023 23:05:17 +0200 Subject: [PATCH 056/126] LIMS-412 Date consistency --- src/bika/coa/reportview.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index 3b7f770..a044bff 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -413,11 +413,11 @@ def get_verified_dates(self,samples): all_dates.append(date_verified) all_dates.sort() if len(all_dates) > 1: - verified_from = all_dates[0].strftime('%d-%m-%Y') - verified_to = all_dates[-1].strftime('%d-%m-%Y') + verified_from = self.to_localized_date(all_dates[0]) + verified_to = self.to_localized_date(all_dates[-1]) if len(all_dates) == 1: - verified_from = all_dates[0].strftime('%d-%m-%Y') - verified_to = all_dates[0].strftime('%d-%m-%Y') + verified_from = self.to_localized_date(all_dates[0]) + verified_to = self.to_localized_date(all_dates[0]) return [verified_from,verified_to] def get_analyzed_dates(self,samples): @@ -506,7 +506,7 @@ def get_received_dates(self, samples): all_dates.append(date_received) all_dates.sort() if len(all_dates) > 0: - earliest_creation_date = all_dates[0].strftime('%d-%m-%Y') + earliest_creation_date = self.to_localized_date(all_dates[0]) else: return None return earliest_creation_date From 514924ea83854f3031914ac1985f168ecded1602 Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Tue, 13 Jun 2023 17:05:01 +0200 Subject: [PATCH 057/126] Lims 397 max column num (#16) * different get pages method for ghill * clean up * Adding a max column num for samples with long names * Reduced column widths --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 20 +++++++------- src/bika/coa/reports/GreenhillMulti.pt | 20 +++++++------- src/bika/coa/reportview.py | 29 ++++++++++++++++++++ 3 files changed, 49 insertions(+), 20 deletions(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index 28797d8..7cec2f9 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.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_long_names(options); report_images python:view.get_extended_report_images(); styles python:view.get_coa_styles(); "> @@ -381,7 +381,7 @@ Sample ID - +
@@ -392,7 +392,7 @@ Client Sample ID - +
@@ -402,7 +402,7 @@
Sample Type
- +
@@ -413,7 +413,7 @@
Sample Condition
- +
@@ -430,7 +430,7 @@
Date Sampled
- +
@@ -441,7 +441,7 @@
Date Received
- +
@@ -452,7 +452,7 @@
Date Verified
- +
@@ -470,7 +470,7 @@ Verifier Unit - Result + Result @@ -500,7 +500,7 @@ - @@ -322,7 +322,7 @@ Sample ID - +
@@ -333,7 +333,7 @@ Client Sample ID - +
@@ -343,7 +343,7 @@
Sample Type
- +
@@ -354,7 +354,7 @@
Sample Point
- +
@@ -365,7 +365,7 @@
Date Sampled
- +
@@ -376,7 +376,7 @@
Date Received
- +
@@ -387,7 +387,7 @@
Date Verified
- +
@@ -405,7 +405,7 @@ Verifier Unit - Result + Result @@ -426,7 +426,7 @@ - 0: + pages.append(new_page) + logger.info("Last page len = {}".format(len(new_page))) + return pages + def get_received_dates(self, samples): earliest_creation_date = "" all_dates = [] From 20b2bda487c13c140aef849bf2c7c0e3cfe3debc Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Tue, 13 Jun 2023 17:54:38 +0200 Subject: [PATCH 058/126] Disclamer --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 30 +++++++++++++--- src/bika/coa/reports/GreenhillMulti.pt | 37 ++++++++++++++++++++ 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index 7cec2f9..52db9e1 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -604,11 +604,31 @@

Disclaimers

    -
  1. The results apply only to the samples / items as received, tested, and described above.
    2. -
  2. Where customer-provided details will affect the validity of the results, cannot be held liable if this information is not received, or supplied incorrectly.
    3. -
  3. This test report shall not be reproduced except in full, and not without written approval of .
    4. -
  4. Our interpretation of the results is for your benefit as guidance, for which we cannot be held liable if misinterpreted or misapplied.
    5. -
  5. D = Detected / ND = Not Detected
    6. +
  6. + The results apply only to the samples / items as received, tested, and described above. +
    7. +
  7. Where customer-provided details will affect the validity of the results, + cannot be held + liable if this information is not received, or supplied incorrectly. +
    8. +
  8. + Where a deviation has been noted, the validity of the results + may be affected - results should be used with this + consideration in mind. +
    9. +
  9. + This test report shall not be reproduced except in full, + and not without written approval of GreenHill Laboratories. +
    10. +
  10. + Our interpretation of the results is for your benefit as + guidance, for which we cannot be held liable if + misinterpreted or misapplied. +
    11. +
  11. + Any opinions and interpretations expressed herein are outside + the scope of accreditation. +
diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index e317c28..383dcaf 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -638,6 +638,43 @@
+ + +
+
+

Disclaimers

+
    +
  1. + The results apply only to the samples / items as received, tested, and described above. +
    2. +
  2. Where customer-provided details will affect the validity of the results, + cannot be held + liable if this information is not received, or supplied incorrectly. +
    3. +
  3. + Where a deviation has been noted, the validity of the results + may be affected - results should be used with this + consideration in mind. +
    4. +
  4. + This test report shall not be reproduced except in full, + and not without written approval of GreenHill Laboratories. +
    5. +
  5. + Our interpretation of the results is for your benefit as + guidance, for which we cannot be held liable if + misinterpreted or misapplied. +
    6. +
  6. + Any opinions and interpretations expressed herein are outside + the scope of accreditation. +
    7. +
+
+
+
+ + From 9cfbe5e52bbb9ffec58a30390d78ac4df5abb225 Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Thu, 15 Jun 2023 10:52:06 +0200 Subject: [PATCH 059/126] table head not fitting on page (#17) --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index 52db9e1..d8dd423 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -376,6 +376,7 @@ +
@@ -528,6 +529,7 @@
+
From ffa0d0cf28a51ad9e5caefac34e22193b19798de Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 19 Jun 2023 10:10:45 +0200 Subject: [PATCH 060/126] LIMS-420, LIMS-427 --- src/bika/coa/reports/GreenhillMulti.pt | 140 ++++++++++++++----------- src/bika/coa/reportview.py | 4 +- 2 files changed, 81 insertions(+), 63 deletions(-) diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index 383dcaf..3c75a67 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -15,7 +15,7 @@ content_width options/content_width|nothing; content_height options/content_height|nothing; pages python:view.get_pages_long_names(options); - report_images python:view.get_report_images(); + report_images python:view.get_extended_report_images(); styles python:view.get_coa_styles(); "> @@ -51,11 +51,14 @@ +
@@ -133,7 +161,6 @@ -
@@ -274,7 +301,6 @@ -
@@ -303,7 +329,8 @@
- +
+ @@ -317,6 +344,7 @@

+
@@ -352,11 +380,17 @@ @@ -399,26 +433,35 @@ - + + + - + - + -
-
Sample Point
+
Sample Condition
 -
+ +
+ + +
+
- - MethodMethod VerifierUnitUnit ResultResult
- + + + + + + + + + + - + @@ -454,11 +497,14 @@
+
+ +
@@ -593,51 +639,23 @@ - - -
-
-
- - - - Result out of client specified range. -
-
- Not invoiced -
-
- - - - Methods included in the - - schedule of Accreditation for this Laboratory. Analysis remarks are not - accredited - -
-
- 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 % confidence level + + +
+
+

Legend

+
+
+

Accredited methods

+
+
+

South African Veterinary Council registered

+
+
+

Subcontracted methods

+
-
-
- +
diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index 126fd96..a69842e 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -265,9 +265,9 @@ def __init__(self, collection, request): def get_pages(self, options): if options.get("orientation", "") == "portrait": - num_per_page = 5 + num_per_page = 4 elif options.get("orientation", "") == "landscape": - num_per_page = 8 + num_per_page = 6 else: logger.error("get_pages: orientation unknown") num_per_page = 5 From e82b82ebbc6eabddad81ba95558798e997bb7433 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 19 Jun 2023 10:13:58 +0200 Subject: [PATCH 061/126] Changed number of samples on report to be 7 --- src/bika/coa/reportview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index a69842e..e49eaae 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -267,7 +267,7 @@ def get_pages(self, options): if options.get("orientation", "") == "portrait": num_per_page = 4 elif options.get("orientation", "") == "landscape": - num_per_page = 6 + num_per_page = 7 else: logger.error("get_pages: orientation unknown") num_per_page = 5 From 79a506fa10f98d08ec0ad3d32e810312584e6e83 Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Mon, 19 Jun 2023 17:28:53 +0200 Subject: [PATCH 062/126] Sort Key requirement removed from GhillMulti (#20) --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 2 +- src/bika/coa/reportview.py | 30 +++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index d8dd423..c0c917b 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -475,7 +475,7 @@ - diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index e49eaae..f8b610c 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -540,8 +540,36 @@ def get_received_dates(self, samples): return None return earliest_creation_date - def get_common_row_data_green(self, collection, poc, category): + model = collection[0] + analyses = self.get_analyses_by(collection, poc=poc, category=category) + common_data = [] + for analysis in analyses: + datum = [analysis.Title(), "-", + model.get_formatted_unit(analysis), "-", + False, False, False, "-"] + if analysis.Method: + datum[1] = analysis.Method.Title() + datum[4] = self.is_analysis_accredited(analysis) + datum[5] = self.is_analysis_method_subcontracted(analysis) + datum[6] = self.is_analysis_method_savcregistered(analysis) + verifier = self.get_verifier_by_analysis(analysis) + datum[7] = verifier.get("verifier", "-") + instruments = analysis.getAnalysisService().getInstruments() + # TODO: Use getInstruments + instr_list = [] + if instruments: + for i, instrument in enumerate(instruments): + title = instrument.Title() + if title in instr_list: + continue + instr_list.append(title) + datum[3] = " ".join(instr_list) + common_data.append(datum) + unique_data = self.uniquify_items(common_data) + return unique_data + + def get_common_row_data_green_dalrrd(self, collection, poc, category): model = collection[0] analyses = self.get_analyses_by(collection, poc=poc, category=category) common_data = [] From f74540a54af777cbd30c85e68f82940257826ae7 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 19 Jun 2023 17:37:25 +0200 Subject: [PATCH 063/126] Default values for verifier --- src/bika/coa/reportview.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index f8b610c..37cbc28 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -222,21 +222,22 @@ def get_coa_styles(self): def get_verifier_by_analysis(self, model): analysis = api.get_object(model) actor = getTransitionUsers(analysis, "verify") + verifier = {"fullname": "", "role": "", "email": "", "verifier": "", + "signature": "", "jobtitle": "", "default_department": "", + } if not actor: - return {"verifier": '', "email": ""} + return verifier user_name = actor[0] if actor else "" user_obj = api.get_user(user_name) roles = ploneapi.user.get_roles(username=user_name) date_verified = self.to_localized_time(model.getDateVerified()) contact = api.get_user_contact(user_obj) - verifier = {"fullname": "", "role": "", "email": "", "verifier": "", - "signature": "", "jobtitle": "", "default_department": "",} if not contact: return verifier verifier["fullname"] = contact.getFullname() - verifier["role"] = roles[0] + verifier["role"] = roles[0] verifier["date_verified"] = date_verified verifier["email"] = contact.getEmailAddress() verifier["jobtitle"] = contact.getJobTitle() @@ -863,16 +864,17 @@ def get_verifier(self, collection): def get_verifier_by_analysis(self, model): analysis = api.get_object(model) actor = getTransitionUsers(analysis, "verify") + verifier = {"fullname": "", "role": "", "email": "", "verifier": "", + "signature": "", "jobtitle": "", "default_department": "", + } if not actor: - return {"verifier": '', "email": ""} + return verifier user_name = actor[0] if actor else "" user_obj = api.get_user(user_name) roles = ploneapi.user.get_roles(username=user_name) date_verified = self.to_localized_time(model.getDateVerified()) contact = api.get_user_contact(user_obj) - verifier = {"fullname": "", "role": "", "email": "", "verifier": "", - "signature": "", "jobtitle": "", "default_department": "",} if not contact: return verifier From 2d9c1aae7841f21abd4a613cace4a3501fb00c15 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 19 Jun 2023 20:31:39 +0200 Subject: [PATCH 064/126] LIMS-431 --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 1 - src/bika/coa/reports/GreenhillMulti.pt | 1 - 2 files changed, 2 deletions(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index c0c917b..960d1b1 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -521,7 +521,6 @@ - diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index 3c75a67..262e70a 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -489,7 +489,6 @@ - From 551c3900505ab624ed83537fd288b0bd97bd0197 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Tue, 20 Jun 2023 08:26:10 +0200 Subject: [PATCH 065/126] Added SamplePoint --- src/bika/coa/reports/GreenhillMulti.pt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index 262e70a..3c5af14 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -377,6 +377,17 @@ + + + +
Sample Point
+ + +
+ + + From 7ba98fc8586bf63c8e4420b50f6733ae6415fdac Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Tue, 20 Jun 2023 14:51:39 +0200 Subject: [PATCH 066/126] Lims 396 rename coas (#21) * Changing coa names * Swop names for Geonangol multis --- src/bika/coa/reports/{GeoAngolMulti.pt => GeoangolBatchMulti.pt} | 0 src/bika/coa/reports/{GeoAngolBatchMulti.pt => GeoangolMulti.pt} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/bika/coa/reports/{GeoAngolMulti.pt => GeoangolBatchMulti.pt} (100%) rename src/bika/coa/reports/{GeoAngolBatchMulti.pt => GeoangolMulti.pt} (100%) diff --git a/src/bika/coa/reports/GeoAngolMulti.pt b/src/bika/coa/reports/GeoangolBatchMulti.pt similarity index 100% rename from src/bika/coa/reports/GeoAngolMulti.pt rename to src/bika/coa/reports/GeoangolBatchMulti.pt diff --git a/src/bika/coa/reports/GeoAngolBatchMulti.pt b/src/bika/coa/reports/GeoangolMulti.pt similarity index 100% rename from src/bika/coa/reports/GeoAngolBatchMulti.pt rename to src/bika/coa/reports/GeoangolMulti.pt From 7be356663925afb50a202897de2caeadc76699b2 Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Thu, 22 Jun 2023 14:37:48 +0200 Subject: [PATCH 067/126] Lims 419 new coa rows (#23) * Changes to DALRRD and Green Multi * Removed batch header and fixed sample point * added title for sample point * Added condition for sample point --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 28 +- src/bika/coa/reports/GreenhillMulti.pt | 1058 +++++++++--------- 2 files changed, 569 insertions(+), 517 deletions(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index 960d1b1..d9b9897 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -280,9 +280,6 @@

Certificate of Analysis

-
-

-

@@ -294,6 +291,16 @@ received_date python: view.get_received_dates(collection);"> + + + + + + + + + + + + - - - @@ -561,123 +568,6 @@ - - - - - - - - - - - - - - - -
diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index 37cbc28..dcf5ff0 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -186,7 +186,11 @@ def get_report_images(self): outofrange_symbol_url = "{}/++resource++bika.coa.images/outofrange.png".format( self.portal_url ) - datum = {"outofrange_symbol_url": outofrange_symbol_url} + accredited_symbol_url = "{}/++resource++bika.coa.images/star.png".format( + self.portal_url + ) + datum = {"outofrange_symbol_url": outofrange_symbol_url, + "accredited_symbol_url": accredited_symbol_url,} return datum def get_toolbar_logo(self): @@ -252,6 +256,11 @@ def get_verifier_by_analysis(self, model): verifier["signature"] = '{}/Signature'.format(contact.absolute_url()) return verifier + + def is_analysis_accredited(self,analysis): + if analysis.Accredited: + return True + return False class MultiReportView(MRV): @@ -317,6 +326,33 @@ def get_common_row_data(self, collection, poc, category): unique_data = self.uniquify_items(common_data) return unique_data + def get_common_row_data_updated(self, collection, poc, category): + """ A version of get_common_row_data that includes + the accreditation icon and verifier column """ + model = collection[0] + analyses = self.get_analyses_by(collection, poc=poc, category=category) + common_data = [] + for analysis in analyses: + datum = [analysis.Title(), "-", model.get_formatted_unit(analysis), "-",False, ""] + verifier = self.get_verifier_by_analysis(analysis) + datum[4] = self.is_analysis_accredited(analysis) + datum[5] = verifier.get("verifier", "-") + if analysis.Method: + datum[1] = analysis.Method.Title() + instruments = analysis.getAnalysisService().getInstruments() + # TODO: Use getInstruments + instr_list = [] + if instruments: + for i, instrument in enumerate(instruments): + title = instrument.Title() + if title in instr_list: + continue + instr_list.append(title) + datum[3] = " ".join(instr_list) + common_data.append(datum) + unique_data = self.uniquify_items(common_data) + return unique_data + #---------------------------------- Z labs start ------------------------------------------ def get_methods_data(self,collection): analyses = self.get_analyses_by(collection) @@ -350,12 +386,21 @@ def get_zlabs_body(self): methods_list.append(analysis_service.getMethod().Title()) else: methods_list.append("") - analysis_Ids_list.append(analysis_service.Title()) + if self.is_analysis_accredited(analysis_service): + analysis_Ids_list.append(analysis_service.Title()+"accredited") + else: + analysis_Ids_list.append(analysis_service.Title()) unit_list.append(analysis_service.getUnit()) final_body_rows = [ analysis_Ids_list,methods_list,unit_list,] return eligible_analysis_services,final_body_rows + + def zlabs_is_accredited(self,service_title): + if "accredited" in service_title: + return [True,service_title.replace("accredited","")] + return [False,service_title] + def get_zlabs_analysis_request(self,samples,analysis_services,extra_column): sorted_samples = sorted(samples, key=lambda x:x.ClientSampleID) From 520d1e17e142bf26e93bebc84baa76887269e0e7 Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Fri, 23 Jun 2023 12:21:57 +0200 Subject: [PATCH 069/126] All recommended changes made (#25) --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 17 +----- src/bika/coa/reports/GreenhillMulti.pt | 58 ++++++++------------ 2 files changed, 25 insertions(+), 50 deletions(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index d9b9897..b76c2cd 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -423,11 +423,7 @@
@@ -437,15 +433,8 @@
Sample Condition
+
diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index f581215..f6652bd 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -153,15 +153,26 @@
-
- -

Certificate of Analysis

-

-

-
- - +
+ +

Certificate of Analysis

+

+

+
+ + +
+
@@ -306,25 +317,6 @@
Batch +
+
Client Order Number +
+
Container @@ -409,6 +416,21 @@
+
Sample Point
+ 		+
+
+
diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index 3c5af14..f581215 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -140,8 +140,17 @@ + + +
+

Please make sure all Samples are on the same batch

+
+ + + + - +
@@ -159,558 +168,579 @@ - -
-
- - - - - - - - - - - +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Client - -
- -
Contact - -
- -
Physical Address - -
-
-
-
-
- -
Email Address - -
- -
Date Published
Published by - - - () - -
- 		- - - - + - - -
- -
-
-
-
-
- Supervisor: -
-
-
-
-
+ + + +
+
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Batch +
+
Client Order Number +
+
Client + +
+ +
Contact + +
+ +
Physical Address + +
+
+
+
+
+ +
Email Address + +
+ +
Date Published
Published by + + + () + +
Batch Remarks +
+
+ 		+ + + + - -
+ +
+
+
- -
- - -
- -
-
+
+ Supervisor: +
-
-
-
-
-
-
-
-
- -
-
-
+
+
+
+
+ +
+ + +
+ +
+
+
+
+
+
+
+
+
+
+
+ +
+ +
+
+ + + + +
+ +
- - - - -
- -
-
+
+
+
- -
- + - - -
-
- -
-

-
This Analysis Request has been invalidated due to erroneously published results
- - This Analysis request has been replaced by - - -
+ + +
+
+ +
+

+
This Analysis Request has been invalidated due to erroneously published results
+ + This Analysis request has been replaced by + + +
-
-

-
Provisional report
-
- +
+

+
Provisional report
+
+ +
-
- + -
- - -
-
-

Results

+
+ + +
+
+

Results

- - - -

+ + + +

- -
- - - - - - + + + + + + + + + + + + + + + +
Sample ID -
+ +
+ + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + tal:content="python:model.getDateVerified() and view.to_localized_date(model.getDateVerified()) or '-'"> + + + + + + + + + + + + + + + + - - - - - - - - - + - - - - - - - - - -
Sample ID +
+
+ Client Sample ID + +
+
+
Sample Type
+ 		+
+
+
Sample Point
- Client Sample ID + +
+
+
Sample Condition
 -
+ +
+ + +
+
-
Sample Type
+
Date Sampled
+ tal:content="python:model.DateSampled and view.to_localized_date(model.DateSampled) or '-'">
-
Sample Point
- 		-
-
-
Sample Condition
- 		- + +
+
Date Received
+
- - + tal:content="python:model.DateReceived and view.to_localized_date(model.DateReceived) or '-'">
+
+
Date Verified
+
- -
-
Date Sampled
- 		-
-
-
Date Received
- 		-
-
-
Date Verified
- 		-
-
- - MethodVerifierUnitResult
+ + MethodVerifierUnitResult
- - - - - - - - - - - - - - - - - - - - - - - - - +
+ + -
-
- - + + + + + + + + +
+ + + + + + + + - + + + + + + +
+
+ + +
-
- - -
+ + +
- - - -
-
-

Results Interpretation for

- -

Department

-
- + + + +
+
+

Results Interpretation for

+ +

Department

+
+ +
-
- - + + - - + + + + --> - - - -
-
-

Remarks for

-
-
+ + + +
+
+

Remarks for

+
+
+
+
-
-
- - + + - - -
- - -

- Attachments for -

- - - - - - + + + + + + + +
-
- -
-
- Attachment for - -
-
- -
-
- Filename: - -
-
-
+ + +
+ + +

+ Attachments for +

+ + + + + + + +
+
+ +
+
+ Attachment for + +
+
+ +
+
+ Filename: + +
+
+
+
+ + +
+ + + +
+ + + + -
+

Publisher

+ 		+

- - -
- - - -
- - - - - - - - - - - - - -
-

Publisher

- 		-

-

-

Authorised by

-
-
- -
-
- -
-
- -
-
- -
-
-
- - +
+

Authorised by

+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + - -
-
-

Legend

-
-
-

Accredited methods

-
-
-

South African Veterinary Council registered

-
-
-

Subcontracted methods

+ +
+
+

Legend

+
+
+

Accredited methods

+
+
+

South African Veterinary Council registered

+
+
+

Subcontracted methods

+
+ + + +
+
+

Disclaimers

+
    +
  1. + The results apply only to the samples / items as received, tested, and described above. +
    2. +
  2. Where customer-provided details will affect the validity of the results, + cannot be held + liable if this information is not received, or supplied incorrectly. +
    3. +
  3. + Where a deviation has been noted, the validity of the results + may be affected - results should be used with this + consideration in mind. +
    4. +
  4. + This test report shall not be reproduced except in full, + and not without written approval of GreenHill Laboratories. +
    5. +
  5. + Our interpretation of the results is for your benefit as + guidance, for which we cannot be held liable if + misinterpreted or misapplied. +
    6. +
  6. + Any opinions and interpretations expressed herein are outside + the scope of accreditation. +
    7. +
- - - -
-
-

Disclaimers

-
    -
  1. - The results apply only to the samples / items as received, tested, and described above. -
    2. -
  2. Where customer-provided details will affect the validity of the results, - cannot be held - liable if this information is not received, or supplied incorrectly. -
    3. -
  3. - Where a deviation has been noted, the validity of the results - may be affected - results should be used with this - consideration in mind. -
    4. -
  4. - This test report shall not be reproduced except in full, - and not without written approval of GreenHill Laboratories. -
    5. -
  5. - Our interpretation of the results is for your benefit as - guidance, for which we cannot be held liable if - misinterpreted or misapplied. -
    6. -
  6. - Any opinions and interpretations expressed herein are outside - the scope of accreditation. -
    7. -
-
-
- - - - - -
- - -
-
- +
+ + + + +
+ + +
+
+ + From 046454aa7ac2b7bedd534fc493e44444f36a5a69 Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Thu, 22 Jun 2023 14:47:14 +0200 Subject: [PATCH 068/126] Lims 435 accredited icon missing (#22) * accredited icon added for coas * Fix Single coa accredited url error --- src/bika/coa/reports/GeoangolBatchMulti.pt | 5 +- src/bika/coa/reports/Multi.pt | 23 +--- src/bika/coa/reports/Single.pt | 7 +- .../coa/reports/ZimlabsTransposedMulti.pt | 128 ++---------------- src/bika/coa/reportview.py | 49 ++++++- 5 files changed, 68 insertions(+), 144 deletions(-) diff --git a/src/bika/coa/reports/GeoangolBatchMulti.pt b/src/bika/coa/reports/GeoangolBatchMulti.pt index 6ec80a6..a470ea8 100644 --- a/src/bika/coa/reports/GeoangolBatchMulti.pt +++ b/src/bika/coa/reports/GeoangolBatchMulti.pt @@ -478,9 +478,12 @@
+ + + diff --git a/src/bika/coa/reports/Multi.pt b/src/bika/coa/reports/Multi.pt index a39f57c..11dd1fc 100644 --- a/src/bika/coa/reports/Multi.pt +++ b/src/bika/coa/reports/Multi.pt @@ -409,16 +409,19 @@
+ + + - + @@ -477,22 +480,6 @@ - - - diff --git a/src/bika/coa/reports/Single.pt b/src/bika/coa/reports/Single.pt index 44aaa34..7becf0c 100644 --- a/src/bika/coa/reports/Single.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', {}); @@ -420,8 +419,8 @@
+ @@ -645,8 +644,8 @@
- + + Methods included in the diff --git a/src/bika/coa/reports/ZimlabsTransposedMulti.pt b/src/bika/coa/reports/ZimlabsTransposedMulti.pt index 682a6a6..8068048 100644 --- a/src/bika/coa/reports/ZimlabsTransposedMulti.pt +++ b/src/bika/coa/reports/ZimlabsTransposedMulti.pt @@ -533,8 +533,15 @@
-
+
+ + + + + + +
-
+ tal:content="python:model.getSamplePointTitle() or '-'"/>
- -
- - -
- -
- - - - - -
- -
-
@@ -424,14 +416,8 @@
Sample Condition
- -
- - -
- +
From 96243cd39e5ba42caa993a96b60ae6dfd55c6438 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Tue, 27 Jun 2023 09:09:04 +0200 Subject: [PATCH 070/126] Removed thead and tbody so that hearder block doesn't get rendered the second page Fixed bug so that every page shows the hearder block --- src/bika/coa/reports/Multi.pt | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/bika/coa/reports/Multi.pt b/src/bika/coa/reports/Multi.pt index 11dd1fc..4ee1e2a 100644 --- a/src/bika/coa/reports/Multi.pt +++ b/src/bika/coa/reports/Multi.pt @@ -318,7 +318,6 @@ - @@ -330,7 +329,7 @@ - - - - - - - - - + @@ -455,8 +452,8 @@ -
Sample ID
+ Client Sample ID @@ -340,7 +339,7 @@
+
Sample Type
 @@ -351,7 +350,7 @@
+
Sample Point
 @@ -362,7 +361,7 @@
+
Date Sampled
 @@ -373,7 +372,7 @@
+
Date Received
 @@ -384,7 +383,7 @@
+
Date Verified
 @@ -393,11 +392,9 @@
+
From 88852c37e3afb16c95cbec1fe1d30d7c2b86db10 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Tue, 27 Jun 2023 10:42:57 +0200 Subject: [PATCH 071/126] Fix cell width and copied bugfix from multi to the green coas --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 30 ++++++++++---------- src/bika/coa/reports/GreenhillMulti.pt | 30 ++++++++++---------- src/bika/coa/reports/Multi.pt | 14 ++++----- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index b76c2cd..e2a76a3 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -389,7 +389,7 @@ Sample ID - +
@@ -397,20 +397,20 @@ - + Client Sample ID - +
- +
Sample Type
- +
@@ -418,10 +418,10 @@ - +
Sample Point
- +
@@ -429,20 +429,20 @@ - +
Sample Condition
- +
- +
Date Sampled
- +
@@ -450,10 +450,10 @@ - +
Date Received
- +
@@ -461,10 +461,10 @@ - +
Date Verified
- +
diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index f6652bd..f3832d8 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -372,7 +372,7 @@ Sample ID - +
@@ -380,20 +380,20 @@ - + Client Sample ID - +
- +
Sample Type
- +
@@ -401,10 +401,10 @@ - +
Sample Point
- +
@@ -412,10 +412,10 @@ - +
Sample Condition
- +
@@ -423,10 +423,10 @@ - +
Date Sampled
- +
@@ -434,10 +434,10 @@ - +
Date Received
- +
@@ -445,10 +445,10 @@ - +
Date Verified
- +
diff --git a/src/bika/coa/reports/Multi.pt b/src/bika/coa/reports/Multi.pt index 4ee1e2a..a60cb19 100644 --- a/src/bika/coa/reports/Multi.pt +++ b/src/bika/coa/reports/Multi.pt @@ -321,7 +321,7 @@ Sample ID - +
@@ -332,7 +332,7 @@ Client Sample ID - +
@@ -342,7 +342,7 @@
Sample Type
- +
@@ -353,7 +353,7 @@
Sample Point
- +
@@ -364,7 +364,7 @@
Date Sampled
- +
@@ -375,7 +375,7 @@
Date Received
- +
@@ -386,7 +386,7 @@
Date Verified
- +
From 6102af9c4a15527a2e250e087e900bfcac02160b Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Tue, 27 Jun 2023 14:36:54 +0200 Subject: [PATCH 072/126] Missed from last commit --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 2 +- src/bika/coa/reports/GreenhillMulti.pt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index e2a76a3..9c7293a 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -474,7 +474,7 @@ - + diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index f3832d8..6a5b529 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -458,7 +458,7 @@ - + From d157f19277c15b720da743edfa47478ba1e7da12 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Tue, 27 Jun 2023 15:15:09 +0200 Subject: [PATCH 073/126] Removed tbody and thead --- src/bika/coa/reports/GeoangolMulti.pt | 4 ---- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/bika/coa/reports/GeoangolMulti.pt b/src/bika/coa/reports/GeoangolMulti.pt index a203552..8fa517c 100644 --- a/src/bika/coa/reports/GeoangolMulti.pt +++ b/src/bika/coa/reports/GeoangolMulti.pt @@ -311,7 +311,6 @@ - @@ -351,8 +350,6 @@ - - @@ -408,7 +405,6 @@ -
Sample ID
diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index 9c7293a..6512bae 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -385,7 +385,6 @@
- @@ -470,8 +469,6 @@ - - @@ -537,7 +534,6 @@ -
Sample ID
From 5608acb256e51368d5c41fa0bede9c744a99e727 Mon Sep 17 00:00:00 2001 From: Luthando Date: Tue, 27 Jun 2023 15:41:27 +0200 Subject: [PATCH 074/126] Both table and div table --- src/bika/coa/reports/GreenhillMulti.pt | 202 +++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index f3832d8..122738e 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -113,6 +113,34 @@ border-top: 1px solid black; } + .table { + display: table; + width: 100%; + } + + .table-row { + display: table-row; + } + + .table-header { + display: table-cell; + padding: 4px; + border-top: 1px solid #ccc; + } + + .table-cell { + display: table-cell; + padding: 2px; + border-top: 1px solid #ccc; + } + + .table-header { + font-weight: bold; + } + + .colspan-4 { + grid-column: span 4; + }
+ +

Results

+ + + +

+
+
+
Sample ID
+
+
+
+ +
+
+
+ +
+
+
Client Sample ID
+
+
+
+ +
+
+
+ +
+
+
Sample Type
+
+
+
+ +
+
+
+ +
+
+
Sample Point
+
+
+
+ +
+
+
+ +
+
+
Sample Condition
+
+
+
+ +
+
+
+ +
+
+
Date Sampled
+
+
+
+ +
+
+
+ +
+
+
Date Received
+
+
+
+ +
+
+
+ +
+
+
Date Verified
+
+
+
+ +
+
+
+ +
+ +
+
+ +
+
Method
+
Verifier
+
Unit
+ +
Result
+ +
+
+
+ + + + + + + + + + +
+
+ +
+
+ +
+
+ +
+ + + + +
+ + - + + + + + + +
+ + +
+ + + +
+ +
+ + + + From d001a7bf12ca2c3d4bbfed8a818b7e01fb43bb67 Mon Sep 17 00:00:00 2001 From: Luthando Date: Tue, 27 Jun 2023 16:27:21 +0200 Subject: [PATCH 075/126] Removed older table format --- src/bika/coa/reports/GreenhillMulti.pt | 181 ------------------------- 1 file changed, 181 deletions(-) diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index 122738e..248780f 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -379,187 +379,6 @@
-
- - -
-
-

Results

- - - - -

- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Sample ID -
-
- Client Sample ID - -
-
-
Sample Type
- 		-
-
-
Sample Point
- 		-
-
-
Sample Condition
- 		-
-
-
Date Sampled
- 		-
-
-
Date Received
- 		-
-
-
Date Verified
- 		-
-
- - MethodVerifierUnitResult
- - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
-
- - -
- From 8082a79191fea84f118f8c48e9d727deaefd0c25 Mon Sep 17 00:00:00 2001 From: Luthando Date: Tue, 27 Jun 2023 16:40:31 +0200 Subject: [PATCH 076/126] Remove yellow highlight --- src/bika/coa/reports/GreenhillMulti.pt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index 248780f..f970060 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -486,7 +486,7 @@
-
+
Method
From c59947844daa3a6bf48a0f08a2195a2ac50200bd Mon Sep 17 00:00:00 2001 From: Luthando Date: Wed, 28 Jun 2023 10:52:24 +0200 Subject: [PATCH 077/126] remove table sm and space tal's --- src/bika/coa/reports/GreenhillMulti.pt | 51 +++++++++----------------- 1 file changed, 18 insertions(+), 33 deletions(-) diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index f970060..78d4e1b 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -387,7 +387,7 @@

-
+
Sample ID
@@ -570,22 +570,6 @@ - - - @@ -643,6 +627,7 @@
+ Legend

-
-
-

Accredited methods

-
-
-

South African Veterinary Council registered

-
-
-

Subcontracted methods

-
-
- +

Legend

+
+
+

Accredited methods

+
+
+

South African Veterinary Council registered

+
+
+

Subcontracted methods

+
+
+ +
From 8cc906483d9bfa214ea83ff2c4571189475258db Mon Sep 17 00:00:00 2001 From: Luthando Date: Wed, 28 Jun 2023 10:58:36 +0200 Subject: [PATCH 078/126] remove spacing changes --- src/bika/coa/reports/GreenhillMulti.pt | 49 +++++++++++++++++--------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index 78d4e1b..d86f5d8 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -570,6 +570,22 @@ + + + @@ -627,7 +643,6 @@
- Legend -
-
-

Accredited methods

-
-
-

South African Veterinary Council registered

-
-
-

Subcontracted methods

-
- - + +
+
+

Legend

+
+
+

Accredited methods

+
+
+

South African Veterinary Council registered

+
+
+

Subcontracted methods

+
+
+
From 31fd08dd21407c86fcd83cbaa7deb4b436cfd5d3 Mon Sep 17 00:00:00 2001 From: Luthando Date: Thu, 29 Jun 2023 10:46:14 +0200 Subject: [PATCH 079/126] Both Green tables using divs --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 371 ++++++++++--------- src/bika/coa/reports/GreenhillMulti.pt | 4 - 2 files changed, 197 insertions(+), 178 deletions(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index e2a76a3..3f1474a 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -112,7 +112,31 @@ height: 2mm; border-top: 1px solid black; } - + + .table { + display: table; + width: 100%; + } + + .table-row { + display: table-row; + } + + .table-header { + display: table-cell; + padding: 4px; + border-top: 1px solid #ccc; + } + + .table-cell { + display: table-cell; + padding: 2px; + border-top: 1px solid #ccc; + } + + .table-header { + font-weight: bold; + } - -
-
-

Results

- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Sample ID -
-
- Client Sample ID - -
-
-
Sample Type
- 		-
-
-
Sample Point
- 		-
-
-
Sample Condition
- 		-
- -
-
Date Sampled
- 		-
-
-
Date Received
- 		-
-
-
Date Verified
- 		-
-
- - MethodVerifierUnitResult
- - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - + +

Results

+ + + +

+
+
+
Sample ID
+
+
+
+ +
+
+
+ +
+
+
Client Sample ID
+
+
+
+ +
+
+
+ +
+
+
Sample Type
+
+
+
+ +
+
+
+ +
+
+
Sample Point
+
+
+
+ +
+
+
+ +
+
+
Sample Condition
+
+
+
+ +
+
+
+ +
+
+
Date Sampled
+
+
+
+ +
+
+
+ +
+
+
Date Received
+
+
+
+ +
+
+
+ +
+
+
Date Verified
+
+
+
+ +
+
+
+ +
+ +
+
+ +
+
Method
+
Verifier
+
Unit
+ +
Result
+ +
+
+
+ + + + + + + + + + +
+
+ +
+
+ +
+
+ +
+ + + + +
+ + - + + + + + + +
+ + +
+ + + +
+
-
- + + + diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index d86f5d8..61e3335 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -138,10 +138,6 @@ font-weight: bold; } - .colspan-4 { - grid-column: span 4; - } - diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index 0e56f58..f7bd1bb 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -133,6 +133,7 @@ display: table-cell; padding: 2px; border-top: 1px solid #ccc; + width: 22mm; } From 0750279d15b725dcf6f5e779424dab65cbd417e0 Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Wed, 5 Jul 2023 13:07:58 +0200 Subject: [PATCH 082/126] Lims 442, 443, 447 (#27) * New AWTC table * AWTC Cosmetics,LIMS 447 and LIMS 443 * No attachments * Added with of 25mm to columns * Fix column width value AWTC * Increase samples on coa awtc --- src/bika/coa/ajax.py | 7 +- src/bika/coa/reports/AWTCBatchMulti.pt | 371 ++++++++++++------------- src/bika/coa/reportview.py | 31 +++ 3 files changed, 214 insertions(+), 195 deletions(-) diff --git a/src/bika/coa/ajax.py b/src/bika/coa/ajax.py index f7604a1..0734510 100644 --- a/src/bika/coa/ajax.py +++ b/src/bika/coa/ajax.py @@ -72,16 +72,15 @@ def ajax_save_reports(self): sample = getAdapter(sample, ISuperModel) samples.append(sample) - csv_reports = [] is_multi_template = self.is_multi_template(template) - if template == "bika.coa:MultiGeochemistryBatch.pt": + if template == "bika.coa:GeoangolBatchMulti.pt": csv_report = self.create_geochemistry_csv_report(samples,coa_num) csv_reports = [csv_report for i in range(len(pdf_reports))] - elif template == "bika.coa:MultiBatch.pt": + elif template == "bika.coa:AWTCBatchMulti.pt": csv_report= self.create_batch_csv_reports(samples,coa_num) csv_reports = [csv_report for i in range(len(pdf_reports))] - if template == "bika.coa:MultiSampleTransposed.pt": + elif template == "bika.coa:ZimlabsTransposedMulti.pt": csv_report = self.create_zlabs_csv_report(samples,coa_num) csv_reports = [csv_report for i in range(len(pdf_reports))] elif is_multi_template: diff --git a/src/bika/coa/reports/AWTCBatchMulti.pt b/src/bika/coa/reports/AWTCBatchMulti.pt index 6ef43c5..78829cd 100644 --- a/src/bika/coa/reports/AWTCBatchMulti.pt +++ b/src/bika/coa/reports/AWTCBatchMulti.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_awtc(options); report_images python:view.get_report_images(); styles python:view.get_coa_styles(); "> @@ -87,6 +87,25 @@ height: 2mm; border-top: 1px solid black; } + .table { + display: table; + width: 100%; + } + .table-row { + display: table-row; + } + .table-header { + display: table-cell; + padding: 4px; + font-weight: bold; + border-top: 1px solid #ccc; + } + .table-cell { + display: table-cell; + padding: 2px; + border-top: 1px solid #ccc; + width: 22mm; + } + + +
+

Please make sure all Samples are on the same batch

+
+ + + - +
@@ -127,12 +154,23 @@
+
- @@ -247,35 +285,23 @@
+
+
+
+
+ +
- - - - - -
- -
-
@@ -287,7 +313,7 @@ - +
@@ -311,156 +337,135 @@
- -
-
-

Results

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Sample ID -
-
- Client Sample ID - -
-
-
Sample Type
- 		-
-
-
Sample Point
- 		-
-
-
Date Sampled
- 		-
-
-
Date Received
- 		-
-
-
Date Verified
- 		-
-
- - - - - - - - - - - - - - + define="analyses_by_poc python:view.get_analyses_by_poc(collection); + categories_by_poc python:view.get_categories_by_poc(collection)"> +

Results

+ + + +
+
+
Sample ID
+
+ +
+
+
+ +
+
+
Client Sample ID
+
+ +
+
+
+ +
+
+
Sample Type
+
+ +
+
+
+ +
+
+
Sample Point
+
+ +
+
+
+ +
+
+
Date Sampled
+
+ +
+
+
+ +
+
+
Date Received
+
+ +
+
+
+ +
+
+
Date Verified
+
+ +
+
+
+ +
+ +
+
+ +
+
+
+
+ +
+
+ +
+ + + + +
+ + - + + + + -
- - -
-
- - -

Mutli Batches found

- + +
+ + +
+ + + +
+ +
+ + + - +
- - -
-
-

QC Results for

-
-

QC Results

-
-
-
- - - --> - - +
@@ -508,7 +497,7 @@ - +
@@ -551,7 +540,7 @@ - +
@@ -593,7 +582,7 @@ -
@@ -639,7 +628,7 @@ - +
@@ -648,7 +637,7 @@ -
diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index dcf5ff0..d6f049c 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -302,6 +302,35 @@ def get_pages(self, options): logger.info("Last page len = {}".format(len(new_page))) return pages + def get_pages_awtc(self, options): + if options.get("orientation", "") == "portrait": + num_per_page = 5 + elif options.get("orientation", "") == "landscape": + num_per_page = 8 + else: + logger.error("get_pages: orientation unknown") + num_per_page = 5 + logger.info( + "get_pages: col len = {}; num_per_page = {}".format( + len(self.collection), num_per_page + ) + ) + pages = [] + new_page = [] + for idx, col in enumerate(self.collection): + if idx % num_per_page == 0: + if len(new_page): + pages.append(new_page) + logger.info("New page len = {}".format(len(new_page))) + new_page = [col] + continue + new_page.append(col) + + if len(new_page) > 0: + pages.append(new_page) + logger.info("Last page len = {}".format(len(new_page))) + return pages + def get_common_row_data(self, collection, poc, category): model = collection[0] analyses = self.get_analyses_by(collection, poc=poc, category=category) @@ -685,6 +714,8 @@ def get_common_row_data_by_poc(self, collection, poc): all_analyses = self.get_analyses_by_poc(collection) analyses = all_analyses.get(poc) common_data = [] + if not analyses: + return for analysis in analyses: datum = [analysis.Title(), "-", model.get_formatted_unit(analysis), "-"] if analysis.Method: From b21d2da76cab9f3eacb31580bbf2be895a5a5266 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Wed, 12 Jul 2023 20:10:57 +0200 Subject: [PATCH 083/126] LIMS-457 DALRRD Supervisor --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 16 +++++++++++-- src/bika/coa/reportview.py | 25 ++++++++++++++++++-- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index d2672c8..6588aa3 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -590,8 +590,7 @@ + primarymodel python:collection[0];">
@@ -624,6 +623,19 @@ +
+
+ +
+
+ +
+
+ +
+
diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index d6f049c..f11ebb9 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -5,7 +5,6 @@ from zope.component._api import getAdapters from bika.coa import logger -from bika.coa.ajax import AjaxPublishView as AP from bika.lims import api from bika.lims.api import _marker @@ -256,7 +255,7 @@ def get_verifier_by_analysis(self, model): verifier["signature"] = '{}/Signature'.format(contact.absolute_url()) return verifier - + def is_analysis_accredited(self,analysis): if analysis.Accredited: return True @@ -971,6 +970,28 @@ def get_verifier_by_analysis(self, model): return verifier + def get_lab_supervisor(self): + laboratory = self.laboratory + contact = laboratory.getSupervisor() + supervisor = {"fullname": "", "supervisor": "", + "signature": "", "jobtitle": "", + } + if not contact: + return supervisor + + supervisor["fullname"] = contact.getFullname() + supervisor["jobtitle"] = contact.getJobTitle() + if contact.getSalutation(): + salutation = contact.getSalutation() + fullname = contact.getFullname() + supervisor["supervisor"] = "{}. {}".format(salutation, fullname) + else: + supervisor["supervisor"] = "{}".format(contact.getFullname()) + if contact.getSignature(): + supervisor["signature"] = '{}/Signature'.format(contact.absolute_url()) + + return supervisor + def get_publisher(self): publisher = { From 54736e174789ecbca0320a310e75ac9556fb8157 Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Mon, 31 Jul 2023 21:39:14 +0200 Subject: [PATCH 084/126] Hydrochem methods (#28) * hydrochem methods added * Temporarily added hydrochem template to bika.coa * Removed temp hydrochem * hyd update * New get pages for hydro * location method and general hydrochem coa --- .../coa/reports/HydroChemLocationMulti.pt | 944 ++++++++++++++++++ src/bika/coa/reportview.py | 105 ++ 2 files changed, 1049 insertions(+) create mode 100644 src/bika/coa/reports/HydroChemLocationMulti.pt diff --git a/src/bika/coa/reports/HydroChemLocationMulti.pt b/src/bika/coa/reports/HydroChemLocationMulti.pt new file mode 100644 index 0000000..c18aff9 --- /dev/null +++ b/src/bika/coa/reports/HydroChemLocationMulti.pt @@ -0,0 +1,944 @@ + + + +
+
Custom Report Options
+ +
+
+
+ +
+ +
+ + Number of attachments rendered within one row per Analysis Request + +
+
+ + + + + + + + + + +
+

Samples are not from the same Location / not samples on the same date / not received on the same date

+
+ + + + + + + +
+ +
+ +

+

+
+ + +
+ +
+ + + + + + +
+
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
Contact + +
+ +
Client + +
+ +
Tel # + +
+ +
Email Address + +
+ +
+ 		+ + + + + +
+ +
+
+ Supervisor: +
+
+
+
+
+
+ +
+ + +
+ +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+ + + + +
+
+ +
+

+
This Analysis Request has been invalidated due to erroneously published results
+ + This Analysis request has been replaced by + + +
+ +
+

+
Provisional report
+
+ +
+
+ + + + +
+
+
Location
+
+
Address
+
+
+
+
Date Sampled
+
+
+
+
+
+
Date Received
+
+
+
+
+
+ + + + + + + +
+
+

Results

+ + + + +

+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Sample ID +
+
+
Sample Point
+ 		+
+
+ Client Sample ID + +
+
+
Sample Type
+ 		+
+
+
Specification
+ 		+
+
+
+
Date Verified
+ 		+
+
+ + MethodUnitResultMinMax
+ + + + + + + + + + + + - + + + + + + + + + + +
+
+ + +
+
+ + + + + + +
+
+

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.

+
+
+ + + + + +
+ + +
+
+ + + + diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index f11ebb9..c163ad2 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -708,6 +708,111 @@ def get_country_name(self,country_code): #------------------------GHill end--------------------------------------- + #------------------------Hydro begin------------------------------------- + def get_common_row_data_hydro(self, collection, poc, category): + model = collection[0] + analyses = self.get_analyses_by(collection, poc=poc, category=category) + common_data = [] + for analysis in analyses: + datum = [analysis.Title(), "-", + model.get_formatted_unit(analysis), "-", + False, "-"] + if analysis.Method: + datum[1] = analysis.Method.Title() + datum[4] = self.is_analysis_method_subcontracted(analysis) + verifier = self.get_verifier_by_analysis(analysis) + datum[5] = verifier.get("verifier", "-") + instruments = analysis.getAnalysisService().getInstruments() + # TODO: Use getInstruments + instr_list = [] + if instruments: + for i, instrument in enumerate(instruments): + title = instrument.Title() + if title in instr_list: + continue + instr_list.append(title) + datum[3] = " ".join(instr_list) + common_data.append(datum) + unique_data = self.uniquify_items(common_data) + return unique_data + + def get_formatted_uncertainty(self, analysis): + setup = api.get_setup() + sciformat = int(setup.getScientificNotationReport()) + decimalmark = setup.getDecimalMark() + uncertainty = format_uncertainty( + analysis.instance, + decimalmark=decimalmark, + sciformat=sciformat, + ) + if uncertainty: + return "± {}".format(uncertainty) + return + + def dates_sampled_same_day(self, collection=None): + datetimes = [i.DateSampled for i in collection] + dates = [v.Date() for v in datetimes] + return len(set(dates)) == 1 + + def dates_received_same_day(self, collection=None): + datetimes = [i.DateReceived for i in collection] + dates = [v.Date() for v in datetimes] + return len(set(dates)) == 1 + + def same_sample_point_location(self,collection=None): + sample_point_locations = [i.getSamplePointLocation() for i in collection] + return len(set(sample_point_locations)) + + def matching_analysis_in_spec(self,analysis,result_range): + return analysis.getKeyword() == result_range['keyword'] + + def any_matching_analysis_in_spec(self,analysis,spec): + analysis_match = False + result_ranges = spec.getResultsRange() + for result_range in result_ranges: + if analysis.getKeyword() == result_range['keyword']: + analysis_match = True + return analysis_match + + def get_pages_hydro(self, options): + if options.get("orientation", "") == "portrait": + num_per_page = 3 + elif options.get("orientation", "") == "landscape": + num_per_page = 5 + else: + logger.error("get_pages: orientation unknown") + num_per_page = 3 + logger.info( + "get_pages: col len = {}; num_per_page = {}".format( + len(self.collection), num_per_page + ) + ) + pages = [] + new_page = [] + for idx, col in enumerate(self.collection): + if idx % num_per_page == 0: + if len(new_page): + pages.append(new_page) + logger.info("New page len = {}".format(len(new_page))) + new_page = [col] + continue + new_page.append(col) + + if len(new_page) > 0: + pages.append(new_page) + logger.info("Last page len = {}".format(len(new_page))) + return pages + + def get_location_address(self,location): + address = location.getAddress()[0].get('address') + city = location.getAddress()[0].get('city') + country = location.getAddress()[0].get('country') + if not (address or city or country): + return + return "{0}, {1}, {2}".format(address,city,country) + + #------------------------Hydro end-------------------------------------- + def get_common_row_data_by_poc(self, collection, poc): model = collection[0] all_analyses = self.get_analyses_by_poc(collection) From bab7f44b22190878c790c7b8e077e037904ffcae Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Fri, 4 Aug 2023 14:20:20 +0200 Subject: [PATCH 085/126] Lims 468 imex multi coa (#29) * Imex COA Multi * reportview changes * Check for unique specs * Added speicification tag * unique verifier for imex * Updated Unique verifier condition * LIMS-481 no attribute ResultsRange * Imex methods update --- src/bika/coa/reports/ImexMulti.pt | 647 ++++++++++++++++++++++++++++++ src/bika/coa/reportview.py | 99 ++++- 2 files changed, 745 insertions(+), 1 deletion(-) create mode 100644 src/bika/coa/reports/ImexMulti.pt diff --git a/src/bika/coa/reports/ImexMulti.pt b/src/bika/coa/reports/ImexMulti.pt new file mode 100644 index 0000000..7dca802 --- /dev/null +++ b/src/bika/coa/reports/ImexMulti.pt @@ -0,0 +1,647 @@ + + + +
+
Custom Report Options
+ +
+
+
+ +
+ +
+ + Number of attachments rendered within one row per Analysis Request + +
+
+ + + + + + + + +
+

+ 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 +

+
+ + + + +
+

+

+ + + + + + +
+ +
+ +

Certificate of Analysis

+

+

+
+ + +
+
+ + + + + + +
+
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Client + +
+ +
Contact + +
+ +
Physical Address + +
+
+
+
+
+ +
Email Address + +
+ +
Date Published
Published by + + + () + +
+ 		+ + + + + +
+ +
+
+
+
+
+ Supervisor: +
+
+
+
+
+
+ +
+ + +
+ +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+ + + + +
+
+ +
+

+
This Analysis Request has been invalidated due to erroneously published results
+ + This Analysis request has been replaced by + + +
+ +
+

+
Provisional report
+
+ +
+
+ + + + +
+
+

Results

+

+ + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Sample ID +
+
+ Client Sample ID + +
+
+
Sample Type
+ 		+
+
+
Sample Point
+ 		+
+
+
Date Sampled
+ 		+
+
+
Date Received
+ 		+
+
+
Date Verified
+ 		+
+
+ + MethodSpecificationLDLUnitVerifierResult
+ + + + + + + + + + + + + + - + + + + + + +
+
+ + +

+
+ + + + + +
+
+

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 + + schedule of Accreditation for this Laboratory. Analysis remarks are not + accredited + +
+
+ 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 % confidence level +
+
+
+ + + + +
+ + +
+
+ + + + + diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index c163ad2..d0998c7 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -568,7 +568,104 @@ def reference_definition_titles(self,samples): def get_date_string(self,num_date): return str(num_date.day()) + " " + num_date.Month() + " " + str(num_date.year()) - #----------------zlabs end------------------------------------------------- + # ----------------zlabs end------------------------------------------------- + + # -----------------------Imx begin--------------------------------------- + + def get_common_row_data_imex(self, collection, poc, category, spec): + """ A version of get_common_row_data for Imex """ + model = collection[0] + analyses = self.get_analyses_by(collection, poc=poc, category=category) + common_data = [] + for analysis in analyses: + datum = [analysis.Title(), "-", model.get_formatted_unit(analysis), "-", False, "", "", "", ""] + verifier = self.get_verifier_by_analysis(analysis) + datum[4] = self.is_analysis_accredited(analysis) + if spec: + for result_range in spec.getResultsRange(): + if result_range.get("keyword") == analysis.Keyword: + min_val = result_range.get("min") + max_val = result_range.get("max") + datum[5] = "{0} - {1}".format(min_val, max_val) + datum[6] = analysis.LowerDetectionLimit + datum[7] = verifier.get("verifier", "-") + if analysis.Method: + datum[1] = analysis.Method.Title() + instruments = analysis.getAnalysisService().getInstruments() + # TODO: Use getInstruments + instr_list = [] + if instruments: + for i, instrument in enumerate(instruments): + title = instrument.Title() + if title in instr_list: + continue + instr_list.append(title) + datum[3] = " ".join(instr_list) + common_data.append(datum) + unique_data = self.uniquify_items(common_data) + return unique_data + + def get_pages_imex(self, options): + if options.get("orientation", "") == "portrait": + num_per_page = 3 + elif options.get("orientation", "") == "landscape": + num_per_page = 5 + else: + logger.error("get_pages: orientation unknown") + num_per_page = 4 + logger.info( + "get_pages: col len = {}; num_per_page = {}".format( + len(self.collection), num_per_page + ) + ) + pages = [] + new_page = [] + for idx, col in enumerate(self.collection): + if idx % num_per_page == 0: + if len(new_page): + pages.append(new_page) + logger.info("New page len = {}".format(len(new_page))) + new_page = [col] + continue + new_page.append(col) + + if len(new_page) > 0: + pages.append(new_page) + logger.info("Last page len = {}".format(len(new_page))) + return pages + + def is_spec_unique(self, collection=None): + specs = [] + for sample in collection: + spec = sample.Specification + pub_spec = sample.PublicationSpecification + specs.append(pub_spec or spec) + return len(set(specs)) == 1 + + def is_verifier_unique(self, collection=None): + analysis_verifiers = {} + different_verifiers = [] + analyses = self.get_analyses_by(collection) + for analysis in analyses: + kw = analysis.Keyword + verifier = self.get_verifier_by_analysis(analysis).get("verifier") + if kw not in analysis_verifiers.keys(): + analysis_verifiers[kw] = [verifier] + else: + if verifier not in analysis_verifiers.get(kw): + analysis_verifiers[kw].append(verifier) + for pair in analysis_verifiers.items(): + if len(pair[1]) > 1: + different_verifiers.append(pair[0]) + if len(different_verifiers) == 0: + return [True, different_verifiers] + else: + all_keywords = "" + for names in different_verifiers: + all_keywords = all_keywords + names + ", " + return [False, all_keywords] + + #-----------------------Imx end----------------------------------------- #------------------------GHill begin------------------------------------- From f86af90dfef45ae3f12dd8d961dfa2f77fc4d4c4 Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Wed, 16 Aug 2023 08:03:12 +0200 Subject: [PATCH 086/126] Lims 512 borders between results (#31) * LIMS-512-botween-results * Add border to empty results and remove Method * Add padding to max value and fix get verifier error --- .../coa/reports/HydroChemLocationMulti.pt | 248 ++---------------- src/bika/coa/reportview.py | 4 +- 2 files changed, 32 insertions(+), 220 deletions(-) diff --git a/src/bika/coa/reports/HydroChemLocationMulti.pt b/src/bika/coa/reports/HydroChemLocationMulti.pt index c18aff9..0e2eb6b 100644 --- a/src/bika/coa/reports/HydroChemLocationMulti.pt +++ b/src/bika/coa/reports/HydroChemLocationMulti.pt @@ -69,9 +69,10 @@ .report table.nopadding td { padding: 0; } .report table td.label { padding-right: 0.3rem; font-weight: bold; } .report table td.paddedlabel { padding-left: 1.2rem;} - .report table td.results { width:22mm} - .report table th.results { width:22mm} - .report table.results td th { width:22mm} + .report table td.border-out { border-right: 1px solid #999; border-left: 1px solid #999;} + .report table th.border-out { border-right: 1px solid #999; border-left: 1px solid #999;} + .report table td.border-lft { border-left: 1px solid #999;} + .report table td.border-rite { border-right: 1px solid #999; padding-right: 2em;} .report table.range-table td { padding: 0 0.3rem 0 0; border: none; } .report .section-header h1 { font-size: 175%; } .report .section-header img.logo { max-height: 200px; margin-bottom: 10px } @@ -213,7 +214,7 @@
-

Samples are not from the same Location / not samples on the same date / not received on the same date

+

Samples are not from the same Location / not sampled on the same date / not received on the same date

 @@ -406,194 +407,7 @@
- - - - + @@ -611,20 +425,20 @@ - + - - + - - @@ -632,20 +446,20 @@ - - - - @@ -656,10 +470,10 @@ - - - - @@ -689,12 +503,11 @@ - - + - + - + - @@ -717,7 +527,7 @@ spec python:publication_specification or specification; analyses python:view.get_analyses_by(model, title=row_data[0]);"> - - - - + - + - - + + diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index d0998c7..1c8a1c2 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -1113,7 +1113,9 @@ def get_extra_data(self, collection=None, poc=None, category=None): def get_verifier(self, collection): model = collection[0] analyses = self.get_analyses_by([model]) - actor = getTransitionUsers(analyses[0].getObject(), "verify") + actor = [] + if analyses: + actor = getTransitionUsers(analyses[0].getObject(), "verify") if not actor: return {"verifier": '', "email": ""} From 036eeed3a3e126bf64cdb4cd90755ac93e061261 Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Wed, 16 Aug 2023 08:04:14 +0200 Subject: [PATCH 087/126] Lims 480 same verifier multi (#30) * Imex COA Multi * reportview changes * Check for unique specs * Added speicification tag * unique verifier for imex * Updated Unique verifier condition * LIMS-481 no attribute ResultsRange * Imex methods update * Added same verifier condition to standard Multi LIMS-480 --- src/bika/coa/reports/Multi.pt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/bika/coa/reports/Multi.pt b/src/bika/coa/reports/Multi.pt index a60cb19..b49ccba 100644 --- a/src/bika/coa/reports/Multi.pt +++ b/src/bika/coa/reports/Multi.pt @@ -112,7 +112,18 @@ + + +
+

+

+ + + +
@@ -631,5 +642,5 @@
- + From 82c827175dfe0f7681f7f7d23ec0d30fa3ac40d9 Mon Sep 17 00:00:00 2001 From: Luthando Date: Sun, 20 Aug 2023 20:41:28 +0200 Subject: [PATCH 088/126] Samples now sorted the same way they appear on the listing --- src/bika/coa/ajax.py | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/bika/coa/ajax.py b/src/bika/coa/ajax.py index 0734510..05a7eaf 100644 --- a/src/bika/coa/ajax.py +++ b/src/bika/coa/ajax.py @@ -200,7 +200,7 @@ def create_batch_csv_reports(self,samples,coa_num): for i in top_headers[len(headers_line):]: headers_line.append('') - sample_data, penultimate_field_analyses, penultimate_lab_analyses = self.create_sample_rows(group_cats,field_analyses,lab_analyses) + sample_data, penultimate_field_analyses, penultimate_lab_analyses = self.create_sample_rows(group_cats, field_analyses, lab_analyses, samples) header_rows = self.merge_header_and_values(top_headers,headers_line) final_field_analyses = self.sort_analyses_to_list(penultimate_field_analyses) @@ -405,7 +405,7 @@ def sort_analyses_to_list(self,analyses): key_sort = sorted(title_sort, key=lambda x:(x[1][-1] is None,x[1][-1])) return key_sort - def create_sample_rows(self,grouped_analyses,field_analyses,lab_analyses): + def create_sample_rows_2(self,grouped_analyses,field_analyses,lab_analyses): sample_ids = ["Sample ID"] sample_Points = ["Sample Points"] sample_Types = ["Sample Types"] @@ -431,6 +431,33 @@ def create_sample_rows(self,grouped_analyses,field_analyses,lab_analyses): sample_headers = [sample_ids,sample_Points,sample_Types] return sample_headers,field_analyses,lab_analyses + def create_sample_rows(self, grouped_analyses, field_analyses, lab_analyses, samples): + sample_ids, sample_points, sample_types = self.get_sample_header_data(samples) + if grouped_analyses.get("field"): + for field_Analysis_service in grouped_analyses.get("field"): + position_at_top = sample_ids.index(field_Analysis_service.get("sampleID")) - 1 + title = field_Analysis_service.get('title') + field_analyses[title][position_at_top] = field_Analysis_service.get("result") + if grouped_analyses.get("lab"): + for lab_Analysis_service in grouped_analyses.get("lab"): + position_at_top = sample_ids.index(lab_Analysis_service.get("sampleID")) - 1 + title = lab_Analysis_service.get('title') + if lab_analyses.get(title): + lab_analyses.get(title)[position_at_top] = lab_Analysis_service.get("result") + sample_headers = [sample_ids, sample_points, sample_types] + return sample_headers, field_analyses, lab_analyses + + def get_sample_header_data(self, samples): + sample_ids = ["Sample ID"] + sample_points = ["Sample Points"] + sample_types = ["Sample Types"] + for sample in samples: + sample_ids.append(sample.Title()) + sample_points.append(sample.getSamplePointTitle()) + sample_types.append(sample.getSampleTypeTitle()) + return sample_ids, sample_points, sample_types + + def merge_header_and_values(self,headers,values): """Merge the headers and their values to make writing to CSV easier""" row1 = [] From 277ac4db957686ac8196b43b3ea21b58edee8f1f Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Wed, 23 Aug 2023 17:29:26 +0200 Subject: [PATCH 089/126] Update ReferenceWidget import --- src/bika/coa/extenders/method.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bika/coa/extenders/method.py b/src/bika/coa/extenders/method.py index 6ba691c..30646d9 100755 --- a/src/bika/coa/extenders/method.py +++ b/src/bika/coa/extenders/method.py @@ -5,7 +5,7 @@ from bika.lims.interfaces import IMethod from zope.component import adapts from zope.interface import implements -from bika.lims.browser.widgets import ReferenceWidget as BikaReferenceWidget +from senaite.core.browser.widgets import ReferenceWidget as BikaReferenceWidget class MethodSchemaExtender(object): From 6f09cc262b132a26a05d67e9e5a1e18a556faa42 Mon Sep 17 00:00:00 2001 From: Luthando Date: Fri, 25 Aug 2023 12:08:47 +0200 Subject: [PATCH 090/126] Remove outdated method --- src/bika/coa/ajax.py | 53 ++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/src/bika/coa/ajax.py b/src/bika/coa/ajax.py index 05a7eaf..ce520bf 100644 --- a/src/bika/coa/ajax.py +++ b/src/bika/coa/ajax.py @@ -405,45 +405,27 @@ def sort_analyses_to_list(self,analyses): key_sort = sorted(title_sort, key=lambda x:(x[1][-1] is None,x[1][-1])) return key_sort - def create_sample_rows_2(self,grouped_analyses,field_analyses,lab_analyses): - sample_ids = ["Sample ID"] - sample_Points = ["Sample Points"] - sample_Types = ["Sample Types"] - if grouped_analyses.get("field"): - for field_Analysis_service in grouped_analyses.get("field"): - if field_Analysis_service.get("sampleID") not in sample_ids: - sample_ids.append(field_Analysis_service.get("sampleID")) - sample_Points.append(field_Analysis_service.get("samplePoint")) - sample_Types.append(field_Analysis_service.get("sampleType")) - position_at_top = sample_ids.index(field_Analysis_service.get("sampleID")) - 1 - title = field_Analysis_service.get('title') - field_analyses[title][position_at_top] = field_Analysis_service.get("result") - if grouped_analyses.get("lab"): - for lab_Analysis_service in grouped_analyses.get("lab"): - if lab_Analysis_service.get("sampleID") not in sample_ids: - sample_ids.append(lab_Analysis_service.get("sampleID")) - sample_Points.append(lab_Analysis_service.get("samplePoint")) - sample_Types.append(lab_Analysis_service.get("sampleType")) - position_at_top = sample_ids.index(lab_Analysis_service.get("sampleID")) - 1 - title = lab_Analysis_service.get('title') - if lab_analyses.get(title): - lab_analyses.get(title)[position_at_top] = lab_Analysis_service.get("result") - sample_headers = [sample_ids,sample_Points,sample_Types] - return sample_headers,field_analyses,lab_analyses + def create_sample_rows( + self, grouped_analyses, field_analyses, + lab_analyses, samples): - def create_sample_rows(self, grouped_analyses, field_analyses, lab_analyses, samples): - sample_ids, sample_points, sample_types = self.get_sample_header_data(samples) + sample_ids, sample_points, sample_types = self.get_sample_header_data( + samples) if grouped_analyses.get("field"): - for field_Analysis_service in grouped_analyses.get("field"): - position_at_top = sample_ids.index(field_Analysis_service.get("sampleID")) - 1 - title = field_Analysis_service.get('title') - field_analyses[title][position_at_top] = field_Analysis_service.get("result") + for field_AS in grouped_analyses.get("field"): + position_at_top = sample_ids.index( + field_AS.get("sampleID")) - 1 + title = field_AS.get('title') + field_analyses[title][position_at_top] = field_AS.get( + "result") if grouped_analyses.get("lab"): - for lab_Analysis_service in grouped_analyses.get("lab"): - position_at_top = sample_ids.index(lab_Analysis_service.get("sampleID")) - 1 - title = lab_Analysis_service.get('title') + for lab_AS in grouped_analyses.get("lab"): + position_at_top = sample_ids.index( + lab_AS.get("sampleID")) - 1 + title = lab_AS.get('title') if lab_analyses.get(title): - lab_analyses.get(title)[position_at_top] = lab_Analysis_service.get("result") + lab_analyses.get(title)[position_at_top] = lab_AS.get( + "result") sample_headers = [sample_ids, sample_points, sample_types] return sample_headers, field_analyses, lab_analyses @@ -457,7 +439,6 @@ def get_sample_header_data(self, samples): sample_types.append(sample.getSampleTypeTitle()) return sample_ids, sample_points, sample_types - def merge_header_and_values(self,headers,values): """Merge the headers and their values to make writing to CSV easier""" row1 = [] From ca98c8e758c89fe1878521477b49ccad95d77199 Mon Sep 17 00:00:00 2001 From: Luthando Date: Thu, 31 Aug 2023 10:02:09 +0200 Subject: [PATCH 091/126] Cannabis Methods --- src/bika/coa/reportview.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index 1c8a1c2..f69e9da 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -192,6 +192,21 @@ def get_report_images(self): "accredited_symbol_url": accredited_symbol_url,} return datum + def get_extended_report_images(self): + outofrange_symbol_url = "{}/++resource++bika.coa.images/outofrange.png".format( + self.portal_url + ) + subcontracted_symbol_url = "{}/++resource++bika.coa.images/subcontracted.png".format( + self.portal_url + ) + accredited_symbol_url = "{}/++resource++bika.coa.images/star.png".format( + self.portal_url + ) + datum = {"outofrange_symbol_url": outofrange_symbol_url, + "subcontracted_symbol_url": subcontracted_symbol_url, + "accredited_symbol_url": accredited_symbol_url,} + return datum + def get_toolbar_logo(self): registry = getUtility(IRegistry) portal_url = self.portal_url @@ -261,6 +276,12 @@ def is_analysis_accredited(self,analysis): return True return False + def is_analysis_method_subcontracted(self, analysis): + if analysis.Method: + if analysis.Method.Supplier: + return True + return False + class MultiReportView(MRV): """View for Bika COA Multi Reports From 81a41a1a48fcf49d8fc456de4fef707440a55e76 Mon Sep 17 00:00:00 2001 From: Luthando Date: Thu, 31 Aug 2023 23:27:56 +0200 Subject: [PATCH 092/126] US Cannabis Multi methods --- src/bika/coa/reportview.py | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index f69e9da..5078fbf 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -931,6 +931,56 @@ def get_location_address(self,location): #------------------------Hydro end-------------------------------------- + def get_date_analysed(self, sample): + from_date = "" + to_date = "" + analyses = self.get_analyses_by(sample) + all_dates = [] + for analysis in analyses: + date_captured = analysis.ResultCaptureDate + if date_captured: + all_dates.append(date_captured) + all_dates.sort() + if len(all_dates) > 0: + from_date = self.to_localized_date(all_dates[0]) + to_date = self.to_localized_date(all_dates[-1]) + return [from_date, to_date] + + def get_common_row_data_cannabis(self, collection, poc, category): + """ A version of get_common_row_data for Cannabis """ + model = collection[0] + analyses = self.get_analyses_by(collection, poc=poc, category=category) + common_data = [] + for analysis in analyses: + datum = [analysis.Title(), "-", model.get_formatted_unit(analysis), "-", False, False, "", ""] + verifier = self.get_verifier_by_analysis(analysis) + datum[4] = self.is_analysis_accredited(analysis) + datum[5] = self.is_analysis_method_subcontracted(analysis) + specification = analysis.Specification + publication_specification = analysis.PublicationSpecification + spec = publication_specification or specification + if spec: + for result_range in spec.getResultsRange(): + if result_range.get("keyword") == analysis.Keyword: + min_val = result_range.get("min") + max_val = result_range.get("max") + datum[6] = "{0} - {1}".format(min_val, max_val) + if analysis.Method: + datum[1] = analysis.Method.Title() + instruments = analysis.getAnalysisService().getInstruments() + # TODO: Use getInstruments + instr_list = [] + if instruments: + for i, instrument in enumerate(instruments): + title = instrument.Title() + if title in instr_list: + continue + instr_list.append(title) + datum[3] = " ".join(instr_list) + common_data.append(datum) + unique_data = self.uniquify_items(common_data) + return unique_data + def get_common_row_data_by_poc(self, collection, poc): model = collection[0] all_analyses = self.get_analyses_by_poc(collection) From debb4f7dac167b4518b8995b17810b6a6219bea9 Mon Sep 17 00:00:00 2001 From: Luthando Date: Thu, 7 Sep 2023 09:56:56 +0200 Subject: [PATCH 093/126] Add cannabis code divdiders --- src/bika/coa/reportview.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index 5078fbf..1eb1474 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -929,8 +929,9 @@ def get_location_address(self,location): return return "{0}, {1}, {2}".format(address,city,country) - #------------------------Hydro end-------------------------------------- + # ------------------------Hydro end-------------------------------------- + # ------------------------Cannabis start--------------------------------- def get_date_analysed(self, sample): from_date = "" to_date = "" @@ -981,6 +982,8 @@ def get_common_row_data_cannabis(self, collection, poc, category): unique_data = self.uniquify_items(common_data) return unique_data + # -----------------------Cannabis end------------------------------ + def get_common_row_data_by_poc(self, collection, poc): model = collection[0] all_analyses = self.get_analyses_by_poc(collection) From 06acbbe59aa6e7d0ace68ac788614dd41bdbd0a8 Mon Sep 17 00:00:00 2001 From: Luthando Date: Mon, 11 Sep 2023 14:42:58 +0200 Subject: [PATCH 094/126] Code update --- src/bika/coa/ajax.py | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/bika/coa/ajax.py b/src/bika/coa/ajax.py index ce520bf..6669022 100644 --- a/src/bika/coa/ajax.py +++ b/src/bika/coa/ajax.py @@ -199,12 +199,19 @@ def create_batch_csv_reports(self,samples,coa_num): if len(headers_line) != len(top_headers): for i in top_headers[len(headers_line):]: headers_line.append('') - - sample_data, penultimate_field_analyses, penultimate_lab_analyses = self.create_sample_rows(group_cats, field_analyses, lab_analyses, samples) - header_rows = self.merge_header_and_values(top_headers,headers_line) - final_field_analyses = self.sort_analyses_to_list(penultimate_field_analyses) - final_lab_analyses = self.sort_analyses_to_list(penultimate_lab_analyses) + sample_data = self.get_sample_header_data(samples) + sample_ids = sample_data[0] + penultimate_field_analyses = self.create_field_sample_rows( + group_cats, field_analyses, sample_ids) + penultimate_lab_analyses = self.create_lab_sample_rows( + group_cats, lab_analyses, sample_ids) + + header_rows = self.merge_header_and_values(top_headers, headers_line) + final_field_analyses = self.sort_analyses_to_list( + penultimate_field_analyses) + final_lab_analyses = self.sort_analyses_to_list( + penultimate_lab_analyses) for row in header_rows: writer.writerow(row) @@ -405,12 +412,9 @@ def sort_analyses_to_list(self,analyses): key_sort = sorted(title_sort, key=lambda x:(x[1][-1] is None,x[1][-1])) return key_sort - def create_sample_rows( - self, grouped_analyses, field_analyses, - lab_analyses, samples): + def create_field_sample_rows( + self, grouped_analyses, field_analyses, sample_ids): - sample_ids, sample_points, sample_types = self.get_sample_header_data( - samples) if grouped_analyses.get("field"): for field_AS in grouped_analyses.get("field"): position_at_top = sample_ids.index( @@ -418,6 +422,11 @@ def create_sample_rows( title = field_AS.get('title') field_analyses[title][position_at_top] = field_AS.get( "result") + return field_analyses + + def create_lab_sample_rows( + self, grouped_analyses, lab_analyses, sample_ids): + if grouped_analyses.get("lab"): for lab_AS in grouped_analyses.get("lab"): position_at_top = sample_ids.index( @@ -426,8 +435,7 @@ def create_sample_rows( if lab_analyses.get(title): lab_analyses.get(title)[position_at_top] = lab_AS.get( "result") - sample_headers = [sample_ids, sample_points, sample_types] - return sample_headers, field_analyses, lab_analyses + return lab_analyses def get_sample_header_data(self, samples): sample_ids = ["Sample ID"] @@ -437,7 +445,7 @@ def get_sample_header_data(self, samples): sample_ids.append(sample.Title()) sample_points.append(sample.getSamplePointTitle()) sample_types.append(sample.getSampleTypeTitle()) - return sample_ids, sample_points, sample_types + return [sample_ids, sample_points, sample_types] def merge_header_and_values(self,headers,values): """Merge the headers and their values to make writing to CSV easier""" From c90243406925bbf7b3eb84810eac055880827d41 Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Mon, 11 Sep 2023 17:28:09 +0200 Subject: [PATCH 095/126] Lims 537 thead appears after tbody (#33) * Removed unused methods * Add precision formatting to specification, hydro * No CSV to be sent via email for HyrdochemSystemsMulti * No Result Import files at email preview * Precision update if not existing * remove csv from HydrochemSystemsMulti * Duplicate sample point method removed * Added brackets in method instead of in the pt file --- src/bika/coa/ajax.py | 2 + .../coa/browser/publish/templates/email.pt | 50 ++++++++++--------- src/bika/coa/reportview.py | 24 ++++++++- 3 files changed, 50 insertions(+), 26 deletions(-) diff --git a/src/bika/coa/ajax.py b/src/bika/coa/ajax.py index 0734510..c2741b5 100644 --- a/src/bika/coa/ajax.py +++ b/src/bika/coa/ajax.py @@ -83,6 +83,8 @@ def ajax_save_reports(self): elif template == "bika.coa:ZimlabsTransposedMulti.pt": csv_report = self.create_zlabs_csv_report(samples,coa_num) csv_reports = [csv_report for i in range(len(pdf_reports))] + elif template == 'bika.hydrochem:HydroChemSystemsMulti.pt': + csv_reports = [""] elif is_multi_template: csv_report = self.create_csv_reports(samples) csv_reports = [csv_report for i in range(len(pdf_reports))] diff --git a/src/bika/coa/browser/publish/templates/email.pt b/src/bika/coa/browser/publish/templates/email.pt index eea461d..9d70b44 100644 --- a/src/bika/coa/browser/publish/templates/email.pt +++ b/src/bika/coa/browser/publish/templates/email.pt @@ -143,7 +143,7 @@ -
+
@@ -179,30 +179,32 @@ -
- - -
- -
- - -
- - in - -
- - + +
+ + +
+
-
- -
+ + +
+ + in + +
+ + +
+
+ +
+
diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index 1c8a1c2..f3f7319 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -15,6 +15,7 @@ from bika.lims.content.analysisspec import ResultsRangeDict from bika.lims.idserver import generateUniqueId from bika.lims.interfaces import IDuplicateAnalysis +from bika.lims.utils import formatDecimalMark from bika.lims.utils.analysis import format_uncertainty from bika.lims.workflow import getTransitionUsers @@ -845,7 +846,26 @@ def get_formatted_uncertainty(self, analysis): if uncertainty: return "± {}".format(uncertainty) return - + + def get_formatted_specs_hydro(self, model, analysis): + specs = analysis.getResultsRange() + fs = '' + precision = analysis.getPrecision() + if not precision: + precision = 0 + precision_formatting = "{:." + str(precision) + "f}" + if specs.get('min', None) and specs.get('max', None): + min_val = precision_formatting.format(float(specs['min'])) + max_val = precision_formatting.format(float(specs['max'])) + fs = '(%s - %s)' % (min_val, max_val) + elif specs.get('min', None): + min_val = precision_formatting.format(float(specs['min'])) + fs = '> %s' % min_val + elif specs.get('max', None): + max_val = precision_formatting.format(float(specs['max'])) + fs = '< %s' % max_val + return formatDecimalMark(fs, model.decimal_mark) + def dates_sampled_same_day(self, collection=None): datetimes = [i.DateSampled for i in collection] dates = [v.Date() for v in datetimes] @@ -855,7 +875,7 @@ def dates_received_same_day(self, collection=None): datetimes = [i.DateReceived for i in collection] dates = [v.Date() for v in datetimes] return len(set(dates)) == 1 - + def same_sample_point_location(self,collection=None): sample_point_locations = [i.getSamplePointLocation() for i in collection] return len(set(sample_point_locations)) From 921a3ec1f0c9562f7c7aa6fde1b734a1f9747601 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Thu, 21 Sep 2023 23:49:19 +0200 Subject: [PATCH 096/126] Fixed reports listing --- src/bika/coa/__init__.py | 8 + .../coa/browser/listingview/configure.zcml | 9 +- .../browser/listingview/published_results.py | 115 ++------ .../coa/browser/listingview/report_listing.py | 82 ++++++ src/bika/coa/browser/overrides.zcml | 9 - .../coa/browser/publish/reports_listing.py | 274 ------------------ 6 files changed, 119 insertions(+), 378 deletions(-) create mode 100644 src/bika/coa/browser/listingview/report_listing.py delete mode 100644 src/bika/coa/browser/publish/reports_listing.py diff --git a/src/bika/coa/__init__.py b/src/bika/coa/__init__.py index 05301bc..f80824b 100644 --- a/src/bika/coa/__init__.py +++ b/src/bika/coa/__init__.py @@ -5,6 +5,8 @@ # Copyright 2019 by it's authors. import logging +from bika.lims.api import get_request +from bika.coa.interfaces import IBikaCOALayer PRODUCT_NAME = "bika.coa" PROFILE_ID = "profile-{}:default".format(PRODUCT_NAME) @@ -15,3 +17,9 @@ def initialize(context): """Initializer called when used as a Zope 2 product.""" logger.info("*** Initializing BIKA.COA ***") + + +def is_installed(): + """Returns whether the product is installed or not""" + request = get_request() + return IBikaCOALayer.providedBy(request) diff --git a/src/bika/coa/browser/listingview/configure.zcml b/src/bika/coa/browser/listingview/configure.zcml index f8086bd..664e3d2 100644 --- a/src/bika/coa/browser/listingview/configure.zcml +++ b/src/bika/coa/browser/listingview/configure.zcml @@ -3,9 +3,16 @@ + + + diff --git a/src/bika/coa/browser/listingview/published_results.py b/src/bika/coa/browser/listingview/published_results.py index 4ca048d..8dacc22 100644 --- a/src/bika/coa/browser/listingview/published_results.py +++ b/src/bika/coa/browser/listingview/published_results.py @@ -1,111 +1,38 @@ # -*- coding: utf-8 -*- -from ZODB.POSException import POSKeyError from zope.component import adapts from zope.interface import implements +from bika.coa import is_installed +from bika.coa.browser.listingview.report_listing import \ + ReportsListingViewAdapter as RLVA from bika.lims import api -from bika.lims import bikaMessageFactory as _ from senaite.app.listing.interfaces import IListingView from senaite.app.listing.interfaces import IListingViewAdapter -class AnalysisRequestPublishedResults(object): +class AnalysisRequestPublishedResults(RLVA): adapts(IListingView) implements(IListingViewAdapter) - def __init__(self, context, request): - AnalysisRequestPublishedResults.__init__(self, context, request) - self.context = context - self.request = request + def before_render(self): + if not is_installed(): + return + # get the client for the catalog query + client = self.context.getClient() + client_path = api.get_path(client) + + # get the UID of the current context (sample) + sample_uid = api.get_uid(self.context) - self.catalog = "portal_catalog" self.contentFilter = { - 'portal_type': 'ARReport', - 'path': { - 'query': api.get_path(self.context), - 'depth': 1, + "portal_type": "ARReport", + "path": { + "query": client_path, + "depth": 2, }, - 'sort_order': 'reverse' - } - self.context_actions = {} - self.show_select_column = True - self.show_workflow_action_buttons = False - self.form_id = 'published_results' - self.icon = "{}//++resource++bika.lims.images/report_big.png".format( - self.portal_url) - self.title = self.context.translate(_("Published results")) - self.columns = { - 'COANumber': {'title': _('COA')}, - 'Date': {'title': _('Published Date')}, - 'PublishedBy': {'title': _('Published By')}, - 'DownloadPDF': {'title': _('Download PDF')}, - 'DownloadCSV': {'title': _('Download CSV')}, - 'Recipients': {'title': _('Recipients')}, + # search all reports, where the current sample UID is included + "sample_uid": [sample_uid], + "sort_on": "created", + "sort_order": "descending", } - self.review_states = [ - {'id': 'default', - 'title': 'All', - 'contentFilter': {}, - 'columns': [ - 'COANumber', - 'Date', - 'PublishedBy', - 'Recipients', - 'DownloadPDF', - 'DownloadCSV', - ] - }, - ] - - def folderitem(self, obj, item, index): - - # TODO: find out why obj is a brain and not an object. - # see senaite.listing, obj is a brain and not an object - if api.is_brain: - obj = obj.getObject() - - item['PublishedBy'] = self.user_fullname(obj.Creator()) - - # Formatted creation date of report - creation_date = obj.created() - fmt_date = self.ulocalized_time(creation_date, long_format=1) - item['Date'] = fmt_date - - # Recipients as mailto: links - recipients = obj.getRecipients() - links = ["{Fullname}".format(**r) - for r in recipients if r['EmailAddress']] - if len(links) == 0: - links = ["{Fullname}".format(**r) for r in recipients] - item['replace']['Recipients'] = ', '.join(links) - - # download link 'Download PDF (size)' - dll = [] - try: # - pdf_data = obj.getPdf() - assert pdf_data - item['COANumber'] = '' - item['after']['COANumber'] = pdf_data.filename.split('.')[0] - z = pdf_data.get_size() - z = z / 1024 if z > 0 else 0 - dll.append("{}".format( - obj.absolute_url(), _("Download PDF"), z)) - except (POSKeyError, AssertionError): - # POSKeyError: 'No blob file' - pass - item['DownloadPDF'] = '' - item['after']['DownloadPDF'] = ', '.join(dll) - # download link 'Download CSV (size)' - dll = [] - if hasattr(obj, 'CSV'): - try: - dll.append("{}".format( - obj.absolute_url(), _("Download CSV"), 0)) - except (POSKeyError, AssertionError): - # POSKeyError: 'No blob file' - pass - item['DownloadCSV'] = '' - item['after']['DownloadCSV'] = ', '.join(dll) - - return item diff --git a/src/bika/coa/browser/listingview/report_listing.py b/src/bika/coa/browser/listingview/report_listing.py new file mode 100644 index 0000000..afb6b4c --- /dev/null +++ b/src/bika/coa/browser/listingview/report_listing.py @@ -0,0 +1,82 @@ +# -*- coding: utf-8 -*- + +import collections +from ZODB.POSException import POSKeyError +from zope.component import adapts +from zope.interface import implements + +from bika.lims import api +from bika.lims.utils import get_link +from bika.coa import is_installed +from bika.extras.config import _ +from senaite.app.listing.interfaces import IListingView +from senaite.app.listing.interfaces import IListingViewAdapter + + +class ReportsListingViewAdapter(object): + adapts(IListingView) + implements(IListingViewAdapter) + + def __init__(self, listing, context): + self.listing = listing + self.context = context + + def before_render(self): + if not is_installed(): + return + self.listing.columns = collections.OrderedDict(( + ("Info", { + "title": "", + "toggle": True},), + ("COA", { + "title": _("COA"), + "index": "sortable_title"},), + ("State", { + "title": _("Review State")},), + ("PDF", { + "title": _("Download PDF")},), + ("CSV", { + "title": _("Download CSV")},), + ("FileSize", { + "title": _("Filesize")},), + ("Date", { + "title": _("Published Date")},), + ("PublishedBy", { + "title": _("Published By")},), + ("Recipients", { + "title": _("Recipients")},), + )) + for i in range(len(self.listing.review_states)): + self.listing.review_states[i]["columns"].append("COA") + self.listing.review_states[i]["columns"].append("CSV") + + def folder_item(self, obj, item, index): + if not is_installed(): + return item + obj = api.get_object(obj) + csv = self.get_csv(obj) + filesize_csv = self.listing.get_filesize(csv) + if filesize_csv > 0: + url = "{}/at_download/CSV".format(obj.absolute_url()) + item["replace"]["CSV"] = get_link( + url, value="CSV", target="_blank") + + pdf = self.listing.get_pdf(obj) + pdf_filename = pdf.filename + pdf_filename_value = 'Unknown' + if pdf_filename: + pdf_filename_value = pdf_filename.split('.')[0] + ar = obj.getAnalysisRequest() + item["replace"]["COA"] = get_link( + ar.absolute_url(), value=pdf_filename_value + ) + + return item + + def get_csv(self, obj): + """Get the report csv + """ + try: + return obj.CSV + except (POSKeyError, TypeError): + return None diff --git a/src/bika/coa/browser/overrides.zcml b/src/bika/coa/browser/overrides.zcml index 6ab74d9..3ae1fe7 100644 --- a/src/bika/coa/browser/overrides.zcml +++ b/src/bika/coa/browser/overrides.zcml @@ -3,15 +3,6 @@ xmlns:browser="http://namespaces.zope.org/browser" i18n_domain="bika.coa"> - - - 0: - url = "{}/at_download/Pdf".format(obj.absolute_url()) - item["replace"]["PDF"] = get_link( - url, value="PDF", target="_blank") - - csv = self.get_csv(obj) - filesize_csv = self.get_filesize(csv) - if filesize_csv > 0: - url = "{}/at_download/CSV".format(obj.absolute_url()) - item["replace"]["CSV"] = get_link( - url, value="CSV", target="_blank") - - item["State"] = _BMF(status_title) - item["state_class"] = "state-{}".format(review_state) - item["FileSize"] = "{:.2f} Kb".format(filesize) - fmt_date = self.localize_date(obj.created()) - item["Date"] = fmt_date - item["PublishedBy"] = self.user_fullname(obj.Creator()) - - # N.B. There is a bug in the current publication machinery, so that - # only the primary contact get stored in the Attachment as recipient. - # - # However, we're interested to show here the full list of recipients, - # so we use the recipients of the containing AR instead. - recipients = [] - - for recipient in self.get_recipients(ar): - email = safe_unicode(recipient["EmailAddress"]) - fullname = safe_unicode(recipient["Fullname"]) - if email: - value = u"{}".format(email, fullname) - recipients.append(value) - else: - message = _("No email address set for this contact") - value = u"" \ - u"⚠ {}".format(message, fullname) - recipients.append(value) - - item["replace"]["Recipients"] = ", ".join(recipients) - - # No recipient with email set preference found in the AR, so we also - # flush the Recipients data from the Attachment - if not recipients: - item["Recipients"] = "" - - return item - - def get_recipients(self, ar): - """Return the AR recipients in the same format like the AR Report - expects in the records field `Recipients` - """ - plone_utils = api.get_tool("plone_utils") - - def is_email(email): - if not plone_utils.validateSingleEmailAddress(email): - return False - return True - - def recipient_from_contact(contact): - if not contact: - return None - email = contact.getEmailAddress() - return { - "UID": api.get_uid(contact), - "Username": contact.getUsername(), - "Fullname": to_utf8(contact.Title()), - "EmailAddress": email, - } - - def recipient_from_email(email): - if not is_email(email): - return None - return { - "UID": "", - "Username": "", - "Fullname": email, - "EmailAddress": email, - } - - # Primary Contacts - to = filter(None, [recipient_from_contact(ar.getContact())]) - # CC Contacts - cc = filter(None, map(recipient_from_contact, ar.getCCContact())) - # CC Emails - cc_emails = ar.getCCEmails(as_list=True) - cc_emails = filter(None, map(recipient_from_email, cc_emails)) - - return to + cc + cc_emails From 37c1bfe09b760819355efa70fd66e012a2259e5d Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Fri, 22 Sep 2023 00:02:55 +0200 Subject: [PATCH 097/126] Missing cols --- src/bika/coa/browser/listingview/report_listing.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bika/coa/browser/listingview/report_listing.py b/src/bika/coa/browser/listingview/report_listing.py index afb6b4c..600ec82 100644 --- a/src/bika/coa/browser/listingview/report_listing.py +++ b/src/bika/coa/browser/listingview/report_listing.py @@ -31,18 +31,22 @@ def before_render(self): ("COA", { "title": _("COA"), "index": "sortable_title"},), + ("Batch", { + "title": _("Batch")},), ("State", { "title": _("Review State")},), ("PDF", { "title": _("Download PDF")},), - ("CSV", { - "title": _("Download CSV")},), ("FileSize", { "title": _("Filesize")},), + ("CSV", { + "title": _("Download CSV")},), ("Date", { "title": _("Published Date")},), ("PublishedBy", { "title": _("Published By")},), + ("Sent", { + "title": _("Email sent")},), ("Recipients", { "title": _("Recipients")},), )) From 336365d144dee1b84d4bbd6e7f527c2ca554937c Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Tue, 26 Sep 2023 12:34:35 +0200 Subject: [PATCH 098/126] Cols line up on each table (#34) --- .../coa/reports/HydroChemLocationMulti.pt | 73 ++++++++++--------- 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/src/bika/coa/reports/HydroChemLocationMulti.pt b/src/bika/coa/reports/HydroChemLocationMulti.pt index 0e2eb6b..de8daad 100644 --- a/src/bika/coa/reports/HydroChemLocationMulti.pt +++ b/src/bika/coa/reports/HydroChemLocationMulti.pt @@ -90,6 +90,14 @@ font-size: 9pt; } + .report table td.col-width, th.col-width { + width: ; + padding-top:4px; + padding-bottom:4px; + padding-right:0px; + padding-left:0px; + } + .footerContainer { position:relative; width:100%; @@ -117,7 +125,7 @@ border-top: 1px solid black; } - .table { + .div-table { display: table; width: 100%; } @@ -385,7 +393,7 @@ -
+
Location
@@ -414,7 +422,6 @@

Results

- @@ -422,12 +429,12 @@
-
Sample IDSample ID +
+
Sample Point
 +
+ Client Sample ID +
+
Sample Type
 +
+
Specification
 +
@@ -672,10 +486,10 @@
+
Date Verified
 +
MethodUnitUnit ResultResult MinMaxMax
- - @@ -740,27 +550,27 @@ + +
+
- + - @@ -435,10 +442,10 @@ - - @@ -446,20 +453,20 @@ - - - - @@ -470,10 +477,10 @@ - - - - @@ -500,25 +507,25 @@ - - + - - - + + + - - @@ -527,7 +534,7 @@ spec python:publication_specification or specification; analyses python:view.get_analyses_by(model, title=row_data[0]);"> - - - - - + + - - + + - - - + + + From c6ad8582d0fcb302e6ffb0c46c5b5cd1d6af35e5 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 2 Oct 2023 16:04:41 +0200 Subject: [PATCH 099/126] Fixed import error --- src/bika/coa/__init__.py | 2 ++ src/bika/coa/browser/listingview/report_listing.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bika/coa/__init__.py b/src/bika/coa/__init__.py index f80824b..d585fa5 100644 --- a/src/bika/coa/__init__.py +++ b/src/bika/coa/__init__.py @@ -7,10 +7,12 @@ import logging from bika.lims.api import get_request from bika.coa.interfaces import IBikaCOALayer +from zope.i18nmessageid import MessageFactory PRODUCT_NAME = "bika.coa" PROFILE_ID = "profile-{}:default".format(PRODUCT_NAME) logger = logging.getLogger(PRODUCT_NAME) +_ = MessageFactory(PRODUCT_NAME) def initialize(context): diff --git a/src/bika/coa/browser/listingview/report_listing.py b/src/bika/coa/browser/listingview/report_listing.py index 600ec82..137cc4c 100644 --- a/src/bika/coa/browser/listingview/report_listing.py +++ b/src/bika/coa/browser/listingview/report_listing.py @@ -8,7 +8,7 @@ from bika.lims import api from bika.lims.utils import get_link from bika.coa import is_installed -from bika.extras.config import _ +from bika.coa import _ from senaite.app.listing.interfaces import IListingView from senaite.app.listing.interfaces import IListingViewAdapter From 2800ac2fb1247871d47e3a282a58ac9c6d2ee3ca Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Fri, 6 Oct 2023 10:48:28 +0200 Subject: [PATCH 100/126] Lims 560 alternative locations coa (#36) * Additional Location Reports * Remove HydroChemSystems2Multi on bika.coa --- .../coa/reports/HydroChemLocations2Multi.pt | 718 ++++++++++++++++++ 1 file changed, 718 insertions(+) create mode 100644 src/bika/coa/reports/HydroChemLocations2Multi.pt diff --git a/src/bika/coa/reports/HydroChemLocations2Multi.pt b/src/bika/coa/reports/HydroChemLocations2Multi.pt new file mode 100644 index 0000000..d078d46 --- /dev/null +++ b/src/bika/coa/reports/HydroChemLocations2Multi.pt @@ -0,0 +1,718 @@ + + + +
+
Custom Report Options
+ +
+
+
+ +
+ +
+ + Number of attachments rendered within one row per Analysis Request + +
+
+ + + + + + + + + + +
+

Samples are not from the same Location

+
+ + + + + + + +
+ +
+ +

+

+
+ + +
+ +
+ + + + + + +
+
+ +
Sample IDSample ID +
+
Sample Point
 +
+ Client Sample ID +
+
Sample Type
 +
+
Specification
 +
@@ -486,10 +493,10 @@
+
Date Verified
 +
+ UnitUnit ResultMinMaxResultMinMax
+ + @@ -550,27 +557,27 @@ + +
+ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
Contact + +
+ +
Client + +
+ +
Tel # + +
+ +
Email Address + +
+ +
+ 		+ + + + + +
+ +
+
+ Supervisor: +
+
+
+
+
+
+ +
+ + +
+ +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+ + + + +
+
+ +
+

+
This Analysis Request has been invalidated due to erroneously published results
+ + This Analysis request has been replaced by + + +
+ +
+

+
Provisional report
+
+ +
+
+ + + + +
+
+
Location
+
+
Address
+
+
+ +
+ + + + + +

Results

+ + + +

+
+
+
Sample ID
+ +
+ +
+
+
Client Sample ID
+ +
+ +
+
+
Sample Type
+ +
+ +
+
+
Sample Point
+ +
+ +
+
+
Specification
+ + +
+
+
+
+ + +
+ +
+
Date Sampled
+ +
+ +
+
+
Date Received
+ +
+ +
+
+
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.

+
+
+ + + + + +
+ + +
+
+ + + + From f8dde0e01a49092d7faff4303c376a533fbc8097 Mon Sep 17 00:00:00 2001 From: Luthando Date: Fri, 6 Oct 2023 13:31:38 +0200 Subject: [PATCH 101/126] Removed Commented code from LIMS-560 --- src/bika/coa/reports/HydroChemLocations2Multi.pt | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/bika/coa/reports/HydroChemLocations2Multi.pt b/src/bika/coa/reports/HydroChemLocations2Multi.pt index d078d46..04aa19d 100644 --- a/src/bika/coa/reports/HydroChemLocations2Multi.pt +++ b/src/bika/coa/reports/HydroChemLocations2Multi.pt @@ -380,19 +380,6 @@
Address
-
From 2fc611b40d131b40067e45283e3e2be15d3ef4b3 Mon Sep 17 00:00:00 2001 From: Luthando Date: Fri, 6 Oct 2023 18:08:56 +0200 Subject: [PATCH 102/126] Added Cannabis US Multi CSV template --- src/bika/coa/ajax.py | 91 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/src/bika/coa/ajax.py b/src/bika/coa/ajax.py index c2741b5..4bacfdd 100644 --- a/src/bika/coa/ajax.py +++ b/src/bika/coa/ajax.py @@ -85,6 +85,9 @@ def ajax_save_reports(self): csv_reports = [csv_report for i in range(len(pdf_reports))] elif template == 'bika.hydrochem:HydroChemSystemsMulti.pt': csv_reports = [""] + elif template == "bika.cannabis:CannabisUSMulti.pt": + csv_report = self.create_csv_reports_cannabis(samples, coa_num) + csv_reports = [csv_report for i in range(len(pdf_reports))] elif is_multi_template: csv_report = self.create_csv_reports(samples) csv_reports = [csv_report for i in range(len(pdf_reports))] @@ -613,6 +616,94 @@ def create_csv_report(self, sample): return output.getvalue() + def create_csv_reports_cannabis(self, samples, coa_num): + analyses = [] + output = StringIO.StringIO() + client_headers = [["COA ID", coa_num], + ["Client", samples[0].Client.title], + ["Client Contact", samples[0].Contact.title]] + headers = ["Sample ID", "Tracking ID", "Client Sample ID", + "Batch ID", "License", "Sample Type", "Strain", + "Lot", "Cultivation Batch ID", "Quantity", + "Date Sampled", "Date Received", + "Date Verified", "Date Published"] + body = [] + for sample in samples: + date_received = sample.DateReceived + date_sampled = sample.DateSampled + if date_sampled: + date_sampled = date_sampled.strftime('%m-%d-%y') + if date_received: + date_received = date_received.strftime('%m-%d-%y') + date_verified = sample.getDateVerified() + if date_verified: + date_verified = date_verified.strftime('%m-%d-%y') + license_num = sample.License + if license_num: + license_num = license_num.license_number + strain = sample.Strain + if strain: + strain = strain.title + date_published = sample.DatePublished + if date_published: + date_published = date_published.strftime('%m-%d-%y') + + writer = csv.writer(output) + line = [ + sample.id, + sample.TrackingID, + sample.ClientSampleID, + sample.getBatchID(), + license_num, + sample.SampleTypeTitle, + strain, + sample.LotNumber, + sample.CultivationBatchID, + sample.Quantity, + date_sampled, + date_received, + date_verified, + date_published + ] + + analyses = sample.getAnalyses(full_objects=True) + group_cats = {} + for analysis in analyses: + analysis_info = {'title': analysis.Title(), + 'result': analysis.getFormattedResult(html=False), + 'unit': analysis.getService().getUnit()} + if analysis.getCategoryTitle() not in group_cats.keys(): + group_cats[analysis.getCategoryTitle()] = [] + group_cats[analysis.getCategoryTitle()].append(analysis_info) + + for g_cat in sorted(group_cats.keys()): + for a_info in group_cats[g_cat]: + title = a_info['title'] + result = a_info['result'] + unit = a_info['unit'] + title_unit = title + if unit: + title_unit = '{} ({})'.format(title, unit) + if len(line) != len(headers): + for i in headers[len(line):]: + line.append('') + + if title_unit not in headers: + headers.append(title_unit) + line.append(result) + else: + line[headers.index(title_unit)] = result + + body.append(line) + + for header in client_headers: + writer.writerow(header) + writer.writerow(headers) + for rec in body: + writer.writerow(rec) + + return output.getvalue() + def create_csv_reports(self, samples): analyses = [] output = StringIO.StringIO() From 7a68cbf970173eab785d180869131d2548e6568b Mon Sep 17 00:00:00 2001 From: Luthando Ndlela <104898641+luthando5@users.noreply.github.com> Date: Sat, 7 Oct 2023 10:35:43 +0200 Subject: [PATCH 103/126] Lims 559 locations coa customisations (#35) * LIMS 559 further coa customisations * Removed date verified and other dates * Changed Results headers order and added dates * Table to div table * Remove commented out code --- .../coa/reports/HydroChemLocationMulti.pt | 371 ++++++++---------- 1 file changed, 157 insertions(+), 214 deletions(-) diff --git a/src/bika/coa/reports/HydroChemLocationMulti.pt b/src/bika/coa/reports/HydroChemLocationMulti.pt index de8daad..a348987 100644 --- a/src/bika/coa/reports/HydroChemLocationMulti.pt +++ b/src/bika/coa/reports/HydroChemLocationMulti.pt @@ -69,10 +69,9 @@ .report table.nopadding td { padding: 0; } .report table td.label { padding-right: 0.3rem; font-weight: bold; } .report table td.paddedlabel { padding-left: 1.2rem;} - .report table td.border-out { border-right: 1px solid #999; border-left: 1px solid #999;} - .report table th.border-out { border-right: 1px solid #999; border-left: 1px solid #999;} - .report table td.border-lft { border-left: 1px solid #999;} - .report table td.border-rite { border-right: 1px solid #999; padding-right: 2em;} + .report .border-out { border-right: 1px solid #999; border-left: 1px solid #999;} + .report .border-lft { border-left: 1px solid #999;} + .report .border-rite { border-right: 1px solid #999;} .report table.range-table td { padding: 0 0.3rem 0 0; border: none; } .report .section-header h1 { font-size: 175%; } .report .section-header img.logo { max-height: 200px; margin-bottom: 10px } @@ -104,21 +103,6 @@ height:100px; } - .bgbehind { - background-image:url(); - z-index:100; - background-position: top right; - background-size: 938px 162px; - opacity:0.1 !important; - background-repeat: no-repeat; - position: absolute; - top: -750%; - left: 55%; - transform: rotate(305deg); - width: ; - height:; - } - .report .section-footer #footer-line { width: 100%; height: 2mm; @@ -127,7 +111,7 @@ .div-table { display: table; - width: 100%; + width: auto; } .table-row { @@ -136,19 +120,29 @@ .table-header { display: table-cell; - padding: 4px; + padding-top : 4px; + padding-bottom : 4px; font-weight: bold; border-top: 1px solid #ccc; - width: 22mm; + width: ; } .table-cell { display: table-cell; - padding: 1px; + padding-top : 4px; + padding-bottom : 4px; border-top: 1px solid #ccc; - width: 22mm; + width: ; } + .table-cell-lower { + display: table-cell; + padding-top : 4px; + padding-bottom : 4px; + border-top: 1px solid #ccc; + width: ; + } + .table-header-date { display: table-cell; padding: 4px; @@ -179,20 +173,6 @@ width: 23mm; } - .table-cell-result { - display: table-cell; - padding: 0px; - border-top: 1px solid #ccc; - width: 10mmm; - } - - .table-cell-min-max { - display: table-cell; - padding:0px; - padding-top:1px; - border-top: 1px solid #ccc; - width: 6mm; - } -
+
Location
Address
-
-
Date Sampled
-
-
-
-
Date Received
@@ -415,184 +389,153 @@
- + + -
-
-

Results

- - - -

- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + +
+
Date Sampled
+ +
+ +
+
+
Date Verified
+ +
+ +
+
+
+ +
+
+ +
+
Unit
+ +
Result
+
(Min-Max)
+ +
+
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Sample ID -
-
-
Sample Point
- 		+

Results

+ + + +

+
+
+
Sample ID
+ +
+ +
+
+
Client Sample ID
+ +
+ +
+
+
Sample Type
+ +
+ +
+
+
Sample Point
+ +
+ +
+
+
Specification
+ + +
-
- Client Sample ID - -
-
-
Sample Type
- 		-
-
-
Specification
- 		-
-
-
-
Date Verified
- 		+ tal:condition="spec" + tal:content="python:spec.Title() or '-'"/>
-
- - UnitResultMinMax
- - - - - - - + + + + + + + + + + + +
+ +
+ + + + +
- - - - - - - - - - -
- - - -
-
- - -
-
+ verified python:analysis.review_state in ['published', 'verified']"> + + - + + + + + + +
+ + +
+ +
+ + +
+ + + + +
+
+ + + +
+ +
+ + - + From 8ff806869dd4c9823d982b736bf8bbfefe5a6299 Mon Sep 17 00:00:00 2001 From: Luthando Date: Tue, 10 Oct 2023 15:31:34 +0200 Subject: [PATCH 104/126] Get specification objects instead of uid --- src/bika/coa/reportview.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index a5fab70..a60437e 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -977,8 +977,8 @@ def get_common_row_data_cannabis(self, collection, poc, category): verifier = self.get_verifier_by_analysis(analysis) datum[4] = self.is_analysis_accredited(analysis) datum[5] = self.is_analysis_method_subcontracted(analysis) - specification = analysis.Specification - publication_specification = analysis.PublicationSpecification + specification = analysis.getSpecification() + publication_specification = analysis.getPublicationSpecification() spec = publication_specification or specification if spec: for result_range in spec.getResultsRange(): From a22cc1850989b3a90825f2d33de533c1a5590295 Mon Sep 17 00:00:00 2001 From: Luthando Date: Wed, 11 Oct 2023 16:07:37 +0200 Subject: [PATCH 105/126] ARReport listing change pdf url --- src/bika/coa/browser/listingview/report_listing.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/bika/coa/browser/listingview/report_listing.py b/src/bika/coa/browser/listingview/report_listing.py index 137cc4c..1f93491 100644 --- a/src/bika/coa/browser/listingview/report_listing.py +++ b/src/bika/coa/browser/listingview/report_listing.py @@ -66,6 +66,12 @@ def folder_item(self, obj, item, index): url, value="CSV", target="_blank") pdf = self.listing.get_pdf(obj) + filesize_pdf = self.listing.get_filesize(pdf) + if filesize_pdf > 0: + url = "{}/at_download/Pdf".format(obj.absolute_url()) + item["replace"]["PDF"] = get_link( + url, value="PDF", target="_blank") + pdf_filename = pdf.filename pdf_filename_value = 'Unknown' if pdf_filename: From dc67c87ce5b49968c20ff681228d28103d020d8b Mon Sep 17 00:00:00 2001 From: francoisler-lab <66058884+francoisler-lab@users.noreply.github.com> Date: Thu, 9 Nov 2023 13:48:38 +0200 Subject: [PATCH 106/126] Create MultiTestItISO17025RowAndCoordinates This is to render sample point coordinates on the report --- .../MultiTestItISO17025RowAndCoordinates | 712 ++++++++++++++++++ 1 file changed, 712 insertions(+) create mode 100644 src/bika/coa/reports/MultiTestItISO17025RowAndCoordinates diff --git a/src/bika/coa/reports/MultiTestItISO17025RowAndCoordinates b/src/bika/coa/reports/MultiTestItISO17025RowAndCoordinates new file mode 100644 index 0000000..dd24205 --- /dev/null +++ b/src/bika/coa/reports/MultiTestItISO17025RowAndCoordinates @@ -0,0 +1,712 @@ + + + + +
+
Custom Report Options
+ +
+
+
+ +
+ +
+ + Number of attachments rendered within one row per Analysis Request + +
+
+ + + + + + + + + + + + +
+
Certificate of Analysis
+
+ + +
+ + + + + + + + + + + + + + + + +
+
+ + +
+ + + +
+ + + +
+
+
+
+
+ + + +
+ + + +
+ + +
+ +
+
+ +
+ 		+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ + + + +
+
Important documents and information
+
+
  • 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
    • +
  • 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
    • +
  • Outsourced or subcontracted tests indicated per method
    • +
    +
    Date Published :
    +     +
    +
    Signature :
    +
    + +
    +

    +
    + +     + + + +
    +
    + +
    +

    +
    This Analysis Request has been invalidated due to erroneously published results
    + + This Analysis request has been replaced by + and supercedes any previous report + +
    +
    +

    +
    Preliminary report
    +
    +     +
    +
    +     + + + + + +
    +
    +
    + +
    +
    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 +
    +
    + + + +
    +
    +     +

    +     + + + + +
    +
    +

    Results Interpretation for

    + +

    Department

    +
    +     +
    +
    +     +     + +
    + + + END OF RESULTS + +
    + +
    + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    +

    Additional Sample Information

    +
    +
    Sample ID
    +     		+
    Sample ID
    +
    +
    Sample Remarks
    +     		+
    +
    + +
    +
    +
    +
    Interpretation
    +
    + +
    Department +
    +     +     		+ +
    + +
    +
    +     +
    +
    +
    +
    +     + + + + +
    + + +

    + Attachments for +

    + + + + + + + +
    +
    + +
    +
    + Attachment for + +
    +
    + +
    +
    + Filename: + +
    +
    +
    +
    +     +     +
    +     + + + +
    + + +
    +
    + + + + +
    + + + + + + +
    +
    + Lab Name + • Lab Street and Number + • Lab ZIP + Lab City + • Lab Country +
    +
    + Phone: + Lab Phone Number + • + Lab Email + + • + Lab URL + +
    +
    +
    +     +
    + + + END OF REPORT + +
    + +
    + From 990af0b4c9e7449ebe413cc1c0da5c5c3adacb34 Mon Sep 17 00:00:00 2001 From: Francois le Roux Date: Thu, 9 Nov 2023 15:27:31 +0200 Subject: [PATCH 107/126] coordinates template --- .../MultiTestItISO17025RowWithCoordinates.pt | 712 ++++++++++++++++++ 1 file changed, 712 insertions(+) create mode 100644 src/bika/coa/reports/MultiTestItISO17025RowWithCoordinates.pt diff --git a/src/bika/coa/reports/MultiTestItISO17025RowWithCoordinates.pt b/src/bika/coa/reports/MultiTestItISO17025RowWithCoordinates.pt new file mode 100644 index 0000000..dd24205 --- /dev/null +++ b/src/bika/coa/reports/MultiTestItISO17025RowWithCoordinates.pt @@ -0,0 +1,712 @@ + + + + +
    +
    Custom Report Options
    + +
    +
    +
    + +
    + +
    + + Number of attachments rendered within one row per Analysis Request + +
    +
    + + + + + + + + + + + + +
    +
    Certificate of Analysis
    +
    + + +
    + + + + + + + + + + + + + + + + +
    +
    + + +
    + + + +
    + + + +
    +
    +
    +
    +
    + + + +
    + + + +
    + + +
    + +
    		+
    + +
    +     		+
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +     + + + +
    +
    Important documents and information
    +
    +
  • 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
    • +
  • 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
    • +
  • Outsourced or subcontracted tests indicated per method
    • +
    +
    Date Published :
    +     +
    +
    Signature :
    +
    + +
    +

    +
    + + + + + +
    +
    + +
    +

    +
    This Analysis Request has been invalidated due to erroneously published results
    + + This Analysis request has been replaced by + and supercedes any previous report + +
    +
    +

    +
    Preliminary report
    +
    +     +
    +
    +     + + + + + +
    +
    +
    + +
    +
    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 +
    +
    + + + +
    +
    +     +

    +     + + + + +
    +
    +

    Results Interpretation for

    + +

    Department

    +
    +     +
    +
    +     +     + +
    + + + END OF RESULTS + +
    + +
    + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    +

    Additional Sample Information

    +
    +
    Sample ID
    +     		+
    Sample ID
    +
    +
    Sample Remarks
    +     		+
    +
    + +
    +
    +
    +
    Interpretation
    +
    + +
    Department +
    +     +     		+ +
    + +
    +
    +     +
    +
    +
    +
    +     + + + + +
    + + +

    + Attachments for +

    + + + + + + + +
    +
    + +
    +
    + Attachment for + +
    +
    + +
    +
    + Filename: + +
    +
    +
    +
    +     +     +
    +     + + + +
    + + +
    +
    + + + + +
    + + + + + + +
    +
    + Lab Name + • Lab Street and Number + • Lab ZIP + Lab City + • Lab Country +
    +
    + Phone: + Lab Phone Number + • + Lab Email + + • + Lab URL + +
    +
    +
    +     +
    + + + END OF REPORT + +
    + +
    + From 1010bdf753e2908e279833cc3455fea7ea250cc0 Mon Sep 17 00:00:00 2001 From: Luthando Date: Thu, 9 Nov 2023 22:00:25 +0200 Subject: [PATCH 108/126] Remove Row and co-ords duplicate --- .../MultiTestItISO17025RowAndCoordinates | 712 ------------------ 1 file changed, 712 deletions(-) delete mode 100644 src/bika/coa/reports/MultiTestItISO17025RowAndCoordinates diff --git a/src/bika/coa/reports/MultiTestItISO17025RowAndCoordinates b/src/bika/coa/reports/MultiTestItISO17025RowAndCoordinates deleted file mode 100644 index dd24205..0000000 --- a/src/bika/coa/reports/MultiTestItISO17025RowAndCoordinates +++ /dev/null @@ -1,712 +0,0 @@ - - - - -
    -
    Custom Report Options
    - -
    -
    -
    - -
    - -
    - - Number of attachments rendered within one row per Analysis Request - -
    -
    - - - - - - - - - - - - -
    -
    Certificate of Analysis
    -
    - - -
    - - - - - - - - - - - - - - - - -
    -
    - - -
    - - - -
    - - - -
    -
    -
    -
    -
    - - - -
    - - - -
    - - -
    - -
    		-
    - -
    -     		-
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -     - - - -
    -
    Important documents and information
    -
    -
  • 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
    • -
  • 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
    • -
  • Outsourced or subcontracted tests indicated per method
    • -
    -
    Date Published :
    -     -
    -
    Signature :
    -
    - -
    -

    -
    - - - - - -
    -
    - -
    -

    -
    This Analysis Request has been invalidated due to erroneously published results
    - - This Analysis request has been replaced by - and supercedes any previous report - -
    -
    -

    -
    Preliminary report
    -
    -     -
    -
    -     - - - - - -
    -
    -
    - -
    -
    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 -
    -
    - - - -
    -
    -     -

    -     - - - - -
    -
    -

    Results Interpretation for

    - -

    Department

    -
    -     -
    -
    -     -     - -
    - - - END OF RESULTS - -
    - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    -

    Additional Sample Information

    -
    -
    Sample ID
    -     		-
    Sample ID
    -
    -
    Sample Remarks
    -     		-
    -
    - -
    -
    -
    -
    Interpretation
    -
    - -
    Department -
    -     -     		- -
    - -
    -
    -     -
    -
    -
    -
    -     - - - - -
    - - -

    - Attachments for -

    - - - - - - - -
    -
    - -
    -
    - Attachment for - -
    -
    - -
    -
    - Filename: - -
    -
    -
    -
    -     -     -
    -     - - - -
    - - -
    -
    - - - - -
    - - - - - - -
    -
    - Lab Name - • Lab Street and Number - • Lab ZIP - Lab City - • Lab Country -
    -
    - Phone: - Lab Phone Number - • - Lab Email - - • - Lab URL - -
    -
    -
    -     -
    - - - END OF REPORT - -
    - -
    - From 4542e4d9c699a6e5bc0de8d0dc6feab8ab797f26 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Tue, 14 Nov 2023 03:28:53 +0200 Subject: [PATCH 109/126] Amended disclamer --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 3 +++ src/bika/coa/reports/GreenhillMulti.pt | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index 6588aa3..ce12381 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -649,6 +649,9 @@

    Disclaimers

      +
    1. + Please refer to our SANAS Schedule of Accreditation for a full list of our accredited methods and matrices. +
    2. The results apply only to the samples / items as received, tested, and described above.
      3. diff --git a/src/bika/coa/reports/GreenhillMulti.pt b/src/bika/coa/reports/GreenhillMulti.pt index f7bd1bb..6b3afe0 100644 --- a/src/bika/coa/reports/GreenhillMulti.pt +++ b/src/bika/coa/reports/GreenhillMulti.pt @@ -703,6 +703,9 @@

      Disclaimers

        +
      1. + Please refer to our SANAS Schedule of Accreditation for a full list of our accredited methods and matrices. +
      2. The results apply only to the samples / items as received, tested, and described above.
        3. From ff967494c6e86e2f66f015bbb54adb40bf9b3fb4 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Tue, 14 Nov 2023 12:49:51 +0200 Subject: [PATCH 110/126] Removed Legend --- src/bika/coa/reports/GreenhillDALRRDMulti.pt | 19 ------------------- src/bika/coa/reports/GreenhillMulti.pt | 16 ---------------- 2 files changed, 35 deletions(-) diff --git a/src/bika/coa/reports/GreenhillDALRRDMulti.pt b/src/bika/coa/reports/GreenhillDALRRDMulti.pt index ce12381..96cddff 100644 --- a/src/bika/coa/reports/GreenhillDALRRDMulti.pt +++ b/src/bika/coa/reports/GreenhillDALRRDMulti.pt @@ -568,25 +568,6 @@ - - -
        -
        -

        Legend

        -
        -
        -

        Accredited methods

        -
        -
        -

        South African Veterinary Council registered

        -
        -
        -

        Subcontracted methods

        -
        -
        -         - - Legend -
      -
      -

      Accredited methods

      -
      -
      -

      South African Veterinary Council registered

      -
      -
      -

      Subcontracted methods

      -
      -
    -
    From a901b73ca7543a2a5fb1a8995a96e8b3ca2d66b4 Mon Sep 17 00:00:00 2001 From: Lunga Baliwe Date: Mon, 8 Jan 2024 23:55:00 +0200 Subject: [PATCH 111/126] Aquaculture Data --- src/bika/coa/reportview.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/bika/coa/reportview.py b/src/bika/coa/reportview.py index a60437e..57cb3f1 100644 --- a/src/bika/coa/reportview.py +++ b/src/bika/coa/reportview.py @@ -791,6 +791,31 @@ def get_common_row_data_green_dalrrd(self, collection, poc, category): common_data.append(datum) unique_data = self.uniquify_items(common_data) return unique_data + + def get_analyses_headers(self, collection, poc, category): + analyses = self.get_analyses_by(collection, poc=poc, category=category) + headers = [] + for analysis in analyses: + title = analysis.title + if title not in headers: + headers.append(title) + return headers + + def get_aquaculture_data(self, collection, poc, category): + """ + :returns: {"sample_id":{"analysisTitle": "analysisResult"}} eg + {"ABC-12": {"Calcium": 20}} + """ + analyses = self.get_analyses_by(collection, poc=poc, category=category) + headers = [] + data = {} + for analysis in analyses: + sample_id = analysis.aq_parent.getId() + if sample_id not in data: + data[sample_id] = {analysis.title: analysis.getFormattedResult()} + else: + data[sample_id].update({analysis.title: analysis.getFormattedResult()}) + return data def get_datetime_string(self,num_date): return str(num_date.day()) + " " + num_date.Month() + " " + str(num_date.year()) + " " + str(num_date.Time()[:5]) From 626bbeead2ac02a6c03812a41105099909cb19a6 Mon Sep 17 00:00:00 2001 From: francoisler-lab <66058884+francoisler-lab@users.noreply.github.com> Date: Mon, 22 Jan 2024 12:52:32 +0200 Subject: [PATCH 112/126] Update MultiTestItISO17025RowWithCoordinates.pt (#43) Displays * for results that are not in the scope of accreditation 2. Added additional page breaks 3. Email links now populate subject lines for each query 4. Removed result interpretation section that essentialy duplicates additional sample information. 5. Hard-coded lab contact details to prevent weird rendering 6. Removed duplicate outsource statement on cover page 7. Removed extra space after longitude bearing 8. Added some logic to display - if no coordinates are available --- .../MultiTestItISO17025RowWithCoordinates.pt | 89 ++++++++++++------- 1 file changed, 56 insertions(+), 33 deletions(-) diff --git a/src/bika/coa/reports/MultiTestItISO17025RowWithCoordinates.pt b/src/bika/coa/reports/MultiTestItISO17025RowWithCoordinates.pt index dd24205..00c1e78 100644 --- a/src/bika/coa/reports/MultiTestItISO17025RowWithCoordinates.pt +++ b/src/bika/coa/reports/MultiTestItISO17025RowWithCoordinates.pt @@ -176,25 +176,35 @@
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    +
    Test It LAB
    + +
    +
    +
    Plot 9D Kwagga Street
    +
    + +
    +
    +
    Quaggafontein
    +
    +
    +
    +
    Bloemfontein
    +
    +
    +
    +
    Free State
    +
    +
    +
    +
    9301
    +
    +
    +
    +
    South Africa
    +
    +