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

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

parents e34d9f90 dd375f0a
......@@ -77,12 +77,6 @@
"inputType" => "text",
"rules" => [ "required" => false ]
],
"nivRespNage" => [
"label" => "Année Niveau de respect par approche à la nage",
"placeholder" => "Année Niveau de respect par approche à la nage",
"inputType" => "text",
"rules" => [ "required" => false ]
],
"nivRespPorNage" => [
"label" => "Niveau de respect par approche à la nage",
"placeholder" => "Niveau de respect en %",
......@@ -150,9 +144,19 @@
echo "<td>";
if(isset($a[$i])) {
if(is_array($a[$i]))
{
echo implode(",", $a["ocean"]);
else
echo $a[$i];
}
else {
if($a[$i] == "true"){
echo "oui";
}else if($a[$i] == "false"){
echo "non";
}
else {
echo $a[$i];
}
}
}
echo "</td>";
}
......@@ -209,10 +213,19 @@
if($actualNbr4 > 5){
echo "<td>";
if(isset($a[$i])) {
if(is_array($a[$i]))
if(is_array($a[$i])){
echo implode(",", $a["ocean"]);
else
echo $a[$i];
}
else {
if($a[$i] == "true"){
echo "oui";
}else if($a[$i] == "false"){
echo "non";
}
else {
echo $a[$i];
}
}
}
echo "</td>";
}
......
......@@ -62,6 +62,7 @@
"labelText" => "Concerne les cétacés"
],
"month" => [
"Annuelle " => "Annuelle ",
"Janvier" => "Janvier",
"Fevrier" => "Février",
"Mars" => "Mars",
......@@ -127,7 +128,7 @@
],
"pObservation" => [
"label" => "fin du Période d’observation",
"placeholder" => "Période d’observation",
"placeholder" => "fin du Période d’observation",
"inputType" => "select",
"options" => $paramsData["month"],
"rules" => [ "required" => true ]
......@@ -149,7 +150,7 @@
"zoneObs" => [
"label" => "Zone d'observations",
"placeholder" => "Zone d'observations",
"inputType" => "select",
"inputType" => "selectMultiple",
"options" => $a,
"rules" => ["required" => true ]
]
......@@ -177,25 +178,48 @@
?>
<thead>
<tr>
<td colspan='<?php echo count( $properties)+2?>' ><h4 style="color:<?php echo ($titleColor) ? $titleColor : "black"; ?>"><?php echo $label.$editQuestionBtn.$editParamsBtn.$editBtnL?></h4>
<?php echo $info ?>
</td>
</tr>
<?php
if( count($answers)>0 ){ ?>
<tr>
</th>
<?php
<?php if(isset($answers)){ ?>
<tr>
<?php
$ccnt = 1;
foreach ($properties as $i => $inp) {
echo "<th>".$inp["placeholder"]."</th>";
if($ccnt < 4 ){
echo "<th rowspan='2'>".$inp["placeholder"]."</th>";
}
$ccnt ++;
} ?>
<th></th>
</tr>
<tr></tr>
<?php } ?>
<th colspan="4">Observation Saisonnière</th>
<?php
$ccnt1 = 1;
foreach ($properties as $i => $inp) {
if($ccnt1 > 7 ){
echo "<th rowspan='2'>".$inp["placeholder"]."</th>";
}
$ccnt1 ++;
} ?>
<th rowspan="2"></th>
</tr>
<tr>
<?php
$ccnt2 = 1;
foreach ($properties as $i => $inp) {
if($ccnt2 > 3 and $ccnt2 < 8){
echo "<th >".$inp["placeholder"]."</th>";
}
$ccnt2 ++;
} }?>
</tr>
</thead>
<tbody class="directoryLines">
<?php
......@@ -232,9 +256,17 @@
echo $inp["nomVernaculaire"];
}
}
}else {
echo $a[$i];
}
else {
if($a[$i] == "true"){
echo "oui";
}else if($a[$i] == "false"){
echo "non";
}
else {
echo $a[$i];
}
}
}
}
echo "</td>";
......
......@@ -174,10 +174,16 @@ $actualNbr1 = 0;
{
echo "<a href='".$a[$i]."'>".$a[$i]."</a>";
}
else
{
else {
if($a[$i] == "true"){
echo "oui";
}else if($a[$i] == "false"){
echo "non";
}
else {
echo $a[$i];
}
}
}
}
echo "</td>";
}
......
......@@ -4,7 +4,7 @@
<table class="table table-bordered table-hover directoryTable" id="<?php echo $kunik?>">
<?php
$editBtnL = ($canAnswer) ? " <a href='javascript:;' data-id='".$answer["_id"]."' data-collection='".Form::ANSWER_COLLECTION."' data-path='".$answerPath."' class='add".$kunik." btn btn-default'><i class='fa fa-plus'></i> Ajouter une ligne </a>" : "";
$editBtnL = ($canAnswer) ? " <a href='javascript:;' data-id='".$answer["_id"]."' data-collection='".Form::ANSWER_COLLECTION."' data-path='".$answerPath."' class='add".$kunik." btn btn-default'><i class='fa fa-plus'></i> Ajouter une ligne </a> <a href='javascript:;' data-id='5e7b019e8b509c396d8b459c' data-collection='answers' data-path='answers.sommomForm2.sommomForm21.' class='addacteurEncadrementsommomForm21 btn btn-default'><i class='fa fa-plus'></i> Ajouter un acteur </a>" : "";
$editParamsBtn = ($canEdit) ? " <a href='javascript:;' data-id='".$el["_id"]."' data-collection='".Yii::app()->session["costum"]["contextType"]."' data-path='costum.form.params.".$kunik."' class='previewTpl edit".$kunik."Params btn btn-xs btn-danger'><i class='fa fa-cog'></i> </a>" : "";
......
......@@ -48,22 +48,22 @@
$properties = [
"typeF" => [
"label" => "Type d'entrée",
"placeholder" => "Type d'entrée",
"label" => "Cadre de la réglementation",
"placeholder" => "Sélectionner le cadre d’application",
"inputType" => "select",
"options" => $paramsData["typeF"],
"rules" => [ "required" => true ]
],
"natureP" => [
"label" => "Nature",
"placeholder" => "Nature",
"label" => "Type de réglementation",
"placeholder" => "Sélectionner le type de réglementation",
"inputType" => "select",
"options" => $paramsData["nature"],
"rules" => [ "required" => true ]
],
"nomP" => [
"label" => "Intitulé de la réglementation",
"placeholder" => "Intitulé de la réglementation",
"label" => "Numéro et Intitulé",
"placeholder" => "Numéro et Intitulé de la réglementation",
"inputType" => "text",
"rules" => [ "required" => true ]
],
......@@ -73,12 +73,6 @@
"inputType" => "text",
"rules" => [ "required" => true ]
],
"siteP" => [
"label" => "Site de référence pour consultation",
"placeholder" => "Site de référence pour consultation",
"inputType" => "text",
"rules" => [ "required" => false ]
],
"especeP" => [
"label" => "Espèces concernées",
"placeholder" => "Espèces concernées",
......@@ -86,6 +80,13 @@
"options" => $cetacesArray,
"rules" => [ "required" => true ]
],
"siteP" => [
"label" => "Site de référence pour consultation",
"placeholder" => "Site de référence pour consultation",
"inputType" => "text",
"rules" => [ "required" => false ]
],
"natureP" => [
"label" => "Nature",
"placeholder" => "Nature",
......@@ -159,7 +160,7 @@
foreach ($properties as $i => $inp) {
if($actualNbr1 < 6){
echo "<th>".$inp["placeholder"]."</th>";
echo "<th>".$inp["label"]."</th>";
}
$actualNbr1++;
}
......@@ -196,9 +197,17 @@
$j++;
}
}else {
echo $a[$i];
}
else {
if($a[$i] == "true"){
echo "oui";
}else if($a[$i] == "false"){
echo "non";
}
else {
echo $a[$i];
}
}
}
echo "</td>";
}
......
......@@ -103,10 +103,19 @@
foreach ($properties as $i => $inp) {
echo "<td>";
if(isset($a[$i])) {
if(is_array($a[$i]))
if(is_array($a[$i])){
echo implode(",", $a["ocean"]);
else
echo $a[$i];
}
else {
if($a[$i] == "true"){
echo "oui";
}else if($a[$i] == "false"){
echo "non";
}
else {
echo $a[$i];
}
}
}
echo "</td>";
}
......
......@@ -172,10 +172,19 @@
foreach ($properties as $i => $inp) {
echo "<td>";
if(isset($a[$i])) {
if(is_array($a[$i]))
if(is_array($a[$i])){
echo implode(",", $a["portExp"]);
else
echo $a[$i];
}
else {
if($a[$i] == "true"){
echo "oui";
}else if($a[$i] == "false"){
echo "non";
}
else {
echo $a[$i];
}
}
}
echo "</td>";
}
......
......@@ -116,10 +116,19 @@
foreach ($properties as $i => $inp) {
echo "<td>";
if(isset($a[$i])) {
if(is_array($a[$i]))
if(is_array($a[$i])){
echo implode(",", $a["ocean"]);
else
echo $a[$i];
}
else {
if($a[$i] == "true"){
echo "oui";
}else if($a[$i] == "false"){
echo "non";
}
else {
echo $a[$i];
}
}
}
echo "</td>";
}
......
......@@ -141,10 +141,19 @@
foreach ($properties as $i => $inp) {
echo "<td>";
if(isset($a[$i])) {
if(is_array($a[$i]))
if(is_array($a[$i])){
echo implode(",", $a["ocean"]);
else
echo $a[$i];
}
else {
if($a[$i] == "true"){
echo "oui";
}else if($a[$i] == "false"){
echo "non";
}
else {
echo $a[$i];
}
}
}
echo "</td>";
}
......
......@@ -107,11 +107,11 @@
<th rowspan="2"></th>
</tr>
<tr>
<th><?php $mn = 1; foreach ($properties as $k => $v) { if( $mn < 2) { echo $v["label"]; $mn++ ;} } ?></th>
<th><?php $mn = 2; foreach ($properties as $k => $v) { if( $mn < 3) { echo $v["label"]; $mn++ ;} } ?></th>
<th><?php $mn = 3; foreach ($properties as $k => $v) { if( $mn < 4) { echo $v["label"]; $mn++ ;} } ?></th>
<th><?php $mn = 4; foreach ($properties as $k => $v) { if( $mn < 5) { echo $v["label"]; $mn++ ;} } ?></th>
<th><?php $mn = 5; foreach ($properties as $k => $v) { if( $mn < 6) { echo $v["label"]; $mn++ ;} } ?></th>
<th><?php $mn = 1; foreach ($properties as $k => $v) { if( $mn == 2) { echo $v["label"]; }$mn++ ; } ?></th>
<th><?php $mn = 1; foreach ($properties as $k => $v) { if( $mn == 3) { echo $v["label"]; }$mn++ ; } ?></th>
<th><?php $mn = 1; foreach ($properties as $k => $v) { if( $mn == 5) { echo $v["label"]; }$mn++ ; } ?></th>
<th><?php $mn = 1; foreach ($properties as $k => $v) { if( $mn == 6) { echo $v["label"]; }$mn++ ; } ?></th>
<th><?php $mn = 1; foreach ($properties as $k => $v) { if( $mn == 7) { echo $v["label"]; }$mn++ ; } ?></th>
</tr>
</thead>
......
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