Skip to content

K
kiosqueip
Commit 5cdfa360 authored by Hamza Arfaoui's avatar Hamza Arfaoui
Browse files
Options

CAFI184 CAFI185 CAFI186

parent a44de181
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 6 deletions
pile/css/globalcolors.php
View file @ 5cdfa360
...@@ -24,6 +24,7 @@ echo ' ...@@ -24,6 +24,7 @@ echo '
.rdvbot {font-size:11px;padding:0px;padding-left:5px;padding-right:5px;background-color:#ffffff;color:'.$rdvcolor.';} .rdvbot {font-size:11px;padding:0px;padding-left:5px;padding-right:5px;background-color:#ffffff;color:'.$rdvcolor.';}
.rdvbot2 {padding:0px;background-color:#ffffff;color:#e34740;border-top:1px solid '.$rdvcolor.';font-weight:bold;} .rdvbot2 {padding:0px;background-color:#ffffff;color:#e34740;border-top:1px solid '.$rdvcolor.';font-weight:bold;}
.rdvG a.bt2 {background: '.$rdvcolor.';color:#fff;} .rdvG a.bt2 {background: '.$rdvcolor.';color:#fff;}
.title-rdv{color : '.$rdvcolor.'}
.srdv {border:1px solid '.$srdvcolor.';width:280px;height:65px;margin-top:5px;background-color:#ffffff;color:'.$srdvcolor.';margin-left:auto;margin-right:auto;font-size:12px;} .srdv {border:1px solid '.$srdvcolor.';width:280px;height:65px;margin-top:5px;background-color:#ffffff;color:'.$srdvcolor.';margin-left:auto;margin-right:auto;font-size:12px;}
.srdvtop {font-size:13px;padding:0px;padding-left:5px;background-color:'.$srdvcolor.';color:#ffffff;} .srdvtop {font-size:13px;padding:0px;padding-left:5px;background-color:'.$srdvcolor.';color:#ffffff;}
...@@ -31,6 +32,7 @@ echo ' ...@@ -31,6 +32,7 @@ echo '
.srdvbot {font-size:11px;padding:0px;padding-left:5px;padding-right:5px;background-color:#ffffff;color:'.$srdvcolor.';} .srdvbot {font-size:11px;padding:0px;padding-left:5px;padding-right:5px;background-color:#ffffff;color:'.$srdvcolor.';}
.srdvbot2 {padding:0px;background-color:#ffffff;color:'.$srdvcolor.';border-top:1px solid '.$srdvcolor.';font-weight:bold;} .srdvbot2 {padding:0px;background-color:#ffffff;color:'.$srdvcolor.';border-top:1px solid '.$srdvcolor.';font-weight:bold;}
.srdvG a.bt2 {background: '.$srdvcolor.';color:#fff;} .srdvG a.bt2 {background: '.$srdvcolor.';color:#fff;}
.title-srdv{color : '.$srdvcolor.'}
.myst {border:1px solid '.$mystcolor.';width:94%;height:65px;margin-top:5px;background-color:#ffffff;color:'.$mystcolor.''.$mystcolor.';margin-left:auto;margin-right:auto;font-size:12px;} .myst {border:1px solid '.$mystcolor.';width:94%;height:65px;margin-top:5px;background-color:#ffffff;color:'.$mystcolor.''.$mystcolor.';margin-left:auto;margin-right:auto;font-size:12px;}
.mysttop {font-size:100%;padding:0px;padding-left:5px;background-color:'.$mystcolor.';color:#ffffff;} .mysttop {font-size:100%;padding:0px;padding-left:5px;background-color:'.$mystcolor.';color:#ffffff;}
......
pile/functions.php
View file @ 5cdfa360
...@@ -1191,6 +1191,9 @@ function getEntityColors($entites) { ...@@ -1191,6 +1191,9 @@ function getEntityColors($entites) {
} else { } else {
$entityColors = array("red"); $entityColors = array("red");
} }
if($GLOBALS["PILE_CONF"]["RDV_SRDV_COLUMNS"] == true){
$entityColors = array("srdv", "rdv");
}
return $entityColors; return $entityColors;
} }
...@@ -1199,7 +1202,7 @@ function getAttenteColumns($agence, $attenteData, $entites, $motifs) { ...@@ -1199,7 +1202,7 @@ function getAttenteColumns($agence, $attenteData, $entites, $motifs) {
$column = ""; $column = "";
$entityColors = getEntityColors($entites); $entityColors = getEntityColors($entites);
$comp = 0; $comp = 0;
var_dump($entityColors);
foreach ($attenteData as $key => $columnData) { foreach ($attenteData as $key => $columnData) {
$column .= ' $column .= '
<td class="pile-column attente" id="attente-column"> <td class="pile-column attente" id="attente-column">
......
pile/js/pile.js
View file @ 5cdfa360
...@@ -978,7 +978,7 @@ $(document).on("click", "#submit-btn-fiche-cns", function(e) { ...@@ -978,7 +978,7 @@ $(document).on("click", "#submit-btn-fiche-cns", function(e) {
if (validForm) { if (validForm) {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "../../admin/do.php", url: "../admin/do.php",
data: $("#formCnsNew").serialize(), data: $("#formCnsNew").serialize(),
success: function(data) { success: function(data) {
$('#contentFicheCns').html(data); $('#contentFicheCns').html(data);
......
statistiques/dcc/src/Statistiques.php
View file @ 5cdfa360
...@@ -115,7 +115,7 @@ class Statistiques extends Model ...@@ -115,7 +115,7 @@ class Statistiques extends Model
$where[] .= '( '.implode(' OR ', $like).' )'; $where[] .= '( '.implode(' OR ', $like).' )';
$args['keyword'] = '%'.$keyword.'%'; $args['keyword'] = '%'.$keyword.'%';
} }
if($GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"] && $GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"]){ if(isset($GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]) && $GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"] && $GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"]){
foreach ($GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"] as $choice) { foreach ($GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"] as $choice) {
if($choice == 'shipping') if($choice == 'shipping')
$where[] .= 'stat.rdv NOT IN(3,4)'; $where[] .= 'stat.rdv NOT IN(3,4)';
......
statistiques/dcc/views/index.php
View file @ 5cdfa360
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<th class="red"><?php echo $helper->addSort(array('field' => 'rdv', 'name' => 'Sans RDV') ) ?></th> <th class="red"><?php echo $helper->addSort(array('field' => 'rdv', 'name' => 'Sans RDV') ) ?></th>
<?php <?php
$srdv_last = ' last'; $srdv_last = ' last';
if($GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"] && $GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"]){ if(isset($GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]) && $GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"] && $GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"]){
foreach ($GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"] as $choice) { foreach ($GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"] as $choice) {
if($choice == 'shipping'){ if($choice == 'shipping'){
$srdv_last = ''; $srdv_last = '';
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<td class="with-border"><?php echo $statRdv->ardv ?></td> <td class="with-border"><?php echo $statRdv->ardv ?></td>
<td class="with-border<?php echo $srdv_last ?>"><?php echo $statRdv->srdv ?></td> <td class="with-border<?php echo $srdv_last ?>"><?php echo $statRdv->srdv ?></td>
<?php <?php
if($GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"] && $GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"]){ if(isset($GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]) && $GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"] && $GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"]){
foreach ($GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"] as $choice) { foreach ($GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"] as $choice) {
if($choice == 'shipping'){ if($choice == 'shipping'){
?> ?>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<td><?php echo $client->conseiller ?></td> <td><?php echo $client->conseiller ?></td>
<?php <?php
if($GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"] && $GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"] && in_array('shipping', $GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"])){ if(isset($GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]) && $GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"] && $GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"] && in_array('shipping', $GLOBALS["BO_CONF"]["AGENCE"]["SIEGE"]["CHOICES"])){
if($client->rdv == 1){ if($client->rdv == 1){
echo "<td>1</td><td>0</td><td>0</td>"; echo "<td>1</td><td>0</td><td>0</td>";
}elseif ($client->rdv == 0) { }elseif ($client->rdv == 0) {
......
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