Merge pull request #313 from e-picsa/feat/seasonal-calendar-options

feat(seasonal-calendar): crop activities and images

apps/picsa-apps/extension-app/project.json

@@ -71,7 +71,7 @@
             "output": "assets/svgs/weather"
           },
           {
-            "glob": "*.svg",
+            "glob": "*",
             "input": "libs/data/crop_activity/svgs",
             "output": "assets/svgs/crop_activity"
           },

libs/data/crop_activity/index.ts

@@ -8,55 +8,46 @@ const CROP_ACTIVITY_BASE = {
   sowing: { label: translateMarker('Sowing') },
   watering: { label: translateMarker('Watering') },
   weeding: { label: translateMarker('Weeding') },
+  // updates
+  bagging: { label: translateMarker('bagging'), pngIcon: true },
+  banding: { label: translateMarker('banding') },
+  compost_manure_making: { label: translateMarker('compost manure making'), pngIcon: true },
+  harvesting: { label: translateMarker('harvesting') },
+  land_clearing: { label: translateMarker('land clearing') },
+  marketing_and_selling: { label: translateMarker('marketing and selling') },
+  mulching: { label: translateMarker('mulching'), pngIcon: true },
+  pesticide_apply: { label: translateMarker('apply pesticide') },
+  ploughing: { label: translateMarker('ploughing') },
+  post_harvest_handling: { label: translateMarker('post-harvest handling') },
+  shelling: { label: translateMarker('shelling'), pngIcon: true },
+  storage: { label: translateMarker('storage') },
+  threshing: { label: translateMarker('threshing'), pngIcon: true },
+  transport: { label: translateMarker('transport') },
+  value_addition: { label: translateMarker('value addition') },
+  // TODO - should ideally migrate budget and include mapped options
 } as const;
 
 // Extract list of available weather names
 type CropActivityName = keyof typeof CROP_ACTIVITY_BASE;
 export type ICropActivityDataEntry = typeof CROP_ACTIVITY_DATA[0];
 
 // TODO - migrate budget tool to use
-export const CROP_ACTIVITY_DATA = Object.entries(CROP_ACTIVITY_BASE).map(([id, { label }]) => {
-  const data: IPicsaDataWithIcons = {
-    assetIconPath: `assets/svgs/crop_activity/${id}.svg`,
-    svgIcon: id,
-  };
-  return {
-    id: id as CropActivityName,
-    label: label as string,
-    ...data,
-  };
-});
+export const CROP_ACTIVITY_DATA = Object.entries(CROP_ACTIVITY_BASE)
+  .map(([id, entry]) => {
+    const assetIconPath = `assets/svgs/crop_activity/${id}.svg`;
+    const data: IPicsaDataWithIcons = { assetIconPath, svgIcon: id };
+    // HACK - include png icons while pending new svgs
+    if (entry['pngIcon']) {
+      data.assetIconPath = `assets/svgs/crop_activity/${id}.png`;
+      data.svgIcon = '';
+    }
+    return {
+      id: id as CropActivityName,
+      label: entry.label as string,
+      ...data,
+    };
+  })
+  .sort((a, b) => (a.label.toLowerCase() > b.label.toLowerCase() ? 1 : -1));
 
+console.log({ CROP_ACTIVITY_DATA });
 export const CROP_ACTIVITY_HASHMAP = arrayToHashmap(CROP_ACTIVITY_DATA, 'id');
-
-// TODO - should ideally migrate budget and include mapped options
-/**
- [ 'build-housing',
-  'dipping',
-  'feeding-livestock',
-  'provide-supplements',
-  'provide-water',
-  'relocation',
-  'transport-livestock',
-  'vaccinate',
-  'apply-fertiliser',
-  'apply-pesticide',
-  'bagging',
-  'banding',
-  'compost-manure-making',
-  'harvesting',
-  'land-clearing',
-  'mulching',
-  'ploughing',
-  'post-harvest-handling',
-  'shelling',
-  'sowing',
-  'storage',
-  'threshing',
-  'transport',
-  'watering',
-  'weeding',
-  'marketing-and-selling',
-  'value-addition',
-  'purchase' ]
- */