Skip to content

Commit 6959bec

Browse files
committed
Sync with Kendo UI Professional
1 parent bfb22c6 commit 6959bec

File tree

103 files changed

+1554
-302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1554
-302
lines changed

docs-aspnet/getting-started-core/first-steps.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ In this tutorial, you will:
5353

5454
1. In the search box, enter **Model-View-Controller**, select the **ASP.NET Core Web App (Model-View-Controller)** C# template, and then select **Next**.
5555

56-
![{{ site.product_short }} Create a new project](../getting-started-core/images/create-project-vs2019.png)
56+
![{{ site.product_short }} Create a new project](../getting-started-core/images/create-project-vs2022.png)
5757

5858
1. Enter **MyTelerikProject** as a project name, and then select **Next**.
5959

@@ -80,8 +80,6 @@ The easiest way to add the Telerik NuGet feed to Visual Studio if you are a tria
8080

8181
1. Run the installer.
8282

83-
1. Select the option **Set up Telerik NuGet package source** to automatically add the [Telerik NuGet feed]({% slug nuget_install_aspnetmvc6_aspnetmvc %}).
84-
8583
![{{ site.product_short }} NuGet checkbox in Progress Trial Installer](../getting-started-core/images/check-nuget.png)
8684

8785
>To activate your UI for ASP.NET Core trial license, you must complete the installation procedure. Otherwise, the `Telerik.UI.for.AspNet.Core` NuGet packages will not appear in the NuGet Package Manager.
@@ -96,11 +94,11 @@ The easiest way to add the Telerik NuGet feed to Visual Studio if you have purch
9694

9795
1. Run the Progress Control Panel `exe`.
9896

99-
1. On the Login screen, check the **set up Telerik NuGet package source** option.
97+
1. Log in to your Telerik account.
10098

10199
![{{ site.product_short }} Set Up Nuget on Progress Control Panel Login](../getting-started-core/images/login-control-panel.png)
102100

103-
1. If you miss to set up the NuGet feed on login, go to the Progress Control Panel options and scroll to **NUGET SETTINGS**. Enter your Telerik credentials and click the **Save and Close** button.
101+
1. Go to the Progress Control Panel options and scroll to **NUGET SETTINGS**. Enter your Telerik credentials and click the **Save and Close** button.
104102

105103
![{{ site.product_short }} Set Up Nuget on Progress Control Panel options](../getting-started-core/images/nuget-control-panel-options.png)
106104

63.2 KB
Loading
-17.4 KB
Binary file not shown.
86.9 KB
Loading
46.1 KB
Loading
-969 Bytes
Loading
32.4 KB
Loading

docs-aspnet/html-helpers/charts/chart-types/drill-down.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ To configure a chart series for drill-down:
106106
{% else %}
107107

108108
```Controller
109-
public IActionResult Get_Companies()
109+
public ActionResult Get_Companies()
110110
{
111111
return Json(ChartDataRepository.Companies(), JsonRequestBehavior.AllowGet);
112112
}
@@ -334,15 +334,15 @@ To populate the drill-down series on dynamically:
334334
</script>
335335
```
336336
```Controller
337-
public IActionResult Dynamic_Data()
337+
public ActionResult Dynamic_Data()
338338
{
339339
ViewData["VehiclesByModel"] = ChartDataRepository.VehicleModels();
340340
ViewData["VehiclesByQuarter"] = ChartDataRepository.VehicleQuarters();
341341
342342
return View();
343343
}
344344
345-
public IActionResult Get_VehicleMakes()
345+
public ActionResult Get_VehicleMakes()
346346
{
347347
return Json(ChartDataRepository.VehicleMakes(), JsonRequestBehavior.AllowGet);
348348
}
@@ -590,14 +590,14 @@ To populate the drilldown series asynchronously:
590590
</script>
591591
```
592592
```Controller
593-
public IActionResult Dynamic_Data()
593+
public ActionResult Dynamic_Data()
594594
{
595595
ViewData["VehiclesByModel"] = ChartDataRepository.VehicleModels();
596596
597597
return View();
598598
}
599599
600-
public IActionResult Get_VehicleMakes()
600+
public ActionResult Get_VehicleMakes()
601601
{
602602
return Json(ChartDataRepository.VehicleMakes(), JsonRequestBehavior.AllowGet);
603603
}
@@ -738,7 +738,7 @@ To customize the root item of the Chart's Breadcrumb and change its appearance,
738738
{% else %}
739739

740740
```Controller
741-
public IActionResult Get_Companies()
741+
public ActionResult Get_Companies()
742742
{
743743
return Json(ChartDataRepository.Companies(), JsonRequestBehavior.AllowGet);
744744
}
@@ -921,7 +921,7 @@ To implement a custom drill-down navigation:
921921
{% else %}
922922

923923
```Controller
924-
public IActionResult Get_Companies()
924+
public ActionResult Get_Companies()
925925
{
926926
return Json(ChartDataRepository.Companies(), JsonRequestBehavior.AllowGet);
927927
}

docs-aspnet/html-helpers/charts/data-binding.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ A more flexible alternative is to provide the series with an array of objects. T
222222

223223
You can bind the Chart to a data set in the view model or to items that are stored in `ViewBag`/`ViewData`.
224224

225+
{% if site.core %}
225226
```tab-Controller
226227
public IActionResult Local_Data_Binding()
227228
{
@@ -242,6 +243,28 @@ You can bind the Chart to a data set in the view model or to items that are stor
242243
return View(internetUsers);
243244
}
244245
```
246+
{% else %}
247+
```tab-Controller
248+
public ActionResult Local_Data_Binding()
249+
{
250+
var internetUsers = new InternetUsers[] {
251+
new InternetUsers(2000,43.1,"United States"),
252+
new InternetUsers(2001,49.2,"United States"),
253+
new InternetUsers(2002,59.0,"United States"),
254+
new InternetUsers(2003,61.9,"United States"),
255+
new InternetUsers(2004,65,"United States"),
256+
new InternetUsers(2005,68.3,"United States"),
257+
new InternetUsers(2006,69.2,"United States"),
258+
new InternetUsers(2007,75.3,"United States"),
259+
new InternetUsers(2008,74.2,"United States"),
260+
new InternetUsers(2009,71.2,"United States"),
261+
new InternetUsers(2010,74.2,"United States"),
262+
new InternetUsers(2011,78.2,"United States")
263+
};
264+
return View(internetUsers);
265+
}
266+
```
267+
{% endif %}
245268
```tab-Model
246269
public class InternetUsers
247270
{
@@ -318,6 +341,7 @@ To bind to remote data by using the DataSource component:
318341

319342
1. Add a new action method in your controller that returns the data set.
320343

344+
{% if site.core %}
321345
```tab-Controller
322346
[HttpPost]
323347
public IActionResult _SpainElectricityProduction()
@@ -341,6 +365,31 @@ To bind to remote data by using the DataSource component:
341365
return Json(result);
342366
}
343367
```
368+
{% else %}
369+
```tab-Controller
370+
[HttpPost]
371+
public ActionResult _SpainElectricityProduction()
372+
{
373+
// Data is usually read from a service that communicates with the an instance of the DbContext.
374+
// Refer to the MSDN documentation for further details on connecting to a data base and using a DBContext:
375+
// https://docs.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext?view=efcore-5.0
376+
//
377+
// For clarity, in this example static data is generated and returned from the remote-endpoint.
378+
var result = new ElectricityProduction[] {
379+
new ElectricityProduction("2000", 18, 31807, 4727, 62206),
380+
new ElectricityProduction("2001", 24, 43864, 6759, 63708),
381+
new ElectricityProduction("2002", 30, 26270, 9342, 63016),
382+
new ElectricityProduction("2003", 41, 43897, 12075, 61875),
383+
new ElectricityProduction("2004", 56, 34439, 15700, 63606),
384+
new ElectricityProduction("2005", 41, 23025, 21176, 57539),
385+
new ElectricityProduction("2006", 119, 29831, 23297, 60126),
386+
new ElectricityProduction("2007", 508, 30522, 27568, 55103),
387+
new ElectricityProduction("2008", 2578, 26112, 32203, 58973)
388+
};
389+
return Json(result);
390+
}
391+
```
392+
{% endif %}
344393
```tab-Model
345394
public class ElectricityProduction
346395
{
@@ -433,12 +482,21 @@ To bind to remote data by using the DataSource component:
433482
434483
Unlike the Grid, the Chart is configured to read a flat data response by default. If you have custom logic that requires the usage of the `ToDataSourceResult()` extension method when returning data for the Chart, configure a custom DataSource with a schema that can correctly parse the response. For further details on the DataSource configuration refer to the [DataSource section of the documentation]({% slug htmlhelpers_datasource_aspnetcore %}).
435484
485+
{% if site.core %}
436486
```tab-Controller
437487
public IActionResult Products_Read([DataSourceRequest] DataSourceRequest request)
438488
{
439489
return Json(productService.Read().ToDataSourceResult(request));
440490
}
441491
```
492+
{% else %}
493+
```tab-Controller
494+
public ActionResult Products_Read([DataSourceRequest] DataSourceRequest request)
495+
{
496+
return Json(productService.Read().ToDataSourceResult(request));
497+
}
498+
```
499+
{% endif %}
442500
```HtmlHelper
443501
@(Html.Kendo().Chart<Kendo.Mvc.Examples.Models.ProductViewModel>()
444502
.Name("chart")

docs-aspnet/html-helpers/charts/stockchart/getting.started.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ To add an additional pane that is placed at the bottom of the chart and can be u
176176

177177
In the `Home` controller, declare the `RemoteDataBindingData` action that you set to the DataSource `Read` configuration in step `3`.
178178

179+
{% if site.core %}
179180
```Controller
180181
public IActionResult _BoeingStockData()
181182
{
@@ -203,6 +204,35 @@ In the `Home` controller, declare the `RemoteDataBindingData` action that you se
203204
return Json(data);
204205
}
205206
```
207+
{% else %}
208+
```Controller
209+
public ActionResult _BoeingStockData()
210+
{
211+
var data = new List<StockDataPoint>()
212+
{
213+
new StockDataPoint {
214+
Date= new DateTime(2016,1,1),
215+
Open= 41.62M,
216+
High= 41.69M,
217+
Low= 39.81M,
218+
Close= 40.12M,
219+
Volume= 2632000
220+
},
221+
new StockDataPoint {
222+
Date= new DateTime(2016,3,1),
223+
Open= 40.62M,
224+
High= 39.69M,
225+
Low= 40.81M,
226+
Close= 39.12M,
227+
Volume= 2631986
228+
}
229+
230+
};
231+
232+
return Json(data, JsonRequestBehavior.AllowGet);
233+
}
234+
```
235+
{% endif %}
206236

207237
## 6. Handle the StockChart Events
208238

0 commit comments

Comments
 (0)