Commit e543b0d1 authored by Tibor Katelbach's avatar Tibor Katelbach
Browse files

tweaks and cleans

parent ce41ca15
......@@ -68,26 +68,6 @@ $form["scenario"] = $tmpForm;
$defaultColor = "#62A5B2";
$bleu = "#0A2F62";
$financerTypeList = [
"acteursocioeco" => "Acteur Socio-économique",
"colfinanceur" => "Communes / intercommunalités / Syndicats mixtes",
"departement" => "Départements",
"region" => "Région",
"europe"=>"Europe",
"etat" => "Etat - Services déconcentrés / préfecture",
"ademe" => "Etat - Ademe",
"cerema" => "Etat - Cerema",
"bdt"=> "Etat - Banque des territoires",
"bpi"=> "Etat - BPI",
"agenceLeau"=> "Etat - Agence / Office de l'eau",
"officeNatForet"=>"Etat - Office national des forêts",
"agenceBiodiv"=> "Etat - Office de la biodiversité",
"afd"=> "Etat - Agence Francaise de développement",
"vn2f"=>"Etat - Voies navigable de France",
"franceAgirMer"=>"Etat - FranceAgriMer",
"autre" => "Etat - Autre"
];
$communityLinks = Element::getCommunityByTypeAndId(Project::COLLECTION,$parent["id"]);
foreach ($communityLinks as $id => $co) {
if( !isset($co["roles"]) || !in_array("Financeur", $co["roles"]) )
......@@ -99,7 +79,7 @@ foreach ($orgaFinancers as $id => $or) {
$orgs[$id] = $or["name"];
}
$listLabels = array_merge($financerTypeList,$orgs);
$listLabels = array_merge(Ctenat::$financerTypeList,$orgs);
?>
<div class='col-xs-12 col-sm-10 col-sm-offset-1' style="margin-bottom: 30px">
......@@ -914,7 +894,7 @@ var indicators = <?php echo json_encode($indicators); ?>;
var dialog = null;
$(document).ready(function() {
costum.lists.financerTypeList = <?php echo json_encode($financerTypeList); ?>;
costum.lists.financerTypeList = <?php echo json_encode(Ctenat::$financerTypeList); ?>;
costum.lists.financersList = <?php echo json_encode($orgs); ?>;
costum.lists["indicators"] = indicators;
mylog.log("render","/modules/survey/views/custom/ctenat/dossierEditCTENat")
......
......@@ -70,7 +70,8 @@ $editBtnL = ($canAdmin) ? " <a href='javascript:;' data-form='".$step."' data-st
"<td class='editContent' data-key='res2019' data-indic='indic".$ct."' data-pos='".$q."' data-type='objectif'>".(isset($a["objectif"]["res2019"])?$a["objectif"]["res2019"]:"")."</td>".
"<td class='editContent' data-key='res2020' data-indic='indic".$ct."' data-pos='".$q."' data-type='objectif'>".(isset($a["objectif"]["res2020"])?$a["objectif"]["res2020"]:"")."</td>".
"<td class='editContent' data-key='res2021' data-indic='indic".$ct."' data-pos='".$q."' data-type='objectif'>".(isset($a["objectif"]["res2021"])?$a["objectif"]["res2021"]:"")."</td>".
"<td class='editContent' data-key='res2022' data-indic='indic".$ct."' data-pos='".$q."' data-type='objectif'>".(isset($a["objectif"]["res2022"])?$a["objectif"]["res2022"]:"")."</td>";?>
"<td class='editContent' data-key='res2022' data-indic='indic".$ct."' data-pos='".$q."' data-type='objectif'>".(isset($a["objectif"]["res2022"])?$a["objectif"]["res2022"]:"")."</td>"; ?>
<td rowspan=2 >
<?php if ($canAdmin){ ?>
<a href='javascript:;' data-form='<?php echo $step?>' data-step='<?php echo $step?>' data-q='<?php echo $key?>' data-pos='<?php echo $ct?>' class='editAF btn btn-xs btn-default'><i class='fa fa-pencil'></i></a>
......
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