Skip to content

Commit

Permalink
Merge pull request #132
Browse files Browse the repository at this point in the history 
Zhenghan
  • Loading branch information
@liufangz
liufangz authored May 29, 2022
2 parents ce97168 + a0a9388 commit 6be8ad8
Show file tree
Hide file tree
Showing 18 changed files with 74 additions and 65 deletions.
5 changes: 5 additions & 0 deletions .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions data/csv/BoardingPass.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
passenger,flight,seatNo,food
123456,MH1234,1A,VEGETARIAN
123456,MH8633,1B,VEGETARIAN
123456,MH1234,17B,VEGETARIAN
123456,MH8633,4E,STANDARD
123456,MH1234,5E,STANDARD
2 changes: 1 addition & 1 deletion data/csv/Reservation.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ reservationId,passenger,flight,seatLevel,mealsAvailable,handBaggageNum,checkedBa
1522521654113210368,450101197405207446,HH6324,ECONOMY_CLASS,true,1,0,false
1522522483536826368,654022197901228286,GH0001,FIRST_CLASS,true,0,1,false
1522522709437845504,152224198908049211,CH2341,FIRST_CLASS,true,1,1,false
1517540042405449728,123456,MH1234,ECONOMY_CLASS,true,1,0,true
1517540128904248799,123456,MH8633,BUSINESS_CLASS,true,0,1,true
1517540042405449728,123456,MH1234,ECONOMY_CLASS,true,1,0,true
4 changes: 2 additions & 2 deletions data/csv/flightSeat/MH1234_2022-05-25.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ false,true,true,true,true,true
true,true,true,true,true,true
true,true,true,true,true,true
true,true,true,true,true,true
true,true,true,true,false,true
true,true,true,true,true,true
true,true,true,true,true,true
true,true,true,true,true,true
Expand All @@ -14,8 +15,7 @@ true,true,true,true,true,true
true,true,true,true,true,true
true,true,true,true,true,true
true,true,true,true,true,true
true,true,true,true,true,true
true,true,true,true,true,true
true,false,true,true,true,true
true,true,true,true,true,true
true,true,true,true,true,true
true,true,true,true,true,true
2 changes: 1 addition & 1 deletion data/csv/flightSeat/MH8633_2022-09-11.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ A,B,C,D,E,F
false,false,true,true,true,true
true,true,true,true,true,true
true,true,true,true,true,true
true,true,true,true,true,true
true,true,true,true,false,true
true,true,true,true,true,true
true,true,true,true,true,true
true,true,true,true,true,true
Expand Down
22 changes: 11 additions & 11 deletions data/json/BoardingPass.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
"passengerId": "123456",
"firstName": "Jun",
"lastName": "Test",
"age": 21,
"telephone": "131043688481234"
"age": 20,
"telephone": "13104368848"
},
"flight": {
"flightId": "MH1111",
"flightId": "MH1234",
"departure": "Beijing",
"destination": "Hainan",
"boardingGate": "C08",
"boardingTime": "2022-09-11 07:05",
"departureTime": "2022-09-11 09:55",
"arrivalTime": "2022-09-11 12:55"
"destination": "Shanghai",
"boardingGate": "A10",
"boardingTime": "2022-05-25 11:25",
"departureTime": "2022-05-25 11:55",
"arrivalTime": "2022-05-25 14:55"
},
"seatNo": "1B",
"seatNo": "5E",
"food": {
"foodName": "VEGETARIAN",
"foodPrice": 20.0
"foodName": "STANDARD",
"foodPrice": 30.0
}
}
12 changes: 6 additions & 6 deletions data/json/Flight.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"flightId": "MH8638",
"flightId": "MH1234",
"departure": "Beijing",
"destination": "Hainan",
"boardingGate": "B08",
"boardingTime": "2022-09-11 07:05",
"departureTime": "2022-09-11 09:55",
"arrivalTime": "2022-09-11 12:55"
"destination": "Shanghai",
"boardingGate": "A10",
"boardingTime": "2022-05-25 11:25",
"departureTime": "2022-05-25 11:55",
"arrivalTime": "2022-05-25 14:55"
}
4 changes: 2 additions & 2 deletions data/json/Food.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"foodName": "VEGETARIAN",
"foodPrice": 20.0
"foodName": "STANDARD",
"foodPrice": 30.0
}
27 changes: 17 additions & 10 deletions data/json/Reservation.json
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
[
{
"reservationId": "1511111111111111111",
"reservationId": "1517540042405449728",
"passenger": {
"passengerId": "123456",
"firstName": "Jun",
"lastName": "Test",
"age": 20,
"telephone": "13104368848"
},
"flight": {
"flightId": "MH1111",
"flightId": "MH1234",
"departure": "Beijing",
"destination": "Hainan",
"boardingGate": "C08",
"boardingTime": "2022-09-11 07:05",
"departureTime": "2022-09-11 09:55",
"arrivalTime": "2022-09-11 12:55"
"destination": "Shanghai",
"boardingGate": "A10",
"boardingTime": "2022-05-25 11:25",
"departureTime": "2022-05-25 11:55",
"arrivalTime": "2022-05-25 14:55"
},
"seatLevel": "FIRST_CLASS",
"seatLevel": "ECONOMY_CLASS",
"mealsAvailable": true,
"handBaggageNum": 0,
"checkedBaggageNum": 1,
"handBaggageNum": 1,
"checkedBaggageNum": 0,
"checked": false
}
]
8 changes: 4 additions & 4 deletions data/json/Seat.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"flightId": "MH8633",
"column": "B",
"row": "1",
"price": "400.0"
"flightId": "MH1234",
"column": "E",
"row": "5",
"price": "200.0"
}
2 changes: 1 addition & 1 deletion data/json/Type.json
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"type": "id"
"type": "alipay"
}
14 changes: 7 additions & 7 deletions data/printer/BoardingPass.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
/ \ \.
| | |.
\__| |.
| DATE: 11 SEPTEMBER |.
| FLIGHT: MH8633 |.
| NAME: Test Jun |.
| SEAT: 1B |.
| GATE: B08 |.
| BD TIME: 07:05 |.
| DEST: Hainan |.
| DATE: 25 MAY |.
| FLIGHT: MH1234 |.
| NAME: Jun Test |.
| SEAT: 5E |.
| GATE: A10 |.
| BD TIME: 11:25 |.
| DEST: Shanghai |.
| |.
| |.
| ________________________|____
Expand Down
16 changes: 1 addition & 15 deletions data/printer/Tag.txt
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1 @@
You don't have hand baggage

_______________________________________

___________VOUCHER___________
/ \ \.
| | |.
\__| |.
| NO.1 |.
| COUNTER: B08 |.
| CHECKED BAGGAGE: 1 |.
| |.
| ________________________|____
| / /.
\_/Group58_____________________/.
You don't have checked baggage
6 changes: 6 additions & 0 deletions src/main/java/com/app/flight/controller/AdminLoginController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* This code is used to finish all the steps of check-in.
*
* @author Huanghong
* @author zhenghan
* @version 2.1
* @date 2022.3.30
*/
Expand Down Expand Up @@ -91,6 +92,11 @@ public void start(Stage stage) throws IOException {
stage.show();
}

/**
* This method is used to get the loader of SelectLanguage.fxml.
*
* @throws IOException IOException
*/
public FXMLLoader getLoader() throws IOException {
return new FXMLLoader(Main.class.getResource("fxml/AdminLogin.fxml"));
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/app/flight/controller/AdminViewController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import java.util.ArrayList;

/**
* The controller for admin viewing the checking information
*
* @author Zheng Han
* @version 2.1
*/
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/app/flight/controller/ScanInstructionController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@


/**
* Help passengers to use the scanning feature
*
* @author LianJunhong
* @author zhenghan
*/
public class ScanInstructionController {
@FXML
Expand All @@ -41,7 +44,6 @@ public FXMLLoader getLoader() {
*
* @param idNumber
* @param stage
* @throws IOException
*/
public void checkIdNumber(String idNumber, Stage stage) {
if (isValidCard(idNumber) || idNumber.equals("123456")) {
Expand Down Expand Up @@ -74,8 +76,7 @@ public void checkIdNumber(String idNumber, Stage stage) {
/**
* This method is used to get the help page.
*
* @param actionEvent
* @throws IOException
* @param actionEvent actionEvent
*/
public void helpClick(ActionEvent actionEvent) {
Platform.runLater(() -> {
Expand All @@ -95,8 +96,7 @@ public void helpClick(ActionEvent actionEvent) {
/**
* This method is used to return to the previous page.
*
* @param actionEvent
* @throws IOException
* @param actionEvent actionEvent
*/
public void back(ActionEvent actionEvent) {
Platform.runLater(() -> {
Expand Down
Binary file modified src/main/resources/com/app/flight/image/QR_Code/BoardingPassQR.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/com/app/flight/image/QR_Code/TagQR.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6be8ad8

Please sign in to comment.