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

Corretta visualizzazione filtraggio spostamento reparti

Browse Source 
Fix versione
Rebuild alla 165

git-svn-id: https://keyhammer.ath.cx/svn/WebGIM/trunk@166 3e04ef4b-3b25-4b6c-be27-bb5389ca777b
This commit is contained in:
samuele
2010-01-27 17:32:44 +00:00
parent 53a2877291
commit 154faa77a8
14 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Projects/WebGIM/GIM_data/bin/GIM_data.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/Style.css
+1 -1
View File
@@ -396,7 +396,7 @@
.topTitle
{
color: White;
color: #663300;
font-family: Verdana;
font-size: 26px;
font-weight: bold;
Projects/WebGIM/GIM_site/Web.config
+1 -1
View File
@@ -102,7 +102,7 @@
<add key="welcomeApp" value="GIM_welcomeApp"/>
<add key="appName" value="GIM"/>
<add key="mainRev" value="1.1"/>
<add key="minRev" value="160"/>
<add key="minRev" value="165"/>
<add key="copyRight" value="SteamWare © 2006-2010"/>
<add key="defaultApp" value="GIM_Appl"/>
<add key="defaultTitle" value="GIM_ShortWelcome"/>
Projects/WebGIM/GIM_site/WebConfigSomaschini_AppSettings.config
+1 -1
View File
@@ -18,7 +18,7 @@
<add key="welcomeApp" value="GIM_welcomeApp"/>
<add key="appName" value="GIM"/>
<add key="mainRev" value="1.1"/>
<add key="minRev" value="160"/>
<add key="minRev" value="165"/>
<add key="copyRight" value="SteamWare © 2006-2010"/>
<add key="defaultApp" value="GIM_Appl"/>
<add key="defaultTitle" value="GIM_ShortWelcome"/>
Projects/WebGIM/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx
+7 -3
View File
@@ -6,13 +6,17 @@
<tr>
<td>
<asp:DropDownList ID="ddlImpianto_A" runat="server" DataSourceID="ods" DataTextField="label"
AutoPostBack="true" DataValueField="value" OnSelectedIndexChanged="ddlImpianto_A_SelectedIndexChanged" />
AutoPostBack="true" DataValueField="value"
OnSelectedIndexChanged="ddlImpianto_A_SelectedIndexChanged"
ondatabound="ddlImpianto_A_DataBound" />
</td>
<td>
</td>
<td>
<asp:DropDownList ID="ddlImpianto_B" runat="server" DataSourceID="ods" DataTextField="label"
AutoPostBack="true" DataValueField="value" OnSelectedIndexChanged="ddlImpianto_B_SelectedIndexChanged" />
AutoPostBack="true" DataValueField="value"
OnSelectedIndexChanged="ddlImpianto_B_SelectedIndexChanged"
ondatabound="ddlImpianto_B_DataBound" />
</td>
</tr>
<tr>
@@ -29,7 +33,7 @@
</td>
<td>
<div style="font-size: 8pt;">
<uc2:mod_macchine ID="mod_macchine2" runat="server" vistaModulo="selezione" idxImpiantoSel="2"
<uc2:mod_macchine ID="mod_macchine2" runat="server" vistaModulo="selezione" idxImpiantoSel="1"
dispLessCol="true" />
</div>
</td>
Projects/WebGIM/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx.cs
+18 -3
View File
@@ -7,9 +7,6 @@ using SteamWare;
public partial class mod_assegnazioniMacchineImpianti : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
/// <summary>
/// click spostamento da A a B
/// </summary>
@@ -90,4 +87,22 @@ public partial class mod_assegnazioniMacchineImpianti : System.Web.UI.UserContro
mod_macchine2.idxImpiantoSel = Convert.ToInt32(ddlImpianto_B.SelectedValue);
mod_macchine2.doUpdate();
}
protected void ddlImpianto_A_DataBound(object sender, EventArgs e)
{
// se è primo caricamento aggiorno filtro!
if (!Page.IsPostBack)
{
update_A();
}
}
protected void ddlImpianto_B_DataBound(object sender, EventArgs e)
{
// se è primo caricamento aggiorno filtro!
if (!Page.IsPostBack)
{
update_B();
}
}
}
Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx
+3 -3
View File
@@ -1,15 +1,15 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_main_help" Codebehind="mod_main_help.ascx.cs" %>
<table id="Table7" cellspacing="1" cellpadding="1" width="100%" border="0">
<tr>
<td class="UnauthAppTitle"><asp:Label id="lblAppl" runat="server"></asp:Label>
<td class="UnauthAppTitle"><asp:Label id="lblAppl" runat="server" CssClass="ShadowText" />
</td>
</tr>
<tr>
<td>
<asp:Label id="lblTitle" CssClass="UnauthTitle" runat="server"></asp:Label></td>
<asp:Label id="lblTitle" CssClass="UnauthTitle" runat="server" /></td>
</tr>
<tr>
<td>
<asp:Label id="lblMess" CssClass="UnauthMess" runat="server"></asp:Label></td>
<asp:Label id="lblMess" CssClass="UnauthMess" runat="server" /></td>
</tr>
</table>
Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx
+3 -3
View File
@@ -11,7 +11,7 @@
OnClick="btnLogOut_Click"></asp:LinkButton>
</td>
<td>
<asp:Label ID="lblTitle" runat="server"></asp:Label>
<asp:Label ID="lblTitle" runat="server" />
</td>
<td style="width: 25%; text-align: right;">
<asp:Label ID="lblDateTime" runat="server" CssClass="smallTimeClock" />
@@ -24,8 +24,8 @@
Text="Menu" />
</td>
<td align="center">
<asp:Label ID="lblMessUtente" CssClass="topMenuMess" runat="server"></asp:Label>
<asp:Label ID="lblMessUtenteEn" CssClass="topMenuMessEn" runat="server"></asp:Label>
<asp:Label ID="lblMessUtente" CssClass="topMenuMess" runat="server" />
<asp:Label ID="lblMessUtenteEn" CssClass="topMenuMessEn" runat="server" />
</td>
<td align="right">
<asp:LinkButton ID="lblUser" runat="server" CssClass="userClass" OnClick="lblUser_Click" />
Projects/WebGIM/GIM_site/bin/GIM_data.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/bin/GIM_site.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/obj/Debug/GIM_site.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/obj/Debug/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
Projects/WebGIM/WebGIM/Release/WebGIM.msi
BIN
View File
Binary file not shown.
Projects/WebGIM/WebGIM/WebGIM.vdproj
+3 -3
View File
@@ -351,14 +351,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:WebGIM"
"ProductCode" = "8:{78F4CF95-981F-443B-BEA1-4BE0CAA41FAB}"
"PackageCode" = "8:{48E26F4C-6216-4795-8E3D-855EE28931C4}"
"ProductCode" = "8:{BBD618C8-B3A4-4D19-B95C-EF0E5919334F}"
"PackageCode" = "8:{9F7440E5-441B-46A7-8018-245A03AAE09E}"
"UpgradeCode" = "8:{7739196B-46A3-4BC7-AC29-DB8493976F04}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.1.160"
"ProductVersion" = "8:1.1.165"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:035-460560"
"ARPHELPLINK" = "8:http://www.steamware.net"