Commit a1d241bf authored by Anatole Rakotoson's avatar Anatole Rakotoson

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

parents 37d6f56c 8c91ac34
url : http://127.0.0.1/survey/form/schema/id/ctenatForm
//collection forms (Main Form) : id : ctenatForm
{"id":"ctenatForm","parent":{"5ca1b2bb40bb4e9352ba351b":{"type":"organizations","name":"CTE National"}},"wizardIntroTpl":"survey.views.custom.ctenat.wizardIntroTpl","homeTpl":"survey.views.custom.ctenat.explainRow","subForms":["action","caracter","murir","contractualiser","suivre"],"source":{"key":"ctenat","keys":["ctenat"],"insertOrign":"costum"},"active":true,"params":{"period":{"from":2018,"to":2023},"elementelement1":{"type":"organizations","limit":""},"elementelement3":{"type":"projects","limit":""},"elementporteur":{"type":"organizations","limit":""},"elementprojet":{"type":"projects","limit":""},"elementaction":{"type":"projects","limit":""},"elementparents":{"type":"organizations","limit":""},"elementproject":{"type":"projects","limit":""},"calendaropenForm19":{"sectionTitles":["1erSem2018","2\u00e8meSem2018","1erSem2019","2\u00e8meSem2019","1erSem2020","2\u00e8meSem2020","1erSem2021","2\u00e8meSem2021","1erSem2022","2\u00e8meSem2022","1erSem2023","2\u00e8meSem2023"],"dateSections":["01\/01\/2018","01\/07\/2018","01\/01\/2019","01\/07\/2019","01\/01\/2020","01\/07\/2020","01\/01\/2021","01\/07\/2021","01\/01\/2022","01\/07\/2022","01\/01\/2023","01\/07\/2023","01\/01\/2024"]},"budgetbudget":{"nature":{"investissement":"Investissement","fonctionnement":"Fonctionnement"},"amounts":{"price":"Montant","amount2019":"2019 (euros HT)","amount2020":"2020 (euros HT)","amount2021":"2021 (euros HT)","amount2022":"2022 (euros HT)","amount2023":"2023 (euros HT)"},"estimate":"true"}},"updated":1597679109,"graph":{"budgetbudget_1":{"label":"test","type":"amount"},"budgetbudget_2":{"label":"","type":"poste"}}}
{"id":"ctenatForm","mapping" : {
"name" : {
"path" : "answers.action.project.name",
"query" : "searchString"
},
"porteur" : {
"path" : "answers.action.parents.name",
"query" : "searchString"
},
"cter" : {
"path" : "context.name",
"query" : "searchString"
}},"parent":{"5ca1b2bb40bb4e9352ba351b":{"type":"organizations","name":"CTE National"}},"wizardIntroTpl":"survey.views.custom.ctenat.wizardIntroTpl","homeTpl":"survey.views.custom.ctenat.explainRow","subForms":["action","caracter","murir","contractualiser","suivre"],"source":{"key":"ctenat","keys":["ctenat"],"insertOrign":"costum"},"active":true,"params":{"period":{"from":2018,"to":2023},"elementelement1":{"type":"organizations","limit":""},"elementelement3":{"type":"projects","limit":""},"elementporteur":{"type":"organizations","limit":""},"elementprojet":{"type":"projects","limit":""},"elementaction":{"type":"projects","limit":""},"elementparents":{"type":"organizations","limit":""},"elementproject":{"type":"projects","limit":""},"calendaropenForm19":{"sectionTitles":["1erSem2018","2\u00e8meSem2018","1erSem2019","2\u00e8meSem2019","1erSem2020","2\u00e8meSem2020","1erSem2021","2\u00e8meSem2021","1erSem2022","2\u00e8meSem2022","1erSem2023","2\u00e8meSem2023"],"dateSections":["01\/01\/2018","01\/07\/2018","01\/01\/2019","01\/07\/2019","01\/01\/2020","01\/07\/2020","01\/01\/2021","01\/07\/2021","01\/01\/2022","01\/07\/2022","01\/01\/2023","01\/07\/2023","01\/01\/2024"]},"budgetbudget":{"nature":{"investissement":"Investissement","fonctionnement":"Fonctionnement"},"amounts":{"price":"Montant","amount2019":"2019 (euros HT)","amount2020":"2020 (euros HT)","amount2021":"2021 (euros HT)","amount2022":"2022 (euros HT)","amount2023":"2023 (euros HT)"},"estimate":"true"}},"updated":1597679109,"graph":{"budgetbudget_1":{"label":"test","type":"amount"},"budgetbudget_2":{"label":"","type":"poste"}}}
//collection forms (subForm) : id : action
{"id":"action","type":"openForm","name":"D\u00e9tailler l'action","inputs":{"auteur":{"label":"L'auteur","placeholder":"Auteur","type":"tpls.pods.author","position":"0"},"parents":{"label":"Structure porteuse","type":"tpls.forms.costum.ctenat.element","position":"1"},"project":{"label":"Projet D\u00e9pos\u00e9","type":"tpls.forms.costum.ctenat.element","position":"5"}},"updated":1598639686}
......
......@@ -172,7 +172,8 @@
}
echo "</span></td>";
} else {
echo "<td>".Yii::t("common", $el["el"]["type"])."</td>";
} else if($i!="type"){
if(isset($a[$i]))
echo "<td>".$a[$i]."</td>";
}
......
......@@ -15,7 +15,7 @@
$imgPath = (@$user["profilMediumImageUrl"] && !empty($user["profilMediumImageUrl"])) ? Yii::app()->createUrl('/'.$user["profilMediumImageUrl"]) : $this->module->getParentAssetsUrl().'/images/thumb/default_citoyens.png'; ?>
<img class="img-circle" height=70 width="70" src="<?php echo $imgPath ?>">
</td>
<td><a class="lbh-preview-element" data-hash='#page.type.citoyens.id.<?php echo (string)$answer["user"] ?>' href="@<?php echo Yii::app()->createUrl($user["username"]); ?>"><?php echo @$user["name"]; ?></a></td>
<td rowspan=2 style="vertical-align: middle;"><a class="lbh-preview-element" data-hash='#page.type.<?php echo Person::COLLECTION ?>.id.<?php echo (string)$answer["user"] ?>' href="@<?php echo Yii::app()->createUrl($user["username"]); ?>"><?php echo @$user["name"]; ?></a></td>
</tr>
</tbody>
</table>
......
Markdown is supported
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