Be able to attach multiple files on Events and Actions (#4616)

* Make the document import feature able to upload several files at a time #4504

* Add the possibility to attach documents on actions #4502

Change-Id: I7f0c34754ff1af9bc7206c000a5298c0164ce7d4

Author: aponcon-atolcd

sormas-api/src/main/java/de/symeda/sormas/api/action/ActionDto.java

@@ -180,6 +180,10 @@ public void setActionMeasure(ActionMeasure actionMeasure) {
 		this.actionMeasure = actionMeasure;
 	}
 
+	public ActionReferenceDto toReference() {
+		return new ActionReferenceDto(getUuid(), getTitle());
+	}
+
 	public ReferenceDto getContextReference() {
 
 		switch (actionContext) {

sormas-api/src/main/java/de/symeda/sormas/api/action/ActionReferenceDto.java

@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2018 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *******************************************************************************/
+package de.symeda.sormas.api.action;
+
+import de.symeda.sormas.api.ReferenceDto;
+
+public class ActionReferenceDto extends ReferenceDto {
+
+	private static final long serialVersionUID = 2430932452606853497L;
+
+	public ActionReferenceDto() {
+
+	}
+
+	public ActionReferenceDto(String uuid) {
+		setUuid(uuid);
+	}
+
+	public ActionReferenceDto(String uuid, String caption) {
+		setUuid(uuid);
+		setCaption(caption);
+	}
+
+	@Override
+	public String getCaption() {
+		return super.getCaption();
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/document/DocumentRelatedEntityType.java

@@ -18,6 +18,7 @@
 
 public enum DocumentRelatedEntityType {
 
+	ACTION,
 	EVENT;
 
 	public String toString() {

sormas-api/src/main/resources/enum.properties

@@ -445,6 +445,7 @@ DiseaseTransmissionMode.VECTOR_BORNE = Primarily vector-borne
 DiseaseTransmissionMode.UNKNOWN = Unknown
 
 # DocumentRelatedEntityType
+DocumentRelatedEntityType.ACTION = Action
 DocumentRelatedEntityType.EVENT = Event
 
 # DocumentWorkflow

sormas-base/pom.xml

@@ -719,6 +719,12 @@
 				<version>0.3.0</version>
 			</dependency>
 
+			<dependency>
+				<groupId>com.wcs.wcslib</groupId>
+				<artifactId>wcslib-vaadin-widget-multifileupload</artifactId>
+				<version>4.0</version>
+			</dependency>
+
 			<!-- ** Vaadin END ** -->
 
 			<!-- *** Compile dependencies END *** -->

sormas-ui/pom.xml

@@ -67,6 +67,11 @@
 		   <artifactId>extended-token-field</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>com.wcs.wcslib</groupId>
+			<artifactId>wcslib-vaadin-widget-multifileupload</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>

sormas-ui/src/main/java/de/symeda/sormas/ui/action/ActionListEntry.java

@@ -25,22 +25,28 @@
 import com.google.common.base.Strings;
 import com.vaadin.icons.VaadinIcons;
 import com.vaadin.shared.ui.ContentMode;
+import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
 
+import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.action.ActionDto;
 import de.symeda.sormas.api.action.ActionMeasure;
 import de.symeda.sormas.api.action.ActionPriority;
 import de.symeda.sormas.api.action.ActionStatus;
+import de.symeda.sormas.api.document.DocumentRelatedEntityType;
 import de.symeda.sormas.api.event.EventHelper;
+import de.symeda.sormas.api.feature.FeatureType;
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
+import de.symeda.sormas.api.user.UserRight;
 import de.symeda.sormas.api.utils.DataHelper;
 import de.symeda.sormas.api.utils.HtmlHelper;
+import de.symeda.sormas.ui.document.DocumentListComponent;
 import de.symeda.sormas.ui.utils.ButtonHelper;
 import de.symeda.sormas.ui.utils.CssStyles;
 import de.symeda.sormas.ui.utils.DateFormatHelper;
@@ -63,9 +69,8 @@ public ActionListEntry(ActionDto action) {
 		VerticalLayout withContentLayout = new VerticalLayout();
 		withContentLayout.setMargin(false);
 		withContentLayout.setSpacing(false);
-		withContentLayout.setWidth(100, Unit.PERCENTAGE);
 		addComponent(withContentLayout);
-		setExpandRatio(withContentLayout, 1);
+		setExpandRatio(withContentLayout, 3);
 
 		Label measureOrTitle = new Label(
 			MoreObjects
@@ -181,6 +186,20 @@ public ActionListEntry(ActionDto action) {
 			}
 			priorityLabel.addStyleName(statusStyle);
 		}
+
+		if (FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.DOCUMENTS)) {
+			VerticalLayout documentLayout = new VerticalLayout();
+			documentLayout.setMargin(false);
+			documentLayout.setSpacing(false);
+			addComponent(documentLayout);
+			setExpandRatio(documentLayout, 1);
+			documentLayout.setMargin(new MarginInfo(true, true, false, false));
+
+			// TODO: user rights?
+			DocumentListComponent documentList = new DocumentListComponent(DocumentRelatedEntityType.ACTION, action.toReference(), UserRight.EVENT_EDIT);
+			documentList.addStyleName(CssStyles.SIDE_COMPONENT);
+			documentLayout.addComponent(documentList);
+		}
 	}
 
 	public void addEditListener(int rowIndex, Button.ClickListener editClickListener) {

sormas-ui/src/main/java/de/symeda/sormas/ui/document/DocumentListComponent.java

@@ -18,6 +18,8 @@
 import java.io.IOException;
 import java.util.List;
 
+import org.vaadin.hene.popupbutton.PopupButton;
+
 import com.vaadin.icons.VaadinIcons;
 import com.vaadin.server.FileDownloader;
 import com.vaadin.server.Page;
@@ -28,9 +30,10 @@
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
-import com.vaadin.ui.Upload;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
+import com.wcs.wcslib.vaadin.widget.multifileupload.ui.MultiFileUpload;
+import com.wcs.wcslib.vaadin.widget.multifileupload.ui.UploadStateWindow;
 
 import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.ReferenceDto;
@@ -43,13 +46,13 @@
 import de.symeda.sormas.api.user.UserRight;
 import de.symeda.sormas.api.utils.DataHelper;
 import de.symeda.sormas.ui.UserProvider;
-import de.symeda.sormas.ui.importer.DocumentReceiver;
+import de.symeda.sormas.ui.importer.DocumentMultiFileUpload;
+import de.symeda.sormas.ui.importer.DocumentUploadFinishedHandler;
 import de.symeda.sormas.ui.utils.ButtonHelper;
 import de.symeda.sormas.ui.utils.CssStyles;
 import de.symeda.sormas.ui.utils.VaadinUiUtil;
 
 public class DocumentListComponent extends VerticalLayout {
-
 	private final DocumentRelatedEntityType relatedEntityType;
 	private final ReferenceDto entityRef;
 	private final UserRight editRight;
@@ -93,17 +96,26 @@ private Button buildUploadButton() {
 		uploadLayout.setSpacing(true);
 		uploadLayout.setMargin(true);
 		uploadLayout.addStyleName(CssStyles.LAYOUT_MINIMAL);
-		uploadLayout.setWidth(250, Unit.PIXELS);
-
-		DocumentReceiver receiver = new DocumentReceiver(relatedEntityType, entityRef.getUuid(), this::reload);
-		Upload upload = new Upload("", receiver);
-		receiver.setUpload(upload);
-		upload.setButtonCaption(I18nProperties.getCaption(Captions.importImportData));
-		CssStyles.style(upload, CssStyles.VSPACE_2);
-
-		uploadLayout.addComponentsAndExpand(upload);
 
-		return ButtonHelper.createIconPopupButton(Captions.documentUploadDocument, VaadinIcons.PLUS_CIRCLE, uploadLayout, ValoTheme.BUTTON_PRIMARY);
+		PopupButton mainButton =
+			ButtonHelper.createIconPopupButton(Captions.documentUploadDocument, VaadinIcons.PLUS_CIRCLE, uploadLayout, ValoTheme.BUTTON_PRIMARY);
+
+		UploadStateWindow uploadStateWindow = new UploadStateWindow();
+		MultiFileUpload multiFileUpload = new DocumentMultiFileUpload(() -> {
+			mainButton.setButtonClickTogglesPopupVisibility(false);
+			mainButton.setClosePopupOnOutsideClick(false);
+		}, new DocumentUploadFinishedHandler(relatedEntityType, entityRef.getUuid(), this::reload), uploadStateWindow);
+		multiFileUpload
+			.setUploadButtonCaptions(I18nProperties.getCaption(Captions.importImportData), I18nProperties.getCaption(Captions.importImportData));
+		multiFileUpload.setAllUploadFinishedHandler(() -> {
+			mainButton.setButtonClickTogglesPopupVisibility(true);
+			mainButton.setClosePopupOnOutsideClick(true);
+			mainButton.setPopupVisible(false);
+		});
+
+		uploadLayout.addComponentsAndExpand(multiFileUpload);
+
+		return mainButton;
 	}
 
 	private void reload() {

sormas-ui/src/main/java/de/symeda/sormas/ui/importer/DocumentMultiFileUpload.java

@@ -0,0 +1,40 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2021 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.symeda.sormas.ui.importer;
+
+import com.wcs.wcslib.vaadin.widget.multifileupload.ui.MultiFileUpload;
+import com.wcs.wcslib.vaadin.widget.multifileupload.ui.UploadFinishedHandler;
+import com.wcs.wcslib.vaadin.widget.multifileupload.ui.UploadStartedHandler;
+import com.wcs.wcslib.vaadin.widget.multifileupload.ui.UploadStatePanel;
+import com.wcs.wcslib.vaadin.widget.multifileupload.ui.UploadStateWindow;
+
+import de.symeda.sormas.ui.SormasUI;
+
+public class DocumentMultiFileUpload extends MultiFileUpload {
+
+	public DocumentMultiFileUpload(UploadStartedHandler uploadStartedHandler, UploadFinishedHandler uploadFinishedHandler, UploadStateWindow uploadStateWindow) {
+		super(uploadStartedHandler, uploadFinishedHandler, uploadStateWindow, true);
+
+		// Need to enable Polling or nothing will happen after selecting a file with the MultiFileUpload input
+		this.addAttachListener(e -> SormasUI.get().access(() -> SormasUI.get().setPollInterval(300)));
+		this.addDetachListener(e -> SormasUI.get().access(() -> SormasUI.get().setPollInterval(-1)));
+	}
+
+	@Override
+	protected UploadStatePanel createStatePanel(UploadStateWindow uploadStateWindow) {
+		return new UploadStatePanel(uploadStateWindow, new DocumentUploadReceiver());
+	}
+}

sormas-ui/src/main/java/de/symeda/sormas/ui/importer/DocumentUploadFinishedHandler.java

@@ -0,0 +1,121 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2021 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.symeda.sormas.ui.importer;
+
+import java.io.InputStream;
+
+import com.google.common.io.ByteStreams;
+import com.vaadin.server.Page;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Notification;
+import com.wcs.wcslib.vaadin.widget.multifileupload.ui.UploadFinishedHandler;
+
+import de.symeda.sormas.api.FacadeProvider;
+import de.symeda.sormas.api.document.DocumentDto;
+import de.symeda.sormas.api.document.DocumentRelatedEntityType;
+import de.symeda.sormas.api.i18n.Captions;
+import de.symeda.sormas.api.i18n.I18nProperties;
+import de.symeda.sormas.api.i18n.Strings;
+import de.symeda.sormas.ui.UserProvider;
+import de.symeda.sormas.ui.utils.VaadinUiUtil;
+
+public class DocumentUploadFinishedHandler implements UploadFinishedHandler {
+
+	private final DocumentRelatedEntityType relatedEntityType;
+	private final String relatedEntityUuid;
+	private final Runnable callback;
+
+	public DocumentUploadFinishedHandler(DocumentRelatedEntityType relatedEntityType, String relatedEntityUuid, Runnable callback) {
+		this.relatedEntityType = relatedEntityType;
+		this.relatedEntityUuid = relatedEntityUuid;
+		this.callback = callback;
+	}
+
+	@Override
+	public void handleFile(InputStream inputStream, String fileName, String mimeType, long length, int filesLeftInQueue) {
+		try {
+			byte[] bytes = ByteStreams.toByteArray(inputStream);
+
+			String existing = FacadeProvider.getDocumentFacade().isExistingDocument(relatedEntityType, relatedEntityUuid, fileName);
+			if (existing != null) {
+				VaadinUiUtil.showConfirmationPopup(
+					I18nProperties.getString(Strings.headingFileExists),
+					new Label(String.format(I18nProperties.getString(Strings.infoDocumentAlreadyExists), fileName)),
+					I18nProperties.getCaption(Captions.actionConfirm),
+					I18nProperties.getCaption(Captions.actionCancel),
+					null,
+					ok -> {
+						if (ok) {
+							FacadeProvider.getDocumentFacade().deleteDocument(existing);
+							try {
+								saveDocument(fileName, mimeType, length, relatedEntityType, relatedEntityUuid, bytes);
+							} catch (Exception e) {
+								new Notification(
+									I18nProperties.getString(Strings.headingImportError),
+									I18nProperties.getString(Strings.messageImportError),
+									Notification.Type.ERROR_MESSAGE,
+									false).show(Page.getCurrent());
+								throw new RuntimeException(e);
+							}
+							if (filesLeftInQueue == 0) {
+								Notification.show(I18nProperties.getString(Strings.headingUploadSuccess), Notification.Type.TRAY_NOTIFICATION);
+							}
+						}
+						if (filesLeftInQueue == 0) {
+							if (callback != null) {
+								callback.run();
+							}
+						}
+					});
+			} else {
+				saveDocument(fileName, mimeType, length, relatedEntityType, relatedEntityUuid, bytes);
+
+				if (filesLeftInQueue == 0) {
+					Notification.show(I18nProperties.getString(Strings.headingUploadSuccess), Notification.Type.TRAY_NOTIFICATION);
+					if (callback != null) {
+						callback.run();
+					}
+				}
+			}
+		} catch (Exception e) {
+			new Notification(
+				I18nProperties.getString(Strings.headingImportError),
+				I18nProperties.getString(Strings.messageImportError),
+				Notification.Type.ERROR_MESSAGE,
+				false).show(Page.getCurrent());
+			throw new RuntimeException(e);
+		}
+	}
+
+	private void saveDocument(
+		String fileName,
+		String mimeType,
+		Long length,
+		DocumentRelatedEntityType relatedEntityType,
+		String relatedEntityUuid,
+		byte[] bytes)
+		throws Exception {
+		DocumentDto document = DocumentDto.build();
+		document.setUploadingUser(UserProvider.getCurrent().getUserReference());
+		document.setName(fileName);
+		document.setMimeType(mimeType);
+		document.setSize(length);
+		document.setRelatedEntityType(relatedEntityType);
+		document.setRelatedEntityUuid(relatedEntityUuid);
+
+		FacadeProvider.getDocumentFacade().saveDocument(document, bytes);
+	}
+}