Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
076d768e70e04655a2c343f46d0808c16a27130c
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
package domain;

import java.io.Serializable;
import java.util.Date;

public class Booking implements Serializable {

	/**
	 * 
	 */
	private static final long serialVersionUID = 1L;
	private int bookingNumber;
	private Date bookingDate;
	private Client client;
	private Offer offer;

	public Booking(int bN, Offer offer, Client client) {

		this.bookingNumber = bN;
		this.offer = offer;
		this.client = client;
		// Booking date is assigned to actual date
		this.bookingDate = new java.util.Date(System.currentTimeMillis());
	}

	public Booking(int bN, Offer offer, Client client, Date bookDate) {
		this.bookingNumber = bN;
		this.offer = offer;
		this.client = client;
		this.bookingDate = bookDate;
	}

	public int getBookNumber() {
		return this.bookingNumber;
	}

	public void setOffer(Offer offer) {
		this.offer = offer;
	}

	public Offer getOffer() {
		return this.offer;
	}

	public void setBookDate(Date bookDate) {
		this.bookingDate = bookDate;
	}

	public Date getBookDate() {
		return this.bookingDate;
	}

	public Client getClient() {
		return client;
	}

	public void setClient(Client client) {
		this.client = client;
	}

}

Commits for RRRRHHHH_CoderuralHouses/src/domain/Booking.java

Diff revisions: vs.
Revision Author Commited Message
076d76 ... Diff Diff camjan Fri 22 May, 2015 22:22:23 +0000

The bug found in the presentation that we forgot to review has been fixed

ccac99 ... Diff Diff pinene picture pinene Wed 20 May, 2015 16:42:17 +0000

Merge branch ‘master’ of ssh://xp-dev.com/RRRRHHHH_Code

Conflicts:
ruralHouses client/src/domain/Owner.java
ruralHouses client/src/domain/RuralHouse.java
ruralHouses client/src/gui/BookRuralHouseConfirmationWindow.java
ruralHouses client/src/gui/ModifyOfferGUI.java
ruralHouses/src/dataAccess/DB4oManager.java
ruralHouses/src/domain/Booking.java

d30bcc ... Diff Diff pinene picture pinene Wed 20 May, 2015 16:32:33 +0000

cleaning

85d983 ... Diff Diff camjan Wed 20 May, 2015 09:05:53 +0000

Booking deletion fixed some minor problems remain

25898b ... Diff Diff camjan Mon 18 May, 2015 15:26:01 +0000

Account adding and deleting fixed

4f8bcc ... Diff Diff epinzolas001 Mon 18 May, 2015 09:49:54 +0000

Merge conflicts solutioned

6a5d4d ... Diff Diff camjan Sun 17 May, 2015 20:35:45 +0000

Booking confirmation and e-mail service added. Some bugs to be solved.

7bf57b ... Diff Diff camjan Sun 17 May, 2015 11:59:22 +0000

Possibility of registering new owners added

0f75b2 ... Diff Diff camjan Sat 16 May, 2015 14:34:49 +0000

Username is saved hashed and password hashed and salted

e2ae30 ... Eneko Pinzolas Murua Tue 14 Apr, 2015 15:07:35 +0000

imports leaned