fix

handlers/application/beneficiaries.go

@@ -369,17 +369,21 @@ func (h *ApplicationHandler) BeneficiarySolidarityDisplay(w http.ResponseWriter,
 
 	solidarity_bookings_list, err := h.services.GRPC.SolidarityService.GetBookingsByStatus(context.TODO(), solidarity_booking)
 
-	var bookings []any
+	if err != nil {
-
-	for _, o := range solidarity_bookings_list.Booking {
-		bookings = append(bookings, o)
-	}
-		if err != nil {
 		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
+		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
+	var bookings []any
+
+	for _, o := range solidarity_bookings_list.Booking {
+		if(o.PickupDate != nil){
+			bookings = append(bookings, o)
+
+		}
+	}
+	
 	h.Renderer.BeneficiarySolidarityDisplay(w, r , accountssolidarity , bookings)
 
 }

renderer/beneficiaries.go

@@ -99,7 +99,6 @@ func (renderer *Renderer) BeneficiarySolidarityDisplay(w http.ResponseWriter, r
 	state.ViewState = map[string]any{
 		"beneficiary":              beneficiary,
 		"bookingSolidarity" : solidarity_bookings_list,
-
 	}
 	fmt.Println(solidarity_bookings_list)
 	renderer.Render("beneficiaries_display", w, r, files, state)

renderer/func-maps.go

@@ -25,6 +25,20 @@ func TimeFrom(d any) *time.Time {
 	return nil
 }
 
+func TimestampFrom(d any) *time.Time {
+
+	if date, ok := d.(time.Time); ok {
+		return &date
+	} else if date, ok := d.(string); ok {
+		datetime, err := time.Parse("2006-01-02T15:04:05Z", date)
+		if err != nil {
+			panic(err)
+		}
+		return &datetime
+	}
+	return nil
+}
+
 func TimeFormat(d any, f string) string {
 	date := TimeFrom(d)
 	if date == nil {