@@ -35,6 +35,7 @@ export class CircularHeatmapComponent implements OnInit {
3535 ALL_CARD_DATA : cardSchema [ ] = [ ] ;
3636 radial_labels : string [ ] = [ ] ;
3737 YamlObject : any ;
38+ metaData : any ;
3839 segment_labels : string [ ] = [ ] ;
3940 taskDetails : any ;
4041 showOverlay : boolean ;
@@ -55,8 +56,8 @@ export class CircularHeatmapComponent implements OnInit {
5556 this . radial_labels . push ( 'Level ' + y ) ;
5657 this . maxLevelOfTasks = y ;
5758 }
59+ this . metaData = this . YamlObject ;
5860 } ) ;
59-
6061 this . yaml . setURI ( './assets/YAML/generated/generated.yaml' ) ;
6162 // Function sets data
6263 this . yaml . getJson ( ) . subscribe ( data => {
@@ -94,8 +95,8 @@ export class CircularHeatmapComponent implements OnInit {
9495 'Done%' : - 1 ,
9596 Task : [ ] ,
9697 } ;
97- var totalImplemented : number = 0 ;
98- var totalTasks : number = 0 ;
98+ var totalTeamsImplemented : number = 0 ;
99+ var totalTaskTeams : number = 0 ;
99100 tempData [ 'Dimension' ] = allDimensionNames [ i ] ;
100101 tempData [ 'SubDimension' ] = allSubDimensionInThisDimension [ j ] ;
101102 tempData [ 'Level' ] = 'Level ' + ( l + 1 ) ;
@@ -106,33 +107,52 @@ export class CircularHeatmapComponent implements OnInit {
106107 allSubDimensionInThisDimension [ j ]
107108 ] [ allTaskInThisSubDimension [ k ] ] [ 'level' ] ;
108109 if ( lvlOfCurrentTask == l + 1 ) {
109- totalTasks += 1 ;
110+ totalTaskTeams += 1 ;
110111 var nameOfTask : string = allTaskInThisSubDimension [ k ] ;
111112 var Status : boolean =
112113 this . YamlObject [ allDimensionNames [ i ] ] [
113114 allSubDimensionInThisDimension [ j ]
114115 ] [ allTaskInThisSubDimension [ k ] ] [ 'isImplemented' ] ;
115- var teamStatus : any =
116+ // Create an object from an array from meta data
117+ const teams = this . metaData [ 'strings' ] [ 'en' ] [ 'teams' ] ;
118+
119+ var teamStatus : { [ key : string ] : boolean } = { } ;
120+
121+ teams . forEach ( ( singleTeam : any ) => {
122+ teamStatus [ singleTeam ] = false ;
123+ } ) ;
124+ console . log ( 'check' , teamStatus ) ;
125+
126+ var teamsImplemented : any =
116127 this . YamlObject [ allDimensionNames [ i ] ] [
117128 allSubDimensionInThisDimension [ j ]
118129 ] [ allTaskInThisSubDimension [ k ] ] [ 'teamsImplemented' ] ;
119- if ( ! teamStatus ) {
120- teamStatus = {
121- V : false ,
122- } ;
123- console . log ( 'Adding dummy team name' ) ;
124- }
125- if ( Status ) {
126- totalImplemented += 1 ;
130+ if ( teamsImplemented ) {
131+ teamStatus = teamsImplemented ;
127132 }
133+ // if (Status) {
134+ // totalImplemented += 1;
135+ // }
136+ // Calculating %done
137+ (
138+ Object . keys ( teamStatus ) as ( keyof typeof teamStatus ) [ ]
139+ ) . forEach ( ( key , index ) => {
140+ // 👇️ name Bobby Hadz 0, country Chile 1
141+ console . log ( key , teamStatus [ key ] , index ) ;
142+ totalTaskTeams += 1 ;
143+ if ( teamStatus [ key ] === true ) {
144+ totalTeamsImplemented += 1 ;
145+ }
146+ } ) ;
147+
128148 tempData [ 'Task' ] . push ( {
129149 taskName : nameOfTask ,
130150 ifTaskDone : Status ,
131151 teamsImplemented : teamStatus ,
132152 } ) ;
133153 }
134- if ( totalTasks > 0 ) {
135- tempData [ 'Done%' ] = totalImplemented / totalTasks ;
154+ if ( totalTaskTeams > 0 ) {
155+ tempData [ 'Done%' ] = totalTeamsImplemented / totalTaskTeams ;
136156 }
137157 } catch {
138158 console . log ( 'level for task does not exist' ) ;
@@ -640,11 +660,11 @@ export class CircularHeatmapComponent implements OnInit {
640660 }
641661 }
642662
643- navigate ( dim : string , subdim : string , taskName : string ) {
663+ navigate ( dim : string , subdim : string , taskName : string ) {
644664 let navigationExtras = {
645665 dimension : dim ,
646666 subDimension : subdim ,
647-
667+
648668 taskName : taskName ,
649669 } ;
650670 this . yaml . setURI ( './assets/YAML/generated/generated.yaml' ) ;
0 commit comments