From 5b742c97c9bec8c4b3c74c0e657627eaf3059592 Mon Sep 17 00:00:00 2001
From: Stephen Abello <stephen.abello@combodo.com>
Date: Fri, 3 Dec 2021 10:28:23 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B04481=20Fix=20activity=20panel=20in=20pri?=
 =?UTF-8?q?ntable=20object=20pages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/print.css                                       | 12 +++++++++---
 templates/base/layouts/activity-panel/print.js.twig |  5 +++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/css/print.css b/css/print.css
index d95942206..c264bb796 100644
--- a/css/print.css
+++ b/css/print.css
@@ -256,15 +256,21 @@ div.explain-printable button{
 	display: none;
 }
 
+.printable-content #ibo-page-container, .printable-content #ibo-center-container {
+	height: 100%;
+	overflow: auto;
+}
+.printable-content #ibo-center-container > *{
+	height: auto;
+}
 .printable-content .ibo-activity-panel{
 	width: 100%;
-	padding: 24px 24px 16px 16px;
+	padding: 24px 8px;
 	background-color: white;
 }
 
 .printable-content #ibo-side-content {
-	margin-left: 16px;
-	margin-right: 16px;
+	margin: 0;
 	background-color: var(--ibo-body-background-color);
 }
 
diff --git a/templates/base/layouts/activity-panel/print.js.twig b/templates/base/layouts/activity-panel/print.js.twig
index 28cf9d8ce..7515d4e4c 100644
--- a/templates/base/layouts/activity-panel/print.js.twig
+++ b/templates/base/layouts/activity-panel/print.js.twig
@@ -4,11 +4,12 @@ $('[data-role="ibo-activity-panel--filter"]').on('click', function(){
 	if(sTabType=="caselog")
 	{
 		const sTabTypeCaseLog = $(this).attr('data-entry-caselog-attribute-code');
-		$(this).closest('.ibo-activity-panel').find('[data-entry-group-origin="'+sTabType+':'+sTabTypeCaseLog+'"]').toggle();
+		$(this).closest('.ibo-activity-panel').find('[data-entry-type="'+sTabType+'"][data-entry-caselog-attribute-code="'+sTabTypeCaseLog+'"]').toggle();
 	}
 	else
 	{
 		$(this).closest('.ibo-activity-panel').find('[data-entry-type="'+sTabType+'"]').toggle();
 	}
 	$(this).toggleClass('strikethrough');
-});
\ No newline at end of file
+});
+$('.ibo-activity-panel').find('.ibo-activity-panel--entry-group').removeClass('ibo-is-hidden');