From 2d2562c0cdae62675f2eb6389e125613db13299e Mon Sep 17 00:00:00 2001 From: Marco Audiffredi Date: Thu, 21 Dec 2023 12:57:53 +0100 Subject: [PATCH] varie visualizzazioni chiamate --- Controllers/ChiamateController.cs | 2 +- Controllers/DatiAziendaController.cs | 3 ++- Controllers/ImpiantiController.cs | 6 ++++-- Views/DatiAzienda/Index.cshtml | 7 ++++--- wwwroot/assets/images/icons8-nuovo-50.png | Bin 902 -> 667 bytes wwwroot/assets/images/icons8-nuovo-50_old.png | Bin 0 -> 902 bytes 6 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 wwwroot/assets/images/icons8-nuovo-50_old.png diff --git a/Controllers/ChiamateController.cs b/Controllers/ChiamateController.cs index e55bd42..2f83eae 100644 --- a/Controllers/ChiamateController.cs +++ b/Controllers/ChiamateController.cs @@ -77,7 +77,7 @@ namespace VirtualTask.Controllers var pageSize = 10; var shortLinks = modelList - .OrderByDescending(s => s.chcodimp) + .OrderByDescending(s => s.chnumero) .ToPagedList(page ?? 1, pageSize); return View(shortLinks); diff --git a/Controllers/DatiAziendaController.cs b/Controllers/DatiAziendaController.cs index e92010d..9ff3385 100644 --- a/Controllers/DatiAziendaController.cs +++ b/Controllers/DatiAziendaController.cs @@ -44,7 +44,8 @@ namespace VirtualTask.Controllers { SessionHelper helper = new SessionHelper(this); token = helper.GetStringValue("tok"); - + tenant = helper.GetStringValue("tenant"); + tenant2= helper.GetStringValue("tenant2"); if (string.IsNullOrEmpty(token)) { return RedirectToAction("Login2", "Login"); diff --git a/Controllers/ImpiantiController.cs b/Controllers/ImpiantiController.cs index 34e13e3..07672a5 100644 --- a/Controllers/ImpiantiController.cs +++ b/Controllers/ImpiantiController.cs @@ -16,6 +16,7 @@ namespace VirtualTask.Controllers string urlBase = string.Empty; string token = string.Empty; string tenant = string.Empty; + string tenant2 = string.Empty; string errMes = string.Empty; string admin = string.Empty; @@ -36,7 +37,8 @@ namespace VirtualTask.Controllers { SessionHelper helper = new SessionHelper(this); token = helper.GetStringValue("tok"); - + tenant = helper.GetStringValue("tenant"); + tenant2 = helper.GetStringValue("tenant2"); if (string.IsNullOrEmpty(token)) { return RedirectToAction("Login2", "Login"); @@ -57,7 +59,7 @@ namespace VirtualTask.Controllers { string data = response.Content.ReadAsStringAsync().Result; modelList = JsonConvert.DeserializeObject>(data); - modelList = modelList.Where(s => !string.IsNullOrEmpty(s.imcodimp)).ToList(); + modelList = modelList.Where(s => !string.IsNullOrEmpty(s.imcodimp) && s.imcodazi.Equals(tenant2)).ToList(); if (!string.IsNullOrEmpty(searchString)) { diff --git a/Views/DatiAzienda/Index.cshtml b/Views/DatiAzienda/Index.cshtml index d2a66f0..f50cf65 100644 --- a/Views/DatiAzienda/Index.cshtml +++ b/Views/DatiAzienda/Index.cshtml @@ -7,12 +7,13 @@ -

- Create New -

+
+

+ Crea un nuovo elemento +

diff --git a/wwwroot/assets/images/icons8-nuovo-50.png b/wwwroot/assets/images/icons8-nuovo-50.png index 4d27159948fd549034b96b8795278e111819a7b5..aca10a4dac080df1c82bd0b596d584c13a65fd1a 100644 GIT binary patch delta 642 zcmV-|0)7342b%?uB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ib z000ib0l1NC?EnA(8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10t-n* zK~!i%?U_w01yLNvFD0^)2w#B0&RZ#BquAI{d;-}iYm}`lynk%$EwGZZ6S0tmEJVo% z@VXT8`aE<0qwAVE=G=~%GdjQe^`AN2?mf@UnYlCPWE>8MBUKbhRZ$E_U_Y#5LxG&a zN%-vT1=9^D;50m8gDGm^0sJsz6;!bT`MFtdPXpB%DS-^p4)5V2JcsWv%9+gP5*}wa zLs^Dna0c?M7=K|D^5|T{dN#zs669}Ad3zdg{D(0pbpc*vH|<3gq*^M6Q(QbseUKU% z)mYzwy>JMwv%w&purIs$jRDvO_uwuYa^SVO3AOKL48rlsAg1A2=6CCwAMT4NXJi23F@Fd7oBZR{LUpkxL7CKYsgbcQ zNWs_^B=?%o!nPo#Qu%nKg>6ALAn!_B-ku?nxN8+mnl5%eGKKaxEkRl#A6)0Xy#Ue@ zqybjI7H=d59C=+4)jK3JlU~zH6v#U9`j&<&gh=4WX$ zPj%gDTZ3oV42%FKz;D0>pafV5oB{?yZET-yc!Cn3HzY8~A7WH}uf`ZxOat0tM7r`d zFg;(Q*8n>-uj_yY;BE>gGPGkgXzUu@YjxTtE~O|qS6)oZ#PV@8VZ_ojjBNM7$c{9O zobvQ5A_#Yd&1mSbTPGqe)qV#Mh27wE>WQ_Cn{ zD$_Z@8I{@g6^f6zzCrdYH~fRSSrVb}Uo2T(+A8?#eVk)p!NnU#n`B+-)(tF5?wBKkQ%A<+Hj3J8ibd)*-%wdd? zv}mVKgH7ZCtMU*l<>U#?5!2x%(BmMqM{S3))HRbw*n^5%ZBut^+iF)h^p!*0yZ1J= zL4C?Jh8?R`V|xR;6}XFuh1ecF^?h|Zz2}_gowIk(*tfoQ zdj6g7_dU<=d4JDy4ou?T#U9`j&<&gh=4WX$Pj%gDTZ3oV42%FKz;D0>pafV5oB{?y zZET-yc!Cn3HzY8~A7WH}uf`ZxOat0tM7r`dFg;(Q*8n>-uj_yY;BE>gGPGkgXzUu@ zYjxTtE~O|qS6)oZ#PV@8VZ_ojjBNM7$c{9Oob>M80q*M1B-xb zz_15KMu2<3(p(G_0tbOX4-A+Pzbn-#N;0t$==4CaNnoe6M&g+VB8?-T#u@qOfk2bP zQ;Eba4+I)V-i|Y}#RGxHkydLYY%2ZL1Cb_y{lE+oa3f(5izPr`pzN~BgKe@QlK}1y zv~5z|)j(Mlup&moO&rkVV8mi?f{`OYdx*BK9w-mA-3k;0lG71j0dOEj!<8fx>wsSl zMk;ml$1z6ENAz!1-!Iw%7Xv$WFfk0gSO3h|*=RMckK4Asb(o(>cr~zCG37F~cByVq zv3MVN4ouOB%1q#mHd00U7mw5NE^2$+;23BbBYldM>Ifr^Kv#gD1N9q#eZWy&+pUnwXuxmnJoT#Oh6 zJvjus$9#l=Xl{-=JtWudW4MdQc^*={mx zf+dYFwBlujjg^NUh%^a&qE#*yg<2Yor+nnHvC3eh2ZBumtu|*=c_7$C&}wr=y$6C# z1g$n_GrVb}Uo2T(+A8?#eVk)p!NnU#n`B+-) z(tF5?wBKkQ%A<+Hj3J8ibd)*-%wdd?w5LylP2>Tq@(?TK;M1& literal 0 HcmV?d00001