Skip to content

Commit 6a7244b

Browse files
wurstbrotwurstbrot
authored
Merge pull request #326 from 0x41head/teams-evidence-on-excel
added teamsEvidence to excel
2 parents 62f20a9 + e986d0a commit 6a7244b

File tree

2 files changed

+50
-46
lines changed

2 files changed

+50
-46
lines changed

‎src/app/component/mapping/mapping.component.html‎

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -164,114 +164,116 @@
164164
<th>Usefulness</th>
165165
<th>Implementation</th>
166166
<th>Assessment</th>
167-
<th>Evidence</th>
168167
<th>Comments</th>
169168
<th>Depends On</th>
170169
<th>SAMM</th>
171170
<th>ISO 27001:2017</th>
172171
<th>ISO 27001:2022</th>
173172
<th *ngFor="let team of allTeams">
174-
{{ team }}
173+
{{ team + '- Implemented' }}
174+
</th>
175+
<th *ngFor="let team of allTeams">
176+
{{ team + '- Evidence' }}
175177
</th>
176178
</tr>
177179
<tr *ngFor="let item of allMappingDataSortedByISO17">
178180
<!-- checking if item is defined and set & truncating at 32767 characters per cell to fit to excel limitations-->
179181
<td>
180182
<ng-container *ngIf="item.dimension && item.dimension.length > 0">
181-
{{ item.dimension | slice : 0 : 32767 }}</ng-container
182-
>
183+
{{ item.dimension | slice : 0 : 32767 }}
184+
</ng-container>
183185
</td>
184186
<td>
185187
<ng-container *ngIf="item.subDimension && item.subDimension.length > 0">
186-
{{ item.subDimension | slice : 0 : 32767 }}</ng-container
187-
>
188+
{{ item.subDimension | slice : 0 : 32767 }}
189+
</ng-container>
188190
</td>
189191
<td>
190192
<ng-container *ngIf="item.activityName && item.activityName.length > 0">
191-
{{ item.activityName | slice : 0 : 32767 }}</ng-container
192-
>
193+
{{ item.activityName | slice : 0 : 32767 }}
194+
</ng-container>
193195
</td>
194196
<td>
195197
<ng-container *ngIf="item.description && item.description.length > 0">
196-
{{ item.description | slice : 0 : 32767 }}</ng-container
197-
>
198+
{{ item.description | slice : 0 : 32767 }}
199+
</ng-container>
198200
</td>
199201
<td>
200202
<ng-container *ngIf="item.risk && item.risk.length > 0">
201-
{{ item.risk | slice : 0 : 32767 }}</ng-container
202-
>
203+
{{ item.risk | slice : 0 : 32767 }}
204+
</ng-container>
203205
</td>
204206
<td>
205207
<ng-container *ngIf="item.measure && item.measure.length > 0">
206-
{{ item.measure | slice : 0 : 32767 }}</ng-container
207-
>
208+
{{ item.measure | slice : 0 : 32767 }}
209+
</ng-container>
208210
</td>
209211
<td>
210212
<ng-container *ngIf="item.knowledge && item.knowledge.length > 0">
211-
{{ item.knowledge | slice : 0 : 32767 }}</ng-container
212-
>
213+
{{ item.knowledge | slice : 0 : 32767 }}
214+
</ng-container>
213215
</td>
214216
<td>
215217
<ng-container *ngIf="item.resources && item.resources.length > 0">
216-
{{ item.resources | slice : 0 : 32767 }}</ng-container
217-
>
218+
{{ item.resources | slice : 0 : 32767 }}
219+
</ng-container>
218220
</td>
219221
<td>
220222
<ng-container *ngIf="item.time && item.time.length > 0">
221-
{{ item.time | slice : 0 : 32767 }}</ng-container
222-
>
223+
{{ item.time | slice : 0 : 32767 }}
224+
</ng-container>
223225
</td>
224226
<td>
225227
<ng-container *ngIf="item.usefulness && item.usefulness.length > 0">
226-
{{ item.usefulness | slice : 0 : 32767 }}</ng-container
227-
>
228+
{{ item.usefulness | slice : 0 : 32767 }}
229+
</ng-container>
228230
</td>
229231
<td>
230232
<ng-container
231233
*ngIf="item.implementation && item.implementation.length > 0">
232-
{{ item.implementation | slice : 0 : 32767 }}</ng-container
233-
>
234+
{{ item.implementation | slice : 0 : 32767 }}
235+
</ng-container>
234236
</td>
235237
<td>
236238
<ng-container *ngIf="item.assessment && item.assessment.length > 0">
237-
{{ item.assessment | slice : 0 : 32767 }}</ng-container
238-
>
239-
</td>
240-
<td>
241-
<ng-container *ngIf="item.evidence && item.evidence.length > 0">
242-
{{ item.evidence | slice : 0 : 32767 }}</ng-container
243-
>
239+
{{ item.assessment | slice : 0 : 32767 }}
240+
</ng-container>
244241
</td>
245242
<td>
246243
<ng-container *ngIf="item.comments && item.comments.length > 0">
247-
{{ item.comments | slice : 0 : 32767 }}</ng-container
248-
>
244+
{{ item.comments | slice : 0 : 32767 }}
245+
</ng-container>
249246
</td>
250247
<td>
251248
<ng-container *ngIf="item.dependsOn && item.dependsOn.length > 0">
252-
{{ item.dependsOn | slice : 0 : 32767 }}</ng-container
253-
>
249+
{{ item.dependsOn | slice : 0 : 32767 }}
250+
</ng-container>
254251
</td>
255252
<td>
256253
<ng-container *ngIf="item.samm2 && item.samm2.length > 0">
257-
{{ item.samm2 | slice : 0 : 32767 }}</ng-container
258-
>
254+
{{ item.samm2 | slice : 0 : 32767 }}
255+
</ng-container>
259256
</td>
260257
<td>
261258
<ng-container *ngIf="item.ISO17 && item.ISO17.length > 0">
262-
{{ item.ISO17 | slice : 0 : 32767 }}</ng-container
263-
>
259+
{{ item.ISO17 | slice : 0 : 32767 }}
260+
</ng-container>
264261
</td>
265262
<td>
266263
<ng-container *ngIf="item.ISO22 && item.ISO22.length > 0">
267-
{{ item.ISO22 | slice : 0 : 32767 }}</ng-container
268-
>
264+
{{ item.ISO22 | slice : 0 : 32767 }}
265+
</ng-container>
269266
</td>
270267
<td *ngFor="let key of allTeams">
271268
<ng-container>
272269
{{ item.teamImplementation[key] }}
273270
</ng-container>
274271
</td>
272+
<td *ngFor="let key of allTeams">
273+
<ng-container *ngIf="item.teamsEvidence">
274+
{{ item.teamsEvidence[key] }}
275+
</ng-container>
276+
</td>
275277
</tr>
276278
</table>
277279
</div>

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,15 @@ export interface MappingElementSortedByISO17 {
4242
time: string;
4343
usefulness: string;
4444
dependsOn: string[];
45-
evidence: string;
4645
comments: string;
4746
assessment: string;
4847
implementation: any;
4948
teamImplementation: {
5049
[key: string]: boolean;
5150
};
51+
teamsEvidence: {
52+
[key: string]: string;
53+
};
5254
}
5355

5456
export interface MappingElementSortedByISO22 {
@@ -317,9 +319,6 @@ export class MappingComponent implements OnInit {
317319
var CurrentUsefulness: string =
318320
this.generalLabels[this.YamlObject[dim][subDim][activity]['usefulness']];
319321

320-
var CurrentEvidence: string =
321-
this.YamlObject[dim][subDim][activity]['evidence'];
322-
323322
var CurrentComments: string =
324323
this.YamlObject[dim][subDim][activity]['comments'];
325324

@@ -343,6 +342,9 @@ export class MappingComponent implements OnInit {
343342
var CurrentTeamsAndImplementation =
344343
this.YamlObject[dim][subDim][activity]['teamsImplemented'];
345344

345+
var CurrentTeamsEvidence =
346+
this.YamlObject[dim][subDim][activity]['teamsEvidence'];
347+
346348
this.temporaryMappingElement = {
347349
dimension: dim,
348350
subDimension: subDim,
@@ -359,10 +361,10 @@ export class MappingComponent implements OnInit {
359361
usefulness: CurrentUsefulness,
360362
dependsOn: CurrentDependsOn,
361363
implementation: CurrentImplementation,
362-
evidence: CurrentEvidence,
363364
comments: CurrentComments,
364365
assessment: CurrentAssessment,
365366
teamImplementation: CurrentTeamsAndImplementation,
367+
teamsEvidence: CurrentTeamsEvidence,
366368
};
367369

368370
console.log(this.temporaryMappingElement);

0 commit comments

Comments
 (0)