diff --git a/src/app/admin/backend.service.ts b/src/app/admin/backend.service.ts index 3d35b089b5a2e6cc796897e93390cb101f4a67fd..b5a83c4099299b5cd81508ecc458aa05bcdffba0 100644 --- a/src/app/admin/backend.service.ts +++ b/src/app/admin/backend.service.ts @@ -289,6 +289,8 @@ export interface UnitResponse { bookletname: string; unitname: string; responses: string; + restorepoint: string; + responsetype: string; } export interface MonitorData { diff --git a/src/app/admin/results/results.component.ts b/src/app/admin/results/results.component.ts index 48b4b0723c43fda66481f757c7edf31b9bfd4ae0..c14e57e6f401083f522050d603eb4168f91968e7 100644 --- a/src/app/admin/results/results.component.ts +++ b/src/app/admin/results/results.component.ts @@ -76,11 +76,25 @@ export class ResultsComponent implements OnInit { const columnDelimiter = ';'; const lineDelimiter = '\n'; let myCsvData = 'groupname' + columnDelimiter + 'loginname' + columnDelimiter + 'code' + columnDelimiter + - 'bookletname' + columnDelimiter + 'unitname' + columnDelimiter + 'responses' + lineDelimiter; + 'bookletname' + columnDelimiter + 'unitname' + columnDelimiter + 'responses' + columnDelimiter + + 'restorePoint' + columnDelimiter + 'responseType' + lineDelimiter; responseData.forEach((resp: UnitResponse) => { + myCsvData += '"' + resp.groupname + '"' + columnDelimiter + '"' + resp.loginname + '"' + columnDelimiter + '"' + resp.code + '"' + columnDelimiter + + '"' + resp.bookletname + '"' + columnDelimiter + '"' + resp.unitname + '"' + columnDelimiter; if ((resp.responses !== null) && (resp.responses.length > 0)) { - myCsvData += '"' + resp.groupname + '"' + columnDelimiter + '"' + resp.loginname + '"' + columnDelimiter + '"' + resp.code + '"' + columnDelimiter + - '"' + resp.bookletname + '"' + columnDelimiter + '"' + resp.unitname + '"' + columnDelimiter + resp.responses.replace(/\\"/g, '""') + lineDelimiter; + myCsvData += resp.responses.replace(/\\"/g, '""') + columnDelimiter; + } else { + myCsvData += columnDelimiter; + } + if ((resp.restorepoint !== null) && (resp.restorepoint.length > 0)) { + myCsvData += resp.restorepoint.replace(/\\"/g, '""') + columnDelimiter; + } else { + myCsvData += columnDelimiter; + } + if ((resp.responsetype !== null) && (resp.responsetype.length > 0)) { + myCsvData += '"' + resp.responsetype + '"' + lineDelimiter; + } else { + myCsvData += lineDelimiter; } }); var blob = new Blob([myCsvData], {type: "text/csv;charset=utf-8"});