#2023 - Ajout d'un champ adresse du candidat dans le formulaire de mini stage #2238
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ import { useDispatch } from "react-redux"; | |
| import { | ||
| ConventionId, | ||
| ConventionReadDto, | ||
| addressDtoToString, | ||
| domElementIds, | ||
| isConventionRenewed, | ||
| isStringDate, | ||
|
|
@@ -226,8 +227,17 @@ export const ConventionDocumentPage = ({ | |
| en qualité de <strong>bénéficiaire</strong> {""} | ||
| {beneficiary.isRqth && "reconnu en situation de handicap"} | ||
| <ul> | ||
| <li>tel. : {beneficiary.phone}</li> | ||
| <li>email : {beneficiary.email}</li> | ||
| {convention.internshipKind === "mini-stage-cci" && ( | ||
| <li> | ||
| adresse :{" "} | ||
| {convention.signatories.beneficiary.address && | ||
| addressDtoToString( | ||
| convention.signatories.beneficiary.address, | ||
| )} | ||
| </li> | ||
| )} | ||
| </ul> | ||
| </li> | ||
| {beneficiaryRepresentative && ( | ||
|
|
@@ -239,8 +249,8 @@ export const ConventionDocumentPage = ({ | |
| en qualité de{" "} | ||
| <strong>représentant(e) légal(e) du bénéficiaire</strong> | ||
| <ul> | ||
| <li>tel. : {beneficiaryRepresentative.phone}</li> | ||
| <li>email : {beneficiaryRepresentative.email}</li> | ||
| </ul> | ||
| </li> | ||
| )} | ||
|
|
@@ -254,9 +264,11 @@ export const ConventionDocumentPage = ({ | |
| {beneficiaryCurrentEmployer.businessName}{" "} | ||
| <strong>employant actuellement le bénéficiaire</strong> | ||
| <ul> | ||
| <li>tel. : {beneficiaryCurrentEmployer.phone}</li> | ||
| <li>email : {beneficiaryCurrentEmployer.email}</li> | ||
| <li> | ||
| adresse : {beneficiaryCurrentEmployer.businessAddress} | ||
| </li> | ||
| </ul> | ||
| </li> | ||
| )} | ||
|
|
@@ -269,8 +281,8 @@ export const ConventionDocumentPage = ({ | |
| en qualité de <strong>représentant de l'entreprise</strong>{" "} | ||
| {convention.businessName} | ||
| <ul> | ||
| <li>tel. : {establishmentRepresentative.phone}</li> | ||
| <li>email : {establishmentRepresentative.email}</li> | ||
| </ul> | ||
| </li> | ||
| )} | ||
|
|
@@ -482,7 +494,7 @@ export const ConventionDocumentPage = ({ | |
| {isStartingByVowel(convention.establishmentTutor.job) | ||
| ? `d'${convention.establishmentTutor.job}` | ||
| : `de ${convention.establishmentTutor.job}`}{" "} | ||
| (tel. : {convention.establishmentTutor.phone} | ||
| {convention.establishmentTutor.email !== | ||
| establishmentRepresentative.email && | ||
| `, mail: ${convention.establishmentTutor.email}`} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,8 @@ import { | |
| LevelOfEducation, | ||
| PeConnectIdentity, | ||
| ScheduleDto, | ||
| addressDtoToString, | ||
| addressStringToDto, | ||
| appellationCodeSchema, | ||
| errors, | ||
| isBeneficiaryStudent, | ||
|
|
@@ -163,6 +165,7 @@ const conventionToConventionInUrl = ( | |
| led: beneficiary.levelOfEducation, | ||
| schoolName: beneficiary.schoolName, | ||
| schoolPostcode: beneficiary.schoolPostcode, | ||
| address: beneficiary.address && addressDtoToString(beneficiary.address), | ||
| } | ||
| : undefined; | ||
|
|
||
|
|
@@ -273,6 +276,7 @@ export const conventionValuesFromUrl = { | |
| phone: param.query.optional.string, | ||
| financiaryHelp: param.query.optional.string, | ||
| led: param.query.optional.string, | ||
| address: param.query.optional.string, | ||
| schoolName: param.query.optional.string, | ||
| schoolPostcode: param.query.optional.string, | ||
| emergencyContact: param.query.optional.string, | ||
|
|
@@ -422,6 +426,7 @@ const conventionPresentationFromParams = ( | |
| emergencyContact: params.emergencyContact ?? "", | ||
| emergencyContactPhone: params.emergencyContactPhone ?? "", | ||
| emergencyContactEmail: params.emergencyContactEmail ?? "", | ||
| address: params.address ? addressStringToDto(params.address) : undefined, | ||
| levelOfEducation: (params.led as LevelOfEducation) ?? "", | ||
| schoolName: params.schoolName ?? "", | ||
| schoolPostcode: params.schoolPostcode ?? "", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -571,6 +571,12 @@ export class ConventionDtoBuilder implements Builder<ConventionDto> { | |
| levelOfEducation: "3ème", | ||
| schoolName: "École du quartier ouest", | ||
| schoolPostcode: "87000", | ||
| address: { | ||
| city: "Paris", | ||
| departmentCode: "75", | ||
| postcode: "75001", | ||
| streetNumberAndAddress: "1 rue de la paix", | ||
| }, | ||
| }, | ||
| }, | ||
| }); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import { keys } from "ramda"; | ||
| import { WithAcquisition } from "../acquisition.dto"; | ||
| import { AddressDto, Postcode } from "../address/address.dto"; | ||
| import { AgencyId, AgencyKind } from "../agency/agency.dto"; | ||
| import { Email } from "../email/email.dto"; | ||
| import { PeConnectIdentity } from "../federatedIdentities/federatedIdentity.dto"; | ||
|
|
@@ -224,6 +224,7 @@ type StudentProperties = { | |
| levelOfEducation: LevelOfEducation; | ||
| schoolName: string; | ||
| schoolPostcode: Postcode; | ||
| address?: AddressDto; | ||
| }; | ||
|
|
||
| export type Beneficiary<T extends InternshipKind> = | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -95,6 +95,7 @@ import { | |
| isTutorEmailDifferentThanBeneficiaryRelatedEmails, | ||
| minorBeneficiaryHasRepresentative, | ||
| mustBeSignedByEveryone, | ||
| shouldValidateBeneficiaryAddressAndParse, | ||
| startDateIsBeforeEndDate, | ||
| underMaxCalendarDuration, | ||
| } from "./conventionRefinements"; | ||
|
|
@@ -145,6 +146,14 @@ const studentBeneficiarySchema: z.Schema<Beneficiary<"mini-stage-cci">> = | |
| ), | ||
| schoolName: zStringMinLength1, | ||
| schoolPostcode: zStringMinLength1, | ||
| address: z | ||
| .object({ | ||
| streetNumberAndAddress: zStringCanBeEmpty, | ||
| postcode: zStringMinLength1, | ||
| departmentCode: zStringMinLength1, | ||
| city: zStringMinLength1, | ||
| }) | ||
| .optional(), | ||
| }), | ||
| ); | ||
|
|
||
|
|
@@ -354,6 +363,10 @@ export const conventionSchema: z.Schema<ConventionDto> = conventionCommonSchema | |
| .refine(mustBeSignedByEveryone, { | ||
| message: localization.mustBeSignedByEveryone, | ||
| path: [getConventionFieldName("status")], | ||
| }) | ||
| .refine(shouldValidateBeneficiaryAddressAndParse, { | ||
| message: localization.invalidBeneficiaryAddress, | ||
| path: [getConventionFieldName("signatories.beneficiary.address")], | ||
| }); | ||
|
|
||
| export const conventionReadSchema: z.Schema<ConventionReadDto> = | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,5 +1,6 @@ | ||||||
| import { differenceInYears } from "date-fns"; | ||||||
| import differenceInDays from "date-fns/differenceInDays"; | ||||||
| import { addressSchema } from "../address/address.schema"; | ||||||
| import { DateString } from "../utils/date"; | ||||||
| import { allSignatoriesSigned, getConventionFieldName } from "./convention"; | ||||||
| import { | ||||||
|
|
@@ -76,6 +77,22 @@ export const minorBeneficiaryHasRepresentative = ({ | |||||
| ); | ||||||
| }; | ||||||
|
|
||||||
| export const shouldValidateBeneficiaryAddressAndParse = ( | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| convention: ConventionDto, | ||||||
| ) => { | ||||||
| const ruleAppliesFrom = new Date("2024-09-30"); | ||||||
| const conventionWasSubmittedBeforeRuleApplies = | ||||||
| new Date(convention.dateSubmission).getTime() < ruleAppliesFrom.getTime(); | ||||||
| if ( | ||||||
| convention.internshipKind === "immersion" || | ||||||
| conventionWasSubmittedBeforeRuleApplies | ||||||
| ) | ||||||
| return true; | ||||||
|
|
||||||
| return addressSchema.safeParse(convention.signatories.beneficiary.address) | ||||||
| .success; | ||||||
| }; | ||||||
|
|
||||||
| const statusesAllowedWithoutSign: ConventionStatus[] = [ | ||||||
| "DRAFT", | ||||||
| "READY_TO_SIGN", | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -257,6 +257,7 @@ export const domElementIds = { | |
| emergencyContactEmail: | ||
| "im-convention-form__signatories-beneficiary-emergencyContactEmail", | ||
| isRqth: "im-convention-form__signatories-beneficiary-isRqth", | ||
| address: "im-convention-form__signatories-beneficiary-address", | ||
| }, | ||
| establishmentTutorSection: { | ||
| firstName: "im-convention-form__establishmentTutor-firstName", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,6 +38,8 @@ export const localization = { | |
| expectedBoolean: "La sélection d'une valeur (oui/non) est obligatoire", | ||
| expectText: "Une chaine de caractères est attendue", | ||
| expectRadioButtonSelected: "Veuillez sélectionner une option.", | ||
| invalidBeneficiaryAddress: | ||
| "L'adresse complète du candidat doit être renseignée.", | ||
| invalidDate: "Le format de la date saisie est invalide", | ||
| invalidDateEnd: "Le format de la date de fin est invalide", | ||
| invalidDateStart: "Le format de la date de début est invalide", | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
je n'ai pas trouvé d'autres moyens que ça pour pouvoir utiliser addressDtoToString
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
il y a déjà la condition
convention.internshipKind === "mini-stage-cci"juste en dessous (ligne 250), je pense que tu peux fusionner ton ajout avec