modifiche x

* mostrare solo preview e non pdf * fix tipo di report x DDT e ULP(colli) git-svn-id: https://keyhammer.ath.cx/svn/XPS/trunk@87 43c8e981-f90d-406c-a89a-24a2c4268d51
2008-11-20 14:33:18 +00:00
parent bce2eb2d0e
commit ff96a16e75
3 changed files with 40 additions and 70 deletions
@@ -58,7 +58,7 @@
 		</httpModules>
 		<customErrors mode="Off"/>
 		<!--<customErrors mode="RemoteOnly" defaultRedirect="unauthorized.aspx"/>-->
-		<httpRuntime maxRequestLength="102400"/>
+		<httpRuntime maxRequestLength="102400" />
 		<!--   qui sopra configurato x gestire allegati fino a 100 mb...
 	<httpRuntime 
      maxRequestLength="102400" 
@@ -72,7 +72,7 @@
 	<appSettings>
 		<add key="CodModulo" value="XPS"/>
 		<add key="dominio" value="VOSTRO410"/>
-		<add key="_navMaxChar" value="20"/>
+    <add key="_navMaxChar" value="20"/>
 		<add key="intUpdatePagina_ms" value="120000"/>
 		<add key="_righeDataGrid" value="30"/>
 		<add key="_righeDataGridAnagr" value="20"/>
@@ -89,7 +89,7 @@
 		<add key="titleApp" value="XPS_titleApp"/>
 		<add key="welcomeApp" value="XPS_welcomeApp"/>
 		<add key="appName" value="XPS"/>
-		<add key="mainRev" value="0.9"/>
+		<add key="mainRev" value="0.1"/>
 		<add key="copyRight" value="SteamWare © 2008"/>
 		<add key="defaultApp" value="XPS_Appl"/>
 		<add key="defaultTitle" value="XPS_ShortWelcome"/>
@@ -97,26 +97,26 @@
 		<add key="_treeMaxChar" value="45"/>
 		<add key="_showAllTree" value="false"/>
 		<add key="_jumpStart" value="10"/>
-		<add key="defDayLeadTime" value="3"/>
-		<add key="_adminEmail" value="info@steamware.net"/>
+    <add key ="defDayLeadTime" value="3"/>
+    <add key="_adminEmail" value="info@steamware.net" />
 		<add key="_logDir" value="./logs/"/>
 		<add key="_smtpCli" value="localhost"/>
-		<add key="PermessiConnectionString" value="Data Source=localhost;Initial Catalog=SteamWare_XPS;Persist Security Info=True;User id=sa;Password=keyhammer"/>
-		<add key="UtenteCdcConnectionString" value="Data Source=localhost;Initial Catalog=SteamWare_Anagrafica;Persist Security Info=True;User id=sa;Password=keyhammer"/>
-		<add key="VocabolarioConnectionString" value="Data Source=localhost;Initial Catalog=SteamWare_Vocabolario;Persist Security Info=True;User id=sa;Password=keyhammer"/>
-		<!-- Setup link a reporting -->
-		<add key="urlReporting" value="http://{0}/ReportServer?/{1}/{2}&amp;rs:Command=Render&amp;rc:Parameters=false&amp;rc:Toolbar=false&amp;IdxObj={3}{4}"/>
-		<!-- NB: "/" == "%2f" -->
-		<add key="reportingServerAddress" value="localhost"/>
-		<add key="reportDir" value="ReportEqua"/>
-		<add key="reportName_mod" value="ReportEqua"/>
-		<add key="reportName_lbl" value="LabelEqua"/>
-		<add key="reportOpzPdf" value="&amp;rs:Format=PDF"/>
+		<add key="PermessiConnectionString" value="Data Source=10.74.82.238;Initial Catalog=SteamWare_XPS;Persist Security Info=True;User id=sa;Password=keyhammer"/>
+		<add key="UtenteCdcConnectionString" value="Data Source=10.74.82.238;Initial Catalog=SteamWare_Anagrafica;Persist Security Info=True;User id=sa;Password=keyhammer"/>
+		<add key="VocabolarioConnectionString" value="Data Source=10.74.82.238;Initial Catalog=SteamWare_Vocabolario;Persist Security Info=True;User id=sa;Password=keyhammer"/>
+    <!-- Setup link a reporting -->
+    <add key="urlReporting" value="http://{0}/ReportServer?/{1}/{2}&amp;rs:Command=Render&amp;rc:Parameters=false&amp;rc:Toolbar=false&amp;IdxObj={3}{4}"/>
+    <!-- NB: "/" == "%2f" -->
+    <add key="reportingServerAddress" value="10.74.82.238"/>
+    <add key="reportDir" value="ReportEqua"/>
+    <add key="reportName_mod" value="ReportSchedaIdentificazione"/>
+    <add key="reportName_lbl" value="LabelEqua"/>
+    <add key="reportOpzPdf" value="&amp;rs:Format=PDF"/>
 	</appSettings>
 	<connectionStrings>
-		<add name="SteamWare_XPSConnectionString" connectionString="Data Source=localhost;Initial Catalog=SteamWare_XPS;Persist Security Info=True;User id=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
-		<add name="SteamWare_XPSConnectionString1" connectionString="Data Source=localhost;Initial Catalog=SteamWare_XPS;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
-	</connectionStrings>
+  <add name="SteamWare_XPSConnectionString" connectionString="Data Source=10.74.82.238;Initial Catalog=SteamWare_XPS;Persist Security Info=True;User id=sa;Password=keyhammer"
+   providerName="System.Data.SqlClient" />
+ </connectionStrings>
 	<system.webServer>
 		<validation validateIntegratedModeConfiguration="false"/>
 		<modules>
@@ -2,12 +2,10 @@
 <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
 <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
 <%@ Register Src="mod_navPath.ascx" TagName="mod_navPath" TagPrefix="uc2" %>
-<%@ Register Src="mod_logStati.ascx" TagName="mod_logStati" TagPrefix="uc3" %>
 <asp:Label runat="server" ID="lblULP" CssClass="ctrHeaderPagerDet" Width="150px" />
 <asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataSourceID="ods"
    DataKeyNames="Cod" AllowPaging="True" AllowSorting="True" OnSelectedIndexChanged="grView_SelectedIndexChanged"
-    OnDataBound="grView_DataBound" OnRowUpdating="grView_RowUpdating" OnRowUpdated="grView_RowUpdated"
-    OnRowDeleted="grView_RowDeleted" Width="100%">
+    OnDataBound="grView_DataBound" OnRowUpdating="grView_RowUpdating" OnRowUpdated="grView_RowUpdated" Width="100%">
    <RowStyle CssClass="ctrRowStyleDet" />
    <AlternatingRowStyle CssClass="ctrAltRowStyleDet" />
    <EditRowStyle CssClass="ctrEditRowStyleDet" />
@@ -21,6 +19,8 @@
    </EmptyDataTemplate>
    <Columns>
        <asp:TemplateField ShowHeader="False">
+            <HeaderTemplate>
+            </HeaderTemplate>
            <ItemTemplate>
                <asp:ImageButton ID="imgClona" runat="server" CausesValidation="False" ToolTip='<%# traduci("clonaRow") %>'
                    ImageUrl='<%# imgPath(SteamWare.tipoImg.clona , SteamWare.dimImg.small) %>' CommandArgument="clonaObj"
@@ -28,32 +28,23 @@
            </ItemTemplate>
        </asp:TemplateField>
        <asp:TemplateField HeaderText="#" SortExpression="Posizione">
+            <EditItemTemplate>
+            </EditItemTemplate>
            <ItemTemplate>
                <asp:Label ID="Label3" runat="server" Text='<%# Bind("Posizione") %>' ToolTip='<%# Eval("Cod")%>'></asp:Label>
            </ItemTemplate>
-            <EditItemTemplate>
-                <asp:Label ID="Label3" runat="server" Text='<%# Eval("Posizione") %>' ToolTip='<%# Eval("Cod")%>'></asp:Label>
-            </EditItemTemplate>
        </asp:TemplateField>
        <asp:TemplateField ShowHeader="False">
            <HeaderTemplate>
            </HeaderTemplate>
            <ItemTemplate>
-                <asp:HyperLink runat="server" ID="lnkPDF" ImageUrl="~/images/table.png" NavigateUrl='<%# XPS.obj.urlReport(Eval("Cod"),"label","") %>'
+                <asp:HyperLink runat="server" ID="lnkPDF" ImageUrl="~/images/table.png" NavigateUrl='<%# XPS.obj.urlReport(Eval("Cod"),"module","") %>'
                    Target="_blank" ToolTip='<%# traduci("anteprimaBarcode") %>' />
-                <asp:HyperLink runat="server" ID="lnkShow" ImageUrl="~/images/page_pdf.png" NavigateUrl='<%# XPS.obj.urlReport(Eval("Cod"),"label","PDF") %>'
-                    Target="_blank" ToolTip='<%# traduci("stampaBarcode") %>' />
+                <%--<asp:HyperLink runat="server" ID="lnkShow" ImageUrl="~/images/page_pdf.png" NavigateUrl='<%# XPS.obj.urlReport(Eval("Cod"),"label","PDF") %>'
+                    Target="_blank" ToolTip='<%# traduci("stampaBarcode") %>' />--%>
            </ItemTemplate>
        </asp:TemplateField>
-        <asp:TemplateField HeaderText="Stato" SortExpression="Stato">
-            <ItemTemplate>
-                <asp:ImageButton ID="imgMostraLogStati" runat="server" CausesValidation="False" CommandName="Select"
-                    OnClick="imgMostraLogStati_Click" ToolTip='<%# traduci("MostraLogStati")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.notepad , SteamWare.dimImg.small) %>' />
-                <asp:Label ID="Label6" runat="server" Text='<%# Bind("Stato") %>'></asp:Label>
-            </ItemTemplate>
-            <EditItemTemplate>
-            </EditItemTemplate>
-        </asp:TemplateField>
+        <asp:BoundField DataField="Stato" HeaderText="Stato" SortExpression="Stato" ReadOnly="True" />
        <asp:TemplateField ShowHeader="False">
            <HeaderTemplate>
            </HeaderTemplate>
@@ -105,7 +96,7 @@
            </ItemTemplate>
        </asp:TemplateField>
        <asp:BoundField DataField="DataArrivo" HeaderText="DataArrivo" SortExpression="DataArrivo"
-            ReadOnly="True" DataFormatString="{0:dd/MM/yy HH:mm}" />
+            DataFormatString="{0:dd/MM/yy HH:mm}" ReadOnly="True" />
        <asp:TemplateField HeaderText="DataPrevista" SortExpression="DataPrevista">
            <EditItemTemplate>
                <asp:Label ID="Label5" runat="server" Text='<%# Bind("DataPrevista", "{0:dd/MM/yy HH:mm}") %>'></asp:Label>
@@ -167,13 +158,9 @@
            &nbsp;&nbsp;
            <asp:Button ID="btnCancel" runat="server" Width="100px" OnClick="btnCancel_Click" />
        </div>
+        <div style="text-align: center;">
+            <asp:Button ID="btnAllSched" runat="server" Width="250px" 
+                onclick="btnAllSched_Click" />
+        </div>
    </div>
 </asp:Panel>
-<asp:Panel ID="pnlSetAllSched" Visible="false" runat="server">
-    <div style="text-align: center;">
-        <asp:Button ID="btnAllSched" runat="server" Width="250px" OnClick="btnAllSched_Click" />
-    </div>
-</asp:Panel>
-<asp:Panel ID="pnlLogStati" Visible="false" runat="server">
-    <uc3:mod_logStati ID="mod_logStati1" runat="server" />
-</asp:Panel>
@@ -2,7 +2,6 @@
    Inherits="mod_elencoComm" %>
 <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
 <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
-<%@ Register Src="mod_logStati.ascx" TagName="mod_logStati" TagPrefix="uc2" %>
 <div class="filtro_1">
    <div style="width: 100%">
        <span style="float: left;">
@@ -38,12 +37,10 @@
                        <asp:Label ID="lblCicloEqua" runat="server" />
                    </td>
                    <td>
-                        <asp:DropDownList runat="server" ID="ddlCiclo" DataSourceID="odsValLav" DataTextField="label"
-                            DataValueField="value">
+                        <asp:DropDownList runat="server" ID="ddlCiclo">
+                            <asp:ListItem Value="Brun">Brunitura</asp:ListItem>
+                            <asp:ListItem Value="Fosf">Fosfatazione</asp:ListItem>
                        </asp:DropDownList>
-                        <asp:ObjectDataSource ID="odsValLav" runat="server" OldValuesParameterFormatString="original_{0}"
-                            SelectMethod="GetData" TypeName="DS_utilityTableAdapters.v_selAnagLavTableAdapter">
-                        </asp:ObjectDataSource>
                    </td>
                    <td>
                        <asp:Label ID="lblDescr" runat="server" />
@@ -52,6 +49,7 @@
                        <asp:TextBox ID="txtDescr" runat="server"></asp:TextBox>
                        <asp:RequiredFieldValidator ID="rfvDescr" runat="server" ErrorMessage="!!!" ControlToValidate="txtDescr" />
                    </td>
+               
                </tr>
                <tr>
                    <td>
@@ -118,24 +116,12 @@
                <ItemTemplate>
                    <asp:HyperLink runat="server" ID="lnkPDF" ImageUrl="~/images/table.png" NavigateUrl='<%# XPS.obj.urlReport(Eval("Cod"),"label","") %>'
                        Target="_blank" ToolTip='<%# traduci("anteprimaBarcode") %>' />
-                    <asp:HyperLink runat="server" ID="lnkShow" ImageUrl="~/images/page_pdf.png" NavigateUrl='<%# XPS.obj.urlReport(Eval("Cod"),"label","PDF") %>'
-                        Target="_blank" ToolTip='<%# traduci("stampaBarcode") %>' />
+                    <%--<asp:HyperLink runat="server" ID="lnkShow" ImageUrl="~/images/page_pdf.png" NavigateUrl='<%# XPS.obj.urlReport(Eval("Cod"),"label","PDF") %>'
+                        Target="_blank" ToolTip='<%# traduci("stampaBarcode") %>' />--%>
                </ItemTemplate>
            </asp:TemplateField>
            <asp:BoundField DataField="Ciclo" HeaderText="Ciclo" SortExpression="Ciclo" ReadOnly="true" />
-            <asp:TemplateField HeaderText="Stato" SortExpression="CodStato" ItemStyle-HorizontalAlign="Center">
-                <ItemTemplate>
-                    <span style="float: left; vertical-align: top;">
-                        <asp:ImageButton ID="imgMostraLogStati" runat="server" CausesValidation="False" CommandName="Select"
-                            OnClick="imgMostraLogStati_Click" ToolTip='<%# traduci("MostraLogStati")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.notepad , SteamWare.dimImg.small) %>' />
-                    </span><span style="float: right; vertical-align: top;">
-                    <asp:Image runat="server" ID="imgSemaforo" Visible='<%# isSemaforoVisibile(Eval("minCodStato"),Eval("maxCodStato")) %>'  ImageUrl='<%# immagineDaStato(Eval("minCodStato"),Eval("maxCodStato")) %>' ToolTip='<%# toolTipDaStato(Eval("minCodStato"),Eval("maxCodStato")) %>' /></span>
-                    <asp:Label ID="Label1" runat="server" Text='<%# Bind("Stato") %>'></asp:Label>
-                    <div style="font-size: smaller; color: #57aa57;">
-                        -->
-                        <asp:Label ID="Label4" runat="server" Text='<%# Bind("maxStato") %>' /></div>
-                </ItemTemplate>
-            </asp:TemplateField>
+            <asp:BoundField DataField="Stato" HeaderText="Stato" SortExpression="CodStato" ReadOnly="true" />
            <asp:TemplateField>
                <ItemTemplate>
                    <asp:ImageButton ID="imgAccetta" runat="server" CausesValidation="False" CommandName="Update"
@@ -254,6 +240,3 @@
        </div>
    </div>
 </asp:Panel>
-<asp:Panel ID="pnlLogStati" Visible="false" runat="server">
-    <uc2:mod_logStati ID="mod_logStati1" runat="server" />
-</asp:Panel>