Merge pull request #250 from Dokyeongyun/ft-220517-noDataUI

Ft 220517 no data UI

Author: Dokyeongyun

DBMonitoringWindowApp/src/main/java/root/javafx/Controller/AlertLogMonitoringMenuController.java

@@ -1,5 +1,6 @@
 package root.javafx.Controller;
 
+import java.io.IOException;
 import java.net.URL;
 import java.time.LocalDate;
 import java.util.HashMap;
@@ -20,6 +21,7 @@
 import javafx.fxml.Initializable;
 import javafx.geometry.Insets;
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.Button;
 import javafx.scene.control.DatePicker;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.ScrollPane.ScrollBarPolicy;
@@ -45,7 +47,9 @@
 import root.javafx.CustomView.NumberTextFormatter;
 import root.javafx.CustomView.TagBar;
 import root.javafx.CustomView.dateCell.DisableAfterTodayDateCell;
+import root.javafx.DI.DependencyInjection;
 import root.javafx.utils.AlertUtils;
+import root.javafx.utils.SceneUtils;
 import root.repository.implement.LinuxServerMonitoringRepository;
 import root.repository.implement.PropertyRepositoryImpl;
 import root.repository.implement.ReportFileRepo;
@@ -91,6 +95,15 @@ public class AlertLogMonitoringMenuController implements Initializable {
 
 	@FXML
 	AnchorPane summaryNodataAP;
+	
+	@FXML
+	AnchorPane topMenuBar;
+	
+	@FXML
+	AnchorPane noPropertyFileAP;
+	
+	@FXML
+	Button fileOpenBtn;
 
 	TagBar tagBar = new TagBar();
 
@@ -121,13 +134,21 @@ public void initialize(URL location, ResourceBundle resources) {
 				if (lastUseConnInfoFilePath != null) {
 					runConnInfoFileComboBox.getSelectionModel().select(lastUseConnInfoFilePath);
 				}
+
+				System.out.println(propService.getMonitoringServerNameList());
+				if(propService.getMonitoringServerNameList().size() == 0) {
+					setNoPropertyUIVisible(true);	
+				} else {
+					setNoPropertyUIVisible(false);
+				}
+				
 			} else {
-				AlertUtils.showAlert(AlertType.INFORMATION, "접속정보 설정", "설정된 접속정보가 없습니다.\n[설정]메뉴로 이동합니다.");
+				setNoPropertyUIVisible(true);
 				return;
 			}
 		} catch (PropertyNotFoundException e) {
 			log.error(e.getMessage());
-			AlertUtils.showAlert(AlertType.INFORMATION, "접속정보 설정", "설정된 접속정보가 없습니다.\n[설정]메뉴로 이동합니다.");
+			setNoPropertyUIVisible(true);
 			return;
 		}
 
@@ -395,4 +416,32 @@ private void updateStatusMessage(String message) {
 		statusTextUpdateThread.setDaemon(true);
 		statusTextUpdateThread.start();
 	}
+	
+	/**
+	 * 설정 메뉴로 이동
+	 * 
+	 * @param e
+	 * @throws IOException
+	 */
+	public void goSettingMenu(ActionEvent e) throws IOException {
+		SceneUtils.movePage(DependencyInjection.load("/fxml/SettingMenu.fxml"));
+	}
+	
+	/**
+	 * 접속정보 설정파일 열기
+	 * 
+	 * @param e
+	 */
+	public void openPropertiesFile(ActionEvent e) {
+	}
+	
+	/**
+	 * 접속정보 설정 파일이 없을 때 UI Visible 변경
+	 * 
+	 * @param isVisible
+	 */
+	private void setNoPropertyUIVisible(boolean isVisible) {
+		noPropertyFileAP.setVisible(isVisible);
+		topMenuBar.setVisible(!isVisible);
+	}
 }

DBMonitoringWindowApp/src/main/java/root/javafx/Controller/HistoryMenuController.java

@@ -1,5 +1,6 @@
 package root.javafx.Controller;
 
+import java.io.IOException;
 import java.net.URL;
 import java.util.List;
 import java.util.ResourceBundle;
@@ -9,7 +10,6 @@
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
-import javafx.scene.control.Alert.AlertType;
 import javafx.scene.layout.AnchorPane;
 import lombok.extern.slf4j.Slf4j;
 import root.common.database.implement.JdbcConnectionInfo;
@@ -29,7 +29,8 @@
 import root.core.usecase.constracts.ServerMonitoringUsecase;
 import root.core.usecase.implement.DBCheckUsecaseImpl;
 import root.core.usecase.implement.ServerMonitoringUsecaseImpl;
-import root.javafx.utils.AlertUtils;
+import root.javafx.DI.DependencyInjection;
+import root.javafx.utils.SceneUtils;
 import root.repository.implement.DBCheckRepositoryImpl;
 import root.repository.implement.LinuxServerMonitoringRepository;
 import root.repository.implement.PropertyRepositoryImpl;
@@ -57,6 +58,12 @@ public class HistoryMenuController implements Initializable {
 
 	@FXML
 	AnchorPane osDiskUsageTabAP;
+	
+	@FXML
+	AnchorPane topMenuBar;
+	
+	@FXML
+	AnchorPane noPropertyFileAP;
 
 	/* Custom View */
 	MonitoringAPController<ArchiveUsage> archiveUsageMAP;
@@ -92,13 +99,15 @@ public void initialize(URL location, ResourceBundle resources) {
 				if (lastUseConnInfoFilePath != null) {
 					runConnInfoFileComboBox.getSelectionModel().select(lastUseConnInfoFilePath);
 				}
+				
+				setNoPropertyUIVisible(false);
 			} else {
-				AlertUtils.showAlert(AlertType.INFORMATION, "접속정보 설정", "설정된 DB/Server 접속정보가 없습니다.\n[설정]메뉴로 이동합니다.");
+				setNoPropertyUIVisible(true);
 				return;
 			}
 		} catch (PropertyNotFoundException e) {
 			log.error(e.getMessage());
-			AlertUtils.showAlert(AlertType.INFORMATION, "접속정보 설정", "설정된 DB/Server 접속정보가 없습니다.\n[설정]메뉴로 이동합니다.");
+			setNoPropertyUIVisible(true);
 			return;
 		}
 
@@ -172,4 +181,33 @@ public void runMonitoring(ActionEvent e) {
 		asmDiskUsageMAP.syncTableData(asmDiskUsageMAP.getSelectedAliasComboBoxItem(), 0);
 		osDiskUsageMAP.syncTableData(osDiskUsageMAP.getSelectedAliasComboBoxItem(), 0);
 	}
+	
+	/**
+	 * 설정 메뉴로 이동
+	 * 
+	 * @param e
+	 * @throws IOException
+	 */
+	public void goSettingMenu(ActionEvent e) throws IOException {
+		SceneUtils.movePage(DependencyInjection.load("/fxml/SettingMenu.fxml"));
+	}
+	
+	/**
+	 * 접속정보 설정파일 열기
+	 * 
+	 * @param e
+	 */
+	public void openPropertiesFile(ActionEvent e) {
+		
+	}
+	
+	/**
+	 * 접속정보 설정 파일이 없을 때 UI Visible 변경
+	 * 
+	 * @param isVisible
+	 */
+	private void setNoPropertyUIVisible(boolean isVisible) {
+		noPropertyFileAP.setVisible(isVisible);
+		topMenuBar.setVisible(!isVisible);
+	}
 }

DBMonitoringWindowApp/src/main/java/root/javafx/Controller/RunMenuController.java

@@ -19,6 +19,7 @@
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.Node;
+import javafx.scene.control.Button;
 import javafx.scene.control.Control;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
@@ -118,6 +119,9 @@ public class RunMenuController implements Initializable {
 
 	@FXML
 	AnchorPane noPropertyFileAP;
+	
+	@FXML
+	Button fileOpenBtn;
 
 	private MonitoringTableViewPagingBox dbResults;
 	private MonitoringTableViewPagingBox serverResults;
@@ -135,10 +139,10 @@ public void initialize(URL location, ResourceBundle resources) {
 			/* 4. 실행결과 */
 			// initRunStep4();
 
-			noPropertyFileAP.setVisible(false);
+			setNoPropertyUIVisible(false);
 		} catch (PropertyNotFoundException e) {
 			log.error(e.getMessage());
-			noPropertyFileAP.setVisible(true);
+			setNoPropertyUIVisible(true);
 		}
 	}
 
@@ -315,8 +319,8 @@ private void initRunStep1() throws PropertyNotFoundException {
 		// 1-1. 모니터링 접속정보 설정파일 콤보박스 아이템 설정
 		List<String> connInfoFileList = propService.getConnectionInfoList();
 		if (connInfoFileList == null || ArrayUtils.isEmpty(connInfoFileList.toArray())) {
-			// TODO 접속정보 설정파일이 없는 경우
-			addMonitoringConnInfoPreview(new ArrayList<>(), new ArrayList<>());
+			setNoPropertyUIVisible(true);
+//			addMonitoringConnInfoPreview(new ArrayList<>(), new ArrayList<>());
 		} else {
 			connInfoFileListComboBox.getItems().addAll(connInfoFileList);
 		}
@@ -457,4 +461,21 @@ private void initRunStep4() {
 	public void goSettingMenu(ActionEvent e) throws IOException {
 		SceneUtils.movePage(DependencyInjection.load("/fxml/SettingMenu.fxml"));
 	}
+	
+	/**
+	 * 접속정보 설정파일 열기
+	 * 
+	 * @param e
+	 */
+	public void openPropertiesFile(ActionEvent e) {
+	}
+	
+	/**
+	 * 접속정보 설정 파일이 없을 때 UI Visible 변경
+	 * 
+	 * @param isVisible
+	 */
+	private void setNoPropertyUIVisible(boolean isVisible) {
+		noPropertyFileAP.setVisible(isVisible);
+	}
 }