Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs =================================================================== --- Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs (revision 1124) +++ Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs (revision 1125) @@ -240,4 +240,5 @@ this.lblResource = new System.Windows.Forms.Label(); this.panelCenter = new System.Windows.Forms.Panel(); + this.calendarGrid1 = new IndianHealthService.ClinicalScheduling.CalendarGrid(); this.ctxCalendarGrid = new System.Windows.Forms.ContextMenu(); this.ctxCalGridAdd = new System.Windows.Forms.MenuItem(); @@ -257,5 +258,4 @@ this.splitter1 = new System.Windows.Forms.Splitter(); this.splitter2 = new System.Windows.Forms.Splitter(); - this.calendarGrid1 = new IndianHealthService.ClinicalScheduling.CalendarGrid(); this.panelRight.SuspendLayout(); this.panelClip.SuspendLayout(); @@ -629,5 +629,5 @@ this.tvSchedules.Location = new System.Drawing.Point(0, 0); this.tvSchedules.Name = "tvSchedules"; - this.tvSchedules.Size = new System.Drawing.Size(128, 204); + this.tvSchedules.Size = new System.Drawing.Size(128, 485); this.tvSchedules.Sorted = true; this.tvSchedules.TabIndex = 1; @@ -698,5 +698,5 @@ this.panelRight.Location = new System.Drawing.Point(996, 0); this.panelRight.Name = "panelRight"; - this.panelRight.Size = new System.Drawing.Size(128, 204); + this.panelRight.Size = new System.Drawing.Size(128, 485); this.panelRight.TabIndex = 3; this.panelRight.Visible = false; @@ -794,127 +794,6 @@ this.panelCenter.Location = new System.Drawing.Point(136, 24); this.panelCenter.Name = "panelCenter"; - this.panelCenter.Size = new System.Drawing.Size(857, 156); + this.panelCenter.Size = new System.Drawing.Size(857, 437); this.panelCenter.TabIndex = 7; - // - // ctxCalendarGrid - // - this.ctxCalendarGrid.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { - this.ctxCalGridAdd, - this.ctxCalGridEdit, - this.ctxCalGridDelete, - this.ctxCalGridCheckIn, - this.ctxCalGridUndoCheckin, - this.menuItem2, - this.ctxCalGridNoShow, - this.ctxCalGridNoShowUndo, - this.menuItem9, - this.ctxCalGridWalkin, - this.menuItem10, - this.ctxCalGridReprintApptSlip}); - this.ctxCalendarGrid.Popup += new System.EventHandler(this.ctxCalendarGrid_Popup); - // - // ctxCalGridAdd - // - this.ctxCalGridAdd.Index = 0; - this.ctxCalGridAdd.Text = "Add Appointment"; - this.ctxCalGridAdd.Click += new System.EventHandler(this.ctxCalGridAdd_Click); - // - // ctxCalGridEdit - // - this.ctxCalGridEdit.Index = 1; - this.ctxCalGridEdit.Text = "Edit Appointment"; - this.ctxCalGridEdit.Click += new System.EventHandler(this.ctxCalGridEdit_Click); - // - // ctxCalGridDelete - // - this.ctxCalGridDelete.Index = 2; - this.ctxCalGridDelete.Text = "Cancel Appointment"; - this.ctxCalGridDelete.Click += new System.EventHandler(this.ctxCalGridDelete_Click); - // - // ctxCalGridCheckIn - // - this.ctxCalGridCheckIn.Index = 3; - this.ctxCalGridCheckIn.Text = "Check In Patient"; - this.ctxCalGridCheckIn.Click += new System.EventHandler(this.ctxCalGridCheckIn_Click); - // - // ctxCalGridUndoCheckin - // - this.ctxCalGridUndoCheckin.Index = 4; - this.ctxCalGridUndoCheckin.Text = "&Undo Check In"; - this.ctxCalGridUndoCheckin.Click += new System.EventHandler(this.ctxCalGridUndoCheckin_Click); - // - // menuItem2 - // - this.menuItem2.Index = 5; - this.menuItem2.Text = "-"; - // - // ctxCalGridNoShow - // - this.ctxCalGridNoShow.Index = 6; - this.ctxCalGridNoShow.Text = "Mark as No Show"; - this.ctxCalGridNoShow.Click += new System.EventHandler(this.ctxCalGridNoShow_Click); - // - // ctxCalGridNoShowUndo - // - this.ctxCalGridNoShowUndo.Index = 7; - this.ctxCalGridNoShowUndo.Text = "Undo NoShow"; - this.ctxCalGridNoShowUndo.Click += new System.EventHandler(this.ctxCalGridNoShowUndo_Click); - // - // menuItem9 - // - this.menuItem9.Index = 8; - this.menuItem9.Text = "-"; - // - // ctxCalGridWalkin - // - this.ctxCalGridWalkin.Index = 9; - this.ctxCalGridWalkin.Text = "Create Wal&k-In Appointment"; - this.ctxCalGridWalkin.Click += new System.EventHandler(this.ctxCalGridWalkin_Click); - // - // menuItem10 - // - this.menuItem10.Index = 10; - this.menuItem10.Text = "-"; - // - // ctxCalGridReprintApptSlip - // - this.ctxCalGridReprintApptSlip.Index = 11; - this.ctxCalGridReprintApptSlip.Text = "&Reprint Appointment Slip"; - this.ctxCalGridReprintApptSlip.Click += new System.EventHandler(this.ctxCalGridReprintApptSlip_Click); - // - // panelBottom - // - this.panelBottom.Controls.Add(this.statusBar1); - this.panelBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panelBottom.Location = new System.Drawing.Point(136, 180); - this.panelBottom.Name = "panelBottom"; - this.panelBottom.Size = new System.Drawing.Size(857, 24); - this.panelBottom.TabIndex = 8; - // - // statusBar1 - // - this.statusBar1.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar1.Location = new System.Drawing.Point(0, 0); - this.statusBar1.Name = "statusBar1"; - this.statusBar1.Size = new System.Drawing.Size(857, 24); - this.statusBar1.SizingGrip = false; - this.statusBar1.TabIndex = 0; - // - // splitter1 - // - this.splitter1.Location = new System.Drawing.Point(128, 24); - this.splitter1.Name = "splitter1"; - this.splitter1.Size = new System.Drawing.Size(8, 180); - this.splitter1.TabIndex = 9; - this.splitter1.TabStop = false; - // - // splitter2 - // - this.splitter2.Dock = System.Windows.Forms.DockStyle.Right; - this.splitter2.Location = new System.Drawing.Point(993, 24); - this.splitter2.Name = "splitter2"; - this.splitter2.Size = new System.Drawing.Size(3, 180); - this.splitter2.TabIndex = 10; - this.splitter2.TabStop = false; // // calendarGrid1 @@ -937,5 +816,5 @@ this.calendarGrid1.Resources = ((System.Collections.ArrayList)(resources.GetObject("calendarGrid1.Resources"))); this.calendarGrid1.SelectedAppointment = 0; - this.calendarGrid1.Size = new System.Drawing.Size(857, 156); + this.calendarGrid1.Size = new System.Drawing.Size(857, 437); this.calendarGrid1.StartDate = new System.DateTime(2003, 1, 27, 0, 0, 0, 0); this.calendarGrid1.TabIndex = 0; @@ -947,8 +826,129 @@ this.calendarGrid1.MouseEnter += new System.EventHandler(this.calendarGrid1_MouseEnter); // + // ctxCalendarGrid + // + this.ctxCalendarGrid.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { + this.ctxCalGridAdd, + this.ctxCalGridEdit, + this.ctxCalGridDelete, + this.ctxCalGridCheckIn, + this.ctxCalGridUndoCheckin, + this.menuItem2, + this.ctxCalGridNoShow, + this.ctxCalGridNoShowUndo, + this.menuItem9, + this.ctxCalGridWalkin, + this.menuItem10, + this.ctxCalGridReprintApptSlip}); + this.ctxCalendarGrid.Popup += new System.EventHandler(this.ctxCalendarGrid_Popup); + // + // ctxCalGridAdd + // + this.ctxCalGridAdd.Index = 0; + this.ctxCalGridAdd.Text = "Add Appointment"; + this.ctxCalGridAdd.Click += new System.EventHandler(this.ctxCalGridAdd_Click); + // + // ctxCalGridEdit + // + this.ctxCalGridEdit.Index = 1; + this.ctxCalGridEdit.Text = "Edit Appointment"; + this.ctxCalGridEdit.Click += new System.EventHandler(this.ctxCalGridEdit_Click); + // + // ctxCalGridDelete + // + this.ctxCalGridDelete.Index = 2; + this.ctxCalGridDelete.Text = "Cancel Appointment"; + this.ctxCalGridDelete.Click += new System.EventHandler(this.ctxCalGridDelete_Click); + // + // ctxCalGridCheckIn + // + this.ctxCalGridCheckIn.Index = 3; + this.ctxCalGridCheckIn.Text = "Check In Patient"; + this.ctxCalGridCheckIn.Click += new System.EventHandler(this.ctxCalGridCheckIn_Click); + // + // ctxCalGridUndoCheckin + // + this.ctxCalGridUndoCheckin.Index = 4; + this.ctxCalGridUndoCheckin.Text = "&Undo Check In"; + this.ctxCalGridUndoCheckin.Click += new System.EventHandler(this.ctxCalGridUndoCheckin_Click); + // + // menuItem2 + // + this.menuItem2.Index = 5; + this.menuItem2.Text = "-"; + // + // ctxCalGridNoShow + // + this.ctxCalGridNoShow.Index = 6; + this.ctxCalGridNoShow.Text = "Mark as No Show"; + this.ctxCalGridNoShow.Click += new System.EventHandler(this.ctxCalGridNoShow_Click); + // + // ctxCalGridNoShowUndo + // + this.ctxCalGridNoShowUndo.Index = 7; + this.ctxCalGridNoShowUndo.Text = "Undo NoShow"; + this.ctxCalGridNoShowUndo.Click += new System.EventHandler(this.ctxCalGridNoShowUndo_Click); + // + // menuItem9 + // + this.menuItem9.Index = 8; + this.menuItem9.Text = "-"; + // + // ctxCalGridWalkin + // + this.ctxCalGridWalkin.Index = 9; + this.ctxCalGridWalkin.Text = "Create Wal&k-In Appointment"; + this.ctxCalGridWalkin.Click += new System.EventHandler(this.ctxCalGridWalkin_Click); + // + // menuItem10 + // + this.menuItem10.Index = 10; + this.menuItem10.Text = "-"; + // + // ctxCalGridReprintApptSlip + // + this.ctxCalGridReprintApptSlip.Index = 11; + this.ctxCalGridReprintApptSlip.Text = "&Reprint Appointment Slip"; + this.ctxCalGridReprintApptSlip.Click += new System.EventHandler(this.ctxCalGridReprintApptSlip_Click); + // + // panelBottom + // + this.panelBottom.Controls.Add(this.statusBar1); + this.panelBottom.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panelBottom.Location = new System.Drawing.Point(136, 461); + this.panelBottom.Name = "panelBottom"; + this.panelBottom.Size = new System.Drawing.Size(857, 24); + this.panelBottom.TabIndex = 8; + // + // statusBar1 + // + this.statusBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar1.Location = new System.Drawing.Point(0, 0); + this.statusBar1.Name = "statusBar1"; + this.statusBar1.Size = new System.Drawing.Size(857, 24); + this.statusBar1.SizingGrip = false; + this.statusBar1.TabIndex = 0; + // + // splitter1 + // + this.splitter1.Location = new System.Drawing.Point(128, 24); + this.splitter1.Name = "splitter1"; + this.splitter1.Size = new System.Drawing.Size(8, 461); + this.splitter1.TabIndex = 9; + this.splitter1.TabStop = false; + // + // splitter2 + // + this.splitter2.Dock = System.Windows.Forms.DockStyle.Right; + this.splitter2.Location = new System.Drawing.Point(993, 24); + this.splitter2.Name = "splitter2"; + this.splitter2.Size = new System.Drawing.Size(3, 461); + this.splitter2.TabIndex = 10; + this.splitter2.TabStop = false; + // // CGView // this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); - this.ClientSize = new System.Drawing.Size(1124, 204); + this.ClientSize = new System.Drawing.Size(1124, 485); this.Controls.Add(this.panelCenter); this.Controls.Add(this.panelBottom); @@ -2131,5 +2131,5 @@ try { - CGAppointment appt = new CGAppointment(); + //Get Time and Resource from Selected Cell @@ -2193,4 +2193,5 @@ } + CGAppointment appt = new CGAppointment(); appt.PatientID = Convert.ToInt32(dPat.PatientIEN); appt.PatientName = dPat.PatientName; @@ -2200,4 +2201,13 @@ appt.HealthRecordNumber = dPat.HealthRecordNumber; + appt.Patient = new Patient + { + DFN = Convert.ToInt32(dPat.PatientIEN), + ID = dPat.PatientPID, + Name = dPat.PatientName, + HRN = dPat.HealthRecordNumber, + DOB = dPat.PatientDOB + }; + //smh: Takes too long //this.Document.RefreshDocument(); @@ -2210,5 +2220,5 @@ AppointmentCheckIn(); - //Show the new set of appointments by calling UpdateArrays. Fetches Document's CGAppointments + //Show the new set of appointments by calling UpdateArrays. this.UpdateArrays(); Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/DPatientLookup.cs =================================================================== --- Scheduling/trunk/cs/bsdx0200GUISourceCode/DPatientLookup.cs (revision 1124) +++ Scheduling/trunk/cs/bsdx0200GUISourceCode/DPatientLookup.cs (revision 1125) @@ -226,4 +226,7 @@ this.m_sPatientIEN = r["IEN"].ToString(); this.m_sPatientPID = r["PID"].ToString(); + DateTime d = Convert.ToDateTime(r["DOB"]); + string sFormat = System.Globalization.DateTimeFormatInfo.CurrentInfo.ShortDatePattern; + this.m_sPatientDOB = d.ToString(sFormat); this.cmdOK.Enabled = true; this.AcceptButton = cmdOK; @@ -369,4 +372,20 @@ } + public DateTime PatientDOB + { + get + { + return DateTime.Parse(m_sPatientDOB); + } + } + + public string PatientPID + { + get + { + return m_sPatientPID; + } + } + #endregion //Properties Index: Scheduling/trunk/cs/bsdx0200GUISourceCode/Printing.cs =================================================================== --- Scheduling/trunk/cs/bsdx0200GUISourceCode/Printing.cs (revision 1124) +++ Scheduling/trunk/cs/bsdx0200GUISourceCode/Printing.cs (revision 1125) @@ -615,6 +615,6 @@ sb.AppendLine(); sb.AppendLine("Age:" + "\t" + appt.Patient.UserFriendlyAge); - sb.AppendLine(); - sb.AppendLine("Sex:" + "\t" + appt.Patient.Sex.ToString()); + //sb.AppendLine(); + //sb.AppendLine("Sex:" + "\t" + appt.Patient.Sex.ToString()); // Draw them