From 56386a58bdf3f636d94f31079826410b62d68b99 Mon Sep 17 00:00:00 2001
From: satellitestudiodesign <juancarlos@satellitestud.io>
Date: Sat, 16 Nov 2024 13:00:52 +0100
Subject: [PATCH 1/7] mark 'soloSinAsignar' on by default

---
 src/app/casos-activos/solicitudes/index.tsx |  2 +-
 src/app/casos-activos/solicitudes/page.tsx  | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/app/casos-activos/solicitudes/index.tsx b/src/app/casos-activos/solicitudes/index.tsx
index 369270f..9a35de4 100644
--- a/src/app/casos-activos/solicitudes/index.tsx
+++ b/src/app/casos-activos/solicitudes/index.tsx
@@ -44,7 +44,7 @@ export function Solicitudes({ data, count }: SolicitudesProps) {
     urgencia: searchParams.get('urgencia') || 'todas',
     tipoAyuda: searchParams.get('tipoAyuda') || 'todas',
     pueblo: searchParams.get('pueblo') || 'todos',
-    soloSinAsignar: searchParams.get('soloSinAsignar') || 'false',
+    soloSinAsignar: searchParams.get('soloSinAsignar') || 'true',
   });
 
   const updateFilter = useCallback(
diff --git a/src/app/casos-activos/solicitudes/page.tsx b/src/app/casos-activos/solicitudes/page.tsx
index 4c6aac7..2e556c6 100644
--- a/src/app/casos-activos/solicitudes/page.tsx
+++ b/src/app/casos-activos/solicitudes/page.tsx
@@ -28,8 +28,8 @@ const getData = async (supabase: SupabaseClient<Database>, filters: FiltersData)
     .eq('type', 'necesita')
     .neq('status', 'finished');
 
-  // Solo agregar filtro si es true
-  if (filters.soloSinAsignar !== undefined && filters.soloSinAsignar === 'true') {
+  // Solo agregar filtro si es true o no se especificó
+  if (filters.soloSinAsignar === undefined || filters.soloSinAsignar === 'true') {
     query.eq('assignments_count', 0);
   }
 
@@ -44,19 +44,22 @@ const getData = async (supabase: SupabaseClient<Database>, filters: FiltersData)
 
 const getCount = async (supabase: SupabaseClient<Database>, filters: FiltersData) => {
   const query = supabase
-    .from('help_requests_with_assignment_count')
-    .select('id', { count: 'exact' })
-    .eq('type', 'necesita');
-  // Solo agregar filtro si es true
-  if (filters.soloSinAsignar !== undefined && filters.soloSinAsignar === 'true') {
-    query.eq('assignments_count', 0);
+  .from('help_requests_with_assignment_count')
+  .select('id', { count: 'exact' })
+  .eq('type', 'necesita')
+  .neq('status', 'finished');
+  
+  // Solo agregar filtro si es true o no se especificó
+  if (filters.soloSinAsignar === undefined || filters.soloSinAsignar === 'true') {
+    query.eq('assignments_count', 0);    
   }
   const { count: solicitaCount, error: solicitaError } = await query;
 
   const { count: ofreceCount, error: ofreceError } = await supabase
     .from('help_requests')
     .select('id', { count: 'exact' })
-    .eq('type', 'ofrece');
+    .eq('type', 'ofrece')
+    .neq('status', 'finished');
 
   if (solicitaError) {
     throw new Error('Error fetching solicita:', solicitaError);

From 87d89ce156ab1ed533dca4956e6f66c609c5911c Mon Sep 17 00:00:00 2001
From: satellitestudiodesign <juancarlos@satellitestud.io>
Date: Sat, 16 Nov 2024 13:00:59 +0100
Subject: [PATCH 2/7] fix "Volver" button spacing on mobile

---
 src/app/solicitudes/[id]/page.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/solicitudes/[id]/page.tsx b/src/app/solicitudes/[id]/page.tsx
index 037fc3b..2bbd656 100644
--- a/src/app/solicitudes/[id]/page.tsx
+++ b/src/app/solicitudes/[id]/page.tsx
@@ -40,7 +40,7 @@ export default function CasoDetalle() {
   }
   if (data === null) {
     return (
-      <div className="space-y-6 mx-auto max-w-7xl px-4 sm:px-6">
+      <div className="mt-14 sm:mt-0 space-y-6 mx-auto max-w-7xl px-4 sm:px-6">
         <div className="flex justify-start">
           <button
             className="flex flex-row items-center px-4 py-2 bg-gray-200 text-gray-700 rounded hover:bg-gray-300"
@@ -57,7 +57,7 @@ export default function CasoDetalle() {
     );
   }
   return (
-    <div className="space-y-6 mx-auto max-w-7xl px-4 sm:px-6">
+    <div className="mt-14 sm:mt-0 space-y-6 mx-auto max-w-7xl px-4 sm:px-6">
       <div className="flex justify-start">
         <button
           className="flex flex-row items-center px-4 py-2 bg-gray-200 text-gray-700 rounded hover:bg-gray-300"

From df0e41719338686d484c2296d9d6e5135bf9a10d Mon Sep 17 00:00:00 2001
From: satellitestudiodesign <juancarlos@satellitestud.io>
Date: Sat, 16 Nov 2024 13:10:32 +0100
Subject: [PATCH 3/7] fix "Pueblo" filter

---
 src/app/casos-activos/solicitudes/index.tsx | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/app/casos-activos/solicitudes/index.tsx b/src/app/casos-activos/solicitudes/index.tsx
index 9a35de4..213dd29 100644
--- a/src/app/casos-activos/solicitudes/index.tsx
+++ b/src/app/casos-activos/solicitudes/index.tsx
@@ -71,25 +71,29 @@ export function Solicitudes({ data, count }: SolicitudesProps) {
 
   useEffect(() => {
     const filters: DataFilter[] = [];
+    let preFilteredData = data;
     if (filtersData.search) {
       filters.push({
         keys: ['description'],
         value: filtersData.search,
       });
     }
-    if (filtersData.pueblo && filtersData.pueblo !== 'todos') {
-      const town = towns.find((t) => t.id === parseInt(filtersData.pueblo));
-      filters.push({ keys: ['location'], value: town?.name || '' });
-    }
     if (filtersData.urgencia && filtersData.urgencia !== 'todas') {
       filters.push({ keys: ['urgency'], value: filtersData.urgencia });
     }
     if (filtersData.tipoAyuda && filtersData.tipoAyuda !== 'todas') {
       filters.push({ keys: ['help_type'], value: filtersData.tipoAyuda });
     }
-    const preFilteredData = isStringTrue(filtersData.soloSinAsignar)
-      ? data.filter((d) => d.asignees_count === 0)
-      : data;
+
+    if (filtersData.pueblo && filtersData.pueblo !== 'todos') {
+      const town = towns.find((t) => t.id === parseInt(filtersData.pueblo));
+      preFilteredData = town ? data.filter((d) => d.town_id === town.id) : data;
+    }
+
+    if(filtersData.soloSinAsignar === undefined || isStringTrue(filtersData.soloSinAsignar)) {
+      preFilteredData = data.filter((d) => d.asignees_count === 0);
+    }
+    
     setDataFiltered(getDataFiltered(preFilteredData, filters));
   }, [data, filtersData, towns]);
 

From 9896e5311182416dd3ba28b3c1a1f32c39604a49 Mon Sep 17 00:00:00 2001
From: satellitestudiodesign <juancarlos@satellitestud.io>
Date: Sat, 16 Nov 2024 13:16:58 +0100
Subject: [PATCH 4/7] make filter additive

---
 src/app/casos-activos/solicitudes/index.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/casos-activos/solicitudes/index.tsx b/src/app/casos-activos/solicitudes/index.tsx
index 213dd29..9ee3326 100644
--- a/src/app/casos-activos/solicitudes/index.tsx
+++ b/src/app/casos-activos/solicitudes/index.tsx
@@ -87,13 +87,15 @@ export function Solicitudes({ data, count }: SolicitudesProps) {
 
     if (filtersData.pueblo && filtersData.pueblo !== 'todos') {
       const town = towns.find((t) => t.id === parseInt(filtersData.pueblo));
-      preFilteredData = town ? data.filter((d) => d.town_id === town.id) : data;
+      if(town) {
+        preFilteredData = preFilteredData.filter((d) => d.town_id === town.id);
+      }
     }
 
-    if(filtersData.soloSinAsignar === undefined || isStringTrue(filtersData.soloSinAsignar)) {
-      preFilteredData = data.filter((d) => d.asignees_count === 0);
+    if(isStringTrue(filtersData.soloSinAsignar)) {
+      preFilteredData = preFilteredData.filter((d) => d.asignees_count === 0);
     }
-    
+
     setDataFiltered(getDataFiltered(preFilteredData, filters));
   }, [data, filtersData, towns]);
 

From 1d4726693c9ef0911a0bccb10c42d64e710d735c Mon Sep 17 00:00:00 2001
From: satellitestudiodesign <juancarlos@satellitestud.io>
Date: Sat, 16 Nov 2024 13:26:21 +0100
Subject: [PATCH 5/7] tweak

---
 src/app/solicitudes/[id]/page.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/solicitudes/[id]/page.tsx b/src/app/solicitudes/[id]/page.tsx
index 2bbd656..e7ab8f7 100644
--- a/src/app/solicitudes/[id]/page.tsx
+++ b/src/app/solicitudes/[id]/page.tsx
@@ -40,10 +40,10 @@ export default function CasoDetalle() {
   }
   if (data === null) {
     return (
-      <div className="mt-14 sm:mt-0 space-y-6 mx-auto max-w-7xl px-4 sm:px-6">
+      <div className="space-y-6 mx-auto max-w-7xl px-4 sm:px-6">
         <div className="flex justify-start">
           <button
-            className="flex flex-row items-center px-4 py-2 bg-gray-200 text-gray-700 rounded hover:bg-gray-300"
+            className="ml-10 sm:ml-4 flex flex-row items-center px-4 py-2 bg-gray-200 text-gray-700 rounded hover:bg-gray-300"
             onClick={() => history.back()}
           >
             <ArrowLeft className="w-4 h-4 mr-2" />
@@ -57,10 +57,10 @@ export default function CasoDetalle() {
     );
   }
   return (
-    <div className="mt-14 sm:mt-0 space-y-6 mx-auto max-w-7xl px-4 sm:px-6">
+    <div className="space-y-6 mx-auto max-w-7xl px-4 sm:px-6">
       <div className="flex justify-start">
         <button
-          className="flex flex-row items-center px-4 py-2 bg-gray-200 text-gray-700 rounded hover:bg-gray-300"
+          className="ml-10 sm:ml-4 flex flex-row items-center px-4 py-2 bg-gray-200 text-gray-700 rounded hover:bg-gray-300"
           onClick={() => history.back()}
         >
           <ArrowLeft className="w-4 h-4 mr-2" />

From dad7c75559154c8ce32964f2d80d16246d2b4e07 Mon Sep 17 00:00:00 2001
From: satellitestudiodesign <juancarlos@satellitestud.io>
Date: Sat, 16 Nov 2024 13:32:50 +0100
Subject: [PATCH 6/7] test logs

---
 src/app/casos-activos/solicitudes/index.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/casos-activos/solicitudes/index.tsx b/src/app/casos-activos/solicitudes/index.tsx
index 9ee3326..9533cac 100644
--- a/src/app/casos-activos/solicitudes/index.tsx
+++ b/src/app/casos-activos/solicitudes/index.tsx
@@ -72,6 +72,8 @@ export function Solicitudes({ data, count }: SolicitudesProps) {
   useEffect(() => {
     const filters: DataFilter[] = [];
     let preFilteredData = data;
+    console.log('data:', data)
+    console.log('filtersData:', filtersData)
     if (filtersData.search) {
       filters.push({
         keys: ['description'],

From 64d01f30e66107606bd8da0f4a1efa0eff798537 Mon Sep 17 00:00:00 2001
From: satellitestudiodesign <juancarlos@satellitestud.io>
Date: Sat, 16 Nov 2024 13:59:11 +0100
Subject: [PATCH 7/7] remove logs

---
 src/app/casos-activos/solicitudes/index.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/casos-activos/solicitudes/index.tsx b/src/app/casos-activos/solicitudes/index.tsx
index 9533cac..9ee3326 100644
--- a/src/app/casos-activos/solicitudes/index.tsx
+++ b/src/app/casos-activos/solicitudes/index.tsx
@@ -72,8 +72,6 @@ export function Solicitudes({ data, count }: SolicitudesProps) {
   useEffect(() => {
     const filters: DataFilter[] = [];
     let preFilteredData = data;
-    console.log('data:', data)
-    console.log('filtersData:', filtersData)
     if (filtersData.search) {
       filters.push({
         keys: ['description'],