Commit Graph

16 Commits

Author SHA1 Message Date
cadenjmoore
39023fcdf8 Added search function to Medication Search Page with working gridview 2024-04-01 19:17:05 -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
EggMan20339
ef6782c5c8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/config/applicationhost.config
#	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:24:14 -04:00
EggMan20339
fe80a41d5c idk 2024-03-28 19:23:49 -04:00
cadenjmoore
5bf5f44566 missing Prescription.aspx need to commit started on prescription edit 2024-03-28 19:15:20 -04:00
EggMan20339
9f8f6ccbdc Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/.idea.FWA_MAIN/.idea/dataSources.xml
2024-03-28 18:24:24 -04:00
EggMan20339
5709441ba0 idk 2024-03-28 18:23:57 -04:00
389ac65817 finished patEdit.aspx mostly 2024-03-28 15:04:52 -04:00
EggMan20339
2586a83af8 more? 2024-03-28 12:08:46 -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
cadenjmoore
6d357f4100 Test 2024-03-21 17:26:50 -04:00
81b56351c4 again 2024-03-20 14:05:13 -04:00
afb094bf06 Initial commit 2024-03-20 13:04:27 -04:00