SORMAS-Foundation#3368 SORMAS-Foundation#3477 - fix campaign archiving + filter campaign form data to show only non archived ones + set campaign create form width to 1280 pixels

Author: barnabartha

sormas-backend/src/main/java/de/symeda/sormas/backend/campaign/data/CampaignFormDataService.java

@@ -63,6 +63,8 @@ public Predicate createCriteriaFilter(CampaignFormDataCriteria criteria, Criteri
 
 		if (criteria.getCampaign() != null) {
 			filter = and(cb, filter, cb.equal(campaignJoin.get(Campaign.UUID), criteria.getCampaign().getUuid()));
+		} else {
+			filter = and(cb, filter, cb.or(cb.equal(campaignJoin.get(Campaign.ARCHIVED), false), cb.isNull(campaignJoin.get(Campaign.ARCHIVED))));
 		}
 		if (criteria.getCampaignFormMeta() != null) {
 			filter = and(cb, filter, cb.equal(campaignFormJoin.get(CampaignFormMeta.UUID), criteria.getCampaignFormMeta().getUuid()));

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/CampaignController.java

@@ -156,7 +156,7 @@ public CommitDiscardWrapperComponent<CampaignEditForm> getCampaignComponent(Camp
 		}
 		campaignEditForm.setValue(campaignDto);
 
-		final CommitDiscardWrapperComponent<CampaignEditForm> view =
+		final CommitDiscardWrapperComponent<CampaignEditForm> campaignComponent =
 			new CommitDiscardWrapperComponent<CampaignEditForm>(campaignEditForm, campaignEditForm.getFieldGroup()) {
 
 				@Override
@@ -168,13 +168,26 @@ public void discard() {
 
 		if (UserProvider.getCurrent().hasUserRight(UserRight.CAMPAIGN_DELETE)) {
 			CampaignDto finalCampaignDto = campaignDto;
-			view.addDeleteListener(() -> {
+			campaignComponent.addDeleteListener(() -> {
 				FacadeProvider.getCampaignFacade().deleteCampaign(finalCampaignDto.getUuid());
 				UI.getCurrent().getNavigator().navigateTo(CampaignsView.VIEW_NAME);
 			}, I18nProperties.getString(Strings.entityCampaign));
 		}
 
-		view.addCommitListener(() -> {
+		// Initialize 'Archive' button
+		if (UserProvider.getCurrent().hasUserRight(UserRight.CAMPAIGN_ARCHIVE)) {
+			final String campaignUuid = campaignDto.getUuid();
+			boolean archived = FacadeProvider.getCampaignFacade().isArchived(campaignUuid);
+			Button archiveCampaignButton = ButtonHelper.createButton(archived ? Captions.actionDearchive : Captions.actionArchive, e -> {
+				campaignComponent.commit();
+				archiveOrDearchiveCampaign(campaignUuid, !archived);
+			}, ValoTheme.BUTTON_LINK);
+
+			campaignComponent.getButtonsPanel().addComponentAsFirst(archiveCampaignButton);
+			campaignComponent.getButtonsPanel().setComponentAlignment(archiveCampaignButton, Alignment.BOTTOM_LEFT);
+		}
+
+		campaignComponent.addCommitListener(() -> {
 			if (!campaignEditForm.getFieldGroup().isModified()) {
 				CampaignDto dto = campaignEditForm.getValue();
 				FacadeProvider.getCampaignFacade().saveCampaign(dto);
@@ -183,7 +196,7 @@ public void discard() {
 			}
 		});
 
-		return view;
+		return campaignComponent;
 	}
 
 	public CommitDiscardWrapperComponent<CampaignFormDataEditForm> getCampaignFormDataComponent(

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigns/CampaignEditForm.java

@@ -80,6 +80,7 @@ public class CampaignEditForm extends AbstractEditForm<CampaignDto> {
 	public CampaignEditForm(CampaignDto campaignDto) {
 
 		super(CampaignDto.class, CampaignDto.I18N_PREFIX);
+		setWidth(1280, Unit.PIXELS);
 
 		this.campaignDto = campaignDto;
 		isCreateForm = campaignDto == null;

sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/campaigns/CampaignDashboardView.java

@@ -129,6 +129,7 @@ private void refreshSubTabs(Page page, String tabId, VerticalLayout subTabLayout
 		currentSubTabsWrapper = subTabSwitcherLayout;
 		subTabLayout.addComponent(subTabSwitcherLayout);
 		subTabLayout.setExpandRatio(subTabSwitcherLayout, 0);
+		subTabSwitcherLayout.setStyleName("highlighted-statistics-component");
 
 		subTabs.forEach(subTabId -> subTabSwitcher.addView(subTabId, subTabId, (e) -> {
 			subTabLayout.removeComponent(currentDiagramsWrapper);