Skip to content

Commit dbc772a

Browse files
committed
Fixed heatmap bug for Chrome
1 parent 04d20b5 commit dbc772a

4 files changed

Lines changed: 25 additions & 12 deletions

File tree

src/app/component/circular-heatmap/circular-heatmap.component.ts

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export class CircularHeatmapComponent implements OnInit {
3333
constructor(private yaml:ymlService) { }
3434

3535
ngOnInit(): void {
36-
this.yaml.setURI('./assets/YAML/sample.yaml');
36+
this.yaml.setURI('./assets/YAML/meta.yaml');
3737
// Function sets column header
3838
this.yaml.getJson().subscribe((data) => {
3939
this.YamlObject = data;
@@ -47,7 +47,7 @@ export class CircularHeatmapComponent implements OnInit {
4747

4848
});
4949

50-
this.yaml.setURI('./assets/YAML/generated/sample.yaml');
50+
this.yaml.setURI('./assets/YAML/generated/generated.yaml');
5151
// Function sets data
5252
this.yaml.getJson().subscribe((data) => {
5353
//console.log(this.radial_labels)
@@ -219,15 +219,28 @@ export class CircularHeatmapComponent implements OnInit {
219219

220220
svg.selectAll("path")
221221
.on('click', function(d) {
222-
_self.cardSubheader=d.explicitOriginalTarget.__data__.Level
223-
_self.tasksData=d.explicitOriginalTarget.__data__.Task;
224-
_self.cardHeader=d.explicitOriginalTarget.__data__.Name
222+
console.log(d)
223+
try{
224+
curr=d.explicitOriginalTarget.__data__
225+
}
226+
catch{
227+
curr=d.srcElement.__data__
228+
229+
}
230+
_self.cardSubheader=curr.Level
231+
_self.tasksData=curr.Task;
232+
_self.cardHeader=curr.Name
225233
_self.showTaskCard=true
226234
//console.log(_self.tasksData)
227235
})
228236
.on('mouseover', function(d) {
229-
console.log(d.explicitOriginalTarget)
230-
curr=d.explicitOriginalTarget.__data__
237+
console.log(d.toElement.__data__.Name)
238+
try{
239+
curr=d.explicitOriginalTarget.__data__
240+
}
241+
catch{
242+
curr=d.toElement.__data__
243+
}
231244
//console.log(curr)
232245
// increase the segment height of the one being hovered as well as all others of the same date
233246
// while decreasing the height of all others accordingly

src/app/component/mapping/mapping.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export class MappingComponent implements OnInit {
8181

8282
ngOnInit(): void {
8383
//gets value from generated folder
84-
this.yaml.setURI('./assets/YAML/generated/sample.yaml');
84+
this.yaml.setURI('./assets/YAML/generated/generated.yaml');
8585
// Function sets data
8686
this.yaml.getJson().subscribe((data) => {
8787
this.YamlObject = data;

src/app/component/task-description/task-description.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class TaskDescriptionComponent implements OnInit {
6666
this.KnowledgeLabels=this.YamlObject['strings']['en']['KnowledgeLabels']
6767
})
6868
//gets value from generated folder
69-
this.yaml.setURI('./assets/YAML/generated/sample.yaml');
69+
this.yaml.setURI('./assets/YAML/generated/generated.yaml');
7070
// Function sets data
7171
this.yaml.getJson().subscribe((data) => {
7272
this.YamlObject = data;

src/assets/YAML/generated/generated.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,8 +1729,8 @@ Implementation:
17291729
evidence: ""
17301730
comments: ""
17311731
assessment: ""
1732-
Development & Source Control:
1733-
Local development linting & style checks performed:
1732+
Development and Source Control:
1733+
Local development linting and style checks performed:
17341734
risk: Creating and developing code that contains code smells and quality issues.
17351735
measure: "Integration of quality and linting plugins with interactive development
17361736
environment (IDEs). \n"
@@ -1760,7 +1760,7 @@ Implementation:
17601760
evidence: ""
17611761
comments: ""
17621762
assessment: ""
1763-
Pre-Commit checks & validations:
1763+
Pre-Commit checks and validations:
17641764
risk: Using an insecure application might lead to a compromised application.
17651765
This might lead to total data theft or data modification.
17661766
measure: |

0 commit comments

Comments
 (0)