Merge pull request #220 from Dokyeongyun/ft-220421-alertLogMenuUI

Dokyeongyun · web-flow · commit f80d991e8a9b · 2022-04-22T00:52:30.000+09:00
Ft 220421 alert log menu UI
diff --git a/src/main/java/root/core/domain/Log.java b/src/main/java/root/core/domain/Log.java
@@ -11,6 +11,7 @@
 @AllArgsConstructor
 @Data
 public class Log {
+	private int index;
 	private String logTimeStamp;
 	private List<String> logContents;
 
@@ -20,8 +21,11 @@ public int getTotalLineCount() {
 	
 	public String getFullLogString() {
 		StringBuffer result = new StringBuffer();
-		for(String s : logContents) {
-			result.append(s);
+		for (int i = 0; i < logContents.size(); i++) {
+			result.append(logContents.get(i));
+			if (i != logContents.size()) {
+				result.append(System.lineSeparator());
+			}
 		}
 		return result.toString();
 	}
diff --git a/src/main/java/root/core/usecase/implement/ServerMonitoringUsecaseImpl.java b/src/main/java/root/core/usecase/implement/ServerMonitoringUsecaseImpl.java
@@ -327,7 +327,7 @@ public AlertLog getAlertLogDuringPeriod(AlertLogCommand alc, String startDate, S
 						}
 
 						if (i != readStartIndex) {
-							alertLog.addLog(new Log(logTimeStamp, logContents));
+							alertLog.addLog(new Log(alertLog.getAlertLogs().size(), logTimeStamp, logContents));
 							logContents = new ArrayList<>();
 							logTimeStamp = line;
 						}
diff --git a/src/main/java/root/javafx/CustomView/AlertLogListViewCell.java b/src/main/java/root/javafx/CustomView/AlertLogListViewCell.java
@@ -2,48 +2,91 @@
 
 import java.io.IOException;
 
-import com.jfoenix.controls.JFXTextArea;
-
+import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
+import javafx.scene.control.TextArea;
 import javafx.scene.layout.AnchorPane;
+import javafx.scene.paint.Paint;
+import javafx.scene.text.Text;
+import lombok.extern.slf4j.Slf4j;
 import root.core.domain.Log;
 import root.javafx.DI.DependencyInjection;
 
+@Slf4j
 public class AlertLogListViewCell extends ListCell<Log> {
 	private FXMLLoader loader;
-	
-	@FXML AnchorPane rootAP;
-	@FXML Label logTimeLabel;
-	@FXML JFXTextArea logContentTA;
-	
+
+	@FXML
+	AnchorPane rootAP;
+	@FXML
+	Label logTimeLabel;
+	@FXML
+	Label logIndexLabel;
+	@FXML
+	FontAwesomeIconView logStatusIcon;
+	@FXML
+	TextArea logContentTA;
+
+	private Text textHolder = new Text();
+
 	@Override
-	protected void updateItem(Log log, boolean empty) {
-        super.updateItem(log, empty);
-
-        if(empty || log == null) {
-            setText(null);
-            setGraphic(null);
-        } else {
-            if (loader == null) {
-    			FXMLLoader loader = DependencyInjection.getLoader("/fxml/AlertLogListViewCell.fxml");
+	protected void updateItem(Log logObj, boolean empty) {
+		super.updateItem(logObj, empty);
+
+		if (empty || logObj == null) {
+			setText(null);
+			setGraphic(null);
+		} else {
+			if (loader == null) {
+				FXMLLoader loader = DependencyInjection.getLoader("/fxml/AlertLogListViewCell.fxml");
 				loader.setController(this);
-            	try {
+				try {
 					loader.load();
 				} catch (IOException e) {
-					e.printStackTrace();
+					log.error(e.getMessage());
 				}
-            }
-            
-            logTimeLabel.setText(log.getLogTimeStamp());
-            logContentTA.setPrefRowCount(log.getTotalLineCount());
-            logContentTA.setText(log.getFullLogString());
-            
-            setText(null);
-            setGraphic(rootAP);
-        }
+			}
+
+		
+			boolean isErrorLog = isErrorLog(logObj.getFullLogString());
+			
+			// logTimeStamp
+			logTimeLabel.setText(logObj.getLogTimeStamp());
+
+			// logIndex
+			logIndexLabel.setText(String.valueOf(logObj.getIndex() + 1));
+
+			// logStatusIcon
+			logStatusIcon.setFill(Paint.valueOf(isErrorLog ? "#d92a2a" : "#4d9c84"));
+
+			// logContent
+			logContentTA.widthProperty().addListener((observable, oldValue, newValue) -> {
+				Text text = new Text();
+				text.setWrappingWidth(newValue.doubleValue());
+				text.setText(logContentTA.getText());
+				logContentTA.setPrefHeight(text.getLayoutBounds().getHeight() * 1.35);
+			});
+			
+			if(isErrorLog) {
+				logContentTA.setStyle("-fx-background-color: #ffbfbf");	
+			}
+			logContentTA.setText(logObj.getFullLogString());
+			logContentTA.setEditable(false);
+			logContentTA.setWrapText(true);
+
+			textHolder.textProperty().bind(logContentTA.textProperty());
+
+			setText(null);
+			setGraphic(rootAP);
+			setStyle("-fx-padding: 0");
+		}
 	}
 
+	private boolean isErrorLog(String logContent) {
+		// TODO Remove hard-coding that identifying error log
+		return logContent.contains("ORA-");
+	}
 }
diff --git a/src/main/resources/css/javaFx.css b/src/main/resources/css/javaFx.css
@@ -5,10 +5,10 @@
 
 .button-raised{
     -fx-padding: 0.7em 0.57em;
-    -fx-font-size: 14px;
+    -fx-font-size: 14.0px;
     -jfx-button-type: RAISED;
-    -fx-background-color: rgb(77,102,204);
-    -fx-pref-width: 200;
+    -fx-background-color: rgb(77.0,102.0,204.0);
+    -fx-pref-width: 200.0;
     -fx-text-fill: WHITE;
 }
 
@@ -36,19 +36,19 @@
 /* TabPane */
 .tab-pane > .tab-header-area > .headers-region > .tab:top {
     -fx-border-color: #a3a7a8;
-    -fx-border-radius: 5 5 0 0;
+    -fx-border-radius: 5.0 5.0 0.0 0.0;
     -fx-background-color: transparent;
-    -fx-pref-height: 40px;  
-    -fx-background-insets: 0;
+    -fx-pref-height: 40.0px;  
+    -fx-background-insets: 0.0;
 }
 
 .tab-pane > .tab-header-area > .headers-region > .tab:selected:top {
     -fx-border-color: #2381E9 #a3a7a8 #a3a7a8 #a3a7a8;
-    -fx-border-width: 5 1 1 1;   
-    -fx-border-radius: 5 5 0 0;
+    -fx-border-width: 5.0 1.0 1.0 1.0;   
+    -fx-border-radius: 5.0 5.0 0.0 0.0;
     -fx-background-color: white;
-    -fx-pref-height: 40px;  
-    -fx-background-insets: 0;
+    -fx-pref-height: 40.0px;  
+    -fx-background-insets: 0.0;
 }
 
 .tab-pane > .tab-header-area > .headers-region > .tab:selected > .tab-container > .tab-label {
@@ -67,16 +67,16 @@
 .tab-pane > .tab-header-area > .tab-header-background {
     -fx-background-color: white;
     -fx-border-color: #a3a7a8;
-    -fx-border-width: 0 0 1 0;
-    -fx-background-insets: 0;
-    -fx-pref-height: 45px;  
+    -fx-border-width: 0.0 0.0 1.0 0.0;
+    -fx-background-insets: 0.0;
+    -fx-pref-height: 45.0px;  
 }
 
 /* TextField */
 .text-field {
     -fx-background-color: -fx-text-box-border, white ;
-    -fx-background-insets: 0, 0.5 0.5 0.5 0.5 ;
-    -fx-background-radius: 0 ;
+    -fx-background-insets: 0.0, 0.5 0.5 0.5 0.5 ;
+    -fx-background-radius: 0.0 ;
     -fx-font-family: "Noto Sans Korean Regular";
 }
 .text-field:focused {
@@ -86,17 +86,17 @@
 /* Label */
 .gridTitleLabel {
     -fx-font-family: "Noto Sans Korean Regular";
-    -fx-font-size: 11px;
-    -fx-line-spacing: 0;
+    -fx-font-size: 11.0px;
+    -fx-line-spacing: 0.0;
 }
 
 /* JFXComboBox */
 .jfx-combo-box {
     -fx-background-color: -fx-text-box-border, white ;
-    -fx-background-insets: 0, 0.5 0.5 0.5 0.5 ;
-    -fx-background-radius: 0 ;
+    -fx-background-insets: 0.0, 0.5 0.5 0.5 0.5 ;
+    -fx-background-radius: 0.0 ;
     -fx-font-family: "Noto Sans Korean Regular";
-    -fx-font-size: 10px;
+    -fx-font-size: 10.0px;
 }
 
 .jfx-combo-box:focused {
@@ -111,9 +111,9 @@
 
 .table-view .column-header-background {
     -fx-background-color: linear-gradient(to bottom, #1dbbdd44, #93f9b944);
-    -fx-background-radius: 7px 7px 0px 0px;
-    -fx-background-insets: 0 11px 0 0;
-    -fx-padding: 0 0 5px 0;
+    -fx-background-radius: 7.0px 7.0px 0.0px 0.0px;
+    -fx-background-insets: 0.0 11.0px 0.0 0.0;
+    -fx-padding: 0.0 0.0 5.0px 0.0;
 }
 
 .table-view .column-header {
@@ -122,7 +122,7 @@
 
 .table-view .table-cell{
     -fx-border-color: transparent;
-    -fx-padding: 2 0 2 10px;
+    -fx-padding: 2.0 0.0 2.0 10.0px;
 }
 
 .table-row-cell: hover {
@@ -132,13 +132,13 @@
 
 .table-row-cell: odd{
     -fx-background-color: #93f9b911;
-    -fx-background-insets: 0, 0 0 1 0;
+    -fx-background-insets: 0.0, 0.0 0.0 1.0 0.0;
     -fx-padding: 0.0em;
 }
 
 .table-row-cell: even{
     -fx-background-color: #1dbbdd11;
-    -fx-background-insets: 0, 0 0 1 0;
+    -fx-background-insets: 0.0, 0.0 0.0 1.0 0.0;
     -fx-padding: 0.0em;
 }
 
@@ -150,7 +150,7 @@
 
 .table-view .show-hide-columns-button {
     -fx-background-color: linear-gradient(to bottom, #1dbbdd44, #93f9b944);
-    -fx-background-insets: 2 0 0 2.5;
+    -fx-background-insets: 2.0 0.0 0.0 2.5;
 }
 
 .table-view .virtual-flow .scroll-bar:vertical,
@@ -164,8 +164,8 @@
 
 .table-view .virtual-flow .scroll-bar .increment-button,
 .table-view .virtual-flow .scroll-bar .decrement-button {
-    -fx-opacity: 0;
-    -fx-padding: 2;
+    -fx-opacity: 0.0;
+    -fx-padding: 2.0;
 }
 
 .table-view .virtual-flow .scroll-bar:vertical .thumb {
@@ -187,7 +187,7 @@
 /* Datepicker */
 .date-picker .arrow-button {
 	-fx-background-color: -fx-primary-color;
-	-fx-background-radius: 0;
+	-fx-background-radius: 0.0;
 }
 .date-picker .arrow-button:hover {
 	-fx-background-color: -fx-secondary-color;
@@ -235,4 +235,36 @@
 
 .scroll-pane {
    -fx-background-color: transparent;
-}
+}
+
+.gray-scrollbar .scroll-bar { 
+	-fx-background-color: white;
+}
+
+.gray-scrollbar .scroll-bar:horizontal .track,
+.gray-scrollbar .scroll-bar:vertical .track{
+	-fx-background-color: transparent;
+	-fx-border-color: transparent;
+}
+
+.gray-scrollbar .scroll-bar:horizontal .increment-button ,
+.gray-scrollbar .scroll-bar:horizontal .decrement-button {
+    -fx-background-color: transparent;
+	-fx-padding: 0.0 0.0 10.0 0.0;
+}
+
+.gray-scrollbar .scroll-bar:vertical .increment-button ,
+.gray-scrollbar .scroll-bar:vertical .decrement-button {
+    -fx-background-color: transparent;
+	-fx-padding: 0.0 10.0 0.0 0.0;
+}
+
+.gray-scrollbar .scroll-bar .increment-arrow,
+.gray-scrollbar .scroll-bar .decrement-arrow{
+	-fx-padding: 2.0 0.0 2.0 0.0;
+}
+ 
+.gray-scrollbar .scroll-bar:horizontal .thumb,
+.gray-scrollbar .scroll-bar:vertical .thumb {
+    -fx-background-color: derive(gray,40.0%);
+}
diff --git a/src/main/resources/fxml/AlertLogListViewCell.fxml b/src/main/resources/fxml/AlertLogListViewCell.fxml
diff --git a/src/main/resources/fxml/AlertLogMonitoringMenu.fxml b/src/main/resources/fxml/AlertLogMonitoringMenu.fxml

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ public AlertLog getAlertLogDuringPeriod(AlertLogCommand alc, String startDate, S`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`if (i != readStartIndex) {`
`330`		`- alertLog.addLog(new Log(logTimeStamp, logContents));`
	`330`	`+ alertLog.addLog(new Log(alertLog.getAlertLogs().size(), logTimeStamp, logContents));`
`331`	`331`	`logContents = new ArrayList<>();`
`332`	`332`	`logTimeStamp = line;`
`333`	`333`	`}`