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

2.3.190 fix sync vocabolario

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-05-29 13:31:01 +02:00
parent 23d4e29f2e
commit 9f5a93efce
16 changed files with 97 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/Images/LogoCostimate.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 31 KiB

C2P/Import.aspx
+14 -2
View File
@@ -12,9 +12,21 @@
<h3 class="panel-title"><%: traduci("ImportData") %></h3>
</div>
<div class="panel-body">
<div class="row" style="min-height: 3.3em;" runat="server" id="divNoteImport">
<div class="col-sm-12">
<a class="btn btn-primary" data-toggle="collapse" href="#collapseExample" aria-expanded="false" aria-controls="collapseExample"><%: traduci("NoteImportToggle") %>
</a>
<div class="collapse" id="collapseExample">
<div class="well">
<h3><%: traduci("NoteImportTitle") %></h3>
<%: traduci("NoteImportBody") %>
</div>
</div>
</div>
</div>
<div class="row" style="min-height: 3.3em;" runat="server" id="divAllSteps">
<div class="col-sm-12">
<asp:LinkButton runat="server" ID="lbtAllSteps" CssClass="btn btn-success" Width="100%" OnClick="lbtAllSteps_Click"><%: traduci("tmp.stp_All_Process") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtAllSteps" CssClass="btn btn-success" Width="100%" OnClick="lbtAllSteps_Click" OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaImportAll") %>'><%: traduci("tmp.stp_All_Process") %></asp:LinkButton>
</div>
</div>
<div class="row" style="min-height: 3.3em;" runat="server" id="divThreeSteps">
@@ -25,7 +37,7 @@
<asp:LinkButton runat="server" ID="lbtConvert" CssClass="btn btn-info" Width="100%" OnClick="lbtConvert_Click">Step 2 - <%: traduci("tmp.stp_All_ConvertFile_Process") %></asp:LinkButton>
</div>
<div class="col-sm-4">
<asp:LinkButton runat="server" ID="lbtMerge" CssClass="btn btn-warning" Width="100%" OnClick="lbtMerge_Click">Step 3 - <%: traduci("ext.stp_All_MergeFile_Process") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtMerge" CssClass="btn btn-warning" Width="100%" OnClick="lbtMerge_Click" OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaMergeData") %>'>Step 3 - <%: traduci("ext.stp_All_MergeFile_Process") %></asp:LinkButton>
</div>
</div>
<div class="row" style="min-height: 3.3em;">
C2P/Import.aspx.cs
+2
View File
@@ -17,6 +17,8 @@ namespace C2P
{
grViewLog.Visible = false;
divThreeSteps.Visible = userIsSuperAdmin;
lbtAllSteps.DataBind();
lbtMerge.DataBind();
}
}
C2P/Import.aspx.designer.cs
Generated
+9
View File
@@ -12,6 +12,15 @@ namespace C2P {
public partial class Import {
/// <summary>
/// divNoteImport control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divNoteImport;
/// <summary>
/// divAllSteps control.
/// </summary>
C2P/WebUserControls/mod_SyncVoc.ascx.cs
+19 -3
View File
@@ -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 = "";
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P/bin/SteamWare.dll
BIN
View File
Binary file not shown.
C2P_Report/Reports/ReportOffers_Q.rdlc
+1 -1
View File
@@ -407,7 +407,7 @@
<rd:TypeName>System.Decimal</rd:TypeName>
</Field>
<Field Name="ItemURL">
<Value>="http://c2p.steamware.net/C2P_Drawings/" &amp; Fields!CodItem.Value &amp; ".png"</Value>
<Value>="http://IIS02/C2P_Drawings/" &amp; Fields!CodItem.Value &amp; ".png"</Value>
</Field>
<Field Name="valid">
<DataField>valid</DataField>
C2P_Report/Reports/ReportOffers_S.rdlc
+1 -1
View File
@@ -407,7 +407,7 @@
<rd:TypeName>System.Decimal</rd:TypeName>
</Field>
<Field Name="ItemURL">
<Value>="http://c2p.steamware.net/C2P_Drawings/" &amp; Fields!CodItem.Value &amp; ".png"</Value>
<Value>="http://IIS02/C2P_Drawings/" &amp; Fields!CodItem.Value &amp; ".png"</Value>
</Field>
<Field Name="valid">
<DataField>valid</DataField>
C2P_Report/Reports/StdCostList.rdlc
+47 -75
View File
@@ -170,9 +170,7 @@
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>textbox2</rd:DefaultName>
@@ -208,9 +206,7 @@
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>textbox3</rd:DefaultName>
@@ -246,9 +242,7 @@
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>textbox4</rd:DefaultName>
@@ -284,9 +278,7 @@
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>textbox5</rd:DefaultName>
@@ -322,9 +314,7 @@
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>textbox6</rd:DefaultName>
@@ -360,9 +350,7 @@
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>textbox7</rd:DefaultName>
@@ -398,9 +386,7 @@
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>textbox8</rd:DefaultName>
@@ -436,9 +422,7 @@
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>textbox9</rd:DefaultName>
@@ -475,7 +459,7 @@
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
@@ -512,9 +496,7 @@
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
</Style>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>textbox11</rd:DefaultName>
@@ -551,7 +533,7 @@
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
@@ -589,7 +571,7 @@
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
@@ -627,7 +609,7 @@
</TextRun>
</TextRuns>
<Style>
<TextAlign>Center</TextAlign>
<TextAlign>Right</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
@@ -1174,6 +1156,38 @@
<PrintOnFirstPage>true</PrintOnFirstPage>
<PrintOnLastPage>true</PrintOnLastPage>
<ReportItems>
<Textbox Name="Textbox15">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Proxima © 2008-2014</Value>
<Style>
<FontFamily>Tahoma</FontFamily>
<FontSize>9pt</FontSize>
<Color>Gray</Color>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Textbox15</rd:DefaultName>
<Top>0.13417in</Top>
<Height>0.175in</Height>
<Width>2.25in</Width>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="Textbox16">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
@@ -1214,6 +1228,7 @@
<Left>20.32cm</Left>
<Height>0.175in</Height>
<Width>3.1in</Width>
<ZIndex>1</ZIndex>
<Style>
<Border>
<Style>None</Style>
@@ -1243,7 +1258,7 @@
<Left>5.25in</Left>
<Height>0.175in</Height>
<Width>0.75in</Width>
<ZIndex>1</ZIndex>
<ZIndex>2</ZIndex>
<Visibility>
<Hidden>true</Hidden>
</Visibility>
@@ -1257,49 +1272,6 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<Textbox Name="PiePaginaTeam">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Proxima © 2008-</Value>
<Style>
<FontFamily>Tahoma</FontFamily>
<FontSize>9pt</FontSize>
<Color>Gray</Color>
</Style>
</TextRun>
<TextRun>
<Label>Year</Label>
<Value>=Format(Today, "yyyy" )</Value>
<Style>
<FontFamily>Tahoma</FontFamily>
<FontSize>9pt</FontSize>
<Color>Gray</Color>
</Style>
</TextRun>
</TextRuns>
<Style>
<TextAlign>Left</TextAlign>
</Style>
</Paragraph>
</Paragraphs>
<Top>0.13417in</Top>
<Height>0.175in</Height>
<Width>3.1in</Width>
<ZIndex>2</ZIndex>
<Style>
<Border>
<Style>None</Style>
</Border>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</ReportItems>
<Style>
<Border>
C2P_Report/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Report.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/SteamWare.dll
BIN
View File
Binary file not shown.
VersGen/C2P.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("2.3.189.544")]
[assembly: AssemblyFileVersion("2.3.189.544")]
[assembly: AssemblyVersion("2.3.190.544")]
[assembly: AssemblyFileVersion("2.3.190.544")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-2015")]
[assembly: AssemblyCompany("Steamware")]
VersGen/C2P.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("2.3.189.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.3.189.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("2.3.190.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.3.190.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+