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

update con molte modifiche richieste su terminus

Browse Source 
git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@273 365432ac-a1b5-4ffd-bb28-6d3099d32164
This commit is contained in:
ermanno
2010-10-01 13:08:52 +00:00
parent 942f73d8af
commit e3d1255db3
27 changed files with 244 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/GMW_Term/GMW_Term.csproj
+18 -26
View File
@@ -243,28 +243,6 @@
<Content Include="images\cancel_l.png" />
<Content Include="images\cancel_m.png" />
<Content Include="images\cancel_s.png" />
<Content Include="images\circleDis_s_0.png" />
<Content Include="images\circleDis_s_1.png" />
<Content Include="images\circleDis_s_2.png" />
<Content Include="images\circleDis_s_3.png" />
<Content Include="images\circleDis_s_4.png" />
<Content Include="images\circle_s_0.png" />
<Content Include="images\circle_s_1.png" />
<Content Include="images\circle_s_2.png" />
<Content Include="images\circle_s_3.png" />
<Content Include="images\circle_s_4.png" />
<Content Include="images\lista_01-PreFus_l.png" />
<Content Include="images\lista_01-PreFus_m.png" />
<Content Include="images\lista_01-PreFus_s.png" />
<Content Include="images\lista_02-PreCli_l.png" />
<Content Include="images\lista_02-PreCli_m.png" />
<Content Include="images\lista_02-PreCli_s.png" />
<Content Include="images\lista_02-TerFus_l.png" />
<Content Include="images\lista_02-TerFus_m.png" />
<Content Include="images\lista_02-TerFus_s.png" />
<Content Include="images\lista_03-TerWip_l.png" />
<Content Include="images\lista_03-TerWip_m.png" />
<Content Include="images\lista_03-TerWip_s.png" />
<Content Include="images\view_l.png" />
<Content Include="images\view_m.png" />
<Content Include="images\view_s.png" />
@@ -282,7 +260,6 @@
<Content Include="Barcode.aspx" />
<Content Include="Home.aspx" />
<Content Include="ListePrelievo.aspx" />
<Content Include="images\logo_sw.png" />
<Content Include="Search.aspx" />
<Content Include="Style.css" />
<Content Include="WebMasterPages\Compact.Master" />
@@ -299,9 +276,24 @@
</ItemGroup>
<ItemGroup>
<Content Include="Cella.aspx" />
<Content Include="images\Cella.png" />
<Content Include="images\Part.png" />
<Content Include="images\Udc.png" />
<Content Include="images\Cella.jpg" />
<Content Include="images\lista_01-PreFus_s.jpg" />
<Content Include="images\lista_02-PreCli_s.jpg" />
<Content Include="images\lista_02-TerFus_s.jpg" />
<Content Include="images\lista_03-TerWip_s.jpg" />
<Content Include="images\logo_sw.jpg" />
<Content Include="images\Part.jpg" />
<Content Include="images\squareDis_s_0.jpg" />
<Content Include="images\squareDis_s_1.jpg" />
<Content Include="images\squareDis_s_2.jpg" />
<Content Include="images\squareDis_s_3.jpg" />
<Content Include="images\squareDis_s_4.jpg" />
<Content Include="images\square_s_0.jpg" />
<Content Include="images\square_s_1.jpg" />
<Content Include="images\square_s_2.jpg" />
<Content Include="images\square_s_3.jpg" />
<Content Include="images\square_s_4.jpg" />
<Content Include="images\Udc.jpg" />
<Content Include="images\WIP.png" />
<Content Include="mazzAppSettings.config" />
<Content Include="mazzConnectionStrings.config" />
GMW/GMW_Term/Style.css
+115 -16
View File
@@ -15,7 +15,7 @@
padding: 0px;
border: 1px black solid;
background-position: center bottom;
background-image: url('images/logo_sw.png');
background-image: url('images/logo_sw.jpg');
background-repeat: no-repeat;
}
@@ -29,7 +29,7 @@
}
#taskBanner
{
height: 20px;
height:10px;
}
#smallTable
{
@@ -53,6 +53,7 @@
height: 100px;
text-align: center;
vertical-align: middle;
margin-left: 5px;
}
.quadro1
@@ -87,6 +88,16 @@
color: White;
text-align: center;
}
.ctrHeaderPagerMini
{
background-color: #b8b8b8;
color: White;
text-align: center;
font-size: x-small;
height: 10px;
}
.ctrHeaderPagerWide
{
background-color: #b8b8b8;
@@ -130,118 +141,138 @@
color: #333333;
background-color: #D1DDF1;
}
.ctrFooterMini
{
font-size: x-small;
height: 15px;
}
.btnDeposita
{
display: block;
width: 100px;
width: 70px;
height:40px;
border: solid 2px red;
background-color: #FFAAAA;
font-size:x-small;
}
.btnSposta
{
display: block;
width: 100px;
width: 70px;
height:40px;
border: solid 2px green;
background-color: #AAFFAA;
font-size:x-small;
}
.btnRettifica
{
display: block;
width: 100px;
width: 70px;
height:40px;
border: solid 2px blue;
background-color: #AAAAFF;
font-size:x-small;
}
.btnPreleva
{
display: block;
width: 100px;
width: 70px;
height:40px;
border: solid 2px red;
background-color: #FFAAFF;
font-size:x-small;
}
.btnConferma
{
display: block;
width: 100px;
width: 70px;
height:40px;
border: solid 2px yellow;
background-color: #FFFFAA;
font-size:x-small;
}
.btnCellaPiena
{
display: block;
width: 100px;
width: 70px;
height:40px;
border: solid 2px blue;
background-color: #AAFFFF;
font-size:x-small;
}
.btnBarcode
{
display: block;
width: 100px;
width: 70px;
height:40px;
text-align: center;
border: solid 2px blue;
background-color: #AAFFFF;
font-size:x-small;
}
.btnChiudi
{
display: block;
width: 100px;
width: 70px;
height: 40px;
border: solid 2px yellow;
background-color: #FFFFAA;
font-size:x-small;
}
.btnChiudiInput
{
display: block;
width: 100px;
width: 70px;
height:40px;
border: solid 2px red;
background-color: #FFAAFF;
font-size:x-small;
}
.btnDeliberaFusi
{
display: block;
width: 100px;
width: 70px;
height:40px;
border: solid 2px green;
background-color: #AAFFAA;
font-size:x-small;
}
.btnDeliberaWipPre
{
display: block;
width: 100px;
width: 70px;
height:40px;
border: solid 2px green;
background-color: #AAFFAA;
font-size:x-small;
}
.btnDeliberaWipPost
{
display: block;
width: 100px;
width: 70px;
height:40px;
border: solid 2px green;
background-color: #AAFFAA;
font-size:x-small;
}
.btnUpdate
{
display: block;
width: 100px;
width: 70px;
height:40px;
border: solid 2px green;
background-color: #AAFFAA;
font-size:x-small;
}
.btnCancel
{
display: block;
width: 100px;
width: 70px;
height:40px;
border: solid 2px blue;
background-color: #AAAAFF;
font-size:x-small;
}
/* classe generale per div dei bottoni */
@@ -251,6 +282,74 @@
float: left;
}
/* bottoni homepage */
.btnBarcodeBig
{
width: 90px;
height:90px;
border: solid 2px blue;
background-color: #AAFFFF;
text-align: center;
white-space:pre;
}
.btnSearchBig
{
width: 90px;
height: 90px;
border: solid 2px yellow;
background-color: #FFFFAA;
white-space:pre;
}
.btnListBig
{
width: 90px;
height:90px;
border: solid 2px red;
background-color: #FFAAFF;
white-space:pre;
}
.btnTaskBig
{
width: 90px;
height:90px;
border: solid 2px green;
background-color: #AAFFAA;
white-space:pre;
}
.btnHome
{
width: 80px;
height:20px;
border: solid 2px green;
background-color: #AAFFAA;
white-space:pre;
font-size: x-small;
}
.btnLogout
{
width: 80px;
height:20px;
border: solid 2px red;
background-color: #FFAAFF;
white-space:pre;
font-size: x-small;
}
/* classe per calendario popup ajax */
.miniCalendar .ajax__calendar_container
{
background-color: White;
font-size: xx-small;
}
/* classe comune per bottoni selezione terminalino
.bottoniSel
GMW/GMW_Term/Web.config
+1 -1
View File
@@ -57,7 +57,7 @@
<add key="appName" value="GMW_Term" />
<add key="SiteName" value="Ambivere"/>
<add key="mainRev" value="1.0" />
<add key="minRev" value="260" />
<add key="minRev" value="265" />
<add key="copyRight" value="SteamWare © 2010" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW_Term/WebUserControls/mod_activeTask.ascx
+8 -8
View File
@@ -6,9 +6,9 @@
</div>
<asp:Panel runat="server" ID="pnlListaPrelievo">
<div style="text-align: left;">
<asp:Label runat="server" ID="lblListaAttiva" />
<asp:Label runat="server" ID="lblListaAttiva" Font-Size="X-Small" Font-Bold="true"/>
</div>
<div style="text-align: right;">
<div style="text-align: right; font-size: small;">
<b>
<asp:HyperLink runat="server" ID="hlListaAttiva" NavigateUrl="~/ListePrelievo.aspx" />
</b>
@@ -16,9 +16,9 @@
</asp:Panel>
<asp:Panel runat="server" ID="pnlBarcode">
<div style="text-align: left;">
<asp:Label runat="server" ID="lblBarcode" />
<asp:Label runat="server" ID="lblBarcode" Font-Size="X-Small" Font-Bold="true" />
</div>
<div style="text-align: right;">
<div style="text-align: right; font-size: small;">
<b>
<asp:HyperLink runat="server" ID="hlBarcode" NavigateUrl="~/Barcode.aspx" />
</b>
@@ -26,9 +26,9 @@
</asp:Panel>
<asp:Panel runat="server" ID="pnlRicerca">
<div style="text-align: left;">
<asp:Label runat="server" ID="lblRicerca" />
<asp:Label runat="server" ID="lblRicerca" Font-Bold="true" Font-Size="X-Small" />
</div>
<div style="text-align: right;">
<div style="text-align: right; font-size: small;">
<b>
<asp:HyperLink runat="server" ID="hlRicerca" NavigateUrl="~/Search.aspx" />
</b>
@@ -36,9 +36,9 @@
</asp:Panel>
<asp:Panel runat="server" ID="pnlMaster" Visible="true">
<div id="Button" style="margin-top: 5px;">
<asp:Button ID="btnLoginPage" runat="server" OnClick="btnLoginPage_Click" Width="100px"
<asp:Button ID="btnLoginPage" runat="server" OnClick="btnLoginPage_Click" CssClass="btnLogout"
/>
<asp:Button ID="btnButtonsHome" runat="server" OnClick="btnButtonsHome_Click" Width="100px"
<asp:Button ID="btnButtonsHome" runat="server" OnClick="btnButtonsHome_Click" CssClass="btnHome"
/>
</div>
</asp:Panel>
GMW/GMW_Term/WebUserControls/mod_barcode.ascx
+2 -2
View File
@@ -14,8 +14,8 @@
<asp:Label ID="lblData" runat="server" Text="" />
</div>
<div id="Button">
<asp:Button ID="btnLoginPage" runat="server" OnClick="btnLoginPage_Click" Width="100px" />
<asp:Button ID="btnButtonsHome" runat="server" OnClick="btnButtonsHome_Click" Width="100px" />
<asp:Button ID="btnLoginPage" runat="server" OnClick="btnLoginPage_Click" CssClass="btnLogout" />
<asp:Button ID="btnButtonsHome" runat="server" OnClick="btnButtonsHome_Click" CssClass="btnHome" />
</div>
<div style="padding-top:20px; font-size:smaller;">
<asp:Label runat="server" ID="lblRev" />
GMW/GMW_Term/WebUserControls/mod_currentTask.ascx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_currentTask.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_currentTask" %>
<div id="title" class="taskBanner">
<asp:Label ID="lblTask" runat="server" Text="...wait..." />
<asp:Label ID="lblTask" runat="server" Text="...wait..." Font-Size="X-Small" />
</div>
GMW/GMW_Term/WebUserControls/mod_home.ascx
+4 -4
View File
@@ -1,17 +1,17 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_home.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_home" %>
<div id="1" class="quadro1">
&nbsp;<asp:Button ID="btn1" runat="server" Height="90px" Text="Button" Width="90px"
&nbsp;<asp:Button ID="btn1" runat="server" CssClass="btnBarcodeBig"
OnClick="btn1_Click" AccessKey="1" />
</div>
<div id="2" class="quadro2">
&nbsp;<asp:Button ID="btn2" runat="server" Height="90px" Text="Button" Width="90px"
&nbsp;<asp:Button ID="btn2" runat="server" CssClass="btnSearchBig"
OnClick="btn2_Click1" AccessKey="2" />
</div>
<div style="clear: both;" height="0px">
</div>
<div id="3" class="quadro2">
<asp:Button ID="btn3" runat="server" Height="90px" Text="Button" Width="90px" OnClick="btn3_Click1" />
<asp:Button ID="btn3" runat="server" CssClass="btnListBig" OnClick="btn3_Click1" />
</div>
<div id="4" class="quadro1">
<asp:Button ID="btn4" runat="server" Height="90px" Text="Button" Width="90px" OnClick="btn4_Click1" />
<asp:Button ID="btn4" runat="server" CssClass="btnTaskBig" OnClick="btn4_Click1" />
</div>
GMW/GMW_Term/WebUserControls/mod_home.ascx.cs
+4 -4
View File
@@ -24,13 +24,13 @@ namespace GMW_Term.WebUserControls
{
// scrive label e text bottoni
btn1.Text = "[1]-Barcode";
btn1.Text = "Barcode\n[Alt+1]";
btn1.AccessKey = "1";
btn2.Text = "[3]-" + traduci("Research");
btn2.Text = traduci("Research") + "\n[Alt+3]" ;
btn2.AccessKey = "3";
btn3.Text = "[7]-" + traduci("TakeList");
btn3.Text = traduci("TakeList") + "\n[Alt+7]";
btn3.AccessKey = "7";
btn4.Text = "[9]-" + traduci("ActiveTask");
btn4.Text = traduci("ActiveTask") + "\n[Alt+9]";
btn4.AccessKey = "9";
}
GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx
+13 -17
View File
@@ -6,16 +6,14 @@
</asp:ScriptManager>
<div id="contenuto" style="text-align: center;">
<div id="InputTitle">
<asp:Label ID="lblInput" runat="server" Text="Liste Prelievo" /></div>
<asp:Label ID="lblInput" runat="server" Text="Liste Prelievo" Font-Size="X-Small" Font-Bold="true" /></div>
<div class="filtro_1" style="white-space: nowrap; height: 20px; padding: 2px;">
<uc1:mod_periodoAnalisi ID="mod_periodoAnalisi1" runat="server" />
</div>
<asp:Panel runat="server" ID="pnlMaster" Visible="true">
<div id="Button">
<asp:Button ID="btnLoginPage" runat="server" OnClick="btnLoginPage_Click" Width="100px"
Font-Size="Smaller" />
<asp:Button ID="btnButtonsHome" runat="server" OnClick="btnButtonsHome_Click" Width="100px"
Font-Size="Smaller" />
<asp:Button ID="btnLoginPage" runat="server" OnClick="btnLoginPage_Click" CssClass="btnLogout" />
<asp:Button ID="btnButtonsHome" runat="server" OnClick="btnButtonsHome_Click" CssClass="btnHome" />
</div>
<div id="smallGrid" style="text-align: left; padding: 0px 0px 0px 0px;">
<asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
@@ -26,7 +24,7 @@
<EditRowStyle CssClass="ctrEditRowStyle" />
<SelectedRowStyle CssClass="ctrSelRowStyle" />
<FooterStyle CssClass="ctrFooter" />
<PagerStyle CssClass="ctrHeaderPager" ForeColor="White" HorizontalAlign="Center" />
<PagerStyle CssClass="ctrHeaderPagerMini" ForeColor="White" HorizontalAlign="Center" />
<HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
<EmptyDataRowStyle CssClass="ctrRowStyle" />
<EmptyDataTemplate>
@@ -40,12 +38,12 @@
CommandName="Update" ToolTip='<%# tooltipTipo(Eval("CodTipoLista")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Dest" SortExpression="Destinatario">
<asp:TemplateField HeaderText="Dest/Data" SortExpression="Destinatario">
<ItemTemplate>
<div>
<div style="float: left;">
<b>
<asp:Label ID="lblDestinatario" runat="server" Text='<%# Eval("Destinatario") %>' />
<asp:Label ID="lblDestinatario" runat="server" Text='<%# trimma(Eval("Destinatario").ToString(), 10) %>' />
</b>
</div>
</div>
@@ -71,7 +69,7 @@
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="St" SortExpression="CodStatoLista" ItemStyle-HorizontalAlign="Center">
<asp:TemplateField HeaderText="Stato" SortExpression="CodStatoLista" ItemStyle-HorizontalAlign="Center">
<ItemTemplate>
<asp:ImageButton runat="server" ID="imgCodStatoLista" ImageUrl='<%# pathImgStato(Eval("CodStatoLista")) %>'
CausesValidation="False" CommandArgument='<%# cmdArgStato(Eval("CodStatoLista")) %>'
@@ -83,7 +81,7 @@
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />&nbsp;&nbsp;
<%--<asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />&nbsp;&nbsp;--%>
<asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getByFilt" TypeName="GMW_data.DS_magazzinoTableAdapters.ElencoListePrelievoTableAdapter"
@@ -105,15 +103,13 @@
</asp:Panel>
<asp:Panel runat="server" ID="pnlDetail" Visible="false">
<div>
<asp:Button ID="btnBarcode" runat="server" OnClick="btnBarcode_Click" Width="100px"
Font-Size="Smaller" />
<asp:Button ID="btnCloseDet" runat="server" OnClick="btnCloseDet_Click" Width="100px"
Font-Size="Smaller" />
<asp:Button ID="btnBarcode" runat="server" OnClick="btnBarcode_Click" CssClass="btnLogout" />
<asp:Button ID="btnCloseDet" runat="server" OnClick="btnCloseDet_Click" CssClass="btnHome" />
</div>
<div id="smallGridDetail">
<div id="smallGridDetail" style="text-align: left; padding: 0px 0px 0px 0px;">
<asp:GridView ID="grViewDetail" runat="server" AllowPaging="True" AllowSorting="True"
Width="100%" AutoGenerateColumns="False" OnDataBound="grView_DataBound" DataKeyNames="CodLista,UDC"
DataSourceID="odsDetail" OnRowUpdating="grViewDetail_RowUpdating">
Width="70%" AutoGenerateColumns="False" OnDataBound="grView_DataBound" DataKeyNames="CodLista,UDC"
DataSourceID="odsDetail" OnRowUpdating="grViewDetail_RowUpdating" Font-Size="X-Small">
<RowStyle CssClass="ctrRowStyle" />
<AlternatingRowStyle CssClass="ctrAltRowStyle" />
<EditRowStyle CssClass="ctrEditRowStyle" />
GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs
+14 -5
View File
@@ -166,11 +166,11 @@ namespace GMW_Term.WebUserControls
{ }
}
int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1);
lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord);
//lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord);
}
else
{
lblNumRec.Text = "";
//lblNumRec.Text = "";
}
}
/// <summary>
@@ -579,11 +579,11 @@ namespace GMW_Term.WebUserControls
string answ = "";
if (MagClass.magazzino.userHasActiveLP && stato == 1)
{
answ = string.Format("~/images/circleDis_s_{0}.png", codStato);
answ = string.Format("~/images/squareDis_s_{0}.jpg", codStato);
}
else
{
answ = string.Format("~/images/circle_s_{0}.png", codStato);
answ = string.Format("~/images/square_s_{0}.jpg", codStato);
}
return answ;
}
@@ -748,7 +748,7 @@ namespace GMW_Term.WebUserControls
/// <returns></returns>
public string pathImgTipo(object codice)
{
return string.Format("~/images/lista_{0}_s.png", codice);
return string.Format("~/images/lista_{0}_s.jpg", codice);
}
/// <summary>
/// restituisce tooltip da mostrare x TIPO lista
@@ -820,6 +820,15 @@ namespace GMW_Term.WebUserControls
}
public string trimma(string testo, int maxChar)
{
string answ= testo;
if(testo.Length > maxChar)
{
answ = testo.Substring(0, 10);
}
return answ;
}
}
}
GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs
Generated
-9
View File
@@ -76,15 +76,6 @@ namespace GMW_Term.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.GridView grView;
/// <summary>
/// lblNumRec 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.Label lblNumRec;
/// <summary>
/// lblWarning control.
/// </summary>
GMW/GMW_Term/WebUserControls/mod_menuTop.ascx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuTop.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_menuTop" %>
<div id="titleGMW" style="margin: 0px 0px 0px 0px; background-color: #6666FF; text-align: center;">
<asp:Label ID="lblTitolo" runat="server" Text="" Style="color: #FFFFFF; font-size:small"/>
<asp:Label ID="lblTitolo" runat="server" Text="" Style="color: #FFFFFF; font-size:x-small"/>
</div>
GMW/GMW_Term/WebUserControls/mod_periodoAnalisi.ascx
+2 -8
View File
@@ -1,9 +1,9 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_periodoAnalisi" CodeBehind="mod_periodoAnalisi.ascx.cs" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
<div id="smallTable">
<div style="float: left;">
<asp:DropDownList ID="DropDownList1" runat="server" AutoPostBack="True" OnSelectedIndexChanged="DropDownList1_SelectedIndexChanged"
DataSourceID="odsPeriodi" DataTextField="label" DataValueField="value" Font-Size="Smaller" Width="90px">
DataSourceID="odsPeriodi" DataTextField="label" DataValueField="value" Font-Size="Smaller"
Width="90px">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsPeriodi" runat="server" OldValuesParameterFormatString="original_{0}"
SelectMethod="getByConditio" TypeName="GMW_data.DS_utilityTableAdapters.v_selPeriodiTradTableAdapter">
@@ -15,18 +15,12 @@
<div style="float: left; padding-right: 1px;">
<asp:TextBox ID="txtInizio" TabIndex="1" runat="server" Width="55px" MaxLength="10"
Font-Size="Smaller" AutoPostBack="True" OnTextChanged="txtInizio_TextChanged"></asp:TextBox>
<cc1:CalendarExtender ID="CalendarExtender1" runat="server" TargetControlID="txtInizio"
FirstDayOfWeek="Monday" Format="dd/MM/yyyy">
</cc1:CalendarExtender>
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ErrorMessage="!!!"
ControlToValidate="txtInizio" Display="Dynamic" />
</div>
<div style="float: left; padding-right: 1px;">
<asp:TextBox ID="txtFine" TabIndex="2" runat="server" Width="55px" MaxLength="10"
Font-Size="Smaller" AutoPostBack="True" OnTextChanged="txtFine_TextChanged"></asp:TextBox>
<cc1:CalendarExtender ID="CalendarExtender2" runat="server" TargetControlID="txtFine"
FirstDayOfWeek="Monday" Format="dd/MM/yyyy" >
</cc1:CalendarExtender>
<asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ErrorMessage="!!!"
ControlToValidate="txtFine" Display="Dynamic" />
</div>
GMW/GMW_Term/WebUserControls/mod_periodoAnalisi.ascx.designer.cs
Generated
-18
View File
@@ -39,15 +39,6 @@ public partial class mod_periodoAnalisi {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtInizio;
/// <summary>
/// CalendarExtender1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::AjaxControlToolkit.CalendarExtender CalendarExtender1;
/// <summary>
/// RequiredFieldValidator1 control.
/// </summary>
@@ -66,15 +57,6 @@ public partial class mod_periodoAnalisi {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtFine;
/// <summary>
/// CalendarExtender2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::AjaxControlToolkit.CalendarExtender CalendarExtender2;
/// <summary>
/// RequiredFieldValidator2 control.
/// </summary>
GMW/GMW_Term/WebUserControls/mod_search.ascx
+7 -7
View File
@@ -1,15 +1,15 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_search.ascx.cs"
Inherits="GMW_Term.WebUserControls.mod_search" %>
<%@ Register Src="mod_searchResults.ascx" TagName="mod_searchResults" TagPrefix="uc1" %>
<div id="contenuto" style="text-align: center;">
<div id="contenuto" style="text-align: center; padding: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;">
<div id="InputTitle" style="padding: 0px 0px 0px 0px;">
<asp:Label ID="lblInput" runat="server" Text="Ricerca Libera" /></div>
<div id="Div1">
<asp:Button ID="btnLoginPage" runat="server" OnClick="btnLoginPage_Click" Width="100px" />
<asp:Button ID="btnButtonsHome" runat="server" OnClick="btnButtonsHome_Click" Width="100px" />
<asp:Label ID="lblInput" runat="server" Text="Ricerca Libera" Font-Size="X-Small" /></div>
<div id="Data" style="padding-bottom: 0px;">
<asp:TextBox ID="txtRicerca" runat="server" OnTextChanged="txtRicerca_TextChanged" Height="10px" Font-Size="X-Small" />
</div>
<div id="Data" style="padding-bottom: 4px;">
<asp:TextBox ID="txtRicerca" runat="server" OnTextChanged="txtRicerca_TextChanged" />
<div id="Div1">
<asp:Button ID="btnLoginPage" runat="server" OnClick="btnLoginPage_Click" CssClass="btnLogout"/>
<asp:Button ID="btnButtonsHome" runat="server" OnClick="btnButtonsHome_Click" CssClass="btnHome"/>
</div>
</div>
<uc1:mod_searchResults ID="mod_searchResults1" runat="server" />
GMW/GMW_Term/WebUserControls/mod_search.ascx.designer.cs
Generated
+9 -9
View File
@@ -22,6 +22,15 @@ namespace GMW_Term.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblInput;
/// <summary>
/// txtRicerca 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.TextBox txtRicerca;
/// <summary>
/// btnLoginPage control.
/// </summary>
@@ -40,15 +49,6 @@ namespace GMW_Term.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnButtonsHome;
/// <summary>
/// txtRicerca 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.TextBox txtRicerca;
/// <summary>
/// mod_searchResults1 control.
/// </summary>
GMW/GMW_Term/WebUserControls/mod_searchResults.ascx
+4 -4
View File
@@ -4,13 +4,13 @@
<div id="smallGrid">
<asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound"
Width="100%" DataKeyNames="tipo,valore" DataSourceID="ods" OnRowUpdating="grView_RowUpdating">
Width="90%" DataKeyNames="tipo,valore" DataSourceID="ods" OnRowUpdating="grView_RowUpdating" Font-Size="X-Small">
<RowStyle CssClass="ctrRowStyle" />
<AlternatingRowStyle CssClass="ctrAltRowStyle" />
<EditRowStyle CssClass="ctrEditRowStyle" />
<SelectedRowStyle CssClass="ctrSelRowStyle" />
<FooterStyle CssClass="ctrFooter" />
<PagerStyle CssClass="ctrHeaderPagerWide" ForeColor="White" HorizontalAlign="Center" />
<PagerStyle CssClass="ctrHeaderPagerMini" ForeColor="White" HorizontalAlign="Center" />
<HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
<EmptyDataRowStyle CssClass="ctrRowStyle" />
<EmptyDataTemplate>
@@ -35,8 +35,8 @@
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />&nbsp;&nbsp;
<asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
<%-- <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />&nbsp;&nbsp;
<asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />--%>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="GetData" TypeName="GMW_data.DS_UtilityTableAdapters.stp_ricercaFullTerminalinoTableAdapter">
<SelectParameters>
GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.cs
+7 -7
View File
@@ -123,11 +123,11 @@ namespace GMW_Term.WebUserControls
{ }
}
int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1);
lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord);
//lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord);
}
else
{
lblNumRec.Text = "";
//lblNumRec.Text = "";
}
}
/// <summary>
@@ -241,7 +241,7 @@ namespace GMW_Term.WebUserControls
/// </summary>
protected void aggiornaControlliDataGL()
{
grView.PageSize = 4;
grView.PageSize = 3;
}
/// <summary>
@@ -260,7 +260,7 @@ namespace GMW_Term.WebUserControls
SteamWare.memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView));
grView.SelectedIndex = -1;
grView.DataBind();
lblWarning.Visible = false;
//lblWarning.Visible = false;
}
/// <summary>
@@ -370,13 +370,13 @@ namespace GMW_Term.WebUserControls
switch (tipo)
{
case "UDC":
answ = string.Format("~/images/UDC.png", codice);
answ = string.Format("~/images/Udc.jpg", codice);
break;
case "Particolare":
answ = string.Format("~/images/Part.png", codice);
answ = string.Format("~/images/Part.jpg", codice);
break;
case "Cella":
answ = string.Format("~/images/Cella.png", codice);
answ = string.Format("~/images/Cella.jpg", codice);
break;
default:
break;
GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.designer.cs
Generated
-18
View File
@@ -22,24 +22,6 @@ namespace GMW_Term.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.GridView grView;
/// <summary>
/// lblNumRec 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.Label lblNumRec;
/// <summary>
/// lblWarning 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.Label lblWarning;
/// <summary>
/// ods control.
/// </summary>
GMW/GMW_Term/bin/GMW_Term.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/obj/Debug/GMW_Term.csproj.FileListAbsolute.txt
+29 -29
View File
@@ -27,32 +27,32 @@ c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\ResolveAssemblyReference.cache
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.dll
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.pdb
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_Term.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_Term.pdb
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\AjaxControlToolkit.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_data.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ICSharpCode.SharpZipLib.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\AjaxControlToolkit.pdb
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_data.pdb
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.pdb
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.xml
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ar\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\cs\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\de\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\es\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\fr\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\he\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\hi\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\it\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ja\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ko\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\nl\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\pt\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ru\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\tr-TR\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\zh-CHS\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\zh-CHT\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\ResolveAssemblyReference.cache
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.pdb
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_Term.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_Term.pdb
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\AjaxControlToolkit.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_data.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ICSharpCode.SharpZipLib.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\AjaxControlToolkit.pdb
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_data.pdb
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.pdb
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.xml
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ar\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\cs\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\de\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\es\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\fr\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\he\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\hi\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\it\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ja\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ko\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\nl\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\pt\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ru\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\tr-TR\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\zh-CHS\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\zh-CHT\AjaxControlToolkit.resources.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\ResolveAssemblyReference.cache
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.dll
c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.pdb
GMW/GMW_Term/obj/Debug/GMW_Term.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_Term_installer/GMW_Term_installer.vdproj
+5 -5
View File
@@ -344,14 +344,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW_Term"
"ProductCode" = "8:{0E2CFBF4-7822-4419-AB79-3D0A1148B859}"
"PackageCode" = "8:{94D57F74-FC98-49EF-BB93-1888C0CEFB4E}"
"ProductCode" = "8:{D6CB5F9E-4454-47AF-8422-A3B2797EF37E}"
"PackageCode" = "8:{BFD25881-4CD7-487F-8BB9-B9176FDF245E}"
"UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.0.260"
"ProductVersion" = "8:1.0.265"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
@@ -824,7 +824,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9C1BA08A590A44EC9515C0F91AD50A1D"
{
"SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe"
"SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF"
@@ -852,7 +852,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B0271B832DBE45F0B50639E61DAE3CF4"
{
"SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe"
"SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF"
GMW/GMW_Term_installer/Release/GMW_Term_installer.msi
BIN
View File
Binary file not shown.