Skip to content

v1.0.5 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 13, 2023
Merged

v1.0.5 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db5eef3
feat: Change all <p> tags to <li> under the impact outlooks column, #21
ciatph Jan 11, 2023
eeb9c9c
chore: Replace the normal column names from impact to practice*
ciatph Jan 11, 2023
bb0ab96
Merge pull request #22 from ciatph/feature/ciatph-21
ciatph Jan 11, 2023
7c5664f
chore: Add a numeric ID to each recommendation row
ciatph Jan 13, 2023
a2d42a5
Merge pull request #23 from ciatph/feature/ciatph-21
ciatph Jan 13, 2023
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
4 changes: 2 additions & 2 deletions src/01_recommendations/src/classes/specialtab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/01_recommendations/src/classes/tendaytab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Expand Down
11 changes: 11 additions & 0 deletions src/01_recommendations/src/extract.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -63,6 +73,7 @@ module.exports.extractExcelData = (ExcelTab, excelFilePath) => {
obj[ExcelTab.EXCEL_COLUMN_NAMES[key]] = value
}

obj.id = list.length
list.push(obj)
}

Expand Down