Skip to content

Commit

Permalink
repush roomsetting
Browse files Browse the repository at this point in the history
  • Loading branch information
@anns318
anns318 committed Feb 26, 2022
1 parent cfb14c2 commit 4d5def9
Show file tree
Hide file tree
Showing 16 changed files with 300 additions and 230 deletions.
2 changes: 1 addition & 1 deletion connection.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Hostname=localhost
DatabaseName=LotusHotel
SQLUser=sa
SQLPassword=123456
SQLPassword=an310898
Binary file modified out/production/ProjectJava15/controller/CheckinRoomController$12.class
View file
Binary file not shown.
Binary file modified out/production/ProjectJava15/controller/CheckinRoomController.class
View file
Binary file not shown.
Binary file modified out/production/ProjectJava15/controller/CheckoutController$1.class
View file
Binary file not shown.
Binary file modified out/production/ProjectJava15/controller/CheckoutController$2.class
View file
Binary file not shown.
Binary file modified out/production/ProjectJava15/controller/CheckoutController$3.class
View file
Binary file not shown.
Binary file modified out/production/ProjectJava15/controller/CheckoutController$4.class
View file
Binary file not shown.
Binary file modified out/production/ProjectJava15/controller/CheckoutController$5.class
View file
Binary file not shown.
Binary file modified out/production/ProjectJava15/controller/CheckoutController.class
View file
Binary file not shown.
Binary file modified out/production/ProjectJava15/controller/RoomMapController.class
View file
Binary file not shown.
113 changes: 0 additions & 113 deletions out/production/ProjectJava15/resources/styles/setButton.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#9d4024,
#d86e3a,
radial-gradient(center 50% 50%, radius 100%, #ea7f4b, #c54e2c);
-fx-text-fill: #3f3b3b;
}
.set-btn:pressed{
-fx-padding: 8 15 10 15;
Expand Down Expand Up @@ -50,115 +49,3 @@
-fx-padding: 8 8 10 8;
-fx-background-insets: 2 0 0 0,2 0 3 0, 2 0 4 0, 2 0 5 0;
}

/*button Add in service*/
.set-type2-btnSVAdd{
-fx-padding: 6 8 12 8;
-fx-background-insets: 0,0 0 5 0, 0 0 6 0, 0 0 7 0;
-fx-background-radius: 8;
-fx-background-color:
linear-gradient(from 0% 93% to 0% 100%, #2a3 0%, #2a3 100%),
#2a3,
#2a3,
radial-gradient(center 50% 50%, radius 100%, #9ae9a0, #2a3);
-fx-effect: dropshadow( gaussian , rgba(0,0,0,0.75) , 4,0,0,1 );
-fx-font-weight: bold;
-fx-font-size: 1.1em;
-fx-text-fill: White;
}
.set-type2-btnSVAdd:hover{
-fx-background-color:
linear-gradient(from 0% 93% to 0% 100%, #4fd158 0%, #5d6 100%),
#4fd158,
#5d6,
radial-gradient(center 50% 50%, radius 100%, #9ee6a3, #aea);
-fx-text-fill: #3f3b3b;
}
.set-type2-btnSVAdd:pressed{
-fx-padding: 8 8 10 8;
-fx-background-insets: 2 0 0 0,2 0 3 0, 2 0 4 0, 2 0 5 0;
}
/*button Edit in service*/
.set-type2-btnSVEdit{
-fx-padding: 6 8 12 8;
-fx-background-insets: 0,0 0 5 0, 0 0 6 0, 0 0 7 0;
-fx-background-radius: 8;
-fx-background-color:
linear-gradient(from 0% 93% to 0% 100%, #c99b23 0%, #da2 100%),
#f8d068,
#f8d068,
radial-gradient(center 50% 50%, radius 100%, #f8d068, #fd7);
-fx-effect: dropshadow( gaussian , rgba(0,0,0,0.75) , 4,0,0,1 );
-fx-font-weight: bold;
-fx-font-size: 1.1em;
-fx-text-fill: White;
}
.set-type2-btnSVEdit:hover{
-fx-background-color:
linear-gradient(from 0% 93% to 0% 100%, #e4c134 0%, #ec3 100%),
#e4c134,
#e4c134,
radial-gradient(center 50% 50%, radius 100%,
#f0d89b, #fea);
-fx-text-fill: #3f3b3b;
}
.set-type2-btnSVEdit:pressed{
-fx-padding: 8 8 10 8;
-fx-background-insets: 2 0 0 0,2 0 3 0, 2 0 4 0, 2 0 5 0;
}
/*button Delete in service*/
.set-type2-btnSVDelete{
-fx-padding: 6 8 12 8;
-fx-background-insets: 0,0 0 5 0, 0 0 6 0, 0 0 7 0;
-fx-background-radius: 8;
-fx-background-color:
linear-gradient(from 0% 93% to 0% 100%, #c52a2a 0%, #c33 100%),
#c52a2a,
#c33,
radial-gradient(center 50% 50%, radius 100%, #ff4646, #f44);
-fx-effect: dropshadow( gaussian , rgba(0,0,0,0.75) , 4,0,0,1 );
-fx-font-weight: bold;
-fx-font-size: 1.1em;
-fx-text-fill: White;
}
.set-type2-btnSVDelete:hover{
-fx-background-color:
linear-gradient(from 0% 93% to 0% 100%,
#df2d2d 0%, #e33 100%),
#e33,
#e33,
radial-gradient(center 50% 50%, radius 100%,
#ee5c5c, #f66);
-fx-text-fill: #3f3b3b;
}
.set-type2-btnSVDelete:pressed{
-fx-padding: 8 8 10 8;
-fx-background-insets: 2 0 0 0,2 0 3 0, 2 0 4 0, 2 0 5 0;
}
/*Button refresh in service*/
.set-type2-btnSVRefresh{
-fx-padding: 6 8 12 8;
-fx-background-insets: 0,0 0 5 0, 0 0 6 0, 0 0 7 0;
-fx-background-radius: 8;
-fx-background-color:
linear-gradient(from 0% 93% to 0% 100%, #2e88c5 0%, #2979af 100%),
#3498db,
#70b6e5,
radial-gradient(center 50% 50%, radius 100%, #70b6e5, #48a2de);
-fx-effect: dropshadow( gaussian , rgba(0,0,0,0.75) , 4,0,0,1 );
-fx-font-weight: bold;
-fx-font-size: 1.1em;
-fx-text-fill: white;
}
.set-type2-btnSVRefresh:hover{
-fx-background-color:
linear-gradient(from 0% 93% to 0% 100%, #2e88c5 0%, #2979af 100%),
#3498db,
#70b6e5,
radial-gradient(center 50% 50%, radius 100%, #add5f0, #48a2de);
-fx-text-fill: #3f3b3b;
}
.set-type2-btnSVRefresh:pressed{
-fx-padding: 8 8 10 8;
-fx-background-insets: 2 0 0 0,2 0 3 0, 2 0 4 0, 2 0 5 0;
}
2 changes: 1 addition & 1 deletion out/production/ProjectJava15/resources/views/BookingManage.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<AnchorPane prefHeight="450.0" prefWidth="714.0" styleClass="main-pane" stylesheets="@../styles/CheckinRoom.css" xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controller.BookingManageController">
<AnchorPane prefHeight="450.0" prefWidth="714.0" style="-fx-background-color: white; -fx-background-radius: 10; -fx-border-width: 0;" styleClass="main-pane" stylesheets="@../styles/CheckinRoom.css" xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controller.BookingManageController">
<children>
<VBox prefHeight="200.0" prefWidth="100.0" spacing="20.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
Expand Down
4 changes: 2 additions & 2 deletions out/production/ProjectJava15/resources/views/Revenue.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@
</HBox>
<HBox prefHeight="239.0" prefWidth="740.0" VBox.vgrow="ALWAYS">
<children>
<TableView fx:id="tableRevenue" prefHeight="585.0" prefWidth="720.0" stylesheets="@../styles/Employee.css" HBox.hgrow="ALWAYS">
<TableView fx:id="tableRevenue" prefHeight="585.0" prefWidth="5000.0" stylesheets="@../styles/TableView.css" HBox.hgrow="ALWAYS">
<columns>
<TableColumn fx:id="noCol" prefWidth="49.0" text="No." />
<TableColumn fx:id="customerCol" prefWidth="277.0" text="Customer" />
<TableColumn fx:id="dateCol" minWidth="0.0" prefWidth="128.0" text="Date" />
<TableColumn fx:id="revenueCol" editable="false" minWidth="-Infinity" prefWidth="265.0" sortable="false" text="Revenue" />
<TableColumn fx:id="revenueCol" editable="false" minWidth="0.0" prefWidth="265.0" sortable="false" text="Revenue" />
</columns>
</TableView>
</children>
Expand Down
78 changes: 34 additions & 44 deletions out/production/ProjectJava15/resources/views/RoomSetting.fxml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXComboBox?>
<?import com.jfoenix.controls.JFXTabPane?>
<?import com.jfoenix.controls.JFXTextField?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TableColumn?>
Expand All @@ -23,18 +23,9 @@
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="700.0" prefWidth="742.0">
<children>
<HBox layoutX="136.0" layoutY="-30.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="1.0">
<children>
<JFXButton fx:id="refreshBtn" styleClass="set-type2-btn" stylesheets="@../styles/setButton.css" text="" textFill="WHITE">
<graphic>
<FontIcon iconColor="WHITE" iconLiteral="gmi-refresh" text="" />
</graphic>
</JFXButton>
</children>
</HBox>
<TableView fx:id="table" layoutX="30.0" layoutY="35.0" prefHeight="408.0" stylesheets="@../styles/TableView.css" AnchorPane.bottomAnchor="140.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="40.0">
<columns>
<TableColumn fx:id="number" prefWidth="101.0" text="Room Name" />
<TableColumn fx:id="number" prefWidth="101.0" text="Room Number" />
<TableColumn fx:id="type" prefWidth="107.0" text="Room Type" />
<TableColumn fx:id="status" prefWidth="117.0" text="Room Status" />
<TableColumn fx:id="floor1" prefWidth="105.0" text="Room Floor" />
Expand All @@ -45,9 +36,9 @@
<Insets />
</opaqueInsets>
</TableView>
<VBox alignment="CENTER" layoutX="30.0" prefHeight="140.0" prefWidth="702.0" spacing="16.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0">
<VBox prefHeight="140.0" prefWidth="722.0" spacing="16.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="446.0">
<children>
<HBox alignment="BOTTOM_CENTER" spacing="10.0">
<HBox alignment="BOTTOM_CENTER" prefWidth="742.0" spacing="10.0">
<children>
<Label text="Room Number:" textFill="#00699c">
<font>
Expand All @@ -60,16 +51,16 @@
<Font name="System Bold" size="14.0" />
</font>
</Label>
<JFXComboBox fx:id="comboBox" prefWidth="120.0" />
<ComboBox fx:id="comboBox" maxWidth="120.0" prefWidth="150.0" />
<Label text="Room Floor:" textFill="#00699c">
<font>
<Font name="System Bold" size="14.0" />
</font>
</Label>
<JFXTextField fx:id="roomFloor" alignment="BOTTOM_CENTER" maxWidth="100.0" prefWidth="75.0" />
<JFXTextField fx:id="roomFloor" alignment="BOTTOM_CENTER" maxWidth="100.0" />
</children>
</HBox>
<HBox alignment="BOTTOM_CENTER" prefHeight="37.0" prefWidth="700.0" spacing="10.0">
<HBox alignment="BOTTOM_CENTER" prefWidth="742.0" spacing="10.0">
<children>
<Label text="Room Price:" textFill="#00699c">
<font>
Expand All @@ -83,25 +74,28 @@
</font>
</Label>
<JFXTextField fx:id="pricePerHours" alignment="BOTTOM_CENTER" maxWidth="100.0" prefWidth="260.0" />
<JFXButton fx:id="addBtn" styleClass="set-type2-btn" stylesheets="@../styles/setButton.css" text="Add New" textFill="WHITE">
<HBox.margin>
<Insets />
</HBox.margin></JFXButton>
<JFXButton fx:id="editBtn" styleClass="set-type2-btn" stylesheets="@../styles/setButton.css" text="Edit" textFill="WHITE">
<HBox.margin>
<Insets />
</HBox.margin></JFXButton>
<JFXButton fx:id="delBtn" styleClass="set-btn" stylesheets="@../styles/setButton.css" text="Delete" textFill="WHITE">
<HBox.margin>
<Insets />
</HBox.margin></JFXButton>
</children>
</HBox>
<HBox alignment="CENTER_RIGHT" prefWidth="200.0" spacing="15.0">
<children>
<JFXButton fx:id="addBtn" styleClass="set-type2-btn" stylesheets="@../styles/setButton.css" text="Add New" />
<JFXButton fx:id="editBtn" styleClass="set-type2-btn" stylesheets="@../styles/setButton.css" text="Edit" />
<JFXButton fx:id="delBtn" styleClass="set-btn" stylesheets="@../styles/setButton.css" text="Delete" />
</children>
<opaqueInsets>
<Insets />
</opaqueInsets>
<padding>
<Insets top="10.0" />
<Insets right="20.0" />
</padding>
</HBox>
</children>
</VBox>
<JFXButton fx:id="refreshBtn" layoutX="690.0" layoutY="2.0" styleClass="set-type2-btn" stylesheets="@../styles/setButton.css" text="">
<graphic>
<FontIcon iconLiteral="gmi-refresh" />
</graphic>
</JFXButton>
</children>
<opaqueInsets>
<Insets />
Expand All @@ -114,32 +108,28 @@
</Tab>
<Tab text="Room Type Setting">
<content>
<AnchorPane>
<AnchorPane prefHeight="583.0" prefWidth="762.0">
<children>
<HBox AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="1.0">
<children>
<JFXButton fx:id="refreshBtn1" styleClass="set-type2-btn" stylesheets="@../styles/setButton.css" text="">
<graphic>
<FontIcon iconColor="WHITE" iconLiteral="gmi-refresh" />
</graphic>
</JFXButton>
</children>
</HBox>
<TableView fx:id="table1" layoutX="10.0" layoutY="43.0" stylesheets="@../styles/TableView.css" AnchorPane.bottomAnchor="77.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="43.0">
<TableView fx:id="table1" prefHeight="512.0" stylesheets="@../styles/TableView.css" AnchorPane.bottomAnchor="90.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="40.0">
<columns>
<TableColumn fx:id="id" prefWidth="145.0" text="Number" />
<TableColumn fx:id="name" minWidth="5.0" prefWidth="596.0" text="Room Type Name" />
</columns>
</TableView>
<HBox alignment="CENTER" layoutX="20.0" prefHeight="77.0" prefWidth="722.0" spacing="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0">
<HBox alignment="CENTER" prefHeight="90.0" prefWidth="702.0" spacing="10.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
<children>
<Label text="Room Type Name" />
<JFXTextField fx:id="txtTypeName" maxWidth="150.0" />
<JFXButton fx:id="addTypeBtn" styleClass="set-type2-btn" stylesheets="@../styles/setButton.css" text="Add New" textFill="WHITE" />
<JFXButton fx:id="editTypeBtn" styleClass="set-type2-btn" stylesheets="@../styles/setButton.css" text="Edit" textFill="WHITE" />
<JFXButton fx:id="delTypeBtn" styleClass="set-btn" stylesheets="@../styles/setButton.css" text="Delete" textFill="WHITE" />
<JFXButton fx:id="addTypeBtn" styleClass="set-type2-btn" stylesheets="@../styles/setButton.css" text="Add New" />
<JFXButton fx:id="editTypeBtn" styleClass="set-type2-btn" stylesheets="@../styles/setButton.css" text="Edit" />
<JFXButton fx:id="delTypeBtn" styleClass="set-btn" stylesheets="@../styles/setButton.css" text="Delete" />
</children>
</HBox>
<JFXButton fx:id="refreshBtn1" layoutX="691.0" layoutY="1.0" styleClass="set-type2-btn" stylesheets="@../styles/setButton.css" text="">
<graphic>
<FontIcon iconLiteral="gmi-refresh" />
</graphic>
</JFXButton>
</children>
<padding>
<Insets left="10.0" right="10.0" />
Expand Down
2 changes: 1 addition & 1 deletion out/production/ProjectJava15/resources/views/StockManage.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.text.Font?>

<AnchorPane prefHeight="580.0" prefWidth="700.0" style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1">
<AnchorPane prefHeight="580.0" prefWidth="700.0" style="-fx-background-color: white; -fx-background-radius: 10;" xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1">
<children>
<Label layoutX="173.0" layoutY="264.0" text="Stock Manage Content" textFill="#00699c">
<font>
Expand Down
Loading

0 comments on commit 4d5def9

Please sign in to comment.