Merge pull request #9 from julienbdx/dev

fix(frontend): Version 2.1.2
EsupPortail · Dec 4, 2024 · 0efcd6e · 0efcd6e
2 parents 0809c02 + 9fdf2b3
commit 0efcd6e
Show file tree

Hide file tree

Showing 11 changed files with 586 additions and 488 deletions.
diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -25,4 +25,6 @@ yarn-error.log*
 /.idea
 /.scannerwork
 
-compose.overrides.yml
+compose.overrides.yml
+
+/src/api/OpenApi.yml
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oasis",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "private": true,
   "dependencies": {
     "@ant-design/icons": "^5.5.1",

diff --git a/frontend/src/api/schema.d.ts b/frontend/src/api/schema.d.ts
@@ -1,12 +1,3 @@
-/*
- * Copyright (c) 2024. Esup - Université de Bordeaux
- *
- * This file is part of the Esup-Oasis project (https://github.com/EsupPortail/esup-oasis).
- * For full copyright and license information please view the LICENSE file distributed with the source code.
- *
- * @author Julien Lemonnier <[email protected]>
- */
-
 /**
  * This file was auto-generated by openapi-typescript.
  * Do not make direct changes to the file.
@@ -942,6 +933,11 @@ export interface paths {
       patch: operations["api_types_evenements_id_patch"];
    };
    "/types_evenements/{typeId}/taux": {
+      /**
+       * Retrieves the collection of TauxHoraire resources.
+       * @description Retrieves the collection of TauxHoraire resources.
+       */
+      get: operations["api_types_evenements_typeIdtaux_get_collection"];
       /**
        * Creates a TauxHoraire resource.
        * @description Creates a TauxHoraire resource.
@@ -11346,6 +11342,71 @@ export interface operations {
          };
       };
    };
+   /**
+    * Retrieves the collection of TauxHoraire resources.
+    * @description Retrieves the collection of TauxHoraire resources.
+    */
+   api_types_evenements_typeIdtaux_get_collection: {
+      parameters: {
+         query?: {
+            /** @description The collection page number */
+            page?: number;
+            /** @description The number of items per page */
+            itemsPerPage?: number;
+            date?: string;
+         };
+         path: {
+            /** @description TauxHoraire identifier */
+            typeId: string;
+         };
+      };
+      responses: {
+         /** @description TauxHoraire collection */
+         200: {
+            content: {
+               "application/ld+json": {
+                  "hydra:member": components["schemas"]["TauxHoraire.jsonld-taux.out"][];
+                  "hydra:totalItems"?: number;
+                  /**
+                   * @example {
+                   *   "@id": "string",
+                   *   "type": "string",
+                   *   "hydra:first": "string",
+                   *   "hydra:last": "string",
+                   *   "hydra:previous": "string",
+                   *   "hydra:next": "string"
+                   * }
+                   */
+                  "hydra:view"?: {
+                     /** Format: iri-reference */
+                     "@id"?: string;
+                     "@type"?: string;
+                     /** Format: iri-reference */
+                     "hydra:first"?: string;
+                     /** Format: iri-reference */
+                     "hydra:last"?: string;
+                     /** Format: iri-reference */
+                     "hydra:previous"?: string;
+                     /** Format: iri-reference */
+                     "hydra:next"?: string;
+                  };
+                  "hydra:search"?: {
+                     "@type"?: string;
+                     "hydra:template"?: string;
+                     "hydra:variableRepresentation"?: string;
+                     "hydra:mapping"?: {
+                        "@type"?: string;
+                        variable?: string;
+                        property?: string | null;
+                        required?: boolean;
+                     }[];
+                  };
+               };
+               "text/html": components["schemas"]["TauxHoraire-taux.out"][];
+            };
+         };
+      };
+   };
    /**
     * Creates a TauxHoraire resource.
     * @description Creates a TauxHoraire resource.

diff --git a/frontend/src/controls/AppLayout/AppLayout.scss b/frontend/src/controls/AppLayout/AppLayout.scss
@@ -33,6 +33,7 @@
   .user .ant-menu-title-content {
     padding: 0 !important;
   }
+
   .user .ant-menu-title-content, .recherche .ant-menu-title-content {
     background-color: $light-grey;
   }
@@ -86,6 +87,10 @@
     align-items: center;
   }
 
+  .ant-menu .recherche {
+    line-height: 1;
+  }
+
   .recherche.recherche-en-cours {
 
     .ant-menu-submenu-title {
@@ -155,6 +160,8 @@
   background: none;
 }
 
+
+
 .sider-trigger {
   background: transparent !important;
   color: $primary;
@@ -278,10 +285,15 @@
     vertical-align: middle !important;
   }
 
+  .ant-menu-submenu-title {
+    line-height: 52px;
+  }
+
   .user-space {
     font-size: 1rem;
     vertical-align: middle;
     font-weight: 400;
+    text-align: left;
 
     .ant-space-item {
       margin: 0;

diff --git a/frontend/src/controls/AppLayout/menuItems/MenuItemUtilisateur.tsx b/frontend/src/controls/AppLayout/menuItems/MenuItemUtilisateur.tsx
@@ -37,7 +37,7 @@ export const menuItemUtilisateur = (
       {
          key: "user",
          label: (
-            <Button type="text" className="bg-light-grey">
+            <Button type="text" className="bg-transparent">
                <LabelUtilisateurMenu
                   auth={auth}
                   apiFetching={apiFetching}

diff --git a/frontend/src/controls/Avatars/UtilisateurAvatarImage.tsx b/frontend/src/controls/Avatars/UtilisateurAvatarImage.tsx
@@ -74,7 +74,7 @@ export default function UtilisateurAvatarImage(props: {
             credentials: "include",
             cache: "force-cache",
             headers: {
-               Accept: "image/*",
+               Accept: "image/jpeg",
             },
          };
 

diff --git a/frontend/src/controls/Forms/TarifEvenementField.tsx b/frontend/src/controls/Forms/TarifEvenementField.tsx
@@ -26,9 +26,14 @@ export default function TarifEvenementField({
 }: ITarifEvenementFieldProps) {
    const { data: typesEvenements, isFetching: isFetchingTypeEvenement } =
       useApi().useGetCollection(PREFETCH_TYPES_EVENEMENTS);
-   const { data: taux } = useApi().useGetItem({
-      path: "/types_evenements/{typeId}/taux/{id}",
-      url: typesEvenements?.items.find((t) => t["@id"] === evenement.type)?.tauxActif as string,
+   const { data: taux } = useApi().useGetCollection({
+      path: "/types_evenements/{typeId}/taux",
+      parameters: {
+         typeId: evenement.type as string,
+      },
+      query: {
+         date: dayjs(evenement.debut).format("YYYY-MM-DD"),
+      },
       enabled:
          !!typesEvenements &&
          !!evenement.type &&
@@ -44,7 +49,7 @@ export default function TarifEvenementField({
       return <Skeleton active />;
    }
 
-   if (!taux || !taux?.montant) {
+   if (!taux || taux.items.length !== 1 || !taux.items[0].montant) {
       return (
          <p className="text-warning">
             Pas de taux horaire défini actuellement pour les évènements de la catégorie "
@@ -61,12 +66,12 @@ export default function TarifEvenementField({
                addonAfter={<div style={{ width: 55 }}>€</div>}
                placeholder="0,00"
                className="text-center text-primary semi-bold"
-               value={montantToString((dureeTotale / 60).toString(), taux?.montant)}
+               value={montantToString((dureeTotale / 60).toString(), taux.items[0].montant)}
             />
             <div className="legende">
                Tarif horaire des évènements de la catégorie "
                {typesEvenements?.items.find((t) => t["@id"] === evenement.type)?.libelle}"&nbsp;:{" "}
-               {taux?.montant || "?"}
+               {taux.items[0].montant || "?"}
                &nbsp;€ / heure
             </div>
          </>
@@ -75,7 +80,7 @@ export default function TarifEvenementField({
 
    return (
       <Space>
-         <span>{montantToString((dureeTotale / 60).toString(), taux?.montant)}</span>
+         <span>{montantToString((dureeTotale / 60).toString(), taux.items[0].montant)}</span>
          <span>€</span>
       </Space>
    );

diff --git a/frontend/src/controls/Progress/ProgressAffectation.tsx b/frontend/src/controls/Progress/ProgressAffectation.tsx
@@ -25,14 +25,15 @@ interface IProgressAffectation {
  */
 export default function ProgressAffectation({ evenements }: IProgressAffectation): ReactElement {
    return useMemo(() => {
+      const evts = evenements.filter((e) => !e.dateAnnulation)
       const taux =
          evenements.length === 0
             ? 100
             : Math.round(
                  (100 *
-                    evenements.filter((e) => !e.dateAnnulation).filter((e) => e.isAffecte())
+                     evts.filter((e) => e.isAffecte())
                        .length) /
-                    evenements.length,
+                 evts.length,
               );
 
       return (

diff --git a/frontend/src/controls/Table/DemandeTableFilters.tsx b/frontend/src/controls/Table/DemandeTableFilters.tsx
@@ -193,24 +193,6 @@ export function DemandeTableFilters(props: {
                            />
                         </Col>
 
-                        <Col xs={24} sm={24} md={6}>
-                           <Space direction="vertical" size={0}>
-                              <span aria-label="Campagne archivée">Campagne archivée</span>
-                           </Space>
-                        </Col>
-                        <Col xs={24} sm={24} md={18}>
-                           <Switch
-                              checked={props.filtreDemande.archivees}
-                              onChange={(checked) => {
-                                 props.setFiltreDemande((prev) => ({
-                                    ...prev,
-                                    archivees: checked,
-                                    page: 1,
-                                 }));
-                              }}
-                           />
-                        </Col>
-
                         <Col xs={24} sm={24} md={6}>
                            <Space direction="vertical" size={0}>
                               <span aria-label="Chargés d'accompagnement">
@@ -324,6 +306,26 @@ export function DemandeTableFilters(props: {
                               Seules les formations ayant au moins un demandeur sont proposées.
                            </div>
                         </Col>
+
+                        <Col xs={24} sm={24} md={6}>
+                           <Space direction="vertical" size={0}>
+                              <span aria-label="Afficher les campagnes archivées">
+                                 Afficher campagnes archivées
+                              </span>
+                           </Space>
+                        </Col>
+                        <Col xs={24} sm={24} md={18}>
+                           <Switch
+                              checked={props.filtreDemande.archivees}
+                              onChange={(checked) => {
+                                 props.setFiltreDemande((prev) => ({
+                                    ...prev,
+                                    archivees: checked,
+                                    page: 1,
+                                 }));
+                              }}
+                           />
+                        </Col>
                      </Row>
                   </>
                ),

diff --git a/frontend/src/versions.ts b/frontend/src/versions.ts
@@ -49,6 +49,10 @@ export const VERSIONS: IVersion[] = [
             description: `Amélioration de l'accessibilité / police Lexend`,
             type: "add",
          },
+         {
+            description: "Filtre campagnes archivées",
+            type: "add",
+         },
       ],
    },
    {