Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history 
- Fix #32: #32

- Fix #31: #31

- Fix #30: #30

- Fix #27: #27

- Fix #26: #26
  • Loading branch information
Mike Cotrone committed Dec 1, 2020
1 parent 13af28b commit 1cbece5
Show file tree
Hide file tree
Showing 6 changed files with 332 additions and 349 deletions.
153 changes: 74 additions & 79 deletions 2_Cal-Time Chooser Container Controls/Calendar_Container.xojo_window
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,14 @@ Begin ContainerControl Calendar_Container
UseFocusRing = False
Visible = True
Width = 230
Begin Combobox YearPopup
AutoComplete = False
Begin PopUpMenu YearPopup
AutoDeactivate = True
Bold = False
DataField = ""
DataSource = ""
Enabled = True
Height = 20
HelpTag = ""
Hint = ""
Index = -2147483648
InitialParent = ""
InitialValue = ""
Expand All @@ -56,7 +54,6 @@ Begin ContainerControl Calendar_Container
Top = 12
Transparent = True
Underline = False
UseFocusRing = False
Visible = True
Width = 70
End
Expand Down Expand Up @@ -217,7 +214,7 @@ Begin ContainerControl Calendar_Container
Height = 24
Index = -2147483648
InitialParent = ""
Left = 39
Left = 40
LockBottom = False
LockedInPosition= False
LockLeft = True
Expand All @@ -229,11 +226,10 @@ Begin ContainerControl Calendar_Container
SelectionType = 2
TabIndex = 5
TabPanelIndex = 0
TabStop = True
Top = 226
Transparent = True
Visible = True
Width = 147
Width = 150
End
Begin PopupMenu MonthPopup
AutoDeactivate = True
Expand Down Expand Up @@ -297,14 +293,17 @@ End
Me.Transparent = False
Me.EraseBackground = False
#ENDIF


End Sub
#tag EndEvent

#tag Event
Sub Paint(g As Graphics, areas() As REALbasic.Rect)
#Pragma Unused areas
g.ForeColor = &cECECEC
g.FillRoundRect(0,0,me.Width,me.Height, 8, 8)
g.FillRect(0,0,me.Width,me.Height)

End Sub
#tag EndEvent

Expand All @@ -313,24 +312,23 @@ End
Private Sub goNextMonth()
// Need a Check to See about Incrementing Year or not
Calendar1.deselectAll()
if Calendar1.NextMonth = Calendar1.Localized_January then
// Need to increment Year
Var nextYearDbl as Double = YearPopup.Text.ToDouble+1
If Calendar1.NextMonth = Calendar1.Localized_January Then
Var nextYearDbl As Double = YearPopup.Text.ToDouble+1
Calendar1.NextYear = nextYearDbl
for i as integer = 0 to YearPopup.ListCount-1
if Calendar1.NextYear.ToString = YearPopup.List(i) Then
For i As Integer = 0 To YearPopup.ListCount-1
If Calendar1.NextYear.ToString = YearPopup.List(i) Then
YearPopup.ListIndex = i
exit
End if
next i
End if
Exit
End If
Next i
End If

for i as integer = 0 to MonthPopup.ListCount-1
if Calendar1.NextMonth = MonthPopup.List(i) Then
For i As Integer = 0 To MonthPopup.ListCount-1
If Calendar1.NextMonth = MonthPopup.List(i) Then
MonthPopup.ListIndex = i
exit
End if
next i
Exit
End If
Next i


End Sub
Expand All @@ -339,14 +337,14 @@ End
#tag Method, Flags = &h21
Private Sub goNextYear()
Calendar1.deselectAll()
Var nextYearDbl as Double = YearPopup.Text.ToDouble + 1
Var nextYearDbl As Double = YearPopup.Text.ToDouble + 1
Calendar1.NextYear = nextYearDbl
for i as integer = 0 to YearPopup.ListCount-1
if Calendar1.NextYear.ToString = YearPopup.List(i) Then
For i As Integer = 0 To YearPopup.ListCount-1
If Calendar1.NextYear.ToString = YearPopup.List(i) Then
YearPopup.ListIndex = i
exit
End if
next i
Exit
End If
Next i



Expand All @@ -357,39 +355,39 @@ End
Private Sub goPrevMonth()
// Need a Check to See about Decrementing Year or not
Calendar1.deselectAll()
if Calendar1.PreviousMonth = Calendar1.Localized_December then
If Calendar1.PreviousMonth = Calendar1.Localized_December Then
// Need to increment Year
Var prevYearDbl as Double = YearPopup.Text.ToDouble -1
Var prevYearDbl As Double = YearPopup.Text.ToDouble -1
Calendar1.PrevYear = prevYearDbl
for i as integer = 0 to YearPopup.ListCount-1
if Calendar1.PrevYear.ToString = YearPopup.List(i) Then
For i As Integer = 0 To YearPopup.ListCount-1
If Calendar1.PrevYear.ToString = YearPopup.List(i) Then
YearPopup.ListIndex = i
exit
End if
next i
End if
Exit
End If
Next i
End If

for i as integer = 0 to MonthPopup.ListCount-1
if Calendar1.PreviousMonth = MonthPopup.List(i) Then
For i As Integer = 0 To MonthPopup.ListCount-1
If Calendar1.PreviousMonth = MonthPopup.List(i) Then
MonthPopup.ListIndex = i
exit
End if
next i
Exit
End If
Next i

End Sub
#tag EndMethod

#tag Method, Flags = &h21
Private Sub goPrevYear()
Calendar1.deselectAll()
Var prevYearDbl as Double = YearPopup.Text.ToDouble -1
Var prevYearDbl As Double = YearPopup.Text.ToDouble -1
Calendar1.NextYear = prevYearDbl
for i as integer = 0 to YearPopup.ListCount-1
if Calendar1.NextYear.ToString = YearPopup.List(i) Then
For i As Integer = 0 To YearPopup.ListCount-1
If Calendar1.NextYear.ToString = YearPopup.List(i) Then
YearPopup.ListIndex = i
exit
End if
next i
Exit
End If
Next i



Expand All @@ -412,39 +410,35 @@ End

#tag Method, Flags = &h0
Sub takeMeToTodaysDate()

// Bring Us Back to Today's Month
Var CurrentDateMonthString as String = Calendar1.convertMonthIntToMonthString(Calendar1.CurrentDate.Month)
for i as integer = 0 to MonthPopup.ListCount-1
if CurrentDateMonthString = MonthPopup.List(i) Then
Var CurrentDateMonthString As String = Calendar1.convertMonthIntToMonthString(Calendar1.CurrentDate.Month)
For i As Integer = 0 To MonthPopup.ListCount-1
If CurrentDateMonthString = MonthPopup.List(i) Then
MonthPopup.ListIndex = i
End if
next i
End If
Next i


// Bring Us Back to Today's Year
Var CurrentDateYearString as String = Calendar1.CurrentDate.Year.ToString
for i as integer = 0 to YearPopup.ListCount - 1
if CurrentDateYearString = YearPopup.List(i) Then
Var CurrentDateYearString As String = Calendar1.CurrentDate.Year.ToString
For i As Integer = 0 To YearPopup.ListCount - 1
If CurrentDateYearString = YearPopup.List(i) Then
YearPopup.ListIndex = i
End if
next i
End If
Next i

//Select Todays Date
// SELECT TODAYS DATE
Calendar1.deselectAll()
Var lr as Integer = Calendar1.CalendarButtonClassArray.LastIndex
for i as integer = 7 to lr
Var lr As Integer = Calendar1.CalendarButtonClassArray.LastIndex
For i As Integer = 6 To lr
// Only begin at 7 Since 0-6 Are reserved for Day Of Week Titles
if Calendar1.CalendarButtonClassArray(i).MyDate <> Nil Then
if Calendar1.CalendarButtonClassArray(i).MyDate.Month = Calendar1.CurrentDate.Month AND Calendar1.CalendarButtonClassArray(i).MyDate.Day = Calendar1.CurrentDate.Day Then
If Calendar1.CalendarButtonClassArray(i).MyDate <> Nil Then
If Calendar1.CalendarButtonClassArray(i).MyDate.Month = Calendar1.CurrentDate.Month And Calendar1.CalendarButtonClassArray(i).MyDate.Day = Calendar1.CurrentDate.Day Then
Calendar1.CalendarButtonClassArray(i).Selected = True
Calendar1.SelectedDate = Calendar1.CalendarButtonClassArray(i).MyDate
Calendar1.Invalidate(False)
End if
end if
next i
Var selectedDate As Date = Calendar1.CalendarButtonClassArray(i).MyDate
Calendar1.SelectedDate = selectedDate
End If
End If
Next i

Calendar1.Invalidate(False)
End Sub
#tag EndMethod

Expand Down Expand Up @@ -486,16 +480,17 @@ End
Sub Change()
Calendar1.SelectedYear = Me.Text
Var validYearCode as Integer = Calendar1.calculateYear(Me.Text)
If validYearCode = -1 Then
// INVALID YEAR USE THIS YEARS
Var todayDate as New date
Calendar1.YearNumber = todayDate.Year
Me.Text = todayDate.Year.ToString
End If
'If validYearCode = -1 Then
'// INVALID YEAR USE THIS YEARS
'Var todayDate as New date
'Calendar1.YearNumber = todayDate.Year
'Me.SelectedRow = todayDate.Year.ToString
'End If
Calendar1.UPDATE_MonthDays()
Calendar1.UPDATE_MapDaysToCalSlots()
Calendar1.deselectAll()


End Sub
#tag EndEvent
#tag Event
Expand Down
9 changes: 5 additions & 4 deletions 2_Cal-Time Chooser Container Controls/Date_Time_Container.xojo_window
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ Begin ContainerControl Date_Time_Container
HasBackColor = False
Height = 252
HelpTag = ""
Index = -2147483648
InitialParent = ""
Left = 10
LockBottom = False
Expand Down Expand Up @@ -81,7 +80,6 @@ Begin ContainerControl Date_Time_Container
Height = 252
HelpTag = ""
HideAMPM = False
Index = -2147483648
InitialParent = ""
Left = 250
LockBottom = False
Expand Down Expand Up @@ -115,7 +113,7 @@ End
Sub Paint(g As Graphics, areas() As REALbasic.Rect)
#Pragma Unused areas
g.ForeColor = &cECECEC
g.FillRoundRect(0,0,me.Width,me.Height, 8, 8)
g.FillRect(0,0,me.Width,me.Height)

End Sub
#tag EndEvent
Expand Down Expand Up @@ -645,7 +643,10 @@ End

// EXAMPLE RESULTS USAGE:
//MsgBox "The selected date is: " + inSelectedDate.SQLDateTime
//MsgBox "The selected date is: " + inSelectedDate.AbbreviatedDate
'MsgBox "The selected date is: " + inSelectedDate.AbbreviatedDate + " (" + inSelectedDate.SQLDateTime + ")"



End Sub
#tag EndEvent
#tag Event
Expand Down
3 changes: 2 additions & 1 deletion 2_Cal-Time Chooser Container Controls/Time_Container.xojo_window
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ End
Sub Paint(g As Graphics, areas() As REALbasic.Rect)
#Pragma Unused areas
g.ForeColor = &cECECEC
g.FillRoundRect(0,0,me.Width,me.Height, 8, 8)
g.FillRect(0,0,me.Width,me.Height)

End Sub
#tag EndEvent

Expand Down
Loading

0 comments on commit 1cbece5

Please sign in to comment.