Egalware/WebGIM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vers 232 di prod USA con fix punti aperti su mtz prog

Browse Source
This commit is contained in:
Samuele E. Locatelli
2014-01-30 15:44:12 +01:00
parent 1f733fd6ba
commit 850f4139ee
15 changed files with 105 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Projects/ReleaseClienti/Somaschini USA/GIM_site.zip
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_data/bin/GIM_data.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_data/bin/SteamWare.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/ExcelExportMtzPrev.aspx
+59 -58
View File
@@ -8,64 +8,65 @@
</head>
<body>
<form id="form1" runat="server">
<div>
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False"
DataKeyNames="idxIntPro" DataSourceID="ods" OnDataBound="grView_DataBound" EnableModelValidation="True">
<EmptyDataTemplate>
<asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
</EmptyDataTemplate>
<Columns>
<asp:TemplateField HeaderText="nome impianto" SortExpression="nomeImpianto">
<ItemTemplate>
<asp:Label ID="lblNomeImpianto" runat="server" Text='<%# Eval("nomeImpianto") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="nome macchina" SortExpression="nomeMacchina">
<ItemTemplate>
<asp:Label ID="lblNomeMacchina" runat="server" Text='<%# Eval("nomeMacchina") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="cod macchina" SortExpression="codMacchina">
<ItemTemplate>
<asp:Label ID="lblCodMacchina" runat="server" Text='<%# Eval("codMacchina") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="inizio" HeaderText="inizio" SortExpression="inizio"
HtmlEncode="False" /> <%--DataFormatString="{0:dd/MM/yy}" --%>
<asp:BoundField DataField="frequenza" HeaderText="frequenza" SortExpression="frequenza" />
<asp:BoundField DataField="cadenza" HeaderText="cadenza" SortExpression="cadenza" />
<asp:TemplateField HeaderText="descrizione" SortExpression="descrizione">
<ItemTemplate>
<asp:Label ID="lblDescrizione" runat="server" Text='<%# Eval("descrizione") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="descrTipo" HeaderText="Tipo" SortExpression="descrTipo" />
<asp:TemplateField HeaderText="fermo" SortExpression="isFermo" ItemStyle-HorizontalAlign="Center">
<ItemTemplate>
<asp:label ID="lblIsFermo" runat="server" Text='<%# Eval("isFermo") %>' />
</ItemTemplate>
<ItemStyle HorizontalAlign="Center"></ItemStyle>
</asp:TemplateField>
<asp:TemplateField HeaderText="prior" SortExpression="descrPriorita" ItemStyle-HorizontalAlign="Center">
<ItemTemplate>
<asp:Label ID="Label6" runat="server" Text='<%# Eval("idxPriorita") %>' ToolTip='<%# Eval("descrPriorita") %>' />
</ItemTemplate>
<ItemStyle HorizontalAlign="Center"></ItemStyle>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}"
SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.v_mtzProgExpTableAdapter"
FilterExpression=" codMacchina LIKE '%{0}%' OR nomeMacchina LIKE '%{0}%' OR descrizione LIKE '%{0}%' ">
<FilterParameters>
<asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
<asp:SessionParameter DefaultValue="0" Name="idxTipo" SessionField="idxTipo_filt"
Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="idxMacchina" SessionField="idxMacchina_filt"
Type="Int32" />
</FilterParameters>
</asp:ObjectDataSource>
</div>
<div>
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False"
DataKeyNames="idxIntPro" DataSourceID="ods" OnDataBound="grView_DataBound" EnableModelValidation="True">
<EmptyDataTemplate>
<asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
</EmptyDataTemplate>
<Columns>
<asp:TemplateField HeaderText="lblImpianto">
<ItemTemplate>
<asp:Label ID="lblNomeImpianto" runat="server" Text='<%# Eval("nomeImpianto") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="lblMacchina">
<ItemTemplate>
<asp:Label ID="lblNomeMacchina" runat="server" Text='<%# Eval("nomeMacchina") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="codMacchina">
<ItemTemplate>
<asp:Label ID="lblCodMacchina" runat="server" Text='<%# Eval("codMacchina") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="inizio" HeaderText="inizioMtzPro"
HtmlEncode="False" />
<%--DataFormatString="{0:dd/MM/yy}" --%>
<asp:BoundField DataField="frequenza" HeaderText="frequenzaMtzPro" />
<asp:BoundField DataField="cadenza" HeaderText="cadenzaMtzPro" />
<asp:TemplateField HeaderText="descrizione">
<ItemTemplate>
<asp:Label ID="lblDescrizione" runat="server" Text='<%# Eval("descrizione") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="descrTipo" HeaderText="lblTipoGuastoShort" />
<asp:TemplateField HeaderText="chkImpFermoShort" ItemStyle-HorizontalAlign="Center">
<ItemTemplate>
<asp:Label ID="lblIsFermo" runat="server" Text='<%# Eval("isFermo") %>' />
</ItemTemplate>
<ItemStyle HorizontalAlign="Center"></ItemStyle>
</asp:TemplateField>
<asp:TemplateField HeaderText="lblPriorShort" ItemStyle-HorizontalAlign="Center">
<ItemTemplate>
<asp:Label ID="Label6" runat="server" Text='<%# Eval("idxPriorita") %>' ToolTip='<%# Eval("descrPriorita") %>' />
</ItemTemplate>
<ItemStyle HorizontalAlign="Center"></ItemStyle>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}"
SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.v_mtzProgExpTableAdapter"
FilterExpression=" codMacchina LIKE '%{0}%' OR nomeMacchina LIKE '%{0}%' OR descrizione LIKE '%{0}%' ">
<FilterParameters>
<asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
<asp:SessionParameter DefaultValue="0" Name="idxTipo" SessionField="idxTipo_filt"
Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="idxMacchina" SessionField="idxMacchina_filt"
Type="Int32" />
</FilterParameters>
</asp:ObjectDataSource>
</div>
</form>
</body>
</html>
Projects/WebGIM/GIM_site/ExcelExportMtzPrev.aspx.cs
+1 -3
View File
@@ -19,14 +19,12 @@ namespace GIM_site
{
if (grView.Rows.Count > 0)
{
LinkButton lb;
// aggiorno gli headers
foreach (TableCell cella in grView.HeaderRow.Cells)
{
try
{
lb = (LinkButton)cella.Controls[0];
lb.Text = traduci(lb.Text);
cella.Text = traduci(cella.Text);
}
catch
{ }
Projects/WebGIM/GIM_site/GIM_site.csproj
+1
View File
@@ -595,6 +595,7 @@
<None Include="sql\Applicazione\V1.4 USA\GIM_0222.sql" />
<None Include="sql\Applicazione\V1.4 USA\GIM_0223.sql" />
<None Include="sql\Applicazione\V1.4 USA\GIM_0224.sql" />
<Content Include="sql\Applicazione\V1.4 USA\GIM_0232.sql" />
<Content Include="sql\Applicazione\V1.4 USA\GIM_0229.sql" />
<Content Include="sql\Applicazione\V1.4 USA\GIM_0227.sql" />
<Content Include="Style.css" />
Projects/WebGIM/GIM_site/GIM_site.csproj.user
+1 -1
View File
@@ -2,7 +2,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>Ufficio-ITA %28.218%29</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>Ufficio-ENG %28.17%29</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
Projects/WebGIM/GIM_site/Properties/PublishProfiles/Ufficio-ENG (.17).pubxml.user
+1 -1
View File
@@ -6,6 +6,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAeedwGXkKPUOp+YE/vTr2QgAAAAACAAAAAAADZgAAwAAAABAAAACQS+fM7DateS+EquuzojvSAAAAAASAAACgAAAAEAAAAGLIA8ke+wQ0O0VCqm8lL1MQAAAAqsh6BaGnlMsr7uy6+GYv/xQAAABHPl+iyTy0pgDKMio//KVnsXhPvw==</EncryptedPassword>
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA/K81nomLRUiuXNLIOVdzQgAAAAACAAAAAAADZgAAwAAAABAAAABqbNcPdMltN4x29FwJvbFyAAAAAASAAACgAAAAEAAAAB+GqujTjGBelTN1968dY4IQAAAArh09WVv/59SxTSsqcNKB1hQAAAAJ6AGgm/PmiEe/iPOWuZQEkOmoIQ==</EncryptedPassword>
</PropertyGroup>
</Project>
Projects/WebGIM/GIM_site/Web.config
+1 -1
View File
@@ -104,7 +104,7 @@
<add key="welcomeApp" value="GIM_welcomeApp" />
<add key="appName" value="GIM" />
<add key="mainRev" value="1.3" />
<add key="minRev" value="231" />
<add key="minRev" value="232" />
<add key="copyRight" value="SteamWare © 2006" />
<add key="defaultApp" value="GIM_Appl" />
<add key="defaultTitle" value="GIM_ShortWelcome" />
Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs
+1
View File
@@ -433,6 +433,7 @@ public partial class mod_elencoMtzProg : ApplicationUserControl
}
// a questo punto aggiorno e ricalcolo pending!
mtzProgr.obj.processaCodaMtzPro();
ods.DataBind();
grView.DataBind();
UpdatePanel2.Update();
// aggiorno
Projects/WebGIM/GIM_site/bin/GIM_data.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/bin/GIM_site.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/bin/SteamWare.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/sql/Applicazione/V1.4 USA/GIM_0232.sql
+40
View File
@@ -0,0 +1,40 @@
-- FARE A MANO!!!!
SELECT *
FROM AnagFamMacchine
SELECT *
FROM anagcausali
WHERE idxFamMacchine = 1
-- creare nuova anag fam macchine
-- aggiornare causali alla nuova
UPDATE anagcausali
SET idxFamMacchine = 54 -- verificare su loro db dopo aver creato "DEFAULT MTZ - do not modify"
WHERE idxFamMacchine = 1
-- riportare la prima causale come ND a quella "default"
UPDATE anagcausali
SET idxFamMacchine = 1
WHERE idxCausale = 1
-- aggiungere a mano "axis"...
-- mettere la causale num 1 come N.A. e NON attiva...
-- cambiare nomi tra nuova famiglia e muratec
UPDATE AnagFamMacchine
SET nomeFamMacch = 'DEFAULT MTZ - do not modify'
WHERE idxFamMacchine = 1
-- cambiare nomi tra nuova famiglia e muratec
UPDATE AnagFamMacchine
SET nomeFamMacch = 'MURATEC'
WHERE idxFamMacchine = 54 -- verificare su loro db dopo aver creato "DEFAULT MTZ - do not modify"
-- registro versione...
INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(232, GETDATE())
GO
SELECT * FROM LogUpdateDb ORDER BY versione DESC
GO