Commit Graph

20 Commits

Author SHA1 Message Date
netnobody19
0c31e87b73 Final 2024-04-03 19:23:50 -04:00
netnobody19
4a6f1b6d52 Merge remote-tracking branch 'origin/master' 2024-04-02 10:07:29 -04:00
EggMan20339
209a07a411 made it so that you cant refill past the allowed refill number 2024-04-02 09:14:08 -04:00
2680e87e2c worked on Prescription.aspx 2024-04-01 16:02:24 -04:00
EggMan20339
93cbf4a428 search, new, edit, and delete working for Prescription.aspx 2024-03-29 09:47:23 -04:00
cadenjmoore
5bf5f44566 missing Prescription.aspx need to commit started on prescription edit 2024-03-28 19:15:20 -04:00
netnobody19
437ab80ba2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/.idea.FWA_MAIN/.idea/dataSources.xml
#	FWA_MAIN/bin/FWA_MAIN.dll
#	FWA_MAIN/bin/FWA_MAIN.pdb
#	FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache
#	FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache
#	FWA_MAIN/obj/Debug/FWA_MAIN.dll
#	FWA_MAIN/obj/Debug/FWA_MAIN.pdb
2024-03-28 19:15:03 -04:00
netnobody19
59792602a8 blablabla 2024-03-28 19:12:34 -04:00
389ac65817 finished patEdit.aspx mostly 2024-03-28 15:04:52 -04:00
EggMan20339
de80f0d095 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	FWA_MAIN/bin/FWA_MAIN.dll
#	FWA_MAIN/bin/FWA_MAIN.pdb
#	FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache
#	FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache
#	FWA_MAIN/obj/Debug/FWA_MAIN.dll
#	FWA_MAIN/obj/Debug/FWA_MAIN.pdb
2024-03-28 12:08:35 -04:00
EggMan20339
b4e4c41887 made changes to patsearch, got gridview populating and select funtionality working 2024-03-28 12:08:12 -04:00
cadenjmoore
5def2550f8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/config/applicationhost.config
#	FWA_MAIN/FWA_MAIN.csproj
#	FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache
2024-03-28 10:18:53 -04:00
cadenjmoore
35d009a56f Added Prescription search and new prescription 2024-03-28 10:17:25 -04:00
netnobody19
a8f7dd69ca Rider Commit Test 2024-03-28 09:48:11 -04:00
EggMan20339
dda2a32318 added datatier 2024-03-27 11:14:35 -04:00
Caden
4965a77f46 Finished all med pages exist, correct info not populated 2024-03-24 15:30:21 -07:00
netnobody19
fbe4b755da Test3 2024-03-21 18:29:31 -04:00
cadenjmoore
7e21ce0ac9 Medi stuff 2024-03-21 18:17:57 -04:00
cadenjmoore
6d357f4100 Test 2024-03-21 17:26:50 -04:00
afb094bf06 Initial commit 2024-03-20 13:04:27 -04:00