Fixed SORMAS-Foundation#2781

Author: MateStrysewske

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactFollowUpGrid.java

@@ -1,21 +1,12 @@
 package de.symeda.sormas.ui.contact;
 
-import static de.symeda.sormas.ui.utils.FollowUpUtils.getVisitResultCssStyle;
-import static de.symeda.sormas.ui.utils.FollowUpUtils.getVisitResultDescription;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import com.vaadin.data.provider.DataProvider;
 import com.vaadin.navigator.View;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.ui.DescriptionGenerator;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.StyleGenerator;
 import com.vaadin.ui.renderers.DateRenderer;
-
 import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.contact.ContactCriteria;
 import de.symeda.sormas.api.contact.ContactFollowUpDto;
@@ -34,10 +25,19 @@
 import de.symeda.sormas.ui.utils.ShowDetailsListener;
 import de.symeda.sormas.ui.utils.UuidRenderer;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static de.symeda.sormas.ui.utils.FollowUpUtils.getVisitResultCssStyle;
+import static de.symeda.sormas.ui.utils.FollowUpUtils.getVisitResultDescription;
+
 @SuppressWarnings("serial")
 public class ContactFollowUpGrid extends FilteredGrid<ContactFollowUpDto, ContactCriteria> {
 
 	private List<Date> dates = new ArrayList<>();
+	private List<String> dateColumnIds = new ArrayList<>();
 
 	@SuppressWarnings("unchecked")
 	public <V extends View> ContactFollowUpGrid(ContactCriteria criteria, Date referenceDate, int interval, Class<V> viewClass) {
@@ -61,20 +61,20 @@ public <V extends View> ContactFollowUpGrid(ContactCriteria criteria, Date refer
 		((Column<ContactFollowUpDto, String>) getColumn(ContactFollowUpDto.UUID)).setRenderer(new UuidRenderer());
 		((Column<ContactFollowUpDto, Date>) getColumn(ContactFollowUpDto.LAST_CONTACT_DATE))
 			.setRenderer(new DateRenderer(DateFormatHelper.getDateFormat()));
-		((Column<ContactFollowUpDto, Date>) getColumn(FollowUpDto.REPORT_DATE))
-			.setRenderer(new DateRenderer(DateFormatHelper.getDateFormat()));
-		((Column<ContactFollowUpDto, Date>) getColumn(FollowUpDto.FOLLOW_UP_UNTIL))
-			.setRenderer(new DateRenderer(DateFormatHelper.getDateFormat()));
+		((Column<ContactFollowUpDto, Date>) getColumn(FollowUpDto.REPORT_DATE)).setRenderer(new DateRenderer(DateFormatHelper.getDateFormat()));
+		((Column<ContactFollowUpDto, Date>) getColumn(FollowUpDto.FOLLOW_UP_UNTIL)).setRenderer(new DateRenderer(DateFormatHelper.getDateFormat()));
 
 		for (Column<ContactFollowUpDto, ?> column : getColumns()) {
 			column.setCaption(I18nProperties.getPrefixCaption(ContactFollowUpDto.I18N_PREFIX, column.getId().toString(), column.getCaption()));
-			column.setStyleGenerator(
-				FieldAccessColumnStyleGenerator.withCheckers(
-					getBeanType(),
-					column.getId(),
-					ContactJurisdictionHelper::isInJurisdictionOrOwned,
-					FieldHelper.createPersonalDataFieldAccessChecker(),
-					FieldHelper.createSensitiveDataFieldAccessChecker()));
+			if (!dateColumnIds.contains(column.getId())) {
+				column.setStyleGenerator(
+					FieldAccessColumnStyleGenerator.withCheckers(
+						getBeanType(),
+						column.getId(),
+						ContactJurisdictionHelper::isInJurisdictionOrOwned,
+						FieldHelper.createPersonalDataFieldAccessChecker(),
+						FieldHelper.createSensitiveDataFieldAccessChecker()));
+			}
 		}
 
 		addItemClickListener(
@@ -88,12 +88,12 @@ public void setVisitColumns(Date referenceDate, int interval, ContactCriteria cr
 		dates.forEach(date -> removeColumn(DateFormatHelper.formatDate(date)));
 
 		setDates(referenceDate, interval);
+		dateColumnIds.clear();
 
 		for (int i = 0; i < interval; i++) {
 			String columnId = DateFormatHelper.formatDate(dates.get(i));
-			addComponentColumn(followUpDto -> {
-				return new Label("");
-			}).setId(columnId);
+			dateColumnIds.add(columnId);
+			addComponentColumn(followUpDto -> new Label("")).setId(columnId);
 
 			final int index = i;
 			getColumn(columnId).setCaption(columnId).setSortable(false).setStyleGenerator((StyleGenerator<ContactFollowUpDto>) item -> {