Changeset 850


Ignore:
Timestamp:
Jul 11, 2010, 10:09:11 AM (14 years ago)
Author:
Sam Habiel
Message:

Updated Source Code for i18n.
Changes in DPatientLetter.cs
Changes in CGSchedLib.cs

Location:
Scheduling/trunk/cs/bsdx0200GUISourceCode
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocument.cs

    r821 r850  
    206206                                this.m_appointments.ClearAllAppointments();
    207207
    208                 //  calls RPC to (presumably--not sure yet) get appointments
     208                //  calls RPC to get appointments
    209209                                rAppointmentSchedule = CGSchedLib.CreateAppointmentSchedule(m_DocManager, m_sResourcesArray, this.m_dStartDate, this.m_dEndDate);
    210210                               

  • Scheduling/trunk/cs/bsdx0200GUISourceCode/CGSchedLib.cs

    r614 r850  
    3535                                        sResName += "|";
    3636                        }
    37                         string sStart;
    38                         string sEnd;
    39                         sStart = StartTime.ToString("M-d-yyyy");
    40                         sEnd = EndTime.ToString("M-d-yyyy@HH:m");
     37                       
     38                       
     39            string sStart = FMDateTime.Create(StartTime).DateOnly.FMDateString;
     40            string sEnd = FMDateTime.Create(EndTime).FMDateString;
    4141                        string sSql = "BSDX CREATE APPT SCHEDULE^" + sResName + "^" + sStart + "^" + sEnd ;
    4242                        DataTable dtRet = docManager.RPMSDataTable(sSql, "AppointmentSchedule");

  • Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs

    r825 r850  
    393393            //
    394394            this.mnuPrintReminderLetters.Index = 10;
    395             this.mnuPrintReminderLetters.Shortcut = System.Windows.Forms.Shortcut.CtrlR;
     395            this.mnuPrintReminderLetters.Shortcut = System.Windows.Forms.Shortcut.CtrlI;
    396396            this.mnuPrintReminderLetters.Text = "Print Rem&inder Letters";
    397397            this.mnuPrintReminderLetters.Click += new System.EventHandler(this.mnuPrintReminderLetters_Click);
    … …  
    400400            //
    401401            this.mnuPrintRebookLetters.Index = 11;
     402            this.mnuPrintRebookLetters.Shortcut = System.Windows.Forms.Shortcut.CtrlR;
    402403            this.mnuPrintRebookLetters.Text = "Print &Rebook Letters";
    403404            this.mnuPrintRebookLetters.Click += new System.EventHandler(this.mnuPrintRebookLetters_Click);
    … …  
    651652            this.tvSchedules.Location = new System.Drawing.Point(0, 0);
    652653            this.tvSchedules.Name = "tvSchedules";
    653             this.tvSchedules.Size = new System.Drawing.Size(128, 369);
     654            this.tvSchedules.Size = new System.Drawing.Size(128, 479);
    654655            this.tvSchedules.Sorted = true;
    655656            this.tvSchedules.TabIndex = 1;
    … …  
    697698            this.panelRight.Controls.Add(this.panelClip);
    698699            this.panelRight.Dock = System.Windows.Forms.DockStyle.Right;
    699             this.panelRight.Location = new System.Drawing.Point(807, 0);
     700            this.panelRight.Location = new System.Drawing.Point(941, 0);
    700701            this.panelRight.Name = "panelRight";
    701             this.panelRight.Size = new System.Drawing.Size(128, 369);
     702            this.panelRight.Size = new System.Drawing.Size(128, 479);
    702703            this.panelRight.TabIndex = 3;
    703704            this.panelRight.Visible = false;
    … …  
    765766            this.panelTop.Location = new System.Drawing.Point(128, 0);
    766767            this.panelTop.Name = "panelTop";
    767             this.panelTop.Size = new System.Drawing.Size(679, 24);
     768            this.panelTop.Size = new System.Drawing.Size(813, 24);
    768769            this.panelTop.TabIndex = 6;
    769770            //
    … …  
    773774            this.dateTimePicker1.DropDownAlign = System.Windows.Forms.LeftRightAlignment.Right;
    774775            this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
    775             this.dateTimePicker1.Location = new System.Drawing.Point(551, 0);
     776            this.dateTimePicker1.Location = new System.Drawing.Point(685, 0);
    776777            this.dateTimePicker1.Name = "dateTimePicker1";
    777778            this.dateTimePicker1.Size = new System.Drawing.Size(128, 20);
    … …  
    795796            this.panelCenter.Location = new System.Drawing.Point(136, 24);
    796797            this.panelCenter.Name = "panelCenter";
    797             this.panelCenter.Size = new System.Drawing.Size(668, 321);
     798            this.panelCenter.Size = new System.Drawing.Size(802, 431);
    798799            this.panelCenter.TabIndex = 7;
    799800            //
    … …  
    817818            this.calendarGrid1.Resources = ((System.Collections.ArrayList)(resources.GetObject("calendarGrid1.Resources")));
    818819            this.calendarGrid1.SelectedAppointment = 0;
    819             this.calendarGrid1.Size = new System.Drawing.Size(668, 321);
     820            this.calendarGrid1.Size = new System.Drawing.Size(802, 431);
    820821            this.calendarGrid1.StartDate = new System.DateTime(2003, 1, 27, 0, 0, 0, 0);
    821822            this.calendarGrid1.TabIndex = 0;
    … …  
    909910            this.panelBottom.Controls.Add(this.statusBar1);
    910911            this.panelBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
    911             this.panelBottom.Location = new System.Drawing.Point(136, 345);
     912            this.panelBottom.Location = new System.Drawing.Point(136, 455);
    912913            this.panelBottom.Name = "panelBottom";
    913             this.panelBottom.Size = new System.Drawing.Size(668, 24);
     914            this.panelBottom.Size = new System.Drawing.Size(802, 24);
    914915            this.panelBottom.TabIndex = 8;
    915916            //
    … …  
    919920            this.statusBar1.Location = new System.Drawing.Point(0, 0);
    920921            this.statusBar1.Name = "statusBar1";
    921             this.statusBar1.Size = new System.Drawing.Size(668, 24);
     922            this.statusBar1.Size = new System.Drawing.Size(802, 24);
    922923            this.statusBar1.SizingGrip = false;
    923924            this.statusBar1.TabIndex = 0;
    … …  
    927928            this.splitter1.Location = new System.Drawing.Point(128, 24);
    928929            this.splitter1.Name = "splitter1";
    929             this.splitter1.Size = new System.Drawing.Size(8, 345);
     930            this.splitter1.Size = new System.Drawing.Size(8, 455);
    930931            this.splitter1.TabIndex = 9;
    931932            this.splitter1.TabStop = false;
    … …  
    934935            //
    935936            this.splitter2.Dock = System.Windows.Forms.DockStyle.Right;
    936             this.splitter2.Location = new System.Drawing.Point(804, 24);
     937            this.splitter2.Location = new System.Drawing.Point(938, 24);
    937938            this.splitter2.Name = "splitter2";
    938             this.splitter2.Size = new System.Drawing.Size(3, 345);
     939            this.splitter2.Size = new System.Drawing.Size(3, 455);
    939940            this.splitter2.TabIndex = 10;
    940941            this.splitter2.TabStop = false;
    … …  
    948949            //
    949950            this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
    950             this.ClientSize = new System.Drawing.Size(935, 369);
     951            this.ClientSize = new System.Drawing.Size(1069, 479);
    951952            this.Controls.Add(this.panelCenter);
    952953            this.Controls.Add(this.panelBottom);

  • Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user

    r824 r850  
    3636    </RemoteDebugMachine>
    3737    <StartAction>Project</StartAction>
    38     <StartArguments>/s=172.16.17.31 /p=9240 /a=shabiel12 /v=catdog.44 /e=windows-1256</StartArguments>
     38    <StartArguments>/s=172.16.17.51 /p=9240 /a=shabiel12 /v=catdog.44 /e=windows-1256</StartArguments>
    3939    <StartPage>
    4040    </StartPage>
    … …  
    5555    </RemoteDebugMachine>
    5656    <StartAction>Project</StartAction>
    57     <StartArguments>/s=172.16.17.31 /p=9240 /a=shabiel12 /v=catdog.44 /e=windows-1256</StartArguments>
     57    <StartArguments>/s=172.16.17.51 /p=9240 /a=shabiel12 /v=catdog.44 /e=windows-1256</StartArguments>
    5858    <StartPage>
    5959    </StartPage>

  • Scheduling/trunk/cs/bsdx0200GUISourceCode/DAL.cs

    r848 r850  
    9494        /// ^T00030STATE^T00030ZIP^T00030HOMEPHONE^D00030OldApptDate
    9595        ///</returns>
    96         /// <remarks>Not sure if this works yet</remarks>
    9796        /// <remarks>Mirrors dsRebookAppts.PatientAppt Schema. Can merge table into schema.</remarks>
    9897        public DataTable GetRebookedAppointments(string sClinicList, DateTime BeginDate, DateTime EndDate)
    … …  
    103102            return RPMSDataTable(cmd, "");
    104103        }
     104
     105        public DataTable GetRebookedAppointments(string sApptList)
     106        {
     107            string cmd = String.Format("BSDX REBOOK LIST^{0}", sApptList);
     108            return RPMSDataTable(cmd, "");
     109        }
     110
     111        public DataTable GetCancelledAppointments(string sClinicList, DateTime BeginDate, DateTime EndDate)
     112        {
     113            string sBegin = FMDateTime.Create(BeginDate).DateOnly.FMDateString;
     114            string sEnd = FMDateTime.Create(EndDate).DateOnly.FMDateString;
     115            string cmd = String.Format("BSDX CANCEL CLINIC LIST^{0}^{1}^{2}", sClinicList, sBegin, sEnd);
     116            return RPMSDataTable(cmd, "");
     117        }
     118
    105119
    106120        /// <summary>

  • Scheduling/trunk/cs/bsdx0200GUISourceCode/DPatientLetter.cs

    r848 r850  
    88{
    99        /// <summary>
    10         /// Summary description for DPatientLetter.
     10        /// Handles Printing of letters (Reminder, Rebook, Cancellation) and a Report. Contains a Print Preview dialog.
    1111        /// </summary>
    1212        public class DPatientLetter : System.Windows.Forms.PrintPreviewDialog
    … …  
    1818        private System.Drawing.Printing.PrintDocument printAppts;
    1919        private System.Drawing.Printing.PrintDocument printReminderLetters;
     20        private System.Drawing.Printing.PrintDocument printCancelLetters;
     21        private System.Drawing.Printing.PrintDocument printRebookLetters;
    2022
    2123                #region Fields
    … …  
    2830        int _pageNumber = 0;
    2931       
    30         //dataset to load the results of queries into and set to print routines
     32        //typed datasets to load the results of queries into and set to print routines
    3133        dsPatientApptDisplay2 _dsApptDisplay;
    32         private PrintDocument printCancelLetters;
    33         private PrintDocument printRebookLetters;
    3434        dsRebookAppts _dsRebookAppts;
     35
    3536                #endregion Fields
     37
     38        #region Windows Form Designer generated code
     39        /// <summary>
     40        /// Required method for Designer support - do not modify
     41        /// the contents of this method with the code editor.
     42        /// </summary>
     43        private void InitializeComponent()
     44        {
     45            this.printAppts = new System.Drawing.Printing.PrintDocument();
     46            this.printReminderLetters = new System.Drawing.Printing.PrintDocument();
     47            this.printCancelLetters = new System.Drawing.Printing.PrintDocument();
     48            this.printRebookLetters = new System.Drawing.Printing.PrintDocument();
     49            this.SuspendLayout();
     50            //
     51            // printAppts
     52            //
     53            this.printAppts.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printAppts_PrintPage);
     54            //
     55            // printReminderLetters
     56            //
     57            this.printReminderLetters.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printReminderLetters_PrintPage);
     58            //
     59            // printCancelLetters
     60            //
     61            this.printCancelLetters.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printCancelLetters_PrintPage);
     62            //
     63            // printRebookLetters
     64            //
     65            this.printRebookLetters.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printRebookLetters_PrintPage);
     66            //
     67            // DPatientLetter
     68            //
     69            this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
     70            this.ClientSize = new System.Drawing.Size(648, 398);
     71            this.Name = "DPatientLetter";
     72            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
     73            this.Text = "Patient Letter";
     74            this.ResumeLayout(false);
     75
     76        }
     77        #endregion
     78
    3679
    3780                /// <summary>
    … …  
    83126        /// <param name="dtBegin">Beginning Date</param>
    84127        /// <param name="dtEnd">End Date</param>
    85         /// working on moving this over...
    86128        public void InitializeFormRebookLetters(CGDocumentManager docManager,
    87129                        string sClinicList,
    … …  
    96138                                }
    97139
    98                 string sBegin = dtBegin.ToString("M/d/yyyy@HH:mm");
    99                 string sEnd = dtEnd.ToString("M/d/yyyy@HH:mm");
    100 
    101140                //Call RPC to get list of appt ids that have been rebooked for these clinics on these dates
    102                 string sSql1 = "BSDX REBOOK CLINIC LIST^" + sClinicList + "^" + sBegin + "^" + sEnd;                           
    103                                 string sSql2 = "BSDX RESOURCE LETTERS^" + sClinicList;
     141                DataTable PatientAppts = docManager.DAL.GetRebookedAppointments(sClinicList, dtBegin, dtEnd);
     142                DataTable Resources = docManager.DAL.GetResourceLetters(sClinicList);
    104143
    105144                _dsRebookAppts = new dsRebookAppts();
    106                 _dsRebookAppts.PatientAppts.Merge(docManager.RPMSDataTable(sSql1, "PatientAppts"));
    107                 _dsRebookAppts.BSDXResource.Merge(docManager.RPMSDataTable(sSql2, "Resources"));
     145                _dsRebookAppts.PatientAppts.Merge(PatientAppts);
     146                _dsRebookAppts.BSDXResource.Merge(Resources);
    108147
    109148            }
    … …  
    134173                }
    135174
    136                 string sSql1 = "BSDX REBOOK LIST^" + sApptIDList;
    137                 string sSql2 = "BSDX RESOURCE LETTERS^" + sClinicList;
     175                DataTable PatientAppts = docManager.DAL.GetRebookedAppointments(sApptIDList);
     176                DataTable Resources = docManager.DAL.GetResourceLetters(sClinicList);
    138177
    139178                _dsRebookAppts = new dsRebookAppts();
    140                 _dsRebookAppts.PatientAppts.Merge(docManager.RPMSDataTable(sSql1, "PatientAppts"));
    141                 _dsRebookAppts.BSDXResource.Merge(docManager.RPMSDataTable(sSql2, "Resources"));
    142 
    143 
     179                _dsRebookAppts.PatientAppts.Merge(PatientAppts);
     180                _dsRebookAppts.BSDXResource.Merge(Resources);
    144181            }
    145182            catch (Exception ex)
    … …  
    169206                                        throw new Exception("At least one clinic must be selected.");
    170207                                }
    171 
    172                 string sBegin = dtBegin.ToString("M/d/yyyy@HH:mm");
    173                 string sEnd = dtEnd.ToString("M/d/yyyy@HH:mm");
    174 
    175                 //Call RPC to get list of appt ids that have been cancelled for these clinics on these dates
    176                 string sSql1 = "BSDX CANCEL CLINIC LIST^" + sClinicList + "^" + sBegin + "^" + sEnd;
    177                                 string sSql2 = "BSDX RESOURCE LETTERS^" + sClinicList;
    178 
     208               
     209                DataTable PatientAppts = docManager.DAL.GetCancelledAppointments(sClinicList, dtBegin, dtEnd);
     210                DataTable Resources = docManager.DAL.GetResourceLetters(sClinicList);
     211               
    179212                _dsRebookAppts = new dsRebookAppts();
    180                 _dsRebookAppts.PatientAppts.Merge(docManager.RPMSDataTable(sSql1, "PatientAppts"));
    181                 _dsRebookAppts.BSDXResource.Merge(docManager.RPMSDataTable(sSql2, "Resources"));
    182 
     213                _dsRebookAppts.PatientAppts.Merge(PatientAppts);
     214                _dsRebookAppts.BSDXResource.Merge(Resources);
     215               
    183216                PrintPreviewControl.Document = printCancelLetters;
    184217
    … …  
    208241                                }
    209242
     243                // Global variables to use in printing routine down below
    210244                _dtBegin = dtBegin;
    211245                _dtEnd = dtEnd;
    212                 string sBegin = dtBegin.ToShortDateString();
    213                 string sEnd = dtEnd.ToShortDateString();
    214                 this.Text = "Clinic Schedules";
    215 
    216                 string sSql = "BSDX CLINIC LETTERS^" + sClinicList + "^" + sBegin + "^" + sEnd;
    217                 string sSql2 = "BSDX RESOURCE LETTERS^" + sClinicList;
    218 
     246
     247                this.Text = "Reminder Letters";
     248
     249                // Get Data
     250                DataTable PatientAppts = docManager.DAL.GetClinicSchedules(sClinicList, dtBegin, dtEnd);
     251                DataTable Resources = docManager.DAL.GetResourceLetters(sClinicList);
     252
     253                // Merge tables into typed dataset
    219254                _dsApptDisplay = new dsPatientApptDisplay2();
    220                 _dsApptDisplay.BSDXResource.Merge(docManager.RPMSDataTable(sSql2, "Resources"));
    221                 _dsApptDisplay.PatientAppts.Merge(docManager.RPMSDataTable(sSql, "PatientAppts"));
     255                _dsApptDisplay.PatientAppts.Merge(PatientAppts);
     256                _dsApptDisplay.BSDXResource.Merge(Resources);
    222257
    223258                this.PrintPreviewControl.Document = printReminderLetters;
    … …  
    260295                }
    261296
    262                 #region Windows Form Designer generated code
    263                 /// <summary>
    264                 /// Required method for Designer support - do not modify
    265                 /// the contents of this method with the code editor.
    266                 /// </summary>
    267                 private void InitializeComponent()
    268                 {
    269             this.printAppts = new System.Drawing.Printing.PrintDocument();
    270             this.printReminderLetters = new System.Drawing.Printing.PrintDocument();
    271             this.printCancelLetters = new System.Drawing.Printing.PrintDocument();
    272             this.printRebookLetters = new System.Drawing.Printing.PrintDocument();
    273             this.SuspendLayout();
    274             //
    275             // printAppts
    276             //
    277             this.printAppts.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printAppts_PrintPage);
    278             //
    279             // printReminderLetters
    280             //
    281             this.printReminderLetters.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printReminderLetters_PrintPage);
    282             //
    283             // printCancelLetters
    284             //
    285             this.printCancelLetters.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printCancelLetters_PrintPage);
    286             //
    287             // printRebookLetters
    288             //
    289             this.printRebookLetters.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printRebookLetters_PrintPage);
    290             //
    291             // DPatientLetter
    292             //
    293             this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
    294             this.ClientSize = new System.Drawing.Size(648, 398);
    295             this.Name = "DPatientLetter";
    296             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
    297             this.Text = "Patient Letter";
    298             this.ResumeLayout(false);
    299 
    300                 }
    301                 #endregion
    302297
    303298        private void printAppts_PrintPage(object sender, System.Drawing.Printing.PrintPageEventArgs e)
Note: See TracChangeset for help on using the changeset viewer.