Skip to content

968460: Resolving UG conflict in development branch for Gantt #598

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
merged 1 commit into from
Aug 6, 2025
Merged

968460: Resolving UG conflict in development branch for Gantt #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 14 additions & 18 deletions ej2-javascript/code-snippet/gantt/task-constraints-cs1/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@ ej.gantt.Gantt.Inject(ej.gantt.Selection,
ej.gantt.Toolbar,
ej.gantt.DayMarkers,
ej.gantt.Edit);
window.getConstraintText = function (value) {
var map = {
0: 'As Soon As Possible',
1: 'As Late As Possible',
2: 'Must Start On',
3: 'Must Finish On',
4: 'Start No Earlier Than',
5: 'Start No Later Than',
6: 'Finish No Earlier Than',
7: 'Finish No Later Than'
};
return map[value];
};
var ganttChart = new ej.gantt.Gantt({
dataSource: constraintData,
taskFields: {
Expand Down Expand Up @@ -69,21 +82,4 @@ var ganttChart = new ej.gantt.Gantt({
projectStartDate: new Date('03/25/2025'),
projectEndDate: new Date('09/01/2025')
});
ganttChart.appendTo('#Gantt');
window.getConstraintText = function (value) {
var map = {
0: 'As Soon As Possible',
1: 'As Late As Possible',
2: 'Must Start On',
3: 'Must Finish On',
4: 'Start No Earlier Than',
5: 'Start No Later Than',
6: 'Finish No Earlier Than',
7: 'Finish No Later Than'
};
return map[value];
};




ganttChart.appendTo('#Gantt');
31 changes: 14 additions & 17 deletions ej2-javascript/code-snippet/gantt/task-constraints-cs1/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,19 @@ import { Gantt, Edit, Selection, Toolbar, DayMarkers } from '@syncfusion/ej2-ga
import { constraintData } from 'datasource.ts';
Gantt.Inject(Edit, Selection, Toolbar, DayMarkers);


(window as any).getConstraintText = function (value: number): string {
const map: { [key: number]: string } = {
0: 'As Soon As Possible',
1: 'As Late As Possible',
2: 'Must Start On',
3: 'Must Finish On',
4: 'Start No Earlier Than',
5: 'Start No Later Than',
6: 'Finish No Earlier Than',
7: 'Finish No Later Than'
};
return map[value];
};
let gantt: Gantt = new Gantt({
dataSource: constraintData,
taskFields: {
Expand Down Expand Up @@ -73,19 +85,4 @@ let gantt: Gantt = new Gantt({
projectStartDate: new Date('03/25/2025'),
projectEndDate: new Date('09/01/2025')
});
gantt.appendTo('#Gantt');

(window as any).getConstraintText = function (value: number): string {
const map: { [key: number]: string } = {
0: 'As Soon As Possible',
1: 'As Late As Possible',
2: 'Must Start On',
3: 'Must Finish On',
4: 'Start No Earlier Than',
5: 'Start No Later Than',
6: 'Finish No Earlier Than',
7: 'Finish No Later Than'
};
return map[value];
};

gantt.appendTo('#Gantt');
15 changes: 7 additions & 8 deletions ej2-javascript/code-snippet/gantt/task-constraints-cs1/js/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@
</head>

<body>

<script type="text/x-template" id="rightLabel">
<div style="margin-top=-7px;">
<div id = "rightLabel">
${getConstraintText(ganttProperties.constraintType)}
</div>
</div>
</script>

<div id="container">
<div id="Gantt"></div>
Expand All @@ -27,11 +33,4 @@
}
</script>
<script src="index.js" type="text/javascript"></script>
<script type="text/x-template" id="rightLabel">
<div style="margin-top=-7px;">
<div id = "rightLabel">
${getConstraintText(ganttProperties.constraintType)}
</div>
</div>
</script>
</body></html>
15 changes: 7 additions & 8 deletions ej2-javascript/code-snippet/gantt/task-constraints-cs1/ts/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,16 @@
</head>

<body>

<script type="text/x-template" id="rightLabel">
<div style="margin-top:-7px;">
<div id = "rightLabel">
${getConstraintText(ganttProperties.constraintType)}
</div>
</div>
</script>
<div id='loader'>Loading....</div>
<div id='container'>
<div id='Gantt'></div>
<script type="text/x-template" id="rightLabel">
<div style="margin-top:-7px;">
<div id = "rightLabel">
${getConstraintText(ganttProperties.constraintType)}
</div>
</div>
</script>
</div>
</body>

Expand Down
32 changes: 14 additions & 18 deletions ej2-javascript/code-snippet/gantt/task-constraints-cs2/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@ ej.gantt.Gantt.Inject(ej.gantt.Selection,
ej.gantt.Toolbar,
ej.gantt.DayMarkers,
ej.gantt.Edit);
window.getConstraintText = function (value) {
var map = {
0: 'As Soon As Possible',
1: 'As Late As Possible',
2: 'Must Start On',
3: 'Must Finish On',
4: 'Start No Earlier Than',
5: 'Start No Later Than',
6: 'Finish No Earlier Than',
7: 'Finish No Later Than'
};
return map[value];
};
var ganttChart = new ej.gantt.Gantt({
dataSource: constraintData,
taskFields: {
Expand Down Expand Up @@ -74,21 +87,4 @@ var ganttChart = new ej.gantt.Gantt({
projectStartDate: new Date('03/25/2025'),
projectEndDate: new Date('09/01/2025')
});
ganttChart.appendTo('#Gantt');
window.getConstraintText = function (value) {
var map = {
0: 'As Soon As Possible',
1: 'As Late As Possible',
2: 'Must Start On',
3: 'Must Finish On',
4: 'Start No Earlier Than',
5: 'Start No Later Than',
6: 'Finish No Earlier Than',
7: 'Finish No Later Than'
};
return map[value];
};




ganttChart.appendTo('#Gantt');
28 changes: 13 additions & 15 deletions ej2-javascript/code-snippet/gantt/task-constraints-cs2/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ import { constraintData } from 'datasource.ts';
Gantt.Inject(Edit, Selection, Toolbar, DayMarkers);


(window as any).getConstraintText = function (value: number): string {
const map: { [key: number]: string } = {
0: 'As Soon As Possible',
1: 'As Late As Possible',
2: 'Must Start On',
3: 'Must Finish On',
4: 'Start No Earlier Than',
5: 'Start No Later Than',
6: 'Finish No Earlier Than',
7: 'Finish No Later Than'
};
return map[value];
};
let gantt: Gantt = new Gantt({
dataSource: constraintData,
taskFields: {
Expand Down Expand Up @@ -79,18 +92,3 @@ let gantt: Gantt = new Gantt({
projectEndDate: new Date('09/01/2025')
});
gantt.appendTo('#Gantt');

(window as any).getConstraintText = function (value: number): string {
const map: { [key: number]: string } = {
0: 'As Soon As Possible',
1: 'As Late As Possible',
2: 'Must Start On',
3: 'Must Finish On',
4: 'Start No Earlier Than',
5: 'Start No Later Than',
6: 'Finish No Earlier Than',
7: 'Finish No Later Than'
};
return map[value];
};

15 changes: 7 additions & 8 deletions ej2-javascript/code-snippet/gantt/task-constraints-cs2/js/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@

<body>


<script type="text/x-template" id="rightLabel">
<div style="margin-top=-7px;">
<div id = "rightLabel">
${getConstraintText(ganttProperties.constraintType)}
</div>
</div>
</script>
<div id="container">
<div id="Gantt"></div>
</div>
Expand All @@ -27,11 +33,4 @@
}
</script>
<script src="index.js" type="text/javascript"></script>
<script type="text/x-template" id="rightLabel">
<div style="margin-top=-7px;">
<div id = "rightLabel">
${getConstraintText(ganttProperties.constraintType)}
</div>
</div>
</script>
</body></html>
15 changes: 7 additions & 8 deletions ej2-javascript/code-snippet/gantt/task-constraints-cs2/ts/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,16 @@
</head>

<body>

<script type="text/x-template" id="rightLabel">
<div style="margin-top:-7px;">
<div id = "rightLabel">
${getConstraintText(ganttProperties.constraintType)}
</div>
</div>
</script>
<div id='loader'>Loading....</div>
<div id='container'>
<div id='Gantt'></div>
<script type="text/x-template" id="rightLabel">
<div style="margin-top:-7px;">
<div id = "rightLabel">
${getConstraintText(ganttProperties.constraintType)}
</div>
</div>
</script>
</div>
</body>

Expand Down
3 changes: 2 additions & 1 deletion ej2-javascript/code-snippet/gantt/wbscolumn-cs2/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ ej.gantt.Gantt.Inject(ej.gantt.Selection,
ej.gantt.Edit,
ej.gantt.Filter,
ej.gantt.Sort,
ej.gantt.RowDD,
ej.gantt.ContextMenu);


Expand All @@ -13,6 +14,7 @@ var ganttChart = new ej.gantt.Gantt({
allowSorting: true,
enableContextMenu: true,
enableWBS: true,
allowRowDragAndDrop: true,
dataBound: function () {
if (isRowDropped) {
ganttChart.enableAutoWbsUpdate = false;
Expand Down Expand Up @@ -100,4 +102,3 @@ var ganttChart = new ej.gantt.Gantt({
projectEndDate: new Date('05/30/2024'),
});
ganttChart.appendTo('#Gantt');

8 changes: 4 additions & 4 deletions ej2-javascript/gantt/columns/wbs-column.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ The Work Breakdown Structure (WBS) organizes project tasks hierarchically in the
{% highlight ts tabtitle="index.ts" %}
{% include code-snippet/gantt/wbscolumn-cs1/index.ts %}
{% endhighlight %}
{% highlight ts tabtitle="index.html" %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/gantt/wbscolumn-cs1/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/samples/gantt/wbscolumn-cs1" %}
{% previewsample "page.domainurl/code-snippet/gantt/wbscolumn-cs1" %}

{% elsif page.publishingplatform == "javascript" %}

Expand Down Expand Up @@ -62,12 +62,12 @@ In the following example, WBS auto-update is enabled only during the **row drag
{% highlight ts tabtitle="index.ts" %}
{% include code-snippet/gantt/wbscolumn-cs2/index.ts %}
{% endhighlight %}
{% highlight ts tabtitle="index.html" %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/gantt/wbscolumn-cs2/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/samples/gantt/wbscolumn-cs2" %}
{% previewsample "page.domainurl/code-snippet/gantt/wbscolumn-cs2" %}

{% elsif page.publishingplatform == "javascript" %}

Expand Down
8 changes: 4 additions & 4 deletions ej2-javascript/gantt/task-constraints.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ This task is constrained to must start on July 1, 2025.
{% include code-snippet/gantt/task-constraints-cs1/index.ts %}
{% endhighlight %}

{% highlight ts tabtitle="index.html" %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/gantt/task-constraints-cs1/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/samples/gantt/task-constraints-cs1" %}
{% previewsample "page.domainurl/code-snippet/gantt/task-constraints-cs1" %}

{% elsif page.publishingplatform == "javascript" %}

Expand Down Expand Up @@ -159,12 +159,12 @@ In the following example, we have disabled the MustStartOn violation popup by se
{% include code-snippet/gantt/task-constraints-cs2/index.ts %}
{% endhighlight %}

{% highlight ts tabtitle="index.html" %}
{% highlight html tabtitle="index.html" %}
{% include code-snippet/gantt/task-constraints-cs2/index.html %}
{% endhighlight %}
{% endtabs %}

{% previewsample "page.domainurl/samples/gantt/task-constraints-cs2" %}
{% previewsample "page.domainurl/code-snippet/gantt/task-constraints-cs2" %}

{% elsif page.publishingplatform == "javascript" %}

Expand Down