- Start improve statistiques index

This commit is contained in:
Vincent BRIDIER 2021-09-06 12:38:09 +02:00
parent 7e381502c2
commit 89f7dd0638
3 changed files with 54 additions and 67 deletions

View file

@ -23,33 +23,21 @@ class StatistiqueController extends Controller
{
$sites = Auth::user()->sites()->get();
foreach ($sites as $site) {
$time_start = microtime(true);
if (isset($site->campagnes)) {
$campagnes = $site->campagnes;
foreach ($campagnes as $campagne) {
switch ($campagne->camp_type) {
case 0:
$campagne->camp_type = "Mur";
break;
case 1:
$campagne->camp_type = "Panier";
break;
case 2:
$campagne->camp_type = "Mur sans sélection";
break;
case 3:
$campagne->camp_type = "Panier Sélectionnable";
break;
}
$coupons = $campagne->coupons;
foreach ($coupons as $coupon) {
$coupon->quantity = $this->getFullQuantity($coupon);
$coupon->remain = $this->getFullQuantity($coupon) - $this->getUsedQuantity($coupon);
$coupon->diffused = $this->getDiffusedQuantity($coupon);
$coupon->isPrintable = $this->isAvailableToPrint($coupon, $campagne);
$coupon->isPaused = $this->isPausedToPrint($coupon, $campagne);
foreach ($campagne->coupons as $coupon) {
// $coupon->quantity = $this->getFullQuantity($coupon);
// $coupon->remain = $coupon->quantity - $this->getUsedQuantity($coupon);
// $coupon->diffused = $this->getDiffusedQuantity($coupon);
// $coupon->isPrintable = $this->isAvailableToPrint($coupon, $campagne);
// $coupon->isPaused = $this->isPausedToPrint($coupon, $campagne);
}
}
}
$time_end = microtime(true);
//dd(($time_end - $time_start));
}
return view('stats.index')->with(['sites' => $sites]);
}

View file

@ -6,8 +6,10 @@ use App\Campagne;
use App\Coupon;
use App\Contact;
use App\Calendrier;
use App\Enums\CampaignTypes;
use App\Models\Customers;
use App\Models\PrintedWalls;
use App\Mouvement;
use App\Mur;
use App\Statistique;
use App\Panier;
@ -150,22 +152,29 @@ trait CouponTrait
public function isAvailableToPrint(Coupon $coupon, Campagne $campagne)
{
$availableToPrint = true;
// ---- Contrôle de la publication
if ($coupon->coupon_published == 0) {
$availableToPrint = false;
/**
* Contrôle de la publication de la campagne
*/
if ($campagne->camp_published === 0) {
return false;
}
// ---- Contrôle de la publication du coupon
if ($coupon->coupon_published === 0) {
return false;
}
// ---- Contrôle la date de début de diffusion
if ($coupon->coupon_mindatediffusion != null) {
if ($coupon->coupon_mindatediffusion !== NULL) {
if (strtotime(date('Y-m-d')) < strtotime($coupon->coupon_mindatediffusion)) {
$availableToPrint = false;
return false;
}
}
// ---- Contrôle la date de validité
if ($coupon->coupon_maxdatediffusion != null) {
if ($coupon->coupon_maxdatediffusion !== NULL) {
if (strtotime(date('Y-m-d')) > strtotime($coupon->coupon_maxdatediffusion)) {
$availableToPrint = false;
return false;
}
}
@ -179,31 +188,24 @@ trait CouponTrait
}
}
if (!$pub) {
$availableToPrint = false;
return false;
}
}
if ($campagne->camp_published == 0) {
$availableToPrint = false;
}
return $availableToPrint;
return true;
}
public function isPausedToPrint(Coupon $coupon, Campagne $campagne)
{
$availableToPrint = true;
// ---- Contrôle la date de début de diffusion
if ($coupon->coupon_mindatediffusion != null) {
if ($coupon->coupon_mindatediffusion !== NULL) {
if (strtotime(date('Y-m-d')) < strtotime($coupon->coupon_mindatediffusion)) {
$availableToPrint = false;
return false;
}
}
// ---- Contrôle la date de validité
if ($coupon->coupon_maxdatediffusion != null) {
if ($coupon->coupon_maxdatediffusion !== NULL) {
if (strtotime(date('Y-m-d')) > strtotime($coupon->coupon_maxdatediffusion)) {
$availableToPrint = false;
return false;
}
}
@ -217,11 +219,11 @@ trait CouponTrait
}
}
if (!$pub) {
$availableToPrint = false;
return false;
}
}
return $availableToPrint;
return true;
}
@ -266,26 +268,22 @@ trait CouponTrait
public function getFullQuantity(Coupon $coupon)
{
$mouvements = $coupon->mouvements()->get();
$nombre = array();
foreach ($mouvements as $mouvement) {
array_push($nombre, $mouvement->mouvement_nombre);
}
return array_sum($nombre);
return (int) Mouvement::where('mouvement_couponId', $coupon->coupon_id)->sum('mouvement_nombre');
}
public function getUsedQuantity(Coupon $coupon)
{
$countPrinted = 0;
$couponId = $coupon->coupon_id;
$campagnes = $coupon->campagnes()->get();
foreach ($campagnes as $campagne) {
if ($campagne->camp_type == 0 || $campagne->camp_type == 2) { // Murs
$murs = Mur::where(['mur_campid' => $campagne->camp_id, 'mur_couponId' => $coupon->coupon_id])->get();
$countPrinted = $countPrinted + count($murs);
} else { // Paniers
foreach ($coupon->campagnes as $campagne) {
if ($campagne->camp_type === CampaignTypes::mur() || $campagne->camp_type === CampaignTypes::murss()) {
// Murs
$murs = Mur::where(['mur_campid' => $campagne->camp_id, 'mur_couponId' => $coupon->coupon_id])->count();
$countPrinted += $murs;
} else {
// Paniers
// TODO : Revoir la requete
$campagneId = $campagne->camp_id;
$countPrinted = PanierContent::where('panier_content_couponId', $couponId)->whereHas('panier', function ($query) use ($campagneId) {
$countPrinted = PanierContent::where('panier_content_couponId', $coupon->coupon_id)->whereHas('panier', function ($query) use ($campagneId) {
$query->where('panier_campId', $campagneId);
})->sum('panier_content_printed');
}
@ -296,15 +294,16 @@ trait CouponTrait
public function getDiffusedQuantity(Coupon $coupon)
{
$countPrinted = 0;
$couponId = $coupon->coupon_id;
$campagnes = $coupon->campagnes()->get();
foreach ($campagnes as $campagne) {
if ($campagne->camp_type == 0 || $campagne->camp_type == 2) { // Murs
$murs = Mur::where(['mur_campid' => $campagne->camp_id, 'mur_couponId' => $coupon->coupon_id])->get();
$countPrinted = $countPrinted + count($murs);
} else { // Paniers
foreach ($coupon->campagnes as $campagne) {
if ($campagne->camp_type === CampaignTypes::mur() || $campagne->camp_type === CampaignTypes::murss()) {
// Murs
$murs = Mur::where(['mur_campid' => $campagne->camp_id, 'mur_couponId' => $coupon->coupon_id])->count();
$countPrinted += $murs;
} else {
// Paniers
// TODO : Revoir la requete
$campagneId = $campagne->camp_id;
$panierContents = PanierContent::where('panier_content_couponId', $couponId)->whereHas('panier', function ($query) use ($campagneId) {
$panierContents = PanierContent::where('panier_content_couponId', $coupon->coupon_id)->whereHas('panier', function ($query) use ($campagneId) {
$query->where('panier_campId', $campagneId);
})->get();
$panierContentCountPrinted = $panierContents->sum('panier_content_printed');

View file

@ -22,7 +22,7 @@
@endif
</p>
<p><a href="{{ route('camp.stats', $campagne) }}">{{ $campagne->camp_name }} ({{ $campagne->camp_id }})</a></p>
<p>{{ $campagne->camp_type }}</p>
<p>{{ CampaignType::make($campagne->camp_type)->label }}</p>
<p>{{ $campagne->coupons->count() }} Coupon(s) <i class="fas fa-exclamation-triangle red tooltip"><span class="tooltiptext">Des coupons de cette campagne ne sont plus imprimables.</span></i></p>
<p>{{ date('d/m/Y', strtotime($campagne->camp_createdate)) }}</p>
<p>@if (isset($campagne->coupons) && $campagne->coupons->count()>0)<i class="fas fa-angle-down"></i>@endif</p>