diff --git a/.idea/config/applicationhost.config b/.idea/config/applicationhost.config
index 976a66d..15916dc 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 741c9f5..20b3d3f 100644
--- a/FWA_MAIN/FWA_MAIN.csproj
+++ b/FWA_MAIN/FWA_MAIN.csproj
@@ -128,6 +128,13 @@
main.master
+
+ ASPXCodeBehind
+ MaxRefillNotif.aspx
+
+
+ MaxRefillNotif.aspx
+
ASPXCodeBehind
medDelete.aspx
@@ -242,6 +249,7 @@
+
diff --git a/FWA_MAIN/MaxRefillNotif.aspx b/FWA_MAIN/MaxRefillNotif.aspx
new file mode 100644
index 0000000..de2ab23
--- /dev/null
+++ b/FWA_MAIN/MaxRefillNotif.aspx
@@ -0,0 +1,29 @@
+<%@ Page Language="C#" CodeBehind="MaxRefillNotif.aspx.cs" Inherits="FWA_MAIN.MaxRefillNotif" %>
+
+
+
+
+
+
+
+
+
+
+ Title
+
+
+
+
+
+
\ No newline at end of file
diff --git a/FWA_MAIN/MaxRefillNotif.aspx.cs b/FWA_MAIN/MaxRefillNotif.aspx.cs
new file mode 100644
index 0000000..694e114
--- /dev/null
+++ b/FWA_MAIN/MaxRefillNotif.aspx.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Security.Principal;
+using System.Web.UI;
+
+namespace FWA_MAIN
+{
+ public partial class MaxRefillNotif : Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+
+ protected void btnClose_OnClick(object sender, EventArgs e)
+ {
+ string script = "window.close();";
+ ClientScript.RegisterStartupScript(this.GetType(), "closeWindow", script, true);
+ }
+ }
+}
\ No newline at end of file
diff --git a/FWA_MAIN/MaxRefillNotif.aspx.designer.cs b/FWA_MAIN/MaxRefillNotif.aspx.designer.cs
new file mode 100644
index 0000000..99bc42f
--- /dev/null
+++ b/FWA_MAIN/MaxRefillNotif.aspx.designer.cs
@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+//
+// 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 MaxRefillNotif
+ {
+
+ ///
+ /// HtmlForm control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm HtmlForm;
+
+ ///
+ /// btnClose control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Button btnClose;
+ }
+}
diff --git a/FWA_MAIN/Prescription.aspx b/FWA_MAIN/Prescription.aspx
index 6b95ceb..0bd46af 100644
--- a/FWA_MAIN/Prescription.aspx
+++ b/FWA_MAIN/Prescription.aspx
@@ -3,6 +3,19 @@
+
+
+
+
Prescriptions
diff --git a/FWA_MAIN/Prescription.aspx.cs b/FWA_MAIN/Prescription.aspx.cs
index 62c038a..5e29dd7 100644
--- a/FWA_MAIN/Prescription.aspx.cs
+++ b/FWA_MAIN/Prescription.aspx.cs
@@ -21,6 +21,7 @@ namespace FWA_MAIN
btnPreSearch_OnClick(sender,e);
}
+
}
@@ -222,15 +223,21 @@ namespace FWA_MAIN
protected void btnPreRefill_OnClick(object sender, EventArgs e)
{
- var ds = new DataSet();
- ds = PharmacyDataTier.PrescriptionInfoSearch(gvPrescription.SelectedRow.Cells[0].Text);
-
- if (int.Parse(ds.Tables[0].Rows[0]["test2"].ToString()) < int.Parse(ds.Tables[0].Rows[0]["test"].ToString()))
+ if (gvPrescription.SelectedRow != null)
{
- PharmacyDataTier.AddRefill(PharmacyDataTier.GetNextRefillID().ToString(), DateTime.Now, gvPrescription.SelectedRow.Cells[5].Text,gvPrescription.SelectedRow.Cells[4].Text,gvPrescription.SelectedRow.Cells[0].Text);
+
+ if (int.Parse(gvPrescription.SelectedRow.Cells[2].Text) < int.Parse(gvPrescription.SelectedRow.Cells[1].Text))
+ {
+ PharmacyDataTier.AddRefill(PharmacyDataTier.GetNextRefillID().ToString(), DateTime.Now, gvPrescription.SelectedRow.Cells[5].Text,gvPrescription.SelectedRow.Cells[4].Text,gvPrescription.SelectedRow.Cells[0].Text);
+ }
+ else
+ {
+ string script = "window.open('MaxRefillNotif.aspx', 'PopupWindow', 'width=600,height=400,left=100,top=100');";
+ ScriptManager.RegisterStartupScript(this, GetType(), "popup", script, true);
}
PharmacyDataTier.RefreshRefill(gvPrescription.SelectedRow.Cells[0].Text);
BindData();
+ }
}
}
}
\ No newline at end of file
diff --git a/FWA_MAIN/bin/FWA_MAIN.dll b/FWA_MAIN/bin/FWA_MAIN.dll
index c6c1e33..377394c 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 0f28b78..6d4ea42 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 0b111af..406c024 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 b454eea..fb81b31 100644
--- a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache
+++ b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-5c5d3543aa3df97a4bf6915d78123652c5cfa939186f89192a82bb6d5f3ed9b9
+70b4448723339e99ed60f3c81dc6a5d1da61b1ddf61a97f8541739006170aed6
diff --git a/FWA_MAIN/obj/Debug/FWA_MAIN.dll b/FWA_MAIN/obj/Debug/FWA_MAIN.dll
index c6c1e33..377394c 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 0f28b78..6d4ea42 100644
Binary files a/FWA_MAIN/obj/Debug/FWA_MAIN.pdb and b/FWA_MAIN/obj/Debug/FWA_MAIN.pdb differ