Merge pull request #227 from wri/main

[MERGE] merge 'main' into 'staging' post HH release
wri · May 30, 2024 · f3ba18b · f3ba18b
2 parents 883d999 + 27fee21
commit f3ba18b
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 18 deletions.
diff --git a/...nents/ResourceTabs/InformationTab/components/ProjectInformationAside/HighLevelMetrics.tsx b/...nents/ResourceTabs/InformationTab/components/ProjectInformationAside/HighLevelMetrics.tsx
@@ -26,12 +26,12 @@ const HighLevelMetics: FC = () => {
           </Labeled>
         </When>
         <When condition={record?.framework_key === "ppc"}>
-          <Labeled label="Workdays Created" sx={inlineLabelSx}>
-            <NumberField source="workday_count" emptyText="0" />
-          </Labeled>
-          <Labeled label="Self Reported Workdays Created" sx={inlineLabelSx}>
+          <Labeled label="Workdays Created (Old Calculation)" sx={inlineLabelSx}>
             <NumberField source="self_reported_workday_count" emptyText="0" />
           </Labeled>
+          <Labeled label="Workdays Created (New Calculation)" sx={inlineLabelSx}>
+            <NumberField source="workday_count" emptyText="0" />
+          </Labeled>
         </When>
         <Labeled label="Trees Planted" sx={inlineLabelSx}>
           <NumberField source="trees_planted_count" emptyText="0" />

diff --git a/...mponents/ResourceTabs/InformationTab/components/SiteInformationAside/HighLevelMetrics.tsx b/...mponents/ResourceTabs/InformationTab/components/SiteInformationAside/HighLevelMetrics.tsx
@@ -24,12 +24,12 @@ const HighLevelMetics: FC = () => {
       <Box paddingX={3.75} paddingY={2}>
         <Stack gap={3}>
           <When condition={isPPC}>
-            <Labeled label="Total Number Of Workdays Created" sx={inlineLabelSx}>
-              <NumberField source="workday_count" emptyText="0" />
-            </Labeled>
-            <Labeled label="Self Reported Workdays Created" sx={inlineLabelSx}>
+            <Labeled label="Workdays Created (Old Calculation)" sx={inlineLabelSx}>
               <NumberField source="self_reported_workday_count" emptyText="0" />
             </Labeled>
+            <Labeled label="Workdays Created (New Calculation)" sx={inlineLabelSx}>
+              <NumberField source="workday_count" emptyText="0" />
+            </Labeled>
           </When>
           <Labeled label="Total Number Of Trees Planted" sx={inlineLabelSx}>
             <NumberField source="trees_planted_count" emptyText="0" />

diff --git a/src/components/elements/Cards/ProjectCard/ProjectCard.tsx b/src/components/elements/Cards/ProjectCard/ProjectCard.tsx
@@ -56,6 +56,12 @@ const ProjectCard = ({ project, onDelete, title, children, className, ...rest }:
     );
   };
 
+  const frameworkNames: { [key: string]: string } = {
+    ppc: "Priceless Planet Coalition",
+    hbf: "Harit Bharat Fund",
+    terrafund: "TerraFund"
+  };
+
   return (
     <Paper {...rest} className={classNames(className, "p-0")}>
       <div className="flex items-center gap-4 border-b border-neutral-100 px-8 py-6">
@@ -72,11 +78,7 @@ const ProjectCard = ({ project, onDelete, title, children, className, ...rest }:
           <div className="flex">
             <Text variant="text-bold-subtitle-500">{t("Framework")}:&#160;</Text>
             <Text variant="text-light-subtitle-400" className="capitalize">
-              {project.framework_key === "ppc"
-                ? t("Priceless Planet Coalition")
-                : project.framework_key === "terrafund"
-                ? t("TerraFund")
-                : project.framework_key}
+              {frameworkNames[project.framework_key] ? t(frameworkNames[project.framework_key]) : project.framework_key}
             </Text>
           </div>
           <div className="flex">

diff --git a/src/pages/nursery/[uuid]/index.page.tsx b/src/pages/nursery/[uuid]/index.page.tsx
@@ -96,7 +96,7 @@ const NurseryDetailPage = () => {
           nursery.framework_key === "ppc"
             ? t("Priceless Planet Coalition")
             : nursery.framework_key === "hbf"
-            ? "HBF"
+            ? "Harit Bharat Fund"
             : t("TerraFund")
         ]}
         hasBackButton={false}

diff --git a/src/pages/project/[uuid]/index.page.tsx b/src/pages/project/[uuid]/index.page.tsx
@@ -109,7 +109,7 @@ const ProjectDetailPage = () => {
           isPPC
             ? t("Priceless Planet Coalition")
             : isHBF
-            ? "HBF"
+            ? "Harit Bharat Fund"
             : isTerrafund
             ? t("TerraFund")
             : reportingFramework.name

diff --git a/src/pages/project/[uuid]/tabs/Overview.tsx b/src/pages/project/[uuid]/tabs/Overview.tsx
@@ -52,7 +52,11 @@ const ProjectOverviewTab = ({ project }: ProjectOverviewTabProps) => {
           <div className="flex w-full flex-wrap gap-6">
             <If condition={isPPC}>
               <Then>
-                <GoalProgressCard label={t("Workday (PPC)")} value={project.workday_count} className="w-[170px]" />
+                <GoalProgressCard
+                  label={t("Workday (PPC)")}
+                  value={project.self_reported_workday_count}
+                  className="w-[170px]"
+                />
               </Then>
               <Else>
                 <GoalProgressCard

diff --git a/src/pages/site/[uuid]/index.page.tsx b/src/pages/site/[uuid]/index.page.tsx
@@ -81,7 +81,7 @@ const SiteDetailPage = () => {
 
   const subtitles = [
     `${t("Organisation")}: ${site.organisation?.name}`,
-    isPPC ? t("Priceless Planet Coalition") : isHBF ? "HBF" : t("TerraFund")
+    isPPC ? t("Priceless Planet Coalition") : isHBF ? "Harit Bharat Fund" : t("TerraFund")
   ];
   if (isPPC) {
     subtitles.push(t("Site ID: {id}", { id: site.ppc_external_id }));

diff --git a/src/pages/site/[uuid]/tabs/Overview.tsx b/src/pages/site/[uuid]/tabs/Overview.tsx
@@ -90,7 +90,11 @@ const SiteOverviewTab = ({ site }: SiteOverviewTabProps) => {
         >
           <div className="flex w-full flex-wrap gap-6">
             <When condition={isPPC}>
-              <GoalProgressCard label={t("Workday Count (PPC)")} value={site.workday_count} className="w-[170px]" />
+              <GoalProgressCard
+                label={t("Workday Count (PPC)")}
+                value={site.self_reported_workday_count}
+                className="w-[170px]"
+              />
             </When>
             <GoalProgressCard
               label={t("Hectares Restored Goal")}