Changeset 853 for Scheduling/trunk


Ignore:
Timestamp:
Jul 12, 2010, 10:24:09 AM (14 years ago)
Author:
Sam Habiel
Message:
 
Location:
Scheduling/trunk/cs/bsdx0200GUISourceCode
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Scheduling/trunk/cs/bsdx0200GUISourceCode/CGSchedLib.cs

    r850 r853  
    2626                }
    2727
     28        /// <summary>
     29        /// Gets appointments from VISTA to display in Grid
     30        /// </summary>
     31        /// <param name="docManager"></param>
     32        /// <param name="saryResNames"></param>
     33        /// <param name="StartTime"></param>
     34        /// <param name="EndTime"></param>
     35        /// <returns></returns>
    2836                public static DataTable CreateAppointmentSchedule(CGDocumentManager docManager, ArrayList saryResNames, DateTime StartTime, DateTime EndTime)
    2937                {
     
    120128                }               
    121129
     130
    122131                public static DataTable CreateAssignedTypeSchedule(CGDocumentManager docManager, string sResourceName, DateTime StartTime, DateTime EndTime, ScheduleType stType)
    123132                {
     
    125134                        string sStart;
    126135                        string sEnd;
    127                         sStart = StartTime.ToString("M-d-yyyy");
    128                         sEnd = EndTime.ToString("M-d-yyyy");
     136                        //sStart = StartTime.ToString("M-d-yyyy");
     137            sStart = FMDateTime.Create(StartTime).DateOnly.FMDateString;
     138                        //sEnd = EndTime.ToString("M-d-yyyy");
     139            sEnd = FMDateTime.Create(EndTime).DateOnly.FMDateString;
    129140//                      string sSource = (stType == ScheduleType.Resource ? "ST_RESOURCE" : "ST_CLINIC");
    130141                        string sSql = "BSDX TYPE BLOCKS OVERLAP^" + sStart + "^" + sEnd + "^" + sResourceName ;//+ "^" + sSource;
     
    284295                        string sStart;
    285296                        string sEnd;
    286                         sStart = StartTime.ToString("M-d-yyyy");
    287                         sEnd = EndTime.ToString("M-d-yyyy@H:mm");
     297                        //sStart = StartTime.ToString("M-d-yyyy"); smh
     298            sStart = FMDateTime.Create(StartTime).DateOnly.FMDateString;
     299                        //sEnd = EndTime.ToString("M-d-yyyy@H:mm"); smh
     300            sEnd = FMDateTime.Create(EndTime).FMDateString;
    288301                        string sSql = "BSDX CREATE ASGND SLOT SCHED^" + sResourceName + "^" + sStart + "^" + sEnd + "^" + sApptTypeIDs + "^" + sSearchInfo; //+ "^" + sSTType ;
    289302
     
    359372                        string sStart;
    360373                        string sEnd;
    361                         sStart = StartTime.ToString("M-d-yyyy");
    362                         sEnd = EndTime.ToString("M-d-yyyy");
     374                        //sStart = StartTime.ToString("M-d-yyyy");
     375            sStart = FMDateTime.Create(StartTime).DateOnly.FMDateString;
     376                        //sEnd = EndTime.ToString("M-d-yyyy");
     377            sEnd = FMDateTime.Create(EndTime).DateOnly.FMDateString;
    363378
    364379                        string sSTType = (stType == ScheduleType.Resource ? "ST_RESOURCE" : "ST_CLINIC");
  • Scheduling/trunk/cs/bsdx0200GUISourceCode/DAccessBlock.cs

    r622 r853  
    9999            this.panel1.Size = new Size(0x192, 40);
    100100            this.panel1.TabIndex = 2;
    101             this.cmdCancel.DialogResult = DialogResult.Cancel;
    102101            this.cmdCancel.Location = new Point(0x120, 8);
    103102            this.cmdCancel.Name = "cmdCancel";
     
    105104            this.cmdCancel.TabIndex = 1;
    106105            this.cmdCancel.Text = "Cancel";
    107             this.cmdOK.DialogResult = DialogResult.OK;
     106
    108107            this.cmdOK.Location = new Point(0xd0, 8);
    109108            this.cmdOK.Name = "cmdOK";
     
    253252            this.cboAccessTypeFilter.DisplayMember = "ACCESS_GROUP";
    254253            this.cboAccessTypeFilter.SelectedIndex = this.cboAccessTypeFilter.Items.Count - 1;
     254            this.cmdCancel.DialogResult = DialogResult.Cancel;
     255            this.cmdOK.DialogResult = DialogResult.OK;
    255256            this.UpdateDialogData(true);
    256257        }
     
    277278            this.cboAccessTypeFilter.SelectedIndex = this.cboAccessTypeFilter.Items.Count - 1;
    278279            this.m_pAppt.AccessTypeID = 0;
     280            this.cmdCancel.DialogResult = DialogResult.Cancel;
     281            this.cmdOK.DialogResult = DialogResult.OK;
    279282            this.UpdateDialogData(true);
    280283        }
Note: See TracChangeset for help on using the changeset viewer.