diff --git a/FWA_MAIN/FWA_MAIN.csproj b/FWA_MAIN/FWA_MAIN.csproj index 1fc4ac2..210de1f 100644 --- a/FWA_MAIN/FWA_MAIN.csproj +++ b/FWA_MAIN/FWA_MAIN.csproj @@ -133,6 +133,13 @@ MediSearch.aspx + + ASPXCodeBehind + medNew.aspx + + + medNew.aspx + ASPXCodeBehind patEdit.aspx @@ -176,6 +183,7 @@ + diff --git a/FWA_MAIN/MediSearch.aspx b/FWA_MAIN/MediSearch.aspx index c705c4d..fd2ba71 100644 --- a/FWA_MAIN/MediSearch.aspx +++ b/FWA_MAIN/MediSearch.aspx @@ -1,2 +1,169 @@ -<%@ Page Title="Title" Language="C#" MasterPageFile="MasterPage" CodeBehind="MediSearch.aspx.cs" Inherits="FWA_MAIN.MediSearch" %> +<%@ Page Title="Medication" Language="C#" MasterPageFile="main.master" CodeBehind="MediSearch.aspx.cs" Inherits="FWA_MAIN.MediSearch" %> + + + + + + + + +

+ Medications +

+
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + diff --git a/FWA_MAIN/MediSearch.aspx.cs b/FWA_MAIN/MediSearch.aspx.cs index 190f3d6..dce0cf9 100644 --- a/FWA_MAIN/MediSearch.aspx.cs +++ b/FWA_MAIN/MediSearch.aspx.cs @@ -1,5 +1,6 @@ using System; using System.Web.UI; +using System.Web.UI.WebControls; namespace FWA_MAIN { @@ -9,5 +10,20 @@ namespace FWA_MAIN { } + + protected void btnMediSearch_OnClick(object sender, EventArgs e) + { + throw new NotImplementedException(); + } + + protected void gvMedication_OnSelectedIndexChanged(object sender, EventArgs e) + { + throw new NotImplementedException(); + } + + protected void gvMedication_OnRowDataBound(object sender, GridViewRowEventArgs e) + { + throw new NotImplementedException(); + } } } \ No newline at end of file diff --git a/FWA_MAIN/MediSearch.aspx.designer.cs b/FWA_MAIN/MediSearch.aspx.designer.cs new file mode 100644 index 0000000..a9075c2 --- /dev/null +++ b/FWA_MAIN/MediSearch.aspx.designer.cs @@ -0,0 +1,76 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +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. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtMedID; + + /// + /// btnMediSearch control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnMediSearch; + + /// + /// gvMedication control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView gvMedication; + + /// + /// Master property. + /// + /// + /// Auto-generated property. + /// + public new FWA_MAIN.main Master + { + get + { + return ((FWA_MAIN.main)(base.Master)); + } + } + } +} diff --git a/FWA_MAIN/bin/FWA_MAIN.dll b/FWA_MAIN/bin/FWA_MAIN.dll index dd3b2ee..6cf8f28 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 a25df64..7c02399 100644 Binary files a/FWA_MAIN/bin/FWA_MAIN.pdb and b/FWA_MAIN/bin/FWA_MAIN.pdb differ diff --git a/FWA_MAIN/main.aspx.cs b/FWA_MAIN/main.aspx.cs index 67f3586..f35ccd9 100644 --- a/FWA_MAIN/main.aspx.cs +++ b/FWA_MAIN/main.aspx.cs @@ -51,7 +51,7 @@ namespace FWA_MAIN protected void btnMedication_OnClick(object sender, EventArgs e) { - + Response.Redirect("MediSearch.aspx"); } protected void btnPrescription_OnClick(object sender, EventArgs e) diff --git a/FWA_MAIN/main.css b/FWA_MAIN/main.css index 2e23c84..798291a 100644 --- a/FWA_MAIN/main.css +++ b/FWA_MAIN/main.css @@ -20,7 +20,7 @@ } -.btnPatSearch{ +.btnPatSearch, .btnMediSearch{ margin-left: 177px; @@ -31,7 +31,7 @@ } -.indivPatDiv{ +.indivPatDiv, .indivMedDiv{ height: 35px; /*outline: solid 1px red;*/ @@ -48,7 +48,7 @@ } -.patDiv{ +.patDiv, .medDiv{ vertical-align: top; /*outline: solid 1px red;*/ display: inline-block; diff --git a/FWA_MAIN/medNew.aspx b/FWA_MAIN/medNew.aspx new file mode 100644 index 0000000..48c5dfe --- /dev/null +++ b/FWA_MAIN/medNew.aspx @@ -0,0 +1,53 @@ +<%@ Page Title="New Medication" Language="C#" MasterPageFile="main.master" CodeBehind="medNew.aspx.cs" Inherits="FWA_MAIN.medNew" %> + + + + + +

New Medication

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/FWA_MAIN/medNew.aspx.cs b/FWA_MAIN/medNew.aspx.cs new file mode 100644 index 0000000..7df47ba --- /dev/null +++ b/FWA_MAIN/medNew.aspx.cs @@ -0,0 +1,18 @@ +using System; +using System.Web.UI; + +namespace FWA_MAIN +{ + public partial class medNew : Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + + protected void btnCancelPat_OnClick(object sender, EventArgs e) + { + throw new NotImplementedException(); + } + } +} \ No newline at end of file diff --git a/FWA_MAIN/medNew.aspx.designer.cs b/FWA_MAIN/medNew.aspx.designer.cs new file mode 100644 index 0000000..14a7086 --- /dev/null +++ b/FWA_MAIN/medNew.aspx.designer.cs @@ -0,0 +1,166 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace FWA_MAIN +{ + + + public partial class medNew + { + + /// + /// txtMedID control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + 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; + + /// + /// txtDatePre control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtDatePre; + + /// + /// txtPatID control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtPatID; + + /// + /// 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; + + /// + /// txt control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txt; + + /// + /// txtDOB 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; + + /// + /// btnSavePat control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnSavePat; + + /// + /// btnCancelPat control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnCancelPat; + + /// + /// Master property. + /// + /// + /// Auto-generated property. + /// + public new FWA_MAIN.main Master + { + get + { + return ((FWA_MAIN.main)(base.Master)); + } + } + } +} diff --git a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache index e44749c..2013568 100644 --- a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache +++ b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -31d7b4cf616a35b757ec4946f8a0cfa2417cf6e07179831f891af4bde67c4075 +113c6d70ea1dab72686a10d8d6ab21e247c5896d11512e37740ed2a257fac19b diff --git a/FWA_MAIN/obj/Debug/FWA_MAIN.dll b/FWA_MAIN/obj/Debug/FWA_MAIN.dll index dd3b2ee..6cf8f28 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 a25df64..7c02399 100644 Binary files a/FWA_MAIN/obj/Debug/FWA_MAIN.pdb and b/FWA_MAIN/obj/Debug/FWA_MAIN.pdb differ