Skip to content

v1.2.2 #67

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.

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 1 commit into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy to GitHub Pages
name: Deploy to Production Environment

# This workflow will trigger on any tag/release created on *any* branch
# Make sure to create tags/releases only from the "master" branch for consistency
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/pull-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,5 @@ jobs:
git checkout $LATEST_TAG
echo "LATEST_TAG=$LATEST_TAG" >> $GITHUB_ENV

- name: Create temporary env variables
run: cp docs/.env.example docs/.env

- name: Pull Development Image
run: docker compose -f docker-compose.dev.yml pull
5 changes: 5 additions & 0 deletions docs/pages/articles/provinces-municipalities.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ To enable the greyed-out municipalities, upload cropping calendars that follow t
```bash copy
/constant_data/diffs
```

<Callout type="info">
Also include municipalities with "blank" rows in the Excel cropping calendars if these do not have a commodity. The **"blank"** rows indicate **"no available"** commodity data for these municipalities.
</Callout>

</FAQBox>

## Regional Provinces / Municipalities Inconsistency
Expand Down
9 changes: 8 additions & 1 deletion docs/pages/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,11 @@ https://acaptutorials.github.io/assets-cms/posts/post/?id=Teo2m6os7LZtsEi0nGWw

The ACAP Development website contents are a continuous work in progress.

Given time and availability, code Maintainers (old and new) with access to the parent ACAP code repositories and are acquainted with its latest developments and updates will try to update this documentation website as frequently as possible to sync with the latest updates in the codebase.
Given time and availability, code Maintainers (old and new) with access to the parent ACAP code repositories and who are acquainted or actively involved with its latest developments and updates will try to update this documentation website as frequently as possible to sync with the latest updates in the codebase.

### Tutorials Maintainers

Maintainers with Collaborator access to this documentation code repository are:

- @dilapitan
- @acaptutorials (@ciatph)
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ACAP 1.0 uses a cropping calendar with only **one (1) group of crop stages**, su
### Crop Stage Codes and Labels

<Callout type="warning">
The **crop stage codes** should match with the **crop stage codes** defined in the [ACAP 1.0 crop recommendations](/post-installation/recommendations/recommendations-v1#data-format) raw Excel file to ensure the correct association of crop stages with target recommendations.
The **crop stage codes** should match with the **crop stage labels** defined in the [ACAP 1.0 crop recommendations](/post-installation/recommendations/recommendations-v1#data-format) raw Excel file to ensure the correct association of crop stages with target recommendations.
</Callout>

| Crop Stage Code | Crop Stage Label |
Expand Down
12 changes: 10 additions & 2 deletions docs/pages/post-installation/cropping-calendar/calendar-v2.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ Follow this [link](/post-installation/cropping-calendar/calendar-v1) to view cr

### Data Format

<Callout type="warning">
The latest updates for ACAP 2.1, starting with @commit **95a97cd** in the **acap-v2 dev** branch, use a new Cropping Calendar Excel template different from the ones mentioned on this page.

> These Cropping Calendars are only compatible up to @commit **ee49568** in the **acap-v2 dev** branch.

Kindly chat the ACAP group chat for more information about the new Cropping Calendar Excel file for ACAP 2.1.
</Callout>

ACAP 2.0 uses cropping calendars with _**two (2) groups/rows of crop stages**_ for each municipality supporting _**one (1) or more types of crops**_. View its raw EXCEL data files in the `/server/src/scripts/data/dataset_v2.0` directory for more information about its contents and data structure.

<FileTree>
Expand All @@ -36,7 +44,7 @@ ACAP 2.0 uses cropping calendars with _**two (2) groups/rows of crop stages**_ f
This section only displays the ACAP 2.0 crop stage codes and labels for the Rice and Corn crops.

<Callout type="warning">
The **crop stage codes** should match those defined in the [ACAP 2.0 crop recommendations](/post-installation/recommendations/recommendations-v2/#data-format) raw Excel files crop stages specific to target crops to ensure the correct association of crop stages with target recommendations.
The **crop stage codes** should match those defined in the [ACAP 2.0 crop recommendations](/post-installation/recommendations/recommendations-v2/#data-format) raw Excel files **crop stage labels** specific to target crops to ensure the correct association of crop stages with target recommendations.
</Callout>

<Callout>
Expand Down Expand Up @@ -73,7 +81,7 @@ Developers can add crop stages and labels for other crops, following the crop st
**ACAP 2.0** uploads its cropping calendars using an upload form on the **Cropping Calendars** page, requiring Admin login.

<Callout type="warning">
The **crop stage codes** should match those defined in the [ACAP 2.0 crop recommendations](/post-installation/recommendations/recommendations-v2/#data-format) raw Excel files crop stages specific to target crops to ensure the correct association of crop stages with target recommendations.
The **crop stage codes** should match those defined in the [ACAP 2.0 crop recommendations](/post-installation/recommendations/recommendations-v2/#data-format) raw Excel files **crop stage labels** specific to target crops to ensure the correct association of crop stages with target recommendations.

*Each municipality should have two (2) rows of crop stages each, following the format of the new cropping calendar Excel templates in the `/server/src/scripts/data/dataset_v2.0` directory.
</Callout>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ACAP 1.0 requires initial recommendations data in an Excel file, following the f
</FileTree>

<Callout type="warning">
The **crop stage codes** in the Excel columns should match the **crop stage codes** defined in the [ACAP 1.0 cropping calendar](/post-installation/cropping-calendar/calendar-v1##data-format) raw CSV file to ensure the correct association of crop stages with target recommendations.
The **crop stage labels** in the Excel columns should match the **crop stage codes** defined in the [ACAP 1.0 cropping calendar](/post-installation/cropping-calendar/calendar-v1#data-format) raw CSV file to ensure the correct association of crop stages with target recommendations.
</Callout>

## Upload Recommendations
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ Follow this [link](/post-installation/recommendations/recommendations-v1) to vi

## Data Format

<Callout type="warning">
The latest updates for ACAP 2.1, starting with @commit **95a97cd** in the **acap-v2 dev** branch, use a new Crop Recommendations Excel template different from the ones mentioned on this page.

> These Crop Recommendations are only compatible up to @commit **ee49568** in the **acap-v2 dev** branch.

Kindly chat the ACAP group chat for more information about the new Crop Recommendations Excel file for ACAP 2.1.
</Callout>

ACAP 2.0 uses recommendations data similar to the ACAP 1.0 raw data, added with climate risk information and exclusion of several Excel columns. View its raw EXCEL data files in the `/server/src/scripts/data/dataset_v2.0` directory to gain insight into its new contents and data structure.

The samples only display the ACAP 2.0 recommendations dataset for the Rice and Corn crops.
Expand All @@ -22,7 +30,7 @@ The samples only display the ACAP 2.0 recommendations dataset for the Rice and C
<FileTree.Folder name="scripts" defaultOpen>
<FileTree.Folder name="data" defaultOpen>
<FileTree.Folder name="dataset_v2" defaultOpen>
<FileTree.File name="rice_cropping_calendar.xlsx" />
<FileTree.File name="rice_recommendations_v4.xlsx" />
<FileTree.File name="corn_recommendations_v3.xlsx" />
</FileTree.Folder>
</FileTree.Folder>
Expand All @@ -32,7 +40,7 @@ The samples only display the ACAP 2.0 recommendations dataset for the Rice and C
</FileTree>

<Callout type="warning">
The **crop stage codes** should match the **crop stage codes** defined in the [ACAP 2.0 cropping calendar](/post-installation/cropping-calendar/calendar-v2#crop-stage-codes-and-labels) raw CSV files specific to target crops to ensure the correct association of crop stages with target recommendations.
The **crop stage labels** should match the **crop stage codes** defined in the [ACAP 2.0 cropping calendar](/post-installation/cropping-calendar/calendar-v2#crop-stage-codes-and-labels) Excel files specific to target crops to ensure the correct association of crop stages with target recommendations.
</Callout>

<Callout>
Expand All @@ -45,7 +53,7 @@ Developers can add crop stages and labels for other crops, following the crop st
**ACAP 2.0** uploads its recommendations dataset using an upload form on the **Manage Recommendations** page, requiring Admin login.

<Callout type="warning">
The **crop stage codes** should match the **crop stage codes** defined in the [ACAP 2.0 cropping calendar](/post-installation/cropping-calendar/calendar-v2#crop-stage-codes-and-labels) raw CSV files specific to target crops to ensure the correct association of crop stages with target recommendations.
The **crop stage labels** should match the **crop stage codes** defined in the [ACAP 2.0 cropping calendar](/post-installation/cropping-calendar/calendar-v2#crop-stage-codes-and-labels) Excel files specific to target crops to ensure the correct association of crop stages with target recommendations.
</Callout>

<Steps>
Expand Down
Loading