refactoring and fixing #124

sormas-api/pom.xml

@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.65.0-SNAPSHOT</version>
+		<version>1.0.11</version> 
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -840,6 +840,7 @@ public interface Strings {
 	String messageCampaignDearchived = "messageCampaignDearchived";
 	String messageCampaignDeleted = "messageCampaignDeleted";
 	String messageCampaignFormSaved = "messageCampaignFormSaved";
+	String messageCampaignFormSavedandContinue = "messageCampaignFormSavednContinue";
 	String messageCampaignSaved = "messageCampaignSaved";
 	String messageCaseArchived = "messageCaseArchived";
 	String messageCaseCreated = "messageCaseCreated";

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

@@ -850,6 +850,7 @@ messageCampaignDearchived = Campaign has been de-archived
 messageCampaignDeleted = Campaign deleted
 messageCampaignSaved = Campaign saved
 messageCampaignFormSaved = %s saved
+messageCampaignFormSavednContinue = %s saved and ready for new input
 messageCaseArchived = Case has been archived
 messageCaseCreated = New case created
 messageCaseDearchived = Case has been de-archived

sormas-api/src/main/resources/strings_en-AF.properties

@@ -850,6 +850,7 @@ messageCampaignDearchived = Campaign has been de-archived
 messageCampaignDeleted = Campaign deleted
 messageCampaignSaved = Campaign saved
 messageCampaignFormSaved = %s saved
+messageCampaignFormSavednContinue = %s saved and ready for new input
 messageCaseArchived = Case has been archived
 messageCaseCreated = New case created
 messageCaseDearchived = Case has been de-archived

sormas-api/src/main/resources/strings_fa-AF.properties

@@ -850,6 +850,7 @@ messageCampaignDearchived = Campaign has been de-archived
 messageCampaignDeleted = Campaign deleted
 messageCampaignSaved = Campaign saved
 messageCampaignFormSaved = %s saved
+messageCampaignFormSavednContinue = %s saved and ready for new input
 messageCaseArchived = Case has been archived
 messageCaseCreated = New case created
 messageCaseDearchived = Case has been de-archived

sormas-api/src/main/resources/strings_ps-AF.properties

@@ -850,6 +850,7 @@ messageCampaignDearchived = Campaign has been de-archived
 messageCampaignDeleted = Campaign deleted
 messageCampaignSaved = Campaign saved
 messageCampaignFormSaved = %s saved
+messageCampaignFormSavednContinue = %s saved and ready for new input
 messageCaseArchived = Case has been archived
 messageCaseCreated = New case created
 messageCaseDearchived = Case has been de-archived

sormas-api/src/main/resources/version_apmis.txt

@@ -1 +1 @@
-1.0.11
+1.0.12

sormas-backend/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.65.0-SNAPSHOT</version>
+		<version>1.0.11</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

sormas-base/build-artifact.xml

@@ -20,14 +20,14 @@
 		<fail unless="copy.path">deploy.path is not set!</fail>
 
 		<property name="target.dir" value="./target" />
-		<copy todir="${copy.path}" preservelastmodified="true" verbose="true">
+		<!--copy todir="${copy.path}" preservelastmodified="true" verbose="true">
 			<fileset dir="${target.dir}">
 				<include name="**/*.${file.suffix}" />
 			</fileset>
-			<!-- This mapper strips off all leading directory information and versions from the jars -->
+			
 			<mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${dependency.versions}"
 				to="flatten" />
-		</copy>
+		</copy-->
 	</target>
 
 	<path id="maven-ant-tasks.classpath" path="../sormas-base/antlib/maven-ant-tasks-2.1.4-SNAPSHOT_PATCHED.jar" />

sormas-base/dependencies/serverlibs.pom

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>1.65.0-SNAPSHOT</version>
+        <version>1.0.11</version>
         <relativePath>../</relativePath>
     </parent>
 

sormas-base/pom.xml

@@ -5,7 +5,7 @@
 	<groupId>de.symeda.sormas</groupId>
 	<artifactId>sormas-base</artifactId>
 	<packaging>pom</packaging>
-	<version>1.65.0-SNAPSHOT</version>
+	<version>1.0.11</version>
 
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>

sormas-base/setup/keycloak/themes/sormas/login/resources/css/styles.css

@@ -1,6 +1,6 @@
 .login-pf body {
     background-size: cover;
-    background: #FFFFFF url(../img/world.png) center;
+    background: #FFFFFF url(../img/afghanistan-map.svg) center;
     box-shadow: inset 2000px 0 0 0 rgba(27, 84, 154, 0.9);
     display: flex;
 }

sormas-cargoserver/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>de.symeda.sormas</groupId>
         <artifactId>sormas-base</artifactId>
-        <version>1.65.0-SNAPSHOT</version>
+        <version>1.0.11</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
 

sormas-ear/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.65.0-SNAPSHOT</version>
+		<version>1.0.11</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 

sormas-keycloak-service-provider/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>1.65.0-SNAPSHOT</version>
+        <version>1.0.11</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

sormas-rest/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.65.0-SNAPSHOT</version>
+		<version>1.0.11</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 

sormas-ui/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>1.65.0-SNAPSHOT</version>
+		<version>1.0.11</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

sormas-ui/src/main/java/de/symeda/sormas/resources/de/symeda/sormas/ui/highcharts/login.js

@@ -0,0 +1,2 @@
+var url = window.location.toString();
+window.location = url.replace(/dashboard_logout/, 'dashboard');

sormas-ui/src/main/java/de/symeda/sormas/ui/AboutView.java

@@ -116,24 +116,26 @@ private VerticalLayout createInfoSection() {
 
 		Label aboutLabel = new Label(I18nProperties.getCaption(Captions.about), ContentMode.HTML);
 		aboutLabel.addStyleName(CssStyles.H1);
+		//setComponentAlignment(aboutLabel, Alignment.MIDDLE_CENTER);
 		infoLayout.addComponent(aboutLabel);
 
 		ConfigFacade configFacade = FacadeProvider.getConfigFacade();
 		String infoLabelStr = configFacade.isCustomBranding()
 			? String.format(I18nProperties.getCaption(Captions.aboutBrandedSormasVersion), configFacade.getCustomBrandingName())
-			: "SORMAS";
-		Label infoLabel = new Label(VaadinIcons.INFO_CIRCLE.getHtml() + " " + infoLabelStr, ContentMode.HTML);
+			: "";
+		Label infoLabel = new Label(I18nProperties.getCaption(Captions.aboutApmisVersion) + ": " + InfoProvider.InfoProvider_apmis(), ContentMode.HTML);
+	//	setComponentAlignment(infoLayout, Alignment.MIDDLE_CENTER);
 		infoLayout.addComponent(infoLabel);
 
-		Label versionLabel =
-			new Label(I18nProperties.getCaption(Captions.aboutSormasVersion) + ": " + InfoProvider.get().getVersion(), ContentMode.HTML);
+		//Label versionLabel =
+			//new Label(I18nProperties.getCaption(Captions.aboutSormasVersion) + ": " + InfoProvider.get().getVersion(), ContentMode.HTML);
 		//CssStyles.style(versionLabel, CssStyles.VSPACE_3);
-		infoLayout.addComponent(versionLabel);
+	//	infoLayout.addComponent(versionLabel);
 
-		Label versionApmisLabel =
-				new Label(I18nProperties.getCaption(Captions.aboutApmisVersion) + ": " + InfoProvider.InfoProvider_apmis(), ContentMode.HTML);
-			CssStyles.style(versionApmisLabel, CssStyles.VSPACE_3);
-			infoLayout.addComponent(versionApmisLabel);
+	//	Label versionApmisLabel =
+	//			new Label(I18nProperties.getCaption(Captions.aboutApmisVersion) + ": " + InfoProvider.InfoProvider_apmis(), ContentMode.HTML);
+	//		CssStyles.style(versionApmisLabel, CssStyles.VSPACE_3);
+	//		infoLayout.addComponent(versionApmisLabel);
 /*
 		Link whatsNewLink = new Link(
 			I18nProperties.getCaption(Captions.aboutWhatsNew),

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

@@ -38,6 +38,7 @@
 import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.api.user.UserDto;
 import de.symeda.sormas.api.user.UserRight;
+import de.symeda.sormas.ui.ControllerProvider;
 import de.symeda.sormas.ui.SormasUI;
 import de.symeda.sormas.ui.UserProvider;
 import de.symeda.sormas.ui.campaign.campaigndata.CampaignDataView;
@@ -111,7 +112,12 @@ public void createCampaignDataForm(CampaignReferenceDto campaign, CampaignFormMe
 				SormasUI.refreshView(); //Strings.messageCampaignFormSaved
 				Notification
 					.show(String.format(I18nProperties.getString(Strings.messageCampaignFormSaved), campaignForm.toString()), Type.TRAY_NOTIFICATION);
-			}, window::close);
+			}, window::close, () -> {
+				SormasUI.refreshView(); //Strings.messageCampaignFormSaved
+				Notification
+					.show(String.format(I18nProperties.getString(Strings.messageCampaignFormSavedandContinue), campaignForm.toString()), Type.TRAY_NOTIFICATION);
+
+			},true);
 
 		window.setCaption(String.format(I18nProperties.getString(Strings.headingCreateCampaignDataForm), campaignForm.toString()));
 		window.setContent(component);
@@ -237,6 +243,8 @@ public CommitDiscardWrapperComponent<CampaignFormDataEditForm> getCampaignFormDa
 			boolean showDeleteButton,
 			Runnable commitCallback,
 			Runnable discardCallback) {
+
+
 
 			CampaignFormDataEditForm form = new CampaignFormDataEditForm(campaignFormData == null);
 			if (campaignFormData == null) {
@@ -302,6 +310,7 @@ public CommitDiscardWrapperComponent<CampaignFormDataEditForm> getCampaignFormDa
 		boolean showDeleteButton,
 		Runnable commitCallback,
 		Runnable discardCallback,
+		Runnable saveandcontdCallback,
 		boolean showCloneButton) {
 
 		CampaignFormDataEditForm form = new CampaignFormDataEditForm(campaignFormData == null);
@@ -312,19 +321,22 @@ public CommitDiscardWrapperComponent<CampaignFormDataEditForm> getCampaignFormDa
 				CampaignFormDataDto.build(campaign, campaignForm, currentUser.getArea(), currentUser.getRegion(),  currentUser.getDistrict(), currentUser.getCommunity());
 			campaignFormData.setCreatingUser(UserProvider.getCurrent().getUserReference());
 		}
+		final UserDto currentUsex = UserProvider.getCurrent().getUser();
 		form.setValue(campaignFormData);
 
 		final CommitDiscardWrapperComponent<CampaignFormDataEditForm> component = new CommitDiscardWrapperComponent<>(form, form.getFieldGroup());
 
 		component.addCommitListener(() -> {
 			if (!form.getFieldGroup().isModified()) {
+
 				try {
 					form.validate();
 				} catch (InvalidValueException e) {
 					Notification.show(I18nProperties.getValidationError(Validations.errorsInForm), Type.ERROR_MESSAGE);
 					return;
 				}
-
+
+
 				CampaignFormDataDto formData = form.getValue();
 				FacadeProvider.getCampaignFormDataFacade().saveCampaignFormData(formData);
 				if (commitCallback != null) {
@@ -333,6 +345,42 @@ public CommitDiscardWrapperComponent<CampaignFormDataEditForm> getCampaignFormDa
 				}
 			}
 		});
+
+
+
+		 // TODO duplicate form
+		component.addCommitandContListener(() -> {
+
+			if (!form.getFieldGroup().isModified()) {
+				try {
+					form.validate();
+				} catch (InvalidValueException e) {
+					Notification.show(I18nProperties.getValidationError(Validations.errorsInForm), Type.ERROR_MESSAGE);
+					return;
+				}
+
+				CampaignFormDataDto formData = form.getValue();
+				FacadeProvider.getCampaignFormDataFacade().saveCampaignFormData(formData);
+				if (saveandcontdCallback != null) {
+					saveandcontdCallback.run();
+					form.resetFormValues();
+
+					discardCallback.run();
+					ControllerProvider.getCampaignController().createCampaignDataForm(campaign, campaignForm);
+
+
+
+					//UI.getCurrent().getNavigator().navigateTo(CampaignDataView.VIEW_NAME + "/?" + CAMPAIGN + "=" + campaign.getUuid());
+				}
+			}
+
+		},  I18nProperties.getString(Strings.entityCampaignDataForm));
+
+
+
+
+
+
 
 		component.addDiscardListener(
 			() -> UI.getCurrent().getNavigator().navigateTo(CampaignDataView.VIEW_NAME + "/?" + CAMPAIGN + "=" + campaign.getUuid()));
@@ -353,16 +401,9 @@ public CommitDiscardWrapperComponent<CampaignFormDataEditForm> getCampaignFormDa
 				UI.getCurrent().getNavigator().navigateTo(CampaignFormDataView.VIEW_NAME);
 			}, I18nProperties.getString(Strings.entityCampaignDataForm));
 		}
-		/*
-		 * TODO duplicate form
-		if (showCloneButton && UserProvider.getCurrent().hasUserRight(UserRight.CAMPAIGN_DELETE)) {
-			String campaignFormDataUuid = campaignFormData.getUuid();
-
-			component.addCloneListener(() -> {
-				FacadeProvider.getCampaignFormDataFacade().cloneCampaignFormData(campaignFormDataUuid);
-				UI.getCurrent().getNavigator().navigateTo(CampaignFormDataView.VIEW_NAME);
-			}, I18nProperties.getString(Strings.entityCampaignDataForm));
-		}*/
+
+
+
 
 		return component;
 	}