Commit b9070552 authored by FORESTIER Fabien's avatar FORESTIER Fabien
Browse files

Separate checkboxes for CGU acceptation and for information process acceptation + update rgpd text

parent c8990cf3
Pipeline #4348 passed with stage
in 3 minutes and 20 seconds
......@@ -211,30 +211,26 @@
<input id="consent" class="is-checkradio" type="checkbox" formControlName="consent">
<label for="consent" class="label consent-label checkbox-label">
<p>
<span i18n="@@consent.withoutCGU">By checking this box, I accept the processing of the information
<span i18n="@@consent.withoutCGU">I accept the processing of the information
entered in this form to respond to my request.</span><span class="required-field">*</span>
</p>
</label>
<p class="consent-text" i18n="@@consent.text">
Fields with an asterisk (*) are mandatory. Information in these fields will be
processed to respond to your request. Recipients of this information
are the metropolitan departments in charge of processing your
request. In compliance with the “Digital Technology and Freedom” law dated
January 6, 1978, you have the right to access and rectify information that
concerns you. To exercise this right and be transfered the information concerning
you, please contact: Lyon Métropole - Direction des
Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal
mail
or using the appropriate form on this portal. You may also oppose processing of
your personal data for a legitimate reason. In this case, we will not be able to
process the request submitted using this form.
</p>
<div class="form-incorrect-field-message" *ngIf="fieldIsInvalid('consent')">
<div *ngIf="consent.errors['required']" i18n="@@consent.error">
You must accept the general terms of use and the processing of the information entered in this form to
You must accept the processing of the information entered in this form to
respond to your request.
</div>
</div>
<p class="consent-text" i18n="@@consent.text">
Fields with an asterisk (*) are mandatory. Information in these fields will be processed to respond to
your request. The data is kept for a period of 12 months. Recipients of this
information are the metropolitan departments in charge of processing your request. In compliance with the
“Digital Technology and Freedom” law dated January 6, 1978, you have the right to access and rectify
information that concerns you. To exercise this right, please contact: Lyon Métropole - Direction des
Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal
mail. You may also oppose processing of your personal data for a legitimate reason. In this case, we will
not be able to process the request submitted using this form.
</p>
</div>
</div>
</div>
......
......@@ -96,7 +96,7 @@
[tabindex]="isExpended ? 0 : -1">
<label for="consent-feedback" class="label checkbox-label feedback-consent">
<p>
<span i18n="@@consent.withoutCGU">By checking this box, I accept the processing of the information
<span i18n="@@consent.withoutCGU">I accept the processing of the information
entered in this form to respond to my request.</span><span class="required-field">*</span>
</p>
</label>
......@@ -110,18 +110,14 @@
</div>
<p class="is-small consent-text" i18n="@@consent.text" *ngIf="feedbackHasEmail">
Fields with an asterisk (*) are mandatory. Information in these fields will be
processed to respond to your request. Recipients of this information
are the metropolitan departments in charge of processing your
request. In compliance with the “Digital Technology and Freedom” law dated
January 6, 1978, you have the right to access and rectify information that
concerns you. To exercise this right and be transfered the information concerning
you, please contact: Lyon Métropole - Direction des
Fields with an asterisk (*) are mandatory. Information in these fields will be processed to respond to
your request. The data is kept for a period of 12 months. Recipients of this
information are the metropolitan departments in charge of processing your request. In compliance with the
“Digital Technology and Freedom” law dated January 6, 1978, you have the right to access and rectify
information that concerns you. To exercise this right, please contact: Lyon Métropole - Direction des
Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal
mail
or using the appropriate form on this portal. You may also oppose processing of
your personal data for a legitimate reason. In this case, we will not be able to
process the request submitted using this form.
mail. You may also oppose processing of your personal data for a legitimate reason. In this case, we will
not be able to process the request submitted using this form.
</p>
</form>
</div>
......
......@@ -124,12 +124,12 @@
<label class="label" for="password"><span i18n="@@signup.password">Password </span><span
class="required-field">*</span></label>
<div class="password-rule">
<span class="not-bold" i18n="@@signup.password.rule.intro">Your password must contain at least</span>:
<span class="not-bold" i18n="@@signup.password.rule.intro">Your password must contain at least</span>:
<span i18n="@@signup.password.rule.length">{{ passwordMinLength }} characters</span>
, <span i18n="@@signup.password.rule.special">one special character</span>,
<span i18n="@@signup.password.rule.uppercase">one uppercased character</span>,
<span i18n="@@signup.password.rule.lowercase">one lowercased character</span>
<span class="not-bold" i18n="@@signup.password.rule.and"> and </span>
, <span i18n="@@signup.password.rule.special">one special character</span>,
<span i18n="@@signup.password.rule.uppercase">one uppercased character</span>,
<span i18n="@@signup.password.rule.lowercase">one lowercased character</span>
<span class="not-bold" i18n="@@signup.password.rule.and"> and </span>
<span i18n="@@signup.password.rule.number">one number</span>.
</div>
<p class="control has-icons-right">
......@@ -267,38 +267,49 @@
</div>
</div>
<div class="column is-12">
<div class="field">
<input id="cgu" class="is-checkradio" type="checkbox" formControlName="cgu">
<label for="cgu" class="label checkbox-label">
<p>
<span i18n="@@cgu.partOne">I accept the</span><a i18n="@@cgu.partTwo"
[routerLink]="['/', AppRoutes.cgu.uri]"> general terms of use.</a>
<span class="required-field">*</span>
</p>
</label>
<div class="form-incorrect-field-message" *ngIf="fieldIsInvalid('cgu')">
<div *ngIf="cgu.errors['required']" i18n="@@cgu.error">
You must accept the general terms of use.
</div>
</div>
</div>
</div>
<div class="column is-12">
<div class="field">
<input id="consent" class="is-checkradio" type="checkbox" formControlName="consent">
<label for="consent" class="label checkbox-label consent-label">
<p>
<span i18n="@@consent.partOne">By checking this box, I accept the</span><a i18n="@@consent.partTwo"
[routerLink]="['/', AppRoutes.cgu.uri]"> general terms of use </a>
<span i18n="@@consent.partThree">and the processing of the information entered in this form to respond
to
my request.</span><span class="required-field">*</span>
<span i18n="@@consent.withoutCGU">I accept the processing of the information
entered in this form to respond to my request.</span><span class="required-field">*</span>
</p>
</label>
<p class="consent-text" i18n="@@consent.text">
Fields with an asterisk (*) are mandatory. Information in these fields will be
processed to respond to your request. Recipients of this information
are the metropolitan departments in charge of processing your
request. In compliance with the “Digital Technology and Freedom” law dated
January 6, 1978, you have the right to access and rectify information that
concerns you. To exercise this right and be transfered the information concerning
you, please contact: Lyon Métropole - Direction des
Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal
mail
or using the appropriate form on this portal. You may also oppose processing of
your personal data for a legitimate reason. In this case, we will not be able to
process the request submitted using this form.
</p>
<div class="form-incorrect-field-message" *ngIf="fieldIsInvalid('consent')">
<div *ngIf="consent.errors['required']" i18n="@@consent.error">
You must accept the general terms of use and the processing of the information entered in this form to
You must accept the processing of the information entered in this form to
respond to your request.
</div>
</div>
<p class="consent-text" i18n="@@consent.text">
Fields with an asterisk (*) are mandatory. Information in these fields will be processed to respond to
your request. The data is kept for a period of 12 months. Recipients of this
information are the metropolitan departments in charge of processing your request. In compliance with the
“Digital Technology and Freedom” law dated January 6, 1978, you have the right to access and rectify
information that concerns you. To exercise this right, please contact: Lyon Métropole - Direction des
Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal
mail. You may also oppose processing of your personal data for a legitimate reason. In this case, we will
not be able to process the request submitted using this form.
</p>
</div>
</div>
......
import { HttpErrorResponse } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
import { FormGroup, FormBuilder, Validators, AbstractControl } from '@angular/forms';
import { NotificationService } from '../../../../core/services';
import { Notification } from '../../../../core/models';
import { UserService } from '../../../services';
import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
import { Router } from '@angular/router';
import { environment } from '../../../../../environments/environment';
import { ValidatePassword } from '../../../validators/password.validator';
import { LegacyAccount } from '../../../models';
import { notificationMessages, pageTitles } from '../../../../../i18n/traductions';
import { Notification } from '../../../../core/models';
import { NotificationService } from '../../../../core/services';
import { AppRoutes } from '../../../../routes';
import { HttpErrorResponse } from '@angular/common/http';
import { IPageHeaderInfo } from '../../../../shared/models';
import { LegacyAccount } from '../../../models';
import { UserService } from '../../../services';
import { ValidatePassword } from '../../../validators/password.validator';
@Component({
selector: 'app-sign-up',
......@@ -54,7 +54,7 @@ export class SignUpComponent implements OnInit {
zipcode: [''],
city: [''],
country: [''],
// cgu: [false, Validators.requiredTrue],
cgu: [false, Validators.requiredTrue],
consent: [false, Validators.requiredTrue],
});
}
......@@ -75,7 +75,7 @@ export class SignUpComponent implements OnInit {
get zipcode() { return this.form.get('zipcode'); }
get city() { return this.form.get('city'); }
get contry() { return this.form.get('contry'); }
// get cgu() { return this.form.get('cgu'); }
get cgu() { return this.form.get('cgu'); }
get consent() { return this.form.get('consent'); }
get formDisabled(): boolean {
......
......@@ -128,34 +128,28 @@
<div class="column is-12">
<div class="field">
<input id="consent" class="is-checkradio" type="checkbox" formControlName="consent">
<label for="consent" class="label consent-label checkbox-label">
<label for="consent" class="label checkbox-label consent-label">
<p>
<span i18n="@@consent.partOne">By checking this box, I accept the</span><a i18n="@@consent.partTwo"
[routerLink]="['/', AppRoutes.cgu.uri]"> general terms of use </a>
<span i18n="@@consent.partThree">and the processing of the information entered in this form to respond to
my request.</span><span class="required-field">*</span>
<span i18n="@@consent.withoutCGU">I accept the processing of the information
entered in this form to respond to my request.</span><span class="required-field">*</span>
</p>
</label>
<p class="consent-text" i18n="@@consent.text">
Fields with an asterisk (*) are mandatory. Information in these fields will be
processed to respond to your request. Recipients of this information
are the metropolitan departments in charge of processing your
request. In compliance with the “Digital Technology and Freedom” law dated
January 6, 1978, you have the right to access and rectify information that
concerns you. To exercise this right and be transfered the information concerning
you, please contact: Lyon Métropole - Direction des
Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal
mail
or using the appropriate form on this portal. You may also oppose processing of
your personal data for a legitimate reason. In this case, we will not be able to
process the request submitted using this form.
</p>
<div class="form-incorrect-field-message" *ngIf="fieldIsInvalid(userInfoUpdateForm, 'consent')">
<div class="form-incorrect-field-message" *ngIf="fieldIsInvalid(userInfoUpdateForm,'consent')">
<div *ngIf="consent.errors['required']" i18n="@@consent.error">
You must accept the general terms of use and the processing of the information entered in this form to
You must accept the processing of the information entered in this form to
respond to your request.
</div>
</div>
<p class="consent-text" i18n="@@consent.text">
Fields with an asterisk (*) are mandatory. Information in these fields will be processed to respond to
your request. The data is kept for a period of 12 months. Recipients of this
information are the metropolitan departments in charge of processing your request. In compliance with the
“Digital Technology and Freedom” law dated January 6, 1978, you have the right to access and rectify
information that concerns you. To exercise this right, please contact: Lyon Métropole - Direction des
Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal
mail. You may also oppose processing of your personal data for a legitimate reason. In this case, we will
not be able to process the request submitted using this form.
</p>
</div>
</div>
......
import { Component, OnInit } from '@angular/core';
import { FormGroup, Validators, FormBuilder } from '@angular/forms';
import { LegacyAccount } from '../../../models';
import { UserService } from '../../../services';
import { NotificationService } from '../../../../core/services';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { Router } from '@angular/router';
import { finalize } from 'rxjs/operators';
import { notificationMessages } from '../../../../../i18n/traductions';
import { NotificationService } from '../../../../core/services';
import { AppRoutes } from '../../../../routes';
import { Router } from '@angular/router';
import { LegacyAccount } from '../../../models';
import { UserService } from '../../../services';
@Component({
selector: 'app-user-info',
......@@ -185,11 +185,11 @@ export class UserInfoComponent implements OnInit {
);
}
// If the error received is an authentication error then redirect to the login page
// If the error received is an authentication error then redirect to the login page
// because only authenticated users are supposed to access this component
handle401(err) {
if (err && err.status === 401) {
this._router.navigate(['/', AppRoutes.signin.uri]);
this._router.navigate(['/', AppRoutes.signin.uri]);
}
}
......
......@@ -1204,49 +1204,43 @@ Here is the list of the last evolutions of the portal. If you wish to contribute
<source>Learn more</source>
<target>Learn more</target>
</trans-unit>
<trans-unit id="consent.partOne" datatype="html">
<source>By checking this box, I accept the</source>
<target>By checking this box, I accept the</target>
<trans-unit id="cgu.partOne" datatype="html">
<source>I accept the</source>
<target>I accept the</target>
</trans-unit>
<trans-unit id="consent.partTwo" datatype="html">
<source>general terms of use</source>
<target> general terms of use </target>
</trans-unit>
<trans-unit id="consent.partThree" datatype="html">
<source>and the processing of the information entered in this form to respond to my request.</source>
<target>and the processing of the information entered in this form to respond to my request.</target>
<trans-unit id="cgu.partTwo" datatype="html">
<source>general terms of use.</source>
<target> general terms of use.</target>
</trans-unit>
<trans-unit id="consent.withoutCGU" datatype="html">
<source>By checking this box, I accept the processing of the information entered in this form to respond to my request.</source>
<target>By checking this box, I accept the processing of the information entered in this form to respond to my request.</target>
<source>I accept the processing of the information entered in this form to respond to my request.</source>
<target>I accept the processing of the information entered in this form to respond to my request.</target>
</trans-unit>
<trans-unit id="consent.text" datatype="html">
<source>Fields with an asterisk (*) are mandatory. Information in these fields will be
processed to respond to your request. Recipients of this information
are the metropolitan departments in charge of processing your
request. In compliance with the “Digital Technology and Freedom” law dated
January 6, 1978, you have the right to access and rectify information that
concerns you. To exercise this right and be transfered the information concerning
you, please contact: Lyon Métropole - Direction des
Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail
or using the appropriate form on this portal. You may also oppose processing of
your personal data for a legitimate reason. In this case, we will not be able to
process the request submitted using this form.</source>
<target>Fields with an asterisk (*) are mandatory. Information in these fields will be
processed to respond to your request. Recipients of this information
are the metropolitan departments in charge of processing your
request. In compliance with the “Digital Technology and Freedom” law dated
January 6, 1978, you have the right to access and rectify information that
concerns you. To exercise this right and be transfered the information concerning
you, please contact: Lyon Métropole - Direction des
Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail
or using the appropriate form on this portal. You may also oppose processing of
your personal data for a legitimate reason. In this case, we will not be able to
process the request submitted using this form.</target>
<source>Fields with an asterisk (*) are mandatory. Information in these fields will be processed to respond to
your request. The data is kept for a period of 12 months. Recipients of this
information are the metropolitan departments in charge of processing your request. In compliance with the
“Digital Technology and Freedom” law dated January 6, 1978, you have the right to access and rectify
information that concerns you. To exercise this right, please contact: Lyon Métropole - Direction des
Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal
mail. You may also oppose processing of your personal data for a legitimate reason. In this case, we will
not be able to process the request submitted using this form.</source>
<target>Fields with an asterisk (*) are mandatory. Information in these fields will be processed to respond to
your request. The data is kept for a period of 12 months. Recipients of this
information are the metropolitan departments in charge of processing your request. In compliance with the
“Digital Technology and Freedom” law dated January 6, 1978, you have the right to access and rectify
information that concerns you. To exercise this right, please contact: Lyon Métropole - Direction des
Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal
mail. You may also oppose processing of your personal data for a legitimate reason. In this case, we will
not be able to process the request submitted using this form.</target>
</trans-unit>
<trans-unit id="consent.error" datatype="html">
<source>You must accept the general terms of use and the processing of the information entered in this form to respond to your request.</source>
<target>You must accept the general terms of use and the processing of the information entered in this form to respond to your request.</target>
<source>You must accept the processing of the information entered in this form to respond to your request.</source>
<target>You must accept the processing of the information entered in this form to respond to your request.</target>
</trans-unit>
<trans-unit id="cgu.error" datatype="html">
<source>You must accept the general terms of use.</source>
<target>You must accept the general terms of use.</target>
</trans-unit>
<trans-unit id="page404.oops" datatype="html">
<source>Oops</source>
......
......@@ -1213,48 +1213,37 @@ Voici la liste des dernières évolutions du portail. Si vous souhaitez contribu
<source>Learn more</source>
<target>En savoir plus</target>
</trans-unit>
<trans-unit id="consent.partOne" datatype="html">
<source>By checking this box, I accept the</source>
<target>En cochant cette case j'accepte les</target>
<trans-unit id="cgu.partOne" datatype="html">
<source>I accept the</source>
<target>J'accepte les</target>
</trans-unit>
<trans-unit id="consent.partTwo" datatype="html">
<source>general terms of use</source>
<target> conditions générales d'utilisation </target>
</trans-unit>
<trans-unit id="consent.partThree" datatype="html">
<source>and the processing of the information entered in this form to respond to my request.</source>
<target>et que les informations saisies dans ce formulaire soient traitées pour répondre à ma demande.</target>
<trans-unit id="cgu.partTwo" datatype="html">
<source>general terms of use.</source>
<target> conditions générales d'utilisation.</target>
</trans-unit>
<trans-unit id="consent.withoutCGU" datatype="html">
<source>By checking this box, I accept the processing of the information entered in this form to respond to my request.</source>
<target>En cochant cette case, j'accepte que les informations saisies dans ce formulaire soient traitées pour répondre à ma demande.</target>
<source>I accept the processing of the information entered in this form to respond to my request.</source>
<target>J'accepte que les informations saisies dans ce formulaire soient traitées pour répondre à ma demande.</target>
</trans-unit>
<trans-unit id="consent.text" datatype="html">
<source>Fields with an asterisk (*) are mandatory. Information in these fields will be
processed to respond to your request. Recipients of this information
are the metropolitan departments in charge of processing your
request. In compliance with the “Digital Technology and Freedom” law dated
January 6, 1978, you have the right to access and rectify information that
concerns you. To exercise this right and be transfered the information concerning
you, please contact: Lyon Métropole - Direction des
Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail
or using the appropriate form on this portal. You may also oppose processing of
your personal data for a legitimate reason. In this case, we will not be able to
process the request submitted using this form.</source>
<target>Les champs suivi d'un astérisque (*) sont obligatoires. Les informations contenues dans ces champs font
l’objet d’un traitement informatisé destiné à répondre à votre demande. Les destinataires des informations
sont les services communaux et métropolitains en charge du traitement de votre demande. Conformément à la
loi "informatique et libertés" du 6 janvier 1978 modifiée, vous bénéficiez d’un droit d’accès et de
rectification aux informations qui vous concernent. Si vous souhaitez exercer ce droit et obtenir
communication des informations vous concernant, veuillez-vous adresser à : Métropole de Lyon - Direction des
Affaires Juridiques et de la Commande Publique - 20, rue du Lac - BP 33569 - 69505 Lyon Cedex 03 : par
courrier ou au moyen du formulaire approprié sur ce portail. Vous pouvez également, pour des motifs
légitimes, vous opposer au traitement des données vous concernant. Dans ce cas, nous ne pourrons pas traiter
la demande soumise via ce formulaire.</target>
<source>Fields with an asterisk (*) are mandatory. Information in these fields will be processed to respond to
your request. The data is kept for a period of 12 months. Recipients of this
information are the metropolitan departments in charge of processing your request. In compliance with the
“Digital Technology and Freedom” law dated January 6, 1978, you have the right to access and rectify
information that concerns you. To exercise this right, please contact: Lyon Métropole - Direction des
Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal
mail. You may also oppose processing of your personal data for a legitimate reason. In this case, we will
not be able to process the request submitted using this form.</source>
<target>Les champs suivi d'un astérisque (*) sont obligatoires. Les informations contenues dans ces champs font l’objet d’un traitement informatisé destiné à répondre à votre demande. Les données sont conservées pendant une durée de 12 mois. Les destinataires des informations sont les services métropolitains en charge du traitement de votre demande. Conformément à la loi "informatique et libertés" du 6 janvier 1978 modifiée, vous bénéficiez d’un droit d’accès et de rectification aux informations vous concernant. Si vous souhaitez exercer ce droit, vous pouvez vous adresser à : Métropole de Lyon - Direction des Affaires Juridiques et de la Commande Publique - 20, rue du Lac - BP 33569 - 69505 Lyon Cedex 03 : par courrier. Si toutefois vous souhaitez, pour des motifs légitimes, vous opposer au traitement des données vous concernant, nous ne pourrons pas traiter la demande soumise via ce formulaire.
</target>
</trans-unit>
<trans-unit id="consent.error" datatype="html">
<source>You must accept the general terms of use and the processing of the information entered in this form to respond to your request.</source>
<target>Vous devez accepter les conditions générales d'utilisation et que les informations saisies dans ce formulaire soient traitées pour répondre à votre demande.</target>
<source>You must accept the processing of the information entered in this form to respond to your request.</source>
<target>Vous devez accepter que les informations saisies dans ce formulaire soient traitées pour répondre à votre demande.</target>
</trans-unit>
<trans-unit id="cgu.error" datatype="html">
<source>You must accept the general terms of use.</source>
<target>Vous devez accepter les conditions générales d'utilisation.</target>
</trans-unit>
<trans-unit id="page404.oops" datatype="html">
<source>Oops</source>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment