Skip to content

Commit 1370214

Browse files
committed
Teams implemented panel added in Task Description page
1 parent 0ffff95 commit 1370214

3 files changed

Lines changed: 33 additions & 11 deletions

File tree

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
.content-box {
2-
margin: 20px;
3-
width: 95%;
4-
/*height: 100%;*/
5-
/*background-color: paleturquoise;*/
6-
}
2+
margin: 20px;
3+
width: 95%;
4+
/*height: 100%;*/
5+
/*background-color: paleturquoise;*/
6+
}
77

88
.mat-form-field + .mat-form-field {
99
margin-left: 8px;
1010
}
1111

12-
.mat-raised-button{
12+
.mat-raised-button {
1313
margin-right: 8px;
14-
}
14+
}
15+
.teams-implemented-list {
16+
list-style: none;
17+
}

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,28 @@ <h1>
179179
<mat-expansion-panel>
180180
<mat-expansion-panel-header>
181181
<mat-panel-title>
182-
<b>Implemented</b>
182+
<b>Implemented By</b>
183183
</mat-panel-title>
184184
</mat-expansion-panel-header>
185185
<div
186-
*ngIf="currentTask.isImplemented; then thenBlock; else elseBlock"></div>
187-
<ng-template #thenBlock> Implemented </ng-template>
188-
<ng-template #elseBlock> Not Implemented </ng-template>
186+
*ngIf="
187+
currentTask.teamsImplemented;
188+
then thenBlock;
189+
else elseBlock
190+
"></div>
191+
<ng-template #thenBlock>
192+
<ul class="teams-implemented-list">
193+
<li *ngFor="let item of currentTask.teamsImplemented | keyvalue">
194+
<b>{{ item.key }}</b
195+
>:{{ item.value }}
196+
</li>
197+
</ul>
198+
</ng-template>
199+
<ng-template #elseBlock
200+
>teamsImplemented variable not present <br />
201+
<p *ngIf="currentTask.isImplemented === false">Not Implemented</p>
202+
<p *ngIf="currentTask.isImplemented === true">Implemented</p>
203+
</ng-template>
189204
</mat-expansion-panel>
190205
<mat-expansion-panel>
191206
<mat-expansion-panel-header>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export interface taskDescription {
3333
assessment: string;
3434
comments: string;
3535
isImplemented: boolean;
36+
teamsImplemented: Object;
3637
}
3738

3839
@Component({
@@ -64,6 +65,7 @@ export class TaskDescriptionComponent implements OnInit {
6465
evidence: '',
6566
comments: '',
6667
isImplemented: false,
68+
teamsImplemented: {},
6769
};
6870

6971
YamlObject: any;
@@ -184,6 +186,7 @@ export class TaskDescriptionComponent implements OnInit {
184186
data['isImplemented'],
185187
false
186188
);
189+
this.currentTask.teamsImplemented = data['teamsImplemented'];
187190
this.openall();
188191
});
189192
}
@@ -263,6 +266,7 @@ export class TaskDescriptionComponent implements OnInit {
263266
this.accordion.forEach(element => {
264267
element.openAll();
265268
});
269+
console.log(this.currentTask.teamsImplemented);
266270
}
267271

268272
// Close all function

0 commit comments

Comments
 (0)