diff --git a/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip b/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip index 3f0d6ee..07beffb 100644 Binary files a/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip and b/Projects/ReleaseClienti/Somaschini USA/GIM_site.zip differ diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 6836bd2..fbe92c8 100644 Binary files a/Projects/WebGIM/GIM_data/bin/GIM_data.dll and b/Projects/WebGIM/GIM_data/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_data/bin/SteamWare.dll b/Projects/WebGIM/GIM_data/bin/SteamWare.dll index e1e6f17..2d47a8e 100644 Binary files a/Projects/WebGIM/GIM_data/bin/SteamWare.dll and b/Projects/WebGIM/GIM_data/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/ExcelExportMtzPrev.aspx b/Projects/WebGIM/GIM_site/ExcelExportMtzPrev.aspx index 72af15e..3235134 100644 --- a/Projects/WebGIM/GIM_site/ExcelExportMtzPrev.aspx +++ b/Projects/WebGIM/GIM_site/ExcelExportMtzPrev.aspx @@ -8,64 +8,65 @@
-
- - - - - - - - - - - - - - - - - - - - - <%--DataFormatString="{0:dd/MM/yy}" --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ + + + + + + + + + + + + + + + + + + + + + <%--DataFormatString="{0:dd/MM/yy}" --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/Projects/WebGIM/GIM_site/ExcelExportMtzPrev.aspx.cs b/Projects/WebGIM/GIM_site/ExcelExportMtzPrev.aspx.cs index 58193b5..c2cae73 100644 --- a/Projects/WebGIM/GIM_site/ExcelExportMtzPrev.aspx.cs +++ b/Projects/WebGIM/GIM_site/ExcelExportMtzPrev.aspx.cs @@ -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 { } diff --git a/Projects/WebGIM/GIM_site/GIM_site.csproj b/Projects/WebGIM/GIM_site/GIM_site.csproj index f1fa6b1..d3274ac 100644 --- a/Projects/WebGIM/GIM_site/GIM_site.csproj +++ b/Projects/WebGIM/GIM_site/GIM_site.csproj @@ -595,6 +595,7 @@ + diff --git a/Projects/WebGIM/GIM_site/GIM_site.csproj.user b/Projects/WebGIM/GIM_site/GIM_site.csproj.user index 1131fb9..fa7226d 100644 --- a/Projects/WebGIM/GIM_site/GIM_site.csproj.user +++ b/Projects/WebGIM/GIM_site/GIM_site.csproj.user @@ -2,7 +2,7 @@ ShowAllFiles - Ufficio-ITA %28.218%29 + Ufficio-ENG %28.17%29 diff --git a/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Ufficio-ENG (.17).pubxml.user b/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Ufficio-ENG (.17).pubxml.user index b295877..91b553e 100644 --- a/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Ufficio-ENG (.17).pubxml.user +++ b/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Ufficio-ENG (.17).pubxml.user @@ -6,6 +6,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt - AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAeedwGXkKPUOp+YE/vTr2QgAAAAACAAAAAAADZgAAwAAAABAAAACQS+fM7DateS+EquuzojvSAAAAAASAAACgAAAAEAAAAGLIA8ke+wQ0O0VCqm8lL1MQAAAAqsh6BaGnlMsr7uy6+GYv/xQAAABHPl+iyTy0pgDKMio//KVnsXhPvw== + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA/K81nomLRUiuXNLIOVdzQgAAAAACAAAAAAADZgAAwAAAABAAAABqbNcPdMltN4x29FwJvbFyAAAAAASAAACgAAAAEAAAAB+GqujTjGBelTN1968dY4IQAAAArh09WVv/59SxTSsqcNKB1hQAAAAJ6AGgm/PmiEe/iPOWuZQEkOmoIQ== \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/Web.config b/Projects/WebGIM/GIM_site/Web.config index 7b685b3..c037608 100644 --- a/Projects/WebGIM/GIM_site/Web.config +++ b/Projects/WebGIM/GIM_site/Web.config @@ -104,7 +104,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs index 5cf692b..001fc2e 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs @@ -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 diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 6836bd2..fbe92c8 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index 235d034..da03295 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll index e1e6f17..2d47a8e 100644 Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll index efe92d6..9eecaee 100644 Binary files a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll and b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/sql/Applicazione/V1.4 USA/GIM_0232.sql b/Projects/WebGIM/GIM_site/sql/Applicazione/V1.4 USA/GIM_0232.sql new file mode 100644 index 0000000..bc7a9db --- /dev/null +++ b/Projects/WebGIM/GIM_site/sql/Applicazione/V1.4 USA/GIM_0232.sql @@ -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 \ No newline at end of file