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

Update terminalino a 272 x fix grafica & co...

Browse Source 
git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@280 365432ac-a1b5-4ffd-bb28-6d3099d32164
This commit is contained in:
samuele
2010-10-05 07:12:08 +00:00
parent e5c5b57165
commit 073bc41e6b
26 changed files with 32 additions and 6398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/GMW/obj/Debug/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW/obj/Debug/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW/obj/Release/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW/obj/Release/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_Term/Web.config
+1 -1
View File
@@ -58,7 +58,7 @@
<add key="appName" value="GMW_Term" />
<add key="SiteName" value="Ambivere"/>
<add key="mainRev" value="1.0" />
<add key="minRev" value="271"/>
<add key="minRev" value="272"/>
<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_btnUdc.ascx.cs
+11 -6
View File
@@ -192,14 +192,19 @@ namespace GMW_Term.WebUserControls
{
if (!Page.IsPostBack)
{
pnlButtons.Visible = true;
pnlInput.Visible = false;
traduciObj();
setupBtn();
setupIniziale();
}
txtInput.Focus();
}
private void setupIniziale()
{
pnlButtons.Visible = true;
pnlInput.Visible = false;
traduciObj();
setupBtn();
}
/// <summary>
/// resetta panel input
/// </summary>
@@ -689,8 +694,8 @@ namespace GMW_Term.WebUserControls
{
MagClass.magazzino.confermaUdcPrelevatoPerLista(_CodLista, _UDC);
editAttivo = tipoEditUdc.nd;
doHideBtn();
doResetPnl();
// fix visualizzazione
setupIniziale();
}
/// <summary>
/// passa al barcode!
GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx
+12 -11
View File
@@ -4,7 +4,8 @@
<%@ Register Src="mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc1" %>
<div id="contenuto" style="text-align: center;">
<div id="InputTitle">
<asp:Label ID="lblInput" runat="server" Text="Liste Prelievo" Font-Size="X-Small" Font-Bold="true" /></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>
@@ -16,7 +17,8 @@
<div id="smallGrid" style="text-align: left; padding: 0px 0px 0px 0px;">
<asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound"
Width="70%" DataKeyNames="CodLista" DataSourceID="ods" OnRowUpdating="grView_RowUpdating" Font-Size="X-Small">
Width="70%" DataKeyNames="CodLista" DataSourceID="ods" OnRowUpdating="grView_RowUpdating"
Font-Size="X-Small">
<RowStyle CssClass="ctrRowStyle" />
<AlternatingRowStyle CssClass="ctrAltRowStyle" />
<EditRowStyle CssClass="ctrEditRowStyle" />
@@ -67,7 +69,7 @@
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Stato" SortExpression="CodStatoLista" ItemStyle-HorizontalAlign="Center">
<asp:TemplateField HeaderText="StatoLista" SortExpression="CodStatoLista" ItemStyle-HorizontalAlign="Center">
<ItemTemplate>
<asp:ImageButton runat="server" ID="imgCodStatoLista" ImageUrl='<%# pathImgStato(Eval("CodStatoLista")) %>'
CausesValidation="False" CommandArgument='<%# cmdArgStato(Eval("CodStatoLista")) %>'
@@ -79,7 +81,6 @@
</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:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getByFilt" TypeName="GMW_data.DS_magazzinoTableAdapters.ElencoListePrelievoTableAdapter"
@@ -146,17 +147,17 @@
</HeaderTemplate>
<ItemTemplate>
<asp:ImageButton ID="imgPrelevato" runat="server" CausesValidation="False" CommandName="Update"
CommandArgument="ConfermaPrelevato" ToolTip='<%# traduci("EffettuaPrelievo") %>'
Visible='<%# prelevaEnabled(Eval("Prelevato"), Eval("UDC")) %>' ImageUrl="~/images/ArrowUpGreen_m.png"
OnClick="imgPrelevato_Click" />
<cc1:ConfirmButtonExtender ID="cbePreleva" runat="server" ConfirmText='<%# traduci("confermaPrelievo")%>'
TargetControlID="imgPrelevato" />
CommandArgument="ConfermaPrelevato" ToolTip='<%# traduci("EffettuaPrelievo") %>'
Visible='<%# prelevaEnabled(Eval("Prelevato"), Eval("UDC")) %>' ImageUrl="~/images/ArrowUpGreen_m.png"
OnClick="imgPrelevato_Click" />
<%--<cc1:ConfirmButtonExtender ID="cbePreleva" runat="server" ConfirmText='<%# traduci("confermaPrelievo")%>'
TargetControlID="imgPrelevato" />--%>
<asp:ImageButton ID="imgAnnullaPrelevato" runat="server" CausesValidation="False"
CommandName="Update" CommandArgument="AnnullaPrelevato" ToolTip='<%# traduci("AnnullaPrelievo") %>'
Visible='<%# annullaEnabled(Eval("Prelevato")) %>' ImageUrl="~/images/ArrowDownRed_m.png"
OnClick="imgAnnullato_Click" />
<cc1:ConfirmButtonExtender ID="cbeAnnulla" runat="server" ConfirmText='<%# traduci("confermaAnnullaPrelievo")%>'
TargetControlID="imgAnnullaPrelevato" />
<%-- <cc1:ConfirmButtonExtender ID="cbeAnnulla" runat="server" ConfirmText='<%# traduci("confermaAnnullaPrelievo")%>'
TargetControlID="imgAnnullaPrelevato" />--%>
</ItemTemplate>
</asp:TemplateField>
</Columns>
GMW/GMW_Term/WebUserControls/mod_periodoAnalisi.ascx
+2 -2
View File
@@ -13,13 +13,13 @@
</asp:ObjectDataSource>
</div>
<div style="float: left; padding-right: 1px;">
<asp:TextBox ID="txtInizio" TabIndex="1" runat="server" Width="55px" MaxLength="10"
<asp:TextBox ID="txtInizio" TabIndex="1" runat="server" Width="52px" MaxLength="10"
Font-Size="Smaller" AutoPostBack="True" OnTextChanged="txtInizio_TextChanged"></asp:TextBox>
<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"
<asp:TextBox ID="txtFine" TabIndex="2" runat="server" Width="52px" MaxLength="10"
Font-Size="Smaller" AutoPostBack="True" OnTextChanged="txtFine_TextChanged"></asp:TextBox>
<asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ErrorMessage="!!!"
ControlToValidate="txtFine" Display="Dynamic" />
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.XML
-3186
View File
File diff suppressed because it is too large Load Diff
GMW/GMW_Term/mazzAppSettings.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW_Term"/>
<add key="SiteName" value="Ambivere"/>
<add key="mainRev" value="1.0"/>
<add key="minRev" value="271" />
<add key="minRev" value="272" />
<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/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:{7DE84A14-C138-4C94-8C8D-CE0D2F1F6DF1}"
"PackageCode" = "8:{E3E9D5FC-6E83-4F73-8957-76D1737A4F4A}"
"ProductCode" = "8:{B052C397-AE7A-41DD-913C-ADB81961F1F6}"
"PackageCode" = "8:{4C67925B-C69A-4C73-85CB-32E75579E307}"
"UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.0.271"
"ProductVersion" = "8:1.0.272"
"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\\Release\\SetDirectoryPermission.exe"
"SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF"
@@ -852,7 +852,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B0271B832DBE45F0B50639E61DAE3CF4"
{
"SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe"
"SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\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.
GMW/GMW_data/bin/Debug/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/bin/Debug/SteamWare.xml
-3186
View File
File diff suppressed because it is too large Load Diff
GMW/GMW_data/bin/Release/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Debug/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Release/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_installer/Release/GMW_installer.msi
BIN
View File
Binary file not shown.