From 36b78521949e0bff434e4cb964e39dd32097b83a Mon Sep 17 00:00:00 2001
From: paoloar77 <paolo.arena77@gmail.com>
Date: Wed, 12 Feb 2025 09:33:53 +0100
Subject: [PATCH] aggio Argomento

---
 .DS_Store                                       | Bin 0 -> 8196 bytes
 app/CustomFuncPao.php                           |   4 ++++
 app/Http/Controllers/ArticleController.php      |   6 ++++++
 resources/views/export_articles_sales.blade.php |   4 ++++
 4 files changed, 14 insertions(+)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..e1beca4a7446065d4a06f034ce2c9f83bf25ec48
GIT binary patch
literal 8196
zcmeHMJ%|%Q6n>NBE;$6bLLq{}7J`K$9B3)5=PF)x2Zx2&Xp*}qB)1`#6G6m)tw=zz
zvJfkaE3Og*3sJNYuC-AFJ1ykEMzryJGh_D6{-hM~X2Q%{=6y5o+izxec^e{9^Bb)>
zqB;@PP}$DzL6cM1&oxs@w&xhE!g%Vm=a!psx0gZs4zGY$z$@St@CtYZ{uKrA&gN1p
zc<&ppZ@mIufnBKpKOX{AwxP8{WA&p0jZOhzE9lk**Ry;98(14!J2Vy^6lI3OnxV?3
z7|IMse_(N;wL@dga8fq;P&Tr%8H&=;F@K=pq(WnT>lN?{WEJ4ty+X&SP1k53^LO=i
zaZ&oZaTGN=aRYs|Z(lBrR-e8-?fP32{k^Nnw}H~TEexeHU7;TJWK=2#HxiGGxqa~B
zp~H`KOgpX{ClRw=8IPuRINl63D8_F<>!^K>?!>0^xAIYvN3DM5!1hVaBWFIzX)@B`
z2N_VNsR?##w2HN8yUe~1(tgQl^dNk(a94A3=8$ZPFb)r;dDN%{Z3d_f)OA{Mxtv-6
zmkdVodGd0sQ4TIywMjUK7mbWQJ=y@L4)kfdoc8iwoQ8~JzvQ#DFZ#1)DNMqp2;=ft
zVjeTtJ1fv7MzlWG4A%}Db?-txN^%0?)9B`F=AAR2T)D|ehhJ$2VCc}-+y)tD)&AqO
zUvm2RS?DC@kZg)D4v*><^Qh``7VDGNPVb_l`1+VeNG^At-@pCp*BjO+HIHOdjB@yp
z<}-yo&FhBq@2nS9`iLUDlE?cWV@(`HvUBngZu}4durAjTe+{P#nn(tv{m)LM{gT7O
zpC8U`ZrbxL=8#GhVI+_85v>Dr@x?1pHWJi1|36#&{of1a74QoD#|o%Qv>eUj235gL
za;_bqUPk4@xS_Fn2pXM^!|HS#cKnASt^+`MOla-USoEO$^$!95{jYWR&F)s<H_(@_
AQvd(}

literal 0
HcmV?d00001

diff --git a/app/CustomFuncPao.php b/app/CustomFuncPao.php
index 0738786c..71dc200f 100644
--- a/app/CustomFuncPao.php
+++ b/app/CustomFuncPao.php
@@ -1097,6 +1097,7 @@ class ArticleFormatter
             formatDateToItalian($article->DataPubblicazione),
             $separator,
             $article->DescrizioneCollana,
+            $article->DescrArgomento,
             $separator,
             $article->DescrizioneStatoProdotto,
             $article->DescrizioneFormato,
@@ -1261,6 +1262,9 @@ function libriInPrevendita()
                 ) y'), function ($join) {
                 $join->on('T_WEB_Articoli.IdCollana', '=', 'y.IdCollana');
             })
+            ->leftJoin(DB::raw('(SELECT g2.IdArgomento, g2.Descrizione as DescrArgomento FROM T_WEB_Argomenti g2 JOIN (SELECT IdArgomento, MAX(DataOra) as data12 from T_WEB_Argomenti GROUP BY IdArgomento) h ON g2.IdArgomento = h2.IdArgomento AND g2.DataOra = h2.data1 ) i2'), function ($join) {
+                $join->on('T_WEB_Articoli.ListaArgomenti', '=', 'i2.IdArgomento');
+            })
 
             ->where('DescrizioneStatoProdotto', 'In prevendita')
             ->where(DB::raw('CONVERT(INT, QtaDisponibile)'), '<', 0)
diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
index ddcdba19..0e31685c 100755
--- a/app/Http/Controllers/ArticleController.php
+++ b/app/Http/Controllers/ArticleController.php
@@ -243,12 +243,17 @@ class ArticleController extends Controller
                 ) y'), function ($join) {
                     $join->on('T_WEB_Articoli.IdCollana', '=', 'y.IdCollana');
                 })
+                ->leftJoin(DB::raw('(SELECT g2.IdArgomento, g2.Descrizione as DescrArgomento FROM T_WEB_Argomenti g2 JOIN (SELECT IdArgomento, MAX(DataOra) as data12 from T_WEB_Argomenti GROUP BY IdArgomento) h ON g2.IdArgomento = h2.IdArgomento AND g2.DataOra = h2.data1 ) i2'), function ($join) {
+                    $join->on('T_WEB_Articoli.ListaArgomenti', '=', 'i2.IdArgomento');
+                })
+
                 ->select(
                     'T_WEB_Articoli.*',
                     'f.DescrizioneStatoProdotto',
                     'i.DescrizioneTipologia',
                     'n.DescrizioneFormato',
                     'y.DescrizioneCollana',
+                    'i2.DescrArgomento',
                     DB::raw('COALESCE(o.totVen, 0) as totVen'),
                     DB::raw('COALESCE(u.totFat, 0) as totFat'),
                     DB::raw('COALESCE(p.venduti3mesi, 0) as venduti3mesi'),
@@ -524,6 +529,7 @@ class ArticleController extends Controller
                         'isbn' => $articoloVenduto->Ean13,
                         'IdCollana' => $articoloVenduto->IdCollana,
                         'DescrizioneCollana' => $articoloVenduto->DescrizioneCollana,
+                        'DescrArgomento' => $articoloVenduto->DescrArgomento,
                         'Pagine' => $articoloVenduto->Pagine,
                         'IdTipoFormato' => $articoloVenduto->IdTipoFormato,
                         'Misure' => $articoloVenduto->Misure,
diff --git a/resources/views/export_articles_sales.blade.php b/resources/views/export_articles_sales.blade.php
index e7ad5308..5cf4ba8f 100644
--- a/resources/views/export_articles_sales.blade.php
+++ b/resources/views/export_articles_sales.blade.php
@@ -20,6 +20,7 @@
                     <th>Data Pubbl</th>
                     <th>ISBN</th>
                     <th>Collana</th>
+                    <th>Argomento</th>
                     <th>Pagine</th>
                     <th>Misure</th>
                     <th>Rank 3 M</th>
@@ -64,6 +65,9 @@
                                 <td>@if (isset($articolo->DescrizioneCollana)){{ $articolo->DescrizioneCollana }}@endif
                                     (@if (isset($articolo->IdCollana)){{ $articolo->IdCollana }}@endif)
                                 </td>
+                                <td>@if (isset($articolo->DescrArgomento)){{ $articolo->DescrArgomento }}@endif
+                                    (@if (isset($articolo->IArgomento)){{ $articolo->IArgomento }}@endif)
+                                </td>
 
                                 <td>@if (isset($articolo->Pagine)){{ $articolo->Pagine }}@endif</td>
                                 <td>@if (isset($articolo->Misure)){{ $articolo->Misure }}@endif</td>