Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
9ab330f
Added names to README
AAARRRCCC Oct 15, 2024
1855ad3
replaced activity 1 and 2 .txts with pdfs
AAARRRCCC Oct 15, 2024
6645ecb
added comment for jacob
AAARRRCCC Oct 15, 2024
2910e63
Fixed README.md typo
matthewsam2 Oct 15, 2024
3e8e128
java files added
Oct 15, 2024
5402cf8
pcpType can take patientType as obj
Oct 15, 2024
dea1dfe
Added linked list functionality for testing storage of object informa…
Oct 15, 2024
e3f4938
Changes made
Oct 15, 2024
d8d04cc
Added 4th option in main menu
M-Caesar Oct 15, 2024
912c807
comments made
Oct 16, 2024
916bcc7
other comments added
M-Caesar Oct 16, 2024
2588d19
Merge branch 'master' of https://github.com/M-Caesar/355GroupProject
M-Caesar Oct 16, 2024
8db3f58
comments made
Oct 16, 2024
f1f24d8
Merge branch 'master' of https://github.com/M-Caesar/355GroupProject
M-Caesar Oct 16, 2024
e34b1c7
Added room number variable to Patient Type class
M-Caesar Oct 16, 2024
83e2cc8
Added room number variable to Patient Type class
M-Caesar Oct 17, 2024
ceb3ce9
Added project desc in README.md
FlavoredReed Oct 17, 2024
4a36a34
Added comments to main.java for clarification on method functionality
M-Caesar Oct 18, 2024
254337a
-Added two new classes to handel the patient events and schedule.
M-Caesar Oct 18, 2024
4aab7b3
-Added more event functionality
M-Caesar Oct 18, 2024
c6b91dd
-Added comments for functionality
M-Caesar Oct 21, 2024
3f533bb
Created MySQL server and populated with basic patient and physician data
AAARRRCCC Oct 23, 2024
1e751e5
Adding project settings (data source, MySQL library)
AAARRRCCC Oct 23, 2024
af090b0
comments made
Oct 23, 2024
d24436a
Merge branch 'Database' of https://github.com/AAARRRCCC/355GroupProject
Oct 23, 2024
0ec6c59
First UI Parts
borumea Oct 23, 2024
15f7f71
Added GroupLayoutPanel
borumea Oct 23, 2024
6488c66
Began making Patient DB Service functionality
Oct 24, 2024
4b08319
Added Room search
Oct 25, 2024
635f0e2
Changed Organization and add ScrollPanel
borumea Oct 28, 2024
f871f37
Updated window.java
FlavoredReed Oct 28, 2024
eb30980
Random stuff to UI
FlavoredReed Oct 29, 2024
7f162b3
other ui
FlavoredReed Oct 29, 2024
cde2eb4
ui
FlavoredReed Oct 29, 2024
f55b8f8
Added lots of function windows
FlavoredReed Oct 29, 2024
845b649
trying
FlavoredReed Oct 29, 2024
5aa6cbc
add
FlavoredReed Oct 29, 2024
f72b112
rtg
FlavoredReed Oct 30, 2024
4d6c696
Updated
FlavoredReed Oct 30, 2024
c9ebf4f
.json update
FlavoredReed Oct 30, 2024
639264e
wef
FlavoredReed Oct 30, 2024
a88ab9f
delete ds
FlavoredReed Oct 30, 2024
96005f2
sed
FlavoredReed Oct 30, 2024
c479821
Added functionality to get and display data
borumea Oct 30, 2024
b9f5592
added help
FlavoredReed Oct 30, 2024
c98fd6e
nothigin
FlavoredReed Oct 30, 2024
e9fcf28
Added temp vars for testing
borumea Oct 30, 2024
4081e91
jj
FlavoredReed Oct 30, 2024
37ec317
nn
FlavoredReed Oct 30, 2024
dc172be
menu functions changed
M-Caesar Oct 30, 2024
832df4b
kk
FlavoredReed Oct 30, 2024
df5eb23
kk
FlavoredReed Oct 30, 2024
94fae13
new push
borumea Oct 31, 2024
0cbce27
Changed refresh
borumea Oct 31, 2024
bd01d27
gg
FlavoredReed Oct 31, 2024
a284f51
Merge branch 'UIPartsSetup' of https://github.com/AAARRRCCC/355GroupP…
FlavoredReed Oct 31, 2024
d2fdb89
lwkje fjwe
FlavoredReed Oct 31, 2024
668c09e
we
FlavoredReed Oct 31, 2024
a24e7e7
oin
FlavoredReed Oct 31, 2024
67db101
Fixed Refresh
borumea Oct 31, 2024
7a8cdd0
gg
FlavoredReed Oct 31, 2024
33498d2
sew
FlavoredReed Oct 31, 2024
82c4940
dd
FlavoredReed Oct 31, 2024
bad5982
ELIIIIIII
FlavoredReed Oct 31, 2024
fe31e83
wloejfnowenfoiwenf
FlavoredReed Oct 31, 2024
6e07414
wejwef
FlavoredReed Oct 31, 2024
ad9ddfa
owienfoiew
FlavoredReed Oct 31, 2024
960bc8e
Done
borumea Oct 31, 2024
bfeea5e
Adding .sql for data source
AAARRRCCC Oct 31, 2024
1521635
-Added comments for functionality
M-Caesar Oct 31, 2024
cbaa28e
Merge branch 'Database' of https://github.com/AAARRRCCC/355GroupProje…
M-Caesar Oct 31, 2024
2cce437
Finally Done
FlavoredReed Oct 31, 2024
de3c473
Some menu items fixed, #3 works
AAARRRCCC Oct 31, 2024
7a7e60c
Changed to fit nicks needs
borumea Oct 31, 2024
b4dd18c
advanced search room num, adm date, MRN work
AAARRRCCC Oct 31, 2024
9195382
Final changes before merging to Combined (hopefully)
borumea Oct 31, 2024
9b9fcd0
Merge branch 'UIPartsSetup'
borumea Oct 31, 2024
59a6fec
Merge remote-tracking branch 'origin/Menu-stuff-DB-testing'
borumea Oct 31, 2024
95607f6
Merging database connection into main after GUI
borumea Oct 31, 2024
6dd72ff
All systems combined
borumea Oct 31, 2024
56e00c1
All systems combined
borumea Oct 31, 2024
df00fff
Merge remote-tracking branch 'origin/main'
AAARRRCCC Nov 1, 2024
c3462e2
Redumped database with new data
AAARRRCCC Nov 1, 2024
5122887
Added video showcasing test cases for Sprint 1
M-Caesar Nov 2, 2024
bc6d7ca
Sprint 1 Test Cases
M-Caesar Nov 2, 2024
1382fb1
Added AddPatient functionality
borumea Nov 12, 2024
ee730ea
Started adding "add patient" function in main to be used by UI team.
M-Caesar Nov 13, 2024
ac6a116
Added full functionality for patient added method in main
M-Caesar Nov 13, 2024
b45ba82
Added full functionality for patient edit method in main
M-Caesar Nov 13, 2024
072b914
Added get next patient id method
M-Caesar Nov 13, 2024
0b1625d
added function calls to add patient and update patient
borumea Nov 14, 2024
912a549
Merge branch 'Sprint-2-UI' of https://github.com/AAARRRCCC/355GroupPr…
borumea Nov 14, 2024
945ea22
Update EditPatientData.java
borumea Nov 14, 2024
d749b36
Merge pull request #2 from AAARRRCCC/Sprint-2-UI
AAARRRCCC Nov 15, 2024
dab9fc1
Fixed everything
borumea Nov 15, 2024
7fd20e7
Got add patient frontend working
AAARRRCCC Nov 15, 2024
e4636b6
Update Main.java
M-Caesar Nov 15, 2024
7d70ec8
Update Main.java
M-Caesar Nov 15, 2024
7b79587
Update Main.java
M-Caesar Nov 16, 2024
19ca9ba
Update Main.java
M-Caesar Nov 16, 2024
e70214f
Update Main.java
M-Caesar Nov 16, 2024
da0a988
Sprint 2 Working
AAARRRCCC Nov 16, 2024
4913beb
Sprint 2 Test Cases
M-Caesar Nov 16, 2024
35b0f07
Sprint 2 Test Cases Video
M-Caesar Nov 16, 2024
69163b5
BookRoom and RoomView
borumea Dec 4, 2024
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 modified .DS_Store
Binary file not shown.
50 changes: 50 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
### IntelliJ IDEA ###
out/
!**/src/main/**/out/
!**/src/test/**/out/

### Eclipse ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/

### VS Code ###
.vscode/

### Mac OS ###
.DS_Store

### Random Ass .Class Files ###
/AddPatient$1.class
/AddPatient.class
/GUI.class
/HomePage$1.class
/HomePage$2.class
/HomePage$SwingAction.class
/HomePage.class
/LoginWindow$1.class
/LoginWindow$2.class
/LoginWindow$3.class
/LoginWindow.class
/PatientData$1.class
/PatientData.class
/RoomView$1.class
/RoomView.class
/SearchFunction$1.class
/SearchFunction$2.class
/SearchFunction.class
/SearchPage.class
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/355GroupProject.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions .idea/dataSources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/libraries/mysql_connector_j_9_1_0.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/sqldialects.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

216 changes: 216 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>355GroupProject</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
<filteredResources>
<filter>
<id>1730141042644</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"java.debug.settings.onBuildFailureProceed": true,
"files.exclude": {
"**/*.class": true
}
}
Loading