diff --git a/.idea/config/applicationhost.config b/.idea/config/applicationhost.config index 15916dc..6aca535 100644 --- a/.idea/config/applicationhost.config +++ b/.idea/config/applicationhost.config @@ -155,7 +155,7 @@ - + diff --git a/FWA_MAIN/Prescription.aspx.cs b/FWA_MAIN/Prescription.aspx.cs index 5e29dd7..fb90044 100644 --- a/FWA_MAIN/Prescription.aspx.cs +++ b/FWA_MAIN/Prescription.aspx.cs @@ -226,17 +226,17 @@ namespace FWA_MAIN if (gvPrescription.SelectedRow != null) { - 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(); + 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(); } } } diff --git a/FWA_MAIN/Refills.aspx.cs b/FWA_MAIN/Refills.aspx.cs index 947dc30..6817e5a 100644 --- a/FWA_MAIN/Refills.aspx.cs +++ b/FWA_MAIN/Refills.aspx.cs @@ -47,9 +47,17 @@ namespace FWA_MAIN protected void btnRefDelete_OnClick(object sender, EventArgs e) { - PharmacyDataTier.DeleteRefill(gvRefills.SelectedRow.Cells[0].Text); - PharmacyDataTier.RefreshRefill(gvRefills.SelectedRow.Cells[4].Text); - Fill(); + + try + { + + PharmacyDataTier.DeleteRefill(gvRefills.SelectedRow.Cells[0].Text); + PharmacyDataTier.RefreshRefill(gvRefills.SelectedRow.Cells[4].Text); + Fill(); + } + catch (Exception exception) + { + } } protected void gvRefills_OnRowCommand(object sender, GridViewCommandEventArgs e) diff --git a/FWA_MAIN/bin/FWA_MAIN.dll b/FWA_MAIN/bin/FWA_MAIN.dll index b7ddfb4..6fff3f2 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 ff34a1d..4093ab7 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 406c024..c4fc5be 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 fb81b31..ba87ded 100644 --- a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache +++ b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -70b4448723339e99ed60f3c81dc6a5d1da61b1ddf61a97f8541739006170aed6 +feafdb195a4113bc7d55e6cf55d7dcf2413ba64944ee378d3abf65104964d9e6 diff --git a/FWA_MAIN/obj/Debug/FWA_MAIN.dll b/FWA_MAIN/obj/Debug/FWA_MAIN.dll index b7ddfb4..6fff3f2 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 ff34a1d..4093ab7 100644 Binary files a/FWA_MAIN/obj/Debug/FWA_MAIN.pdb and b/FWA_MAIN/obj/Debug/FWA_MAIN.pdb differ