diff --git a/lims/analysis.py b/lims/analysis.py index feae06b..ee1cc57 100644 --- a/lims/analysis.py +++ b/lims/analysis.py @@ -2505,9 +2505,9 @@ class CopyTypificationSpreadsheet(Report): __name__ = 'lims.report_typification_copy.spreadsheet' @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): Typification = Pool().get('lims.typification') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['new_typifications'] = Typification.browse( data['new_typifications']) report_context['existing_typifications'] = Typification.browse( diff --git a/lims/control_tendency.py b/lims/control_tendency.py index 96bac23..d8583fb 100644 --- a/lims/control_tendency.py +++ b/lims/control_tendency.py @@ -1217,12 +1217,12 @@ class ControlChartReport(Report): __name__ = 'lims.control_chart.report' @classmethod - def get_context(cls, reports, data): - report_context = super().get_context(reports, data) + def get_context(cls, records, header, data): pool = Pool() Company = pool.get('company.company') ControlTendency = pool.get('lims.control.tendency') + report_context = super().get_context(records, header, data) if 'id' in data: tendency = ControlTendency(data['id']) else: @@ -1794,10 +1794,10 @@ class TrendChartReport(Report): __name__ = 'lims.trend.chart.report' @classmethod - def get_context(cls, reports, data): + def get_context(cls, records, header, data): TrendChart = Pool().get('lims.trend.chart') - report_context = super().get_context(reports, data) + report_context = super().get_context(records, header, data) chart_id = data.get('chart_id') chart = TrendChart(chart_id) diff --git a/lims/entry.py b/lims/entry.py index d37e0de..5b7fd26 100644 --- a/lims/entry.py +++ b/lims/entry.py @@ -1607,13 +1607,13 @@ class AcknowledgmentOfReceipt(Report): return result @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Company = pool.get('company.company') Service = pool.get('lims.service') Entry = pool.get('lims.entry') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) if 'id' in data: entry = Entry(data['id']) else: @@ -1805,13 +1805,13 @@ class EntryDetail(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): - report_context = super().get_context(records, data) + def get_context(cls, records, header, data): Company = Pool().get('company.company') + report_context = super().get_context(records, header, data) + company = Company(Transaction().context.get('company')) report_context['company'] = company - return report_context @@ -1820,8 +1820,8 @@ class EntryLabels(Report): __name__ = 'lims.entry.labels.report' @classmethod - def get_context(cls, records, data): - report_context = super().get_context(records, data) + def get_context(cls, records, header, data): + report_context = super().get_context(records, header, data) labels = [] for entry in records: for sample in entry.samples: @@ -1829,5 +1829,4 @@ class EntryLabels(Report): for i in range(fraction.packages_quantity): labels.append(fraction) report_context['labels'] = labels - return report_context diff --git a/lims/notebook.py b/lims/notebook.py index 1239056..c2ff263 100644 --- a/lims/notebook.py +++ b/lims/notebook.py @@ -5998,12 +5998,12 @@ class AnalysisPendingInform(Report): __name__ = 'lims.analysis_pending_inform' @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Laboratory = pool.get('lims.laboratory') Party = pool.get('party.party') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) today = get_print_date() report_context['today'] = today @@ -6012,7 +6012,6 @@ class AnalysisPendingInform(Report): report_context['date_to'] = data['date_to'] report_context['laboratory'] = Laboratory(data['laboratory']).rec_name report_context['party'] = '' - if data['party']: report_context['party'] = Party(data['party']).rec_name report_context['include_comments_of_fraction'] = \ @@ -6145,12 +6144,12 @@ class AnalysisCheckedPendingInform(Report): __name__ = 'lims.analysis_checked_pending_inform' @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Laboratory = pool.get('lims.laboratory') Party = pool.get('party.party') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) today = get_print_date() report_context['today'] = today diff --git a/lims/planification.py b/lims/planification.py index 17fac97..7b5e3dc 100644 --- a/lims/planification.py +++ b/lims/planification.py @@ -5671,8 +5671,8 @@ class PlanificationSequenceReport(Report): __name__ = 'lims.planification.sequence.report' @classmethod - def get_context(cls, records, data): - report_context = super().get_context(records, data) + def get_context(cls, records, header, data): + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company @@ -5743,7 +5743,7 @@ class PlanificationSequenceReport(Report): key=lambda x: x['order']) objects[k1]['methods'][k2]['lines'] = sorted_lines - report_context['objects'] = objects + report_context['records'] = objects return report_context @@ -5753,8 +5753,8 @@ class PlanificationWorksheetAnalysisReport(Report): __name__ = 'lims.planification.worksheet_analysis.report' @classmethod - def get_context(cls, records, data): - report_context = super().get_context(records, data) + def get_context(cls, records, header, data): + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company @@ -5867,8 +5867,8 @@ class PlanificationWorksheetMethodReport(Report): __name__ = 'lims.planification.worksheet_method.report' @classmethod - def get_context(cls, records, data): - report_context = super().get_context(records, data) + def get_context(cls, records, header, data): + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company @@ -6039,8 +6039,8 @@ class PlanificationWorksheetReport(Report): __name__ = 'lims.planification.worksheet.report' @classmethod - def get_context(cls, records, data): - report_context = super().get_context(records, data) + def get_context(cls, records, header, data): + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company @@ -6278,13 +6278,13 @@ class PendingServicesUnplannedReport(Report): __name__ = 'lims.pending_services_unplanned.report' @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Laboratory = pool.get('lims.laboratory') EntryDetailAnalysis = pool.get('lims.entry.detail.analysis') NotebookLine = pool.get('lims.notebook.line') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['start_date'] = (data['start_date'] @@ -6404,7 +6404,7 @@ class PendingServicesUnplannedReport(Report): objects[k1]['services'][k2]['parties'][k3]['lines'] = ( sorted_lines) - report_context['objects'] = objects + report_context['records'] = objects return report_context @classmethod @@ -6444,12 +6444,12 @@ class PendingServicesUnplannedSpreadsheet(Report): __name__ = 'lims.pending_services_unplanned.spreadsheet' @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Laboratory = pool.get('lims.laboratory') EntryDetailAnalysis = pool.get('lims.entry.detail.analysis') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['start_date'] = (data['start_date'] @@ -6552,7 +6552,7 @@ class PendingServicesUnplannedSpreadsheet(Report): objects = sorted(objects.values(), key=lambda x: ( x['laboratory'], x['service'], x['party'], x['order'])) - report_context['objects'] = objects + report_context['records'] = objects return report_context @classmethod @@ -6630,11 +6630,11 @@ class BlindSampleReport(Report): __name__ = 'lims.blind_sample_report' @classmethod - def get_context(cls, records, data): - report_context = super().get_context(records, - data) + def get_context(cls, records, header, data): BlindSample = Pool().get('lims.blind_sample') + report_context = super().get_context(records, header, data) + report_context['company'] = report_context['user'].company objects = [] @@ -6742,7 +6742,7 @@ class BlindSampleReport(Report): record['error'] = round(result - max_value, 2) objects.append(record) - report_context['objects'] = objects + report_context['records'] = objects report_context['date_from'] = data['date_from'] report_context['date_to'] = data['date_to'] @@ -6775,8 +6775,8 @@ class PlanificationSequenceAnalysisReport(Report): __name__ = 'lims.planification.sequence.analysis.report' @classmethod - def get_context(cls, records, data): - report_context = super().get_context(records, data) + def get_context(cls, records, header, data): + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company @@ -6848,6 +6848,6 @@ class PlanificationSequenceAnalysisReport(Report): key=lambda x: x['order']) objects[k1]['methods'][k2]['lines'] = sorted_lines - report_context['objects'] = objects + report_context['records'] = objects return report_context diff --git a/lims/report/blind_sample_report.fodt b/lims/report/blind_sample_report.fodt index 3cfd31d..408ebe6 100644 --- a/lims/report/blind_sample_report.fodt +++ b/lims/report/blind_sample_report.fodt @@ -1,28 +1,28 @@ - 2015-04-09T13:00:47P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2015-04-09T13:00:47P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 0 0 - 30886 - 14072 + 34503 + 14739 true false view2 - 17078 + 18886 3500 0 0 - 30884 - 14071 + 34502 + 14737 0 0 false - 110 + 100 false false @@ -92,7 +92,7 @@ false false true - 511022 + 599408 false false false @@ -398,7 +398,7 @@ - + @@ -409,6 +409,17 @@ + + + + + + + + + + + @@ -442,14 +453,14 @@ - + - Blind Samples Report + Blind Samples Report @@ -470,7 +481,7 @@ - <format_date(date_from, user.language)>- <format_date(date_to, user.language)> + <format_date(date_from, user.language)>- <format_date(date_to, user.language)> @@ -536,7 +547,7 @@ - <for each="record in objects"> + <for each="record in records"> diff --git a/lims/report/countersample_discharge_report.fodt b/lims/report/countersample_discharge_report.fodt index 035891d..f159401 100644 --- a/lims/report/countersample_discharge_report.fodt +++ b/lims/report/countersample_discharge_report.fodt @@ -1,28 +1,28 @@ - 2016-05-11T10:46:12.233498975P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2016-05-11T10:46:12.233498975P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 0 0 - 28312 - 12548 + 34503 + 13760 true false view2 - 12021 + 13921 3997 0 0 - 28310 - 12547 + 34502 + 13758 0 0 false - 120 + 100 false false @@ -92,7 +92,7 @@ false false true - 5087180 + 5219944 false false false @@ -430,63 +430,63 @@ - + - - - + + + - - + - + - - + + - + - + - + - + - + - + + + + + + + + + - + - - - - - - - @@ -557,17 +557,17 @@ - + - Discharge of Countersamples + Discharge of Countersamples - + @@ -592,7 +592,7 @@ - Expiry date range: + Expiry date range: <format_date(expiry_date_from, user.language)>- <format_date(expiry_date_to, user.language)> @@ -600,7 +600,7 @@ - Input date range: + Input date range: <format_date(date_from, user.language)>- <format_date(date_to, user.language)> @@ -608,7 +608,7 @@ - <for each="record in objects"> + <for each="record in records"> <record.location> @@ -623,7 +623,7 @@ - Code + Code Type @@ -644,7 +644,7 @@ Study Plan - Countersample date + Countersample date Expiry date @@ -653,7 +653,7 @@ - <for each="fraction in record.fractions"> + <for each="fraction in record.fractions"> @@ -666,36 +666,36 @@ - <fraction['number']> + <fraction['number']> - <fraction['type']> + <fraction['type']> - <fraction['packages']> + <fraction['packages']> - <format_date(fraction['entry_date'], user.language)> + <format_date(fraction['entry_date'], user.language)> - <fraction['results_reports']> + <fraction['results_reports']> - <fraction['comments']> + <fraction['comments']> - <fraction['stp_number']> + <fraction['stp_number']> - <format_date(fraction['countersample_date'], user.language) if fraction['countersample_date'] else ''> + <format_date(fraction['countersample_date'], user.language) if fraction['countersample_date'] else ''> - <format_date(fraction['expiry_date'], user.language) if fraction['expiry_date'] else ''> + <format_date(fraction['expiry_date'], user.language) if fraction['expiry_date'] else ''> - </for> + </for> diff --git a/lims/report/countersample_storage_report.fodt b/lims/report/countersample_storage_report.fodt index 72ce2b1..d9ca490 100644 --- a/lims/report/countersample_storage_report.fodt +++ b/lims/report/countersample_storage_report.fodt @@ -1,28 +1,28 @@ - 2016-05-11T10:45:50.537494476P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2016-05-11T10:45:50.537494476P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 0 0 - 28312 - 12548 + 34503 + 13760 true false view2 - 11959 + 13859 3997 0 0 - 28310 - 12547 + 34502 + 13758 0 0 false - 120 + 100 false false @@ -92,7 +92,7 @@ false false true - 4871886 + 4972505 false false false @@ -418,55 +418,55 @@ - + - - - + + + - - + - + - - + + - + + + + + + + + + - + - + - + - + - - - - - - - @@ -529,17 +529,17 @@ - + - Storage of Countersamples + Storage of Countersamples - + @@ -564,7 +564,7 @@ - Report date range: + Report date range: <format_date(report_date_from, user.language)>- <format_date(report_date_to, user.language)> @@ -572,7 +572,7 @@ - Input date range: + Input date range: <format_date(date_from, user.language)>- <format_date(date_to, user.language)> @@ -580,7 +580,7 @@ - <for each="record in objects"> + <for each="record in records"> <record.location> @@ -593,7 +593,7 @@ - Code + Code Type @@ -617,7 +617,7 @@ - <for each="fraction in record.fractions"> + <for each="fraction in record.fractions"> @@ -628,30 +628,30 @@ - <fraction['number']> + <fraction['number']> - <fraction['type']> + <fraction['type']> - <fraction['packages']> + <fraction['packages']> - <format_date(fraction['entry_date'], user.language)> + <format_date(fraction['entry_date'], user.language)> - <fraction['results_reports']> + <fraction['results_reports']> - <fraction['comments']> + <fraction['comments']> - <fraction['stp_number']> + <fraction['stp_number']> - </for> + </for> diff --git a/lims/report/entry_detail_report.fodt b/lims/report/entry_detail_report.fodt index 96c3b66..8fb84ca 100644 --- a/lims/report/entry_detail_report.fodt +++ b/lims/report/entry_detail_report.fodt @@ -1,24 +1,24 @@ - 2014-05-15T10:09:19P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2014-05-15T10:09:19P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 0 0 - 33313 - 14104 + 34503 + 14739 true false view2 - 8070 + 3401 1501 0 0 - 33311 - 14102 + 34502 + 14737 0 0 false @@ -92,7 +92,7 @@ false false true - 1701598 + 1746298 false false false @@ -473,7 +473,7 @@ - + @@ -484,6 +484,17 @@ + + + + + + + + + + + @@ -526,14 +537,14 @@ - + - Entry Detail + Entry Detail <format_date(datetime.date.today(), user.language)> @@ -554,7 +565,7 @@ - <for each="entry in objects"> + <for each="entry in records"> diff --git a/lims/report/entry_labels_report.fodt b/lims/report/entry_labels_report.fodt index 691d754..282de0c 100644 --- a/lims/report/entry_labels_report.fodt +++ b/lims/report/entry_labels_report.fodt @@ -1,28 +1,28 @@ - 2017-09-14T11:41:02.109374203P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2017-09-14T11:41:02.109374203P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 0 0 - 18875 - 8366 + 34503 + 14739 true false view2 - 1501 + 7751 1501 0 0 - 18874 - 8364 + 34502 + 14737 0 0 false - 180 + 100 false false @@ -92,7 +92,7 @@ false false true - 1822742 + 1900282 false false false diff --git a/lims/report/pending_services_unplanned_report.fodt b/lims/report/pending_services_unplanned_report.fodt index 9cca445..9aae12a 100644 --- a/lims/report/pending_services_unplanned_report.fodt +++ b/lims/report/pending_services_unplanned_report.fodt @@ -1,28 +1,28 @@ - 2015-03-19T19:35:52P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2015-03-19T19:35:52P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 0 0 - 30886 - 14072 + 34503 + 14739 true false view2 - 1593 + 3401 1501 0 0 - 30884 - 14071 + 34502 + 14737 0 0 false - 110 + 100 false false @@ -92,7 +92,7 @@ false false true - 2400983 + 2575825 false false false @@ -470,7 +470,7 @@ - + @@ -497,6 +497,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -554,14 +581,14 @@ - + - Pending Services Unplanned + Pending Services Unplanned @@ -584,7 +611,7 @@ - <for each="laboratory in objects.values()"> + <for each="laboratory in records.values()"> Date range: <format_date(start_date, user.language)>- <format_date(end_date, user.language)> <laboratory.laboratory>Date of issue: <format_date(datetime.date.today(), user.language)> diff --git a/lims/report/pending_services_unplanned_spreadsheet.fods b/lims/report/pending_services_unplanned_spreadsheet.fods index f55eee3..fee84c9 100644 --- a/lims/report/pending_services_unplanned_spreadsheet.fods +++ b/lims/report/pending_services_unplanned_spreadsheet.fods @@ -1,7 +1,7 @@ - 2009-04-16T11:32:48.39P9DT18H57M2S21LibreOffice/6.1.5.2$Linux_X86_64 LibreOffice_project/10$Build-22019-05-29T16:39:23.195575724 + 2009-04-16T11:32:48.39P9DT18H57M39S22LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-32021-09-22T17:09:52.148106607 451 @@ -14,7 +14,7 @@ 0 - 19 + 14 0 0 0 @@ -32,7 +32,7 @@ Sheet1 - 1125 + 1305 0 100 60 @@ -40,7 +40,7 @@ true true true - 12632256 + 12632256 true true true @@ -64,18 +64,17 @@ false 0 true - lQH+/0dlbmVyaWMgUHJpbnRlcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU0dFTlBSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMAtgAAAAAAAAAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MApjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKRHVwbGV4Ok5vbmUAUGFnZVNpemU6TGV0dGVyAAASAENPTVBBVF9EVVBMRVhfTU9ERQ8ARHVwbGV4TW9kZTo6T2Zm - Generic Printer + mAH+/0hQLUxhc2VySmV0LTEwMTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpIUC1MYXNlckpldC0xMDE4AAAAAAAAAAAAAAAWAAMAtQAAAAAAAwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9SFAtTGFzZXJKZXQtMTAxOApvcmllbnRhdGlvbj1Qb3J0cmFpdApjb3BpZXM9MQpjb2xsYXRlPWZhbHNlCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MQpjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKUGFnZVNpemU6QTQAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du + HP-LaserJet-1018 true 3 true false true true - 12632256 + 12632256 true true - false true false true @@ -102,7 +101,6 @@ - @@ -295,7 +293,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -397,7 +395,7 @@ - for each="line in objects" + for each="line in records" @@ -506,7 +504,7 @@ - for each="line in objects" + for each="line in records" diff --git a/lims/report/referral.fods b/lims/report/referral.fods index 5dc5d9a..aad39c4 100644 --- a/lims/report/referral.fods +++ b/lims/report/referral.fods @@ -25,16 +25,16 @@ 0 0 0 - 80 + 100 60 true false Hoja1 - 1344 + 1305 0 - 80 + 100 60 false true @@ -64,7 +64,7 @@ false 0 false - pwH+/0hQLUxhc2VySmV0LTEwMTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpIUC1MYXNlckpldC0xMDE4AAAAAAAAAAAAAAAWAAMAxAAAAAAAAwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9SFAtTGFzZXJKZXQtMTAxOApvcmllbnRhdGlvbj1Qb3J0cmFpdApjb3BpZXM9MQpjb2xsYXRlPWZhbHNlCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MQpjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKUGFnZVNpemU6QTQASW5wdXRTbG90OkF1dG8AABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du + pwH+/0hQLUxhc2VySmV0LTEwMTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpIUC1MYXNlckpldC0xMDE4AAAAAAAAAAAAAAAWAAMAxAAAAAAAAwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9SFAtTGFzZXJKZXQtMTAxOApvcmllbnRhdGlvbj1Qb3J0cmFpdApjb3BpZXM9MQpjb2xsYXRlPWZhbHNlCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MQpjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKSW5wdXRTbG90OkF1dG8AUGFnZVNpemU6QTQAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du HP-LaserJet-1018 true 3 @@ -208,6 +208,15 @@ + + + + + + + + + @@ -231,9 +240,15 @@ - + + + + + + + @@ -254,7 +269,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -273,7 +288,7 @@ - + Referral of Services @@ -287,12 +302,12 @@ - Laboratory: record.laboratory.name + Laboratory: record.laboratory.name - Date: format_date(record.date, user.language) + Date: format_date(record.date, user.language) @@ -300,20 +315,20 @@ - + Fraction - + Analysis - - + + Method - + - for each="line in record.services" + for each="line in record.services" @@ -327,7 +342,7 @@ line.method.code - + /for diff --git a/lims/report/trend_chart_report.fodt b/lims/report/trend_chart_report.fodt index 75fc099..0094036 100644 --- a/lims/report/trend_chart_report.fodt +++ b/lims/report/trend_chart_report.fodt @@ -1,29 +1,29 @@ - 2015-03-19T10:18:10P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 + 2015-03-19T10:18:10P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 0 0 - 71069 - 29476 + 34503 + 14739 true false view2 - 26033 + 7751 4098 0 0 - 71067 - 29475 + 34502 + 14737 0 1 false - 50 - true + 100 + false false @@ -92,7 +92,7 @@ false false true - 786368 + 863655 true false false @@ -294,51 +294,51 @@ - + + - + + + + - + - - - - - + - + + + + + - + - + - + - + - - - - @@ -369,12 +369,12 @@ <title> - + - - + + \ No newline at end of file diff --git a/lims/results_report.py b/lims/results_report.py index cb0d08a..36ae7b7 100644 --- a/lims/results_report.py +++ b/lims/results_report.py @@ -3850,7 +3850,7 @@ class ResultReport(Report): return result @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Company = pool.get('company.company') ResultsDetail = pool.get('lims.results_report.version.detail') @@ -3859,7 +3859,7 @@ class ResultReport(Report): Sample = pool.get('lims.sample') RangeType = pool.get('lims.range.type') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) if data.get('alt_lang'): lang_code = data['alt_lang'] diff --git a/lims/sample.py b/lims/sample.py index 32ebc94..7afd20a 100644 --- a/lims/sample.py +++ b/lims/sample.py @@ -6244,12 +6244,12 @@ class CountersampleStorageReport(Report): __name__ = 'lims.countersample.storage.report' @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Fraction = pool.get('lims.fraction') NotebookLine = pool.get('lims.notebook.line') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['report_date_from'] = data['report_date_from'] @@ -6327,7 +6327,7 @@ class CountersampleStorageReport(Report): ordered_objects = sorted(list(objects.values()), key=lambda x: x['location']) - report_context['objects'] = ordered_objects + report_context['records'] = ordered_objects return report_context @classmethod @@ -6439,11 +6439,11 @@ class CountersampleDischargeReport(Report): __name__ = 'lims.countersample.discharge.report' @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Fraction = pool.get('lims.fraction') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['expiry_date_from'] = data['expiry_date_from'] @@ -6486,7 +6486,7 @@ class CountersampleDischargeReport(Report): ordered_objects = sorted(list(objects.values()), key=lambda x: x['location']) - report_context['objects'] = ordered_objects + report_context['records'] = ordered_objects return report_context @classmethod diff --git a/lims_analysis_sheet/sheet.py b/lims_analysis_sheet/sheet.py index 8673016..22988f0 100644 --- a/lims_analysis_sheet/sheet.py +++ b/lims_analysis_sheet/sheet.py @@ -1224,13 +1224,13 @@ class AnalysisSheetReport(Report): return [] @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() AnalysisSheet = pool.get('lims.analysis_sheet') Field = pool.get('lims.interface.table.field') Data = pool.get('lims.interface.data') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) sheet = AnalysisSheet(data.get('id')) print_expression_column = data.get('print_expression_column') diff --git a/lims_diagnosis/results_report.py b/lims_diagnosis/results_report.py index f996b19..f9e1b62 100644 --- a/lims_diagnosis/results_report.py +++ b/lims_diagnosis/results_report.py @@ -471,8 +471,8 @@ class ResultReport(metaclass=PoolMeta): __name__ = 'lims.result_report' @classmethod - def get_context(cls, records, data): - report_context = super().get_context(records, data) + def get_context(cls, records, header, data): + report_context = super().get_context(records, header, data) report_context['state_image'] = cls.get_state_image return report_context diff --git a/lims_production/lims.py b/lims_production/lims.py index 8ad9678..3cb34b6 100644 --- a/lims_production/lims.py +++ b/lims_production/lims.py @@ -68,11 +68,11 @@ class FamilyEquivalentReport(Report): __name__ = 'lims.family.equivalent.report' @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Company = pool.get('company.company') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['company'] = Company(Transaction().context['company']) report_context['records'] = cls._get_family_records(records) diff --git a/lims_project_study_plan/project.py b/lims_project_study_plan/project.py index 6d51bc9..07c6f39 100644 --- a/lims_project_study_plan/project.py +++ b/lims_project_study_plan/project.py @@ -937,12 +937,11 @@ class ProjectGLPReport01(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): ProjectSampleInCustody = Pool().get( 'lims.project.sample_in_custody') - report_context = super().get_context( - records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['stp_number'] = records[0].stp_number @@ -978,7 +977,7 @@ class ProjectGLPReport01(Report): sample.file_operator_responsible.rec_name if sample.file_operator_responsible else ''), }) - report_context['objects'] = objects + report_context['records'] = objects return report_context @@ -1000,11 +999,10 @@ class ProjectGLPReport02(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): Fraction = Pool().get('lims.fraction') - report_context = super().get_context( - records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['stp_number'] = records[0].stp_number @@ -1045,7 +1043,7 @@ class ProjectGLPReport02(Report): 'comments': str(fraction.comments or '') }) - report_context['objects'] = objects + report_context['records'] = objects return report_context @@ -1102,13 +1100,12 @@ class ProjectGLPReport03(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Project = pool.get('lims.project') Fraction = pool.get('lims.fraction') - report_context = super().get_context( - records, data) + report_context = super().get_context(records, header, data) project = Project(data['id']) @@ -1141,7 +1138,7 @@ class ProjectGLPReport03(Report): 'countersample_date': fraction.countersample_date or '', 'comments': str(fraction.comments or ''), }) - report_context['objects'] = objects + report_context['records'] = objects return report_context @@ -1163,12 +1160,12 @@ class ProjectGLPReport04(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Fraction = pool.get('lims.fraction') Move = pool.get('stock.move') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['stp_number'] = records[0].stp_number @@ -1211,7 +1208,7 @@ class ProjectGLPReport04(Report): 'shipment': move.shipment.number, 'responsible': move.create_uid.name, }) - report_context['objects'] = objects + report_context['records'] = objects return report_context @@ -1269,12 +1266,12 @@ class ProjectGLPReport05(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Project = pool.get('lims.project') Fraction = pool.get('lims.fraction') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) project = Project(data['id']) @@ -1305,7 +1302,7 @@ class ProjectGLPReport05(Report): 'discharge_date': fraction.discharge_date or '', 'comments': str(fraction.comments or ''), }) - report_context['objects'] = objects + report_context['records'] = objects return report_context @@ -1327,14 +1324,14 @@ class ProjectGLPReport06(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() ProjectDevAndAmndmnt = pool.get( 'lims.project.deviation_amendment') ProjectDevAndAmndmntProfessional = pool.get( 'lims.project.deviation_amendment.professional') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['stp_number'] = records[0].stp_number @@ -1363,7 +1360,7 @@ class ProjectGLPReport06(Report): 'date': p.date or '', } for p in professionals], }) - report_context['objects'] = objects + report_context['records'] = objects return report_context @@ -1407,12 +1404,12 @@ class ProjectGLPReport07(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Entry = pool.get('lims.entry') Fraction = pool.get('lims.fraction') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['stp_number'] = records[0].stp_number @@ -1449,7 +1446,7 @@ class ProjectGLPReport07(Report): 'label': fraction.sample.label, 'storage_location': fraction.storage_location.code, }) - report_context['objects'] = objects + report_context['records'] = objects return report_context @@ -1471,12 +1468,12 @@ class ProjectGLPReport08(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Entry = pool.get('lims.entry') Fraction = pool.get('lims.fraction') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['stp_number'] = records[0].stp_number @@ -1510,7 +1507,7 @@ class ProjectGLPReport08(Report): 'label': fraction.sample.label, 'sample_weight': fraction.sample.sample_weight, }) - report_context['objects'] = objects + report_context['records'] = objects return report_context @@ -1532,7 +1529,7 @@ class ProjectGLPReport09(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): cursor = Transaction().connection.cursor() pool = Pool() Fraction = pool.get('lims.fraction') @@ -1541,7 +1538,7 @@ class ProjectGLPReport09(Report): ResultsReport = pool.get('lims.results_report') Analysis = pool.get('lims.analysis') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['stp_number'] = records[0].stp_number @@ -1614,7 +1611,7 @@ class ProjectGLPReport09(Report): 'result': re if re else '', }) - report_context['objects'] = objects + report_context['records'] = objects return report_context @@ -1674,11 +1671,11 @@ class ProjectGLPReport10(Report): __name__ = 'lims.project.glp_report.10' @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Project = pool.get('lims.project') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['date_from'] = data['date_from'] @@ -1781,7 +1778,7 @@ class ProjectGLPReport10(Report): 'comments': str(s.comments or ''), } for s in project.stp_samples_in_custody], }) - report_context['objects'] = objects + report_context['records'] = objects return report_context @@ -1825,11 +1822,11 @@ class ProjectGLPReport11(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): ProjectReferenceElement = Pool().get( 'lims.project.reference_element') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['stp_number'] = records[0].stp_number @@ -1903,11 +1900,11 @@ class ProjectGLPReport12(Report): __name__ = 'lims.project.glp_report.12' @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() ProjectChangeLog = pool.get('lims.project.stp_changelog') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['date_from'] = data['date_from'] @@ -1963,7 +1960,7 @@ class ProjectGLPReport12(Report): } for p in project.stp_laboratory_professionals], }) - report_context['objects'] = objects + report_context['records'] = objects return report_context @@ -1985,8 +1982,8 @@ class ProjectGLPReportStudyPlan(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): - report_context = super().get_context(records, data) + def get_context(cls, records, header, data): + report_context = super().get_context(records, header, data) project = records[0] @@ -2079,8 +2076,8 @@ class ProjectGLPReportFinalRP(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): - report_context = super().get_context(records, data) + def get_context(cls, records, header, data): + report_context = super().get_context(records, header, data) project = records[0] @@ -2319,8 +2316,8 @@ class ProjectGLPReportFinalFOR(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): - report_context = super().get_context(records, data) + def get_context(cls, records, header, data): + report_context = super().get_context(records, header, data) project = records[0] @@ -2564,8 +2561,8 @@ class ProjectGLPReportAnalyticalPhase(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): - report_context = super().get_context(records, data) + def get_context(cls, records, header, data): + report_context = super().get_context(records, header, data) project = records[0] @@ -2801,11 +2798,11 @@ class ProjectGLPReport13(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Fraction = pool.get('lims.fraction') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) report_context['company'] = report_context['user'].company report_context['stp_matrix'] = records[0].stp_matrix_client_description @@ -2826,7 +2823,7 @@ class ProjectGLPReport13(Report): 'label': fraction.sample.label, 'fraction_type': fraction.type.code, }) - report_context['objects'] = objects + report_context['records'] = objects return report_context @staticmethod diff --git a/lims_project_study_plan/report/glp_01.fodt b/lims_project_study_plan/report/glp_01.fodt index 2dd225a..00799b6 100644 --- a/lims_project_study_plan/report/glp_01.fodt +++ b/lims_project_study_plan/report/glp_01.fodt @@ -1,28 +1,28 @@ - 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 - 0 + 7197 0 - 28312 - 12548 + 34503 + 14739 true false view2 - 1249 - 4140 + 2900 + 5962 0 - 0 - 28310 - 12547 + 7197 + 34502 + 21934 0 0 false - 120 + 100 false false @@ -92,7 +92,7 @@ false false true - 4745585 + 4860755 false false false @@ -430,70 +430,70 @@ - + - + + + + + + + + - + - + - + - + - - - - - - - - - + - + - + - + - + - + + + + + + + + + - - - - - - - @@ -567,18 +567,18 @@ - + - Sample reception - Temporary input and output of samples to the file + Sample reception + Temporary input and output of samples to the file - GLP 005 - Annex 3 + GLP 005 - Annex 3 @@ -607,7 +607,7 @@ STUDY PLAN: <code> - Sponsor: + Sponsor: <stp_sponsor> @@ -616,7 +616,7 @@ - Matrix: + Matrix: <stp_matrix> @@ -625,7 +625,7 @@ - Product brand: + Product brand: <stp_product_brand> @@ -633,7 +633,7 @@ - <for each="record in objects.values()"> + <for each="record in records.values()"> @@ -660,7 +660,7 @@ - Input + Input @@ -675,7 +675,7 @@ - Reception date + Reception date Packages quantity and type @@ -696,7 +696,7 @@ File operator responsible / - Output date * + Output date * Retire responsible/ @@ -704,7 +704,7 @@ - <for each="sample in record['samples']"> + <for each="sample in record['samples']"> @@ -717,36 +717,36 @@ - <if test="sample['entry_date']"><format_date(sample['entry_date'], user.language)></if> + <if test="sample['entry_date']"><format_date(sample['entry_date'], user.language)></if> - <sample['packages']> + <sample['packages']> - <sample['temperature']> + <sample['temperature']> - <sample['processing_state']> + <sample['processing_state']> - <sample['comments']> + <sample['comments']> - <sample['entry_responsible']> + <sample['entry_responsible']> - <sample['file_operator_responsible']> + <sample['file_operator_responsible']> - + - + - </for> + </for> diff --git a/lims_project_study_plan/report/glp_02.fodt b/lims_project_study_plan/report/glp_02.fodt index 1819fa6..e918424 100644 --- a/lims_project_study_plan/report/glp_02.fodt +++ b/lims_project_study_plan/report/glp_02.fodt @@ -1,24 +1,24 @@ - 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 0 0 - 33313 - 14104 + 34503 + 14739 true false view2 - 2554 - 4080 + 2900 + 9548 0 0 - 33311 - 14102 + 34502 + 14737 0 0 false @@ -92,7 +92,7 @@ false false true - 6505210 + 6598944 false false false @@ -466,95 +466,95 @@ - + - - - + + + - - + - + - + + - + + - - + - - + - + - + - + - + - + - + + - + + - + - + - + - + + + + + + + - + - + - + - - - - - - - @@ -648,18 +648,18 @@ - + - Control e identificación de Muestras - Ingreso y Egreso DEFINITIVO de Muestras para ANALIZAR + Control e identificación de Muestras + Ingreso y Egreso DEFINITIVO de Muestras para ANALIZAR - BPL 005 - Anexo 4 – Rev. 4 + BPL 005 - Anexo 4 – Rev. 4 @@ -689,7 +689,7 @@ - Sponsor: + Sponsor: <stp_sponsor> @@ -698,7 +698,7 @@ - Matrix: + Matrix: <stp_matrix> @@ -707,7 +707,7 @@ - Product brand: + Product brand: <stp_product_brand> @@ -716,7 +716,7 @@ - + @@ -728,27 +728,27 @@ - Control de pesos de muestras + Control de pesos de muestras - Cantidad mínima de muestra (dato obtenido del Plan de Estudio): <min_qty_sample> + Cantidad mínima de muestra (dato obtenido del Plan de Estudio): <min_qty_sample> - Indicar conformidad con cantidad mínima de muestra: <min_qty_sample_compliance> + Indicar conformidad con cantidad mínima de muestra: <min_qty_sample_compliance> - Balanza utilizada: <balance_name> + Balanza utilizada: <balance_name> - <for each="record in objects.values()"> + <for each="record in records.values()"> @@ -774,7 +774,7 @@ - Input + Input @@ -789,7 +789,7 @@ - CODE <company.short_name> + CODE <company.short_name> Rótulo @@ -806,7 +806,7 @@ - Output date + Output date Laboratory responsible @@ -817,7 +817,7 @@ - <for each="sample in record['samples']"> + <for each="sample in record['samples']"> @@ -830,36 +830,36 @@ - <sample['number']> + <sample['number']> - <sample['label']> + <sample['label']> - <sample['sample_weight']> + <sample['sample_weight']> - <sample['packages']> + <sample['packages']> - - <sample['comments']> + + <sample['comments']> - + - + - + - </for> - + </for> + @@ -877,13 +877,13 @@ - Observaciones generales: + Observaciones generales: - <project_comments> - + <project_comments> + @@ -893,32 +893,32 @@ - Resp. Ingreso de Muestras + Resp. Ingreso de Muestras - Resp. Op. Archivo + Resp. Op. Archivo - Firma: + Firma: - Firma: + Firma: - Fecha: + Fecha: - Fecha: + Fecha: - (*) Registrar el peso de cada muestra, cuando sea necesario o solo verificar conformidad (consultar al Director de Estudio / Investigador Principal). + (*) Registrar el peso de cada muestra, cuando sea necesario o solo verificar conformidad (consultar al Director de Estudio / Investigador Principal). diff --git a/lims_project_study_plan/report/glp_03.fodt b/lims_project_study_plan/report/glp_03.fodt index 165db65..7412c09 100644 --- a/lims_project_study_plan/report/glp_03.fodt +++ b/lims_project_study_plan/report/glp_03.fodt @@ -1,24 +1,24 @@ - 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 - 0 + 8255 0 - 33974 - 15480 + 34503 + 13760 true false view2 - 2884 - 4103 + 2900 + 7627 0 - 0 - 33973 - 15478 + 8255 + 34502 + 22013 0 0 false @@ -92,7 +92,7 @@ false false true - 4895401 + 4968563 false false false @@ -126,8 +126,8 @@ - - + + @@ -431,7 +431,7 @@ - + @@ -439,7 +439,7 @@ - + @@ -447,110 +447,110 @@ - + - - + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + @@ -562,23 +562,23 @@ - - - - - - - - - - + - + + + + + + + + + + @@ -609,17 +609,17 @@ - + - Storage of Countersamples + Storage of Countersamples - BPL 005 - Anexo 5 – Rev. 3 + BPL 005 - Anexo 5 – Rev. 3 @@ -649,7 +649,7 @@ PLAN DE ESTUDIO: <stp_code> - Report date range: + Report date range: <format_date(report_date_from, user.language)>- <format_date(report_date_to, user.language)> @@ -658,14 +658,14 @@ - + - + @@ -676,46 +676,46 @@ - Sample + Sample - Sample input to file + Sample input to file - Countersample + Countersample - CODE <company.short_name> + CODE <company.short_name> - Type + Type - Packages quantity and type + Packages quantity and type - Location + Location - Location + Location - Countersample date + Countersample date - Comments + Comments - <for each="fraction in objects"> + <for each="fraction in records"> @@ -726,30 +726,30 @@ - <fraction['number']> + <fraction['number']> - <fraction['type']> + <fraction['type']> - <fraction['packages']> + <fraction['packages']> - <fraction['storage_location']> + <fraction['storage_location']> - <fraction['countersample_location']> + <fraction['countersample_location']> - <format_date(fraction['countersample_date'], user.language) if fraction['countersample_date'] else ''> + <format_date(fraction['countersample_date'], user.language) if fraction['countersample_date'] else ''> - <fraction['comments']> + <fraction['comments']> - </for> + </for> @@ -759,24 +759,24 @@ - - + + - General comments: + General comments: - - - + + + - + \ No newline at end of file diff --git a/lims_project_study_plan/report/glp_04.fodt b/lims_project_study_plan/report/glp_04.fodt index e6a3ef2..8f62f10 100644 --- a/lims_project_study_plan/report/glp_04.fodt +++ b/lims_project_study_plan/report/glp_04.fodt @@ -1,24 +1,24 @@ - 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 0 0 - 33974 - 15480 + 34503 + 14739 true false view2 - 2884 - 4486 + 2900 + 6653 0 0 - 33973 - 15478 + 34502 + 14737 0 0 false @@ -92,7 +92,7 @@ false false true - 3869541 + 3897010 false false false @@ -421,55 +421,55 @@ - + - + + + + + + + + - + - - - - - - - - - + - + - + - + + + + + + + + + - + - - - - - - - @@ -539,17 +539,17 @@ - + - Movements of countersamples + Movements of countersamples - BPL 005 - Anexo 6 – Rev. 4 + BPL 005 - Anexo 6 – Rev. 4 @@ -578,7 +578,7 @@ PLAN DE ESTUDIO:<code> - Sponsor: + Sponsor: <stp_sponsor> @@ -587,7 +587,7 @@ - Matrix: + Matrix: <stp_matrix> @@ -596,7 +596,7 @@ - Product brand: + Product brand: <stp_product_brand> @@ -605,7 +605,7 @@ - + @@ -613,7 +613,7 @@ - <for each="record in objects.values()"> + <for each="record in records.values()"> @@ -633,7 +633,7 @@ - Code + Code From Location @@ -659,7 +659,7 @@ - <for each="sample in record['samples']"> + <for each="sample in record['samples']"> @@ -671,22 +671,22 @@ - <sample['number']> + <sample['number']> - <sample['from_location']> + <sample['from_location']> - <sample['to_location']> + <sample['to_location']> - <format_date(sample['date'], user.language)> + <format_date(sample['date'], user.language)> - <sample['shipment']> + <sample['shipment']> - <sample['responsible']> + <sample['responsible']> @@ -697,7 +697,7 @@ - </for> + </for> diff --git a/lims_project_study_plan/report/glp_05.fodt b/lims_project_study_plan/report/glp_05.fodt index 3127240..6aa200b 100644 --- a/lims_project_study_plan/report/glp_05.fodt +++ b/lims_project_study_plan/report/glp_05.fodt @@ -1,24 +1,24 @@ - 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 0 0 - 33974 - 15480 + 34503 + 13760 true false view2 - 2884 - 4530 + 2983 + 8481 0 0 - 33973 - 15478 + 34502 + 13758 0 0 false @@ -92,7 +92,7 @@ false false true - 4927190 + 4956087 false false false @@ -126,8 +126,8 @@ - - + + @@ -439,11 +439,11 @@ - + - + @@ -453,85 +453,35 @@ - + - - + + - - - + + - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - + @@ -539,19 +489,69 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + @@ -563,23 +563,23 @@ - - - - - - - - - - + - + + + + + + + + + + @@ -610,17 +610,17 @@ - + - Discharge of Countersamples + Discharge of Countersamples - BPL 005 - Anexo 7 – Rev. 2 + BPL 005 - Anexo 7 – Rev. 2 @@ -650,7 +650,7 @@ PLAN DE ESTUDIO:<code> - Expiry date range: + Expiry date range: <format_date(expiry_date_from, user.language)>- <format_date(expiry_date_to, user.language)> @@ -659,14 +659,14 @@ - + - + @@ -679,15 +679,15 @@ - Sample + Sample - Sample input to file + Sample input to file - Countersample + Countersample @@ -695,34 +695,34 @@ - Code + Code - Type + Type - Packages quantity and type + Packages quantity and type - Location + Location - Location + Location - Countersample date + Countersample date - Discharge date + Discharge date - Comments + Comments - <for each="fraction in objects"> + <for each="fraction in records"> @@ -734,33 +734,33 @@ - <fraction['number']> + <fraction['number']> - <fraction['type']> + <fraction['type']> - <fraction['packages']> + <fraction['packages']> - <fraction['storage_location']> + <fraction['storage_location']> - <fraction['countersample_location']> + <fraction['countersample_location']> - <format_date(fraction['countersample_date'], user.language) if fraction['countersample_date'] else ''> + <format_date(fraction['countersample_date'], user.language) if fraction['countersample_date'] else ''> - <format_date(fraction['discharge_date'], user.language) if fraction['discharge_date'] else ''> + <format_date(fraction['discharge_date'], user.language) if fraction['discharge_date'] else ''> - <fraction['comments']> + <fraction['comments']> - </for> + </for> @@ -771,7 +771,7 @@ - + \ No newline at end of file diff --git a/lims_project_study_plan/report/glp_06.fodt b/lims_project_study_plan/report/glp_06.fodt index a61e991..9c6ef93 100644 --- a/lims_project_study_plan/report/glp_06.fodt +++ b/lims_project_study_plan/report/glp_06.fodt @@ -1,24 +1,24 @@ - 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.1.5.1$Linux_X86_64 LibreOffice_project/10$Build-1 + 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 - 41275 + 46143 0 - 33710 - 10215 + 34503 + 14739 true false view2 - 9456 - 43651 + 7250 + 1000 0 - 41275 - 33708 - 51488 + 46143 + 34502 + 60881 0 0 false @@ -37,10 +37,9 @@ false false true - true - true false true + true false true @@ -49,12 +48,12 @@ false true false + true false 1753681 false false true - true false false true @@ -66,6 +65,7 @@ false false 1 + false false false @@ -77,11 +77,10 @@ false false - 0 0 true - false + 0 true false false @@ -93,12 +92,11 @@ false false true - 5550534 + 5598405 false false false false - false high-resolution false true @@ -109,13 +107,13 @@ false false true - false false false true true false 0 + true @@ -512,7 +510,7 @@ - <for each="record in objects"> + <for each="record in records"> <record['type_number']>to the <record['document_type']> Study plan ID: <code> Title: <stp_title> diff --git a/lims_project_study_plan/report/glp_07.fodt b/lims_project_study_plan/report/glp_07.fodt index fdf65ad..0564a38 100644 --- a/lims_project_study_plan/report/glp_07.fodt +++ b/lims_project_study_plan/report/glp_07.fodt @@ -1,28 +1,28 @@ - 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 0 0 - 24268 - 10754 + 34503 + 13760 true false view2 - 1249 - 3889 + 2997 + 6535 0 0 - 24266 - 10753 + 34502 + 13758 0 0 false - 140 + 100 false false @@ -92,7 +92,7 @@ false false true - 5601633 + 5705583 false false false @@ -429,67 +429,67 @@ - + - + + + + + + + + - + - - - - - - - - - + - + - + - + - + - + - + + + + + + + + + - + - - - - - - - @@ -557,17 +557,17 @@ - + - Test elements received + Test elements received - Table 1 + Table 1 @@ -596,7 +596,7 @@ PLAN DE ESTUDIO: <code> - Matrix: + Matrix: <stp_matrix> @@ -605,7 +605,7 @@ - Entries: + Entries: <entries> @@ -634,13 +634,13 @@ Packages quantity - Application date + Application date - Sampling date + Sampling date - Treatment + Treatment Dosis @@ -658,7 +658,7 @@ Variety - Code + Code Label @@ -670,7 +670,7 @@ - <for each="fraction in objects"> + <for each="fraction in records"> @@ -687,48 +687,48 @@ - <format_date(fraction['reception_date'], user.language) if fraction['reception_date'] else ''> + <format_date(fraction['reception_date'], user.language) if fraction['reception_date'] else ''> - <fraction['packages']> + <fraction['packages']> - <format_date(fraction['application_date'], user.language) if fraction['application_date'] else ''> + <format_date(fraction['application_date'], user.language) if fraction['application_date'] else ''> - <format_date(fraction['sampling_date'], user.language) if fraction['sampling_date'] else ''> + <format_date(fraction['sampling_date'], user.language) if fraction['sampling_date'] else ''> - <fraction['treatment']> + <fraction['treatment']> - <fraction['dosis']> + <fraction['dosis']> - <fraction['glp_repetitions']> + <fraction['glp_repetitions']> - <fraction['zone']> + <fraction['zone']> - <fraction['after_application_days']> + <fraction['after_application_days']> - <fraction['variety']> + <fraction['variety']> - <fraction['number']> + <fraction['number']> - <fraction['label']> + <fraction['label']> - <fraction['storage_location']> + <fraction['storage_location']> - </for> + </for> diff --git a/lims_project_study_plan/report/glp_08.fodt b/lims_project_study_plan/report/glp_08.fodt index f096dfc..2a2cdbb 100644 --- a/lims_project_study_plan/report/glp_08.fodt +++ b/lims_project_study_plan/report/glp_08.fodt @@ -1,28 +1,28 @@ - 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 0 0 - 24268 - 10754 + 34503 + 13760 true false view2 - 1199 - 3687 + 2997 + 6130 0 0 - 24266 - 10753 + 34502 + 13758 0 0 false - 140 + 100 false false @@ -92,7 +92,7 @@ false false true - 5867753 + 5964493 false false false @@ -429,55 +429,55 @@ - + - + + + + + + + + - + - - - - - - - - - + - + - + - + - + + + + + + + + + - - - - - - - @@ -541,17 +541,17 @@ - + - Test elements received + Test elements received - Table 2 + Table 2 @@ -580,7 +580,7 @@ PLAN DE ESTUDIO: <code> - Entries: + Entries: <entries> @@ -603,13 +603,13 @@ Reception date - Application date + Application date - Sampling date + Sampling date - Treatment + Treatment Dosis @@ -630,7 +630,7 @@ Sample weight (g) - Code + Code Label @@ -639,7 +639,7 @@ - <for each="fraction in objects"> + <for each="fraction in records"> @@ -655,45 +655,45 @@ - <format_date(fraction['reception_date'], user.language) if fraction['reception_date'] else ''> + <format_date(fraction['reception_date'], user.language) if fraction['reception_date'] else ''> - <format_date(fraction['application_date'], user.language) if fraction['application_date'] else ''> + <format_date(fraction['application_date'], user.language) if fraction['application_date'] else ''> - <format_date(fraction['sampling_date'], user.language) if fraction['sampling_date'] else ''> + <format_date(fraction['sampling_date'], user.language) if fraction['sampling_date'] else ''> - <fraction['treatment']> + <fraction['treatment']> - <fraction['dosis']> + <fraction['dosis']> - <fraction['glp_repetitions']> + <fraction['glp_repetitions']> - <fraction['zone']> + <fraction['zone']> - <fraction['after_application_days']> + <fraction['after_application_days']> - <fraction['variety']> + <fraction['variety']> - <fraction['sample_weight']> + <fraction['sample_weight']> - <fraction['number']> + <fraction['number']> - <fraction['label']> + <fraction['label']> - </for> + </for> diff --git a/lims_project_study_plan/report/glp_09.fodt b/lims_project_study_plan/report/glp_09.fodt index 84f1d41..7939688 100644 --- a/lims_project_study_plan/report/glp_09.fodt +++ b/lims_project_study_plan/report/glp_09.fodt @@ -1,28 +1,28 @@ - 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2016-01-11T13:07:10.037989256P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 0 0 - 24268 - 10754 + 34503 + 14739 true false view2 - 1199 - 3687 + 2900 + 4974 0 0 - 24266 - 10753 + 34502 + 14737 0 0 false - 140 + 100 false false @@ -92,7 +92,7 @@ false false true - 7087549 + 7133431 false false false @@ -447,70 +447,70 @@ - + - + + + + + + + + - + - + - - - - - - - - - + - + - - + + - + - + - - + + - - + + - + + + + + + + + + - - - - - - - @@ -594,17 +594,17 @@ - + - + - Table 3 + Table 3 @@ -633,7 +633,7 @@ PLAN DE ESTUDIO: <code> - + @@ -641,12 +641,12 @@ - <for each="group in objects.values()"> + <for each="group in records.values()"> - Matrix: <group['matrix']><if test="group['variety']">variety <group['variety']></if> + Matrix: <group['matrix']><if test="group['variety']">variety <group['variety']></if> @@ -666,7 +666,7 @@ - <if test="report['zone']">Zone: <report['zone']></if> + <if test="report['zone']">Zone: <report['zone']></if> @@ -697,13 +697,13 @@ - Code + Code - Label + Label - Treatment + Treatment Dosis @@ -734,7 +734,7 @@ - <for each="fraction in report['fractions']"> + <for each="fraction in report['fractions']"> @@ -749,42 +749,42 @@ - <fraction['number']> + <fraction['number']> - <fraction['label']> + <fraction['label']> - <fraction['treatment']> + <fraction['treatment']> - <fraction['dosis']> + <fraction['dosis']> - <fraction['glp_repetitions']> + <fraction['glp_repetitions']> - <fraction['after_application_days']> + <fraction['after_application_days']> - + - + - <fraction['analysis']> + <fraction['analysis']> - <fraction['result']> + <fraction['result']> - </for> + </for> diff --git a/lims_project_study_plan/report/glp_10.fodt b/lims_project_study_plan/report/glp_10.fodt index c116aa1..ce6a2f0 100644 --- a/lims_project_study_plan/report/glp_10.fodt +++ b/lims_project_study_plan/report/glp_10.fodt @@ -1,28 +1,28 @@ - 2016-03-22T20:26:46.619537988P0D1LibreOffice/6.1.5.1$Linux_X86_64 LibreOffice_project/10$Build-1 + 2016-03-22T20:26:46.619537988P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 - 8040 - 2469 - 28092 - 8227 + 0 + 0 + 34503 + 14739 true false view2 - 19373 - 11206 - 2469 - 8040 - 30559 - 16265 + 2900 + 5729 + 0 + 0 + 34502 + 14737 0 0 false - 120 + 100 false false @@ -37,10 +37,9 @@ false false true - true - true false true + true false true @@ -49,12 +48,12 @@ false true false + true false 1753681 false false true - true false false true @@ -66,6 +65,7 @@ false false 1 + false false false @@ -77,11 +77,10 @@ false false - 0 0 true - false + 0 true false false @@ -93,12 +92,11 @@ false false true - 5745512 + 5863546 false false false false - false high-resolution false true @@ -109,13 +107,13 @@ false false true - false false false true true false 0 + true @@ -126,7 +124,6 @@ - @@ -326,16 +323,16 @@ - + - + - + - + @@ -470,84 +467,81 @@ + + + + - + - - - - - + - - + + - - - - + + - - - - + + - - - - + + - - - - + + - + - + - + - + - - + + + + + - - + + + + - + @@ -559,31 +553,28 @@ - + - + - + - - + + + + - - - - - - - + + @@ -695,21 +686,21 @@ - Ingress date range: + Ingress date range: - <format_date(date_from, user.language)>- <format_date(date_to, user.language)> + <format_date(date_from, user.language)>- <format_date(date_to, user.language)> - Print date: + Print date: - <format_date(datetime.datetime.today(), user.language)> + <format_date(datetime.datetime.today(), user.language)> - - <for each="project in objects"> + + <for each="project in records"> @@ -719,21 +710,21 @@ - Study N° <project.stp_code> - Id Interno N° <project.stp_number> + Study N° <project.stp_code> + Id Interno N° <project.stp_number> - <if test="project.stp_glp">Under GLP</if> + <if test="project.stp_glp">Under GLP</if> - Sponsor: <project.stp_sponsor> + Sponsor: <project.stp_sponsor> - Description: <project.stp_description> + Description: <project.stp_description> @@ -743,7 +734,7 @@ - <project.stp_position><if test="project.stp_position !=''">:</if> <project.stp_study_director> + <project.stp_position><if test="project.stp_position !=''">:</if> <project.stp_study_director> @@ -752,64 +743,64 @@ - Start date: <format_date(project.stp_start_date, user.language) if project.stp_start_date else ''> + Start date: <format_date(project.stp_start_date, user.language) if project.stp_start_date else ''> - End date: <format_date(project.stp_end_date, user.language) if project.stp_end_date else ''> + End date: <format_date(project.stp_end_date, user.language) if project.stp_end_date else ''> - State: <project.stp_state> + State: <project.stp_state> - Proposal start date: <project.stp_proposal_start_date> + Proposal start date: <project.stp_proposal_start_date> - Proposal end date: <project.stp_proposal_end_date> + Proposal end date: <project.stp_proposal_end_date> - Date of entry into the BPL document file: <format_date(project.stp_date_entry_document_file, user.language) if project.stp_date_entry_document_file else ''> + Date of entry into the BPL document file: <format_date(project.stp_date_entry_document_file, user.language) if project.stp_date_entry_document_file else ''> - + - Product brand: <project.stp_product_brand> + Product brand: <project.stp_product_brand> - Methodology implementation: <project.stp_implementation_validation> + Methodology implementation: <project.stp_implementation_validation> - Pattern availability: <if test="project.stp_pattern_availability">Yes</if> + Pattern availability: <if test="project.stp_pattern_availability">Yes</if> - Matrix: <project.stp_matrix> + Matrix: <project.stp_matrix> - Observations: <project.stp_rector_scheme_comments> + Observations: <project.stp_rector_scheme_comments> @@ -817,7 +808,7 @@ - + @@ -861,9 +852,9 @@ - - - </for> + + + </for> \ No newline at end of file diff --git a/lims_project_study_plan/report/glp_12.fodt b/lims_project_study_plan/report/glp_12.fodt index 6fc1ded..b509e8e 100644 --- a/lims_project_study_plan/report/glp_12.fodt +++ b/lims_project_study_plan/report/glp_12.fodt @@ -1,24 +1,24 @@ - 2016-04-02T11:37:06.439239042P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2016-04-02T11:37:06.439239042P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 - 0 + 7197 0 - 33974 - 15480 + 34503 + 14739 true false view2 - 2884 - 4103 + 2900 + 5888 0 - 0 - 33973 - 15478 + 7197 + 34502 + 21934 0 0 false @@ -92,7 +92,7 @@ false false true - 6202208 + 6320723 false false false @@ -388,53 +388,53 @@ - + - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - - - - - - - @@ -489,17 +489,17 @@ - + - Changelog + Changelog - + @@ -528,7 +528,7 @@ - Date range: + Date range: <format_date(date_from, user.language)>- <format_date(date_to, user.language)> @@ -537,7 +537,7 @@ - Print date: + Print date: <format_date(datetime.datetime.today(), user.language)> @@ -545,7 +545,7 @@ - <for each="change in objects"> + <for each="change in records"> @@ -555,22 +555,22 @@ - Study N° <change.stp_code> + Study N° <change.stp_code> - Update date: <change.change_date> + Update date: <change.change_date> - User: <change.change_user> + User: <change.change_user> - Reason: <change.change_reason> + Reason: <change.change_reason> @@ -581,7 +581,7 @@ - Title: <change.stp_title> + Title: <change.stp_title> @@ -589,17 +589,17 @@ - <if test="change.stp_glp">Under GLP</if> + <if test="change.stp_glp">Under GLP</if> - Target: + Target: - <for each="line in change.stp_target.split('\n')"> - <line> - </for> + <for each="line in change.stp_target.split('\n')"> + <line> + </for> @@ -609,10 +609,10 @@ - Description: + Description: - <change.stp_description> + <change.stp_description> @@ -622,53 +622,53 @@ - Product brand: <change.stp_product_brand> + Product brand: <change.stp_product_brand> - Matrix: <change.stp_matrix> + Matrix: <change.stp_matrix> - + - Proposal start date: <change.stp_proposal_start_date> + Proposal start date: <change.stp_proposal_start_date> - Proposal end date: <change.stp_proposal_end_date> + Proposal end date: <change.stp_proposal_end_date> - Start date: <format_date(change.stp_start_date, user.language) if change.stp_start_date else ''> + Start date: <format_date(change.stp_start_date, user.language) if change.stp_start_date else ''> - End date: <format_date(change.stp_end_date, user.language) if change.stp_end_date else ''> + End date: <format_date(change.stp_end_date, user.language) if change.stp_end_date else ''> - Test method: + Test method: - <for each="line in change.stp_test_method.split('\n')"> - <line> - </for> + <for each="line in change.stp_test_method.split('\n')"> + <line> + </for> @@ -678,29 +678,29 @@ - Pattern availability: <if test="change.stp_pattern_availability">Yes</if> + Pattern availability: <if test="change.stp_pattern_availability">Yes</if> - Implementation - Validation: <if test="change.stp_implementation_validation">Yes</if> + Implementation - Validation: <if test="change.stp_implementation_validation">Yes</if> - Client: <change.stp_sponsor> + Client: <change.stp_sponsor> - State: <change.stp_state> + State: <change.stp_state> - Staff involved: + Staff involved: - <for each="prof in change.stp_laboratory_professionals"> - <prof.position and prof.position + ': ' or ''><prof.professional> - </for> + <for each="prof in change.stp_laboratory_professionals"> + <prof.position and prof.position + ': ' or ''><prof.professional> + </for> @@ -710,10 +710,10 @@ - Records: + Records: - <change.stp_records> + <change.stp_records> diff --git a/lims_project_study_plan/report/glp_13.fods b/lims_project_study_plan/report/glp_13.fods index 0de8902..ecd1271 100644 --- a/lims_project_study_plan/report/glp_13.fods +++ b/lims_project_study_plan/report/glp_13.fods @@ -1,7 +1,7 @@ - 2016-03-08T11:34:41LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-12017-10-07T17:22:33.489047009P39DT10H35M2S163 + 2016-03-08T11:34:41LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-32021-09-22T17:27:42.269916157P39DT10H35M40S164 451 @@ -14,7 +14,7 @@ 0 - 23 + 33 0 0 0 @@ -23,18 +23,18 @@ 0 0 0 - 21 + 31 0 - 75 + 100 85 true false Hoja1 - 1285 + 1305 0 - 75 + 100 85 false true @@ -64,8 +64,8 @@ false 0 true - mQH+/2hwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpocAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMAtgAAAAAAAAAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9aHAKb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCklucHV0U2xvdDpBdXRvAFBhZ2VTaXplOkE0AAASAENPTVBBVF9EVVBMRVhfTU9ERRMARHVwbGV4TW9kZTo6VW5rbm93bg== - hp + mAH+/0hQLUxhc2VySmV0LTEwMTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpIUC1MYXNlckpldC0xMDE4AAAAAAAAAAAAAAAWAAMAtQAAAAAAAwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9SFAtTGFzZXJKZXQtMTAxOApvcmllbnRhdGlvbj1Qb3J0cmFpdApjb3BpZXM9MQpjb2xsYXRlPWZhbHNlCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MQpjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKUGFnZVNpemU6QTQAABIAQ09NUEFUX0RVUExFWF9NT0RFEwBEdXBsZXhNb2RlOjpVbmtub3du + HP-LaserJet-1018 zxx @@ -141,6 +141,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -155,39 +209,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -231,155 +285,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -396,11 +301,11 @@ - + - + @@ -414,7 +319,7 @@ - + @@ -440,7 +345,7 @@ - + @@ -471,7 +376,7 @@ - + @@ -503,7 +408,7 @@ - + @@ -519,7 +424,7 @@ - + @@ -557,9 +462,6 @@ - - - @@ -578,7 +480,7 @@ ???(???) - 00/00/0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -591,16 +493,16 @@ - - - + + + @@ -643,7 +545,7 @@ stp_matrix if stp_matrix else '' - + @@ -654,7 +556,7 @@ stp_reference_objects_list if stp_reference_objects_list else '' - + @@ -665,20 +567,20 @@ stp_test_method if stp_test_method else '' - + - - - + + + AFS or control used: - + Date of Weighing / Removal *2 - + _____/_____/201___ @@ -690,7 +592,7 @@ OP *3 - + @@ -700,20 +602,20 @@ Location: - - - - + + + + T°: - + Date of purification and / or cleaning *2 - + _____/_____/201___ @@ -721,14 +623,14 @@ Factor or aliquot: - - + + Final volume: - + OP *3 - + @@ -737,52 +639,52 @@ Storage of extract *4 - - - + + + Location: - + T°: - + OP. *5 - + Injection date: - + _____/_____/201___ - + Equipment (corresponding batch number): - - + + LC-MS-MS N°: - - + + GC-MS-MS N°: - + Chromatographic column: - + - + @@ -816,38 +718,38 @@ Observations and / or comments - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + @@ -870,8 +772,7 @@ - - company.short_name + company.short_name Label (described by customer) @@ -903,22 +804,22 @@ - for each="object in objects" + for each="object in records" - object.number + object.number object.label object.fraction_type - + - + diff --git a/lims_project_study_plan/report/glp_study_plan.fodt b/lims_project_study_plan/report/glp_study_plan.fodt index fe06128..fb9c960 100644 --- a/lims_project_study_plan/report/glp_study_plan.fodt +++ b/lims_project_study_plan/report/glp_study_plan.fodt @@ -1,28 +1,28 @@ - 2016-05-02T16:12:34.745782454P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2016-05-02T16:12:34.745782454P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 - 0 + 46143 0 - 28312 - 12901 + 34503 + 14739 true false view2 - 12894 + 15990 3600 0 - 0 - 28310 - 12899 + 46143 + 34502 + 60881 0 0 false - 120 + 100 false false @@ -92,7 +92,7 @@ false false true - 8126610 + 8188339 false false false @@ -343,20 +343,20 @@ - + - - - - - - - - + + + + + + + + @@ -498,7 +498,11 @@ - + + + + + @@ -558,17 +562,17 @@ - + - + - Study plan <code> + Study plan <code> @@ -589,7 +593,7 @@ - Study plan + Study plan Title: <stp_title> ID: <code> diff --git a/lims_project_water/project.py b/lims_project_water/project.py index 9ce80d7..b9d61d3 100644 --- a/lims_project_water/project.py +++ b/lims_project_water/project.py @@ -137,12 +137,12 @@ class ProjectWaterSampling(Report): return super().execute(ids, data) @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): pool = Pool() Project = pool.get('lims.project') Fraction = pool.get('lims.fraction') Entry = pool.get('lims.entry') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) project = Project(data['id']) entry = Entry.search([ @@ -198,7 +198,7 @@ class ProjectWaterSampling(Report): 'results': (cls.get_results_insitu(fraction.id)), }) - report_context['objects'] = objects + report_context['records'] = objects return report_context @classmethod diff --git a/lims_project_water/report/wtr_01.fodt b/lims_project_water/report/wtr_01.fodt index def5db6..ffb16d4 100644 --- a/lims_project_water/report/wtr_01.fodt +++ b/lims_project_water/report/wtr_01.fodt @@ -1,28 +1,28 @@ - 2016-05-02T16:12:34.745782454P0D1LibreOffice/6.0.5.1$Linux_X86_64 LibreOffice_project/00m0$Build-1 + 2016-05-02T16:12:34.745782454P0D1LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 0 0 - 21235 - 9410 + 34503 + 13760 true false view2 - 7160 - 3600 + 7848 + 41764 0 0 - 21234 - 9409 + 34502 + 13758 0 0 false - 160 + 100 false false @@ -92,7 +92,7 @@ false false true - 12882913 + 12950917 false false false @@ -426,70 +426,70 @@ - + - + + + + + + + + - + - + - - - - - - - - - + - + - + - + - + - + - + - + + - + + + + + + + + - - - - - - - @@ -684,7 +684,11 @@ - + + + + + @@ -744,17 +748,17 @@ - + - + - Water Sampling <code> + Water Sampling <code> @@ -775,7 +779,7 @@ - Report: Environmental Sampling + Report: Environmental Sampling Date: <format_date(date, user.language) if date else ''> Applicant: <client.full_name> @@ -803,8 +807,8 @@ Description: <description> Numbers of chain of custody: - <code> - + <code> + Weather conditions: <if test="wtr_comments"> <wtr_comments> @@ -817,7 +821,7 @@ Type and number of samples taken: - <if test="objects"> + <if test="records"> @@ -828,34 +832,34 @@ Label - Code <company.short_name> + Code <company.short_name> - Packages + Packages - <for each="fraction in objects"> + <for each="fraction in records"> - <fraction['label']> + <fraction['label']> - <fraction['number']> + <fraction['number']> - <fraction['packages']> + <fraction['packages']> - </for> + </for> @@ -865,7 +869,7 @@ Place and description of sampling points: - <if test="objects"> + <if test="records"> @@ -876,16 +880,16 @@ Label - Sampling point + Sampling point - GPS Coordinates + GPS Coordinates - <for each="fraction in objects"> + <for each="fraction in records"> @@ -893,18 +897,18 @@ - <fraction['label']> + <fraction['label']> - <fraction['sampling_point']> + <fraction['sampling_point']> - <fraction['gps_coordinates']> + <fraction['gps_coordinates']> - </for> + </for> @@ -923,7 +927,7 @@ On-site measurements performed: - <if test="objects"> + <if test="records"> @@ -933,19 +937,19 @@ Label - Results + Results - <for each="fraction in objects"> + <for each="fraction in records"> - <fraction['label']> + <fraction['label']> <for each="line in fraction['results']"> @@ -955,7 +959,7 @@ - </for> + </for> diff --git a/lims_quality_control/quality.py b/lims_quality_control/quality.py index deba00e..e3b2493 100644 --- a/lims_quality_control/quality.py +++ b/lims_quality_control/quality.py @@ -659,12 +659,12 @@ class TestReport(CompanyReport): return result @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): Test = Pool().get('lims.quality.test') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) - report_context['objects'] = Test.browse(data['ids']) + report_context['records'] = Test.browse(data['ids']) report_context['get_professionals'] = cls.get_professionals return report_context diff --git a/lims_quality_control/report/test_report.fodt b/lims_quality_control/report/test_report.fodt index 3c3101a..54b597b 100644 --- a/lims_quality_control/report/test_report.fodt +++ b/lims_quality_control/report/test_report.fodt @@ -1,127 +1,119 @@ - - 2020-01-14T15:29:16.1639609422020-04-30T11:57:28.542811118P2DT7H32M47S25LibreOffice/6.4.3.2$Linux_X86_64 LibreOffice_project/40$Build-2 + + 2020-01-14T15:29:16.1639609422021-09-22T17:22:07.121627594P2DT7H33M3S26LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3 - 35719 + 28998 0 - 21086 - 8650 + 34503 + 14739 true false view2 - 16417 - 40379 + 8250 + 4461 0 - 35719 - 21084 - 44367 + 28998 + 34502 + 43736 0 1 false - 160 + 100 false false + false + + false + false false false - false - true - true - true - true - true - false - 0 false - true - false - false - true - false - false - false - true - true - true - false - false - false - false - false - true - false - false - true - false - false - false - true - 0 - 1 - true - - high-resolution - true - - - false - false - true - false - true - true - - true - 1500963 - - true - false - true - 0 - - false - false - false - false - true - false - false - false - false - true - false - + true false - false - false + true + true + false + + true + + false + false + true + false + true + false + 1176009 + false + false + true + false + false + true + true + true + true + true + true + false + false + 1 false - false + true + false + + false + false + + false + false + false + + false + 0 + false + + 0 + true false false false - false + false + false + true + false false - false - false - 1176009 - false - false - false - false + false + true + 1563768 true - false - true + false + false + false + high-resolution true + true + true false - true - false + false + false + false + false + false + false + false + false + true + false + 0 + true @@ -135,8 +127,8 @@ - - + + @@ -151,7 +143,7 @@ - + @@ -162,7 +154,7 @@ - + @@ -327,7 +319,7 @@ - + @@ -354,7 +346,7 @@ - + @@ -363,7 +355,7 @@ - + @@ -372,7 +364,7 @@ - + @@ -381,7 +373,7 @@ - + @@ -390,7 +382,7 @@ - + @@ -399,15 +391,15 @@ - + - + - + @@ -416,7 +408,7 @@ - + @@ -425,7 +417,7 @@ - + @@ -434,7 +426,7 @@ - + @@ -443,7 +435,7 @@ - + @@ -452,7 +444,7 @@ - + @@ -461,45 +453,45 @@ - + + + + + + + + + + - - - - - + - + - + - + - + - - - - - - - + + @@ -508,7 +500,7 @@ - + @@ -517,34 +509,34 @@ - + + + + + + + + + + - + - + - - - - - - - - - - + @@ -553,9 +545,18 @@ - + + + + + + + + + + @@ -564,17 +565,8 @@ - - - - - - - - - - + @@ -589,66 +581,66 @@ - + - + + + + + + + - - + - + - + - + - + - - - - - - - + + - - - - - - - - - - + - + - + + + + + + + + + + @@ -657,16 +649,16 @@ - + - + - + @@ -675,58 +667,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -825,16 +817,16 @@ - <for each="test in objects"> + <for each="test in records"> - Quality Test Report + Quality Test Report - Date: <format_date(test.test_date, user.language)>TEST: <test.number> - PRODUCT: <test.product.rec_name> + Date: <format_date(test.test_date, user.language)>TEST: <test.number> + PRODUCT: <test.product.rec_name> - SAMPLE: <test.sample.number> - COUNTERSAMPLE: <test.sample.countersample.number if test.sample.countersample else ''> - LOT: <test.lot.number> + SAMPLE: <test.sample.number> + COUNTERSAMPLE: <test.sample.countersample.number if test.sample.countersample else ''> + LOT: <test.lot.number> RESULTS @@ -848,28 +840,28 @@ - Valid + Valid - Analysis + Analysis - Specification + Specification - Result + Result - Min-Max + Min-Max - + - <for each="line in test.lines"> + <for each="line in test.lines"> @@ -879,28 +871,28 @@ - <'✓' if line.success else 'x'> + <'✓' if line.success else 'x'> - <line.analysis.rec_name> + <line.analysis.rec_name> - <line.typification.specification> + <line.typification.specification> - <line.literal_result or line.result><line.initial_unit and line.initial_unit.symbol or ''> - + <line.literal_result or line.result><line.initial_unit and line.initial_unit.symbol or ''> + - <line.quality_min>- <line.quality_max> + <line.quality_min>- <line.quality_max> - + - </for> + </for> @@ -913,11 +905,11 @@ Analysts: <get_professionals(test)> Result: <test.state_string> - - - - _____________________________ - Signature + + + + _____________________________ + Signature </for> diff --git a/lims_quality_control/sample.py b/lims_quality_control/sample.py index 84f7dea..bca99f4 100644 --- a/lims_quality_control/sample.py +++ b/lims_quality_control/sample.py @@ -368,10 +368,10 @@ class SampleLabels(Report): __name__ = 'lims.sample.labels.report' @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): Sample = Pool().get('lims.sample') - report_context = super().get_context(records, data) + report_context = super().get_context(records, header, data) labels = [] if data.get('sample'): records = [Sample(data.get('sample'))] diff --git a/lims_report_html/results_report.py b/lims_report_html/results_report.py index 6626cb1..73a4298 100644 --- a/lims_report_html/results_report.py +++ b/lims_report_html/results_report.py @@ -465,7 +465,7 @@ class ResultReport(metaclass=PoolMeta): model = action.model or data.get('model') if model: records = cls._get_records(ids, model, data) - oext, content = cls._execute(records, data, action) + oext, content = cls._execute(records, [], data, action) if not isinstance(content, str): content = bytearray(content) if bytes == str else bytes(content) return (oext, content, action.direct_print, action.name)