Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard

Diff Revisions 556478 ... vs e90cb4 ... for ruralHouses client/src/gui/listOfBookingRequestsGUI.java

Diff revisions: vs.
  @@ -112,6 +112,8 @@
112 112 } catch (RemoteException e1) {
113 113 e1.printStackTrace();
114 114 }
115 + contentPane.setVisible(false);
116 +
115 117 }
116 118
117 119 }
  @@ -138,11 +140,18 @@
138 140 } catch (RemoteException e) {
139 141 e.printStackTrace();
140 142 }
141 - bookings.remove(book);
143 + ((DefaultTableModel) table.getModel()).removeRow(table
144 + .getSelectedRow());
142 145
143 146 }
144 147 }
145 148 });
149 +
150 + if (this.bookings.get(0).getOffer().isBooked()) {
151 + btnDenyAddition.setEnabled(false);
152 + btnNewButton.setEnabled(false);
153 + }
154 +
146 155 btnDenyAddition.setBounds(390, 395, 169, 25);
147 156 contentPane.add(btnDenyAddition);
148 157
  @@ -164,10 +173,6 @@
164 173 */
165 174 private static final long serialVersionUID = 1L;
166 175
167 - public int daysBetween(Date d1, Date d2) {
168 - return (int) ((d2.getTime() - d1.getTime()) / (1000 * 60 * 60 * 24));
169 - }
170 -
171 176 @Override
172 177 public Component getTableCellRendererComponent(JTable table,
173 178 Object value, boolean isSelected, boolean hasFocus,
  @@ -176,10 +181,7 @@
176 181 super.getTableCellRendererComponent(table, value, isSelected,
177 182 hasFocus, row, col);
178 183
179 - Date bookDay = (Date) table.getModel().getValueAt(row, 1);
180 - Date currentDay = new java.util.Date(System.currentTimeMillis());
181 -
182 - if (daysBetween(bookDay, currentDay) > 3) {
184 + if (!bookings.get(row).getOffer().isBooked()) {
183 185 setBackground(Color.RED);
184 186 setForeground(Color.BLACK);
185 187 } else {