Skip to content

Commit

Permalink
Merge pull request #199 from qjie7/master
Browse files Browse the repository at this point in the history 
Added Assign task tab , as well as assign deadline task
  • Loading branch information
@qjie7
qjie7 authored Oct 30, 2019
2 parents fffc6ed + c407b4b commit 7849a50
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 25 deletions.
51 changes: 45 additions & 6 deletions src/main/java/duke/gui/MainWindow.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,12 @@ public class MainWindow extends AnchorPane {
@FXML
private DatePicker assignTaskEndDatePicker;
@FXML
private DatePicker assignDeadlineTaskDatePicker;
@FXML
private TextField assignDeadlineTaskTimeField;
@FXML
private TextField assignTaskUuidField;
@FXML
private VBox helpGuideContainer;
String currentDir = System.getProperty("user.dir");

Expand Down Expand Up @@ -169,7 +175,7 @@ private void handleUserInput() {

//@@author qjie7
/**
* Event handler of PieChartPopUpButton.
* Action takes to after Undo button is being pressed.
*/
public void handleUndoButton() {
executeDukeWithInput("undo");
Expand Down Expand Up @@ -285,15 +291,15 @@ private void handleDeletePatientButton() {
}

/**
* Action takes to after add patient button is being pressed.
* Action takes to after list patients button is being pressed.
*/
@FXML
private void handleListPatientsButton() {
executeDukeWithInput("list patients");
}

/**
* Action takes to after add patient button is being pressed.
* Action takes to after add task button is being pressed.
*/
@FXML
private void handleAddTaskButton() {
Expand All @@ -304,7 +310,7 @@ private void handleAddTaskButton() {
}

/**
* Action takes to after add patient button is being pressed.
* Action takes to after delete task button is being pressed.
*/
@FXML
private void handleDeleteTaskButton() {
Expand All @@ -315,15 +321,15 @@ private void handleDeleteTaskButton() {
}

/**
* Action takes to after add patient button is being pressed.
* Action takes to after list task button is being pressed.
*/
@FXML
private void handleListTasksButton() {
executeDukeWithInput("list tasks");
}

/**
* Action takes to after add patient button is being pressed.
* Action takes to after Assign Period Task button is being pressed.
*/
@FXML
private void handleAssignTaskButton() {
Expand All @@ -344,6 +350,39 @@ private void handleAssignTaskButton() {
assignTaskStartTimeField.clear();
assignTaskEndTimeField.clear();
}

/**
* Action takes to after Assign Deadline Task button is being pressed.
*/
@FXML
private void handleDeadlineTaskButton() {
String taskId = assignTaskIdField.getText();
String patientId = assignTaskPatientIdField.getText();
LocalDate deadlineDate = assignDeadlineTaskDatePicker.getValue();

String deadlineDateInString = deadlineDate.format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));

String deadlineTime = assignDeadlineTaskTimeField.getText();
String input = "assign deadline task :" + "#" + patientId + " :"
+ "#" + taskId + " :" + deadlineDateInString + " " + deadlineTime;
executeDukeWithInput(input);
assignTaskIdField.clear();
assignTaskPatientIdField.clear();
assignDeadlineTaskTimeField.clear();
}

/**
* Action takes to after Delete Assign task button is being pressed.
*/
@FXML
private void handleDeleteUuidTaskButton() {
String uuid = assignTaskUuidField.getText();

String input = "delete assigned task :" + "#" + uuid;
executeDukeWithInput(input);
assignTaskUuidField.clear();

}
//@@author


Expand Down
65 changes: 46 additions & 19 deletions src/main/resources/view/MainWindow.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,33 +190,60 @@
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
<children>
<Text layoutX="24.0" layoutY="34.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Task Command Shortcut" wrappingWidth="224.22900390625" AnchorPane.rightAnchor="24.77099609375">
<Text layoutX="20.0" layoutY="33.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Task Command Shortcut" wrappingWidth="224.22900390625" AnchorPane.rightAnchor="28.77099609375">
<font>
<Font size="20.0" />
</font>
</Text>
<Text layoutX="14.0" layoutY="75.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Task Name:" AnchorPane.bottomAnchor="626.689453125" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="193.87939453125" AnchorPane.topAnchor="62.0" />
<TextField fx:id="addTaskNameField" layoutX="88.0" layoutY="57.0" promptText="Enter Task Name Here" AnchorPane.bottomAnchor="620.0" AnchorPane.leftAnchor="88.0" AnchorPane.rightAnchor="24.5" AnchorPane.topAnchor="57.0" />
<Button layoutX="17.0" layoutY="99.0" mnemonicParsing="false" onAction="#handleAddTaskButton" prefHeight="27.0" prefWidth="227.0" text="Add Task" AnchorPane.bottomAnchor="578.0" AnchorPane.leftAnchor="17.0" AnchorPane.rightAnchor="29.0" AnchorPane.topAnchor="99.0" />
<Text layoutX="14.0" layoutY="169.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Task ID :" AnchorPane.bottomAnchor="532.2578125" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="212.18603515625" AnchorPane.topAnchor="154.7421875" />
<TextField fx:id="deleteTaskIdField" layoutX="79.0" layoutY="151.0" promptText="Enter Task ID Here" AnchorPane.bottomAnchor="526.0" AnchorPane.leftAnchor="79.0" AnchorPane.rightAnchor="33.5" AnchorPane.topAnchor="151.0" />
<Button layoutX="19.0" layoutY="193.0" mnemonicParsing="false" onAction="#handleDeleteTaskButton" prefHeight="27.0" prefWidth="227.0" text="Delete Task" AnchorPane.bottomAnchor="484.0" AnchorPane.leftAnchor="19.0" AnchorPane.rightAnchor="27.0" AnchorPane.topAnchor="193.0" />
<Button layoutX="70.0" layoutY="518.0" mnemonicParsing="false" onAction="#handleListTasksButton" prefHeight="68.0" prefWidth="134.0" text="List Tasks" AnchorPane.leftAnchor="70.0" />
<Text layoutX="13.0" layoutY="313.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Assign to:" AnchorPane.bottomAnchor="387.0" AnchorPane.leftAnchor="13.0" AnchorPane.rightAnchor="206.2734375" AnchorPane.topAnchor="300.0" />
<TextField fx:id="assignTaskPatientIdField" layoutX="73.0" layoutY="295.0" promptText="Enter Patient ID Here" AnchorPane.bottomAnchor="382.0" AnchorPane.leftAnchor="73.0" AnchorPane.rightAnchor="39.5" AnchorPane.topAnchor="295.0" />
<Text layoutX="17.0" layoutY="276.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Task ID:" AnchorPane.bottomAnchor="425.2578125" AnchorPane.leftAnchor="17.0" AnchorPane.rightAnchor="211.85205078125" AnchorPane.topAnchor="263.431640625" />
<TextField fx:id="assignTaskIdField" layoutX="72.0" layoutY="258.0" prefHeight="27.0" prefWidth="162.0" promptText="Enter Task ID Here" AnchorPane.bottomAnchor="419.0" AnchorPane.leftAnchor="72.0" AnchorPane.rightAnchor="39.0" AnchorPane.topAnchor="258.0" />
<Text layoutX="15.0" layoutY="366.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Start:" />
<Text layoutX="17.0" layoutY="403.0" strokeType="OUTSIDE" strokeWidth="0.0" text="End:" AnchorPane.bottomAnchor="297.0" AnchorPane.leftAnchor="17.0" AnchorPane.rightAnchor="231.47265625" AnchorPane.topAnchor="390.0" />
<Button layoutX="20.0" layoutY="435.0" mnemonicParsing="false" onAction="#handleAssignTaskButton" prefHeight="27.0" prefWidth="228.0" text="Assign Task" AnchorPane.bottomAnchor="242.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="25.0" AnchorPane.topAnchor="435.0" />
<DatePicker fx:id="assignTaskStartDatePicker" layoutX="59.0" layoutY="348.0" prefHeight="27.0" prefWidth="89.0" promptText="Date" AnchorPane.bottomAnchor="329.0" AnchorPane.leftAnchor="59.0" AnchorPane.rightAnchor="125.0" AnchorPane.topAnchor="348.0" />
<DatePicker fx:id="assignTaskEndDatePicker" layoutX="59.0" layoutY="385.0" prefHeight="27.0" prefWidth="89.0" promptText="Date" AnchorPane.bottomAnchor="292.0" AnchorPane.leftAnchor="59.0" AnchorPane.rightAnchor="125.0" AnchorPane.topAnchor="385.0" />
<TextField fx:id="assignTaskStartTimeField" layoutX="159.0" layoutY="348.0" prefHeight="27.0" prefWidth="82.0" promptText="Time" AnchorPane.bottomAnchor="329.0" AnchorPane.leftAnchor="159.0" AnchorPane.rightAnchor="32.0" AnchorPane.topAnchor="348.0" />
<TextField fx:id="assignTaskEndTimeField" layoutX="160.0" layoutY="385.0" prefHeight="27.0" prefWidth="83.0" promptText="Time" AnchorPane.leftAnchor="159.0" />
<Text layoutX="14.0" layoutY="105.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Task Name:" AnchorPane.bottomAnchor="596.2578125" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="193.87939453125" AnchorPane.topAnchor="92.431640625" />
<TextField fx:id="addTaskNameField" layoutX="88.0" layoutY="87.0" promptText="Enter Task Name Here" AnchorPane.bottomAnchor="590.0" AnchorPane.leftAnchor="88.0" AnchorPane.rightAnchor="24.5" AnchorPane.topAnchor="87.0" />
<Button layoutX="18.0" layoutY="129.0" mnemonicParsing="false" onAction="#handleAddTaskButton" prefHeight="27.0" prefWidth="227.0" text="Add Task" AnchorPane.bottomAnchor="548.0" AnchorPane.leftAnchor="18.0" AnchorPane.rightAnchor="28.0" AnchorPane.topAnchor="129.0" />
<Text layoutX="14.0" layoutY="202.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Task ID :" AnchorPane.bottomAnchor="499.2578125" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="212.18603515625" AnchorPane.topAnchor="189.431640625" />
<TextField fx:id="deleteTaskIdField" layoutX="88.0" layoutY="184.0" promptText="Enter Task ID Here" AnchorPane.bottomAnchor="493.0" AnchorPane.leftAnchor="88.0" AnchorPane.rightAnchor="24.5" AnchorPane.topAnchor="184.0" />
<Button layoutX="18.0" layoutY="223.0" mnemonicParsing="false" onAction="#handleDeleteTaskButton" prefHeight="27.0" prefWidth="227.0" text="Delete Task" AnchorPane.bottomAnchor="454.0" AnchorPane.leftAnchor="18.0" AnchorPane.rightAnchor="28.0" AnchorPane.topAnchor="223.0" />
<Button layoutX="65.0" layoutY="299.0" mnemonicParsing="false" onAction="#handleListTasksButton" prefHeight="68.0" prefWidth="134.0" text="List Tasks" AnchorPane.leftAnchor="65.0" />
<Separator layoutX="32.0" layoutY="279.0" prefWidth="217.0" />
<Separator layoutX="32.0" layoutY="178.0" prefWidth="200.0" />
<Separator layoutX="31.0" layoutY="65.0" prefWidth="200.0" />
</children>
</AnchorPane>
</content>
</Tab>
<Tab text="Assign Task">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
<children>
<Button layoutX="20.0" layoutY="298.0" mnemonicParsing="false" onAction="#handleAssignTaskButton" prefHeight="27.0" prefWidth="234.0" text="Assign Period Task" />
<Text layoutX="15.0" layoutY="111.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Task ID:" wrappingWidth="49.22900390625" />
<TextField fx:id="assignTaskIdField" layoutX="94.0" layoutY="93.0" promptText="Enter Task ID Here" />
<Text layoutX="17.0" layoutY="150.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Assign to:" wrappingWidth="63.0" />
<TextField fx:id="assignTaskPatientIdField" layoutX="94.0" layoutY="132.0" promptText="Enter Patient Name Here" />
<Text layoutX="8.0" layoutY="225.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Start:" wrappingWidth="43.376953125" />
<Text layoutX="15.0" layoutY="268.0" strokeType="OUTSIDE" strokeWidth="0.0" text="End:" />
<TextField fx:id="assignTaskStartTimeField" layoutX="191.0" layoutY="207.0" prefHeight="27.0" prefWidth="63.0" promptText="Time" />
<TextField fx:id="assignTaskEndTimeField" layoutX="191.0" layoutY="255.0" prefHeight="27.0" prefWidth="63.0" promptText="Time" />
<DatePicker fx:id="assignTaskStartDatePicker" layoutX="51.0" layoutY="207.0" prefHeight="27.0" prefWidth="126.0" promptText="Date" />
<DatePicker fx:id="assignTaskEndDatePicker" layoutX="51.0" layoutY="255.0" prefHeight="27.0" prefWidth="126.0" promptText="Date" />
<Text layoutX="82.0" layoutY="372.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Set Deadline Here" wrappingWidth="110.0" />
<DatePicker fx:id="assignDeadlineTaskDatePicker" layoutX="20.0" layoutY="388.0" prefHeight="27.0" prefWidth="158.0" promptText="Date" />
<Button layoutX="20.0" layoutY="438.0" mnemonicParsing="false" onAction="#handleDeadlineTaskButton" prefHeight="27.0" prefWidth="234.0" text="Assign Deadline Task" />
<TextField fx:id="assignDeadlineTaskTimeField" layoutX="191.0" layoutY="388.0" prefHeight="27.0" prefWidth="63.0" promptText="Time" />
<Button layoutX="20.0" layoutY="543.0" mnemonicParsing="false" onAction="#handleDeleteUuidTaskButton" prefHeight="22.0" prefWidth="233.0" text="Delete Assign Task " />
<TextField fx:id="assignTaskUuidField" layoutX="94.0" layoutY="504.0" promptText="Enter UUID Here" />
<Text layoutX="30.0" layoutY="522.0" strokeType="OUTSIDE" strokeWidth="0.0" text="UUID:" wrappingWidth="37.22900390625" />
<Text layoutX="8.0" layoutY="32.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Assign Task Command Shortcut" wrappingWidth="274.22900390625">
<font>
<Font size="19.0" />
</font>
</Text>
<Separator layoutX="37.0" layoutY="66.0" prefWidth="200.0" />
<Separator layoutX="37.0" layoutY="181.0" prefWidth="200.0" />
<Separator layoutX="45.0" layoutY="342.0" prefWidth="200.0" />
<Separator layoutX="45.0" layoutY="489.0" prefWidth="200.0" />
</children>
</AnchorPane>
</content>
</Tab>
<Tab text="Statistic">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
Expand Down

0 comments on commit 7849a50

Please sign in to comment.