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

Vari fix con Asto

Browse Source
This commit is contained in:
Samuele E. Locatelli
2014-08-29 18:47:08 +02:00
parent 8a3fc3dd99
commit 44b67e4f1f
31 changed files with 95 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/C2P.csproj
+16
View File
@@ -196,6 +196,22 @@
<Content Include="Content\themes\base\minified\jquery.ui.theme.min.css" />
<Content Include="Content\themes\base\minified\jquery.ui.tooltip.min.css" />
<Content Include="DbSync.aspx" />
<Content Include="Drawings\1AN00002.png" />
<Content Include="Drawings\1AN00003.png" />
<Content Include="Drawings\1AN00004.png" />
<Content Include="Drawings\1AN00005.png" />
<Content Include="Drawings\Itm0001.png" />
<Content Include="Drawings\1AN00001.png" />
<Content Include="Drawings\Itm0002.png" />
<Content Include="Drawings\Itm0003.png" />
<Content Include="Drawings\Itm0004.png" />
<Content Include="Drawings\Itm0005.png" />
<Content Include="Drawings\MissingImage.png" />
<Content Include="Drawings\Profilo_01.png" />
<Content Include="Drawings\Profilo_02.png" />
<Content Include="Drawings\Profilo_03.png" />
<Content Include="Drawings\Profilo_04.png" />
<Content Include="Drawings\Profilo_05.png" />
<Content Include="ExistingProductOffer.aspx" />
<Content Include="fonts\fontawesome-webfont.svg" />
<Content Include="fonts\glyphicons-halflings-regular.svg" />
C2P/Drawings/1AN00001.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

C2P/Drawings/1AN00002.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

C2P/Drawings/1AN00003.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

C2P/Drawings/1AN00004.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

C2P/Drawings/1AN00005.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

C2P/Drawings/Itm0001.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

C2P/Drawings/Itm0002.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

C2P/Drawings/Itm0003.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

C2P/Drawings/Itm0004.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

C2P/Drawings/Itm0005.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

C2P/Drawings/MissingImage.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

C2P/Drawings/Profilo_01.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

C2P/Drawings/Profilo_02.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

C2P/Drawings/Profilo_03.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

C2P/Drawings/Profilo_04.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

C2P/Drawings/Profilo_05.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

C2P/ExistingProductOffer.aspx
+43 -39
View File
@@ -14,48 +14,52 @@
</div>
<div class="panel-body">
<div class="row" style="font-size: 1.2em; line-height: 1.6em;">
<div class="col-xs-6">
<asp:UpdatePanel ID="upSelettore" runat="server" ViewStateMode="Disabled">
<ContentTemplate>
<uc1:mod_autocomplete runat="server" ID="acArticolo" contextKey="a" minCharAutocomplete="3" showKey="false" ServicePath="Services/WS_data.asmx/Items" placeholder="Type to Search" />
<%--<asp:DropDownList ID="ddlProduct" runat="server" DataSourceID="odsProducts" DataValueField="value" DataTextField="value" AutoPostBack="true" Font-Size="1.4em" />
<div class="col-xs-10">
<div class="col-xs-12">
<asp:UpdatePanel ID="upSelettore" runat="server" ViewStateMode="Disabled">
<ContentTemplate>
<uc1:mod_autocomplete runat="server" ID="acArticolo" contextKey="a" minCharAutocomplete="3" showKey="false" ServicePath="Services/WS_data.asmx/Items" placeholder="Type to Search" />
<%--<asp:DropDownList ID="ddlProduct" runat="server" DataSourceID="odsProducts" DataValueField="value" DataTextField="value" AutoPostBack="true" Font-Size="1.4em" />
<asp:ObjectDataSource ID="odsProducts" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selItemsTableAdapter"></asp:ObjectDataSource>--%>
</ContentTemplate>
</asp:UpdatePanel>
</div>
</div>
<div class="row" style="font-size: 1.2em; line-height: 1.6em;">
<div class="col-xs-12">
<asp:UpdatePanel ID="upItems" runat="server">
<ContentTemplate>
<div class="shortcuts">
<asp:Repeater ID="repView" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class="shortcut">
<%: traduci("RawMat") %>
<asp:Label ID="Label1" runat="server" Text='<%# Bind("RawMat") %>' Font-Bold="true" Font-Size="1.2em" />
<div class="didascalia">
<asp:Label ID="Label2" runat="server" Text='<%# Bind("numRec","{0} rec") %>' />
</div>
<div style="font-size: 0.7em; padding-top:5px;">
<asp:HyperLink runat="server" ID="hlExistingProd" NavigateUrl='<%# getUrl(false,Eval("RawMat")) %>' CssClass="btn btn-success" Width="100%" Visible='<%# Convert.ToInt32(Eval("numRec")) > 0 %>'><%: traduci("ExistingProduct")%></asp:HyperLink>
<asp:HyperLink runat="server" ID="hlNewProd" NavigateUrl='<%# getUrl(true,Eval("RawMat")) %>' CssClass="btn btn-warning" Width="100%" Visible='<%# Convert.ToInt32(Eval("numRec")) == 0 %>'><%: traduci("NewProduct")%></asp:HyperLink>
</div>
</div>
</ItemTemplate>
</asp:Repeater>
</div>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.Offers4ItemTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="acArticolo" DefaultValue="" Name="CodItem" PropertyName="valore" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</ContentTemplate>
</asp:UpdatePanel>
</ContentTemplate>
</asp:UpdatePanel>
</div>
<div class="col-xs-12">
<asp:UpdatePanel ID="upItems" runat="server">
<ContentTemplate>
<div class="shortcuts">
<asp:Repeater ID="repView" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class="shortcut">
<%: traduci("RawMat") %>
<asp:Label ID="Label1" runat="server" Text='<%# Bind("RawMat") %>' Font-Bold="true" Font-Size="1.2em" />
<div class="didascalia">
<asp:Label ID="Label2" runat="server" Text='<%# Bind("numRec","{0} rec") %>' />
</div>
<div style="font-size: 0.7em; padding-top: 5px;">
<asp:HyperLink runat="server" ID="hlExistingProd" NavigateUrl='<%# getUrl(false,Eval("RawMat")) %>' CssClass="btn btn-success" Width="100%" Visible='<%# Convert.ToInt32(Eval("numRec")) > 0 %>'><%: traduci("ExistingProduct")%></asp:HyperLink>
<asp:HyperLink runat="server" ID="hlNewProd" NavigateUrl='<%# getUrl(true,Eval("RawMat")) %>' CssClass="btn btn-warning" Width="100%" Visible='<%# Convert.ToInt32(Eval("numRec")) == 0 %>'><%: traduci("NewProduct")%></asp:HyperLink>
</div>
</div>
</ItemTemplate>
</asp:Repeater>
</div>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.Offers4ItemTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="acArticolo" DefaultValue="" Name="CodItem" PropertyName="valore" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</ContentTemplate>
</asp:UpdatePanel>
</div>
</div>
<div class="col-xs-2">
<asp:Image ID="Image1" runat="server" ImageUrl="~/Drawings/MissingImage.png" />
</div>
</div>
<%--<div class="row" style="font-size: 1.2em; line-height: 1.6em;">
</div>--%>
</div>
</div>
</div>
</div>
</asp:Content>
C2P/ExistingProductOffer.aspx.designer.cs
Generated
+9
View File
@@ -56,5 +56,14 @@ namespace C2P {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// Image1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Image Image1;
}
}
C2P/Reports/MarginReport.xlsx
BIN
View File
Binary file not shown.
C2P/Reports/SiepiLogoHead_160_800.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

C2P/WebUserControls/mod_OffersArchive.ascx
+10 -2
View File
@@ -73,7 +73,7 @@
</div>
</div>
</div>--%>
<div class="row" style="min-height: 3.3em; font-size:0.8em;">
<div class="row" style="min-height: 3.3em; font-size: 0.8em;">
<div class="col-sm-12">
<uc4:mod_range ID="mod_range1" runat="server" minVal="0" maxVal="5000" />
</div>
@@ -96,7 +96,7 @@
<asp:LinkButton runat="server" Width="100%" ID="lbOpen" CssClass="btn btn-success" OnClick="lbOpen_Click"><i class="fa fa-search"></i> <%:traduci("Open") %></asp:LinkButton>
</div>
<div class="col-sm-2" style="padding: 0px 4px;">
<asp:LinkButton runat="server" Width="100%" ID="lbDelete" CssClass="btn btn-danger" OnClick="lbDelete_Click" OnClientClick="if (!confermaDel()) return false;" ><i class="fa fa-trash-o"></i> <%:traduci("Delete") %></asp:LinkButton>
<asp:LinkButton runat="server" Width="100%" ID="lbDelete" CssClass="btn btn-danger" OnClick="lbDelete_Click" OnClientClick="if (!confermaDel()) return false;"><i class="fa fa-trash-o"></i> <%:traduci("Delete") %></asp:LinkButton>
</div>
<div class="col-sm-2" style="padding: 0px 4px;">
<asp:LinkButton runat="server" Width="100%" ID="lbDuplicate" CssClass="btn btn-primary" OnClick="lbDuplicate_Click"><i class="fa fa-code-fork"></i> <%:traduci("Duplicate") %></asp:LinkButton>
@@ -118,6 +118,14 @@
<PagerSettings Mode="NumericFirstLast" />
<PagerStyle CssClass="paginatore" HorizontalAlign="Center" Font-Bold="true" Wrap="true" Font-Size="1.2em" Width="100%" />
<Columns>
<asp:TemplateField HeaderText="">
<ItemTemplate>
<asp:HyperLink runat="server" Target="_blank" NavigateUrl="~/Drawings/MissingImage.png" ToolTip="Missing image"><%--<asp:Image runat="server" ImageUrl="~/Drawings/MissingImage.png" Height="32px" />--%><i class="fa fa-file-image-o fa-3x"></i></asp:HyperLink>
</ItemTemplate>
<AlternatingItemTemplate>
<asp:HyperLink ID="HyperLink1" runat="server" Target="_blank" NavigateUrl="~/Drawings/MissingImage.png" ToolTip="Missing image"><asp:Image runat="server" ImageUrl="~/Drawings/MissingImage.png" Height="32px" /><%--<i class="fa fa-file-image-o fa-3x"></i>--%></asp:HyperLink>
</AlternatingItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Offer #" SortExpression="CodQuote">
<ItemTemplate>
<b>
C2P/WebUserControls/mod_Q_Costs.ascx
+2 -2
View File
@@ -90,14 +90,14 @@
</div>
<div class="row">
<div class="col-xs-6 text-left">
<uc1:mod_displayHor ID="mod_displayHor12" runat="server" etichetta='<%# traduci("VC4UG01") %>' valore='<%# Eval("VC4UG01", "{0:C3}") %>' />
<uc1:mod_displayHor ID="mod_displayHor12" runat="server" etichetta='<%# traduci("VC4UG01") %>' valore='<%# Eval("VC4UG01", "{0:C3}") %>' Visible='<%# userIsAdmin %>' />
</div>
<div class="col-xs-6 text-right">
</div>
</div>
<div class="row">
<div class="col-xs-6 text-left">
<uc1:mod_displayHor ID="mod_displayHor16" runat="server" etichetta='<%# traduci("VC4UG04") %>' valore='<%# Eval("VC4UG04", "{0:C3}") %>' />
<uc1:mod_displayHor ID="mod_displayHor16" runat="server" etichetta='<%# traduci("VC4UG04") %>' valore='<%# Eval("VC4UG04", "{0:C3}") %>' Visible='<%# userIsAdmin %>' />
</div>
<div class="col-xs-6 text-right">
</div>
C2P/WebUserControls/mod_Q_Costs.ascx.cs
+11
View File
@@ -89,5 +89,16 @@ namespace C2P.WebUserControls
eh_update(this, new EventArgs());
}
}
/// <summary>
/// verifica se utente sia admin altrimenti non vede dati...
/// </summary>
public bool userIsAdmin
{
get
{
bool answ = SteamWare.user_std.UtSn.userHasRight("SuperUser");
return answ;
}
}
}
}
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Data/bin/Release/C2P_Data.dll
BIN
View File
Binary file not shown.
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.
VersGen/C2P.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("0.9.116.267")]
[assembly: AssemblyFileVersion("0.9.116.267")]
[assembly: AssemblyVersion("0.9.117.271")]
[assembly: AssemblyFileVersion("0.9.117.271")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")]
[assembly: AssemblyCompany("Steamware")]
VersGen/C2P.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("0.9.116.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.9.116.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("0.9.117.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.9.117.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+