vers 208

chiusi altri punti segnalati da Daniele

C2P/C2P.csproj.user

@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ShowAllFiles</ProjectView>
-    <NameOfLastUsedPublishProfile>costimateZip</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>IIS02</NameOfLastUsedPublishProfile>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>

C2P/WebUserControls/mod_AgentsMan.ascx

@@ -19,7 +19,7 @@
                 <asp:BoundField DataField="CodAg" HeaderText="CodAg" SortExpression="CodAg" />
                 <asp:BoundField DataField="Lastname" HeaderText="Lastname" SortExpression="Lastname" />
                 <asp:BoundField DataField="Firstname" HeaderText="Firstname" SortExpression="Firstname" />
-                <asp:BoundField DataField="QuotaProvvAg" HeaderText="QuotaProvvAg" SortExpression="QuotaProvvAg" />
+                <asp:BoundField DataField="QuotaProvvAg" HeaderText="QuotaProvvAg" SortExpression="QuotaProvvAg" DataFormatString="{0:C4}" />
                 <asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center" ItemStyle-Wrap="false">
                      <EditItemTemplate>
                         <asp:LinkButton runat="server" ID="lbUpdate2" CausesValidation="true" CommandName="Update"><i class="fa fa-check fa-2x"></i></asp:LinkButton>

C2P/WebUserControls/mod_PackageMan.ascx

@@ -15,9 +15,18 @@
                     <ItemTemplate>
                         <asp:LinkButton runat="server" ID="lbEdit" CausesValidation="false" CommandName="Edit" Visible='<%# Eval("CodPackag")!="" %>'><i class="fa fa-edit fa-2x"></i></asp:LinkButton>
                     </ItemTemplate>
+
+<ItemStyle HorizontalAlign="Center" Wrap="False"></ItemStyle>
                 </asp:TemplateField>
                 <asp:BoundField DataField="CodPackag" HeaderText="CodPackag" SortExpression="CodPackag" />
-                <asp:BoundField DataField="PackagDesc" HeaderText="PackagDesc" SortExpression="PackagDesc" />
+                <asp:TemplateField HeaderText="PackagDesc" SortExpression="PackagDesc">
+                    <EditItemTemplate>
+                        <asp:TextBox ID="txtPackagDesc" runat="server" Text='<%# Bind("PackagDesc") %>' Width="50em"></asp:TextBox>
+                    </EditItemTemplate>
+                    <ItemTemplate>
+                        <asp:Label ID="lblPackagDesc" runat="server" Text='<%# Bind("PackagDesc") %>'></asp:Label>
+                    </ItemTemplate>
+                </asp:TemplateField>
                 <asp:BoundField DataField="RMCost" HeaderText="RMCost" SortExpression="RMCost" DataFormatString="{0:C4}" />
                 <asp:BoundField DataField="RMWeight" HeaderText="RMWeight" SortExpression="RMWeight" DataFormatString="kg {0:N3}" />
                 <asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center" ItemStyle-Wrap="false">
@@ -28,6 +37,8 @@
                     <ItemTemplate>
                         <asp:LinkButton runat="server" ID="lbDelete" CausesValidation="false" CommandName="Delete" OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaDel") %>' Visible='<%# Eval("CodPackag")!="" %>'><i class="fa fa-trash-o fa-2x"></i></asp:LinkButton>
                     </ItemTemplate>
+
+<ItemStyle HorizontalAlign="Center" Wrap="False"></ItemStyle>
                 </asp:TemplateField>
             </Columns>
             <EmptyDataTemplate>

C2P/WebUserControls/mod_RawMatMan.ascx

@@ -49,7 +49,7 @@
                         <asp:TextBox ID="txtSSVA" runat="server" Text='<%# Bind("SSVA") %>'></asp:TextBox>
                     </EditItemTemplate>
                     <ItemTemplate>
-                        <asp:Label ID="lblSSVA" runat="server" Text='<%# Bind("SSVA", "{0:P2}") %>'></asp:Label>
+                        <asp:Label ID="lblSSVA" runat="server" Text='<%# Bind("SSVA", "{0:C4}") %>'></asp:Label>
                     </ItemTemplate>
                 </asp:TemplateField>
                 <asp:TemplateField HeaderText="SSVR" SortExpression="SSVR">

C2P/WebUserControls/mod_RawMatMan.ascx.cs

@@ -76,19 +76,16 @@ namespace C2P.WebUserControls
                         TextBox txtProcYield = ((TextBox)((GridViewRow)grView.Rows[grView.EditIndex]).FindControl("txtProcYield"));
                         TextBox txtCSR = ((TextBox)((GridViewRow)grView.Rows[grView.EditIndex]).FindControl("txtCSR"));
                         TextBox txtSSR = ((TextBox)((GridViewRow)grView.Rows[grView.EditIndex]).FindControl("txtSSR"));
-                        TextBox txtSSVA = ((TextBox)((GridViewRow)grView.Rows[grView.EditIndex]).FindControl("txtSSVA"));
                         TextBox txtSSVR = ((TextBox)((GridViewRow)grView.Rows[grView.EditIndex]).FindControl("txtSSVR"));
                         // valori decimali
                         decimal ProcYield = percentuali.num2perc(txtProcYield.Text);
                         decimal CSR = percentuali.num2perc(txtCSR.Text);
                         decimal SSR = percentuali.num2perc(txtSSR.Text);
-                        decimal SSVA = percentuali.num2perc(txtSSVA.Text);
                         decimal SSVR = percentuali.num2perc(txtSSVR.Text);
                         // ora modifico moltiplicando x 100...
                         txtProcYield.Text = string.Format("{0:N2}", ProcYield);
                         txtCSR.Text = string.Format("{0:N2}", CSR);
                         txtSSR.Text = string.Format("{0:N2}", SSR);
-                        txtSSVA.Text = string.Format("{0:N2}", SSVA);
                         txtSSVR.Text = string.Format("{0:N2}", SSVR);
                     }
                     catch (Exception exc)
@@ -144,7 +141,6 @@ namespace C2P.WebUserControls
             e.InputParameters["ProcYield"] = percentuali.perc2num(e.InputParameters["ProcYield"].ToString());
             e.InputParameters["CSR"] = percentuali.perc2num(e.InputParameters["CSR"].ToString());
             e.InputParameters["SSR"] = percentuali.perc2num(e.InputParameters["SSR"].ToString());
-            e.InputParameters["SSVA"] = percentuali.perc2num(e.InputParameters["SSVA"].ToString());
             e.InputParameters["SSVR"] = percentuali.perc2num(e.InputParameters["SSVR"].ToString());
         }
     }

C2P_CronJob/bin/Release/C2P_CronJob.application

@@ -11,7 +11,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>25NPXwCQN8dtc/jl2cPnXjFqnm8=</dsig:DigestValue>
+        <dsig:DigestValue>5jDp7p/YFyMLa9vQdH98t9gtb64=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest

@@ -84,7 +84,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>ef9M5hnh7dlipvak6ZoUOTxT1rc=</dsig:DigestValue>
+        <dsig:DigestValue>PryOAJW97tJRvGzzL48C7flgUXA=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -96,7 +96,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>+Bn2dvw9fYiqXU7QxbPXcajKv60=</dsig:DigestValue>
+        <dsig:DigestValue>m34cuY2MWUtnkhaDh4sww9nLx9E=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -252,7 +252,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>xsTqfTT/e1LCY7ud4yCDRhwfCK4=</dsig:DigestValue>
+        <dsig:DigestValue>OWsKmyQHQHdoYsEdhpd4z5G3dvw=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

VersGen/C2P.cs

@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.3.207.558")]
-[assembly: AssemblyFileVersion("2.3.207.558")]
+[assembly: AssemblyVersion("2.3.208.561")]
+[assembly: AssemblyFileVersion("2.3.208.561")]
 [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2015")]
 [assembly: AssemblyCompany("Steamware")]

VersGen/C2P.tt

@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.3.207.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.3.207.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.3.208.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.3.208.<#= this.RevisionNumber #>")]
 [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
 [assembly: AssemblyCompany("Steamware")]
 <#+

packages/NLog.Config.4.0.0/content/NLog.config

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <!-- 
+  See https://github.com/nlog/nlog/wiki/Configuration-file 
+  for information on customizing logging rules and outputs.
+   -->
+  <targets>
+    <!-- add your targets here -->
+    
+    <!--
+    <target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
+            layout="${longdate} ${uppercase:${level}} ${message}" />
+    -->
+  </targets>
+
+  <rules>
+    <!-- add your logging rules here -->
+    
+    <!--
+    <logger name="*" minlevel="Trace" writeTo="f" />
+    -->
+  </rules>
+</nlog>

packages/NLog.Config.4.0.0/tools/Install.ps1

@@ -0,0 +1,12 @@
+param($installPath, $toolsPath, $package, $project)
+
+$configItem = $project.ProjectItems.Item("NLog.config")
+
+# set 'Copy To Output Directory' to 'Copy if newer'
+$copyToOutput = $configItem.Properties.Item("CopyToOutputDirectory")
+$copyToOutput.Value = 1
+
+# set 'Build Action' to 'Content'
+$buildAction = $configItem.Properties.Item("BuildAction")
+$buildAction.Value = 2
+