Skip to content

Commit

Permalink
chore: merge with development
Browse files Browse the repository at this point in the history
  • Loading branch information
@9sneha-n
9sneha-n committed Apr 3, 2024
2 parents 6525056 + 9151cdc commit a5a812b
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
3 changes: 2 additions & 1 deletion src/domain/entities/Questionnaire/Questionnaire.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ export class Questionnaire {
}),
};
});
const updatedQuestionnaire = Questionnaire.updateQuestionnaireStages(

const updatedQuestionnaire: Questionnaire = Questionnaire.updateQuestionnaireStages(
questionnaire,
updatedStages
);
Expand Down
4 changes: 2 additions & 2 deletions src/domain/usecases/GetChildCountUseCase.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export class GetChildCountUseCase {
};
} else if (pc.id === PREVALENCE_CENTRAL_REF_LAB_FORM_ID) {
return {
option: `List Central Ref Labs (${pc.count})`,
option: `List Central Ref Labs Results (${pc.count})`,
count: pc.count,
};
} else if (pc.id === PREVALENCE_PATHOGEN_ISO_STORE_TRACK_ID) {
Expand All @@ -51,7 +51,7 @@ export class GetChildCountUseCase {
};
} else if (pc.id === PREVALENCE_SUPRANATIONAL_REF_LAB_ID) {
return {
option: `List Supranational Refs (${pc.count})`,
option: `List Supranational Refs Results (${pc.count})`,
count: pc.count,
};
} else {
Expand Down
16 changes: 8 additions & 8 deletions src/domain/utils/PPSProgramsHelper.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,16 @@ export const getChildSurveyType = (
case option?.startsWith("List Sample Shipments"):
return "PrevalenceSampleShipTrackForm";

case option === "Add New Central Ref Lab":
case option?.startsWith("List Central Ref Labs"):
case option === "Add New Central Ref Lab Results":
case option?.startsWith("List Central Ref Labs Results"):
return "PrevalenceCentralRefLabForm";

case option === "Add New Pathogen Isolates Log":
case option?.startsWith("List Pathogen Isolates Logs"):
return "PrevalencePathogenIsolatesLog";

case option === "Add New Supranational Ref":
case option?.startsWith("List Supranational Refs"):
case option === "Add New Supranational Ref Results":
case option?.startsWith("List Supranational Refs Results"):
return "PrevalenceSupranationalRefLabForm";
default:
return undefined;
Expand Down Expand Up @@ -144,12 +144,12 @@ export const getSurveyOptions = (
"Edit",
"Add New Sample Shipment",
"List Sample Shipments",
"Add New Central Ref Lab",
"List Central Ref Labs",
"Add New Central Ref Lab Results",
"List Central Ref Labs Results",
"Add New Pathogen Isolates Log",
"List Pathogen Isolates Logs",
"Add New Supranational Ref",
"List Supranational Refs",
"Add New Supranational Ref Results",
"List Supranational Refs Results",
"Delete",
];
case "PrevalenceSampleShipTrackForm":
Expand Down
8 changes: 4 additions & 4 deletions src/webapp/components/survey-list/table/PaginatedSurveyListTable.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ export const PaginatedSurveyListTable: React.FC<PaginatedSurveyListTableProps> =
option:
options.find(op =>
op.startsWith(
"Add New Central Ref Lab"
"Add New Central Ref Lab Results"
)
) ?? "",
handler: option =>
Expand All @@ -220,7 +220,7 @@ export const PaginatedSurveyListTable: React.FC<PaginatedSurveyListTableProps> =
option:
options.find(op =>
op.startsWith(
"List Central Ref Labs"
"List Central Ref Labs Results"
)
) ?? "",
handler: option =>
Expand Down Expand Up @@ -251,7 +251,7 @@ export const PaginatedSurveyListTable: React.FC<PaginatedSurveyListTableProps> =
option:
options.find(op =>
op.startsWith(
"Add New Supranational Ref"
"Add New Supranational Ref Results"
)
) ?? "",
handler: option =>
Expand All @@ -261,7 +261,7 @@ export const PaginatedSurveyListTable: React.FC<PaginatedSurveyListTableProps> =
option:
options.find(op =>
op.startsWith(
"List Supranational Refs"
"List Supranational Refs Results"
)
) ?? "",
handler: option =>
Expand Down

0 comments on commit a5a812b

Please sign in to comment.