Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2021-05-06 13:47:42 +02:00
commit 0ab5a40d98
3 changed files with 9 additions and 6 deletions

View File

@ -27,10 +27,10 @@ class Registration implements UserInterface, \Serializable
private $id;
/**
* @ORM\Column(type="string", length=25, unique=true)
* @ORM\Column(type="string", length=128, unique=true)
* @Assert\Length(
* min = "5",
* max = "25",
* max = "128",
* minMessage = "Votre nom doit faire au moins {{ limit }} caractères",
* maxMessage = "Votre nom ne peut pas être plus long que {{ limit }} caractères"
* )
@ -68,7 +68,7 @@ class Registration implements UserInterface, \Serializable
private $passwordad;
/**
* @ORM\Column(type="string", length=60, unique=true)
* @ORM\Column(type="string", length=128, unique=true)
*/
private $email;

View File

@ -30,10 +30,10 @@ class User implements UserInterface, \Serializable
private $id;
/**
* @ORM\Column(type="string", length=50, unique=true)
* @ORM\Column(type="string", length=128, unique=true)
* @Assert\Length(
* min = "5",
* max = "25",
* max = "128",
* minMessage = "Votre nom doit faire au moins {{ limit }} caractères",
* maxMessage = "Votre nom ne peut pas être plus long que {{ limit }} caractères"
* )
@ -71,7 +71,7 @@ class User implements UserInterface, \Serializable
private $passwordad;
/**
* @ORM\Column(type="string", length=60, unique=true)
* @ORM\Column(type="string", length=128, unique=true)
*/
private $email;

View File

@ -407,6 +407,7 @@ class GetLimesurveyCommand extends Command
foreach($surveys as $survey) {
// Si le sondage est actif
if($survey["active"]=="Y") {
$this->writeln("SURVEY = ".$survey["surveyls_title"]);
// Liste des participants
$survey_id=$survey["sid"];
@ -415,6 +416,8 @@ class GetLimesurveyCommand extends Command
foreach($users as $user) {
if(isset($user["participant_info"]["email"]) && $user["participant_info"]["email"]!="") {
$this->writeln("EMAIL = ".$user["participant_info"]["email"]);
$entity = $this->em->getRepository('CadolesCoreBundle:User')->findOneBy(["email"=>$user["participant_info"]["email"]]);
if($entity) {
$surveypropconf = $myJSONRPCClient->get_survey_properties($sessionKey,$survey["sid"],["datecreated"]);