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

.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\cmoore\RiderProjects\FWA_MAIN\FWA_MAIN" />
         </application>
         <bindings>
           <binding protocol="http" bindingInformation="*:5000:localhost" />

FWA_MAIN/FWA_MAIN.csproj

@@ -181,6 +181,13 @@
     <Compile Include="physician.aspx.designer.cs">
       <DependentUpon>physician.aspx</DependentUpon>
     </Compile>
+    <Compile Include="preEdit.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>preEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="preEdit.aspx.designer.cs">
+      <DependentUpon>preEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="preNew.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
       <DependentUpon>preNew.aspx</DependentUpon>
@@ -229,6 +236,7 @@
     <Content Include="patSearch.aspx" />
     <Content Include="patNew.aspx" />
     <Content Include="physician.aspx" />
+    <Content Include="preEdit.aspx" />
     <Content Include="Scripts\bootstrap.js" />
     <Content Include="Scripts\bootstrap.min.js" />
     <Content Include="Default.aspx" />

FWA_MAIN/Prescription.aspx

@@ -21,21 +21,12 @@
             </div>
             <br/>
             <div class="indivPatDiv" style="text-align: right;">
-                            <label for="txtNumRefill" class="buttonLabel">Number of refills: </label>
+                            <label for="txtMedID" class="buttonLabel">Medication ID: </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">
@@ -52,21 +43,12 @@
             </div>
             <br/>
             <div class="indivPatDiv">
-                            <asp:TextBox runat="server" CssClass="defaultTXT" id="txtNumRefill"></asp:TextBox>
+                            <asp:TextBox runat="server" CssClass="defaultTXT" id="txtMedID"></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/>
             
             
             

FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-9d1cdd184476eb265233bc67136ca7e3159166a02c46b34cb16710aa0fb22e94
+d2d2a219092f2f86c27fbbb67e6e1855b3e51df134233d4f20d9e880feaa1a41

FWA_MAIN/preEdit.aspx

@@ -0,0 +1,48 @@
+<%@ Page Title="Edit Prescription" Language="C#" MasterPageFile="main.master" CodeBehind="preEdit.aspx.cs" Inherits="FWA_MAIN.preEdit" %>
+
+<asp:Content runat="server" ContentPlaceHolderID="cph1">
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+        <script type="text/javascript">
+    $(document).ready(function() {
+        $(document).keypress(function(e) {
+            if (e.which === 13) { // Enter key = keycode 13
+                e.preventDefault(); // Prevent the default Enter action
+                $("#<%= btnSavePat.ClientID %>").click(); // Trigger the search button click
+            }
+        });
+    });
+    </script>
+    <link type="text/css" href="main.css"/>
+    
+    <h1 style="text-align: center; font-size: 44px">Edit 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>
+            <div class="indivPatDiv" style="text-align: right"><label class="buttonLabel">Patient ID: </label></div>
+            <div class="indivPatDiv" style="text-align: right"><label class="buttonLabel">Medication ID: </label></div>
+            <div class="indivPatDiv" style="text-align: right"><label class="buttonLabel">Physician ID: </label></div>
+            <div class="indivPatDiv" style="text-align: right"><label class="buttonLabel">Refills Used: </label></div>
+            <div class="indivPatDiv" style="text-align: right"><label class="buttonLabel">Refills Allowed: </label></div>
+           
+        </div>
+        <div class="patDiv">
+            <div class="indivPatDiv"><asp:TextBox runat="server" CssClass="defaultTXT" ID="txtRxNum"></asp:TextBox></div>
+            <div class="indivPatDiv"><asp:TextBox runat="server" CssClass="defaultTXT" ID="txtPatID"></asp:TextBox></div>
+            <div class="indivPatDiv"><asp:TextBox runat="server" CssClass="defaultTXT" ID="txtMedID"></asp:TextBox></div>
+            <div class="indivPatDiv"><asp:TextBox runat="server" CssClass="defaultTXT" ID="txtPhysID"></asp:TextBox></div>
+            <div class="indivPatDiv"><asp:TextBox runat="server" CssClass="defaultTXT" ID="txtUsed"></asp:TextBox></div>
+            <div class="indivPatDiv"><asp:TextBox runat="server" CssClass="defaultTXT" ID="txtAllowed"></asp:TextBox></div>
+           
+        </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="Save" OnClick="btnSavePre_OnClick"/></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/preEdit.aspx.cs

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

FWA_MAIN/preEdit.aspx.designer.cs

@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+// <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 preEdit
+    {
+
+        /// <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>
+        /// 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>
+        /// 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>
+        /// 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>
+        /// txtUsed 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 txtUsed;
+
+        /// <summary>
+        /// txtAllowed 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 txtAllowed;
+
+        /// <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));
+            }
+        }
+    }
+}