Merge remote-tracking branch 'origin/master'

Louis'-Pharmacy_CNSA212-FP/Louis'-Pharmacy_CNSA212-FP.csproj

@@ -98,6 +98,7 @@
     <Compile Include="PharmacyDataTier.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="refillDataTier.cs" />
     <EmbeddedResource Include="frmAbout.resx">
       <DependentUpon>frmAbout.cs</DependentUpon>
     </EmbeddedResource>

Louis'-Pharmacy_CNSA212-FP/frmRefill.Designer.cs

@@ -29,6 +29,7 @@ namespace Louis__Pharmacy_CNSA212_FP
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmRefill));
             this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
@@ -49,7 +50,12 @@ namespace Louis__Pharmacy_CNSA212_FP
             this.patientid = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.medicationid = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.rxnumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.cmuAdd = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmuUpdate = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmuDelete = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            this.contextMenuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
             // bindingNavigatorAddNewItem
@@ -160,6 +166,33 @@ namespace Louis__Pharmacy_CNSA212_FP
             this.rxnumber.HeaderText = "Rx Number";
             this.rxnumber.Name = "rxnumber";
             // 
+            // contextMenuStrip1
+            // 
+            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cmuAdd,
+            this.cmuUpdate,
+            this.cmuDelete});
+            this.contextMenuStrip1.Name = "contextMenuStrip1";
+            this.contextMenuStrip1.Size = new System.Drawing.Size(181, 92);
+            // 
+            // cmuAdd
+            // 
+            this.cmuAdd.Name = "cmuAdd";
+            this.cmuAdd.Size = new System.Drawing.Size(180, 22);
+            this.cmuAdd.Text = "Add";
+            // 
+            // cmuUpdate
+            // 
+            this.cmuUpdate.Name = "cmuUpdate";
+            this.cmuUpdate.Size = new System.Drawing.Size(180, 22);
+            this.cmuUpdate.Text = "Update";
+            // 
+            // cmuDelete
+            // 
+            this.cmuDelete.Name = "cmuDelete";
+            this.cmuDelete.Size = new System.Drawing.Size(180, 22);
+            this.cmuDelete.Text = "Delete";
+            // 
             // frmRefill
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -172,6 +205,7 @@ namespace Louis__Pharmacy_CNSA212_FP
             this.Text = "Louis\' Pharmacy - Prescription Refill";
             this.Load += new System.EventHandler(this.frmRefill_Load);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            this.contextMenuStrip1.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -210,5 +244,9 @@ namespace Louis__Pharmacy_CNSA212_FP
         private System.Windows.Forms.DataGridViewTextBoxColumn patientid;
         private System.Windows.Forms.DataGridViewTextBoxColumn medicationid;
         private System.Windows.Forms.DataGridViewTextBoxColumn rxnumber;
+        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem cmuAdd;
+        private System.Windows.Forms.ToolStripMenuItem cmuUpdate;
+        private System.Windows.Forms.ToolStripMenuItem cmuDelete;
     }
 }

Louis'-Pharmacy_CNSA212-FP/frmRefill.cs

@@ -8,6 +8,11 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
+using Microsoft.VisualBasic;
+using System.Configuration;
+using System.Collections;
+using System.Data.SqlClient;
+
 namespace Louis__Pharmacy_CNSA212_FP
 {
     public partial class frmRefill : Form
@@ -24,9 +29,7 @@ namespace Louis__Pharmacy_CNSA212_FP
 
         private void frmRefill_Load(object sender, EventArgs e)
         {
-            // TODO: This line of code loads data into the 'finalProjectOfficialPharmacyDataSet.REFILLS' table. You can move, or remove it, as needed.
+            
-            //this.rEFILLSTableAdapter.Fill(this.finalProjectOfficialPharmacyDataSet.REFILLS);
-
         }
     }
 }

Louis'-Pharmacy_CNSA212-FP/frmRefill.resx

@@ -132,6 +132,9 @@
   <metadata name="rxnumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

Louis'-Pharmacy_CNSA212-FP/refillDataTier.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Louis__Pharmacy_CNSA212_FP
+{
+    class refillDataTier
+    {
+
+    }
+}