diff --git a/C2P/Images/LogoCostimate.png b/C2P/Images/LogoCostimate.png index 4cc5842..8e69905 100644 Binary files a/C2P/Images/LogoCostimate.png and b/C2P/Images/LogoCostimate.png differ diff --git a/C2P/Import.aspx b/C2P/Import.aspx index af15a67..cd49a05 100644 --- a/C2P/Import.aspx +++ b/C2P/Import.aspx @@ -12,9 +12,21 @@

<%: traduci("ImportData") %>

+
+
+ +
+
+

<%: traduci("NoteImportTitle") %>

+ <%: traduci("NoteImportBody") %> +
+
+
+
- <%: traduci("tmp.stp_All_Process") %> + <%: traduci("tmp.stp_All_Process") %>
@@ -25,7 +37,7 @@ Step 2 - <%: traduci("tmp.stp_All_ConvertFile_Process") %>
- Step 3 - <%: traduci("ext.stp_All_MergeFile_Process") %> + Step 3 - <%: traduci("ext.stp_All_MergeFile_Process") %>
diff --git a/C2P/Import.aspx.cs b/C2P/Import.aspx.cs index 1fedd91..4b53a76 100644 --- a/C2P/Import.aspx.cs +++ b/C2P/Import.aspx.cs @@ -17,6 +17,8 @@ namespace C2P { grViewLog.Visible = false; divThreeSteps.Visible = userIsSuperAdmin; + lbtAllSteps.DataBind(); + lbtMerge.DataBind(); } } diff --git a/C2P/Import.aspx.designer.cs b/C2P/Import.aspx.designer.cs index c1a0a69..a070a7e 100644 --- a/C2P/Import.aspx.designer.cs +++ b/C2P/Import.aspx.designer.cs @@ -12,6 +12,15 @@ namespace C2P { public partial class Import { + /// + /// divNoteImport control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divNoteImport; + /// /// divAllSteps control. /// diff --git a/C2P/WebUserControls/mod_SyncVoc.ascx.cs b/C2P/WebUserControls/mod_SyncVoc.ascx.cs index d7a0321..4f97430 100644 --- a/C2P/WebUserControls/mod_SyncVoc.ascx.cs +++ b/C2P/WebUserControls/mod_SyncVoc.ascx.cs @@ -58,15 +58,31 @@ namespace C2P.WebUserControls try { termine = risultato.Split('#'); - // verifico se il termine sia cambiato... - if (DataWrap.DW.dictVocabolario[termine[0] + "#" + termine[1]] != termine[2] || DataWrap.DW.dictVocabolario[termine[0] + "#" + termine[1]] == null) + // in primis cerco SE ESISTA la chiave in locale... + if (DataWrap.DW.dictVocabolario.ContainsKey(termine[0] + "#" + termine[1])) + { + // verifico se il termine sia cambiato... + if (DataWrap.DW.dictVocabolario[termine[0] + "#" + termine[1]] != termine[2] || DataWrap.DW.dictVocabolario[termine[0] + "#" + termine[1]] == null) + { + // faccio upsert + selDataVoc.mgr.upsertLemma(termine[0], termine[1], termine[2]); + updLoc++; + } + } + else // non c'è faccio upsert ed inserisco comunque! { // faccio upsert selDataVoc.mgr.upsertLemma(termine[0], termine[1], termine[2]); updLoc++; } } - catch { } + catch (Exception exc) + { + if (memLayer.ML.confReadInt("_logLevel") > 6) + { + logger.lg.scriviLog(string.Format("Errore merge vocabolario:{0}{1}", Environment.NewLine, exc)); + } + } } // step 2: caricamento termini NUOVI locali in db remoto... string trovato = ""; diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index aee1136..10c63c7 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 36802ff..1646f86 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 86283ef..7161ee4 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Report/Reports/ReportOffers_Q.rdlc b/C2P_Report/Reports/ReportOffers_Q.rdlc index f707c4f..fd0a8c0 100644 --- a/C2P_Report/Reports/ReportOffers_Q.rdlc +++ b/C2P_Report/Reports/ReportOffers_Q.rdlc @@ -407,7 +407,7 @@ System.Decimal - ="http://c2p.steamware.net/C2P_Drawings/" & Fields!CodItem.Value & ".png" + ="http://IIS02/C2P_Drawings/" & Fields!CodItem.Value & ".png" valid diff --git a/C2P_Report/Reports/ReportOffers_S.rdlc b/C2P_Report/Reports/ReportOffers_S.rdlc index f707c4f..fd0a8c0 100644 --- a/C2P_Report/Reports/ReportOffers_S.rdlc +++ b/C2P_Report/Reports/ReportOffers_S.rdlc @@ -407,7 +407,7 @@ System.Decimal - ="http://c2p.steamware.net/C2P_Drawings/" & Fields!CodItem.Value & ".png" + ="http://IIS02/C2P_Drawings/" & Fields!CodItem.Value & ".png" valid diff --git a/C2P_Report/Reports/StdCostList.rdlc b/C2P_Report/Reports/StdCostList.rdlc index d62c154..31ae2ec 100644 --- a/C2P_Report/Reports/StdCostList.rdlc +++ b/C2P_Report/Reports/StdCostList.rdlc @@ -170,9 +170,7 @@ - + - + - + - + - + - + - + - + @@ -512,9 +496,7 @@ - + @@ -589,7 +571,7 @@ @@ -627,7 +609,7 @@ @@ -1174,6 +1156,38 @@ true true + + true + true + + + + + Proxima © 2008-2014 + + + + + + 2pt + 2pt + 2pt + 2pt + + true true @@ -1214,6 +1228,7 @@ 20.32cm 0.175in 3.1in + 1 @@ -1243,7 +1258,7 @@ 5.25in 0.175in 0.75in - 1 + 2 true @@ -1257,49 +1272,6 @@ 2pt - - true - true - - - - - Proxima © 2008- - - - - - =Format(Today, "yyyy" ) - - - - - - - 0.13417in - 0.175in - 3.1in - 2 - - - 2pt - 2pt - 2pt - 2pt - -