JaRutkowski · JaRutkowski · Jan 4, 2021 · Jan 3, 2021 · Jan 4, 2021
diff --git a/elibrary-core/source/resources/messages.properties b/elibrary-core/source/resources/messages.properties
@@ -486,7 +486,7 @@ settingsPanel.treeMenuSystemDataFeeding                                       =
 settingsPanel.treeMenuProcesses                                               = Processes
 settingsPanel.treeMenuSystemDataTitle                                         = System Data
 settingsPanel.treeMenuSystemDataDescription                                   = Configure and manage system data such as parameters, feeds and processes.
-settingsPanel.treeMenuSystemDataMenuItems                                     = <html>&#8227; System paremeters<br />&#8227; System data feeding<br />&#8227; Processes<br />&#8227; Connections, services, integrations monitor</html>
+settingsPanel.treeMenuSystemDataMenuItems                                     = <html>&#8227; System paremeters<br />&#8227; System data feeding<br />&#8227; Processes<br />&#8227; Connections, services, integrations monitor<br />&#8227; Installation</html>
 systemDataFeedingTableModel.feedKindCol                                       = Feed kind
 systemDataFeedingTableModel.dataValueCol                                      = Data
 systemDataFeedingTableModel.actionCol                                         = Action
@@ -615,6 +615,14 @@ systemDataFeedingTablePanel.languageData.btnRun                               =
 systemDataFeedingTablePanel.languageData.btnCheck                             = Check
 systemDataFeedingTableData.languageData.feedTypeCol                           = Language data
 systemDataFeedingTableData.languageData.dataCol                               =
+settingsPanel.treeMenuInstallation                                            = Installation
+systemInstallationPanel.systemInstallationPanelTitle                          = Installation data
+systemInstallationPanel.lblVersion                                            = Version:
+systemInstallationPanel.lblBuildNumber                                        = Build:
+systemInstallationPanel.lblLastBuildDate                                      = Built:
+aboutPanel.version                                                            = #DSK-{0}-{1}
+aboutPanel.none                                                               = None
+systemInstallationPanel.lblLastBuildStatus                                    = Build status:
 
 
 

diff --git a/elibrary-core/source/resources/messages_en.properties b/elibrary-core/source/resources/messages_en.properties
@@ -490,7 +490,7 @@ settingsPanel.treeMenuSystemDataFeeding                                       =
 settingsPanel.treeMenuProcesses                                               = Processes
 settingsPanel.treeMenuSystemDataTitle                                         = System Data
 settingsPanel.treeMenuSystemDataDescription                                   = Configure and manage system data such as parameters, feeds and processes.
-settingsPanel.treeMenuSystemDataMenuItems                                     = <html>&#8227; System paremeters<br />&#8227; System data feeding<br />&#8227; Processes<br />&#8227; Connections, services, integrations monitor</html>
+settingsPanel.treeMenuSystemDataMenuItems                                     = <html>&#8227; System paremeters<br />&#8227; System data feeding<br />&#8227; Processes<br />&#8227; Connections, services, integrations monitor<br />&#8227; Installation</html>
 systemDataFeedingTableModel.feedKindCol                                       = Feed kind
 systemDataFeedingTableModel.dataValueCol                                      = Data
 systemDataFeedingTableModel.actionCol                                         = Action
@@ -613,5 +613,13 @@ aboutPanel.isNotActive                                                        =
 systemDataFeedingTablePanel.languageData.btnRun                               = Run
 systemDataFeedingTablePanel.languageData.btnCheck                             = Check
 systemDataFeedingTableData.languageData.feedTypeCol                           = Language data
+settingsPanel.treeMenuInstallation                                            = Installation
+systemInstallationPanel.systemInstallationPanelTitle                          = Installation data
+systemInstallationPanel.lblVersion                                            = Version:
+systemInstallationPanel.lblBuildNumber                                        = Build:
+systemInstallationPanel.lblLastBuildDate                                      = Built:
+aboutPanel.version                                                            = #DSK-{0}-{1}
+aboutPanel.none                                                               = None
+systemInstallationPanel.lblLastBuildStatus                                    = Build status:
 
 
diff --git a/elibrary-core/source/resources/messages_pl.properties b/elibrary-core/source/resources/messages_pl.properties
@@ -490,7 +490,7 @@ settingsPanel.treeMenuSystemDataFeeding                                       =
 settingsPanel.treeMenuProcesses                                               = Procesy
 settingsPanel.treeMenuSystemDataTitle                                         = Dane Systemu
 settingsPanel.treeMenuSystemDataDescription                                   = Konfiguracja i zarz\u0105dzanie danymi systemu takimi jak parametry, zasilania i procesy.
-settingsPanel.treeMenuSystemDataMenuItems                                     = <html>&#8227; Parametry systemowe<br />&#8227; Zasilanie danymi systemowymi<br />&#8227; Procesy<br />&#8227; Monitor po\u0142\u0105cze\u0144, serwis\u00F3w i integracji</html>
+settingsPanel.treeMenuSystemDataMenuItems                                     = <html>&#8227; Parametry systemowe<br />&#8227; Zasilanie danymi systemowymi<br />&#8227; Procesy<br />&#8227; Monitor po\u0142\u0105cze\u0144, serwis\u00F3w i integracji<br />&#8227; Instalacja</html>
 systemDataFeedingTableModel.feedKindCol                                       = Rodzaj zasilania
 systemDataFeedingTableModel.dataValueCol                                      = Dane
 systemDataFeedingTableModel.actionCol                                         = Akcja
@@ -614,5 +614,13 @@ aboutPanel.isNotActive                                                        =
 systemDataFeedingTablePanel.languageData.btnRun                               = Uruchom
 systemDataFeedingTablePanel.languageData.btnCheck                             = Sprawd\u017A
 systemDataFeedingTableData.languageData.feedTypeCol                           = J\u0119zyki systemowe
+settingsPanel.treeMenuInstallation                                            = Instalacja
+systemInstallationPanel.systemInstallationPanelTitle                          = Dane instalacji
+systemInstallationPanel.lblVersion                                            = Wersja:
+systemInstallationPanel.lblBuildNumber                                        = Build:
+systemInstallationPanel.lblLastBuildDate                                      = Zbudowano:
+aboutPanel.version                                                            = #DSK-{0}-{1}
+aboutPanel.none                                                               = Brak
+systemInstallationPanel.lblLastBuildStatus                                    = Status build'a:
 
 
diff --git a/elibrary-core/source/src/controller/java/com/javafee/elibrary/core/aboutform/Actions.java b/elibrary-core/source/src/controller/java/com/javafee/elibrary/core/aboutform/Actions.java
@@ -3,11 +3,10 @@
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
+import java.util.Optional;
 
-import com.javafee.elibrary.core.common.Common;
 import com.javafee.elibrary.core.common.SystemProperties;
 import com.javafee.elibrary.core.common.action.IActionForm;
-import com.javafee.elibrary.core.common.dto.Build;
 import com.javafee.elibrary.hibernate.dao.HibernateUtil;
 import com.javafee.elibrary.hibernate.dao.common.Constants;
 import com.javafee.elibrary.hibernate.dto.library.LibraryBranchData;
@@ -37,26 +36,26 @@ public void initializeForm() {
 	}
 
 	private void reloadLblsDynamic() {
-		reloadLblVersion();
-		reloadLblLicenseInformation();
+		LibrarySystemData librarySystemData = HibernateUtil.getSession().get(LibrarySystemData.class, Constants.DATA_BASE_LIBRARY_DATA_ID);
+		reloadLblVersion(librarySystemData);
+		reloadLblLicenseInformation(librarySystemData);
 		reloadLblSubscription();
 	}
 
-	private void reloadLblVersion() {
-		Build build = Common.fetchSystemVersion();
-		String version = build.getSourceBlob().getVersion();
-		SimpleDateFormat versionDateFormat = new SimpleDateFormat("yyyy-dd-MM"),
-				releaseDateFormat = new SimpleDateFormat("MMMM dd, yyyy", Locale.US);
-		String versionDateString = versionDateFormat.format(build.getCreatedAt()),
-				releaseDateString = releaseDateFormat.format(build.getCreatedAt());
-		String versionText = MessageFormat.format(SystemProperties.getInstance().getResourceBundle().getString("aboutPanel.lblVersion"),
-				"#DSK-" + versionDateString + "-" + version, releaseDateString);
+	private void reloadLblVersion(LibrarySystemData librarySystemData) {
+		SimpleDateFormat releaseDateFormat = new SimpleDateFormat("MMMM dd, yyyy", Locale.US);
+		String releaseDateString = Optional.ofNullable(librarySystemData.getInstallationDate()).isPresent()
+				? releaseDateFormat.format(librarySystemData.getInstallationDate())
+				: SystemProperties.getInstance().getResourceBundle().getString("aboutPanel.none");
+		String versionText = Optional.ofNullable(librarySystemData.getVersion()).isPresent()
+				? MessageFormat.format(SystemProperties.getInstance().getResourceBundle()
+				.getString("aboutPanel.lblVersion"), librarySystemData.getVersion(), releaseDateString)
+				: SystemProperties.getInstance().getResourceBundle().getString("aboutPanel.none");
 		aboutForm.getAboutPanel().getLblVersion().setText(versionText);
 		aboutForm.getAboutPanel().getLblVersion().setToolTipText(versionText);
 	}
 
-	private void reloadLblLicenseInformation() {
-		LibrarySystemData librarySystemData = HibernateUtil.getSession().get(LibrarySystemData.class, Constants.DATA_BASE_LIBRARY_DATA_ID);
+	private void reloadLblLicenseInformation(LibrarySystemData librarySystemData) {
 		LibraryBranchData libraryBranchData = (LibraryBranchData) librarySystemData.getLibraryData().getLibraryBranchData().toArray()[0];
 		String licenseText = MessageFormat.format(SystemProperties.getInstance().getResourceBundle().getString("aboutPanel.lblLicenseInformation"),
 				librarySystemData.getLibraryData().getName(), libraryBranchData.getName());

diff --git a/elibrary-core/source/src/controller/java/com/javafee/elibrary/core/settingsform/Actions.java b/elibrary-core/source/src/controller/java/com/javafee/elibrary/core/settingsform/Actions.java
@@ -130,6 +130,10 @@ private void reloadContentPanel() {
 						settingsForm.getSettingsPanel().reloadContentPanel(settingsForm, settingsForm.getSettingsPanel().getSystemMonitorPanel());
 						SystemMonitorPanelEvent.getInstance(settingsForm);
 						break;
+					case SYSTEM_INSTALLATION_PANEL:
+						settingsForm.getSettingsPanel().reloadContentPanel(settingsForm, settingsForm.getSettingsPanel().getSystemInstallationPanel());
+						SystemInstallationPanelEvent.getInstance(settingsForm);
+						break;
 					default:
 						break;
 				}
@@ -155,5 +159,6 @@ private void clearEvent() {
 		SystemDataFeedingPanelEvent.systemDataFeedingPanelEvent = null;
 		SystemProcessesPanelEvent.systemProcessesPanelEvent = null;
 		SystemMonitorPanelEvent.systemMonitorPanelEvent = null;
+		SystemInstallationPanelEvent.systemInstallationPanelEvent = null;
 	}
 }
diff --git a/.../controller/java/com/javafee/elibrary/core/settingsform/SystemInstallationPanelEvent.java b/.../controller/java/com/javafee/elibrary/core/settingsform/SystemInstallationPanelEvent.java
@@ -0,0 +1,95 @@
+package com.javafee.elibrary.core.settingsform;
+
+import java.awt.*;
+import java.util.Optional;
+
+import javax.swing.ImageIcon;
+
+import com.javafee.elibrary.core.common.Common;
+import com.javafee.elibrary.core.common.Constants;
+import com.javafee.elibrary.core.common.SystemProperties;
+import com.javafee.elibrary.core.common.action.IActionForm;
+import com.javafee.elibrary.core.startform.RegistrationPanel;
+
+import lombok.Setter;
+
+public class SystemInstallationPanelEvent implements IActionForm {
+	@Setter
+	private SettingsForm settingsForm;
+
+	protected static SystemInstallationPanelEvent systemInstallationPanelEvent = null;
+
+	private SystemInstallationPanelEvent(SettingsForm settingsForm) {
+		this.control(settingsForm);
+	}
+
+	public static SystemInstallationPanelEvent getInstance(SettingsForm settingsForm) {
+		if (systemInstallationPanelEvent == null)
+			systemInstallationPanelEvent = new SystemInstallationPanelEvent(settingsForm);
+		return systemInstallationPanelEvent;
+	}
+
+	public void control(SettingsForm settingsForm) {
+		setSettingsForm(settingsForm);
+		initializeForm();
+	}
+
+	@Override
+	public void initializeForm() {
+		reloadLblsDynamic();
+	}
+
+	private void reloadLblsDynamic() {
+		reloadLblVersion();
+		reloadLblBuildNumber();
+		reloadLblBuildDate();
+		reloadLblBuildStatus();
+
+		reloadContentPanel();
+		//TODO
+		// - Build Logs (API) - #279
+		// - DB logs (dbchangelog) - US under #39
+		// - db version under 'System data' > 'Installation' (from dbchangelog) - US under #39
+	}
+
+	private void reloadContentPanel() {
+		settingsForm.getSettingsPanel().reloadContentPanel(settingsForm, settingsForm.getSettingsPanel().getSystemInstallationPanel());
+	}
+
+	private void reloadLblVersion() {
+		settingsForm.getSettingsPanel().getSystemInstallationPanel().getLblVersionValue()
+				.setText(Optional.ofNullable(Common.fetchSystemVersion()).isPresent()
+						? Common.constructVersionString(Common.fetchSystemVersion())
+						: SystemProperties.getInstance().getResourceBundle().getString("aboutPanel.none"));
+	}
+
+	private void reloadLblBuildNumber() {
+		settingsForm.getSettingsPanel().getSystemInstallationPanel().getLblBuildNumberValue()
+				.setText(Optional.ofNullable(Common.fetchSystemVersion()).isPresent()
+						? Common.fetchSystemVersion().getSourceBlob().getVersion()
+						: SystemProperties.getInstance().getResourceBundle().getString("aboutPanel.none"));
+	}
+
+	private void reloadLblBuildDate() {
+		String versionDateString = Optional.ofNullable(Common.fetchSystemVersion()).isPresent()
+				? Constants.APPLICATION_DATE_FORMAT.format(Common.fetchSystemVersion().getCreatedAt())
+				: SystemProperties.getInstance().getResourceBundle().getString("aboutPanel.none");
+		settingsForm.getSettingsPanel().getSystemInstallationPanel().getLblLastBuildDateValue()
+				.setText(versionDateString);
+	}
+
+	private void reloadLblBuildStatus() {
+		if (Optional.ofNullable(Common.fetchSystemVersion()).isPresent())
+			if (Constants.APPLICATION_BUILD_STATUS_SUCCEEDED.equals(Common.fetchSystemVersion().getStatus()))
+				settingsForm.getSettingsPanel().getSystemInstallationPanel().getLblLastBuildStatusValue().setIcon(
+						new ImageIcon(new ImageIcon(RegistrationPanel.class.getResource("/images/sign-check-ico.png"))
+								.getImage().getScaledInstance(18, 18, Image.SCALE_SMOOTH)));
+			else
+				settingsForm.getSettingsPanel().getSystemInstallationPanel().getLblLastBuildStatusValue().setIcon(
+						new ImageIcon(new ImageIcon(RegistrationPanel.class.getResource("/images/sign-error-ico.png"))
+								.getImage().getScaledInstance(18, 18, Image.SCALE_SMOOTH)));
+		else
+			settingsForm.getSettingsPanel().getSystemInstallationPanel().getLblLastBuildDateValue()
+					.setText(SystemProperties.getInstance().getResourceBundle().getString("aboutPanel.none"));
+	}
+}
diff --git a/elibrary-core/source/src/controller/utils/com/javafee/elibrary/core/common/Common.java b/elibrary-core/source/src/controller/utils/com/javafee/elibrary/core/common/Common.java
@@ -9,13 +9,13 @@
 import java.sql.DriverManager;
 import java.text.MessageFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Vector;
 import java.util.function.Consumer;
@@ -403,7 +403,16 @@ public Build fetchSystemVersion() {
 		} catch (UnirestException e) {
 			log.warning("Not able to get response from WS heroku-management/latest-builds method");
 		}
-		return Objects.requireNonNull(responseVersion)[0];
+		return Optional.ofNullable(responseVersion).isPresent() ? responseVersion[0] : null;
+	}
+
+	public String constructVersionString(Build build) {
+		String version = build.getSourceBlob().getVersion();
+		SimpleDateFormat versionDateFormat = new SimpleDateFormat("yyyy-dd-MM");
+		String versionDateString = versionDateFormat.format(build.getCreatedAt());
+		String versionText = MessageFormat.format(SystemProperties.getInstance().getResourceBundle().getString("aboutPanel.version"),
+				versionDateString, version);
+		return versionText;
 	}
 
 	public Pair<Boolean, String> checkELibraryDbConnectivityAndGetHealthStatus() {

diff --git a/elibrary-core/source/src/controller/utils/com/javafee/elibrary/core/common/Constants.java b/elibrary-core/source/src/controller/utils/com/javafee/elibrary/core/common/Constants.java
@@ -27,7 +27,8 @@ public enum Panel_Settings {
 		SYSTEM_PARAMETERS_PANEL(SystemProperties.getInstance().getResourceBundle().getString("settingsPanel.treeMenuSystemParameters")),
 		SYSTEM_DATA_FEEDING_PANEL(SystemProperties.getInstance().getResourceBundle().getString("settingsPanel.treeMenuSystemDataFeeding")),
 		SYSTEM_PROCESSES_PANEL(SystemProperties.getInstance().getResourceBundle().getString("settingsPanel.treeMenuProcesses")),
-		SYSTEM_MONITOR_PANEL(SystemProperties.getInstance().getResourceBundle().getString("settingsPanel.treeMenuMonitor"));
+		SYSTEM_MONITOR_PANEL(SystemProperties.getInstance().getResourceBundle().getString("settingsPanel.treeMenuMonitor")),
+		SYSTEM_INSTALLATION_PANEL(SystemProperties.getInstance().getResourceBundle().getString("settingsPanel.treeMenuInstallation"));
 
 		private final String name;
 
@@ -394,6 +395,7 @@ public static BlockReason getByNumber(String blockReason) {
 	public static final String MAIN_SPLASH_SCREEN_IMAGE = "source/resources/images/splashScreen.jpg";
 
 	public static final String APPLICATION_NAME = "e-library";
+	public static final String APPLICATION_BUILD_STATUS_SUCCEEDED = "succeeded";
 	public static String APPLICATION_LANGUAGE = "en";
 	public static final String APPLICATION_LANGUAGE_PL = "pl";
 	public static final String APPLICATION_LANGUAGE_EN = "en";

diff --git a/elibrary-core/source/src/view/forms/com/javafee/elibrary/core/aboutform/AboutForm.java b/elibrary-core/source/src/view/forms/com/javafee/elibrary/core/aboutform/AboutForm.java
@@ -19,7 +19,7 @@ public class AboutForm extends BaseForm {
 	public void initialize() {
 		super.initialize();
 
-		frame.setBounds(100, 100, 350, 420);
+		frame.setBounds(100, 100, 350, 430);
 		frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 		frame.setResizable(false);
 

diff --git a/...ary-core/source/src/view/panels/com/javafee/elibrary/core/settingsform/SettingsPanel.java b/...ary-core/source/src/view/panels/com/javafee/elibrary/core/settingsform/SettingsPanel.java
@@ -39,6 +39,8 @@ public class SettingsPanel extends BasePanel {
 	private SystemProcessesPanel systemProcessesPanel;
 	@Getter
 	private SystemMonitorPanel systemMonitorPanel;
+	@Getter
+	private SystemInstallationPanel systemInstallationPanel;
 
 	private GridBagConstraints gbc_panel;
 
@@ -78,6 +80,7 @@ public SettingsPanel() {
 		systemDataFeedingPanel = new SystemDataFeedingPanel();
 		systemProcessesPanel = new SystemProcessesPanel();
 		systemMonitorPanel = new SystemMonitorPanel();
+		systemInstallationPanel = new SystemInstallationPanel();
 	}
 
 	public void reloadContentPanel(SettingsForm settingsForm, JPanel contentPanel) {
@@ -118,6 +121,7 @@ private List<Object> constructTreeMenuNodes() {
 		systemDataNodes.add(SystemProperties.getInstance().getResourceBundle().getString("settingsPanel.treeMenuSystemDataFeeding"));
 		systemDataNodes.add(SystemProperties.getInstance().getResourceBundle().getString("settingsPanel.treeMenuProcesses"));
 		systemDataNodes.add(SystemProperties.getInstance().getResourceBundle().getString("settingsPanel.treeMenuMonitor"));
+		systemDataNodes.add(SystemProperties.getInstance().getResourceBundle().getString("settingsPanel.treeMenuInstallation"));
 
 		nodes.add(generalNodes);
 		if (LogInEvent.getRole() != Constants.Role.ADMIN)