diff --git a/FWA_MAIN/MediSearch.aspx b/FWA_MAIN/MediSearch.aspx index 3b913c8..11d9971 100644 --- a/FWA_MAIN/MediSearch.aspx +++ b/FWA_MAIN/MediSearch.aspx @@ -29,32 +29,32 @@
- +

- +

- +

-
- -
-
-
- -
-

+
+ +
+
+
+ +
+

diff --git a/FWA_MAIN/MediSearch.aspx.designer.cs b/FWA_MAIN/MediSearch.aspx.designer.cs index a9075c2..5088cfe 100644 --- a/FWA_MAIN/MediSearch.aspx.designer.cs +++ b/FWA_MAIN/MediSearch.aspx.designer.cs @@ -14,24 +14,6 @@ namespace FWA_MAIN public partial class MediSearch { - /// - /// txtFNAME control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtFNAME; - - /// - /// txtLNAME control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtLNAME; - /// /// txtMedID control. /// @@ -41,6 +23,24 @@ namespace FWA_MAIN /// protected global::System.Web.UI.WebControls.TextBox txtMedID; + /// + /// txtMedName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtMedName; + + /// + /// txtRxNum control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtRxNum; + /// /// btnMediSearch control. /// diff --git a/FWA_MAIN/bin/FWA_MAIN.dll b/FWA_MAIN/bin/FWA_MAIN.dll index 5349fc9..2a84f2c 100644 Binary files a/FWA_MAIN/bin/FWA_MAIN.dll and b/FWA_MAIN/bin/FWA_MAIN.dll differ diff --git a/FWA_MAIN/bin/FWA_MAIN.pdb b/FWA_MAIN/bin/FWA_MAIN.pdb index 579d4e7..c4e30f4 100644 Binary files a/FWA_MAIN/bin/FWA_MAIN.pdb and b/FWA_MAIN/bin/FWA_MAIN.pdb differ diff --git a/FWA_MAIN/medDelete.aspx b/FWA_MAIN/medDelete.aspx index 690c843..439678c 100644 --- a/FWA_MAIN/medDelete.aspx +++ b/FWA_MAIN/medDelete.aspx @@ -4,47 +4,26 @@ -

Edit Patient

+

Delete Medication

-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ +
+
diff --git a/FWA_MAIN/medEdit.aspx b/FWA_MAIN/medEdit.aspx index efc951b..a22fa17 100644 --- a/FWA_MAIN/medEdit.aspx +++ b/FWA_MAIN/medEdit.aspx @@ -4,46 +4,31 @@ -

Edit Patient

+

Edit Medication

-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

diff --git a/FWA_MAIN/medNew.aspx b/FWA_MAIN/medNew.aspx index 48c5dfe..371452c 100644 --- a/FWA_MAIN/medNew.aspx +++ b/FWA_MAIN/medNew.aspx @@ -10,42 +10,30 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+ +
-
-
+

diff --git a/FWA_MAIN/medNew.aspx.designer.cs b/FWA_MAIN/medNew.aspx.designer.cs index 14a7086..0963c38 100644 --- a/FWA_MAIN/medNew.aspx.designer.cs +++ b/FWA_MAIN/medNew.aspx.designer.cs @@ -33,13 +33,13 @@ namespace FWA_MAIN protected global::System.Web.UI.WebControls.TextBox txtMedName; /// - /// txtDatePre control. + /// txtIntake control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtDatePre; + protected global::System.Web.UI.WebControls.TextBox txtIntake; /// /// txtPatID control. @@ -51,85 +51,40 @@ namespace FWA_MAIN protected global::System.Web.UI.WebControls.TextBox txtPatID; /// - /// txtFNAME control. + /// txtFrequency control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtFNAME; + protected global::System.Web.UI.WebControls.TextBox txtFrequency; /// - /// txtLNAME control. + /// txtDosage control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtLNAME; + protected global::System.Web.UI.WebControls.TextBox txtDosage; /// - /// txt control. + /// txtPurpose control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txt; + protected global::System.Web.UI.WebControls.TextBox txtPurpose; /// - /// txtDOB control. + /// txtRxNum control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtDOB; - - /// - /// txtGender control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtGender; - - /// - /// txtCity control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtCity; - - /// - /// txtZip control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtZip; - - /// - /// txtState control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtState; - - /// - /// txtPhoneNum control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtPhoneNum; + protected global::System.Web.UI.WebControls.TextBox txtRxNum; /// /// btnSavePat control. diff --git a/FWA_MAIN/obj/Debug/FWA_MAIN.dll b/FWA_MAIN/obj/Debug/FWA_MAIN.dll index 5349fc9..2a84f2c 100644 Binary files a/FWA_MAIN/obj/Debug/FWA_MAIN.dll and b/FWA_MAIN/obj/Debug/FWA_MAIN.dll differ diff --git a/FWA_MAIN/obj/Debug/FWA_MAIN.pdb b/FWA_MAIN/obj/Debug/FWA_MAIN.pdb index 579d4e7..c4e30f4 100644 Binary files a/FWA_MAIN/obj/Debug/FWA_MAIN.pdb and b/FWA_MAIN/obj/Debug/FWA_MAIN.pdb differ