Several Fixes found in my own testing:

- CalendarGrid needs to have StartDate as 12:00:00, otherwise a subtraction to calculate the column number of each availability doesn't work properly
- CGDocument needs to have SelectedDate set otherwise when it refreshes, it uses the selected date and makes the screen suddenly blank.
- DApptSearch needs to make date/times proper to send over to DB. CGSchedLib.CreateAvailabilitySchedule needs the startDate to be the beginning of the day and end date to be the end of the day. Now this is done.
- Updated exes.
This commit is contained in:
sam 2011-03-29 14:29:04 +00:00
parent 410bed6c38
commit 6c386491b2
8 changed files with 18 additions and 5 deletions

View File

@ -337,6 +337,8 @@ namespace IndianHealthService.ClinicalScheduling
try
{
//Create new Document
this.SelectedDate = dDate.Date;
m_ScheduleType = (m_sResourcesArray.Count == 1) ? ScheduleType.Resource : ScheduleType.Clinic;
bool bRet = false;

View File

@ -733,6 +733,15 @@
return rectangle;
}
/// <summary>
/// Translates a StartTime into a Cell, for coloring
/// </summary>
/// <param name="dDate"></param>
/// <param name="nRow"></param>
/// <param name="nCol"></param>
/// <param name="bStartCell"></param>
/// <param name="sResource"></param>
/// <returns></returns>
public bool GetCellFromTime(DateTime dDate, ref int nRow, ref int nCol, bool bStartCell, string sResource)
{
int num = (dDate.Hour * 60) + dDate.Minute;
@ -1420,7 +1429,8 @@
}
set
{
this.m_dtStart = value;
//this.m_dtStart = value;
this.m_dtStart = value.Date; // only date portion!!!//smh
}
}

View File

@ -36,8 +36,7 @@
<RemoteDebugMachine>
</RemoteDebugMachine>
<StartAction>Project</StartAction>
<StartArguments>
</StartArguments>
<StartArguments>/s=172.16.16.108 /p=9250 /a=BASMA.ALDWAIRI /v=SELEN.123 /culture=ar-JO</StartArguments>
<StartPage>
</StartPage>
<StartProgram>C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\IEExec.exe</StartProgram>

View File

@ -244,7 +244,7 @@ namespace IndianHealthService.ClinicalScheduling
this.m_dStart = this.dtStart.Value;
//End
this.m_dEnd = this.dtEnd.Value;
this.m_dEnd = this.dtEnd.Value;
}
}
@ -726,7 +726,9 @@ namespace IndianHealthService.ClinicalScheduling
//Get Availabilities and Appointments from the DB
//NB: m_sAmpm and m_sWeekDays don't have an effect on the M side side right now
string sSearchInfo = "1|" + m_sAmpm + "|" + m_sWeekDays;
m_dStart = m_dStart.Date; // move to 1200
m_dEnd = m_dEnd.Date.AddHours(23).AddMinutes(59).AddSeconds(59); //move to 235959
string sSearchInfo = "1|" + m_sAmpm + "|" + m_sWeekDays;
DataTable m_availTable = CGSchedLib.CreateAvailabilitySchedule(m_DocManager, m_alResources, m_dStart, m_dEnd, m_alAccessTypes, ScheduleType.Resource, sSearchInfo);
DataTable m_apptTable = CGSchedLib.CreateAppointmentSchedule(m_DocManager, m_alResources, m_dStart, m_dEnd);