Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hel 657/fix retours #605

Merged
merged 11 commits into from
Dec 5, 2024
Merged

Hel 657/fix retours #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9614098
Feat/recherche avancee (#602)
maeturki Nov 28, 2024
0275f88
vesrion upgrade 1.2.0 -> 1.3.0
maeturki Nov 28, 2024
bb3ab1d
fix zone geo label
schlaifa Dec 4, 2024
16e9b13
add flux qualite to gitignore
schlaifa Dec 5, 2024
93538f0
delete flux qualite folders
schlaifa Dec 5, 2024
9c68964
fix merge conflicts
schlaifa Dec 5, 2024
163e08f
fix typescript issues
schlaifa Dec 5, 2024
c70c6ce
Merge branch 'feat/recherche-avancee' into Hel-657/fix-retours
schlaifa Dec 5, 2024
83d6758
fix bugs terme not initialized and delete zone geo from query
schlaifa Dec 5, 2024
85b5898
implement exception for communes with arrondissements
schlaifa Dec 5, 2024
c2a0cfd
fix merge conflicts
schlaifa Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/backend/infrastructure/gateways/recherche-loader/TypeOrmRechercheLoader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,15 @@ export class TypeOrmRechercheLoader implements RechercheLoader {

if (zoneParam) {
if (typeZone === "C") {
conditions.push("recherche.commune = :commune");
parameters = { ...parameters, commune: zoneParam };
// Afficher toute la ville pour les villes avec arrondissements: Paris, Marseille et Lyon
if (zoneParam === "LYON" || zoneParam === "MARSEILLE" || zoneParam === "PARIS") {
conditions.push("recherche.commune like :commune");
parameters = { ...parameters, commune: `%${zoneParam}%` };
}
else {
conditions.push("recherche.commune = :commune");
parameters = { ...parameters, commune: zoneParam };
}
}
if (typeZone === "D") {
conditions.push("recherche.departement = :departement");
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/ui/recherche-avancee/FiltreZoneGeographique.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ export const FiltreZoneGeographique = () => {
setZoneGeoType("");
rechercheAvanceeContext?.setZoneGeoType("");
setSuggestions([]);
rechercheAvanceeContext?.setZoneGeoLabel;
rechercheAvanceeContext?.setZoneGeoLabel("");
};

const applyZoneGeoValue = () => {
Expand Down
4 changes: 1 addition & 3 deletions src/frontend/ui/recherche-avancee/RechecheAvanceeFormulaire.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ import styles from "./RechercheAvanceeFormulaire.module.css";
type RechercheAvanceeFormulaireProps = Readonly<{
lancerLaRecherche: (event: MouseEvent<HTMLButtonElement>) => void;
rechercheOnChange: (event: ChangeEvent<HTMLInputElement>) => void;
terme: string | undefined;
}>;

export const RechercheAvanceeFormulaire = ({ terme, lancerLaRecherche, rechercheOnChange }: RechercheAvanceeFormulaireProps) => {
export const RechercheAvanceeFormulaire = ({ lancerLaRecherche, rechercheOnChange }: RechercheAvanceeFormulaireProps) => {
const { wording } = useDependencies();
const rechercheAvanceeContext = useContext(RechercheAvanceeContext);
const [disableCapaciter, setDisableCapaciter] = useState<boolean>(false);
Expand Down Expand Up @@ -87,7 +86,6 @@ export const RechercheAvanceeFormulaire = ({ terme, lancerLaRecherche, recherche
onChange={rechercheOnChange}
placeholder="Rechercher un numéro FINESS ou le nom d'un établissement"
type="search"
value={terme}
/>
<button className="fr-btn" onClick={lancerLaRecherche} title="Rechercher" type="button">
{wording.RECHERCHE_LABEL}
Expand Down
5 changes: 2 additions & 3 deletions src/pages/recherche-avancee.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export default function RechercheAvancee(props: ExtendedRésultatDeRecherche) {
estCeQueLaRechercheEstLancee,
lancerLaRecherche,
rechercheOnChange,
terme,
resultats,
nombreRésultats,
page,
Expand All @@ -48,7 +47,7 @@ export default function RechercheAvancee(props: ExtendedRésultatDeRecherche) {

return (
<main className="fr-container">
<RechercheAvanceeFormulaire lancerLaRecherche={lancerLaRecherche} rechercheOnChange={rechercheOnChange} terme={terme} />
<RechercheAvanceeFormulaire lancerLaRecherche={lancerLaRecherche} rechercheOnChange={rechercheOnChange} />
{estCeQueLesRésultatsSontReçus && Number(nombreRésultats) === 0 && !estCeEnAttente && <PasResultatRechercheAvancee />}
{nombreRésultats > 0 && !estCeEnAttente && (
<ResultatRechercheAvancee data={resultats} lastPage={lastPage} nombreRésultats={nombreRésultats} page={page || 1} setPage={setPage} />
Expand All @@ -72,7 +71,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext): Pr
capacite_medico_sociaux: capaciteMedicoSociaux = [],
capacite_handicap: capaciteHandicap = [],
capacite_agees: capaciteAgees = [],
order = "",
order = "ASC",
order_by: orderBy = "",
},
} = context;
Expand Down
Loading