Merge branch 'development' of https://github.com/hotosm/fmtm into fix…

…-refine-mbtiles-modal-design
hotosm · Nov 1, 2023 · 16a6888 · 16a6888
2 parents 1a381e3 + 42d77d6
commit 16a6888
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 20 deletions.
diff --git a/src/backend/app/projects/project_crud.py b/src/backend/app/projects/project_crud.py
@@ -1524,9 +1524,13 @@ def generate_appuser_files(
                 boundary = {"type": "Feature", "properties": {}, "geometry": outline}
                 data_extract = pg.execQuery(boundary)
                 filter = FilterData(xlsform)
-                filtered_data_extract = filter.cleanData(data_extract)
 
                 updated_data_extract = {"type": "FeatureCollection", "features": []}
+                filtered_data_extract = (
+                    filter.cleanData(data_extract)
+                    if data_extract
+                    else updated_data_extract
+                )
 
                 # Collect feature mappings for bulk insert
                 feature_mappings = []

diff --git a/src/frontend/src/components/common/Select.tsx b/src/frontend/src/components/common/Select.tsx
@@ -131,10 +131,10 @@ export const CustomSelect = ({
   errorMsg,
 }: ICustomSelect) => {
   return (
-    <div className="">
+    <div className="fmtm-w-full">
       <p className="fmtm-text-[1rem] fmtm-mb-2 fmtm-font-semibold ">{title}</p>
       <div className="fmtm-flex fmtm-items-end ">
-        <div className="fmtm-w-[14rem] ">
+        <div className="fmtm-w-full">
           <Select value={value} onValueChange={(value) => onValueChange(value)}>
             <SelectTrigger className="">
               <SelectValue placeholder={placeholder} />

diff --git a/src/frontend/src/components/createnewproject/ProjectDetailsForm.tsx b/src/frontend/src/components/createnewproject/ProjectDetailsForm.tsx
@@ -166,8 +166,8 @@ const ProjectDetailsForm = ({ flag }) => {
             </div>
           </div>
           <div className="md:fmtm-w-[50%] fmtm-flex fmtm-flex-col fmtm-gap-6">
-            <div>
-              <div className="fmtm-flex fmtm-items-center ">
+            <div className="">
+              <div className="fmtm-flex fmtm-items-center fmtm-max-w-[18rem]">
                 <CustomSelect
                   title="Organization Name"
                   placeholder="Organization Name"
@@ -179,7 +179,7 @@ const ProjectDetailsForm = ({ flag }) => {
                   onValueChange={(value) => handleCustomChange('organisation_id', value && +value)}
                 />
                 <AssetModules.AddIcon
-                  className="fmtm-bg-red-600 fmtm-text-white fmtm-rounded-full fmtm-mb-[0.15rem] hover:fmtm-bg-red-700 hover:fmtm-cursor-pointer fmtm-ml-5 fmtm-mt-4"
+                  className="fmtm-bg-red-600 fmtm-text-white fmtm-rounded-full fmtm-mb-[0.15rem] hover:fmtm-bg-red-700 hover:fmtm-cursor-pointer fmtm-ml-5 fmtm-mt-9"
                   onClick={() => createPopup('Create Organization', 'createOrganization?popup=true')}
                 />
               </div>

diff --git a/src/frontend/src/components/createnewproject/SelectForm.tsx b/src/frontend/src/components/createnewproject/SelectForm.tsx
@@ -85,7 +85,7 @@ const SelectForm = ({ flag, geojsonFile, customFormFile, setCustomFormFile }) =>
             onSubmit={handleSubmit}
             className="fmtm-flex fmtm-flex-col fmtm-gap-6 lg:fmtm-w-[40%] fmtm-justify-between"
           >
-            <div className="">
+            <div className="fmtm-w-[13.35rem]">
               <CustomSelect
                 title="Select form category"
                 placeholder="Select form category"

diff --git a/src/frontend/src/components/createnewproject/SplitTasks.tsx b/src/frontend/src/components/createnewproject/SplitTasks.tsx
@@ -94,7 +94,7 @@ const SplitTasks = ({ flag, geojsonFile, setGeojsonFile, customLineUpload, custo
             odk_central_password: projectDetails.odk_central_password,
           },
           // dont send xform_title if upload custom form is selected
-          xform_title: projectDetails.formWays === 'custom_form' ? null : projectDetails.formCategorySelection,
+          xform_title: projectDetails.formCategorySelection,
           dimension: projectDetails.dimension,
           splitting_algorithm: splitTasksSelection,
           form_ways: projectDetails.formWays,
@@ -136,10 +136,10 @@ const SplitTasks = ({ flag, geojsonFile, setGeojsonFile, customLineUpload, custo
         }),
       );
     } else if (splitTasksSelection === 'task_splitting_algorithm') {
-      const a = document.createElement('a');
-      a.href = URL.createObjectURL(drawnGeojsonFile);
-      a.download = 'test.json';
-      a.click();
+      // const a = document.createElement('a');
+      // a.href = URL.createObjectURL(drawnGeojsonFile);
+      // a.download = 'test.json';
+      // a.click();
       dispatch(
         TaskSplittingPreviewService(
           `${import.meta.env.VITE_API_URL}/projects/task_split`,

diff --git a/src/frontend/src/components/home/HomePageFilters.tsx b/src/frontend/src/components/home/HomePageFilters.tsx
@@ -130,13 +130,6 @@ const HomePageFilters = ({ onSearch, filteredProjectCount, totalProjectCount })
               ></input>
               <i className="material-icons">search</i>
             </div>
-            <AssetModules.FilterAltIcon
-              sx={{
-                fontSize: 25,
-                color: '#9B9999',
-                cursor: 'pointer',
-              }}
-            />
           </div>
           <div className="fmtm-flex fmtm-items-center fmtm-gap-2">
             <p>Show Map</p>
@@ -148,7 +141,7 @@ const HomePageFilters = ({ onSearch, filteredProjectCount, totalProjectCount })
         </div>
         <div className="fmtm-mt-6 fmtm-mb-1 fmtm-flex fmtm-items-center fmtm-justify-between">
           <p className="fmtm-text-[#A8A6A6]">
-            showing {filteredProjectCount} of {totalProjectCount} projects
+            Showing {filteredProjectCount} {filteredProjectCount > 1 ? 'projects' : 'project'}
           </p>
           {/* <div className="fmtm-flex fmtm-gap-1">
             <AssetModules.WindowIcon