diff --git a/src/Connected.Components.Showcase.Runner/Pages/Democomp.razor b/src/Connected.Components.Showcase.Runner/Pages/Democomp.razor index 55efb76..649df9a 100644 --- a/src/Connected.Components.Showcase.Runner/Pages/Democomp.razor +++ b/src/Connected.Components.Showcase.Runner/Pages/Democomp.razor @@ -949,11 +949,7 @@ -<<<<<<< HEAD -
-=======
->>>>>>> features/rewrite/styles
diff --git a/src/Connected.Components.Showcase.Runner/Pages/Index.razor b/src/Connected.Components.Showcase.Runner/Pages/Index.razor index 45f90e1..9ed0882 100644 --- a/src/Connected.Components.Showcase.Runner/Pages/Index.razor +++ b/src/Connected.Components.Showcase.Runner/Pages/Index.razor @@ -21,7 +21,7 @@

Izbran datum je: @date

-======= + Step1 @@ -43,7 +43,6 @@ CloseOnDateSelect=true

Selected date is @date.ToString()

->>>>>>> f35b855ba7f7efe1991867b4d60a2a2959005c60 @code { DateTime date = DateTime.Today; diff --git a/src/Connected.Components/Components/DatePicker.razor b/src/Connected.Components/Components/DatePicker.razor index 1371c1f..b1e13ff 100644 --- a/src/Connected.Components/Components/DatePicker.razor +++ b/src/Connected.Components/Components/DatePicker.razor @@ -1,15 +1,8 @@ @using System.Globalization; - - @if (loaded) {
- - - @*
*@ - -
@@ -17,7 +10,7 @@
At least 6 characters required
- + @@ -29,232 +22,101 @@ @if (Shown) - { + {
-
- @*
- @SelectedDate.Year.ToString() -
*@ -
Select date
-
- @SelectedDate.ToString("ddd, " + Format) +
+ +
Select date
+
+ @SelectedDate.ToString("ddd, " + Format) +
-
-
- -
- @switch (Selecting) - { - case Selecting.Years: - { -<<<<<<< HEAD -
-
-
-
-
Selecting = Selecting.Months)>@SelectedDate.ToString("MMMM yyyy")
- -
-
-
-
- @for (int i = SelectedDate.Year - 7; i < SelectedDate.Year + 8; i++) +
+ +
+ @switch (Selecting) + { + case Selecting.Years: { - int y = i; - -
-
-
@i.ToString()
-
-
- - - if (SelectedDate.Year - i % 3 == 0) -======= - -
- -
Selecting = Selecting.Months)>@SelectedDate.ToString("yyyy")
- -
-
- @for (int i = SelectedDate.Year - 7; i < SelectedDate.Year + 8; i++) ->>>>>>> f35b855ba7f7efe1991867b4d60a2a2959005c60 - { - int y = i; - @* -
-
-
@i.ToString()
-
-
- - if (SelectedDate.Year - i % 3 == 0) - { -
- } *@ - - } -
- break; - } - case Selecting.Months: - { -<<<<<<< HEAD -
-
-
+
+ +
Selecting = Selecting.Months)>@SelectedDate.ToString("yyyy")
+
- -
Selecting = Selecting.Years)>@SelectedDate.ToString("MMMM yyyy")
- - -
-
+
+ @for (int i = SelectedDate.Year - 7; i < SelectedDate.Year + 8; i++) + { + int y = i; + + }
-
- @for (int i = 1; i <= @DateTimeFormatInfo.CurrentInfo.MonthNames.Length - 1; i++) + break; + } + case Selecting.Months: { - int m = i; - - -
-
-
@DateTimeFormatInfo.CurrentInfo.GetMonthName(i).Substring(0,3)
-
-
- - - if (i % 3 == 0) -======= - - -
- -
Selecting = Selecting.Years)>@SelectedDate.ToString("MMMM yyyy")
- -
-
- @for (int i = 1; i <= @DateTimeFormatInfo.CurrentInfo.MonthNames.Length - 1; i++) ->>>>>>> f35b855ba7f7efe1991867b4d60a2a2959005c60 - { - int m = i; - @* - -
-
-
@DateTimeFormatInfo.CurrentInfo.GetMonthName(i).Substring(0,3)
-
-
- - - - - if (i % 3 == 0) - { -
- } *@ - - - } -
- break; - } - case (Selecting.Days): - { -<<<<<<< HEAD -
-
-
+
+ +
Selecting = Selecting.Years)>@SelectedDate.ToString("MMMM yyyy")
+
- -
Selecting = Selecting.Months)>@SelectedDate.ToString("MMMM yyyy")
- - -
-
+
+ @for (int i = 1; i <= @DateTimeFormatInfo.CurrentInfo.MonthNames.Length - 1; i++) + { + int m = i; + + }
-======= -
- -
Selecting = Selecting.Months)>@SelectedDate.ToString("MMMM yyyy")
- ->>>>>>> f35b855ba7f7efe1991867b4d60a2a2959005c60 -
-
- @for (int i = 0; i < 7; i++) - - { - - @*
@CalendarStart.AddDays(i).ToString("ddd").Substring(0,1)
*@ -
@CalendarStart.AddDays(i).ToString("ddd").Substring(0,1)
- - } -<<<<<<< HEAD - CalendarStart = CalendarStart.AddDays(1); + break; } -======= - - @foreach (var Date in ShowingDates) - { - +
Selecting = Selecting.Months)>@SelectedDate.ToString("MMMM yyyy")
+ - @if (CalendarStart.DayOfWeek.Equals(DayOfWeek.Sunday)) +
+
+ @for (int i = 0; i < 7; i++) + { - @*
*@ +
@CalendarStart.AddDays(i).ToString("ddd").Substring(0,1)
} - CalendarStart = CalendarStart.AddDays(1); - } -
->>>>>>> f35b855ba7f7efe1991867b4d60a2a2959005c60 - break; - - } - - } -<<<<<<< HEAD - @if (ShowBottomBar) - { - -
- - -
- } -======= -
- -
- - + @foreach (var Date in ShowingDates) + { + + CalendarStart = CalendarStart.AddDays(1); + } +
+ break; + + } + } +
+ +
+ + +
+
-
- ->>>>>>> f35b855ba7f7efe1991867b4d60a2a2959005c60
-
}
-} +} \ No newline at end of file diff --git a/src/Connected.Components/Components/DatePicker.razor.cs b/src/Connected.Components/Components/DatePicker.razor.cs index 6f11fea..f77984b 100644 --- a/src/Connected.Components/Components/DatePicker.razor.cs +++ b/src/Connected.Components/Components/DatePicker.razor.cs @@ -18,6 +18,8 @@ public partial class DatePicker [Parameter] public DateTime SelectedDate { get; set; } = DateTime.Today; + private DateTime _InitialDate { get; set; } + [Parameter] public DateTime? SelectedEndDate { get; set; } = null; @@ -53,14 +55,13 @@ public partial class DatePicker } private bool Shown { get; set; } = false; - public async Task SetDate(DateTime Date, bool HideOnSet=false) + public async Task SetDate(DateTime Date) { SelectedDate = Date; SetStartStop(); if (CloseOnDateSelect) Shown = false; await SelectedDateChanged.InvokeAsync(SelectedDate); - if (HideOnSet) Shown = false; StateHasChanged(); } @@ -82,48 +83,6 @@ public partial class DatePicker StateHasChanged(); } - private string DayNamesRowClass - { - get - { - return new CssBuilder() - .AddClass("chip-leading-icon") - .AddClass("d-inline-block") - .AddClass("m-1") - .AddClass("bg-danger") - .AddClass("text-small") - .AddClass("text-white") - .Build(); - } - } - private string ChipFirstRowStyle - { - get - { - return new StyleBuilder() - .AddStyle("width", "30px") - .AddStyle("height", "30px") - .AddStyle("text-align", "center") - .Build(); - } - } - /* - @for (int i=0;i<7; i++) - { -
@calendarStart.AddDays(i).ToString("ddd").Substring(0,1)
- } - @while (calendarStart.CompareTo(calendarEnd) < 0) - { -
@calendarStart.Day.ToString()
 - @if (calendarStart.DayOfWeek.Equals(DayOfWeek.Sunday)) - { -
- } - calendarStart = calendarStart.AddDays(1); - } - - */ - public void SetStartStop() { CalendarStart = SelectedDate; @@ -154,7 +113,7 @@ public partial class DatePicker } } - public string DateChipStyle(DateTime date) + public string DateChipClass(DateTime date) { string result = ""; if (date.Month.CompareTo(SelectedDate.Month) < 0 || date.Month.CompareTo(SelectedDate.Month) > 0) return "d-none"; @@ -188,6 +147,7 @@ public partial class DatePicker protected override async Task OnInitializedAsync() { SelectedDate = DateTime.Today; + _InitialDate=SelectedDate; SetStartStop(); loaded = true; await base.OnInitializedAsync(); @@ -219,6 +179,20 @@ public partial class DatePicker } } + private async Task ClosePicker(bool resetDate=true) + { + if (resetDate) + SelectedDate=_InitialDate; + Shown = false; + await SelectedDateChanged.InvokeAsync(SelectedDate); + } + + private void TogglePicker() + { + _InitialDate=SelectedDate; + Shown = !Shown; + } + private async Task NavBarClick(bool forward = true) { int multiplier = 1; diff --git a/src/Connected.Components/Components/FormWizard.razor b/src/Connected.Components/Components/FormWizard.razor index b0ef625..661bed1 100644 --- a/src/Connected.Components/Components/FormWizard.razor +++ b/src/Connected.Components/Components/FormWizard.razor @@ -6,7 +6,7 @@
- +