Skip to content

Commit e558cc2

Browse files
committed
Changed hover color of Circular heatmap and added dynamic show for expanson panels of 'Depends On' and 'Impementation Guide' section
1 parent 0737340 commit e558cc2

4 files changed

Lines changed: 2898 additions & 1860 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,4 @@
2121
padding: 10px;
2222
bottom: 12%;
2323
right: 5%;
24-
}
25-
24+
}

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export class CircularHeatmapComponent implements OnInit {
137137
for(var j=0;j<allSubDimensionInThisDimension.length;j++){
138138
if(allSubDimensionInThisDimension[j]==this.cardHeader){
139139
var taskName= this.ALL_CARD_DATA[index]["Task"][taskIndex]["taskName"]
140-
console.log(taskName)
140+
//console.log(taskName)
141141
this.YamlObject[allDimensionNames[i]][allSubDimensionInThisDimension[j]][taskName]["isImplemented"]=this.ALL_CARD_DATA[index]["Task"][taskIndex]["ifTaskDone"]
142142
break
143143
}
@@ -223,17 +223,17 @@ export class CircularHeatmapComponent implements OnInit {
223223
_self.tasksData=d.explicitOriginalTarget.__data__.Task;
224224
_self.cardHeader=d.explicitOriginalTarget.__data__.Name
225225
_self.showTaskCard=true
226-
console.log(_self.tasksData)
226+
//console.log(_self.tasksData)
227227
})
228228
.on('mouseover', function(d) {
229229

230230
curr=d.explicitOriginalTarget.__data__
231-
console.log(curr)
231+
//console.log(curr)
232232
// increase the segment height of the one being hovered as well as all others of the same date
233233
// while decreasing the height of all others accordingly
234234
//console.log(d)
235235
if(curr["Done%"]!=-1){
236-
d3.selectAll("#segment-" + curr.Name.replace(/ /g, "-")+'-'+curr.Level.replaceAll(' ','-')).attr("fill","white")
236+
d3.selectAll("#segment-" + curr.Name.replace(/ /g, "-")+'-'+curr.Level.replaceAll(' ','-')).attr("fill","yellow")
237237
};
238238

239239
})
@@ -347,8 +347,7 @@ export class CircularHeatmapComponent implements OnInit {
347347
.text(function(d:any) {
348348
return d;
349349
});
350-
});
351-
350+
});
352351
}
353352

354353
/* Arc functions */
@@ -434,6 +433,5 @@ export class CircularHeatmapComponent implements OnInit {
434433
d3.selectAll("#segment-" + this.ALL_CARD_DATA[x]["Name"].replace(/ /g, "-")+'-'+this.ALL_CARD_DATA[x]["Level"].replace(' ','-')).attr("fill","#DCDCDC");
435434
}
436435
}
437-
}
438-
436+
}
439437
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h1>{{currentTask.dimension}} -> {{currentTask.subDimension}}: {{currentTask.tas
3131
</mat-expansion-panel-header>
3232
<p [innerHTML]="currentTask.measure"></p>
3333
</mat-expansion-panel>
34-
<mat-expansion-panel>
34+
<mat-expansion-panel *ngIf="currentTask.implementatonGuide">
3535
<mat-expansion-panel-header>
3636
<mat-panel-title>
3737
<b>Implementation Guide</b>
@@ -42,7 +42,7 @@ <h1>{{currentTask.dimension}} -> {{currentTask.subDimension}}: {{currentTask.tas
4242
<mat-expansion-panel>
4343
<mat-expansion-panel-header>
4444
<mat-panel-title>
45-
<b>Difficulty Of Implementation</b>
45+
<b>Difficulty of Implementation</b>
4646
</mat-panel-title>
4747
</mat-expansion-panel-header>
4848
<p>Knowledge: {{this.currentTask.knowledge}} </p>
@@ -128,7 +128,7 @@ <h1>{{currentTask.dimension}} -> {{currentTask.subDimension}}: {{currentTask.tas
128128
</mat-accordion>
129129
</p>
130130
</mat-expansion-panel>
131-
<mat-expansion-panel>
131+
<mat-expansion-panel *ngIf="this.currentTask.dependsOn">
132132
<mat-expansion-panel-header>
133133
<mat-panel-title>
134134
<b>Depends on</b>

0 commit comments

Comments
 (0)