fix (createNewProject): updateContents - project setup description up…

…dated (#968)
hotosm · Nov 6, 2023 · 6016e60 · 6016e60
1 parent f252b35
commit 6016e60
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 16 deletions.
diff --git a/src/frontend/src/components/createnewproject/DataExtract.tsx b/src/frontend/src/components/createnewproject/DataExtract.tsx
@@ -90,9 +90,19 @@ const DataExtract = ({ flag, customLineUpload, setCustomLineUpload, customPolygo
       <div className="fmtm-bg-white lg:fmtm-w-[20%] xl:fmtm-w-[17%] fmtm-px-5 fmtm-py-6">
         <h6 className="fmtm-text-xl fmtm-font-[600] fmtm-pb-2 lg:fmtm-pb-6">Data Extract</h6>
         <p className="fmtm-text-gray-500 lg:fmtm-flex lg:fmtm-flex-col lg:fmtm-gap-3">
-          <span>Fill in your project basic information such as name, description, hashtag, etc. </span>
-          <span>To complete the first step, you will need the account credentials of ODK central server.</span>{' '}
-          <span>Here are the instructions for setting up a Central ODK Server on Digital Ocean.</span>
+          <span>
+            You may choose to use the default OSM data extracts as your feature types to perform the field survey
+          </span>
+          <span>The relevant data extracts that exist on OSM are imported based on your AOI.</span>
+          <span>
+            You can use these data extracts to use the select_from_map functionality from ODK that allows you the mapper
+            to select the existing feature and conduct field mapping survey
+          </span>
+          <span>
+            In contrast to OSM data extracts, you can also upload custom data extracts around the AOI to conduct the
+            field mapping survey.
+          </span>
+          <span>Note: The custom data extracts shall follow the defined data standards.</span>
         </p>
       </div>
       <div className="lg:fmtm-w-[80%] xl:fmtm-w-[83%] lg:fmtm-h-[60vh] xl:fmtm-h-[58vh] fmtm-bg-white fmtm-px-5 lg:fmtm-px-11 fmtm-py-6 lg:fmtm-overflow-y-scroll lg:scrollbar">

diff --git a/src/frontend/src/components/createnewproject/ProjectDetailsForm.tsx b/src/frontend/src/components/createnewproject/ProjectDetailsForm.tsx
@@ -81,12 +81,16 @@ const ProjectDetailsForm = ({ flag }) => {
       <div className="fmtm-bg-white xl:fmtm-w-[17%] fmtm-px-5 fmtm-py-6">
         <h6 className="fmtm-text-xl fmtm-font-[600] fmtm-pb-2 lg:fmtm-pb-6">Project Details</h6>
         <p className="fmtm-text-gray-500 lg:fmtm-flex lg:fmtm-flex-col lg:fmtm-gap-3">
-          <span>Fill in your project basic information such as name, description, hashtag, etc. </span>
-          <span>To complete the first step, you will need the account credentials of ODK central server.</span>{' '}
-          <span>Here are the instructions for setting up a Central ODK Server on Digital Ocean.</span>
+          <span>
+            Fill in your project basic information such as name, description, hashtag, etc. This captures essential
+            information about your project.
+          </span>
+          <span>To complete the first step, you will need the login credentials of ODK Central Server.</span>{' '}
+          <span>
+            Here are the instructions for setting up a Central ODK Server on Digital Ocean, if you haven’t already.
+          </span>
         </p>
       </div>
-
       <form
         className="xl:fmtm-w-[83%] lg:fmtm-h-[60vh] xl:fmtm-h-[58vh] fmtm-bg-white fmtm-px-11 fmtm-py-6 lg:fmtm-overflow-y-scroll lg:scrollbar"
         onSubmit={handleSubmit}

diff --git a/src/frontend/src/components/createnewproject/SelectForm.tsx b/src/frontend/src/components/createnewproject/SelectForm.tsx
@@ -74,9 +74,8 @@ const SelectForm = ({ flag, geojsonFile, customFormFile, setCustomFormFile }) =>
       <div className="fmtm-bg-white lg:fmtm-w-[20%] xl:fmtm-w-[17%] fmtm-px-5 fmtm-py-6">
         <h6 className="fmtm-text-xl fmtm-font-[600] fmtm-pb-2 lg:fmtm-pb-6">Select Form</h6>
         <p className="fmtm-text-gray-500 lg:fmtm-flex lg:fmtm-flex-col lg:fmtm-gap-3">
-          <span>Fill in your project basic information such as name, description, hashtag, etc. </span>
-          <span>To complete the first step, you will need the account credentials of ODK central server.</span>{' '}
-          <span>Here are the instructions for setting up a Central ODK Server on Digital Ocean.</span>
+          <span>You may choose to either use the default XLS form defined in FMTM or upload a custom XLS form.</span>
+          <span>You may learn more about XLSforms here.</span>{' '}
         </p>
       </div>
       <div className="lg:fmtm-w-[80%] xl:fmtm-w-[83%] lg:fmtm-h-[60vh] xl:fmtm-h-[58vh] fmtm-bg-white fmtm-px-5 lg:fmtm-px-11 fmtm-py-6 lg:fmtm-overflow-y-scroll lg:scrollbar">

diff --git a/src/frontend/src/components/createnewproject/SplitTasks.tsx b/src/frontend/src/components/createnewproject/SplitTasks.tsx
@@ -269,9 +269,13 @@ const SplitTasks = ({ flag, geojsonFile, setGeojsonFile, customLineUpload, custo
           <div className="fmtm-bg-white lg:fmtm-w-[20%] xl:fmtm-w-[17%] fmtm-px-5 fmtm-py-6">
             <h6 className="fmtm-text-xl fmtm-font-[600] fmtm-pb-2 lg:fmtm-pb-6">Split Tasks</h6>
             <p className="fmtm-text-gray-500 lg:fmtm-flex lg:fmtm-flex-col lg:fmtm-gap-3">
-              <span>Fill in your project basic information such as name, description, hashtag, etc. </span>
-              <span>To complete the first step, you will need the account credentials of ODK central server.</span>{' '}
-              <span>Here are the instructions for setting up a Central ODK Server on Digital Ocean.</span>
+              <span>You may choose how to divide an area into tasks for field mapping</span>
+              <span>Divide area on squares split the AOI into squares based on user’s input in dimensions</span>
+              <span>Choose area as task creates the number of tasks based on number of polygons in AOI</span>
+              <span>
+                Task splitting algorithm splits an entire AOI into smallers tasks based on linear networks (road, river)
+                followed by taking into account the input of number of average buildings per task
+              </span>
             </p>
           </div>
           <div className="lg:fmtm-w-[80%] xl:fmtm-w-[83%] lg:fmtm-h-[60vh] xl:fmtm-h-[58vh] fmtm-bg-white fmtm-px-5 lg:fmtm-px-11 fmtm-py-6 lg:fmtm-overflow-y-scroll lg:scrollbar">

diff --git a/src/frontend/src/components/createnewproject/UploadArea.tsx b/src/frontend/src/components/createnewproject/UploadArea.tsx
@@ -114,11 +114,15 @@ const UploadArea = ({ flag, geojsonFile, setGeojsonFile }) => {
       <div className="fmtm-bg-white lg:fmtm-w-[20%] xl:fmtm-w-[17%] fmtm-px-5 fmtm-py-6">
         <h6 className="fmtm-text-xl fmtm-font-[600] fmtm-pb-2 lg:fmtm-pb-6">Upload Area</h6>
         <p className="fmtm-text-gray-500 lg:fmtm-flex lg:fmtm-flex-col lg:fmtm-gap-3">
-          <span>Fill in your project basic information such as name, description, hashtag, etc. </span>
-          <span>To complete the first step, you will need the account credentials of ODK central server.</span>{' '}
-          <span>Here are the instructions for setting up a Central ODK Server on Digital Ocean.</span>
+          <span>You can choose to upload the AOI. Note: The file upload only supports .geojson format. </span>
+          <div>
+            <p>You may also draw a freehand polygon on map interface.</p>{' '}
+            <p>Click on the reset button to redraw the AOI.</p>
+          </div>
+          <span>The total area of the AOI is also calculated and displayed on the screen.</span>
         </p>
       </div>
+
       <div className="lg:fmtm-w-[80%] xl:fmtm-w-[83%] lg:fmtm-h-[60vh] xl:fmtm-h-[58vh] fmtm-bg-white fmtm-px-5 lg:fmtm-px-11 fmtm-py-6 lg:fmtm-overflow-y-scroll lg:scrollbar">
         <div className="fmtm-w-full fmtm-flex fmtm-gap-6 md:fmtm-gap-14 fmtm-flex-col md:fmtm-flex-row fmtm-h-full">
           <form