RRRRHHHH_Code

Explore

Commits

Diff Revisions ad3773 ... vs 4bc36b ... for ruralHouses client/src/gui/HouseFeaturesGUI.java

		@@ -55,6 +55,7 @@
55	55		private JTable table;
56	56		private DefaultTableModel tableModel;
57	57		private RuralHouse rh;
	58	+	private Vector<Offer> offers= new Vector<Offer>();
58	59		private JTextField telIn;
59	60		private int row;
60	61		private JLabel labelPhone;
		@@ -237,7 +238,9 @@
237	238		Enumeration<Offer> rhs = rh.getAllOffers().elements();
238	239		while (rhs.hasMoreElements()) {
239	240		Offer of = rhs.nextElement();
240		-	if (of.getBookings() != null) {
	241	+	if (of.getBookings() == null
	242	+	\|\| !of.isBooked()) {
	243	+	offers.add(of);
241	244		Vector<Object> row = new Vector<Object>();
242	245		row.add(of.getOfferNumber());
243	246		row.add(of.getFirstDay());
		@@ -299,8 +302,8 @@
299	302		if (table.getRowCount() != 0) {
300	303		Client cl = new Client(nameField.getText(),
301	304		mailField.getText(), telIn.getText());
302		-	book = bookingM.createBooking(rh, rh.offers.get(row)
303		-	.getFirstDay(), rh.offers.get(row).getLastDay(),cl);
	305	+	book = bookingM.createBooking(rh, offers.get(row)
	306	+	.getFirstDay(), offers.get(row).getLastDay(),cl);
304	307		}
305	308		} catch (Exception e) {
306	309		e.printStackTrace();