Commit 6e647ac2 authored by Raph El's avatar Raph El
Browse files

Merge branch 'master' into qa

parents 725ed359 510e9f25
......@@ -131,9 +131,11 @@ Enfin, vous pourrez suivre et évaluer votre action.
$stepNum = 3;
if( !isset($adminAnswers["validation"]) ||
!isset($adminAnswers["validation"]["ctenat"]) ||
!isset($adminAnswers["validation"]["cter"]) ||
!in_array( $adminAnswers["validation"]["ctenat"]["valid"], ["valid", "validReserve"]) ||
!in_array( $adminAnswers["validation"]["cter"]["valid"], ["valid", "validReserve"]) ) { ?>
!isset($adminAnswers["validation"]["cter"]) ||
!( isset($adminAnswers["validation"]["ctenat"]) &&
in_array( @$adminAnswers["validation"]["ctenat"]["valid"], ["valid", "validReserve"]) &&
isset($adminAnswers["validation"]["cter"]) &&
in_array( @$adminAnswers["validation"]["cter"]["valid"], ["valid", "validReserve"]) ) ) { ?>
<li id="murirBtn">
<a onclick="showStep('#murir')" href="javascript:;" class="done" >
......@@ -150,9 +152,14 @@ if( !isset($adminAnswers["validation"]) ||
if( isset($adminAnswers["validation"]) &&
isset($adminAnswers["validation"]["ctenat"]) &&
isset($adminAnswers["validation"]["cter"]) &&
//<<<<<<< HEAD
in_array( $adminAnswers["validation"]["ctenat"]["valid"], ["valid", "validReserve"]) &&
isset($adminAnswers["validation"]["cter"]["valid"]) &&
in_array( $adminAnswers["validation"]["cter"]["valid"], ["valid", "validReserve"]) ) {
// =======
// in_array( @$adminAnswers["validation"]["ctenat"]["valid"], ["valid", "validReserve"]) &&
// in_array( @$adminAnswers["validation"]["cter"]["valid"], ["valid", "validReserve"]) ) {
// >>>>>>> master
$prioClass = "done";
$isSuivi = true;
}
......@@ -910,8 +917,8 @@ $(document).ready(function() {
<?php if( isset($adminAnswers["validation"]) &&
isset($adminAnswers["validation"]["ctenat"]) &&
isset($adminAnswers["validation"]["cter"]) &&
in_array( $adminAnswers["validation"]["ctenat"]["valid"], ["valid", "validReserve"]) &&
in_array( $adminAnswers["validation"]["cter"]["valid"], ["valid", "validReserve"]) ) { ?>
in_array( @$adminAnswers["validation"]["ctenat"]["valid"], ["valid", "validReserve"]) &&
in_array( @$adminAnswers["validation"]["cter"]["valid"], ["valid", "validReserve"]) ) { ?>
$("#suivre").html($("#murir").html())
<?php } ?>
......
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