Skip to content
This repository has been archived by the owner on Jul 12, 2023. It is now read-only.

Support testType field as input for bulk-upload #1531

Merged
merged 2 commits into from
Jan 7, 2021
Merged

Support testType field as input for bulk-upload #1531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfeee85
support test-type for bulk-upload
whaught Jan 7, 2021
4ca1c2c
comma
whaught Jan 7, 2021
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
2 changes: 1 addition & 1 deletion cmd/server/assets/codes/bulk-issue.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<label class="custom-file-label" for="csv" id="file-label">{{t $.locale "codes.bulk-issue.select-csv"}}</label>
</div>
<small class="form-text text-muted">
{{t $.locale "codes.bulk-issue.csv-format1" `<code>phone,testDate,[optional]symptomDate</code>` | safeHTML}}
{{t $.locale "codes.bulk-issue.csv-format1" `<code>phone,testDate,[optional]symptomDate,[optional]testType</code>` | safeHTML}}
{{t $.locale "codes.bulk-issue.csv-format2" `<a href="https://www.twilio.com/docs/glossary/what-e164" target="_blank">E.164</a>` `<a href="https://www.iso.org/iso-8601-date-and-time-format.html" target="_blank">ISO 8601</a>` | safeHTML}}
</small>
</div>
Expand Down
10 changes: 7 additions & 3 deletions cmd/server/assets/static/js/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,11 @@ function buildBatchIssueRequest(thisRow, retryCode, template, line) {
request["phone"] = $("<div>").text(cols[0].trim()).html();
request["testDate"] = (cols.length > 1) ? $("<div>").text(cols[1].trim()).html() : "";
request["symptomDate"] = (cols.length > 2) ? $("<div>").text(cols[2].trim()).html() : "";
request["testType"] = (cols.length > 3) ? $("<div>").text(cols[3].trim()).html() : "confirmed";

if (request["testType"] == "") {
request["testType"] = "confirmed";
}

// Skip missing phone number
if (request["phone"] == "" || cols.Length < 2) {
Expand All @@ -885,7 +890,6 @@ function buildBatchIssueRequest(thisRow, retryCode, template, line) {

request["uuid"] = uuid;
request["smsTemplateLabel"] = template;
request["testType"] = "confirmed";
request["tzOffset"] = tzOffset;

// CSV file has error codes in the file. Usually means a retry of the receipt file.
Expand Down Expand Up @@ -978,7 +982,7 @@ function showErroredCode(request, code, line) {
$errorTable.addClass('d-none');
$errorTooMany.removeClass('d-none');
}
$save.attr("href", `${$save.attr("href")}${request["phone"]},${request["testDate"]},${request["symptomDate"]},,,,${request["uuid"]},${code.errorCode},${code.error}\n`);
$save.attr("href", `${$save.attr("href")}${request["phone"]},${request["testDate"]},${request["symptomDate"]},${request["testType"]},,,${request["uuid"]},${code.errorCode},${code.error}\n`);
if (totalErrs > showMaxResults) {
return;
}
Expand All @@ -1004,7 +1008,7 @@ function showSuccessfulCode(request, code, line) {
$successTable.addClass('d-none');
$successTooMany.removeClass('d-none');
}
$save.attr("href", `${$save.attr("href")}${request["phone"]},${request["testDate"]},${request["symptomDate"]},,,,${code.uuid},success\n`);
$save.attr("href", `${$save.attr("href")}${request["phone"]},${request["testDate"]},${request["symptomDate"]},${request["testType"]},,,${code.uuid},success\n`);
if (total > showMaxResults) {
return;
}
Expand Down