Skip to content

[BUG] Some bugs in shadow presentation in RenderableContentControl #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Brano5 merged 8 commits into from
Aug 8, 2023
Merged

[BUG] Some bugs in shadow presentation in RenderableContentControl #200

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9aa0d1a
Create draft PR for #199
Brano5 Aug 1, 2023
97730d5
Repaired bugs in RenderableContentControl
Brano5 Aug 1, 2023
8674890
Repaired tests for RenderableContentControl
Brano5 Aug 2, 2023
b308674
Merge branch 'dev' into 199-_BUG_Some_bugs_in_shadow_presentation_in_…
Brano5 Aug 2, 2023
ff02b99
Repair some bugs in views. Add view for REAL and LREAL type.
Brano5 Aug 7, 2023
6f6d0e5
Repaired tests
Brano5 Aug 8, 2023
d80c101
Merge branch 'dev' into 199-_BUG_Some_bugs_in_shadow_presentation_in_…
Brano5 Aug 8, 2023
a966dd0
Added Key into REAL and LREAL views
Brano5 Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Repaired bugs in RenderableContentControl
  • Loading branch information
@Brano5
Brano5 committed Aug 1, 2023
commit 97730d5392bb4be5f466c7e1bd3030ae65b17d8b
17 changes: 6 additions & 11 deletions ...p.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerBaseControlView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
@typeparam T
@namespace AXSharp.Presentation.Blazor.Controls.Templates
@inherits TemplateBaseOnline<T>
@namespace AXSharp.Presentation.Blazor.Controls.Templates

@typeparam T

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">

<label for="@ComponentId">@Onliner.AttributeName</label>
<input id="@ComponentId"
readonly="@IsReadOnly"
class="w-100 form-control @AccessStatus"
type=@IsNumeric(typeof(T))
step=any
@onfocus="@( () => {HasFocus = true; LastValue = Onliner.LastValue;} )"
@onblur="@( () => HasFocus = false )"
@bind="Value" />

@onfocus="@(() => { HasFocus = true; LastValue = Onliner.LastValue; })"
@onblur="@(() => HasFocus = false)"
@bind="Value">
</TemplateView>


@code{

@code {
private string IsNumeric(Type type)
{
if (type == null) return "text";
Expand Down
3 changes: 1 addition & 2 deletions ...p.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerBoolControlView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
@inherits TemplateBaseOnline<bool>

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
<label for="@ComponentId" >@Onliner.AttributeName</label>
<label for="@ComponentId">@Onliner.AttributeName</label>
<div class="form-check form-switch">
<input id="@ComponentId"
disabled="@IsReadOnly"
class="form-check-input @AccessStatus"
type="checkbox"
@bind="Value">

</div>
</TemplateView>
12 changes: 5 additions & 7 deletions ...p.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerDateControlView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
@inherits TemplateBaseOnline<DateOnly>

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">

<label for="@ComponentId" >@Onliner.AttributeName</label>
<label for="@ComponentId">@Onliner.AttributeName</label>
<input id="@ComponentId"
readonly="@IsReadOnly"
class="w-100 form-control @AccessStatus"
type="date"
@bind="Value" />

readonly="@IsReadOnly"
class="w-100 form-control @AccessStatus"
type="date"
@bind="Value">
</TemplateView>
14 changes: 5 additions & 9 deletions ...esentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerDateTimeControlView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@
@inherits TemplateBaseOnline<DateTime>

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">

<label for="@ComponentId" >@Onliner.AttributeName</label>
<label for="@ComponentId">@Onliner.AttributeName</label>
<input id="@ComponentId"
readonly="@IsReadOnly"
class="w-100 form-control @AccessStatus"
type="datetime-local"
step=1
name="onlineDateTime"
@bind="Value">

readonly="@IsReadOnly"
class="w-100 form-control @AccessStatus"
type="datetime-local"
@bind="Value">
</TemplateView>
4 changes: 4 additions & 0 deletions ...sentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerLDateTimeControlView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@namespace AXSharp.Presentation.Blazor.Controls.Templates
@inherits TemplateBaseOnline<DateTime>

<OnlinerDateTimeControlView Onliner="Onliner" IsReadOnly="IsReadOnly" PollingInterval="PollingInterval" />
4 changes: 4 additions & 0 deletions ....Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerLTimeControlView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@namespace AXSharp.Presentation.Blazor.Controls.Templates
@inherits TemplateBaseOnline<TimeSpan>

<OnlinerTimeControlView Onliner="Onliner" IsReadOnly="IsReadOnly" PollingInterval="PollingInterval" />
4 changes: 4 additions & 0 deletions ...entation.Blazor.Controls/Templates/Base/Online/Control/OnlinerLTimeOfDayControlView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@namespace AXSharp.Presentation.Blazor.Controls.Templates
@inherits TemplateBaseOnline<TimeSpan>

<OnlinerTimeControlView Onliner="Onliner" IsReadOnly="IsReadOnly" PollingInterval="PollingInterval" />
27 changes: 27 additions & 0 deletions ...p.Presentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerTimeControlView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
@namespace AXSharp.Presentation.Blazor.Controls.Templates
@inherits TemplateBaseOnline<TimeSpan>

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
<label for="@ComponentId">@Onliner.AttributeName</label>
<input id="@ComponentId"
readonly="@IsReadOnly"
class="w-100 form-control @AccessStatus"
type="time"
value="@Onliner.Cyclic"
@onchange="ValueChanged">
</TemplateView>

@code
{
private void ValueChanged(ChangeEventArgs args)
{
try
{
Onliner.Edit = TimeSpan.Parse(args.Value.ToString());
}
catch
{
//do nothing
}
}
}
31 changes: 1 addition & 30 deletions ...sentation.Blazor.Controls/Templates/Base/Online/Control/OnlinerTimeOfDayControlView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,4 @@
@namespace AXSharp.Presentation.Blazor.Controls.Templates
@inherits TemplateBaseOnline<TimeSpan>

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">

<label for="@ComponentId" >@Onliner.AttributeName</label>
<input id="@ComponentId"
readonly="@IsReadOnly"
class="w-100 form-control @AccessStatus"
type="time"
step="1"
name="onlineTime"
value="@Onliner.Cyclic"
@onchange="ValueChanged">

</TemplateView>
@code
{
private void ValueChanged(ChangeEventArgs args)
{
try
{
var parsedTimeSpan = TimeSpan.Parse(args.Value.ToString());
Onliner.Edit = parsedTimeSpan;

}
catch
{
//do nothing
}

}
}
<OnlinerTimeControlView Onliner="Onliner" IsReadOnly="IsReadOnly" PollingInterval="PollingInterval" />
21 changes: 10 additions & 11 deletions ...p.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerBaseDisplayView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
@namespace AXSharp.Presentation.Blazor.Controls.Templates
@typeparam T
@inherits TemplateBaseOnline<T>
<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">

<label for="@(ComponentId)" >@Onliner.AttributeName</label>
<input id="@(ComponentId)"
readonly="readonly"
class="w-100 form-control @AccessStatus"
style=@(IsReadOnly? "" : "background-color:transparent")
type="text"
step=any
[email protected] />
@typeparam T

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
<label for="@ComponentId">@Onliner.AttributeName</label>
<input id="@ComponentId"
readonly="readonly"
class="w-100 form-control @AccessStatus"
style=@(IsReadOnly? "" : "background-color:transparent")
type="text"
step=any
[email protected]>
</TemplateView>
10 changes: 4 additions & 6 deletions ...p.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerBoolDisplayView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@
@inherits TemplateBaseOnline<bool>

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">

<label for="@(ComponentId)" >@Onliner.AttributeName</label>
<label for="@ComponentId">@Onliner.AttributeName</label>
<div class="form-check form-switch">
<input id="@(ComponentId)"
<input id="@ComponentId"
disabled
class="form-check-input @AccessStatus"
type="checkbox"
@bind="Onliner.Cyclic"
disabled>
@bind="Onliner.Cyclic">
</div>

</TemplateView>
16 changes: 7 additions & 9 deletions ...p.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerDateDisplayView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
@inherits TemplateBaseOnline<DateOnly>

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">

<label for="@(ComponentId)" >@Onliner.AttributeName</label>
<input id="@(ComponentId)"
readonly="readonly"
class="w-100 form-control @AccessStatus"
style=@(IsReadOnly? "" : "background-color:transparent")
type="date"
[email protected] />

<label for="@ComponentId">@Onliner.AttributeName</label>
<input id="@ComponentId"
readonly="readonly"
class="w-100 form-control @AccessStatus"
style=@(IsReadOnly? "" : "background-color:transparent")
type="text"
value="@Onliner.Cyclic">
</TemplateView>
16 changes: 7 additions & 9 deletions ...esentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerDateTimeDisplayView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
@inherits TemplateBaseOnline<DateTime>

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">

<label for="@(ComponentId)" >@Onliner.AttributeName</label>
<input id="@(ComponentId)"
class="w-100 form-control @AccessStatus"
style=@(IsReadOnly? "" : "background-color:transparent")
readonly="readonly"
type="datetime"
[email protected] />

<label for="@ComponentId">@Onliner.AttributeName</label>
<input id="@ComponentId"
readonly="readonly"
class="w-100 form-control @AccessStatus"
style=@(IsReadOnly? "" : "background-color:transparent")
type="text"
value="@Onliner.Cyclic">
</TemplateView>
4 changes: 4 additions & 0 deletions ...sentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerLDateTimeDisplayView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@namespace AXSharp.Presentation.Blazor.Controls.Templates
@inherits TemplateBaseOnline<DateTime>

<OnlinerDateTimeDisplayView Onliner="Onliner" IsReadOnly="IsReadOnly" PollingInterval="PollingInterval" />
4 changes: 4 additions & 0 deletions ....Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerLTimeDisplayView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@namespace AXSharp.Presentation.Blazor.Controls.Templates
@inherits TemplateBaseOnline<TimeSpan>

<OnlinerTimeDisplayView Onliner="Onliner" IsReadOnly="IsReadOnly" PollingInterval="PollingInterval" />
4 changes: 4 additions & 0 deletions ...entation.Blazor.Controls/Templates/Base/Online/Display/OnlinerLTimeOfDayDisplayView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@namespace AXSharp.Presentation.Blazor.Controls.Templates
@inherits TemplateBaseOnline<TimeSpan>

<OnlinerTimeDisplayView Onliner="Onliner" IsReadOnly="IsReadOnly" PollingInterval="PollingInterval" />
12 changes: 12 additions & 0 deletions ...p.Presentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerTimeDisplayView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@namespace AXSharp.Presentation.Blazor.Controls.Templates
@inherits TemplateBaseOnline<TimeSpan>

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
<label for="@ComponentId">@Onliner.AttributeName</label>
<input id="@ComponentId"
readonly="readonly"
class="w-100 form-control @AccessStatus"
style=@(IsReadOnly? "" : "background-color:transparent")
type="text"
value="@Onliner.Cyclic">
</TemplateView>
12 changes: 1 addition & 11 deletions ...sentation.Blazor.Controls/Templates/Base/Online/Display/OnlinerTimeOfDayDisplayView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
@namespace AXSharp.Presentation.Blazor.Controls.Templates
@inherits TemplateBaseOnline<TimeSpan>

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
<label for="@(ComponentId)" >@Onliner.AttributeName</label>
<input id="@(ComponentId)"
class="w-100 form-control @AccessStatus"
style=@(IsReadOnly? "" : "background-color:transparent")
type="text"
value="@Onliner.Cyclic"
readonly="readonly">


</TemplateView>
<OnlinerTimeDisplayView Onliner="Onliner" IsReadOnly="IsReadOnly" PollingInterval="PollingInterval" />
15 changes: 7 additions & 8 deletions ...entation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerBaseShadowControlView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
@namespace AXSharp.Presentation.Blazor.Controls.Templates
@typeparam T
@inherits TemplateBaseShadow<T>
@typeparam T

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">

<label for="@ComponentId" >@Onliner.AttributeName</label>
<label for="@ComponentId">@Onliner.AttributeName</label>
<input id="@ComponentId"
readonly="@IsReadOnly"
class="w-100 form-control @AccessStatus"
type="@IsNumeric(typeof(T))"
step=any
@[email protected] />
readonly="@IsReadOnly"
class="w-100 form-control @AccessStatus"
type="@IsNumeric(typeof(T))"
step=any
@[email protected]>
</TemplateView>
@code
{
Expand Down
4 changes: 2 additions & 2 deletions ...entation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerBoolShadowControlView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
@inherits TemplateBaseShadow<bool>

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">
<label for="@ComponentId" >@Onliner.AttributeName</label>
<label for="@ComponentId">@Onliner.AttributeName</label>
<div class="form-check form-switch">
<input id="@ComponentId"
disabled="@IsReadOnly"
class="form-check-input @AccessStatus"
type="checkbox"
@bind="Onliner.Shadow">
@bind="@Onliner.Shadow">
</div>
</TemplateView>
14 changes: 6 additions & 8 deletions ...entation.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerDateShadowControlView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
@inherits TemplateBaseShadow<DateOnly>

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">

<label for="@ComponentId" >@Onliner.AttributeName</label>
<input id="@ComponentId"
readonly="@IsReadOnly"
class="w-100 form-control @AccessStatus"
type="date"
@bind="@Onliner.Shadow" />

<label for="@ComponentId">@Onliner.AttributeName</label>
<input id="@ComponentId"
readonly="@IsReadOnly"
class="w-100 form-control @AccessStatus"
type="date"
@bind="Value">
</TemplateView>
14 changes: 5 additions & 9 deletions ...tion.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerDateTimeShadowControlView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@
@inherits TemplateBaseShadow<DateTime>

<TemplateView Symbol="@OnlinerSymbol" FailureReason="@Onliner.AccessStatus.FailureReason">

<label for="@ComponentId" >@Onliner.AttributeName</label>
<label for="@ComponentId">@Onliner.AttributeName</label>
<input id="@ComponentId"
readonly="@IsReadOnly"
class="w-100 form-control @AccessStatus"
type="datetime-local"
step=1
name="onlineDateTime"
@bind="Onliner.Shadow">

readonly="@IsReadOnly"
class="w-100 form-control @AccessStatus"
type="datetime-local"
@bind="Value">
</TemplateView>
4 changes: 4 additions & 0 deletions ...ion.Blazor.Controls/Templates/Base/Shadow/Control/OnlinerLDateTimeShadowControlView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@namespace AXSharp.Presentation.Blazor.Controls.Templates
@inherits TemplateBaseShadow<DateTime>

<OnlinerDateTimeShadowControlView Onliner="Onliner" IsReadOnly="IsReadOnly" PollingInterval="PollingInterval" />
Loading