From 7f80056c779f67f6dadf78d9fcc1b44d057f46a6 Mon Sep 17 00:00:00 2001 From: SHININGGGG Date: Tue, 6 Nov 2018 14:05:13 +0800 Subject: [PATCH 1/6] [Calendar] ui update --- .../java/seedu/address/ui/CalendarPanel.java | 136 ++++++++++++------ .../java/seedu/address/ui/MainWindow.java | 11 +- src/main/resources/view/CalendarPanel.fxml | 121 +--------------- src/main/resources/view/MainWindow.fxml | 10 +- 4 files changed, 111 insertions(+), 167 deletions(-) diff --git a/src/main/java/seedu/address/ui/CalendarPanel.java b/src/main/java/seedu/address/ui/CalendarPanel.java index c738235d4c56..d5db8c066429 100644 --- a/src/main/java/seedu/address/ui/CalendarPanel.java +++ b/src/main/java/seedu/address/ui/CalendarPanel.java @@ -1,13 +1,22 @@ +//@@author SHININGGGG package seedu.address.ui; +import java.time.format.DateTimeFormatter; +import java.time.LocalDateTime; + import java.util.Calendar; import java.util.logging.Logger; +import javafx.scene.text.Font; +import javafx.scene.text.FontWeight; +import javafx.scene.text.FontPosture; +import javafx.scene.text.Text; import javafx.fxml.FXML; -import javafx.scene.control.Label; import javafx.scene.layout.GridPane; - +import javafx.scene.paint.Color; import javafx.scene.layout.Region; +import javafx.geometry.Pos; + import seedu.address.commons.core.LogsCenter; import seedu.address.model.CalendarInfo; @@ -24,22 +33,87 @@ public class CalendarPanel extends UiPart { private int firstDay; @FXML - private GridPane calendarView = new GridPane(); + private Text currentDate; @FXML - private Label date1; + private GridPane calendarView; public CalendarPanel() { super(FXML); calendar = calendarInfo.getCalendar(); - firstDay = calendarInfo.firstDay; - setGridPane(calendar); + firstDay = calendarInfo.firstDay - 1; + setCurrentDate(); + //String stringFirstDay = Integer.toString(firstDay); + //setCalendar(calendar); + //calendar = Calendar.getInstance(); + setCalendar(calendar); registerAsAnEventHandler(this); } - private void setGridPane (Calendar calendar) { + private void setCurrentDate () { + + //Text currentDate = new Text(); + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDateTime now = LocalDateTime.now(); + currentDate.setText("\n " + dtf.format(now)); + currentDate.setFont(Font.font("verdana", FontWeight.BOLD, FontPosture.REGULAR, 15)); + currentDate.setFill(Color.ORANGE); + //currentDate.setLayoutY(20); + //currentDate.setLayoutX(0); + //currentDate.setLayoutY(0); + } + + private void setCalendar (Calendar calendar) { + System.out.println("The first day of the whole month is " + firstDay); + calendarView.setMinSize(200, 200); + calendarView.setVgap(30); + calendarView.setHgap(20); + calendarView.setAlignment(Pos.CENTER); + + + //calendarView.add(currentDate, 3, 0); + + for (int j = 0; j < 7; j++) { + if (j == 0) { + Text text = new Text("Sun"); + text.setFont(Font.font("verdana", FontWeight.BOLD, FontPosture.REGULAR, 20)); + text.setFill(Color.WHEAT); + calendarView.add(text, 0, 0); + } else if (j == 1) { + Text text = new Text("Mon"); + text.setFont(Font.font("verdana", FontWeight.BOLD, FontPosture.REGULAR, 20)); + text.setFill(Color.WHEAT); + calendarView.add(text, 1, 0); + } else if (j == 2) { + Text text = new Text("Tue"); + text.setFont(Font.font("verdana", FontWeight.BOLD, FontPosture.REGULAR, 20)); + text.setFill(Color.WHEAT); + calendarView.add(text, 2, 0); + } else if (j == 3) { + Text text = new Text("Wed"); + text.setFont(Font.font("verdana", FontWeight.BOLD, FontPosture.REGULAR, 20)); + text.setFill(Color.WHEAT); + calendarView.add(text, 3, 0); + } else if (j == 4) { + Text text = new Text("Thur"); + text.setFont(Font.font("verdana", FontWeight.BOLD, FontPosture.REGULAR, 20)); + text.setFill(Color.WHEAT); + calendarView.add(text, 4, 0); + } else if (j == 5) { + Text text = new Text("Fri"); + text.setFont(Font.font("verdana", FontWeight.BOLD, FontPosture.REGULAR, 20)); + text.setFill(Color.WHEAT); + calendarView.add(text, 5, 0); + } else if (j == 6) { + Text text = new Text("Sat"); + text.setFont(Font.font("verdana", FontWeight.BOLD, FontPosture.REGULAR, 20)); + text.setFill(Color.WHEAT); + calendarView.add(text, 6, 0); + } else {} + } + int numOfDays; - int week; + int week = 1; int day = firstDay; if (calendar.get(Calendar.MONTH) == Calendar.JANUARY || calendar.get(Calendar.MONTH) == Calendar.MARCH @@ -54,43 +128,17 @@ private void setGridPane (Calendar calendar) { } else { numOfDays = 30; } - //for (int i = 0; i < numOfDays; i++) { - week = calendar.get(Calendar.WEEK_OF_MONTH); - calendar.set(Calendar.DAY_OF_MONTH, 1); - date1.setText(Integer.toString(1)); - calendarView.add(date1, (day % 7), week); - day++; - //} - } - /* - private void setEventHandlerForSelectionChangeEvent() { - calendarView.getSelectionModel().selectedItemProperty() - .addListener((observable, oldValue, newValue) -> { - if (newValue != null) { - logger.fine("Selection in person list panel changed to : '" + newValue + "'"); - raise(new PersonPanelSelectionChangedEvent(newValue)); - } - }); - } - */ - - /** - * Custom {@code ListCell} that displays the graphics of a {@code Person} using a {@code PersonCard}. - */ - /* - class PersonListViewCell extends ListCell { - @Override - protected void updateItem(Person person, boolean empty) { - super.updateItem(person, empty); - - if (empty || person == null) { - setGraphic(null); - setText(null); - } else { - setGraphic(new PersonCard(person, getIndex() + 1).getRoot()); + + for (int i = 1; i <= numOfDays; i++) { + Text text = new Text(Integer.toString(i)); + text.setFont(Font.font("verdana", FontWeight.BOLD, FontPosture.REGULAR, 20)); + text.setFill(Color.WHEAT); + calendarView.add(text, day, week); + day = (day + 1) % 7; + if (day == 0) { + week++; } } - } - */ + } } diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/seedu/address/ui/MainWindow.java index e23ce9fd1c46..2c54f040b24a 100644 --- a/src/main/java/seedu/address/ui/MainWindow.java +++ b/src/main/java/seedu/address/ui/MainWindow.java @@ -6,11 +6,11 @@ import javafx.event.ActionEvent; import javafx.fxml.FXML; +import javafx.scene.Node; import javafx.scene.control.MenuItem; import javafx.scene.control.TextInputControl; import javafx.scene.input.KeyCombination; import javafx.scene.input.KeyEvent; -import javafx.scene.layout.GridPane; import javafx.scene.layout.StackPane; import javafx.stage.Stage; import seedu.address.commons.core.Config; @@ -53,7 +53,7 @@ public class MainWindow extends UiPart { private StackPane browserPlaceholder; @FXML - private GridPane calendarPlaceholder; + private StackPane calendarPlaceholder; @FXML private StackPane commandBoxPlaceholder; @@ -141,7 +141,8 @@ void fillInnerParts() { //browserPlaceholder.getChildren().add(browserPanel.getRoot()); calendarPanel = new CalendarPanel(); - calendarPlaceholder.getChildren().add(calendarPanel.getRoot()); + Node x = calendarPanel.getRoot(); + calendarPlaceholder.getChildren().add(x); expenditureListPanel = new ExpenditureListPanel(logic.getFilteredExpenditureList()); expenditureListPanelPlaceholder.getChildren().add(expenditureListPanel.getRoot()); @@ -228,6 +229,10 @@ public ExpenditureListPanel getExpenditureListPanel() { return expenditureListPanel; } + public CalendarPanel getCalendarPanel() { + return calendarPanel; + } + void releaseResources() { browserPanel.freeResources(); } diff --git a/src/main/resources/view/CalendarPanel.fxml b/src/main/resources/view/CalendarPanel.fxml index fbe5fb8dbae3..3a81bea6225f 100644 --- a/src/main/resources/view/CalendarPanel.fxml +++ b/src/main/resources/view/CalendarPanel.fxml @@ -8,118 +8,9 @@ - - - - - + + + diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml index 93b6637f14a2..82c8b4b27610 100644 --- a/src/main/resources/view/MainWindow.fxml +++ b/src/main/resources/view/MainWindow.fxml @@ -48,21 +48,21 @@ - + - + + + - - - + From 08b9b83de8ce1faa000b145edbdcda1973cff514 Mon Sep 17 00:00:00 2001 From: SHININGGGG Date: Tue, 6 Nov 2018 14:21:55 +0800 Subject: [PATCH 2/6] Travis build error fix --- .../java/seedu/address/ui/CalendarPanel.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/seedu/address/ui/CalendarPanel.java b/src/main/java/seedu/address/ui/CalendarPanel.java index d5db8c066429..ba475f02eb76 100644 --- a/src/main/java/seedu/address/ui/CalendarPanel.java +++ b/src/main/java/seedu/address/ui/CalendarPanel.java @@ -7,15 +7,15 @@ import java.util.Calendar; import java.util.logging.Logger; +import javafx.fxml.FXML; +import javafx.geometry.Pos; +import javafx.scene.layout.GridPane; +import javafx.scene.layout.Region; +import javafx.scene.paint.Color; import javafx.scene.text.Font; import javafx.scene.text.FontWeight; import javafx.scene.text.FontPosture; import javafx.scene.text.Text; -import javafx.fxml.FXML; -import javafx.scene.layout.GridPane; -import javafx.scene.paint.Color; -import javafx.scene.layout.Region; -import javafx.geometry.Pos; import seedu.address.commons.core.LogsCenter; import seedu.address.model.CalendarInfo; @@ -56,7 +56,7 @@ private void setCurrentDate () { DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); LocalDateTime now = LocalDateTime.now(); currentDate.setText("\n " + dtf.format(now)); - currentDate.setFont(Font.font("verdana", FontWeight.BOLD, FontPosture.REGULAR, 15)); + currentDate.setFont(Font.font("verdana", FontWeight.BOLD, FontPosture.REGULAR, 15)); currentDate.setFill(Color.ORANGE); //currentDate.setLayoutY(20); //currentDate.setLayoutX(0); @@ -104,12 +104,12 @@ private void setCalendar (Calendar calendar) { text.setFont(Font.font("verdana", FontWeight.BOLD, FontPosture.REGULAR, 20)); text.setFill(Color.WHEAT); calendarView.add(text, 5, 0); - } else if (j == 6) { + } else { Text text = new Text("Sat"); text.setFont(Font.font("verdana", FontWeight.BOLD, FontPosture.REGULAR, 20)); text.setFill(Color.WHEAT); calendarView.add(text, 6, 0); - } else {} + } } int numOfDays; From 06bb6218ac5d1d3401a8c5c78b0c881a383aa802 Mon Sep 17 00:00:00 2001 From: SHININGGGG Date: Tue, 6 Nov 2018 14:31:07 +0800 Subject: [PATCH 3/6] Travis build error fix --- src/main/java/seedu/address/ui/CalendarPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/seedu/address/ui/CalendarPanel.java b/src/main/java/seedu/address/ui/CalendarPanel.java index ba475f02eb76..18584c4ad140 100644 --- a/src/main/java/seedu/address/ui/CalendarPanel.java +++ b/src/main/java/seedu/address/ui/CalendarPanel.java @@ -1,8 +1,8 @@ //@@author SHININGGGG package seedu.address.ui; -import java.time.format.DateTimeFormatter; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.Calendar; import java.util.logging.Logger; From bc41185fbe8ad85073ad2646587dca1f9e52e90a Mon Sep 17 00:00:00 2001 From: SHININGGGG Date: Tue, 6 Nov 2018 14:37:14 +0800 Subject: [PATCH 4/6] Travis build error fix --- src/main/java/seedu/address/ui/CalendarPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/seedu/address/ui/CalendarPanel.java b/src/main/java/seedu/address/ui/CalendarPanel.java index 18584c4ad140..067e3a76cbec 100644 --- a/src/main/java/seedu/address/ui/CalendarPanel.java +++ b/src/main/java/seedu/address/ui/CalendarPanel.java @@ -13,8 +13,8 @@ import javafx.scene.layout.Region; import javafx.scene.paint.Color; import javafx.scene.text.Font; -import javafx.scene.text.FontWeight; import javafx.scene.text.FontPosture; +import javafx.scene.text.FontWeight; import javafx.scene.text.Text; import seedu.address.commons.core.LogsCenter; From a9e03d01c3a373c4376b3d33704031cb85e28ed3 Mon Sep 17 00:00:00 2001 From: SHININGGGG Date: Tue, 6 Nov 2018 14:46:28 +0800 Subject: [PATCH 5/6] Codacy build error fix --- src/main/java/seedu/address/ui/CalendarPanel.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/seedu/address/ui/CalendarPanel.java b/src/main/java/seedu/address/ui/CalendarPanel.java index 067e3a76cbec..be16deb446a8 100644 --- a/src/main/java/seedu/address/ui/CalendarPanel.java +++ b/src/main/java/seedu/address/ui/CalendarPanel.java @@ -63,14 +63,12 @@ private void setCurrentDate () { //currentDate.setLayoutY(0); } - private void setCalendar (Calendar calendar) { - System.out.println("The first day of the whole month is " + firstDay); + private void setOverview() { + //System.out.println("The first day of the whole month is " + firstDay); calendarView.setMinSize(200, 200); calendarView.setVgap(30); calendarView.setHgap(20); calendarView.setAlignment(Pos.CENTER); - - //calendarView.add(currentDate, 3, 0); for (int j = 0; j < 7; j++) { @@ -111,6 +109,9 @@ private void setCalendar (Calendar calendar) { calendarView.add(text, 6, 0); } } + } + + private void setDays () { int numOfDays; int week = 1; @@ -139,6 +140,10 @@ private void setCalendar (Calendar calendar) { week++; } } + } + private void setCalendar (Calendar calendar) { + setOverview(); + setDays(); } } From 22e5ed8b8c9f11e7f15529b92a575d6fd0dc752e Mon Sep 17 00:00:00 2001 From: SHININGGGG Date: Tue, 6 Nov 2018 15:01:13 +0800 Subject: [PATCH 6/6] Codacy build error fix --- src/main/java/seedu/address/ui/CalendarPanel.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/seedu/address/ui/CalendarPanel.java b/src/main/java/seedu/address/ui/CalendarPanel.java index be16deb446a8..3b276e972b2e 100644 --- a/src/main/java/seedu/address/ui/CalendarPanel.java +++ b/src/main/java/seedu/address/ui/CalendarPanel.java @@ -43,10 +43,7 @@ public CalendarPanel() { calendar = calendarInfo.getCalendar(); firstDay = calendarInfo.firstDay - 1; setCurrentDate(); - //String stringFirstDay = Integer.toString(firstDay); - //setCalendar(calendar); - //calendar = Calendar.getInstance(); - setCalendar(calendar); + setCalendar(); registerAsAnEventHandler(this); } @@ -142,7 +139,7 @@ private void setDays () { } } - private void setCalendar (Calendar calendar) { + private void setCalendar () { setOverview(); setDays(); }