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

.idea/config/applicationhost.config

@@ -155,7 +155,7 @@
       <virtualDirectoryDefaults allowSubDirConfig="true" />
       <site name="FWA_MAIN" id="1">
         <application path="/" applicationPool="Clr4IntegratedAppPool">
-          <virtualDirectory path="/" physicalPath="C:\Users\eggman\Nextcloud\TSCT\2nd Year\SEM 4\RiderProjects\FWA_MAIN\FWA_MAIN" />
+          <virtualDirectory path="/" physicalPath="C:\Users\IVAN\RiderProjects\FWA_MAIN\FWA_MAIN" />
         </application>
         <bindings>
           <binding protocol="http" bindingInformation="*:5000:localhost" />

FWA_MAIN/FWA_MAIN.csproj

@@ -181,6 +181,20 @@
     <Compile Include="physician.aspx.designer.cs">
       <DependentUpon>physician.aspx</DependentUpon>
     </Compile>
+    <Compile Include="preNew.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>preNew.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="preNew.aspx.designer.cs">
+      <DependentUpon>preNew.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Prescription.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>Prescription.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Prescription.aspx.designer.cs">
+      <DependentUpon>Prescription.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="testpage.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>

FWA_MAIN/Prescription.aspx

@@ -0,0 +1,161 @@
+<%@ Page Title="Prescription" Language="C#" MasterPageFile="main.master" CodeBehind="Prescription.aspx.cs" Inherits="FWA_MAIN.Prescription" %>
+
+<asp:Content runat="server" ContentPlaceHolderID="cph1">
+
+    <link type="text/css" href="main.css"/>
+    <h1 style="text-align: center; font-size: 44px">
+        Prescriptions
+    </h1>
+    <div class="patDiv" style="padding-left: 400px">
+        <div class="patDiv" style="width: 100px; margin-right: 5px">
+            <div class="indivPatDiv" style="text-align: right;">
+                <label for="txtRxNum" class="buttonLabel">Rx Number: </label>
+            </div>
+            <br/>
+            <div class="indivPatDiv" style="text-align: right;">
+                <label for="txtPhysID" class="buttonLabel">Physician ID: </label>
+            </div>
+            <br/>
+            <div class="indivPatDiv" style="text-align: right;">
+                <label for="txtPatID" class="buttonLabel">Patient ID: </label>
+            </div>
+            <br/>
+            <div class="indivPatDiv" style="text-align: right;">
+                            <label for="txtNumRefill" class="buttonLabel">Number of refills: </label>
+                        </div>
+                        <br/>
+            <div class="indivPatDiv" style="text-align: right;">
+                            <label for="txtPastRefill" class="buttonLabel">Number of Past Refills: </label>
+                        </div>
+                        <br/>
+            <div class="indivPatDiv" style="text-align: right;">
+                            <label for="txtStart" class="buttonLabel">Prescription Start Date: </label>
+                        </div>
+                        <br/>
+            <div class="indivPatDiv" style="text-align: right;">
+                            <label for="txtPreEnd" class="buttonLabel">Prescription End Date: </label>
+                        </div>
+                        <br/>
+        </div>
+
+        <div class="patDiv" style="width: 400px">
+            <div class="indivPatDiv">
+                <asp:TextBox runat="server" CssClass="defaultTXT" id="txtRxNum"></asp:TextBox>
+            </div>
+            <br/>
+            <div class="indivPatDiv">
+                <asp:TextBox runat="server" CssClass="defaultTXT" id="txtPhysID"></asp:TextBox>
+            </div>
+            <br/>
+            <div class="indivPatDiv">
+                <asp:TextBox runat="server" CssClass="defaultTXT" id="txtPatID"></asp:TextBox>
+            </div>
+            <br/>
+            <div class="indivPatDiv">
+                            <asp:TextBox runat="server" CssClass="defaultTXT" id="txtNumRefill"></asp:TextBox>
+                        </div>
+                        <br/>
+            <div class="indivPatDiv">
+                            <asp:TextBox runat="server" CssClass="defaultTXT" id="txtPastRefill"></asp:TextBox>
+                        </div>
+                        <br/>
+            <div class="indivPatDiv">
+                                        <asp:TextBox runat="server" CssClass="defaultTXT" id="txtStart"></asp:TextBox>
+                                    </div>
+                                    <br/>
+            <div class="indivPatDiv">
+                                        <asp:TextBox runat="server" CssClass="defaultTXT" id="txtPreEnd"></asp:TextBox>
+                                    </div>
+                                    <br/>
+            
+            
+            
+        </div>
+        <br/>
+        <asp:Button runat="server" ID="btnPatSearch" Text="Search" CssClass="btnPatSearch" OnClick="btnPreSearch_OnClick"/>
+        
+    </div>
+    
+    <asp:GridView runat="server" ID="gvPatient" BorderColor="red"></asp:GridView>
+    
+    <script type="text/javascript"> 
+            document.oncontextmenu = rightClick; 
+      
+            function rightClick(clickEvent) { 
+                clickEvent.preventDefault(); 
+                // return false; 
+            } 
+        </script>
+
+    <div id="contextMenu" class="context-menu"
+         style="display: none">
+        <ul>
+            <li>
+                <a href="preNew.aspx">New</a>
+            </li>
+            <li>
+                <a href="preEdit.aspx">Edit</a>
+            </li>
+            <li>
+                <a href="#">Delete</a>
+            </li>
+
+            <%-- <asp:Button runat="server" Text="New" OnClick="btnNew_OnClick" /> --%>
+        </ul>
+    </div>
+    <script> 
+        document.onclick = hideMenu; 
+        document.oncontextmenu = rightClick; 
+          
+        function hideMenu() { 
+            document.getElementById("contextMenu") 
+                    .style.display = "none" 
+        } 
+      
+        
+        function rightClick(e) { 
+            e.preventDefault(); 
+      
+            if (document.getElementById("contextMenu").style.display == "block") 
+                hideMenu(); 
+            else{ 
+                var menu = document.getElementById("contextMenu") 
+      
+                menu.style.display = 'block'; 
+                menu.style.left = e.pageX + "px"; 
+                menu.style.top = e.pageY + "px"; 
+            } 
+        } 
+    </script>
+    <style type="text/css"> 
+        .context-menu { 
+            position: absolute; 
+            text-align: center; 
+            background: lightgray; 
+            border: 1px solid black; 
+        } 
+      
+        .context-menu ul { 
+            padding: 0px; 
+            margin: 0px; 
+            min-width: 150px; 
+            list-style: none; 
+        } 
+      
+        .context-menu ul li { 
+            padding-bottom: 7px; 
+            padding-top: 7px; 
+            border: 1px solid black; 
+        } 
+      
+        .context-menu ul li a { 
+            text-decoration: none; 
+            color: black; 
+        } 
+      
+        .context-menu ul li:hover { 
+            background: darkgray; 
+        } 
+    </style>
+
+</asp:Content>

FWA_MAIN/Prescription.aspx.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Web.UI;
+
+namespace FWA_MAIN
+{
+    public partial class Prescription : Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        protected void btnPreSearch_OnClick(object sender, EventArgs e)
+        {
+            throw new NotImplementedException();
+        }
+        
+        
+        protected void btnNew_OnClick(object sender, EventArgs e)
+        {
+            
+            Response.Redirect("preNew.aspx");
+            
+        }
+    }
+}

FWA_MAIN/Prescription.aspx.designer.cs

@@ -0,0 +1,112 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FWA_MAIN
+{
+
+
+    public partial class Prescription
+    {
+
+        /// <summary>
+        /// txtRxNum control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtRxNum;
+
+        /// <summary>
+        /// txtPhysID control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtPhysID;
+
+        /// <summary>
+        /// txtPatID control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtPatID;
+
+        /// <summary>
+        /// txtNumRefill control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtNumRefill;
+
+        /// <summary>
+        /// txtPastRefill control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtPastRefill;
+
+        /// <summary>
+        /// txtStart control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtStart;
+
+        /// <summary>
+        /// txtPreEnd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtPreEnd;
+
+        /// <summary>
+        /// btnPatSearch control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnPatSearch;
+
+        /// <summary>
+        /// gvPatient control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView gvPatient;
+
+        /// <summary>
+        /// Master property.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated property.
+        /// </remarks>
+        public new FWA_MAIN.main Master
+        {
+            get
+            {
+                return ((FWA_MAIN.main)(base.Master));
+            }
+        }
+    }
+}

FWA_MAIN/main.aspx.cs

@@ -56,7 +56,7 @@ namespace FWA_MAIN
 
         protected void btnPrescription_OnClick(object sender, EventArgs e)
         {
-            throw new NotImplementedException();
+            Response.Redirect("Prescription.aspx");
         }
     }
 }

FWA_MAIN/physNew.aspx

@@ -0,0 +1,2 @@
+<%@ Page Title="Title" Language="C#" MasterPageFile="MasterPage" CodeBehind="physNew.aspx.cs" Inherits="FWA_MAIN.physNew" %>
+

FWA_MAIN/physNew.aspx.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Web.UI;
+
+namespace FWA_MAIN
+{
+    public partial class physNew : Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

FWA_MAIN/physNew.aspx.designer.cs

@@ -0,0 +1,17 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FWA_MAIN
+{
+
+
+    public partial class physNew
+    {
+    }
+}

FWA_MAIN/preNew.aspx

@@ -0,0 +1,42 @@
+<%@ Page Title="New Prescription" Language="C#" MasterPageFile="main.master" CodeBehind="preNew.aspx.cs" Inherits="FWA_MAIN.preNew" %>
+
+<asp:Content runat="server" ContentPlaceHolderID="cph1">
+    
+    <link type="text/css" href="main.css"/>
+    
+    <h1 style="text-align: center; font-size: 44px">New Prescription</h1>
+    <div class="patDiv">
+    <div class="patDiv">
+        <div class="patDiv" style="padding-left: 150px; padding-right: 5px;width: 100px">
+            <div class="indivPatDiv" style="text-align: right"><label class="buttonLabel">Rx Number: </label></div><br/>
+            <div class="indivPatDiv" style="text-align: right"><label class="buttonLabel">Number of Refills: </label></div><br/>
+            <div class="indivPatDiv" style="text-align: right"><label class="buttonLabel">Number of Past Refills: </label></div><br/>
+            <div class="indivPatDiv" style="text-align: right"><label class="buttonLabel">Physician ID: </label></div><br/>
+            <div class="indivPatDiv" style="text-align: right"><label class="buttonLabel">Medication ID: </label></div><br/>
+            <div class="indivPatDiv" style="text-align: right"><label class="buttonLabel">Patient ID: </label></div><br/>
+            <div class="indivPatDiv" style="text-align: right"><label class="buttonLabel">Prescription Start Date: </label></div><br/>
+            <div class="indivPatDiv" style="text-align: right"><label class="buttonLabel">Prescription End Date: </label></div><br/>
+            
+        </div>
+        <div class="patDiv">
+            <div class="indivPatDiv"><asp:TextBox runat="server" CssClass="defaultTXT" ID="txtRxNum"></asp:TextBox></div><br/>
+            <div class="indivPatDiv"><asp:TextBox runat="server" CssClass="defaultTXT" ID="txtNumRefill"></asp:TextBox></div><br/>
+            <div class="indivPatDiv"><asp:TextBox runat="server" CssClass="defaultTXT" ID="txtPastRefill"></asp:TextBox></div><br/>
+            <div class="indivPatDiv"><asp:TextBox runat="server" CssClass="defaultTXT" ID="txtPhysID"></asp:TextBox></div><br/>
+            <div class="indivPatDiv"><asp:TextBox runat="server" CssClass="defaultTXT" ID="txtMedID"></asp:TextBox></div><br/>
+            <div class="indivPatDiv"><asp:TextBox runat="server" CssClass="defaultTXT" ID="txtPatID"></asp:TextBox></div><br/>
+            <div class="indivPatDiv"><asp:TextBox runat="server" CssClass="defaultTXT" ID="txtPreStart"></asp:TextBox></div><br/>
+            <div class="indivPatDiv"><asp:TextBox runat="server" CssClass="defaultTXT" ID="txtPreEnd"></asp:TextBox></div><br/>
+            
+        </div>
+    </div>    
+    
+        
+    </div>
+    
+    <br/>
+    <div class="patDiv" style="margin-left: 500px">
+        <div style="margin-right: 10px; display: inline-block"><asp:Button runat="server" CssClass="standardbtn" ID="btnSavePat" Text="Create"/></div>
+        <div style="display: inline-block"><asp:Button runat="server" CssClass="standardbtn" ID="btnCancelPat" Text="Cancel" OnClick="btnCancelPre_OnClick"/></div>
+    </div>
+</asp:Content>

FWA_MAIN/preNew.aspx.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Web.UI;
+
+namespace FWA_MAIN
+{
+    public partial class preNew : Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        protected void btnCancelPre_OnClick(object sender, EventArgs e)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

FWA_MAIN/preNew.aspx.designer.cs

@@ -0,0 +1,121 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FWA_MAIN
+{
+
+
+    public partial class preNew
+    {
+
+        /// <summary>
+        /// txtRxNum control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtRxNum;
+
+        /// <summary>
+        /// txtNumRefill control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtNumRefill;
+
+        /// <summary>
+        /// txtPastRefill control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtPastRefill;
+
+        /// <summary>
+        /// txtPhysID control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtPhysID;
+
+        /// <summary>
+        /// txtMedID control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtMedID;
+
+        /// <summary>
+        /// txtPatID control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtPatID;
+
+        /// <summary>
+        /// txtPreStart control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtPreStart;
+
+        /// <summary>
+        /// txtPreEnd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtPreEnd;
+
+        /// <summary>
+        /// btnSavePat control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnSavePat;
+
+        /// <summary>
+        /// btnCancelPat control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btnCancelPat;
+
+        /// <summary>
+        /// Master property.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated property.
+        /// </remarks>
+        public new FWA_MAIN.main Master
+        {
+            get
+            {
+                return ((FWA_MAIN.main)(base.Master));
+            }
+        }
+    }
+}