Skip to content

Commit 7d0bfcc

Browse files
MydeensnMydeensn
authored
Merge pull request #290 from syncfusion-content/888907-conflict
888907: Resolved the conflict issues
2 parents 5ec26dc + e0935aa commit 7d0bfcc

File tree

5 files changed

+28
-129
lines changed

5 files changed

+28
-129
lines changed

‎ej2-javascript-toc.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2555,7 +2555,7 @@
25552555
<li><a href="https://ej2.syncfusion.com/javascript/documentation/api/tooltip/">API Reference</a></li>
25562556
</ul>
25572557
</li><li>
2558-
TreeGrid
2558+
<a href="/ej2-javascript/treegrid/overview">TreeGrid</a>
25592559
<ul>
25602560
<li><a href="/ej2-javascript/treegrid/getting-started">Getting Started</a></li>
25612561
<li><a href="/ej2-javascript/treegrid/module">Feature Modules</a></li>
@@ -2819,8 +2819,7 @@
28192819
</ul>
28202820
</li> <li>Release Notes
28212821
<ul>
2822-
<li>2024 Volume 2 - 26.*<ul><li><a href="/ej2-javascript/release-notes/26.1.35">26.1.35 Main Release</a></li></ul></li>
2823-
<li>2024 Volume 1 - 25.*<ul><li>Weekly Release<ul><li><a href="/ej2-javascript/release-notes/25.2.7">25.2.7</a></li><li><a href="/ej2-javascript/release-notes/25.2.6">25.2.6</a></li><li><a href="/ej2-javascript/release-notes/25.2.5">25.2.5</a></li><li><a href="/ej2-javascript/release-notes/25.2.4">25.2.4</a></li><li><a href="/ej2-javascript/release-notes/25.1.42">25.1.42</a></li><li><a href="/ej2-javascript/release-notes/25.1.41">25.1.41</a></li><li><a href="/ej2-javascript/release-notes/25.1.40">25.1.40</a></li><li><a href="/ej2-javascript/release-notes/25.1.39">25.1.39</a></li><li><a href="/ej2-javascript/release-notes/25.1.38">25.1.38</a></li><li><a href="/ej2-javascript/release-notes/25.1.37">25.1.37</a></li></ul></li><li><a href="/ej2-javascript/release-notes/25.2.3">25.2.3 Service Pack Release</a></li><li><a href="/ej2-javascript/release-notes/25.1.35">25.1.35 Main Release</a></li></ul></li>
2822+
<li>2024 Volume 2 - 26.*<ul><li><a href="/ej2-javascript/release-notes/26.1.35">26.1.35 Main Release</a></li></ul></li><li>2024 Volume 1 - 25.*<ul><li>Weekly Release<ul><li><a href="/ej2-javascript/release-notes/25.2.7">25.2.7</a></li><li><a href="/ej2-javascript/release-notes/25.2.6">25.2.6</a></li><li><a href="/ej2-javascript/release-notes/25.2.5">25.2.5</a></li><li><a href="/ej2-javascript/release-notes/25.2.4">25.2.4</a></li><li><a href="/ej2-javascript/release-notes/25.1.42">25.1.42</a></li><li><a href="/ej2-javascript/release-notes/25.1.41">25.1.41</a></li><li><a href="/ej2-javascript/release-notes/25.1.40">25.1.40</a></li><li><a href="/ej2-javascript/release-notes/25.1.39">25.1.39</a></li><li><a href="/ej2-javascript/release-notes/25.1.38">25.1.38</a></li><li><a href="/ej2-javascript/release-notes/25.1.37">25.1.37</a></li></ul></li><li><a href="/ej2-javascript/release-notes/25.2.3">25.2.3 Service Pack Release</a></li><li><a href="/ej2-javascript/release-notes/25.1.35">25.1.35 Main Release</a></li></ul></li>
28242823
<li>2023 Volume 4 - 24.*<ul><li>Weekly Release<ul><li><a href="/ej2-javascript/release-notes/24.2.9">24.2.9</a></li><li><a href="/ej2-javascript/release-notes/24.2.8">24.2.8</a></li><li><a href="/ej2-javascript/release-notes/24.2.7">24.2.7</a></li><li><a href="/ej2-javascript/release-notes/24.2.6">24.2.6</a></li><li><a href="/ej2-javascript/release-notes/24.2.5">24.2.5</a></li><li><a href="/ej2-javascript/release-notes/24.2.4">24.2.4</a></li><li><a href="/ej2-javascript/release-notes/24.1.47">24.1.47</a></li><li><a href="/ej2-javascript/release-notes/24.1.46">24.1.46</a></li><li><a href="/ej2-javascript/release-notes/24.1.45">24.1.45</a></li><li><a href="/ej2-javascript/release-notes/24.1.44">24.1.44</a></li><li><a href="/ej2-javascript/release-notes/24.1.43">24.1.43</a></li></ul></li><li><a href="/ej2-javascript/release-notes/24.2.3">24.2.3 Service Pack Release</a></li><li><a href="/ej2-javascript/release-notes/24.1.41">24.1.41 Main Release</a></li></ul></li>
28252824
<li>2023 Volume 3 - 23.*<ul><li> Weekly Release<ul><li><a href="/ej2-javascript/release-notes/23.2.7">23.2.7</a></li><li><a href="/ej2-javascript/release-notes/23.2.6">23.2.6</a></li><li><a href="/ej2-javascript/release-notes/23.2.5">23.2.5</a></li><li><a href="/ej2-javascript/release-notes/23.1.44">23.1.44</a></li><li><a href="/ej2-javascript/release-notes/23.1.43">23.1.43</a></li><li><a href="/ej2-javascript/release-notes/23.1.42">23.1.42</a></li><li><a href="/ej2-javascript/release-notes/23.1.41">23.1.41</a></li><li><a href="/ej2-javascript/release-notes/23.1.40">23.1.40</a></li><li><a href="/ej2-javascript/release-notes/23.1.39">23.1.39</a></li><li><a href="/ej2-javascript/release-notes/23.1.38">23.1.38</a></li></ul></li><li><a href="/ej2-javascript/release-notes/23.2.4">23.2.4 Service Pack Release</a></li><li><a href="/ej2-javascript/release-notes/23.1.36">23.1.36 Main Release</a></li></ul></li>
28262825
<li>2023 Volume 2 - 22.*

‎ej2-javascript/schedule/dimensions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
layout: post
3-
title: Dimensions in ##Platform_Name## Schedule control | Syncfusion
4-
description: Learn here all about Dimensions in Syncfusion ##Platform_Name## Schedule control of Syncfusion Essential JS 2 and more.
3+
title: Dimensions in ##Platform_Name## Schedule Control | Syncfusion
4+
description: Learn here all about dimensions in Syncfusion ##Platform_Name## Schedule control, its elements and more.
55
platform: ej2-javascript
66
control: Dimensions
77
publishingplatform: ##Platform_Name##
88
documentation: ug
99
domainurl: ##DomainURL##
1010
---
1111

12-
# Dimensions in ##Platform_Name## Schedule control
12+
# Dimensions in ##Platform_Name## Schedule Control
1313

1414
The Scheduler dimensions refers to both height and width of the entire layout and it accepts 3 types of values.
1515

@@ -114,4 +114,4 @@ When height and width of the Scheduler are given as percentage, it will make the
114114
115115
## See Also
116116

117-
* [How to Change Scheduler Cell Dimensions](./cell-customization/#setting-cell-dimensions-in-all-views)
117+
* [How to Change Scheduler Cell Dimensions](./cell-customization#setting-cell-dimensions-in-all-views)

‎ej2-javascript/schedule/how-to/salesforce-integration.md

Lines changed: 20 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ sfdx org:login:web -d
6464
Open the `sfdx-project.json` file located in `salesforceApp/scheduler-salesforce-app` and update the `sfdcLoginUrl` with the domain URL of your Salesforce account as shown in image (fig 2). You can obtain the domain URL from the `My Domain` setup tab in Salesforce as shown in image (fig 1).
6565

6666
fig 1
67-
![Salesforce project (fig 1)](../images/Salesforce-project-fig1.png)
67+
![Salesforce project fig 1](../images/Salesforce-project-fig1.png)
6868

6969
fig 2
70-
![Salesforce project (fig 2)](../images/Salesforce-project-fig2.png)
70+
![Salesforce project fig 2](../images/Salesforce-project-fig2.png)
7171

7272
## Create scratch organization
7373

@@ -88,7 +88,7 @@ To integrate the Syncfusion scripts and styles as static resource files within S
8888
Use the following command to open the scratch project in the browser
8989

9090
```
91-
sfdx org:open -o <stratch org user name>
91+
sfdx org:open -o <scratch org user name>
9292
```
9393

9494
Replace <scratch org username> with the username of your scratch organization, which was generated during the scratch organization creation process.
@@ -204,122 +204,23 @@ sfdx lightning:generate:component --type lwc -n scheduler -d force-app/main/defa
204204

205205
4. Open the `scheduler.js` file located in `force-app/main/default/lwc/scheduler` and implement the scheduler code in renderedCallback function. The static scripts and styles are loaded using the `loadScript` and `loadStyle` imports. Here's an example of the modified file.
206206

207-
```
208-
import { LightningElement, api } from 'lwc';
209-
import { ShowToastEvent } from "lightning/platformShowToastEvent";
210-
import { loadStyle, loadScript } from "lightning/platformResourceLoader";
211-
import { createRecord, updateRecord, deleteRecord } from "lightning/uiRecordApi";
212-
// Static resources
213-
import schedulerFiles from "@salesforce/resourceUrl/syncfusionscheduler";
214-
215-
// Controllers
216-
import getEvents from "@salesforce/apex/SchedulerData.getEvents";
217-
function getEventsData(eventData) {
218-
const data = eventData.events.map((a) => ({
219-
Id: a.Id,
220-
Subject: a.Name,
221-
Location: a.Location__c,
222-
StartTime: a.Start_Time__c,
223-
EndTime: a.End_Time__c,
224-
IsAllDay: a.IsAllDay__c,
225-
RecurrenceRule: a.RecurrenceRule__c,
226-
RecurrenceID: a.Recurrence_Id__c,
227-
RecurrenceException: a.RecurrenceException__c
228-
}));
229-
return data;
230-
}
207+
{% if page.publishingplatform == "typescript" %}
231208

232-
export default class Scheduler extends LightningElement {
233-
static delegatesFocus = true;
234-
@api height;
235-
schedulerInitialized = false;
236-
renderedCallback() {
237-
if (this.schedulerInitialized) {
238-
return;
239-
}
240-
this.schedulerInitialized = true;
241-
Promise.all([
242-
loadScript(this, schedulerFiles + "/syncscheduler.js"),
243-
loadStyle(this, schedulerFiles + "/syncscheduler.css")
244-
])
245-
.then(() => {
246-
this.initializeUI();
247-
})
248-
.catch((error) => {
249-
this.dispatchEvent(
250-
new ShowToastEvent({
251-
title: "Error loading scheduler",
252-
message: error.message,
253-
variant: "error"
254-
})
255-
);
256-
});
257-
}
258-
initializeUI() {
259-
const root = this.template.querySelector(".syncfusionscheduler");
260-
root.style.height = this.height + "px";
261-
const scheduleOptions = {
262-
height: this.height + "px",
263-
selectedDate: new Date(),
264-
actionComplete: function (args) {
265-
//To perform CRUD in salesforce backend
266-
if (args.addedRecords && args.addedRecords.length > 0) {
267-
var data = args.addedRecords[0];
268-
var insert = {
269-
apiName: "SchedulerEvent__c",
270-
fields: {
271-
Name: data.Subject,
272-
Location__c: data.Location,
273-
Start_Time__c: data.StartTime,
274-
End_Time__c: data.EndTime,
275-
IsAllDay__c: data.IsAllDay,
276-
RecurrenceRule__c: data.RecurrenceRule,
277-
Recurrence_Id__c: data.RecurrenceID,
278-
RecurrenceException__c: data.RecurrenceException
279-
}
280-
};
281-
createRecord(insert).then((res) => {
282-
if (scheduleObj)
283-
{
284-
scheduleObj.eventSettings.dataSource[scheduleObj.eventSettings.dataSource.length - 1].Id = res.id;
285-
scheduleObj.refreshEvents();
286-
}
287-
return { tid: res.id, ...res };
288-
});
289-
}
290-
if (args.changedRecords && args.changedRecords.length > 0) {
291-
var data = args.changedRecords[0];
292-
var update = {
293-
fields: {
294-
Id: data.Id,
295-
Name: data.Subject,
296-
Location__c: data.Location,
297-
Start_Time__c: data.StartTime,
298-
End_Time__c: data.EndTime,
299-
IsAllDay__c: data.IsAllDay,
300-
RecurrenceRule__c: data.RecurrenceRule,
301-
RecurrenceException__c: data.RecurrenceException,
302-
Recurrence_Id__c: data.RecurrenceID
303-
}
304-
};
305-
updateRecord(update).then(() => ({}));
306-
}
307-
if (args.deletedRecords && args.deletedRecords.length > 0) {
308-
args.deletedRecords.forEach(event => {
309-
deleteRecord(event.Id).then(() => ({}));
310-
});
311-
}
312-
}
313-
};
314-
const scheduleObj = new ej.schedule.Schedule(scheduleOptions, root);
315-
getEvents().then((data) => {
316-
const eventData = getEventsData(data);
317-
scheduleObj.eventSettings.dataSource = eventData;
318-
scheduleObj.dataBind();
319-
});
320-
}
321-
}
322-
```
209+
{% tabs %}
210+
{% highlight ts tabtitle="index.ts" %}
211+
{% include code-snippet/schedule/salesforce-integration/index.ts %}
212+
{% endhighlight %}
213+
{% endtabs %}
214+
215+
{% elsif page.publishingplatform == "javascript" %}
216+
217+
{% tabs %}
218+
{% highlight js tabtitle="index.js" %}
219+
{% include code-snippet/schedule/salesforce-integration/index.js %}
220+
{% endhighlight %}
221+
{% endtabs %}
222+
223+
{% endif %}
323224

324225
## Creating apex class
325226

@@ -418,4 +319,4 @@ Click on the `SyncfusionScheduler` app, and the scheduler will load on the home
418319

419320
![Click Scheduler page](../images/Salesforce-click-scheduler.png)
420321

421-
N> You can also explore our [**JavaScript Scheduler**](https://www.syncfusion.com/javascript-ui-controls/js-scheduler) example to knows about the Salesforce integration.
322+
N> You can also explore our [**JavaScript Scheduler Salesforce integration**](https://github.com/SyncfusionExamples/salesforce-integration-in-ej2-javascript-scheduler) example to knows about the Salesforce integration.

‎ej2-javascript/schedule/images/Salesforce-app.png

-144 KB
Loading

‎ej2-typescript-toc.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2559,7 +2559,7 @@
25592559
<li><a href="https://ej2.syncfusion.com/documentation/api/tooltip/">API Reference</a></li>
25602560
</ul>
25612561
</li><li>
2562-
TreeGrid
2562+
<a href="/ej2-typescript/treegrid/overview">TreeGrid</a>
25632563
<ul>
25642564
<li><a href="/ej2-typescript/treegrid/getting-started">Getting Started</a></li>
25652565
<li><a href="/ej2-typescript/treegrid/module">Feature Modules</a></li>
@@ -2824,8 +2824,7 @@
28242824
</ul>
28252825
</li> <li>Release Notes
28262826
<ul>
2827-
<li>2024 Volume 2 - 26.*<ul><li><a href="/ej2-typescript/release-notes/26.1.35">26.1.35 Main Release</a></li></ul></li>
2828-
<li>2024 Volume 1 - 25.*<ul>
2827+
<li>2024 Volume 2 - 26.*<ul><li><a href="/ej2-typescript/release-notes/26.1.35">26.1.35 Main Release</a></li></ul></li><li>2024 Volume 1 - 25.*<ul>
28292828
<li>Weekly Release<ul><li><a href="/ej2-typescript/release-notes/25.2.7">25.2.7</a></li>
28302829
<li><a href="/ej2-typescript/release-notes/25.2.6">25.2.6</a></li>
28312830
<li><a href="/ej2-typescript/release-notes/25.2.5">25.2.5</a></li>

0 commit comments

Comments
 (0)