diff --git a/sdd/Requirements-Matrix.xlsx b/sdd/Requirements-Matrix.xlsx new file mode 100644 index 0000000..c8ead3d Binary files /dev/null and b/sdd/Requirements-Matrix.xlsx differ diff --git a/sdd/Software_Detail_Design.docx b/sdd/Software_Detail_Design.docx index fd5bd55..db59294 100644 Binary files a/sdd/Software_Detail_Design.docx and b/sdd/Software_Detail_Design.docx differ diff --git a/sdd/ui-idea1.svg b/sdd/ui-idea1.svg new file mode 100644 index 0000000..803af48 --- /dev/null +++ b/sdd/ui-idea1.svg @@ -0,0 +1,17195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <footer> + + + + + + <number> + + + + + + <date/time> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Search Account# + + + + + + + + + + + + <<AccountList>> + + + + + + Number | Address | Phone + + + + + + + + + + + + + View (toggle menu) In account view for reservations view on an Account + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Account#Label + + + + + + + + + + + + <<AccountList>> + + + + + + Number | Address | Phone + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Account#Label + + + + + + + + + + + + <<AccountList>> + + + + + + Number | Address | Phone + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + View (toggled menu) Reservations For Account In view + + + + + + + + + + + + + + + + + + + + + + + + + Account#Label + + + + + + + + + + + + <<ReservationList>> + + + + + + Number | Address | Address + + + + + + Row onclick Data-Bind + + + + + + + + + + + + + Row onclick + + + + + + + + + + + + Row onclick + + + + + + Add + + + + + + + + + + + + + + + + + + + + + + + + + Account#Label + + + + + + + + + + + + <<CabinReservation>> + + + + + + Address: Physical + + + + + + Cancel + + + + + + Address: Mailing + + + + + + Save + + + + + + + edit + + + + + + reservation view + + + + + + reservation view + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/lodge/datamodel/Reservation.java b/src/main/java/lodge/datamodel/Reservation.java index fc2417e..c9bae0c 100644 --- a/src/main/java/lodge/datamodel/Reservation.java +++ b/src/main/java/lodge/datamodel/Reservation.java @@ -34,7 +34,7 @@ public abstract class Reservation implements IReservation{ private Float price; - protected String accountNumber = null; + protected String accountNumber = "-99"; protected Reservation() { numberOfBeds = 1; diff --git a/src/main/java/lodge/reservationsystem/CabinReservation.java b/src/main/java/lodge/reservationsystem/CabinReservation.java index 8d2fc78..15eb3f0 100644 --- a/src/main/java/lodge/reservationsystem/CabinReservation.java +++ b/src/main/java/lodge/reservationsystem/CabinReservation.java @@ -43,9 +43,6 @@ public final class CabinReservation extends Reservation { if (getPhysical_address() == null) { throw new IllegalArgumentException(String.format("not valid, physical_address %s", this.getReservation_number())); } - if (getMailing_address() == null) { - throw new IllegalArgumentException(String.format("not valid, mailing_address: %s", this.getReservation_number())); - } return true; } diff --git a/src/main/java/lodge/reservationsystem/HotelReservation.java b/src/main/java/lodge/reservationsystem/HotelReservation.java index 2687c57..7625c8a 100644 --- a/src/main/java/lodge/reservationsystem/HotelReservation.java +++ b/src/main/java/lodge/reservationsystem/HotelReservation.java @@ -65,9 +65,6 @@ public final class HotelReservation extends Reservation { if (getPhysical_address() == null) { throw new IllegalArgumentException(String.format("not valid, physical_address %s", this.getReservation_number())); } - if (getMailing_address() == null) { - throw new IllegalArgumentException(String.format("not valid, mailing_address: %s", this.getReservation_number())); - } return true; } diff --git a/src/main/java/lodge/reservationsystem/HouseReservation.java b/src/main/java/lodge/reservationsystem/HouseReservation.java index 2e093d9..b012db4 100644 --- a/src/main/java/lodge/reservationsystem/HouseReservation.java +++ b/src/main/java/lodge/reservationsystem/HouseReservation.java @@ -53,9 +53,6 @@ public final class HouseReservation extends Reservation { if (getPhysical_address() == null) { throw new IllegalArgumentException(String.format("not valid, physical_address %s", this.getReservation_number())); } - if (getMailing_address() == null) { - throw new IllegalArgumentException(String.format("not valid, mailing_address: %s", this.getReservation_number())); - } return true; }