Merge remote-tracking branch 'origin/master'
# Conflicts: # Louis'-Pharmacy_CNSA212-FP/frmInfo.cs
This commit is contained in:
commit
4e85e6f9bb
16
Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs
generated
16
Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs
generated
@ -34,8 +34,8 @@ namespace Louis__Pharmacy_CNSA212_FP
|
|||||||
System.Windows.Forms.Label lblPatientLast;
|
System.Windows.Forms.Label lblPatientLast;
|
||||||
System.Windows.Forms.Label lblPhysicianFirst;
|
System.Windows.Forms.Label lblPhysicianFirst;
|
||||||
System.Windows.Forms.Label lblPhysicianLast;
|
System.Windows.Forms.Label lblPhysicianLast;
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmInfo));
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmInfo));
|
||||||
this.tbcInfo = new System.Windows.Forms.TabControl();
|
this.tbcInfo = new System.Windows.Forms.TabControl();
|
||||||
this.tbpPatient = new System.Windows.Forms.TabPage();
|
this.tbpPatient = new System.Windows.Forms.TabPage();
|
||||||
@ -400,9 +400,9 @@ namespace Louis__Pharmacy_CNSA212_FP
|
|||||||
// DOB
|
// DOB
|
||||||
//
|
//
|
||||||
this.DOB.DataPropertyName = "DOB";
|
this.DOB.DataPropertyName = "DOB";
|
||||||
dataGridViewCellStyle1.Format = "d";
|
dataGridViewCellStyle3.Format = "d";
|
||||||
dataGridViewCellStyle1.NullValue = null;
|
dataGridViewCellStyle3.NullValue = null;
|
||||||
this.DOB.DefaultCellStyle = dataGridViewCellStyle1;
|
this.DOB.DefaultCellStyle = dataGridViewCellStyle3;
|
||||||
this.DOB.HeaderText = "DOB";
|
this.DOB.HeaderText = "DOB";
|
||||||
this.DOB.MinimumWidth = 6;
|
this.DOB.MinimumWidth = 6;
|
||||||
this.DOB.Name = "DOB";
|
this.DOB.Name = "DOB";
|
||||||
@ -806,9 +806,9 @@ namespace Louis__Pharmacy_CNSA212_FP
|
|||||||
// dobb
|
// dobb
|
||||||
//
|
//
|
||||||
this.dobb.DataPropertyName = "DOB";
|
this.dobb.DataPropertyName = "DOB";
|
||||||
dataGridViewCellStyle2.Format = "d";
|
dataGridViewCellStyle4.Format = "d";
|
||||||
dataGridViewCellStyle2.NullValue = null;
|
dataGridViewCellStyle4.NullValue = null;
|
||||||
this.dobb.DefaultCellStyle = dataGridViewCellStyle2;
|
this.dobb.DefaultCellStyle = dataGridViewCellStyle4;
|
||||||
this.dobb.HeaderText = "DOB";
|
this.dobb.HeaderText = "DOB";
|
||||||
this.dobb.MinimumWidth = 6;
|
this.dobb.MinimumWidth = 6;
|
||||||
this.dobb.Name = "dobb";
|
this.dobb.Name = "dobb";
|
||||||
|
@ -746,6 +746,11 @@ namespace Louis__Pharmacy_CNSA212_FP
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void cmuAddRefill_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private void dgvRx_CellContentClick(object sender, DataGridViewCellEventArgs e)
|
private void dgvRx_CellContentClick(object sender, DataGridViewCellEventArgs e)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user