diff --git a/src/01_recommendations/src/classes/specialtab.js b/src/01_recommendations/src/classes/specialtab.js index 6ae99fb..3c63ebb 100644 --- a/src/01_recommendations/src/classes/specialtab.js +++ b/src/01_recommendations/src/classes/specialtab.js @@ -12,8 +12,8 @@ class SpecialTab extends ExcelTabDefinition { this.EXCEL_COLUMN_NAMES = { 'Crop Stage': this.NORMAL_COLUMN_NAMES.CROP_STAGE, 'Farm Operation': this.NORMAL_COLUMN_NAMES.FARM_OPERATION, - __EMPTY: this.NORMAL_COLUMN_NAMES.IMPACT_TAGALOG, - 'SPECIAL WEATHER ADVISORY': this.NORMAL_COLUMN_NAMES.IMPACT + __EMPTY: this.NORMAL_COLUMN_NAMES.PRACTICE_TAGALOG, + 'SPECIAL WEATHER ADVISORY': this.NORMAL_COLUMN_NAMES.PRACTICE } } } diff --git a/src/01_recommendations/src/classes/tendaytab.js b/src/01_recommendations/src/classes/tendaytab.js index dc87417..0f0534e 100644 --- a/src/01_recommendations/src/classes/tendaytab.js +++ b/src/01_recommendations/src/classes/tendaytab.js @@ -12,8 +12,8 @@ class TendayTab extends ExcelTabDefinition { this.EXCEL_COLUMN_NAMES = { 'Crop Stage': this.NORMAL_COLUMN_NAMES.CROP_STAGE, 'Farm Operation': this.NORMAL_COLUMN_NAMES.FARM_OPERATION, - __EMPTY: this.NORMAL_COLUMN_NAMES.IMPACT_TAGALOG, - '10-DAY FWOA': this.NORMAL_COLUMN_NAMES.IMPACT + __EMPTY: this.NORMAL_COLUMN_NAMES.PRACTICE_TAGALOG, + '10-DAY FWOA': this.NORMAL_COLUMN_NAMES.PRACTICE } } } diff --git a/src/01_recommendations/src/extract.js b/src/01_recommendations/src/extract.js index 15d7fc7..8ccc09d 100644 --- a/src/01_recommendations/src/extract.js +++ b/src/01_recommendations/src/extract.js @@ -38,6 +38,16 @@ module.exports.extractExcelData = (ExcelTab, excelFilePath) => { if (ExcelTab.EXCEL_COLUMN_NAMES[key] === ExcelTab.NORMAL_COLUMN_NAMES.FORECAST) { value = ExcelTab.NORMAL_FORECAST_CODES[value] } + + // Change all
tags in NORMAL_COLUMN_NAMES.IMPACT to
')) { + value = value.replace(/
/g, '