Skip to content

Commit b8b7b12

Browse files
mvgalievignatvilesov
authored andcommitted
added tooltip bucket (#103)
1 parent 4ba5bd5 commit b8b7b12

File tree

6 files changed

+3
-48
lines changed

6 files changed

+3
-48
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## 1.9.4
22
* Fixed issue with tooltip duration
33
* Fixed issue with invisible task line when duration is 1
4-
* Added ability to use custom tooltip rows
4+
* Renamed "Extra imformation" field bucket to "Tooltips"
55
## 1.9.3
66
* Fixed issue with tooltip duration
77
* Fixed issue with line length with float value and 'second' duration

capabilities.json

+1-17
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,9 @@
6060
},
6161
{
6262
"name": "ExtraInformation",
63-
"displayName": "Extra information",
64-
"displayNameKey": "Role_ExtraInformation",
65-
"kind": "Grouping"
66-
},
67-
{
68-
"name": "Tooltips",
6963
"displayName": "Tooltips",
7064
"displayNameKey": "Role_Tooltips",
71-
"kind": "Measure"
65+
"kind": "Grouping"
7266
}
7367
],
7468
"dataViewMappings": [
@@ -204,11 +198,6 @@
204198
"for": {
205199
"in": "ExtraInformation"
206200
}
207-
},
208-
{
209-
"for": {
210-
"in": "Tooltips"
211-
}
212201
}
213202
]
214203
},
@@ -225,11 +214,6 @@
225214
"for": {
226215
"in": "Completion"
227216
}
228-
},
229-
{
230-
"for": {
231-
"in": "Tooltips"
232-
}
233217
}
234218
]
235219
}

src/columns.ts

+1-7
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,7 @@ module powerbi.extensibility.visual {
5555
columns = {};
5656
}
5757
columns[x.source.displayName] = x.values;
58-
} else if (x.source.roles && x.source.roles["Tooltips"]) {
59-
if (!columns) {
60-
columns = {};
61-
}
62-
columns[x.source.displayName] = x.values;
63-
} else {
58+
} else {
6459
columns = x.values;
6560
}
6661
});
@@ -83,6 +78,5 @@ module powerbi.extensibility.visual {
8378
public Completion: T = null;
8479
public Resource: T = null;
8580
public ExtraInformation: T = null;
86-
public Tooltips: T = null;
8781
}
8882
}

src/gantt.ts

-20
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,6 @@ module powerbi.extensibility.visual {
740740
let taskType: TaskTypeMetadata = null;
741741
let wasDowngradeDurationUnit: boolean = false;
742742
let tooltips: VisualTooltipDataItem[] = [];
743-
let skipTooltipNames: string[] = [];
744743
let stepDurationTransformation: number = 0;
745744

746745
const selectionBuider: ISelectionIdBuilder = host
@@ -782,14 +781,6 @@ module powerbi.extensibility.visual {
782781
completion = Gantt.ComplectionMax;
783782
}
784783
}
785-
786-
if (group.Tooltips && group.Tooltips.values[index]) {
787-
tooltips.push({
788-
displayName: group.Tooltips.source.displayName,
789-
value: group.Tooltips.values[index]
790-
} as VisualTooltipDataItem);
791-
skipTooltipNames.push(group.Tooltips.source.displayName);
792-
}
793784
}
794785
});
795786
}
@@ -815,17 +806,6 @@ module powerbi.extensibility.visual {
815806
}
816807
}
817808

818-
if (values.Tooltips) {
819-
const extraTooltipKeys: any[] = Object.keys(values.Tooltips);
820-
for (const key of extraTooltipKeys.filter(k => skipTooltipNames.indexOf(k) < 0)) {
821-
const value: string = values.Tooltips[key][index];
822-
tooltips.push({
823-
displayName: key,
824-
value: value || ""
825-
});
826-
}
827-
}
828-
829809
const task: Task = {
830810
color,
831811
completion,

stringResources/en-US/resources.resjson

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"Role_Duration": "Duration",
66
"Role_Completion": "% Completion",
77
"Role_Resource": "Resource",
8-
"Role_ExtraInformation": "Extra information",
98
"Role_Tooltips": "Tooltips",
109
"Visual_General": "General",
1110
"Visual_GroupTasks": "Group Tasks",

test/visualData.ts

-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ module powerbi.extensibility.visual.test {
4343
public static ColumnCompletePrecntege: string = "CompletePrecntege";
4444
public static ColumnExtraInformation: string = "Description";
4545
public static ColumnParent: string = "Parent";
46-
public static ColumnTooltips: string = "Tooltips";
4746

4847
public valuesTaskTypeResource: string[][] = [
4948
["Spec", "MOLAP connectivity", "Mey"],
@@ -83,7 +82,6 @@ module powerbi.extensibility.visual.test {
8382
public valuesDuration = GanttData.getRandomUniqueNumbers(this.valuesTaskTypeResource.length, 3, 40);
8483
public valuesCompletePrecntege = GanttData.getRandomUniqueNumbers(this.valuesTaskTypeResource.length);
8584
public valuesExtraInformation = GanttData.getTexts(this.valuesTaskTypeResource, "Description");
86-
public valuesTooltips = GanttData.getTexts(this.valuesTaskTypeResource, "Description");
8785

8886
public static getTexts(valuesTaskTypeResource: string[][], text: string): string[] {
8987
return valuesTaskTypeResource.map((item) => {

0 commit comments

Comments
 (0)