Commit 0b8de7fb authored by Tibor Katelbach's avatar Tibor Katelbach
Browse files

Merge remote-tracking branch 'origin/development' into development

parents 5d04abd9 c926f504
......@@ -11,14 +11,13 @@
"deal43" : {
"label" : "Suivi",
"type" : "tpls.forms.cplx.suiviFormBudget"
"type" : "tpls.forms.cplx.suiviFromBudget"
}
}
}
/* 2 */
{
"id" : "deal1",
"type" : "openForm",
"name" : "Dossier",
......@@ -33,7 +32,6 @@
"type" : "text",
"info" : "It seems that perfection is reached not when there is nothing left to add, but when there is nothing left to take away - Antoine de Saint Exupéry"
},
"deal13x" : {
"label" : "Date de l'ouverture de dossier",
"type" : "date"
......@@ -43,8 +41,24 @@
"label" : "Adresse",
"type" : "tpls.forms.cplx.address"
},
"deal14" : {
"label" : "Décrire la nature des travaux",
"type" : "textarea"
},
"deal15" : {
"label" : "Ajouter une image à votre projet",
"placeholder" : "",
"info" : "",
"type" : "tpls.forms.uploader",
"uploader" : {
"docType" : "image",
"contentKey" : "profil",
"paste" : false,
"restricted" : "true",
"itemLimit" : 1
}
},
"deal16" : {
"label" : "Opérateur",
"placeholder" : "",
"info" : "",
......@@ -53,7 +67,7 @@
}
}
/* 3 */
/* 4 */
{
"id" : "deal4",
......@@ -84,18 +98,11 @@
"label" : "Dépense éligible ",
"type" : "sectionTitle"
},
"budget" : {
"label" : "Dépenses",
"placeholder" : "Dépenses",
"type" : "tpls.forms.cplx.budget"
},
"budget" : {
"label" : "Dépenses",
"placeholder" : "Dépenses",
"type" : "tpls.forms.cplx.budget"
},
"deal3stepValidation" : {
"label" : "valid",
"type" : "tpls.forms.cplx.stepValidation"
......@@ -123,55 +130,64 @@
"deal29" : {
"label" : "Nature des travaux",
"type" : "sectionTitle"
},
"deal24x" : {
"label" : "parcelle",
"type" : "text"
},
"deal25" : {
"label" : "description du bien / pb",
"type" : "textarea"
},
"deal26" : {
"label" : "amiante ",
"placeholder" : "présence d'amiante",
"type" : "tpls.forms.checkbox"
},
"deal24x" : {
"label" : "parcelle",
"type" : "text"
},
"deal25" : {
"label" : "description du bien / pb",
"type" : "textarea"
},
"deal26" : {
"label" : "amiante ",
"placeholder" : "présence d'amiante",
"type" : "tpls.forms.checkbox"
},
"deal210" : {
"label" : "Ménage",
"type" : "sectionTitle"
},
"deal213" : {
"label" : "composition familial (document sociaux)",
"type" : "textarea"
},
"deal214" : {
"label" : "nb d'enfant et si proprio",
"type" : "text"
},
"deal215" : {
"label" : "bénéficiaire d'une aide social",
"type" : "textarea"
},
"deal213" : {
"label" : "composition familial (document sociaux)",
"type" : "textarea"
},
"deal214" : {
"label" : "nb d'enfant et si proprio",
"type" : "text"
},
"deal215" : {
"label" : "bénéficiaire d'une aide social",
"type" : "textarea"
},
"deal211" : {
"label" : "socle commun des pièces",
"type" : "sectionTitle"
},
"deal216" : {
"label" : "Identité",
"type" : "text"
},
"deal218" : {
"label" : "liste pièces par organisme / par type de chantier",
"type" : "textarea"
},
"deal217" : {
"label" : "CNI",
"type" : "text"
"deal216" : {
"label" : "Identité",
"placeholder" : "",
"info" : "Ajouter un document d'identité officiel (Passeport, carte d'indentité)",
"type" : "tpls.forms.uploader",
"uploader" : {
"docType" : "file",
"paste" : false,
"restricted" : "true",
"itemLimit" : 1
}
},
"deal217" : {
"label" : "Liste pièces par organisme / par type de chantier",
"placeholder" : "",
"info" : "",
"type" : "tpls.forms.uploader",
"uploader" : {
"docType" : "file",
"paste" : false,
"restricted" : "true",
"itemLimit" : 5
}
}
}
}
......
......@@ -60,16 +60,20 @@
<div class="col-md-9 col-sm-8 col-xs-12">
<div class="col-xs-12"><h1>Bonjour <?php echo Yii::app()->session["user"]["name"] ?></h1></div>
<div class="col-xs-12"><h3>Vos dossiers</h3></div>
<?php $answs=Form::getListAnswersBy(implode("|", $this->costum["form"]["ids"]) , $this->costum["slug"], Yii::app()->session["userId"]);
$params = [
"el" => @$this->costum["el"],
"color1" => "blue",
"canEdit" => true,
"allAnswers"=>@$answs,
"what" => "dossiers",
"viewDom"=>"dashboard"
];
echo $this->renderPartial("survey.views.tpls.answers.allAnswers",$params);
<?php
if(!empty($this->costum["form"]["ids"])){
$answs=Form::getListAnswersBy(implode("|", $this->costum["form"]["ids"]) , $this->costum["slug"], Yii::app()->session["userId"]);
$params = [
"el" => @$this->costum["el"],
"color1" => "blue",
"canEdit" => true,
"allAnswers"=>@$answs,
"what" => "dossiers",
"viewDom"=>"dashboard"
];
echo $this->renderPartial("survey.views.tpls.answers.allAnswers",$params);
}
?>
</div>
<script type="text/javascript">
......
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