From 7163a5131b975ef9068acbcbf4bfc0dc99dd5434 Mon Sep 17 00:00:00 2001 From: Agustin <agusr1999@gmail.com> Date: Mon, 18 Oct 2021 11:36:10 -0300 Subject: [PATCH] Parameter update fixes, .env is now ignored --- .gitignore | 2 ++ src/Config/Constants.ts | 2 +- src/Services/ParameterService.ts | 14 +++++++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c6bdbb7..6d6dd69 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ build npm-debug.log .DS_Store logs/ + +.env diff --git a/src/Config/Constants.ts b/src/Config/Constants.ts index 0334439..8baaf85 100644 --- a/src/Config/Constants.ts +++ b/src/Config/Constants.ts @@ -29,4 +29,4 @@ export const extraDataIDs = { extraEnergyLact18to29: 'lactationExtraEnergy18to29', extraEnergyPreg30to59: 'pregnancyExtraEnergy30to59', extraEnergyLact30to59: 'lactationExtraEnergy30to59', -} \ No newline at end of file +}; diff --git a/src/Services/ParameterService.ts b/src/Services/ParameterService.ts index b5e9640..e76ec61 100644 --- a/src/Services/ParameterService.ts +++ b/src/Services/ParameterService.ts @@ -278,22 +278,22 @@ const updateExtraData = async (parameters: DefaultExtraDataDTO[]): Promise<void> if (ids.includes(extraDataIDs.minLowPrev)) { if (ids.includes(extraDataIDs.minModPrev) && ids.includes(extraDataIDs.minIntPrev)) { - updatePercentage(parameters, total); + await updatePercentage(parameters, total); } else { throw new Error('Missing parameter for update'); } } else if (ids.includes(extraDataIDs.urbPopPerc)) { - updatePair(parameters[0], extraDataIDs.rurPopPerc); + await updatePair(parameters[0], extraDataIDs.rurPopPerc); } else if (ids.includes(extraDataIDs.rurPopPerc)) { - updatePair(parameters[0], extraDataIDs.urbPopPerc); + await updatePair(parameters[0], extraDataIDs.urbPopPerc); } else if (ids.includes(extraDataIDs.urbAdultActPerc)) { - updatePair(parameters[0], extraDataIDs.urbAdultLowPerc); + await updatePair(parameters[0], extraDataIDs.urbAdultLowPerc); } else if (ids.includes(extraDataIDs.urbAdultLowPerc)) { - updatePair(parameters[0], extraDataIDs.urbAdultActPerc); + await updatePair(parameters[0], extraDataIDs.urbAdultActPerc); } else if (ids.includes(extraDataIDs.rurAdultActPerc)) { - updatePair(parameters[0], extraDataIDs.rurAdultLowPerc); + await updatePair(parameters[0], extraDataIDs.rurAdultLowPerc); } else if (ids.includes(extraDataIDs.rurAdultLowPerc)) { - updatePair(parameters[0], extraDataIDs.rurAdultActPerc); + await updatePair(parameters[0], extraDataIDs.rurAdultActPerc); } else { await DefaultExtraData.update( { value: parameters[0].value }, -- GitLab