Skip to content

Commit 3e2245c

Browse files
rajendranr-5483rajendranr-5483
authored
Merge pull request #3 from Aravinth113/master
v19.2.44 released
2 parents 8aa4e9b + ee7a56b commit 3e2245c

File tree

7 files changed

+47
-28999
lines changed

7 files changed

+47
-28999
lines changed

‎Models/SignalR/SignalRCommonHub.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public async Task SendToGroup(int groupId, int userId)
3838
public override Task OnConnectedAsync()
3939
{
4040
string roomGUID = new RoomList().DefaultRoomId;
41-
string currentUserId = this.Context.Connection.GetHttpContext().Request.Query["userId"];
41+
string currentUserId = this.Context.GetHttpContext().Request.Query["userId"];
4242
if (!string.IsNullOrWhiteSpace(currentUserId) && currentUserId != "undefined")
4343
{
4444
int currentUserIdValue = Convert.ToInt32(currentUserId);
@@ -56,7 +56,7 @@ public override Task OnConnectedAsync()
5656
public override Task OnDisconnectedAsync(Exception exp)
5757
{
5858
string roomGUID = new RoomList().DefaultRoomId;
59-
string currentUserId = this.Context.Connection.GetHttpContext().Request.Query["userId"];
59+
string currentUserId = this.Context.GetHttpContext().Request.Query["userId"];
6060
if (!string.IsNullOrWhiteSpace(currentUserId) && currentUserId != "undefined")
6161
{
6262
int currentUserIdValue = Convert.ToInt32(currentUserId);

‎Models/StoryObjects.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace StoryEstimator.Showcase.Models
22
{
33
using System;
4-
using Syncfusion.XlsIO;
4+
using System.ComponentModel;
55
using StoryEstimator.Showcase.Utils;
66

77
public class StoryObjects : TransactionResult

‎StoryEstimator.Showcase.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
10-
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.0.0-preview1-final" />
11-
<PackageReference Include="Syncfusion.EJ2" Version="16.1.0.37" />
12-
<PackageReference Include="Syncfusion.XlsIO.NETStandard" Version="16.1.0.32" />
10+
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.0.0" />
11+
<PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="19.2.0.44" />
12+
<PackageReference Include="Syncfusion.XlsIO.Net.Core" Version="19.2.0.44" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎Views/Home/_StoryTemplate.cshtml‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@model StoryEstimator.Showcase.Models.PlayObjects
22
@using StoryEstimator.Showcase.Models.Data
33
@using StoryEstimator.Showcase.Utils;
4+
@using Syncfusion.EJ2.CircularGauge
45
@using Syncfusion.EJ2
56

67
@{
@@ -160,60 +161,60 @@
160161
}
161162
<input type="hidden" id="storyTimer" value="@Model.RoomDetails.Timer.Value" />
162163
@{
163-
var lineStyle = new
164+
CircularGaugeLine lineStyle = new CircularGaugeLine()
164165
{
165-
width = "0",
166+
Width = 0,
166167
};
167-
var majorTicks = new
168+
CircularGaugeTick majorTicks = new CircularGaugeTick()
168169
{
169-
color = "white",
170-
offset = -5,
171-
height = 12,
170+
Color = "white",
171+
Offset = -5,
172+
Height = 12,
172173
};
173-
var minorTicks = new
174+
CircularGaugeTick minorTicks = new CircularGaugeTick()
174175
{
175-
width = "0",
176+
Width = 0,
176177
};
177-
var labelStyle = new
178+
CircularGaugeLabel labelStyle = new CircularGaugeLabel
178179
{
179-
offset = -10,
180-
useRangeColor = true,
181-
font = new
180+
Offset = -10,
181+
UseRangeColor = true,
182+
Font = new CircularGaugeFont()
182183
{
183-
color = "#424242",
184-
size = "13px",
185-
fontFamily = "Roboto",
184+
Color = "#424242",
185+
Size = "13px",
186+
FontFamily = "Roboto",
186187
}
187188
};
188-
List<Syncfusion.EJ2.CircularGauge.CircularGaugePointer> pointers = new List<Syncfusion.EJ2.CircularGauge.CircularGaugePointer>();
189-
pointers.Add(new Syncfusion.EJ2.CircularGauge.CircularGaugePointer
189+
List<CircularGaugePointer> pointers = new List<CircularGaugePointer>();
190+
pointers.Add(new CircularGaugePointer
190191
{
191192
Radius = "65%",
192193
Color = "#000000",
193-
Cap = new
194+
Cap = new CircularGaugeCap()
194195
{
195-
radius = 6,
196-
border = new
196+
Radius = 6,
197+
Border = new CircularGaugeBorder()
197198
{
198-
color = "#000000",
199-
width = 6,
199+
Color = "#000000",
200+
Width = 6,
200201
},
201202
},
202-
Animation = new
203+
Animation = new CircularGaugeAnimation()
203204
{
204-
enable = true,
205-
duration = 100,
205+
Enable = true,
206+
Duration = 100,
206207
}
207208
});
208-
List<Syncfusion.EJ2.CircularGauge.CircularGaugeRange> ranges = new List<Syncfusion.EJ2.CircularGauge.CircularGaugeRange>();
209-
ranges.Add(new Syncfusion.EJ2.CircularGauge.CircularGaugeRange
209+
List<CircularGaugeRange> ranges = new List<CircularGaugeRange>();
210+
ranges.Add(new CircularGaugeRange
210211
{
211212
StartWidth = "10px",
212213
EndWidth = "10px",
213214
Radius = "102%",
214215
Color = "#69d5e8"
215216
});
216-
ranges.Add(new Syncfusion.EJ2.CircularGauge.CircularGaugeRange
217+
ranges.Add(new CircularGaugeRange
217218
{
218219
StartWidth = "10px",
219220
EndWidth = "10px",

‎Views/Home/_TeamAverage.cshtml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@model StoryEstimator.Showcase.Models.StoryObjects
22
@using StoryEstimator.Showcase.Models.Data;
33
@using StoryEstimator.Showcase.Utils;
4+
@using Syncfusion.EJ2.Charts
45
@using Syncfusion.EJ2
56

67
@{
@@ -174,17 +175,17 @@
174175
}
175176
</div>
176177
@{
177-
var dataLabel = new
178+
AccumulationDataLabelSettings dataLabel = new AccumulationDataLabelSettings()
178179
{
179-
visible = true,
180-
name = "Text",
181-
position = "Inside",
182-
template = "<div>${point.text}</div>",
183-
font = new
180+
Visible = true,
181+
Name = "Text",
182+
Position = AccumulationLabelPosition.Inside,
183+
Template = "<div>${point.text}</div>",
184+
Font = new AccumulationChartFont()
184185
{
185-
color = "white",
186-
fontWeight = "600",
187-
size = "14px",
186+
Color = "white",
187+
FontWeight = "600",
188+
Size = "14px",
188189
}
189190
};
190191
}

‎wwwroot/css/ej2/material.css‎

Lines changed: 1 addition & 28954 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎wwwroot/js/ej2.min.js‎

Lines changed: 1 addition & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)