Merge pull request #24 from ciatph/dev

v1.0.5

Author: ciatph

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
  }
  }
 }

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
  }
  }
 }

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 <p> tags in NORMAL_COLUMN_NAMES.IMPACT to <li>
+ if ([ExcelTab.NORMAL_COLUMN_NAMES.IMPACT, ExcelTab.NORMAL_COLUMN_NAMES.IMPACT_TAGALOG]
+ .includes(ExcelTab.EXCEL_COLUMN_NAMES[key])
+ ) {
+ if (value.includes('<p>')) {
+ value = value.replace(/<p>/g, '<li>')
+ value = value.replace(/<\/p>/g, '</li>')
+ }
+ }
  break
  default: break
  }
@@ -63,6 +73,7 @@ module.exports.extractExcelData = (ExcelTab, excelFilePath) => {
  obj[ExcelTab.EXCEL_COLUMN_NAMES[key]] = value
  }
 
+ obj.id = list.length
  list.push(obj)
  }