diff --git a/.idea/config/applicationhost.config b/.idea/config/applicationhost.config index 976a66d..0d5606b 100644 --- a/.idea/config/applicationhost.config +++ b/.idea/config/applicationhost.config @@ -155,7 +155,7 @@ - + diff --git a/FWA_MAIN/FWA_MAIN.csproj b/FWA_MAIN/FWA_MAIN.csproj index 8a8e2c5..e07dd8f 100644 --- a/FWA_MAIN/FWA_MAIN.csproj +++ b/FWA_MAIN/FWA_MAIN.csproj @@ -127,6 +127,20 @@ main.master + + ASPXCodeBehind + medDelete.aspx + + + medDelete.aspx + + + ASPXCodeBehind + medEdit.aspx + + + medEdit.aspx + ASPXCodeBehind MediSearch.aspx @@ -190,6 +204,8 @@ + + diff --git a/FWA_MAIN/MediSearch.aspx b/FWA_MAIN/MediSearch.aspx index fd2ba71..3b913c8 100644 --- a/FWA_MAIN/MediSearch.aspx +++ b/FWA_MAIN/MediSearch.aspx @@ -93,7 +93,7 @@ Edit
  • - Delete + Delete
    • <%-- --%> diff --git a/FWA_MAIN/bin/FWA_MAIN.dll b/FWA_MAIN/bin/FWA_MAIN.dll index f791652..5349fc9 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 2ca27a4..579d4e7 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 new file mode 100644 index 0000000..690c843 --- /dev/null +++ b/FWA_MAIN/medDelete.aspx @@ -0,0 +1,54 @@ +<%@ Page Title="Delete Medication" Language="C#" MasterPageFile="main.master" CodeBehind="medDelete.aspx.cs" Inherits="FWA_MAIN.medDelete" %> + + + + + +

    Edit Patient

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +     + diff --git a/FWA_MAIN/medDelete.aspx.cs b/FWA_MAIN/medDelete.aspx.cs new file mode 100644 index 0000000..50ffd4b --- /dev/null +++ b/FWA_MAIN/medDelete.aspx.cs @@ -0,0 +1,18 @@ +using System; +using System.Web.UI; + +namespace FWA_MAIN +{ + public partial class medDelete : 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/medEdit.aspx b/FWA_MAIN/medEdit.aspx new file mode 100644 index 0000000..efc951b --- /dev/null +++ b/FWA_MAIN/medEdit.aspx @@ -0,0 +1,53 @@ +<%@ Page Title="Edit Medication" Language="C#" MasterPageFile="main.master" CodeBehind="medEdit.aspx.cs" Inherits="FWA_MAIN.medEdit" %> + + + + + +

    Edit Patient

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +     \ No newline at end of file diff --git a/FWA_MAIN/medEdit.aspx.cs b/FWA_MAIN/medEdit.aspx.cs new file mode 100644 index 0000000..bcab2df --- /dev/null +++ b/FWA_MAIN/medEdit.aspx.cs @@ -0,0 +1,18 @@ +using System; +using System.Web.UI; + +namespace FWA_MAIN +{ + public partial class medEdit : 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/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache index 56fc954..62a5f96 100644 Binary files a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache and b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache differ diff --git a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache index 22301e2..da1ebf8 100644 --- a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache +++ b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -42e7680a16974b8b589cb0e2940a987bc79238ec8d31ff20ed638eb0517ddf03 +03d54558836e2fd184186c9d982fbf4e82893af120120f301c39a6bd7068ebc4 diff --git a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.FileListAbsolute.txt b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.FileListAbsolute.txt index 356431e..1c638a2 100644 --- a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.FileListAbsolute.txt +++ b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.FileListAbsolute.txt @@ -483,3 +483,79 @@ C:\Users\IVAN\Source\Repos\FWA_MAIN\FWA_MAIN\obj\Debug\FWA_MAIN.csproj.CoreCompi C:\Users\IVAN\Source\Repos\FWA_MAIN\FWA_MAIN\obj\Debug\FWA_MAIN.csproj.CopyComplete C:\Users\IVAN\Source\Repos\FWA_MAIN\FWA_MAIN\obj\Debug\FWA_MAIN.dll C:\Users\IVAN\Source\Repos\FWA_MAIN\FWA_MAIN\obj\Debug\FWA_MAIN.pdb +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\FWA_MAIN.dll.config +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\FWA_MAIN.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\FWA_MAIN.pdb +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\csc.exe +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\csc.exe.config +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\csc.rsp +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\csi.exe +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\csi.exe.config +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\csi.rsp +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\Microsoft.Build.Tasks.CodeAnalysis.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\Microsoft.CodeAnalysis.CSharp.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\Microsoft.CodeAnalysis.CSharp.Scripting.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\Microsoft.CodeAnalysis.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\Microsoft.CodeAnalysis.Scripting.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\Microsoft.CodeAnalysis.VisualBasic.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\Microsoft.CSharp.Core.targets +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\Microsoft.DiaSymReader.Native.amd64.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\Microsoft.DiaSymReader.Native.x86.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\Microsoft.Managed.Core.targets +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\Microsoft.VisualBasic.Core.targets +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.AppContext.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Collections.Immutable.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Console.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Diagnostics.FileVersionInfo.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Diagnostics.StackTrace.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.IO.Compression.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.IO.FileSystem.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.IO.FileSystem.Primitives.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.IO.Pipes.AccessControl.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.IO.Pipes.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Reflection.Metadata.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Security.AccessControl.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Security.Claims.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Security.Cryptography.Algorithms.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Security.Cryptography.Encoding.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Security.Cryptography.Primitives.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Security.Cryptography.X509Certificates.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Security.Principal.Windows.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Text.Encoding.CodePages.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.ValueTuple.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Xml.ReaderWriter.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Xml.XmlDocument.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Xml.XPath.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\System.Xml.XPath.XDocument.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\vbc.exe +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\vbc.exe.config +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\vbc.rsp +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\VBCSCompiler.exe +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\roslyn\VBCSCompiler.exe.config +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\Antlr3.Runtime.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\Microsoft.Web.Infrastructure.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\Newtonsoft.Json.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\System.Web.Helpers.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\System.Web.Mvc.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\System.Web.Optimization.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\System.Web.Razor.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\System.Web.WebPages.Deployment.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\System.Web.WebPages.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\System.Web.WebPages.Razor.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\WebGrease.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\System.Web.Helpers.xml +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\System.Web.Mvc.xml +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\System.Web.Optimization.xml +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\System.Web.Razor.xml +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\System.Web.WebPages.xml +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\System.Web.WebPages.Deployment.xml +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\System.Web.WebPages.Razor.xml +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\Newtonsoft.Json.xml +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\Antlr3.Runtime.pdb +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.xml +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\obj\Debug\FWA_MAIN.csproj.AssemblyReference.cache +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\obj\Debug\FWA_MAIN.csproj.CoreCompileInputs.cache +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\obj\Debug\FWA_MAIN.csproj.Up2Date +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\obj\Debug\FWA_MAIN.dll +C:\Users\Caden\RiderProjects\FWA_MAIN\FWA_MAIN\obj\Debug\FWA_MAIN.pdb diff --git a/FWA_MAIN/obj/Debug/FWA_MAIN.dll b/FWA_MAIN/obj/Debug/FWA_MAIN.dll index f791652..5349fc9 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 2ca27a4..579d4e7 100644 Binary files a/FWA_MAIN/obj/Debug/FWA_MAIN.pdb and b/FWA_MAIN/obj/Debug/FWA_MAIN.pdb differ