diff --git a/controllers/answer/ValidateAction.php b/controllers/answer/ValidateAction.php index 5bdb988218eeb0c824bfad9880cff38e9168d821..5c6c4e1bd8708e0fd7374d06a990b1acc209dbb9 100644 --- a/controllers/answer/ValidateAction.php +++ b/controllers/answer/ValidateAction.php @@ -8,4 +8,32 @@ class ValidateAction extends CAction $res = Answer::validate($_POST); Rest::json($_POST); } - } \ No newline at end of file + } + + "organizations" : [ + { + "from" : "aressForm1.multitextvalidationaressForm110", + "to" : "name" + }, + { + "from" : "aressForm1.multitextvalidationaressForm111", + "to" : "sigle" + }, + { + "from" : "aressForm1.multitextvalidationaressForm112", + "to" : "siren" + }, + { + "from" : "aressForm1.multitextvalidationaressForm19", + "to" : "email" + }, + { + "from" : "aressForm1.multitextvalidationaressForm113", + "to" : "WALDEC_RNA +" + }, + { + "from" : "aressForm1.multitextvalidationaressForm113", + "to" : "siren" + } +] \ No newline at end of file diff --git a/controllers/answer/admin/DirectoryAction.php b/controllers/answer/admin/DirectoryAction.php index 4c1e590c2cf2b0b087c997c90959dd92e13dfb72..6ecdbb679243873cdb2e7c44bd3a436960d5d3aa 100644 --- a/controllers/answer/admin/DirectoryAction.php +++ b/controllers/answer/admin/DirectoryAction.php @@ -24,7 +24,6 @@ class DirectoryAction extends CAction $idFs[] = $keyF; } $res = Form::getBySourceAndId($controller->costum["slug"]); - //Rest::json($res); exit; $searchParams = $_POST; $searchParams["count"] = true; $answers=Answer::globalAutocomplete($res["form"], $searchParams); diff --git a/models/Answer.php b/models/Answer.php index 9f06b2bb4a09569685b4125d02c95114b5016cba..fae74ae0bbc0dd0b79d954122a0e3e7f367eb6ed 100644 --- a/models/Answer.php +++ b/models/Answer.php @@ -108,6 +108,7 @@ class Answer{ } public static function globalAutocomplete($form, $searchParams){ + //var_dump($form); $searchParams["indexMin"] = (isset($searchParams["indexMin"])) ? $searchParams["indexMin"] : 0; $searchParams["indexStep"] = (isset($searchParams["indexStep"])) ? $searchParams["indexStep"] : 100; $mappingData=(isset($form["mapping"])) ? $form["mapping"] : array("name"=>"name", "address"=>"address"); @@ -149,7 +150,7 @@ class Answer{ $query = Search::searchFilters($searchParams['filters'], $query); } $res= array(); - //var_dump($query);exit; + //Rest::json($query);exit; $res["results"] = PHDB::findAndLimitAndIndex ( self::COLLECTION , $query, $searchParams["indexStep"], $searchParams["indexMin"]); if(isset($searchParams["count"])) $res["count"][self::COLLECTION] = PHDB::count( self::COLLECTION , $query); diff --git a/models/Form.php b/models/Form.php index 89d54782698df87fcbf57c098fb9b5ff44e702c4..b650be5b3497a5e796bb0994167bf01bed1d74e9 100755 --- a/models/Form.php +++ b/models/Form.php @@ -184,10 +184,12 @@ class Form { } $res["form"]=PHDB::findOne( Form::COLLECTION, $queryForm ); $res["forms"] = []; - foreach ($res["form"]["subForms"] as $ix => $formId) { - $f = PHDB::findOne(Form::COLLECTION, ["id"=>$formId]); - $res["forms"][$formId] = $f; - } + if(!empty($res["form"]["subForms"])){ + foreach ($res["form"]["subForms"] as $ix => $formId) { + $f = PHDB::findOne(Form::COLLECTION, ["id"=>$formId]); + $res["forms"][$formId] = $f; + } + } return $res; } public static function getById($parentForm, $fields=array()){ diff --git a/views/tpls/forms/cplx/multitextvalidation.php b/views/tpls/forms/cplx/multitextvalidation.php index 782c4c49827260191d1ab5d4e7639f96625c0cfd..ae9dad24ab989e3fcdf05375689492d583034c32 100644 --- a/views/tpls/forms/cplx/multitextvalidation.php +++ b/views/tpls/forms/cplx/multitextvalidation.php @@ -168,9 +168,10 @@ $paramsData = [ "validation" => [ "text" => "texte", "number" => "Nombre", - "email" => "adresse mail" + "email" => "adresse mail", + "unique" => [ "siret" ] ] - ]; +]; if($saveOneByOne) diff --git a/views/tpls/forms/cplx/validationForm.php b/views/tpls/forms/cplx/validationForm.php index f63c2c92d720a39ff92006e913682f7b3403e03f..dc4216190a7c8140e569593cef75441baaf2a62c 100644 --- a/views/tpls/forms/cplx/validationForm.php +++ b/views/tpls/forms/cplx/validationForm.php @@ -1,11 +1,12 @@