Skip to content

Commit

Permalink
select date for disapproval note added
Browse files Browse the repository at this point in the history
  • Loading branch information
@MikeRaff
MikeRaff committed Dec 3, 2023
1 parent 49e313c commit 1dd90a4
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 20 deletions.
11 changes: 7 additions & 4 deletions src/main/java/ca/mcgill/ecse/assetplus/javafx/controllers/DisapproveWorkController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.DatePicker;
import javafx.scene.control.TextField;
import javafx.scene.layout.AnchorPane;
import java.util.Calendar;
Expand All @@ -29,6 +30,9 @@ public class DisapproveWorkController {
@FXML
private Button updateDisapproveWork;

@FXML
private DatePicker disapproveWorkDate;

@FXML
private AnchorPane disapproveWorkAnchorPane;

Expand All @@ -41,10 +45,9 @@ void cancelDisapproveWorkClicked(ActionEvent event) {
@FXML
void updateDisapproveWorkClicked(ActionEvent event) {
String reason = disapproveWorkComments.getText();
Calendar calendar = Calendar.getInstance();
java.util.Date currentDate = calendar.getTime();
Date today = new Date(currentDate.getTime());
if (successful(AssetPlusTicketingController.disapproveWorkOnMaintenanceTicket(ticketID, today, reason))){
LocalDate theLocalDate = disapproveWorkDate.getValue();
var theDate = Date.valueOf(theLocalDate);
if (successful(AssetPlusTicketingController.disapproveWorkOnMaintenanceTicket(ticketID, theDate, reason))){
disapproveWorkComments.setText("");
sceneSwitch(disapproveWorkAnchorPane, "../pages/TicketsPage.fxml");
}
Expand Down
12 changes: 10 additions & 2 deletions src/main/java/ca/mcgill/ecse/assetplus/javafx/pages/DisapproveWork.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.DatePicker?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?>
Expand All @@ -20,6 +21,7 @@
<rowConstraints>
<RowConstraints maxHeight="128.66668701171875" minHeight="0.0" prefHeight="57.0" valignment="CENTER" />
<RowConstraints maxHeight="247.33332316080725" minHeight="0.0" prefHeight="67.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="247.33332316080725" minHeight="10.0" prefHeight="67.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="220.00003051757812" minHeight="10.0" prefHeight="63.33335367838538" vgrow="SOMETIMES" />
</rowConstraints>
<children>
Expand All @@ -36,17 +38,23 @@
<Font size="18.0" />
</font>
</Label>
<Button fx:id="cancelDisapproveWork" mnemonicParsing="false" onAction="#cancelDisapproveWorkClicked" text="Cancel" GridPane.rowIndex="2">
<Button fx:id="cancelDisapproveWork" mnemonicParsing="false" onAction="#cancelDisapproveWorkClicked" text="Cancel" GridPane.rowIndex="3">
<font>
<Font size="18.0" />
</font>
</Button>
<Button fx:id="updateDisapproveWork" mnemonicParsing="false" onAction="#updateDisapproveWorkClicked" text="Update" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2">
<Button fx:id="updateDisapproveWork" mnemonicParsing="false" onAction="#updateDisapproveWorkClicked" text="Update" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="3">
<font>
<Font size="18.0" />
</font>
</Button>
<TextField fx:id="disapproveWorkComments" maxWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Label text="Comments" textAlignment="CENTER" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
<font>
<Font size="18.0" />
</font>
</Label>
<DatePicker fx:id="disapproveWorkDate" editable="false" GridPane.columnIndex="1" GridPane.rowIndex="2" />
</children>
</GridPane>
</children>
Expand Down
28 changes: 14 additions & 14 deletions src/main/java/ca/mcgill/ecse/assetplus/javafx/pages/TicketsPage.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>

<AnchorPane fx:id="maintenanceTicketsViewAnchorPane" prefHeight="700.0" prefWidth="1030.0" style="-fx-background-color: #FFFFFF;" stylesheets="@../styles.css" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ca.mcgill.ecse.assetplus.javafx.controllers.TicketsPageController">
<AnchorPane fx:id="maintenanceTicketsViewAnchorPane" prefHeight="700.0" prefWidth="1030.0" style="-fx-background-color: #FFFFFF;" stylesheets="@../styles.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ca.mcgill.ecse.assetplus.javafx.controllers.TicketsPageController">
<children>
<VBox layoutX="0.5" layoutY="12.666666984558105" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
Expand Down Expand Up @@ -48,21 +48,21 @@
</GridPane>
<TableView fx:id="ticketsTable" editable="true" prefHeight="590.0" prefWidth="1030.0">
<columns>
<TableColumn fx:id="id" prefWidth="97.0" text="Ticket ID" />
<TableColumn fx:id="status" prefWidth="107.0" text="Status" />
<TableColumn fx:id="raisedOnDate" prefWidth="67.0" text="Date" />
<TableColumn fx:id="description" prefWidth="90.0" text="Description" />
<TableColumn fx:id="floorNumber" prefWidth="66.0" text="Floor Number" />
<TableColumn fx:id="roomNumber" prefWidth="87.0" text="Room Number" />
<TableColumn fx:id="assetName" prefWidth="87.0" text="Asset Name" />
<TableColumn fx:id="imageURLs" prefWidth="102.0" text="Image URLs" />
<TableColumn fx:id="raisedByEmail" prefWidth="146.0" text="Raised by" />
<TableColumn fx:id="priority" prefWidth="84.0" text="Priority" />
<TableColumn fx:id="fixedByEmail" prefWidth="84.0" text="Fixer" />
<TableColumn fx:id="timeToResolve" prefWidth="84.0" text="Time to Resolve" />
<TableColumn fx:id="id" prefWidth="67.8063440322876" text="Ticket ID" />
<TableColumn fx:id="status" prefWidth="74.80633544921875" text="Status" />
<TableColumn fx:id="raisedOnDate" prefWidth="103.17424011230469" text="Date" />
<TableColumn fx:id="description" prefWidth="124.82577514648438" text="Description" />
<TableColumn fx:id="floorNumber" prefWidth="88.85818481445312" text="Floor Number" />
<TableColumn fx:id="roomNumber" prefWidth="96.03237915039062" text="Room Number" />
<TableColumn fx:id="assetName" prefWidth="83.5291748046875" text="Asset Name" />
<TableColumn fx:id="imageURLs" prefWidth="86.1806640625" text="Image URLs" />
<TableColumn fx:id="raisedByEmail" prefWidth="99.8193359375" text="Raised by" />
<TableColumn fx:id="priority" prefWidth="71.62554931640625" text="Priority" />
<TableColumn fx:id="fixedByEmail" prefWidth="107.09954833984375" text="Fixer" />
<TableColumn fx:id="timeToResolve" prefWidth="106.90057373046875" text="Time to Resolve" />
<TableColumn fx:id="approvalRequired" prefWidth="84.0" text="Approval Required" />
<TableColumn fx:id="expectLifeSpanInDays" prefWidth="84.0" text="Life Span" />
<TableColumn fx:id="notes" prefWidth="84.0" text="Notes" />
<TableColumn fx:id="notes" prefWidth="850.0" text="Notes" />
</columns>
</TableView>
<GridPane prefHeight="99.0" prefWidth="1030.0">
Expand Down

0 comments on commit 1dd90a4

Please sign in to comment.