CNSA-216-FP/FWA_MAIN
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
..
.idea Initial commit 2024-03-20 13:04:27 -04:00
App_Start Initial commit 2024-03-20 13:04:27 -04:00
bin blablabla 2024-03-28 19:12:34 -04:00
Content Initial commit 2024-03-20 13:04:27 -04:00
Controllers Initial commit 2024-03-20 13:04:27 -04:00
fonts Initial commit 2024-03-20 13:04:27 -04:00
obj/Debug Merge remote-tracking branch 'origin/master' 2024-03-28 19:15:03 -04:00
packages Initial commit 2024-03-20 13:04:27 -04:00
Properties Initial commit 2024-03-20 13:04:27 -04:00
Scripts Initial commit 2024-03-20 13:04:27 -04:00
Views Initial commit 2024-03-20 13:04:27 -04:00
cmutemplate.html Initial commit 2024-03-20 13:04:27 -04:00
Crypt.cs finished patEdit.aspx mostly 2024-03-28 15:04:52 -04:00
Default.aspx Initial commit 2024-03-20 13:04:27 -04:00
Default.aspx.cs Initial commit 2024-03-20 13:04:27 -04:00
Default.aspx.designer.cs Initial commit 2024-03-20 13:04:27 -04:00
favicon.ico Initial commit 2024-03-20 13:04:27 -04:00
FWA_MAIN.csproj Merge remote-tracking branch 'origin/master' 2024-03-28 19:15:03 -04:00
Global.asax Initial commit 2024-03-20 13:04:27 -04:00
Global.asax.cs Initial commit 2024-03-20 13:04:27 -04:00
main.aspx.cs Merge remote-tracking branch 'origin/master' 2024-03-28 12:08:35 -04:00
main.css finished with patients 2024-03-28 15:56:19 -04:00
main.master Initial commit 2024-03-20 13:04:27 -04:00
main.master.designer.cs Initial commit 2024-03-20 13:04:27 -04:00
medDelete.aspx Med search, new, edit, delete made with corresponding labels. 2024-03-24 19:29:36 -04:00
medDelete.aspx.cs Finished all med pages exist, correct info not populated 2024-03-24 15:30:21 -07:00
medDelete.aspx.designer.cs Fixing missing file 2024-03-25 17:13:14 -04:00
medEdit.aspx Med search, new, edit, delete made with corresponding labels. 2024-03-24 19:29:36 -04:00
medEdit.aspx.cs Finished all med pages exist, correct info not populated 2024-03-24 15:30:21 -07:00
medEdit.aspx.designer.cs Fixing missing file 2024-03-25 17:13:14 -04:00
MediSearch.aspx Med search, new, edit, delete made with corresponding labels. 2024-03-24 19:29:36 -04:00
MediSearch.aspx.cs Medi stuff 2024-03-21 18:17:57 -04:00
MediSearch.aspx.designer.cs Med search, new, edit, delete made with corresponding labels. 2024-03-24 19:29:36 -04:00
medNew.aspx Med search, new, edit, delete made with corresponding labels. 2024-03-24 19:29:36 -04:00
medNew.aspx.cs Medi stuff 2024-03-21 18:17:57 -04:00
medNew.aspx.designer.cs Med search, new, edit, delete made with corresponding labels. 2024-03-24 19:29:36 -04:00
packages.config Initial commit 2024-03-20 13:04:27 -04:00
patEdit.aspx finished with patients 2024-03-28 15:56:19 -04:00
patEdit.aspx.cs finished patEdit.aspx mostly 2024-03-28 15:04:52 -04:00
patEdit.aspx.designer.cs Initial commit 2024-03-20 13:04:27 -04:00
patNew.aspx finished with patients 2024-03-28 15:56:19 -04:00
patNew.aspx.cs new patient works 2024-03-28 15:21:56 -04:00
patNew.aspx.designer.cs Initial commit 2024-03-20 13:04:27 -04:00
patSearch.aspx finished with patients 2024-03-28 15:56:19 -04:00
patSearch.aspx.cs finished with patients 2024-03-28 15:56:19 -04:00
patSearch.aspx.designer.cs finished patEdit.aspx mostly 2024-03-28 15:04:52 -04:00
PharmactDataTier.cs finished patEdit.aspx mostly 2024-03-28 15:04:52 -04:00
physEdit.aspx blablabla 2024-03-28 19:12:34 -04:00
physEdit.aspx.cs blablabla 2024-03-28 19:12:34 -04:00
physician.aspx Test3 2024-03-21 18:29:31 -04:00
physician.aspx.cs Test3 2024-03-21 18:29:31 -04:00
physician.aspx.designer.cs Test3 2024-03-21 18:29:31 -04:00
physNew.aspx blablabla 2024-03-28 19:12:34 -04:00
physNew.aspx.cs blablabla 2024-03-28 19:12:34 -04:00
physNew.aspx.designer.cs blablabla 2024-03-28 19:12:34 -04:00
preNew.aspx Added Prescription search and new prescription 2024-03-28 10:17:25 -04:00
preNew.aspx.cs Added Prescription search and new prescription 2024-03-28 10:17:25 -04:00
preNew.aspx.designer.cs Added Prescription search and new prescription 2024-03-28 10:17:25 -04:00
Prescription.aspx Added Prescription search and new prescription 2024-03-28 10:17:25 -04:00
Prescription.aspx.cs Added Prescription search and new prescription 2024-03-28 10:17:25 -04:00
Prescription.aspx.designer.cs Added Prescription search and new prescription 2024-03-28 10:17:25 -04:00
testpage.aspx Initial commit 2024-03-20 13:04:27 -04:00
testpage.aspx.cs Initial commit 2024-03-20 13:04:27 -04:00
Val.cs new patient works 2024-03-28 15:21:56 -04:00
Web.config corrected connection string to connect to FinalProjectOfficialPharmacy instead of College2 2024-03-28 07:48:01 -04:00
Web.Debug.config Initial commit 2024-03-20 13:04:27 -04:00
Web.Release.config Initial commit 2024-03-20 13:04:27 -04:00