From 11a3663e3c8d035667feb5268c08b44074a4c7eb Mon Sep 17 00:00:00 2001 From: EggMan20339 <99349302+EggMan20339@users.noreply.github.com> Date: Fri, 16 Feb 2024 08:37:53 -0500 Subject: [PATCH 1/4] deletes --- .../Louis'-Pharmacy_CNSA212-FP.csproj | 1 - Louis'-Pharmacy_CNSA212-FP/frmInfo.cs | 7 ++- .../frmMain.Designer.cs | 58 +++++-------------- Louis'-Pharmacy_CNSA212-FP/frmMain.cs | 32 +++++----- Louis'-Pharmacy_CNSA212-FP/refillDataTier.cs | 13 ----- 5 files changed, 33 insertions(+), 78 deletions(-) delete mode 100644 Louis'-Pharmacy_CNSA212-FP/refillDataTier.cs 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 - { - - } -} From c1f9c67e3145c2c3958ceaf7298686958e1b2e2a Mon Sep 17 00:00:00 2001 From: Noah Date: Fri, 16 Feb 2024 09:07:39 -0500 Subject: [PATCH 2/4] Placeholder - working on frmPrescription --- .../frmPrescription.Designer.cs | 26 ++++++++++++++++++- Louis'-Pharmacy_CNSA212-FP/frmPrescription.cs | 20 ++++++++++++++ .../frmPrescription.resx | 3 +++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/Louis'-Pharmacy_CNSA212-FP/frmPrescription.Designer.cs b/Louis'-Pharmacy_CNSA212-FP/frmPrescription.Designer.cs index d05881f..b858e48 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmPrescription.Designer.cs +++ b/Louis'-Pharmacy_CNSA212-FP/frmPrescription.Designer.cs @@ -29,21 +29,45 @@ namespace Louis__Pharmacy_CNSA212_FP /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmPrescription)); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // + // contextMenuStrip1 + // + this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); + // + // dataGridView1 + // + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Location = new System.Drawing.Point(13, 334); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowHeadersWidth = 51; + this.dataGridView1.RowTemplate.Height = 24; + this.dataGridView1.Size = new System.Drawing.Size(829, 224); + this.dataGridView1.TabIndex = 2; + // // frmPrescription // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); + this.ClientSize = new System.Drawing.Size(981, 570); + this.Controls.Add(this.dataGridView1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "frmPrescription"; this.Text = "Louis\' Pharmacy - Add / Update Prescription"; + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); } #endregion + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.DataGridView dataGridView1; } } \ No newline at end of file diff --git a/Louis'-Pharmacy_CNSA212-FP/frmPrescription.cs b/Louis'-Pharmacy_CNSA212-FP/frmPrescription.cs index 1d8ba7e..7abb09a 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmPrescription.cs +++ b/Louis'-Pharmacy_CNSA212-FP/frmPrescription.cs @@ -16,5 +16,25 @@ namespace Louis__Pharmacy_CNSA212_FP { InitializeComponent(); } + + private void btnPatientSearch_Click(object sender, EventArgs e) + { + + } + + private void btnPrescriptionSearch_Click(object sender, EventArgs e) + { + + } + + private void btnPhysicianSearch_Click(object sender, EventArgs e) + { + + } + + private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + + } } } diff --git a/Louis'-Pharmacy_CNSA212-FP/frmPrescription.resx b/Louis'-Pharmacy_CNSA212-FP/frmPrescription.resx index 66296d6..f540c38 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmPrescription.resx +++ b/Louis'-Pharmacy_CNSA212-FP/frmPrescription.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + From a1b90e522b5ae658416bba25f82174b948e9e3ea Mon Sep 17 00:00:00 2001 From: Noah Date: Fri, 16 Feb 2024 09:57:01 -0500 Subject: [PATCH 3/4] Edited frmPrescription to include split container, labels, text boxes, and search button --- .../frmInfo.Designer.cs | 309 +++++++++++++----- .../frmPrescription.Designer.cs | 132 +++++++- Louis'-Pharmacy_CNSA212-FP/frmPrescription.cs | 20 ++ .../frmPrescription.resx | 3 + 4 files changed, 369 insertions(+), 95 deletions(-) diff --git a/Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs b/Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs index ed06ce8..b1da08d 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs +++ b/Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs @@ -138,36 +138,40 @@ namespace Louis__Pharmacy_CNSA212_FP // lblPatientFirst // lblPatientFirst.AutoSize = true; - lblPatientFirst.Location = new System.Drawing.Point(20, 28); + lblPatientFirst.Location = new System.Drawing.Point(27, 34); + lblPatientFirst.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); lblPatientFirst.Name = "lblPatientFirst"; - lblPatientFirst.Size = new System.Drawing.Size(60, 13); + lblPatientFirst.Size = new System.Drawing.Size(80, 17); lblPatientFirst.TabIndex = 4; lblPatientFirst.Text = "First Name:"; // // lblPatientLast // lblPatientLast.AutoSize = true; - lblPatientLast.Location = new System.Drawing.Point(20, 69); + lblPatientLast.Location = new System.Drawing.Point(27, 85); + lblPatientLast.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); lblPatientLast.Name = "lblPatientLast"; - lblPatientLast.Size = new System.Drawing.Size(61, 13); + lblPatientLast.Size = new System.Drawing.Size(80, 17); lblPatientLast.TabIndex = 5; lblPatientLast.Text = "Last Name:"; // // lblPhysicianFirst // lblPhysicianFirst.AutoSize = true; - lblPhysicianFirst.Location = new System.Drawing.Point(24, 26); + lblPhysicianFirst.Location = new System.Drawing.Point(32, 32); + lblPhysicianFirst.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); lblPhysicianFirst.Name = "lblPhysicianFirst"; - lblPhysicianFirst.Size = new System.Drawing.Size(60, 13); + lblPhysicianFirst.Size = new System.Drawing.Size(80, 17); lblPhysicianFirst.TabIndex = 4; lblPhysicianFirst.Text = "First Name:"; // // lblPhysicianLast // lblPhysicianLast.AutoSize = true; - lblPhysicianLast.Location = new System.Drawing.Point(23, 70); + lblPhysicianLast.Location = new System.Drawing.Point(31, 86); + lblPhysicianLast.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); lblPhysicianLast.Name = "lblPhysicianLast"; - lblPhysicianLast.Size = new System.Drawing.Size(61, 13); + lblPhysicianLast.Size = new System.Drawing.Size(80, 17); lblPhysicianLast.TabIndex = 5; lblPhysicianLast.Text = "Last Name:"; // @@ -176,18 +180,20 @@ namespace Louis__Pharmacy_CNSA212_FP this.tbcInfo.Controls.Add(this.tbpPatient); this.tbcInfo.Controls.Add(this.tbpPrescription); this.tbcInfo.Controls.Add(this.tbpPhysician); - this.tbcInfo.Location = new System.Drawing.Point(12, 12); + this.tbcInfo.Location = new System.Drawing.Point(16, 15); + this.tbcInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tbcInfo.Name = "tbcInfo"; this.tbcInfo.SelectedIndex = 0; - this.tbcInfo.Size = new System.Drawing.Size(666, 441); + this.tbcInfo.Size = new System.Drawing.Size(888, 543); this.tbcInfo.TabIndex = 1; // // tbpPatient // this.tbpPatient.Controls.Add(this.splcPatient); - this.tbpPatient.Location = new System.Drawing.Point(4, 22); + this.tbpPatient.Location = new System.Drawing.Point(4, 25); + this.tbpPatient.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tbpPatient.Name = "tbpPatient"; - this.tbpPatient.Size = new System.Drawing.Size(658, 415); + this.tbpPatient.Size = new System.Drawing.Size(880, 514); this.tbpPatient.TabIndex = 3; this.tbpPatient.Text = "Patient Info"; this.tbpPatient.UseVisualStyleBackColor = true; @@ -196,6 +202,7 @@ namespace Louis__Pharmacy_CNSA212_FP // this.splcPatient.Dock = System.Windows.Forms.DockStyle.Fill; this.splcPatient.Location = new System.Drawing.Point(0, 0); + this.splcPatient.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.splcPatient.Name = "splcPatient"; this.splcPatient.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -213,46 +220,52 @@ namespace Louis__Pharmacy_CNSA212_FP // this.splcPatient.Panel2.AutoScroll = true; this.splcPatient.Panel2.Controls.Add(this.dgvPatient); - this.splcPatient.Size = new System.Drawing.Size(658, 415); - this.splcPatient.SplitterDistance = 186; + this.splcPatient.Size = new System.Drawing.Size(880, 514); + this.splcPatient.SplitterDistance = 230; + this.splcPatient.SplitterWidth = 5; this.splcPatient.TabIndex = 0; // // txtPatientID // - this.txtPatientID.Location = new System.Drawing.Point(86, 109); + this.txtPatientID.Location = new System.Drawing.Point(115, 134); + this.txtPatientID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtPatientID.Name = "txtPatientID"; - this.txtPatientID.Size = new System.Drawing.Size(100, 20); + this.txtPatientID.Size = new System.Drawing.Size(132, 22); this.txtPatientID.TabIndex = 8; // // lblPatientID // this.lblPatientID.AutoSize = true; - this.lblPatientID.Location = new System.Drawing.Point(23, 109); + this.lblPatientID.Location = new System.Drawing.Point(31, 134); + this.lblPatientID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblPatientID.Name = "lblPatientID"; - this.lblPatientID.Size = new System.Drawing.Size(57, 13); + this.lblPatientID.Size = new System.Drawing.Size(73, 17); this.lblPatientID.TabIndex = 7; this.lblPatientID.Text = "Patient ID:"; // // txtPatientLast // - this.txtPatientLast.Location = new System.Drawing.Point(87, 66); + this.txtPatientLast.Location = new System.Drawing.Point(116, 81); + this.txtPatientLast.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtPatientLast.Name = "txtPatientLast"; - this.txtPatientLast.Size = new System.Drawing.Size(100, 20); + this.txtPatientLast.Size = new System.Drawing.Size(132, 22); this.txtPatientLast.TabIndex = 6; // // txtPatientFirst // - this.txtPatientFirst.Location = new System.Drawing.Point(86, 25); + this.txtPatientFirst.Location = new System.Drawing.Point(115, 31); + this.txtPatientFirst.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtPatientFirst.Name = "txtPatientFirst"; - this.txtPatientFirst.Size = new System.Drawing.Size(100, 20); + this.txtPatientFirst.Size = new System.Drawing.Size(132, 22); this.txtPatientFirst.TabIndex = 5; // // btnPatientSearch // this.btnPatientSearch.BackColor = System.Drawing.Color.Transparent; - this.btnPatientSearch.Location = new System.Drawing.Point(23, 150); + this.btnPatientSearch.Location = new System.Drawing.Point(31, 185); + this.btnPatientSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnPatientSearch.Name = "btnPatientSearch"; - this.btnPatientSearch.Size = new System.Drawing.Size(75, 23); + this.btnPatientSearch.Size = new System.Drawing.Size(100, 28); this.btnPatientSearch.TabIndex = 4; this.btnPatientSearch.Text = "Search"; this.btnPatientSearch.UseVisualStyleBackColor = false; @@ -263,93 +276,132 @@ namespace Louis__Pharmacy_CNSA212_FP this.dgvPatient.AllowUserToAddRows = false; this.dgvPatient.AllowUserToDeleteRows = false; this.dgvPatient.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvPatient.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.pat_id, this.FirstName, this.LastName, this.MiddleInitials, this.City, this.UsState, this.Zip, this.Ibs, this.Height_feet, this.Height_inches, this.Ailment, this.DOB, this.PhoneNumber, this.Gender, this.Medications }); + this.dgvPatient.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.pat_id, + this.FirstName, + this.LastName, + this.MiddleInitials, + this.City, + this.UsState, + this.Zip, + this.Ibs, + this.Height_feet, + this.Height_inches, + this.Ailment, + this.DOB, + this.PhoneNumber, + this.Gender, + this.Medications}); this.dgvPatient.ContextMenuStrip = this.cmuPatient; this.dgvPatient.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; - this.dgvPatient.Location = new System.Drawing.Point(3, 3); + this.dgvPatient.Location = new System.Drawing.Point(4, 4); + this.dgvPatient.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.dgvPatient.MultiSelect = false; this.dgvPatient.Name = "dgvPatient"; this.dgvPatient.ReadOnly = true; + this.dgvPatient.RowHeadersWidth = 51; this.dgvPatient.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvPatient.Size = new System.Drawing.Size(652, 219); + this.dgvPatient.Size = new System.Drawing.Size(869, 270); this.dgvPatient.TabIndex = 0; // // pat_id // this.pat_id.DataPropertyName = "Patient_id"; this.pat_id.HeaderText = "Patient ID"; + this.pat_id.MinimumWidth = 6; this.pat_id.Name = "pat_id"; this.pat_id.ReadOnly = true; + this.pat_id.Width = 125; // // FirstName // this.FirstName.DataPropertyName = "FirstName"; this.FirstName.HeaderText = "First Name"; + this.FirstName.MinimumWidth = 6; this.FirstName.Name = "FirstName"; this.FirstName.ReadOnly = true; + this.FirstName.Width = 125; // // LastName // this.LastName.DataPropertyName = "LastName"; this.LastName.HeaderText = "Last Name"; + this.LastName.MinimumWidth = 6; this.LastName.Name = "LastName"; this.LastName.ReadOnly = true; + this.LastName.Width = 125; // // MiddleInitials // this.MiddleInitials.DataPropertyName = "MiddleInitials"; this.MiddleInitials.HeaderText = "Middle Initial"; + this.MiddleInitials.MinimumWidth = 6; this.MiddleInitials.Name = "MiddleInitials"; this.MiddleInitials.ReadOnly = true; + this.MiddleInitials.Width = 125; // // City // this.City.DataPropertyName = "City"; this.City.HeaderText = "City"; + this.City.MinimumWidth = 6; this.City.Name = "City"; this.City.ReadOnly = true; + this.City.Width = 125; // // UsState // this.UsState.DataPropertyName = "UsState"; this.UsState.HeaderText = "State"; + this.UsState.MinimumWidth = 6; this.UsState.Name = "UsState"; this.UsState.ReadOnly = true; + this.UsState.Width = 125; // // Zip // this.Zip.DataPropertyName = "Zip"; this.Zip.HeaderText = "Zip"; + this.Zip.MinimumWidth = 6; this.Zip.Name = "Zip"; this.Zip.ReadOnly = true; + this.Zip.Width = 125; // // Ibs // this.Ibs.DataPropertyName = "Ibs"; this.Ibs.HeaderText = "Weight"; + this.Ibs.MinimumWidth = 6; this.Ibs.Name = "Ibs"; this.Ibs.ReadOnly = true; + this.Ibs.Width = 125; // // Height_feet // this.Height_feet.DataPropertyName = "Height_feet"; this.Height_feet.HeaderText = "Height (Feet)"; + this.Height_feet.MinimumWidth = 6; this.Height_feet.Name = "Height_feet"; this.Height_feet.ReadOnly = true; + this.Height_feet.Width = 125; // // Height_inches // this.Height_inches.DataPropertyName = "Height_inches"; this.Height_inches.HeaderText = "Height (inches)"; + this.Height_inches.MinimumWidth = 6; this.Height_inches.Name = "Height_inches"; this.Height_inches.ReadOnly = true; + this.Height_inches.Width = 125; // // Ailment // this.Ailment.DataPropertyName = "Ailment"; this.Ailment.HeaderText = "Ailment"; + this.Ailment.MinimumWidth = 6; this.Ailment.Name = "Ailment"; this.Ailment.ReadOnly = true; + this.Ailment.Width = 125; // // DOB // @@ -358,62 +410,75 @@ namespace Louis__Pharmacy_CNSA212_FP dataGridViewCellStyle1.NullValue = null; this.DOB.DefaultCellStyle = dataGridViewCellStyle1; this.DOB.HeaderText = "DOB"; + this.DOB.MinimumWidth = 6; this.DOB.Name = "DOB"; this.DOB.ReadOnly = true; + this.DOB.Width = 125; // // PhoneNumber // this.PhoneNumber.DataPropertyName = "PhoneNumber"; this.PhoneNumber.HeaderText = "Phone Number"; + this.PhoneNumber.MinimumWidth = 6; this.PhoneNumber.Name = "PhoneNumber"; this.PhoneNumber.ReadOnly = true; + this.PhoneNumber.Width = 125; // // Gender // this.Gender.DataPropertyName = "Gender"; this.Gender.HeaderText = "Gender"; + this.Gender.MinimumWidth = 6; this.Gender.Name = "Gender"; this.Gender.ReadOnly = true; + this.Gender.Width = 125; // // Medications // this.Medications.DataPropertyName = "Medications"; this.Medications.HeaderText = "Medications"; + this.Medications.MinimumWidth = 6; this.Medications.Name = "Medications"; this.Medications.ReadOnly = true; + this.Medications.Width = 125; // // cmuPatient // - this.cmuPatient.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cmuPatientNew, this.cmuPatientEdit, this.cmuPatientDelete }); + this.cmuPatient.ImageScalingSize = new System.Drawing.Size(20, 20); + this.cmuPatient.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cmuPatientNew, + this.cmuPatientEdit, + this.cmuPatientDelete}); this.cmuPatient.Name = "contextMenuStrip1"; - this.cmuPatient.Size = new System.Drawing.Size(108, 70); + this.cmuPatient.Size = new System.Drawing.Size(123, 76); // // cmuPatientNew // this.cmuPatientNew.Name = "cmuPatientNew"; - this.cmuPatientNew.Size = new System.Drawing.Size(107, 22); + this.cmuPatientNew.Size = new System.Drawing.Size(122, 24); this.cmuPatientNew.Text = "New"; this.cmuPatientNew.Click += new System.EventHandler(this.cmuPatientNew_Click); // // cmuPatientEdit // this.cmuPatientEdit.Name = "cmuPatientEdit"; - this.cmuPatientEdit.Size = new System.Drawing.Size(107, 22); + this.cmuPatientEdit.Size = new System.Drawing.Size(122, 24); this.cmuPatientEdit.Text = "Edit"; this.cmuPatientEdit.Click += new System.EventHandler(this.cmuPatientEdit_Click); // // cmuPatientDelete // this.cmuPatientDelete.Name = "cmuPatientDelete"; - this.cmuPatientDelete.Size = new System.Drawing.Size(107, 22); + this.cmuPatientDelete.Size = new System.Drawing.Size(122, 24); this.cmuPatientDelete.Text = "Delete"; // // tbpPrescription // this.tbpPrescription.Controls.Add(this.splcPrescription); - this.tbpPrescription.Location = new System.Drawing.Point(4, 22); + this.tbpPrescription.Location = new System.Drawing.Point(4, 25); + this.tbpPrescription.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tbpPrescription.Name = "tbpPrescription"; - this.tbpPrescription.Size = new System.Drawing.Size(658, 415); + this.tbpPrescription.Size = new System.Drawing.Size(880, 514); this.tbpPrescription.TabIndex = 4; this.tbpPrescription.Text = "Prescription Info"; this.tbpPrescription.UseVisualStyleBackColor = true; @@ -422,6 +487,7 @@ namespace Louis__Pharmacy_CNSA212_FP // this.splcPrescription.Dock = System.Windows.Forms.DockStyle.Fill; this.splcPrescription.Location = new System.Drawing.Point(0, 0); + this.splcPrescription.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.splcPrescription.Name = "splcPrescription"; this.splcPrescription.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -436,15 +502,17 @@ namespace Louis__Pharmacy_CNSA212_FP // splcPrescription.Panel2 // this.splcPrescription.Panel2.Controls.Add(this.dgvPrescription); - this.splcPrescription.Size = new System.Drawing.Size(658, 415); - this.splcPrescription.SplitterDistance = 210; + this.splcPrescription.Size = new System.Drawing.Size(880, 514); + this.splcPrescription.SplitterDistance = 260; + this.splcPrescription.SplitterWidth = 5; this.splcPrescription.TabIndex = 0; // // btnPrescriptionSearch // - this.btnPrescriptionSearch.Location = new System.Drawing.Point(64, 117); + this.btnPrescriptionSearch.Location = new System.Drawing.Point(85, 144); + this.btnPrescriptionSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnPrescriptionSearch.Name = "btnPrescriptionSearch"; - this.btnPrescriptionSearch.Size = new System.Drawing.Size(75, 23); + this.btnPrescriptionSearch.Size = new System.Drawing.Size(100, 28); this.btnPrescriptionSearch.TabIndex = 4; this.btnPrescriptionSearch.Text = "Search"; this.btnPrescriptionSearch.UseVisualStyleBackColor = true; @@ -452,34 +520,36 @@ namespace Louis__Pharmacy_CNSA212_FP // // txtPrescriptionPatID // - this.txtPrescriptionPatID.Location = new System.Drawing.Point(184, 74); + this.txtPrescriptionPatID.Location = new System.Drawing.Point(245, 91); + this.txtPrescriptionPatID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtPrescriptionPatID.Name = "txtPrescriptionPatID"; - this.txtPrescriptionPatID.Size = new System.Drawing.Size(100, 20); + this.txtPrescriptionPatID.Size = new System.Drawing.Size(132, 22); this.txtPrescriptionPatID.TabIndex = 3; // // txtRxNumber // - this.txtRxNumber.Location = new System.Drawing.Point(184, 25); + this.txtRxNumber.Location = new System.Drawing.Point(245, 31); + this.txtRxNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtRxNumber.Name = "txtRxNumber"; - this.txtRxNumber.Size = new System.Drawing.Size(100, 20); + this.txtRxNumber.Size = new System.Drawing.Size(132, 22); this.txtRxNumber.TabIndex = 2; // // lblPrescriptionPatID // this.lblPrescriptionPatID.AutoSize = true; - this.lblPrescriptionPatID.Location = new System.Drawing.Point(61, 74); + this.lblPrescriptionPatID.Location = new System.Drawing.Point(81, 91); + this.lblPrescriptionPatID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblPrescriptionPatID.Name = "lblPrescriptionPatID"; - this.lblPrescriptionPatID.Size = new System.Drawing.Size(57, 13); + this.lblPrescriptionPatID.Size = new System.Drawing.Size(73, 17); this.lblPrescriptionPatID.TabIndex = 1; this.lblPrescriptionPatID.Text = "Patient ID:"; // // lblRxNumber // this.lblRxNumber.AutoSize = true; - this.lblRxNumber.Location = new System.Drawing.Point(61, 25); - this.lblRxNumber.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblRxNumber.Location = new System.Drawing.Point(81, 31); this.lblRxNumber.Name = "lblRxNumber"; - this.lblRxNumber.Size = new System.Drawing.Size(63, 13); + this.lblRxNumber.Size = new System.Drawing.Size(82, 17); this.lblRxNumber.TabIndex = 0; this.lblRxNumber.Text = "Rx Number:"; // @@ -488,86 +558,114 @@ namespace Louis__Pharmacy_CNSA212_FP this.dgvPrescription.AllowUserToAddRows = false; this.dgvPrescription.AllowUserToDeleteRows = false; this.dgvPrescription.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvPrescription.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.RxNum_id, this.numRefills, this.pastNumRefills, this.PrescribedBy, this.Physician_id, this.Medication_id, this.Patient_id }); + this.dgvPrescription.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.RxNum_id, + this.numRefills, + this.pastNumRefills, + this.PrescribedBy, + this.Physician_id, + this.Medication_id, + this.Patient_id}); this.dgvPrescription.ContextMenuStrip = this.cmuRx; - this.dgvPrescription.Location = new System.Drawing.Point(3, 3); + this.dgvPrescription.Location = new System.Drawing.Point(4, 4); + this.dgvPrescription.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.dgvPrescription.Name = "dgvPrescription"; - this.dgvPrescription.Size = new System.Drawing.Size(652, 195); + this.dgvPrescription.RowHeadersWidth = 51; + this.dgvPrescription.Size = new System.Drawing.Size(869, 240); this.dgvPrescription.TabIndex = 0; // // RxNum_id // this.RxNum_id.DataPropertyName = "RxNum_id"; this.RxNum_id.HeaderText = "Rx Number"; + this.RxNum_id.MinimumWidth = 6; this.RxNum_id.Name = "RxNum_id"; + this.RxNum_id.Width = 125; // // numRefills // this.numRefills.DataPropertyName = "numRefills"; this.numRefills.HeaderText = "Number of Refills"; + this.numRefills.MinimumWidth = 6; this.numRefills.Name = "numRefills"; + this.numRefills.Width = 125; // // pastNumRefills // this.pastNumRefills.DataPropertyName = "pastNumRefills"; this.pastNumRefills.HeaderText = "Past Number of Refills"; + this.pastNumRefills.MinimumWidth = 6; this.pastNumRefills.Name = "pastNumRefills"; + this.pastNumRefills.Width = 125; // // PrescribedBy // this.PrescribedBy.DataPropertyName = "PrescribedBy"; this.PrescribedBy.HeaderText = "Prescribed By"; + this.PrescribedBy.MinimumWidth = 6; this.PrescribedBy.Name = "PrescribedBy"; + this.PrescribedBy.Width = 125; // // Physician_id // this.Physician_id.DataPropertyName = "Physician_id"; this.Physician_id.HeaderText = "Physician ID"; + this.Physician_id.MinimumWidth = 6; this.Physician_id.Name = "Physician_id"; + this.Physician_id.Width = 125; // // Medication_id // this.Medication_id.DataPropertyName = "Medication_id"; this.Medication_id.HeaderText = "Medication ID"; + this.Medication_id.MinimumWidth = 6; this.Medication_id.Name = "Medication_id"; + this.Medication_id.Width = 125; // // Patient_id // this.Patient_id.DataPropertyName = "Patient_id"; this.Patient_id.HeaderText = "Patient ID"; + this.Patient_id.MinimumWidth = 6; this.Patient_id.Name = "Patient_id"; + this.Patient_id.Width = 125; // // cmuRx // - this.cmuRx.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cmuRxNew, this.cmuRxEdit, this.cmuRxDelete }); + this.cmuRx.ImageScalingSize = new System.Drawing.Size(20, 20); + this.cmuRx.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cmuRxNew, + this.cmuRxEdit, + this.cmuRxDelete}); this.cmuRx.Name = "cmuRx"; - this.cmuRx.Size = new System.Drawing.Size(108, 70); + this.cmuRx.Size = new System.Drawing.Size(123, 76); // // cmuRxNew // this.cmuRxNew.Name = "cmuRxNew"; - this.cmuRxNew.Size = new System.Drawing.Size(107, 22); + this.cmuRxNew.Size = new System.Drawing.Size(122, 24); this.cmuRxNew.Text = "New"; // // cmuRxEdit // this.cmuRxEdit.Name = "cmuRxEdit"; - this.cmuRxEdit.Size = new System.Drawing.Size(107, 22); + this.cmuRxEdit.Size = new System.Drawing.Size(122, 24); this.cmuRxEdit.Text = "Edit"; // // cmuRxDelete // this.cmuRxDelete.Name = "cmuRxDelete"; - this.cmuRxDelete.Size = new System.Drawing.Size(107, 22); + this.cmuRxDelete.Size = new System.Drawing.Size(122, 24); this.cmuRxDelete.Text = "Delete"; // // tbpPhysician // this.tbpPhysician.Controls.Add(this.splcPhysician); - this.tbpPhysician.Location = new System.Drawing.Point(4, 22); + this.tbpPhysician.Location = new System.Drawing.Point(4, 25); + this.tbpPhysician.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tbpPhysician.Name = "tbpPhysician"; - this.tbpPhysician.Padding = new System.Windows.Forms.Padding(3); - this.tbpPhysician.Size = new System.Drawing.Size(658, 415); + this.tbpPhysician.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tbpPhysician.Size = new System.Drawing.Size(880, 514); this.tbpPhysician.TabIndex = 2; this.tbpPhysician.Text = "Physician Info"; this.tbpPhysician.UseVisualStyleBackColor = true; @@ -575,7 +673,8 @@ namespace Louis__Pharmacy_CNSA212_FP // splcPhysician // this.splcPhysician.Dock = System.Windows.Forms.DockStyle.Fill; - this.splcPhysician.Location = new System.Drawing.Point(3, 3); + this.splcPhysician.Location = new System.Drawing.Point(4, 4); + this.splcPhysician.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.splcPhysician.Name = "splcPhysician"; this.splcPhysician.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -595,45 +694,51 @@ namespace Louis__Pharmacy_CNSA212_FP // this.splcPhysician.Panel2.AutoScroll = true; this.splcPhysician.Panel2.Controls.Add(this.dgvPhysician); - this.splcPhysician.Size = new System.Drawing.Size(652, 409); - this.splcPhysician.SplitterDistance = 183; + this.splcPhysician.Size = new System.Drawing.Size(872, 506); + this.splcPhysician.SplitterDistance = 226; + this.splcPhysician.SplitterWidth = 5; this.splcPhysician.TabIndex = 0; // // txtPhysicianID // - this.txtPhysicianID.Location = new System.Drawing.Point(99, 111); + this.txtPhysicianID.Location = new System.Drawing.Point(132, 137); + this.txtPhysicianID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtPhysicianID.Name = "txtPhysicianID"; - this.txtPhysicianID.Size = new System.Drawing.Size(100, 20); + this.txtPhysicianID.Size = new System.Drawing.Size(132, 22); this.txtPhysicianID.TabIndex = 8; // // lblPhysicianID // this.lblPhysicianID.AutoSize = true; - this.lblPhysicianID.Location = new System.Drawing.Point(24, 111); + this.lblPhysicianID.Location = new System.Drawing.Point(32, 137); + this.lblPhysicianID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblPhysicianID.Name = "lblPhysicianID"; - this.lblPhysicianID.Size = new System.Drawing.Size(69, 13); + this.lblPhysicianID.Size = new System.Drawing.Size(89, 17); this.lblPhysicianID.TabIndex = 7; this.lblPhysicianID.Text = "Physician ID:"; // // txtPhysicianLast // - this.txtPhysicianLast.Location = new System.Drawing.Point(99, 67); + this.txtPhysicianLast.Location = new System.Drawing.Point(132, 82); + this.txtPhysicianLast.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtPhysicianLast.Name = "txtPhysicianLast"; - this.txtPhysicianLast.Size = new System.Drawing.Size(100, 20); + this.txtPhysicianLast.Size = new System.Drawing.Size(132, 22); this.txtPhysicianLast.TabIndex = 6; // // txtPhysicianFirst // - this.txtPhysicianFirst.Location = new System.Drawing.Point(99, 23); + this.txtPhysicianFirst.Location = new System.Drawing.Point(132, 28); + this.txtPhysicianFirst.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtPhysicianFirst.Name = "txtPhysicianFirst"; - this.txtPhysicianFirst.Size = new System.Drawing.Size(100, 20); + this.txtPhysicianFirst.Size = new System.Drawing.Size(132, 22); this.txtPhysicianFirst.TabIndex = 5; // // btnPhysicianSearch // - this.btnPhysicianSearch.Location = new System.Drawing.Point(45, 146); + this.btnPhysicianSearch.Location = new System.Drawing.Point(60, 180); + this.btnPhysicianSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnPhysicianSearch.Name = "btnPhysicianSearch"; - this.btnPhysicianSearch.Size = new System.Drawing.Size(75, 23); + this.btnPhysicianSearch.Size = new System.Drawing.Size(100, 28); this.btnPhysicianSearch.TabIndex = 4; this.btnPhysicianSearch.Text = "Search"; this.btnPhysicianSearch.UseVisualStyleBackColor = true; @@ -644,62 +749,89 @@ namespace Louis__Pharmacy_CNSA212_FP this.dgvPhysician.AllowUserToAddRows = false; this.dgvPhysician.AllowUserToDeleteRows = false; this.dgvPhysician.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvPhysician.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Phys_id, this.namefirst, this.namelast, this.initialsmiddle, this.cit, this.state, this.zipp, this.dobb, this.numberphone, this.gennder, this.Specialty }); + this.dgvPhysician.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Phys_id, + this.namefirst, + this.namelast, + this.initialsmiddle, + this.cit, + this.state, + this.zipp, + this.dobb, + this.numberphone, + this.gennder, + this.Specialty}); this.dgvPhysician.ContextMenuStrip = this.cmuPhysician; - this.dgvPhysician.Location = new System.Drawing.Point(3, 3); + this.dgvPhysician.Location = new System.Drawing.Point(4, 4); + this.dgvPhysician.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.dgvPhysician.Name = "dgvPhysician"; this.dgvPhysician.ReadOnly = true; - this.dgvPhysician.Size = new System.Drawing.Size(646, 216); + this.dgvPhysician.RowHeadersWidth = 51; + this.dgvPhysician.Size = new System.Drawing.Size(861, 266); this.dgvPhysician.TabIndex = 0; // // Phys_id // this.Phys_id.DataPropertyName = "Physician_id"; this.Phys_id.HeaderText = "Physician ID"; + this.Phys_id.MinimumWidth = 6; this.Phys_id.Name = "Phys_id"; this.Phys_id.ReadOnly = true; + this.Phys_id.Width = 125; // // namefirst // this.namefirst.DataPropertyName = "FirstName"; this.namefirst.HeaderText = "First Name"; + this.namefirst.MinimumWidth = 6; this.namefirst.Name = "namefirst"; this.namefirst.ReadOnly = true; + this.namefirst.Width = 125; // // namelast // this.namelast.DataPropertyName = "LastName"; this.namelast.HeaderText = "Last Name"; + this.namelast.MinimumWidth = 6; this.namelast.Name = "namelast"; this.namelast.ReadOnly = true; + this.namelast.Width = 125; // // initialsmiddle // this.initialsmiddle.DataPropertyName = "MiddleInitials"; this.initialsmiddle.HeaderText = "Middle Initial"; + this.initialsmiddle.MinimumWidth = 6; this.initialsmiddle.Name = "initialsmiddle"; this.initialsmiddle.ReadOnly = true; + this.initialsmiddle.Width = 125; // // cit // this.cit.DataPropertyName = "City"; this.cit.HeaderText = "City"; + this.cit.MinimumWidth = 6; this.cit.Name = "cit"; this.cit.ReadOnly = true; + this.cit.Width = 125; // // state // this.state.DataPropertyName = "UsState"; this.state.HeaderText = "State"; + this.state.MinimumWidth = 6; this.state.Name = "state"; this.state.ReadOnly = true; + this.state.Width = 125; // // zipp // this.zipp.DataPropertyName = "Zip"; this.zipp.HeaderText = "Zip"; + this.zipp.MinimumWidth = 6; this.zipp.Name = "zipp"; this.zipp.ReadOnly = true; + this.zipp.Width = 125; // // dobb // @@ -708,62 +840,74 @@ namespace Louis__Pharmacy_CNSA212_FP dataGridViewCellStyle2.NullValue = null; this.dobb.DefaultCellStyle = dataGridViewCellStyle2; this.dobb.HeaderText = "DOB"; + this.dobb.MinimumWidth = 6; this.dobb.Name = "dobb"; this.dobb.ReadOnly = true; + this.dobb.Width = 125; // // numberphone // this.numberphone.DataPropertyName = "PhoneNumber"; this.numberphone.HeaderText = "Phone Number"; + this.numberphone.MinimumWidth = 6; this.numberphone.Name = "numberphone"; this.numberphone.ReadOnly = true; + this.numberphone.Width = 125; // // gennder // this.gennder.DataPropertyName = "Gender"; this.gennder.HeaderText = "Gender"; + this.gennder.MinimumWidth = 6; this.gennder.Name = "gennder"; this.gennder.ReadOnly = true; + this.gennder.Width = 125; // // Specialty // this.Specialty.DataPropertyName = "Specialty"; this.Specialty.HeaderText = "Specialty"; + this.Specialty.MinimumWidth = 6; this.Specialty.Name = "Specialty"; this.Specialty.ReadOnly = true; + this.Specialty.Width = 125; // // cmuPhysician // - this.cmuPhysician.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cmuPhysicianNew, this.cmuPhysicianEdit, this.cmuPhysicianDelete }); + this.cmuPhysician.ImageScalingSize = new System.Drawing.Size(20, 20); + this.cmuPhysician.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cmuPhysicianNew, + this.cmuPhysicianEdit, + this.cmuPhysicianDelete}); this.cmuPhysician.Name = "cmuPhysician"; - this.cmuPhysician.Size = new System.Drawing.Size(108, 70); + this.cmuPhysician.Size = new System.Drawing.Size(123, 76); // // cmuPhysicianNew // this.cmuPhysicianNew.Name = "cmuPhysicianNew"; - this.cmuPhysicianNew.Size = new System.Drawing.Size(107, 22); + this.cmuPhysicianNew.Size = new System.Drawing.Size(122, 24); this.cmuPhysicianNew.Text = "New"; // // cmuPhysicianEdit // this.cmuPhysicianEdit.Name = "cmuPhysicianEdit"; - this.cmuPhysicianEdit.Size = new System.Drawing.Size(107, 22); + this.cmuPhysicianEdit.Size = new System.Drawing.Size(122, 24); this.cmuPhysicianEdit.Text = "Edit"; // // cmuPhysicianDelete // this.cmuPhysicianDelete.Name = "cmuPhysicianDelete"; - this.cmuPhysicianDelete.Size = new System.Drawing.Size(107, 22); + this.cmuPhysicianDelete.Size = new System.Drawing.Size(122, 24); this.cmuPhysicianDelete.Text = "Delete"; // // frmInfo // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(737, 465); + this.ClientSize = new System.Drawing.Size(983, 572); this.Controls.Add(this.tbcInfo); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "frmInfo"; this.Text = "Louis\' Pharmacy - View Patient / Prescription Info"; this.Load += new System.EventHandler(this.frmInfo_Load); @@ -793,6 +937,7 @@ namespace Louis__Pharmacy_CNSA212_FP ((System.ComponentModel.ISupportInitialize)(this.dgvPhysician)).EndInit(); this.cmuPhysician.ResumeLayout(false); this.ResumeLayout(false); + } private System.Windows.Forms.ContextMenuStrip cmuPatient; diff --git a/Louis'-Pharmacy_CNSA212-FP/frmPrescription.Designer.cs b/Louis'-Pharmacy_CNSA212-FP/frmPrescription.Designer.cs index b858e48..1d6cbd8 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmPrescription.Designer.cs +++ b/Louis'-Pharmacy_CNSA212-FP/frmPrescription.Designer.cs @@ -32,8 +32,20 @@ namespace Louis__Pharmacy_CNSA212_FP this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmPrescription)); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.dataGridView1 = new System.Windows.Forms.DataGridView(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.dgvPrescriptions = new System.Windows.Forms.DataGridView(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.btnSearch = new System.Windows.Forms.Button(); + this.lblLastName = new System.Windows.Forms.Label(); + this.lblRxNumber = new System.Windows.Forms.Label(); + this.lblFirstName = new System.Windows.Forms.Label(); + this.txtRxNumber = new System.Windows.Forms.TextBox(); + this.txtLastName = new System.Windows.Forms.TextBox(); + this.txtFirstName = new System.Windows.Forms.TextBox(); + ((System.ComponentModel.ISupportInitialize)(this.dgvPrescriptions)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); this.SuspendLayout(); // // contextMenuStrip1 @@ -42,32 +54,126 @@ namespace Louis__Pharmacy_CNSA212_FP this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); // - // dataGridView1 + // dgvPrescriptions // - this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Location = new System.Drawing.Point(13, 334); - this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.RowHeadersWidth = 51; - this.dataGridView1.RowTemplate.Height = 24; - this.dataGridView1.Size = new System.Drawing.Size(829, 224); - this.dataGridView1.TabIndex = 2; + this.dgvPrescriptions.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvPrescriptions.Location = new System.Drawing.Point(0, 3); + this.dgvPrescriptions.Name = "dgvPrescriptions"; + this.dgvPrescriptions.RowHeadersWidth = 51; + this.dgvPrescriptions.RowTemplate.Height = 24; + this.dgvPrescriptions.Size = new System.Drawing.Size(878, 263); + this.dgvPrescriptions.TabIndex = 2; + // + // splitContainer1 + // + this.splitContainer1.Location = new System.Drawing.Point(13, 12); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.btnSearch); + this.splitContainer1.Panel1.Controls.Add(this.lblLastName); + this.splitContainer1.Panel1.Controls.Add(this.lblRxNumber); + this.splitContainer1.Panel1.Controls.Add(this.lblFirstName); + this.splitContainer1.Panel1.Controls.Add(this.txtRxNumber); + this.splitContainer1.Panel1.Controls.Add(this.txtLastName); + this.splitContainer1.Panel1.Controls.Add(this.txtFirstName); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.dgvPrescriptions); + this.splitContainer1.Size = new System.Drawing.Size(881, 546); + this.splitContainer1.SplitterDistance = 273; + this.splitContainer1.TabIndex = 3; + // + // btnSearch + // + this.btnSearch.Location = new System.Drawing.Point(35, 213); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Size = new System.Drawing.Size(93, 28); + this.btnSearch.TabIndex = 6; + this.btnSearch.Text = "Search"; + this.btnSearch.UseVisualStyleBackColor = true; + // + // lblLastName + // + this.lblLastName.Location = new System.Drawing.Point(16, 101); + this.lblLastName.Name = "lblLastName"; + this.lblLastName.Size = new System.Drawing.Size(100, 23); + this.lblLastName.TabIndex = 5; + this.lblLastName.Text = "Last Name:"; + this.lblLastName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lblRxNumber + // + this.lblRxNumber.Location = new System.Drawing.Point(16, 154); + this.lblRxNumber.Name = "lblRxNumber"; + this.lblRxNumber.Size = new System.Drawing.Size(100, 23); + this.lblRxNumber.TabIndex = 4; + this.lblRxNumber.Text = "Rx Number:"; + this.lblRxNumber.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // lblFirstName + // + this.lblFirstName.Location = new System.Drawing.Point(16, 55); + this.lblFirstName.Name = "lblFirstName"; + this.lblFirstName.Size = new System.Drawing.Size(100, 23); + this.lblFirstName.TabIndex = 3; + this.lblFirstName.Text = "First Name:"; + this.lblFirstName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // txtRxNumber + // + this.txtRxNumber.Location = new System.Drawing.Point(122, 154); + this.txtRxNumber.Name = "txtRxNumber"; + this.txtRxNumber.Size = new System.Drawing.Size(148, 22); + this.txtRxNumber.TabIndex = 2; + // + // txtLastName + // + this.txtLastName.Location = new System.Drawing.Point(122, 101); + this.txtLastName.Name = "txtLastName"; + this.txtLastName.Size = new System.Drawing.Size(148, 22); + this.txtLastName.TabIndex = 1; + // + // txtFirstName + // + this.txtFirstName.Location = new System.Drawing.Point(122, 56); + this.txtFirstName.Name = "txtFirstName"; + this.txtFirstName.Size = new System.Drawing.Size(148, 22); + this.txtFirstName.TabIndex = 0; // // frmPrescription // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(981, 570); - this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.splitContainer1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "frmPrescription"; this.Text = "Louis\' Pharmacy - Add / Update Prescription"; - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.Load += new System.EventHandler(this.frmPrescription_Load); + ((System.ComponentModel.ISupportInitialize)(this.dgvPrescriptions)).EndInit(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel1.PerformLayout(); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); this.ResumeLayout(false); } #endregion private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; - private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.DataGridView dgvPrescriptions; + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.TextBox txtFirstName; + private System.Windows.Forms.TextBox txtRxNumber; + private System.Windows.Forms.TextBox txtLastName; + private System.Windows.Forms.Label lblFirstName; + private System.Windows.Forms.Label lblLastName; + private System.Windows.Forms.Label lblRxNumber; + private System.Windows.Forms.Button btnSearch; } } \ No newline at end of file diff --git a/Louis'-Pharmacy_CNSA212-FP/frmPrescription.cs b/Louis'-Pharmacy_CNSA212-FP/frmPrescription.cs index 7abb09a..1e781d1 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmPrescription.cs +++ b/Louis'-Pharmacy_CNSA212-FP/frmPrescription.cs @@ -36,5 +36,25 @@ namespace Louis__Pharmacy_CNSA212_FP { } + + private void frmPrescription_Load(object sender, EventArgs e) + { + + } + + private void frmPrescription_KeyDown(object sender, KeyEventArgs e) + { + // esc not funtional + if (e.KeyCode == Keys.Escape) // Check if the pressed key is Escape + { + this.Close(); // Close the form + } + + if (e.KeyCode == Keys.Enter) + { + btnPatientSearch_Click(sender, e); + } + + } } } diff --git a/Louis'-Pharmacy_CNSA212-FP/frmPrescription.resx b/Louis'-Pharmacy_CNSA212-FP/frmPrescription.resx index f540c38..4930298 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmPrescription.resx +++ b/Louis'-Pharmacy_CNSA212-FP/frmPrescription.resx @@ -120,6 +120,9 @@ 17, 17 + + 65 + From 22bb09981abdf62a42e8329b52d525893f3f4edd Mon Sep 17 00:00:00 2001 From: EggMan20339 <99349302+EggMan20339@users.noreply.github.com> Date: Fri, 16 Feb 2024 10:12:36 -0500 Subject: [PATCH 4/4] added breakage back --- Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs | 3 ++- Louis'-Pharmacy_CNSA212-FP/frmInfo.cs | 17 +++++++++++++---- Louis'-Pharmacy_CNSA212-FP/frmPatientAdd.cs | 3 +-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs b/Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs index b1da08d..2a84bbf 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs +++ b/Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs @@ -303,6 +303,7 @@ namespace Louis__Pharmacy_CNSA212_FP this.dgvPatient.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvPatient.Size = new System.Drawing.Size(869, 270); this.dgvPatient.TabIndex = 0; + this.dgvPatient.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPatient_CellContentClick); // // pat_id // @@ -971,7 +972,7 @@ namespace Louis__Pharmacy_CNSA212_FP private System.Windows.Forms.Button btnPhysicianSearch; private System.Windows.Forms.TextBox txtPatientLast; private System.Windows.Forms.TextBox txtPatientFirst; - private System.Windows.Forms.DataGridView dgvPatient; + public System.Windows.Forms.DataGridView dgvPatient; private System.Windows.Forms.TextBox txtPhysicianLast; private System.Windows.Forms.TextBox txtPhysicianFirst; private System.Windows.Forms.DataGridView dgvPhysician; diff --git a/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs b/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs index cc6d5a6..80ee9e2 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs +++ b/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs @@ -322,16 +322,25 @@ namespace Louis__Pharmacy_CNSA212_FP { if (dgvPatient.Rows.Count > 0) { + // Console.WriteLine( dgvPatient.SelectedRows.Count); + DataGridViewRow row = dgvPatient.SelectedRows[0]; + string patid = ""; + patid = (row.Cells[0].Value).ToString(); frmPatientAdd PatientAdd = new frmPatientAdd(false); PatientAdd.MdiParent = MdiParent; PatientAdd.StartPosition = FormStartPosition.CenterScreen; PatientAdd.Show(); PatientAdd.Focus(); - // Console.WriteLine( dgvPatient.SelectedRows.Count); - // DataGridViewRow row = dgvPatient.SelectedRows[0]; - // string patid = dgvPatient.SelectedRows[0].Cells[0].Value.ToString(); - // PatientAdd.FillPatient(patid); + PatientAdd.FillPatient(patid); + } + + + } + + private void dgvPatient_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + } } } diff --git a/Louis'-Pharmacy_CNSA212-FP/frmPatientAdd.cs b/Louis'-Pharmacy_CNSA212-FP/frmPatientAdd.cs index 677c094..7ec95db 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmPatientAdd.cs +++ b/Louis'-Pharmacy_CNSA212-FP/frmPatientAdd.cs @@ -46,8 +46,7 @@ namespace Louis__Pharmacy_CNSA212_FP else { - - + } }