diff --git a/Louis'-Pharmacy_CNSA212-FP/Louis'-Pharmacy_CNSA212-FP.csproj b/Louis'-Pharmacy_CNSA212-FP/Louis'-Pharmacy_CNSA212-FP.csproj index c1039b0..dbfad5e 100644 --- a/Louis'-Pharmacy_CNSA212-FP/Louis'-Pharmacy_CNSA212-FP.csproj +++ b/Louis'-Pharmacy_CNSA212-FP/Louis'-Pharmacy_CNSA212-FP.csproj @@ -98,7 +98,6 @@ - frmAbout.cs diff --git a/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs b/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs index 77f39bd..cc6d5a6 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs +++ b/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs @@ -327,9 +327,10 @@ namespace Louis__Pharmacy_CNSA212_FP PatientAdd.StartPosition = FormStartPosition.CenterScreen; PatientAdd.Show(); PatientAdd.Focus(); - Console.WriteLine( dgvPatient.SelectedRows.Count); - DataGridViewRow row = dgvPatient.SelectedRows[0]; - PatientAdd.FillPatient(row.Cells[0].Value.ToString().Trim()); + // Console.WriteLine( dgvPatient.SelectedRows.Count); + // DataGridViewRow row = dgvPatient.SelectedRows[0]; + // string patid = dgvPatient.SelectedRows[0].Cells[0].Value.ToString(); + // PatientAdd.FillPatient(patid); } } } diff --git a/Louis'-Pharmacy_CNSA212-FP/frmMain.Designer.cs b/Louis'-Pharmacy_CNSA212-FP/frmMain.Designer.cs index 0c35598..e8634a2 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmMain.Designer.cs +++ b/Louis'-Pharmacy_CNSA212-FP/frmMain.Designer.cs @@ -31,8 +31,6 @@ this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.mnuNavigation = new System.Windows.Forms.ToolStripMenuItem(); this.mnuNavigationView = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuNavigationAUPaPh = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuNavigationAUPres = new System.Windows.Forms.ToolStripMenuItem(); this.mnuNavigationAURRefill = new System.Windows.Forms.ToolStripMenuItem(); this.mnuWindow = new System.Windows.Forms.ToolStripMenuItem(); this.mnuWindowArrangeIcons = new System.Windows.Forms.ToolStripMenuItem(); @@ -47,10 +45,7 @@ // // menuStrip1 // - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mnuNavigation, - this.mnuWindow, - this.mnuHelp}); + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuNavigation, this.mnuWindow, this.mnuHelp }); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Size = new System.Drawing.Size(800, 24); @@ -59,11 +54,7 @@ // // mnuNavigation // - this.mnuNavigation.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mnuNavigationView, - this.mnuNavigationAUPaPh, - this.mnuNavigationAUPres, - this.mnuNavigationAURRefill}); + this.mnuNavigation.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuNavigationView, this.mnuNavigationAURRefill }); this.mnuNavigation.Name = "mnuNavigation"; this.mnuNavigation.Size = new System.Drawing.Size(77, 20); this.mnuNavigation.Text = "Navigation"; @@ -71,39 +62,20 @@ // mnuNavigationView // this.mnuNavigationView.Name = "mnuNavigationView"; - this.mnuNavigationView.Size = new System.Drawing.Size(286, 22); - this.mnuNavigationView.Text = "View Patient/Prescription/Physician Info"; + this.mnuNavigationView.Size = new System.Drawing.Size(272, 22); + this.mnuNavigationView.Text = "Patient/Prescription/Physician Search"; this.mnuNavigationView.Click += new System.EventHandler(this.mnuNavigationView_Click); // - // mnuNavigationAUPaPh - // - this.mnuNavigationAUPaPh.Name = "mnuNavigationAUPaPh"; - this.mnuNavigationAUPaPh.Size = new System.Drawing.Size(286, 22); - this.mnuNavigationAUPaPh.Text = "Add/Update Patient/Physician"; - this.mnuNavigationAUPaPh.Click += new System.EventHandler(this.mnuNavigationAUPaPh_Click); - // - // mnuNavigationAUPres - // - this.mnuNavigationAUPres.Name = "mnuNavigationAUPres"; - this.mnuNavigationAUPres.Size = new System.Drawing.Size(286, 22); - this.mnuNavigationAUPres.Text = "Add/Update Prescription"; - this.mnuNavigationAUPres.Click += new System.EventHandler(this.mnuNavigationAUPres_Click); - // // mnuNavigationAURRefill // this.mnuNavigationAURRefill.Name = "mnuNavigationAURRefill"; - this.mnuNavigationAURRefill.Size = new System.Drawing.Size(286, 22); + this.mnuNavigationAURRefill.Size = new System.Drawing.Size(272, 22); this.mnuNavigationAURRefill.Text = "Add/Update/Remove Refill"; this.mnuNavigationAURRefill.Click += new System.EventHandler(this.mnuNavigationAURRefill_Click); // // mnuWindow // - this.mnuWindow.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mnuWindowArrangeIcons, - this.mnuWindowCascade, - this.mnuWindowHorizontal, - this.mnuWindowVertical, - this.mnuWindowCloseAll}); + this.mnuWindow.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuWindowArrangeIcons, this.mnuWindowCascade, this.mnuWindowHorizontal, this.mnuWindowVertical, this.mnuWindowCloseAll }); this.mnuWindow.Name = "mnuWindow"; this.mnuWindow.Size = new System.Drawing.Size(63, 20); this.mnuWindow.Text = "Window"; @@ -111,42 +83,41 @@ // mnuWindowArrangeIcons // this.mnuWindowArrangeIcons.Name = "mnuWindowArrangeIcons"; - this.mnuWindowArrangeIcons.Size = new System.Drawing.Size(180, 22); + this.mnuWindowArrangeIcons.Size = new System.Drawing.Size(147, 22); this.mnuWindowArrangeIcons.Text = "Arrange Icons"; this.mnuWindowArrangeIcons.Click += new System.EventHandler(this.mnuWindowArrangeIcons_Click); // // mnuWindowCascade // this.mnuWindowCascade.Name = "mnuWindowCascade"; - this.mnuWindowCascade.Size = new System.Drawing.Size(180, 22); + this.mnuWindowCascade.Size = new System.Drawing.Size(147, 22); this.mnuWindowCascade.Text = "Cascade"; this.mnuWindowCascade.Click += new System.EventHandler(this.mnuWindowCascade_Click); // // mnuWindowHorizontal // this.mnuWindowHorizontal.Name = "mnuWindowHorizontal"; - this.mnuWindowHorizontal.Size = new System.Drawing.Size(180, 22); + this.mnuWindowHorizontal.Size = new System.Drawing.Size(147, 22); this.mnuWindowHorizontal.Text = "Horizontal"; this.mnuWindowHorizontal.Click += new System.EventHandler(this.mnuWindowHorizontal_Click); // // mnuWindowVertical // this.mnuWindowVertical.Name = "mnuWindowVertical"; - this.mnuWindowVertical.Size = new System.Drawing.Size(180, 22); + this.mnuWindowVertical.Size = new System.Drawing.Size(147, 22); this.mnuWindowVertical.Text = "Vertical"; this.mnuWindowVertical.Click += new System.EventHandler(this.mnuWindowVertical_Click); // // mnuWindowCloseAll // this.mnuWindowCloseAll.Name = "mnuWindowCloseAll"; - this.mnuWindowCloseAll.Size = new System.Drawing.Size(180, 22); + this.mnuWindowCloseAll.Size = new System.Drawing.Size(147, 22); this.mnuWindowCloseAll.Text = "Close All"; this.mnuWindowCloseAll.Click += new System.EventHandler(this.mnuWindowCloseAll_Click); // // mnuHelp // - this.mnuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mnuHelpAbout}); + this.mnuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuHelpAbout }); this.mnuHelp.Name = "mnuHelp"; this.mnuHelp.Size = new System.Drawing.Size(44, 20); this.mnuHelp.Text = "Help"; @@ -154,7 +125,7 @@ // mnuHelpAbout // this.mnuHelpAbout.Name = "mnuHelpAbout"; - this.mnuHelpAbout.Size = new System.Drawing.Size(180, 22); + this.mnuHelpAbout.Size = new System.Drawing.Size(107, 22); this.mnuHelpAbout.Text = "About"; this.mnuHelpAbout.Click += new System.EventHandler(this.mnuHelpAbout_Click); // @@ -173,7 +144,6 @@ this.menuStrip1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); - } #endregion @@ -181,8 +151,6 @@ private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.ToolStripMenuItem mnuNavigation; private System.Windows.Forms.ToolStripMenuItem mnuNavigationView; - private System.Windows.Forms.ToolStripMenuItem mnuNavigationAUPaPh; - private System.Windows.Forms.ToolStripMenuItem mnuNavigationAUPres; private System.Windows.Forms.ToolStripMenuItem mnuNavigationAURRefill; private System.Windows.Forms.ToolStripMenuItem mnuWindow; private System.Windows.Forms.ToolStripMenuItem mnuHelp; diff --git a/Louis'-Pharmacy_CNSA212-FP/frmMain.cs b/Louis'-Pharmacy_CNSA212-FP/frmMain.cs index 07e84a7..9cac1ba 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmMain.cs +++ b/Louis'-Pharmacy_CNSA212-FP/frmMain.cs @@ -43,26 +43,26 @@ namespace Louis__Pharmacy_CNSA212_FP private void mnuNavigationAUPaPh_Click(object sender, EventArgs e) { - frmPatientPhysician formPaPh = new frmPatientPhysician(); - - formPaPh.MdiParent = this; - formPaPh.StartPosition = FormStartPosition.CenterScreen; - formPaPh.Show(); - formPaPh.Focus(); - - mnuNavigationAUPaPh.Checked = true; + // frmPatientPhysician formPaPh = new frmPatientPhysician(); + // + // formPaPh.MdiParent = this; + // formPaPh.StartPosition = FormStartPosition.CenterScreen; + // formPaPh.Show(); + // formPaPh.Focus(); + // + // mnuNavigationAUPaPh.Checked = true; } private void mnuNavigationAUPres_Click(object sender, EventArgs e) { - frmPrescription formPrescription = new frmPrescription(); - - formPrescription.MdiParent = this; - formPrescription.StartPosition = FormStartPosition.CenterScreen; - formPrescription.Show(); - formPrescription.Focus(); - - mnuNavigationAUPres.Checked = true; + // frmPrescription formPrescription = new frmPrescription(); + // + // formPrescription.MdiParent = this; + // formPrescription.StartPosition = FormStartPosition.CenterScreen; + // formPrescription.Show(); + // formPrescription.Focus(); + // + // mnuNavigationAUPres.Checked = true; } private void mnuNavigationAURRefill_Click(object sender, EventArgs e) diff --git a/Louis'-Pharmacy_CNSA212-FP/refillDataTier.cs b/Louis'-Pharmacy_CNSA212-FP/refillDataTier.cs deleted file mode 100644 index 5cd061c..0000000 --- a/Louis'-Pharmacy_CNSA212-FP/refillDataTier.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Louis__Pharmacy_CNSA212_FP -{ - class refillDataTier - { - - } -}