diff --git a/.idea/config/applicationhost.config b/.idea/config/applicationhost.config index 6aca535..15916dc 100644 --- a/.idea/config/applicationhost.config +++ b/.idea/config/applicationhost.config @@ -155,7 +155,7 @@ - + diff --git a/FWA_MAIN/Val.cs b/FWA_MAIN/Val.cs index 9f6d11b..c997c56 100644 --- a/FWA_MAIN/Val.cs +++ b/FWA_MAIN/Val.cs @@ -69,6 +69,11 @@ namespace FWA_MAIN DateTime date = DateTime.Parse(box.Text.Trim()); + if (date < new DateTime(1753,1,1) || date > new DateTime(9999,12,31)) + { + throw new Exception(); + } + return date; } diff --git a/FWA_MAIN/bin/FWA_MAIN.dll b/FWA_MAIN/bin/FWA_MAIN.dll index d634662..ef3e437 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 16534e7..d1c5fcd 100644 Binary files a/FWA_MAIN/bin/FWA_MAIN.pdb and b/FWA_MAIN/bin/FWA_MAIN.pdb differ diff --git a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache index 2ae3ac5..3bde82b 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 2e69a80..b221804 100644 --- a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache +++ b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e89e31cdadf20fe7db48ef132bf217873437f194debfb0966ea84327b2ae8615 +9d1cdd184476eb265233bc67136ca7e3159166a02c46b34cb16710aa0fb22e94 diff --git a/FWA_MAIN/obj/Debug/FWA_MAIN.dll b/FWA_MAIN/obj/Debug/FWA_MAIN.dll index d634662..ef3e437 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 16534e7..d1c5fcd 100644 Binary files a/FWA_MAIN/obj/Debug/FWA_MAIN.pdb and b/FWA_MAIN/obj/Debug/FWA_MAIN.pdb differ diff --git a/FWA_MAIN/obj/Debug/Package/PackageTmp/Web.config b/FWA_MAIN/obj/Debug/Package/PackageTmp/Web.config index c3180cb..938a42f 100644 --- a/FWA_MAIN/obj/Debug/Package/PackageTmp/Web.config +++ b/FWA_MAIN/obj/Debug/Package/PackageTmp/Web.config @@ -13,15 +13,26 @@ + + + + - - + + diff --git a/FWA_MAIN/obj/Debug/Package/PackageTmp/bin/FWA_MAIN.dll b/FWA_MAIN/obj/Debug/Package/PackageTmp/bin/FWA_MAIN.dll index 469d8e0..ef3e437 100644 Binary files a/FWA_MAIN/obj/Debug/Package/PackageTmp/bin/FWA_MAIN.dll and b/FWA_MAIN/obj/Debug/Package/PackageTmp/bin/FWA_MAIN.dll differ diff --git a/FWA_MAIN/obj/Debug/Package/PackageTmp/bin/FWA_MAIN.pdb b/FWA_MAIN/obj/Debug/Package/PackageTmp/bin/FWA_MAIN.pdb index 8b3bd69..d1c5fcd 100644 Binary files a/FWA_MAIN/obj/Debug/Package/PackageTmp/bin/FWA_MAIN.pdb and b/FWA_MAIN/obj/Debug/Package/PackageTmp/bin/FWA_MAIN.pdb differ diff --git a/FWA_MAIN/obj/Debug/Package/PackageTmp/main.css b/FWA_MAIN/obj/Debug/Package/PackageTmp/main.css index 0797493..d54d7f2 100644 --- a/FWA_MAIN/obj/Debug/Package/PackageTmp/main.css +++ b/FWA_MAIN/obj/Debug/Package/PackageTmp/main.css @@ -13,6 +13,99 @@ } +.gridview { + outline-color: black; + margin: 10px; + font-family: Arial, sans-serif; + width: auto; + border-collapse: collapse; +} + +.gridview th { + background-color: #101214; + color: #fff; + padding: 5px; + text-align: center; +} + +.gridview td { + /*background-color: #1D2125;*/ + padding: 5px; + width: 120px; + color: #FFFFFF; +} + +.gridview tr:hover { + background-color: #101214; +} + +.gridview .headerstyle { + background-color: #161A1D; + color: white; + font-weight: bold; + text-align: left; +} + +.gridview .rowstyle { + background-color: #1D2125; +} + +.gridview .alternatingrowstyle { + background-color: #2C333A; +} + +.gridview .selectedrowstyle { + background-color: #09326C; +} + +.buttonLabel{ + + text-align: right; + vertical-align: center; + +} + +.btnPatSearch, .btnMediSearch{ + + margin-left: 177px; + + height: 25px; + width: 100px; + color: white; + background-color: #161A1D; + +} + +.indivPatDiv, .indivMedDiv{ + + height: 35px; + /*outline: solid 1px red;*/ + + +} + +.standardbtn{ + + height: 25px; + width: 100px; + color: white; + background-color: #161A1D; + +} + +.patDiv, .medDiv{ + vertical-align: top; + /*outline: solid 1px red;*/ + display: inline-block; + +} + +.defaultTXT{ + + height: 25px; + +} + .sidenavbutton{ background-color: #1D2125; @@ -22,7 +115,7 @@ font-size: 16px; color: white; /*border: 2px solid #0056b3;*/ - + } @@ -34,7 +127,7 @@ .welcomepage{ background-color: #1b6d85; - outline: solid 1px red; + /*outline: solid 1px red;*/ } .standardcontentpage{ diff --git a/FWA_MAIN/obj/Debug/Package/PackageTmp/main.master b/FWA_MAIN/obj/Debug/Package/PackageTmp/main.master index 0c41add..7e76c7a 100644 --- a/FWA_MAIN/obj/Debug/Package/PackageTmp/main.master +++ b/FWA_MAIN/obj/Debug/Package/PackageTmp/main.master @@ -11,9 +11,9 @@ +
@@ -32,6 +31,7 @@
+ \ No newline at end of file diff --git a/FWA_MAIN/obj/Debug/Package/PackageTmp/patNew.aspx b/FWA_MAIN/obj/Debug/Package/PackageTmp/patNew.aspx index 086f088..bc5a852 100644 --- a/FWA_MAIN/obj/Debug/Package/PackageTmp/patNew.aspx +++ b/FWA_MAIN/obj/Debug/Package/PackageTmp/patNew.aspx @@ -1,7 +1,63 @@ <%@ Page Title="New Patient" Language="C#" MasterPageFile="main.master" CodeBehind="patNew.aspx.cs" Inherits="FWA_MAIN.patNew" %> + + + -

New Patient

- +

New Patient

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/FWA_MAIN/obj/Debug/Package/PackageTmp/patient.aspx b/FWA_MAIN/obj/Debug/Package/PackageTmp/patient.aspx deleted file mode 100644 index 98d0ff4..0000000 --- a/FWA_MAIN/obj/Debug/Package/PackageTmp/patient.aspx +++ /dev/null @@ -1,84 +0,0 @@ -<%@ Page Title="Patients" Language="C#" MasterPageFile="main.master" CodeBehind="patient.aspx.cs" Inherits="FWA_MAIN.patient" %> - - - - -

- Welcome to Pharmacy. -

-

- Hi, We are creating a - custom context menu here. -

- - - - - - -
\ No newline at end of file diff --git a/FWA_MAIN/obj/Debug/TransformWebConfig/original/Web.config b/FWA_MAIN/obj/Debug/TransformWebConfig/original/Web.config index 5abb5ab..b80eae9 100644 --- a/FWA_MAIN/obj/Debug/TransformWebConfig/original/Web.config +++ b/FWA_MAIN/obj/Debug/TransformWebConfig/original/Web.config @@ -1,28 +1,38 @@ - + - - - - - - - - - + + + + + + + + + + + + + - - + + @@ -58,12 +68,8 @@ - - + + - + \ No newline at end of file diff --git a/FWA_MAIN/obj/Debug/TransformWebConfig/transformed/Web.config b/FWA_MAIN/obj/Debug/TransformWebConfig/transformed/Web.config index c3180cb..938a42f 100644 --- a/FWA_MAIN/obj/Debug/TransformWebConfig/transformed/Web.config +++ b/FWA_MAIN/obj/Debug/TransformWebConfig/transformed/Web.config @@ -13,15 +13,26 @@ + + + + - - + + diff --git a/FWA_MAIN/obj/Debug/_WPPLastBuildInfo.txt b/FWA_MAIN/obj/Debug/_WPPLastBuildInfo.txt index b5e402d..aec68e5 100644 Binary files a/FWA_MAIN/obj/Debug/_WPPLastBuildInfo.txt and b/FWA_MAIN/obj/Debug/_WPPLastBuildInfo.txt differ diff --git a/FWA_MAIN/patNew.aspx.cs b/FWA_MAIN/patNew.aspx.cs index ecc82a5..cb08093 100644 --- a/FWA_MAIN/patNew.aspx.cs +++ b/FWA_MAIN/patNew.aspx.cs @@ -12,6 +12,7 @@ namespace FWA_MAIN patID = Crypt.Decrypt(Request.QueryString["ID"]); + txtPatID.Enabled = false; txtPatID.Text = patID; }