Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
dfa9ffa
Person Class Added
gitanitraj Apr 20, 2026
3140e48
made address and person files
thejoeflynn Apr 20, 2026
dda22ea
added more to Address
thejoeflynn Apr 20, 2026
eb0b2c2
Interface created
prachi0617 Apr 20, 2026
add4b58
Finished up Address and Person
thejoeflynn Apr 20, 2026
d2b6e6b
Changes Removed
gitanitraj Apr 20, 2026
0ab204f
LibraryItem abstract completed
Apr 20, 2026
a4bc754
Merge pull request #1 from thejoeflynn/Joe
thejoeflynn Apr 20, 2026
9ffbff4
Merge pull request #3 from thejoeflynn/michaelgiovannisie
thejoeflynn Apr 20, 2026
d1f6cf7
Merge branch 'master' into prachi
thejoeflynn Apr 20, 2026
2e6e815
Merge pull request #2 from thejoeflynn/prachi
thejoeflynn Apr 20, 2026
10f6939
made address and person files
thejoeflynn Apr 20, 2026
7ab48a6
added more to Address
thejoeflynn Apr 20, 2026
9ce4392
Finished up Address and Person
thejoeflynn Apr 20, 2026
374c96b
Added Librarian Class
gitanitraj Apr 20, 2026
8cdd748
completed searchable interface
Apr 20, 2026
87fd994
some changes
prachi0617 Apr 20, 2026
1229805
initialising book.java
Apr 20, 2026
d086377
some changes
prachi0617 Apr 20, 2026
2ba52ef
Merge pull request #5 from thejoeflynn/prachi
prachi0617 Apr 20, 2026
5b89bde
Added Librarian Class Merge remote-tracking branch 'origin/Joe' into …
gitanitraj Apr 20, 2026
668e9a4
Merge branch 'master' into michaelgiovannisie
thejoeflynn Apr 20, 2026
c0f56b9
Merge pull request #4 from thejoeflynn/michaelgiovannisie
thejoeflynn Apr 20, 2026
4add427
Merge branch 'master' into Anitra
thejoeflynn Apr 20, 2026
1d471b0
Merge pull request #6 from thejoeflynn/Anitra
thejoeflynn Apr 20, 2026
fa8a06e
finished book.java and made slight changes
Apr 20, 2026
b573bf5
Merge branch 'master' of https://github.com/thejoeflynn/OneLibrary in…
Apr 20, 2026
e72e363
Merge pull request #7 from thejoeflynn/michaelgiovannisie
thejoeflynn Apr 21, 2026
96eba49
Renamed CentralLibrary to OneLibrary
thejoeflynn Apr 21, 2026
677ec3b
Merge pull request #8 from thejoeflynn/Joe
thejoeflynn Apr 21, 2026
e08d270
renamed
collin-beck3 Apr 21, 2026
5f5a27a
Deleted duplicate file
thejoeflynn Apr 21, 2026
6259469
Merge pull request #9 from thejoeflynn/Joe
thejoeflynn Apr 21, 2026
5b87dca
fixed searchable
Apr 21, 2026
2f910f1
Updated Member and LibraryItem Classes
gitanitraj Apr 21, 2026
2dbbb85
made periodical class w/ comments
collin-beck3 Apr 22, 2026
77a155b
UI mockup
thejoeflynn Apr 22, 2026
79273e5
Merge branch 'master' into Collin
thejoeflynn Apr 22, 2026
8fc1e8e
Merge pull request #10 from thejoeflynn/Collin
thejoeflynn Apr 22, 2026
6ab169b
Merge pull request #11 from thejoeflynn/Joe
thejoeflynn Apr 22, 2026
c5ab6f8
Updated address
thejoeflynn Apr 22, 2026
8a56ef6
Merge pull request #12 from thejoeflynn/Anitra2
gitanitraj Apr 22, 2026
29863a9
new UI design
thejoeflynn Apr 22, 2026
29251f7
Merge branch 'master' into michaelgiovannisie
thejoeflynn Apr 22, 2026
06b8648
Merge pull request #13 from thejoeflynn/michaelgiovannisie
thejoeflynn Apr 22, 2026
8b42c9e
Merge pull request #14 from thejoeflynn/Joe
thejoeflynn Apr 22, 2026
3089724
finished Librarian
Apr 22, 2026
f00f751
Split UI Sketch and Main Application
thejoeflynn Apr 22, 2026
03cd560
Merge pull request #24 from thejoeflynn/Joe
thejoeflynn Apr 22, 2026
06d9d4f
finished library
Apr 22, 2026
554fe18
Merge pull request #25 from thejoeflynn/michaelgiovannisie
thejoeflynn Apr 22, 2026
fad4716
Adding JSON setting
gitanitraj Apr 22, 2026
d46f58e
Merge pull request #29 from thejoeflynn/Anitra2
gitanitraj Apr 22, 2026
2736181
Added Data from python crew (thank you python crew)
thejoeflynn Apr 22, 2026
d091d07
Merge pull request #32 from thejoeflynn/Joe
thejoeflynn Apr 22, 2026
f02321c
Updated Libary maxDays
gitanitraj Apr 22, 2026
84ba6e0
added periodicaLoader
Apr 22, 2026
0505d0d
fixed searchable
Apr 21, 2026
a5606bc
UI mockup
thejoeflynn Apr 22, 2026
92819fe
Made a WIP User Interface
thejoeflynn Apr 22, 2026
d7c9dba
Merge branch 'master' into Joe
thejoeflynn Apr 22, 2026
8842b8f
Updated Member and LibraryItem Classes
gitanitraj Apr 21, 2026
40e6993
Updated address
thejoeflynn Apr 22, 2026
d715a85
new UI design
thejoeflynn Apr 22, 2026
8728d04
Split UI Sketch and Main Application
thejoeflynn Apr 22, 2026
08ff6a4
finished Librarian
Apr 22, 2026
8bc039f
finished library
Apr 22, 2026
1f432f6
Adding JSON setting
gitanitraj Apr 22, 2026
892d25c
Added Data from python crew (thank you python crew)
thejoeflynn Apr 22, 2026
4d9b6db
updated classes to "super pull" from LibraryItem, added constructor t…
collin-beck3 Apr 22, 2026
a396d02
Merge branch 'master' into Collin
collin-beck3 Apr 22, 2026
7c8f766
Merge pull request #34 from thejoeflynn/Collin
collin-beck3 Apr 22, 2026
6c488bb
Merge pull request #33 from thejoeflynn/Joe
collin-beck3 Apr 22, 2026
115e1bf
UI works with while loop
thejoeflynn Apr 22, 2026
8470a86
Merge pull request #35 from thejoeflynn/Joe
thejoeflynn Apr 22, 2026
cb67af7
fixed searchable
Apr 21, 2026
5bc3caa
Merge branch 'master' into michaelgiovannisie
michaelgiovannisie Apr 22, 2026
8f6dce0
Merge pull request #36 from thejoeflynn/michaelgiovannisie
michaelgiovannisie Apr 22, 2026
0745e1c
UI mockup
thejoeflynn Apr 22, 2026
8430352
Updated Member and LibraryItem Classes
gitanitraj Apr 21, 2026
0507e8b
Updated address
thejoeflynn Apr 22, 2026
0a1c87c
new UI design
thejoeflynn Apr 22, 2026
b272485
Split UI Sketch and Main Application
thejoeflynn Apr 22, 2026
48185eb
Added Data from python crew (thank you python crew)
thejoeflynn Apr 22, 2026
60903e7
updated classes to "super pull" from LibraryItem, added constructor t…
collin-beck3 Apr 22, 2026
dcd4fd9
resolved conflict
gitanitraj Apr 22, 2026
9423907
Made a WIP User Interface
thejoeflynn Apr 22, 2026
a6784bd
UI works with while loop
thejoeflynn Apr 22, 2026
e00ff60
resolved conflicts
gitanitraj Apr 22, 2026
f06a303
Updated Libary maxDays
gitanitraj Apr 22, 2026
0161fc9
Merge branch 'master' into Anitra2
gitanitraj Apr 22, 2026
fb05ade
completed music subclass
Apr 22, 2026
f5c6cc5
Streamlined Main application
thejoeflynn Apr 23, 2026
9f92b5b
Merge pull request #38 from thejoeflynn/michaelgiovannisie
thejoeflynn Apr 23, 2026
4669565
Merge pull request #39 from thejoeflynn/Joe
thejoeflynn Apr 23, 2026
7bd3753
updating periodical loader, will test it soon.
Apr 23, 2026
d76fde8
Merge pull request #40 from thejoeflynn/michaelgiovannisie
michaelgiovannisie Apr 23, 2026
e983f09
made books screen
thejoeflynn Apr 23, 2026
c912a4d
Merge pull request #41 from thejoeflynn/Joe
thejoeflynn Apr 23, 2026
25b2b2b
resolved json conflict
gitanitraj Apr 23, 2026
45f0068
Updates to MainApplication
thejoeflynn Apr 23, 2026
f917fe9
finished bookloader
Apr 23, 2026
85dc89d
updated library
Apr 23, 2026
d56e279
Merge pull request #44 from thejoeflynn/michaelgiovannisie
michaelgiovannisie Apr 23, 2026
8acaf72
updated book
Apr 23, 2026
4f4f138
Merge pull request #45 from thejoeflynn/michaelgiovannisie
michaelgiovannisie Apr 23, 2026
5b63907
updated periodical loader
Apr 23, 2026
1393bec
Merge pull request #46 from thejoeflynn/michaelgiovannisie
michaelgiovannisie Apr 23, 2026
411e06d
More updates to main app.
thejoeflynn Apr 23, 2026
82a0fd4
Merge pull request #47 from thejoeflynn/Joe
thejoeflynn Apr 23, 2026
00572a6
small fixes
thejoeflynn Apr 23, 2026
be6616c
Merge pull request #48 from thejoeflynn/Joe
thejoeflynn Apr 23, 2026
b417fb5
finalised periodical loader and updated periodical class
Apr 23, 2026
76e86c8
Merge pull request #49 from thejoeflynn/michaelgiovannisie
michaelgiovannisie Apr 23, 2026
769604f
slight update periodical loader
Apr 23, 2026
62783ee
Merge pull request #50 from thejoeflynn/michaelgiovannisie
michaelgiovannisie Apr 23, 2026
6faaabd
Added Dataloader
gitanitraj Apr 24, 2026
9b4f25f
did a BUNCH of stuff. I'm not explaining look through it or ask quest…
thejoeflynn Apr 24, 2026
2484ee6
finalised periodical loader and updated periodical class
Apr 23, 2026
323ac89
slight update periodical loader
Apr 23, 2026
4584d88
Added Dataloader
gitanitraj Apr 24, 2026
b275be0
finalised periodical loader and updated periodical class
Apr 23, 2026
8af905a
slight update periodical loader
Apr 23, 2026
fdf2c3c
Added Dataloader
gitanitraj Apr 24, 2026
0e38e40
did a BUNCH of stuff. I'm not explaining look through it or ask quest…
thejoeflynn Apr 24, 2026
0bb1e47
finalised periodical loader and updated periodical class
Apr 23, 2026
a5745dd
slight update periodical loader
Apr 23, 2026
fba0858
Added Dataloader
gitanitraj Apr 24, 2026
afe1be8
finalised periodical loader and updated periodical class
Apr 23, 2026
85e5615
slight update periodical loader
Apr 23, 2026
2daadce
Added Dataloader
gitanitraj Apr 24, 2026
b647daa
some changes in searchable and reservable
prachi0617 Apr 25, 2026
ef7cfdd
Merge branch 'master' of https://github.com/thejoeflynn/OneLibrary in…
prachi0617 Apr 25, 2026
d3c838a
Merge pull request #62 from thejoeflynn/prachi
prachi0617 Apr 25, 2026
519e8a2
Added checkout capability
thejoeflynn Apr 25, 2026
818c355
Merge branch 'master' into joe
thejoeflynn Apr 25, 2026
03c3466
Updated Main Application and DataLoader. Books, DVDs, and Periodicals…
thejoeflynn Apr 26, 2026
2bbd875
Added InheritanceTestClass
prachi0617 Apr 27, 2026
2944b93
added test files from collin, updated pom.xml
thejoeflynn Apr 27, 2026
47e2407
Added Inheritance test class
prachi0617 Apr 27, 2026
f2a1127
temp push
thejoeflynn Apr 27, 2026
66bb299
Fixed comma issue
thejoeflynn Apr 27, 2026
a6bef5a
IT WORKS! The search function works!
thejoeflynn Apr 27, 2026
0467a8a
Fixed more issues. Specifically with showing more detail in view all …
thejoeflynn Apr 27, 2026
175f755
Merge pull request #65 from thejoeflynn/prachi
prachi0617 Apr 27, 2026
bfd654a
Added random function!
thejoeflynn Apr 27, 2026
cf4e7c1
added updates to pom.xml to work with opencsv. Also fixed up DataLoad…
thejoeflynn Apr 27, 2026
6be41e9
removed dupe Test
thejoeflynn Apr 27, 2026
eeced31
finalize
thejoeflynn Apr 28, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
11 changes: 11 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
<<<<<<< HEAD

"java.configuration.updateBuildConfiguration": "interactive"
// "java.debug.settings.onBuildFailureProceed": true

=======
"java.configuration.updateBuildConfiguration": "interactive",
"java.debug.settings.onBuildFailureProceed": true
>>>>>>> master
}
3 changes: 3 additions & 0 deletions members.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
M001,Alice Johnson,25,alice@email.com,555-1234,2026-04-24,456 Oak Street,Bookville,MD,12347
M002,Bob Wilson,35,bob@email.com,555-4321,2026-04-24,654 Maple Street,Media,PA,12346
m003,Kris Younger,100,kris@kris.com,3025555555,2026-04-27,street,wilmington,delaware,19803
16 changes: 15 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,22 @@
<modelVersion>4.0.0</modelVersion>

<groupId>com.zipcodewilmington</groupId>
<artifactId>central-library</artifactId>
<artifactId>OneLibrary</artifactId>
<version>1.0-SNAPSHOT</version>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.13.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>5.12.0</version>
</dependency>
</dependencies>


</project>
Binary file added src/.DS_Store
Binary file not shown.
Binary file added src/main/.DS_Store
Binary file not shown.
Binary file added src/main/java/.DS_Store
Binary file not shown.
Binary file added src/main/java/com/.DS_Store
Binary file not shown.
Binary file added src/main/java/com/zipcodewilmington/.DS_Store
Binary file not shown.
68 changes: 68 additions & 0 deletions src/main/java/com/zipcodewilmington/OneLibrary/Address.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package com.zipcodewilmington.OneLibrary;

public class Address {
private String street;
private String city;
private String state;
private String zipCode;

public Address(String street, String city, String state, String zipCode) {
this.street = street;
this.city = city;
this.state = state;
this.zipCode = zipCode;
}

public String getStreet() {
return street;
}

public void setStreet(String street) {
if (street != null && !street.isEmpty()){
this.street = street;
} else {
System.out.println("Invalid street");
}
}

public String getCity() {
return city;
}

public void setCity(String city) {
if (city != null && !city.isEmpty()){
this.city = city;
} else {
System.out.println("Invalid city");
}
}

public String getState() {
return state;
}

public void setState(String state) {
if (state != null && !state.isEmpty()) {
this.state = state;
} else {
System.out.println("Invalid state");
}
}

public String getZipCode() {
return zipCode;
}

public void setZipCode(String zipCode) {
if (zipCode != null && !zipCode.isEmpty()) {
this.zipCode = zipCode;
} else {
System.out.println("invalid zipcode");
}
}

public String toString() {
return street + ", " + city + ", " + state + " " + zipCode;
}

}
99 changes: 99 additions & 0 deletions src/main/java/com/zipcodewilmington/OneLibrary/Book.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
package com.zipcodewilmington.OneLibrary;

public class Book extends LibraryItem {
private String author;
private String isbn;
private int pages;
private String genre;

public Book(String id, String title, String location,
String author, String isbn, int pages, String genre) {

super(id, title, location);
//setId(id);
//setTitle(title);
//setLocation(location);
setAuthor(author);
setIsbn(isbn);
setPages(pages);
setGenre(genre);
}

@Override
public String toString() {
return "ID: " + getId() + " | Title: " + getTitle() +
" | Location: " + getLocation() + " | Author: " + author +
" | ISBN: " + isbn + " | Pages: " + pages + " | Genre: " + genre +
" | " + (isAvailable() ? "Available" : "Unavailable");
}

public String getAuthor() {
return author;
}

public void setAuthor(String author) {
this.author = author;
}

public String getIsbn() {
return isbn;
}

public void setIsbn(String isbn) {
if(isbn != null && !isbn.isEmpty()) {
this.isbn = isbn;
} else {
System.out.println("Invalid ISBN");
}
}

public int getPages() {
return pages;
}

public void setPages(int pages) {
if(pages > 0) {
this.pages = pages;
} else {
System.out.println("Invalid Pages");
}
}

public String getGenre() {
return genre;
}

public void setGenre(String genre) {
if(genre != null && !genre.isEmpty()) {
this.genre = genre;
} else {
System.out.println("Invalid Genre");
}
}

@Override
public String[] getSearchableFields() {
return new String[] {
getTitle(),
author,
genre,
isbn
};
}

@Override
public double calculateLateFee(int daysLate) {
return daysLate * 0.5;
}

@Override
public int getMaxBorrowDays() {
return 14;
}

@Override
public String getItemType() {
return "book";
}

}
Loading