Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
71 changes: 59 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"@angular/platform-browser-dynamic": "~13.3.0",
"@angular/router": "~13.3.0",
"d3": "^7.5.0",
"js-yaml": "^4.1.0",
"markdown-it": "^13.0.1",
"rxjs": "~7.5.0",
"tslib": "^2.3.0",
Expand All @@ -33,6 +34,7 @@
"@angular/compiler-cli": "~13.3.0",
"@types/d3": "^7.4.0",
"@types/jasmine": "~3.10.0",
"@types/js-yaml": "^4.0.5",
"@types/markdown-it": "^12.2.3",
"@types/node": "^12.11.1",
"@types/yamljs": "^0.2.31",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
stroke: #000;
shape-rendering: crispEdges;
}
.abc{
.heatmapClass{
background-color: aquamarine;
}
.example-card {
Expand All @@ -16,3 +16,7 @@
margin:5%;
padding: 20px;
}
.buttonClass{
float: right;
margin: 5%;
}
24 changes: 12 additions & 12 deletions src/app/component/circular-heatmap/circular-heatmap.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@
<div class="col-md-3">
</div>
<div class="col-md-6">
<div id="chart" class="abc">
<mat-card class="example-card" *ngIf="show">
<div id="chart" class="heatmapClass">
<mat-card class="example-card" *ngIf="showTaskCard">
<mat-card-title-group>
<mat-card-title>{{header}}</mat-card-title>
<mat-card-subtitle>{{subheader}}</mat-card-subtitle>
<mat-card-title>{{taskHeader}}</mat-card-title>
<mat-card-subtitle>{{taskSubheader}}</mat-card-subtitle>
</mat-card-title-group>
<mat-card-content *ngFor="let task of tasks;index as i">
<div *ngIf="task.done; then trueBlock else falseBlock"></div>
<mat-card-content *ngFor="let task of tasksData;index as i">
<div *ngIf="task.ifTaskDone; then trueBlock else falseBlock"></div>
<p>
<ng-template #trueBlock>
<mat-checkbox (click)="this.checkboxToggle(i)" [checked]="true" color="primary">
{{task["name"]}}
<mat-checkbox (click)="this.toggleCheckbox(i)" [checked]="true" color="primary">
{{task["taskName"]}}
</mat-checkbox>
</ng-template>
<ng-template #falseBlock>
<mat-checkbox (click)="this.checkboxToggle(i)" [checked]="false" color="primary">
{{task["name"]}}
<mat-checkbox (click)="this.toggleCheckbox(i)" [checked]="false" color="primary">
{{task["taskName"]}}
</mat-checkbox>
</ng-template>
</p>
</mat-card-content>
</mat-card>
</div>

<button class="buttonClass" (click)="SaveDemo()">Save As</button>
</div>
</div>
<div class="col-md-3">
</div>
Expand Down
81 changes: 46 additions & 35 deletions src/app/component/circular-heatmap/circular-heatmap.component.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { Component, OnInit } from '@angular/core';
import { ymlService } from '../../service/yaml-parser/yaml-parser.service';
import * as d3 from 'd3';
import * as yaml from "js-yaml"

export interface taskSchema{
name:string
done:boolean
taskName:string
ifTaskDone:boolean
}

export interface cardSchema{
Expand All @@ -20,12 +21,12 @@ export interface cardSchema{
styleUrls: ['./circular-heatmap.component.css']
})
export class CircularHeatmapComponent implements OnInit {
maxLevel:number=-1
show:boolean=false
header:string=''
subheader:string=''
tasks:any[]=[]
data:cardSchema[] =[];
maxLevelOfTasks:number=-1
showTaskCard:boolean=false
taskHeader:string=''
taskSubheader:string=''
tasksData:any[]=[]
ALL_CARD_DATA:cardSchema[] =[];
radial_labels:string[]= [];
YamlObject:any;
segment_labels:string[] = [];
Expand All @@ -41,7 +42,7 @@ export class CircularHeatmapComponent implements OnInit {
for(let x in this.YamlObject['strings']['en']['maturity_levels']){
var y=parseInt(x)+1
this.radial_labels.push('Level '+y)
this.maxLevel=y
this.maxLevelOfTasks=y
}

});
Expand All @@ -55,7 +56,7 @@ export class CircularHeatmapComponent implements OnInit {
for(var x in this.YamlObject['dimension']){
this.segment_labels.push(this.YamlObject['dimension'][x]['subdimension']['name'])
}
for(var l=0 ; l<this.maxLevel; l++){
for(var l=0 ; l<this.maxLevelOfTasks; l++){
for(var x in this.YamlObject['dimension']){
var tempdata:cardSchema={
"Name": "",
Expand All @@ -73,57 +74,67 @@ export class CircularHeatmapComponent implements OnInit {
if(Status){
totalImplemented+=1
}
tempdata["Task"].push({"name":nameOfTask,"done":Status})
tempdata["Task"].push({"taskName":nameOfTask,"ifTaskDone":Status})
}
tempdata["Done%"]=totalImplemented/this.YamlObject['dimension'][x]['subdimension']['level-'+(l+1)].length
}
catch{
tempdata["Done%"]=-1
}
this.data.push(tempdata)
this.ALL_CARD_DATA.push(tempdata)
}
}
console.log(this.data)
this.loadCircularHeatMap(this.data, "#chart", this.radial_labels, this.segment_labels);
console.log(this.ALL_CARD_DATA)
this.loadCircularHeatMap(this.ALL_CARD_DATA, "#chart", this.radial_labels, this.segment_labels);
this.noTasktoGrey()
})
}

checkboxToggle(taskIndex:number){
toggleCheckbox(taskIndex:number){
//console.log('fo')
let _self=this
var index=0;
var cnt=0;
for(var i=0;i<this.data.length;i++){
if(this.data[i]["Name"]===this.header&&this.data[i]["Level"]===this.subheader){
for(var i=0;i<this.ALL_CARD_DATA.length;i++){
if(this.ALL_CARD_DATA[i]["Name"]===this.taskHeader&&this.ALL_CARD_DATA[i]["Level"]===this.taskSubheader){
index=i
break;
}
}
if(this.data[index]["Task"][taskIndex]["done"]){
this.data[index]["Task"][taskIndex]["done"]=false
if(this.ALL_CARD_DATA[index]["Task"][taskIndex]["ifTaskDone"]){
this.ALL_CARD_DATA[index]["Task"][taskIndex]["ifTaskDone"]=false
}
else{
this.data[index]["Task"][taskIndex]["done"]=true
this.ALL_CARD_DATA[index]["Task"][taskIndex]["ifTaskDone"]=true
}
//console.log(this.data[i]["Task"][taskIndex]["done"])
for(var i=0;i< this.data[index]["Task"].length;i++){
console.log(this.data[index]["Task"][i]["done"])
if(this.data[index]["Task"][i]["done"]){
for(var i=0;i< this.ALL_CARD_DATA[index]["Task"].length;i++){
console.log(this.ALL_CARD_DATA[index]["Task"][i]["ifTaskDone"])
if(this.ALL_CARD_DATA[index]["Task"][i]["ifTaskDone"]){
cnt+=1
}
}
this.data[index]['Done%']=cnt/this.data[index]["Task"].length
this.ALL_CARD_DATA[index]['Done%']=cnt/this.ALL_CARD_DATA[index]["Task"].length
//console.log(this.data[index]['Done%'],cnt)
var color = d3.scaleLinear<string,string>().domain([0,1]).range(["white", "green"]);

this.loadCircularHeatMap(this.data, "#chart", this.radial_labels, this.segment_labels);
d3.selectAll("#segment-" + this.data[index]["Name"]+'-'+this.data[index]["Level"].replace(' ','-')).attr("fill", function(p) {
return color(_self.data[index]["Done%"])
this.loadCircularHeatMap(this.ALL_CARD_DATA, "#chart", this.radial_labels, this.segment_labels);
d3.selectAll("#segment-" + this.ALL_CARD_DATA[index]["Name"]+'-'+this.ALL_CARD_DATA[index]["Level"].replace(' ','-')).attr("fill", function(p) {
return color(_self.ALL_CARD_DATA[index]["Done%"])
});

}

SaveDemo() {
let yamlStr = yaml.dump(this.YamlObject);
let file = new Blob([yamlStr], { type: 'text/csv;charset=utf-8' });
var link = document.createElement('a');
link.href = window.URL.createObjectURL(file);
link.download = './hlll.txt'
link.click();
link.remove();
}

loadCircularHeatMap(dataset:any, dom_element_to_append_to:string, radial_labels:string[], segment_labels:string[]) {
//d3.select(dom_element_to_append_to).selectAll('svg').exit()
//console.log(dataset)
Expand Down Expand Up @@ -177,11 +188,11 @@ export class CircularHeatmapComponent implements OnInit {

svg.selectAll("path")
.on('click', function(d) {
_self.subheader=d.explicitOriginalTarget.__data__.Level
_self.tasks=d.explicitOriginalTarget.__data__.Task;
_self.header=d.explicitOriginalTarget.__data__.Name
_self.show=true
console.log(_self.tasks)
_self.taskSubheader=d.explicitOriginalTarget.__data__.Level
_self.tasksData=d.explicitOriginalTarget.__data__.Task;
_self.taskHeader=d.explicitOriginalTarget.__data__.Name
_self.showTaskCard=true
console.log(_self.tasksData)
})
.on('mouseover', function(d) {

Expand Down Expand Up @@ -384,9 +395,9 @@ export class CircularHeatmapComponent implements OnInit {
}

noTasktoGrey():void{
for (var x in this.data){
if (this.data[x]["Done%"]==-1){
d3.selectAll("#segment-" + this.data[x]["Name"]+'-'+this.data[x]["Level"].replace(' ','-')).attr("fill","#DCDCDC");
for (var x in this.ALL_CARD_DATA){
if (this.ALL_CARD_DATA[x]["Done%"]==-1){
d3.selectAll("#segment-" + this.ALL_CARD_DATA[x]["Name"]+'-'+this.ALL_CARD_DATA[x]["Level"].replace(' ','-')).attr("fill","#DCDCDC");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/component/matrix/matrix.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<mat-chip-list #chipList aria-label="Filter" color="primary">
<mat-chip
color="primary"
*ngFor="let row of rows"
*ngFor="let row of rowsCurrentlyBeingShown"
(removed)="remove(row)"
[selected]=true>
{{row}}
Expand Down
Loading