From 27c435e4bb5367e2e618388ab7ae7b86ab0d6a07 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 24 Jan 2018 13:12:15 +0100
Subject: [PATCH] Fix report giornaliero

---
 .vs/MedAP/v15/.suo                            | Bin 195584 -> 195584 bytes
 MedAP/WebUserControl/mod_fattura.ascx         |   4 ++-
 MedAP/WebUserControl/mod_giornaliero.ascx     |  34 ++++++++----------
 MedAP/WebUserControl/mod_giornaliero.ascx.cs  |   9 +++++
 .../mod_giornaliero.ascx.designer.cs          |   9 -----
 5 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/.vs/MedAP/v15/.suo b/.vs/MedAP/v15/.suo
index 78ac16a7d3fa4f3f8ad5a60f133a6b803e091c84..e26474df4bfcfb3491bea5ca980880e53f8e0f53 100644
GIT binary patch
delta 1257
zcmb_aTWkzr6rOWtraQCivJ^{GR0Y*aZS87HUAm11snk88if!Gt)SbGtrL>CBDAV@$
zAks~nNrZ^*uz$%$@E~3!;(@I+co6X*;*!w1)tRM1QoNY#x95ES`M){m|G%l|uvK)}
zYMrBm?#C_&Gbxt|U%R@x%w-@fB+PDEJQ$^-3oC8LR<r=@*7k_|F>$i?QLI)c(k|NH
zwOKnVje)6Ji<AQ!v@eoFE~3gtV~D&6q~VS{(nkHzmPVyf$<$k_)n$|ppe9?jqskaq
zskJCMuvYt`IOJ7S@o5Eh4#TM)aY3G$YWJob&t6Iev!yv_97*$uFDI-Z&@lur#R5Vh
zA)EMWiqk2Ynst=tQ@+J~+sO(=8A)UtEgE;GI>$np(Ydz&P$|plNi+IZUA6afQK`F6
zD&-lZi|##zGPBb(ic7w~X&$Wkp2TY2di#*|R55!NQ#AW+qG-0-Vd~Xg#7YQXwVU<P
z+Lk)WcwMikP;PXd{a^*R@#b6%N;4+9X^0CS-$5R;HbOnzVvUV(o?TRNFx%jV#k|!I
zv+TC=XhEQ#U=i*y2thUT8enHRVfxFy3`ubJ_tkXX7JwMBAq2cHjR1tmQ<T}GoG)mF
zW?8=uG0fiz9##{8IlM9qBLI5b4-Pi34F*WbtF{-hg2$N69)}@LCYtE`$(gqklcW?^
zx|_i@7#TH?M#vJlzYY8%i+=*Kto#F1>Q5n7&ZW|Qma-Jjvy%B3$3Baw1V2N9s-FgA
zZ}VX^&pm*TK(`{%O046dN-T!p8BnFa-W;+*55{Zb_6_5{LwEyNd=pG&7n{J!XEZ}d
zWT$*ktmS*`y!kLziFzC=wzB_v*E`uI5hs|2_Tj!`<_Hx5NQt->xpv|ibcFUNIEbIF
z!CJ7caiva5b~>GDuAm#6<$qf6%axms{6c$jz#VbGgY0!CZsH9m@KiMO1R<4$u0R@_
z+Yav{-te-8ScS~1VlFRf!ho!IfYi_n7x2C3Fl=G92F;tfp3c)S8m-*w!}szZZM5ju
zP~iz8hB0^$6UOWN$j0lRAl@PfvF3-#$NKOg=$CPj9zfI|V3dBF5Jp9Br}%=_o)cc8
Vq(39+h*B(IuR5?l-~JYB)Nh_Cj9CBx

delta 1338
zcmb_ZZERCz6u#%&+x24u?mDtzDWTcMr(xE$+k&j4VVzNsWkE<#hikVn5n(F~3`W$B
z$Y3S{%j<dwF=T^z#Xv@8<6ceXGBq){L|rh^&W&V0jNykNh%<D=GSAh@4<m_*zPV4H
z^FHUC_ndo9ER`KgWuNjcLnU)`MagH=!niv(H)pCU!^K!KxNQ+?3*Y@NE3pr)05S2B
z`WkLoEAFVBc0VWz$IrEjE^P%=ia~7?>=tRQz_OD)dlC;=wt}|!jY-bU%H+PBRlzPZ
z-`Z(^n$3k=Br3XWE8tl%XxjwMB5f<MG_vP85$P!sHv@WitT++1Kjwp{{!peWV>M=*
z=J9a$GaOsb*umgGQ5u-Tj0mHK?@i3>nOm66oO-r*v0WrSDPL;apHUN60^U_nm6&aD
zF426|{<Vn(uYaWHnuR=^P{v{9jCG<fkT=gP6X07FV>>tH>yG)wTRplMFE6fqo<+0H
zU&pNd0&8a7z05_-ZOr>JaR)PO#*6WQ_x*UvW;Sy6wgY^LpWkz#R$3bJCl*|~^9wYR
zqZfK$jCy<FqP<yZQ<{`^B|_b4D4?c3*d|B&AgDX4@)U(X#j4Oq1%53rCcve_7j$_7
z;?|bPfddEkM<|?xHSmF{byCB}V5QT;u!;^#nEz)|{fE$Rp_>!nFh;;dxf0gV#wpM#
zl>}YxOv2+JKbwTJDu({yWv9Nkt+^pnt0dCibSOfRX{@2z3DD==N59uw>oo{b_(^or
z-P_QinTr(NLl06g51hs{xM4H(<=|zyGz%ViAr0GY@gtZtP6N_8JG$k}5&Qv+Gko2k
z;UQUf6pzEu+hEuJ<p@!1sSQc@F&qXeJP(i1z<F@UP(KW-RGNlzIll|XRKtU||2k{<
z(%isdihYCp>YF$Q6rAF5n?oiZ@=D2j7yycDxLQ0>=#`}>(EvIzi;HMr5^`jTA7hsL
zFJdXxX}DYLsdLHt_1N!>_hZttrmUj+;hO44%X}e!=#~FzQ#-D~r^Z%93Z|iuTB}f(
zj(6}Yi;)6Nc#HDojWAYPh4aL6s%ydH#t_>6zDBQ=Zf!u1^o-!N)zZ#eUrf0V;V~Mo
z#T*&!z*FA%E?iBGzrjk1BI?u_#utsx5&5-zBguS)@jYgVj-zh6kwT{|`4+Ec8$Yr<
t&A5&l18MXYj>^&N7=-wYY5jyj^<EB@jNw(<{Hoc>uQ;sAsTnM`{to{C+aUk|

diff --git a/MedAP/WebUserControl/mod_fattura.ascx b/MedAP/WebUserControl/mod_fattura.ascx
index 981c1f8..e656cb1 100644
--- a/MedAP/WebUserControl/mod_fattura.ascx
+++ b/MedAP/WebUserControl/mod_fattura.ascx
@@ -11,7 +11,9 @@
         <h1><%# SteamWare.memLayer.ML.cdv("FATT_H1") %></h1>
         <p>
         <%# SteamWare.memLayer.ML.cdv("FATT_P1") %><br />
-           <%# SteamWare.memLayer.ML.cdv("FATT_P2") %>
+           <%# SteamWare.memLayer.ML.cdv("FATT_P2") %><br />
+           <%# SteamWare.memLayer.ML.cdv("FATT_P3") %><br />
+           <%# SteamWare.memLayer.ML.cdv("FATT_P4") %>
         </p>
         <div class="text-left">
           <strong style="font-size: 2em;">
diff --git a/MedAP/WebUserControl/mod_giornaliero.ascx b/MedAP/WebUserControl/mod_giornaliero.ascx
index f7cca10..7216a3b 100644
--- a/MedAP/WebUserControl/mod_giornaliero.ascx
+++ b/MedAP/WebUserControl/mod_giornaliero.ascx
@@ -1,23 +1,17 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_giornaliero.ascx.cs" Inherits="MedAP.WebUserControl.mod_giornaliero" %>
 
 <div class="row">
-  <div class="col-xs-7 text-center">
+  <div class="col-xs-8 text-left">
     <div class="row">
       <h1>Registro Fatture Emesse</h1>
+    <p class="small"><%: SteamWare.memLayer.ML.cdv("FATT_P2") %> - <%: SteamWare.memLayer.ML.cdv("FATT_P3") %> | <%: SteamWare.memLayer.ML.cdv("FATT_P4") %></p>
     </div>
   </div>
-  <div class="col-xs-5 text-right text-info">
+  <div class="col-xs-4 text-right text-info">
     <h1><%: SteamWare.memLayer.ML.cdv("FATT_H1") %></h1>
     <p>
       <%: SteamWare.memLayer.ML.cdv("FATT_P1") %>
     </p>
-    <div class="text-right">
-      <strong style="font-size: 2em;">
-        <asp:Label ID="tipoLabel" runat="server" Text='<%# Eval("tipo") %>' /></strong>
-    </div>
-  </div>
-  <div class="col-xs-12 text-right small">
-    <%: SteamWare.memLayer.ML.cdv("FATT_P2") %>
   </div>
 </div>
 <div class="row">
@@ -25,19 +19,19 @@
     <asp:Repeater runat="server" ID="repMonth" DataSourceID="odsMonth">
       <ItemTemplate>
         <div class="panel panel-default">
-          <div class="panel-heading">
+          <div class="panel-heading fontBig">
             <div class="row">
               <div class="col-xs-12">
-                <b><%# Eval("anno") %> / <%# Eval("mese") %></b>
+                <b><%# Eval("anno") %> / <%# meseFromInt(Eval("mese"))%></b>
               </div>
             </div>
           </div>
-          <div class="panel-body bg-default fontSmall">
+          <div class="panel-body bg-default fontStd">
             <asp:HiddenField runat="server" ID="hfAnno" Value='<%# Eval("anno") %>' />
             <asp:HiddenField runat="server" ID="hfMese" Value='<%# Eval("mese") %>' />
             <asp:Repeater runat="server" ID="repDay" DataSourceID="odsDay">
               <ItemTemplate>
-                <div class="panel panel-default">
+                <div class="panel panel-info">
                   <div class="panel-heading">
                     <div class="row">
                       <div class="col-xs-12">
@@ -45,11 +39,11 @@
                       </div>
                     </div>
                   </div>
-                  <div class="panel-body bg-default fontSmall">
+                  <div class="panel-body bg-default fontSmall" style="padding-top: 0;">
                     <asp:HiddenField runat="server" ID="hfGiorno" Value='<%# Eval("giorno") %>' />
                     <asp:Repeater runat="server" ID="repDocs" DataSourceID="ods">
                       <HeaderTemplate>
-                        <div class="row bg-info">
+                        <div class="row bg-primary">
                           <div class="col-xs-1 text-left">
                             TIPO
                           </div>
@@ -132,24 +126,24 @@
               </SelectParameters>
             </asp:ObjectDataSource>
           </div>
-          <div class="panel-footer bg-info fontSmall">
+          <div class="panel-footer bg-info fontStd">
             <div class="row text-right">
-              <div class="col-xs-8 text-left">
+              <div class="col-xs-5 text-left">
                 <b>TOTALE MENSILE</b>
               </div>
               <div class="col-xs-1">
                 #  DOC<br />
                 <b><%# Eval("numDoc") %></b>
               </div>
-              <div class="col-xs-1">
+              <div class="col-xs-2">
                 NETTO<br />
                 <b><%# Eval("totNetto","{0:C2}") %></b>
               </div>
-              <div class="col-xs-1">
+              <div class="col-xs-2">
                 IVA<br />
                 <b><%# Eval("totIva","{0:C2}") %></b>
               </div>
-              <div class="col-xs-1">
+              <div class="col-xs-2">
                 IMPORTO<br />
                 <b><%# Eval("totImporto","{0:C2}") %></b>
               </div>
diff --git a/MedAP/WebUserControl/mod_giornaliero.ascx.cs b/MedAP/WebUserControl/mod_giornaliero.ascx.cs
index 91af8f3..0a0e713 100644
--- a/MedAP/WebUserControl/mod_giornaliero.ascx.cs
+++ b/MedAP/WebUserControl/mod_giornaliero.ascx.cs
@@ -13,5 +13,14 @@ namespace MedAP.WebUserControl
     {
 
     }
+
+    public string meseFromInt(object _num)
+    {
+      int num = 0;
+      int.TryParse(_num.ToString(), out num);
+      string answ = "";
+      answ = new DateTime(2000, num, 1).ToString("MMMM").ToUpper();
+      return answ;
+    }
   }
 }
\ No newline at end of file
diff --git a/MedAP/WebUserControl/mod_giornaliero.ascx.designer.cs b/MedAP/WebUserControl/mod_giornaliero.ascx.designer.cs
index 832991a..ebeca47 100644
--- a/MedAP/WebUserControl/mod_giornaliero.ascx.designer.cs
+++ b/MedAP/WebUserControl/mod_giornaliero.ascx.designer.cs
@@ -12,15 +12,6 @@ namespace MedAP.WebUserControl {
     
     public partial class mod_giornaliero {
         
-        /// <summary>
-        /// Controllo tipoLabel.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label tipoLabel;
-        
         /// <summary>
         /// Controllo repMonth.
         /// </summary>