Merge branch 'master' of https://github.com/EggMan20339/CNSA-212
This commit is contained in:
		| @@ -98,7 +98,6 @@ | |||||||
|     <Compile Include="PharmacyDataTier.cs" /> |     <Compile Include="PharmacyDataTier.cs" /> | ||||||
|     <Compile Include="Program.cs" /> |     <Compile Include="Program.cs" /> | ||||||
|     <Compile Include="Properties\AssemblyInfo.cs" /> |     <Compile Include="Properties\AssemblyInfo.cs" /> | ||||||
|     <Compile Include="refillDataTier.cs" /> |  | ||||||
|     <EmbeddedResource Include="frmAbout.resx"> |     <EmbeddedResource Include="frmAbout.resx"> | ||||||
|       <DependentUpon>frmAbout.cs</DependentUpon> |       <DependentUpon>frmAbout.cs</DependentUpon> | ||||||
|     </EmbeddedResource> |     </EmbeddedResource> | ||||||
|   | |||||||
| @@ -327,9 +327,10 @@ namespace Louis__Pharmacy_CNSA212_FP | |||||||
|                 PatientAdd.StartPosition = FormStartPosition.CenterScreen; |                 PatientAdd.StartPosition = FormStartPosition.CenterScreen; | ||||||
|                 PatientAdd.Show(); |                 PatientAdd.Show(); | ||||||
|                 PatientAdd.Focus(); |                 PatientAdd.Focus(); | ||||||
|                 Console.WriteLine( dgvPatient.SelectedRows.Count); |                 // Console.WriteLine( dgvPatient.SelectedRows.Count); | ||||||
|                 DataGridViewRow row = dgvPatient.SelectedRows[0]; |                 // DataGridViewRow row = dgvPatient.SelectedRows[0]; | ||||||
|                 PatientAdd.FillPatient(row.Cells[0].Value.ToString().Trim()); |                 // string patid = dgvPatient.SelectedRows[0].Cells[0].Value.ToString(); | ||||||
|  |                 // PatientAdd.FillPatient(patid); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|   | |||||||
							
								
								
									
										58
									
								
								Louis'-Pharmacy_CNSA212-FP/frmMain.Designer.cs
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										58
									
								
								Louis'-Pharmacy_CNSA212-FP/frmMain.Designer.cs
									
									
									
										generated
									
									
									
								
							| @@ -31,8 +31,6 @@ | |||||||
|             this.menuStrip1 = new System.Windows.Forms.MenuStrip(); |             this.menuStrip1 = new System.Windows.Forms.MenuStrip(); | ||||||
|             this.mnuNavigation = new System.Windows.Forms.ToolStripMenuItem(); |             this.mnuNavigation = new System.Windows.Forms.ToolStripMenuItem(); | ||||||
|             this.mnuNavigationView = 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.mnuNavigationAURRefill = new System.Windows.Forms.ToolStripMenuItem(); | ||||||
|             this.mnuWindow = new System.Windows.Forms.ToolStripMenuItem(); |             this.mnuWindow = new System.Windows.Forms.ToolStripMenuItem(); | ||||||
|             this.mnuWindowArrangeIcons = new System.Windows.Forms.ToolStripMenuItem(); |             this.mnuWindowArrangeIcons = new System.Windows.Forms.ToolStripMenuItem(); | ||||||
| @@ -47,10 +45,7 @@ | |||||||
|             //  |             //  | ||||||
|             // menuStrip1 |             // menuStrip1 | ||||||
|             //  |             //  | ||||||
|             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { |             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuNavigation, this.mnuWindow, this.mnuHelp }); | ||||||
|             this.mnuNavigation, |  | ||||||
|             this.mnuWindow, |  | ||||||
|             this.mnuHelp}); |  | ||||||
|             this.menuStrip1.Location = new System.Drawing.Point(0, 0); |             this.menuStrip1.Location = new System.Drawing.Point(0, 0); | ||||||
|             this.menuStrip1.Name = "menuStrip1"; |             this.menuStrip1.Name = "menuStrip1"; | ||||||
|             this.menuStrip1.Size = new System.Drawing.Size(800, 24); |             this.menuStrip1.Size = new System.Drawing.Size(800, 24); | ||||||
| @@ -59,11 +54,7 @@ | |||||||
|             //  |             //  | ||||||
|             // mnuNavigation |             // mnuNavigation | ||||||
|             //  |             //  | ||||||
|             this.mnuNavigation.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { |             this.mnuNavigation.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuNavigationView, this.mnuNavigationAURRefill }); | ||||||
|             this.mnuNavigationView, |  | ||||||
|             this.mnuNavigationAUPaPh, |  | ||||||
|             this.mnuNavigationAUPres, |  | ||||||
|             this.mnuNavigationAURRefill}); |  | ||||||
|             this.mnuNavigation.Name = "mnuNavigation"; |             this.mnuNavigation.Name = "mnuNavigation"; | ||||||
|             this.mnuNavigation.Size = new System.Drawing.Size(77, 20); |             this.mnuNavigation.Size = new System.Drawing.Size(77, 20); | ||||||
|             this.mnuNavigation.Text = "Navigation"; |             this.mnuNavigation.Text = "Navigation"; | ||||||
| @@ -71,39 +62,20 @@ | |||||||
|             // mnuNavigationView |             // mnuNavigationView | ||||||
|             //  |             //  | ||||||
|             this.mnuNavigationView.Name = "mnuNavigationView"; |             this.mnuNavigationView.Name = "mnuNavigationView"; | ||||||
|             this.mnuNavigationView.Size = new System.Drawing.Size(286, 22); |             this.mnuNavigationView.Size = new System.Drawing.Size(272, 22); | ||||||
|             this.mnuNavigationView.Text = "View Patient/Prescription/Physician Info"; |             this.mnuNavigationView.Text = "Patient/Prescription/Physician Search"; | ||||||
|             this.mnuNavigationView.Click += new System.EventHandler(this.mnuNavigationView_Click); |             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 |             // mnuNavigationAURRefill | ||||||
|             //  |             //  | ||||||
|             this.mnuNavigationAURRefill.Name = "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.Text = "Add/Update/Remove Refill"; | ||||||
|             this.mnuNavigationAURRefill.Click += new System.EventHandler(this.mnuNavigationAURRefill_Click); |             this.mnuNavigationAURRefill.Click += new System.EventHandler(this.mnuNavigationAURRefill_Click); | ||||||
|             //  |             //  | ||||||
|             // mnuWindow |             // mnuWindow | ||||||
|             //  |             //  | ||||||
|             this.mnuWindow.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { |             this.mnuWindow.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuWindowArrangeIcons, this.mnuWindowCascade, this.mnuWindowHorizontal, this.mnuWindowVertical, this.mnuWindowCloseAll }); | ||||||
|             this.mnuWindowArrangeIcons, |  | ||||||
|             this.mnuWindowCascade, |  | ||||||
|             this.mnuWindowHorizontal, |  | ||||||
|             this.mnuWindowVertical, |  | ||||||
|             this.mnuWindowCloseAll}); |  | ||||||
|             this.mnuWindow.Name = "mnuWindow"; |             this.mnuWindow.Name = "mnuWindow"; | ||||||
|             this.mnuWindow.Size = new System.Drawing.Size(63, 20); |             this.mnuWindow.Size = new System.Drawing.Size(63, 20); | ||||||
|             this.mnuWindow.Text = "Window"; |             this.mnuWindow.Text = "Window"; | ||||||
| @@ -111,42 +83,41 @@ | |||||||
|             // mnuWindowArrangeIcons |             // mnuWindowArrangeIcons | ||||||
|             //  |             //  | ||||||
|             this.mnuWindowArrangeIcons.Name = "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.Text = "Arrange Icons"; | ||||||
|             this.mnuWindowArrangeIcons.Click += new System.EventHandler(this.mnuWindowArrangeIcons_Click); |             this.mnuWindowArrangeIcons.Click += new System.EventHandler(this.mnuWindowArrangeIcons_Click); | ||||||
|             //  |             //  | ||||||
|             // mnuWindowCascade |             // mnuWindowCascade | ||||||
|             //  |             //  | ||||||
|             this.mnuWindowCascade.Name = "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.Text = "Cascade"; | ||||||
|             this.mnuWindowCascade.Click += new System.EventHandler(this.mnuWindowCascade_Click); |             this.mnuWindowCascade.Click += new System.EventHandler(this.mnuWindowCascade_Click); | ||||||
|             //  |             //  | ||||||
|             // mnuWindowHorizontal |             // mnuWindowHorizontal | ||||||
|             //  |             //  | ||||||
|             this.mnuWindowHorizontal.Name = "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.Text = "Horizontal"; | ||||||
|             this.mnuWindowHorizontal.Click += new System.EventHandler(this.mnuWindowHorizontal_Click); |             this.mnuWindowHorizontal.Click += new System.EventHandler(this.mnuWindowHorizontal_Click); | ||||||
|             //  |             //  | ||||||
|             // mnuWindowVertical |             // mnuWindowVertical | ||||||
|             //  |             //  | ||||||
|             this.mnuWindowVertical.Name = "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.Text = "Vertical"; | ||||||
|             this.mnuWindowVertical.Click += new System.EventHandler(this.mnuWindowVertical_Click); |             this.mnuWindowVertical.Click += new System.EventHandler(this.mnuWindowVertical_Click); | ||||||
|             //  |             //  | ||||||
|             // mnuWindowCloseAll |             // mnuWindowCloseAll | ||||||
|             //  |             //  | ||||||
|             this.mnuWindowCloseAll.Name = "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.Text = "Close All"; | ||||||
|             this.mnuWindowCloseAll.Click += new System.EventHandler(this.mnuWindowCloseAll_Click); |             this.mnuWindowCloseAll.Click += new System.EventHandler(this.mnuWindowCloseAll_Click); | ||||||
|             //  |             //  | ||||||
|             // mnuHelp |             // mnuHelp | ||||||
|             //  |             //  | ||||||
|             this.mnuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { |             this.mnuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuHelpAbout }); | ||||||
|             this.mnuHelpAbout}); |  | ||||||
|             this.mnuHelp.Name = "mnuHelp"; |             this.mnuHelp.Name = "mnuHelp"; | ||||||
|             this.mnuHelp.Size = new System.Drawing.Size(44, 20); |             this.mnuHelp.Size = new System.Drawing.Size(44, 20); | ||||||
|             this.mnuHelp.Text = "Help"; |             this.mnuHelp.Text = "Help"; | ||||||
| @@ -154,7 +125,7 @@ | |||||||
|             // mnuHelpAbout |             // mnuHelpAbout | ||||||
|             //  |             //  | ||||||
|             this.mnuHelpAbout.Name = "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.Text = "About"; | ||||||
|             this.mnuHelpAbout.Click += new System.EventHandler(this.mnuHelpAbout_Click); |             this.mnuHelpAbout.Click += new System.EventHandler(this.mnuHelpAbout_Click); | ||||||
|             //  |             //  | ||||||
| @@ -173,7 +144,6 @@ | |||||||
|             this.menuStrip1.PerformLayout(); |             this.menuStrip1.PerformLayout(); | ||||||
|             this.ResumeLayout(false); |             this.ResumeLayout(false); | ||||||
|             this.PerformLayout(); |             this.PerformLayout(); | ||||||
|  |  | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         #endregion |         #endregion | ||||||
| @@ -181,8 +151,6 @@ | |||||||
|         private System.Windows.Forms.MenuStrip menuStrip1; |         private System.Windows.Forms.MenuStrip menuStrip1; | ||||||
|         private System.Windows.Forms.ToolStripMenuItem mnuNavigation; |         private System.Windows.Forms.ToolStripMenuItem mnuNavigation; | ||||||
|         private System.Windows.Forms.ToolStripMenuItem mnuNavigationView; |         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 mnuNavigationAURRefill; | ||||||
|         private System.Windows.Forms.ToolStripMenuItem mnuWindow; |         private System.Windows.Forms.ToolStripMenuItem mnuWindow; | ||||||
|         private System.Windows.Forms.ToolStripMenuItem mnuHelp; |         private System.Windows.Forms.ToolStripMenuItem mnuHelp; | ||||||
|   | |||||||
| @@ -43,26 +43,26 @@ namespace Louis__Pharmacy_CNSA212_FP | |||||||
|  |  | ||||||
|         private void mnuNavigationAUPaPh_Click(object sender, EventArgs e) |         private void mnuNavigationAUPaPh_Click(object sender, EventArgs e) | ||||||
|         { |         { | ||||||
|             frmPatientPhysician formPaPh = new frmPatientPhysician(); |             // frmPatientPhysician formPaPh = new frmPatientPhysician(); | ||||||
|  |             // | ||||||
|             formPaPh.MdiParent = this; |             // formPaPh.MdiParent = this; | ||||||
|             formPaPh.StartPosition = FormStartPosition.CenterScreen; |             // formPaPh.StartPosition = FormStartPosition.CenterScreen; | ||||||
|             formPaPh.Show(); |             // formPaPh.Show(); | ||||||
|             formPaPh.Focus(); |             // formPaPh.Focus(); | ||||||
|  |             // | ||||||
|             mnuNavigationAUPaPh.Checked = true; |             // mnuNavigationAUPaPh.Checked = true; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         private void mnuNavigationAUPres_Click(object sender, EventArgs e) |         private void mnuNavigationAUPres_Click(object sender, EventArgs e) | ||||||
|         { |         { | ||||||
|             frmPrescription formPrescription = new frmPrescription(); |             // frmPrescription formPrescription = new frmPrescription(); | ||||||
|  |             // | ||||||
|             formPrescription.MdiParent = this; |             // formPrescription.MdiParent = this; | ||||||
|             formPrescription.StartPosition = FormStartPosition.CenterScreen; |             // formPrescription.StartPosition = FormStartPosition.CenterScreen; | ||||||
|             formPrescription.Show(); |             // formPrescription.Show(); | ||||||
|             formPrescription.Focus(); |             // formPrescription.Focus(); | ||||||
|  |             // | ||||||
|             mnuNavigationAUPres.Checked = true; |             // mnuNavigationAUPres.Checked = true; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         private void mnuNavigationAURRefill_Click(object sender, EventArgs e) |         private void mnuNavigationAURRefill_Click(object sender, EventArgs e) | ||||||
|   | |||||||
| @@ -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 |  | ||||||
|     { |  | ||||||
|  |  | ||||||
|     } |  | ||||||
| } |  | ||||||
		Reference in New Issue
	
	Block a user