netnobody19
|
47d13f3841
|
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.dll
# FWA_MAIN/obj/Debug/FWA_MAIN.pdb
|
2024-04-03 19:25:07 -04:00 |
|
netnobody19
|
0c31e87b73
|
Final
|
2024-04-03 19:23:50 -04:00 |
|
EggMan20339
|
be2d0534f4
|
fixed id validiation on preEdit.aspx.cs and made medi new more centered
|
2024-04-03 18:54:23 -04:00 |
|
cadenjmoore
|
38c01a7d70
|
Finished MediBedi fully, broke prescription then fixed it and changed session values to avoid cross population
|
2024-04-03 16:50:34 -04:00 |
|
cadenjmoore
|
1af5fa7a4f
|
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.dll
# FWA_MAIN/obj/Debug/FWA_MAIN.pdb
|
2024-04-03 15:21:49 -04:00 |
|
cadenjmoore
|
f699063d2e
|
Almost working New medi
|
2024-04-03 15:21:33 -04:00 |
|
EggMan20339
|
6fe3add26a
|
made some small changes to the welcome page
|
2024-04-03 11:22:40 -04:00 |
|
cadenjmoore
|
a5c4b903e3
|
Med edit and save work
|
2024-04-03 10:15:02 -04:00 |
|
cadenjmoore
|
793984a4d0
|
working with med edit
|
2024-04-03 10:08:41 -04:00 |
|
cadenjmoore
|
ccdf70b85f
|
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.dll
# FWA_MAIN/obj/Debug/FWA_MAIN.pdb
|
2024-04-03 10:01:59 -04:00 |
|
cadenjmoore
|
4a3239073d
|
Med edit work
|
2024-04-03 10:01:25 -04:00 |
|
EggMan20339
|
81eb144527
|
added .trim to patEdit.aspx.cs
|
2024-04-03 08:27:59 -04:00 |
|
cadenjmoore
|
a393631e61
|
Fixed medi css
|
2024-04-02 17:30:32 -04:00 |
|
|
|
69e33fd0a8
|
did a little more work on Refills
|
2024-04-02 16:26:34 -04:00 |
|
netnobody19
|
4a6f1b6d52
|
Merge remote-tracking branch 'origin/master'
|
2024-04-02 10:07:29 -04:00 |
|
EggMan20339
|
9c78ff1aed
|
idk
|
2024-04-02 09:34:54 -04:00 |
|
EggMan20339
|
209a07a411
|
made it so that you cant refill past the allowed refill number
|
2024-04-02 09:14:08 -04:00 |
|
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
|
bbb273f668
|
Added prescription edit
|
2024-03-28 19:21:44 -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 |
|
|
|
bcfba3fb27
|
finished with patients
|
2024-03-28 15:56:19 -04:00 |
|
|
|
8fc2e1ab81
|
new patient works
|
2024-03-28 15:21:56 -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 |
|
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
|
751b9cb1f9
|
corrected connection string to connect to FinalProjectOfficialPharmacy instead of College2
|
2024-03-28 07:48:01 -04:00 |
|
EggMan20339
|
dda2a32318
|
added datatier
|
2024-03-27 11:14:35 -04:00 |
|
Caden
|
0ae893a805
|
Fixing missing file
|
2024-03-25 17:13:14 -04:00 |
|
Caden
|
ba0b113255
|
Med search, new, edit, delete made with corresponding labels.
|
2024-03-24 19:29:36 -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
|
de453382ed
|
medi bedi
|
2024-03-21 18:20:41 -04:00 |
|
cadenjmoore
|
f3b64d2c9e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# FWA_MAIN/FWA_MAIN.csproj
|
2024-03-21 18:20:18 -04:00 |
|
cadenjmoore
|
7e21ce0ac9
|
Medi stuff
|
2024-03-21 18:17:57 -04:00 |
|
netnobody19
|
5ea0b12260
|
Test
|
2024-03-21 18:13:21 -04:00 |
|
cadenjmoore
|
6d357f4100
|
Test
|
2024-03-21 17:26:50 -04:00 |
|
|
|
81b56351c4
|
again
|
2024-03-20 14:05:13 -04:00 |
|
|
|
650f7abc88
|
test
|
2024-03-20 14:04:36 -04:00 |
|
|
|
76403be7b8
|
test
|
2024-03-20 13:13:19 -04:00 |
|
|
|
afb094bf06
|
Initial commit
|
2024-03-20 13:04:27 -04:00 |
|
