Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refresh pagine controlli, turni, mappa stato, dettaglio

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-03-13 12:00:31 +01:00
parent 9e81b20c62
commit 4b8c4fc8d8
16 changed files with 102 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/config/applicationhost.config
+23 -7
View File
@@ -162,7 +162,7 @@
</site>
<site name="MP-IO" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-IO" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-IO" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:64103:localhost" />
@@ -170,7 +170,7 @@
</site>
<site name="MP-Admin" id="3">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-Admin" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-Admin" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56734:localhost" />
@@ -178,7 +178,7 @@
</site>
<site name="MoonProTablet" id="4">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-Tablet" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-Tablet" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56739:localhost" />
@@ -186,7 +186,7 @@
</site>
<site name="MP-Site" id="5">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\VisualStudioProject\MoonPro_dotnet\MP-Site" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-Site" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:54806:localhost" />
@@ -194,7 +194,7 @@
</site>
<site name="MP-MON" id="6">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-MON" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-MON" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56580:localhost" />
@@ -202,7 +202,7 @@
</site>
<site name="MP" id="7">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:2809:localhost" />
@@ -218,12 +218,28 @@
</site>
<site name="MP-Site(1)" id="9">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-Site" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-Site" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:54807:localhost" />
</bindings>
</site>
<site name="MP-IO(1)" id="10">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-IO" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:20967:localhost" />
</bindings>
</site>
<site name="MP-MON(1)" id="11">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-MON" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:14216:localhost" />
</bindings>
</site>
<siteDefaults>
<logFile logFormat="W3C" directory="%IIS_USER_HOME%\Logs" />
<traceFailedRequestsLogging directory="%IIS_USER_HOME%\TraceLogFiles" enabled="true" maxLogFileSizeKB="1024" />
MP-Admin/MP-Admin.csproj.user
+2 -25
View File
@@ -10,30 +10,7 @@
<IISExpressSSLPort />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>False</EnableENC>
<AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<ProjectExtensions />
</Project>
MP-IO/MP-IO.csproj
+1 -1
View File
@@ -337,7 +337,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:64103/</IISUrl>
<IISUrl>http://localhost:20967/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
MP-IO/MP-IO.csproj.user
+5 -3
View File
@@ -10,13 +10,15 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>default.aspx</StartPageUrl>
<StartAction>SpecificPage</StartAction>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
@@ -29,7 +31,7 @@
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>False</EnableENC>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
MP-MON/MP-MON.csproj.user
+2 -25
View File
@@ -19,30 +19,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<ProjectExtensions />
</Project>
MP-Site/MP-Site.csproj.user
+2 -25
View File
@@ -10,30 +10,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<ProjectExtensions />
</Project>
MP-Tablet/Controlli.aspx
+4 -4
View File
@@ -12,12 +12,12 @@
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container my-3" role="main">
<div class="row">
<div class="col-12 col-sm-6">
<div class="col-12 col-sm-6 col-md-8">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
<uc1:mod_controlliProd runat="server" ID="mod_controlliProd" />
<uc1:mod_elencoControlli runat="server" ID="mod_elencoControlli" />
</div>
<div class="col-12 col-sm-6">
<uc1:mod_controlliProd runat="server" id="mod_controlliProd" />
<uc1:mod_elencoControlli runat="server" id="mod_elencoControlli" />
<div class="col-12 col-sm-6 col-md-4">
<uc1:mod_directLinks runat="server" ID="mod_directLinks" />
</div>
</div>
MP-Tablet/DettaglioMacchina.aspx
+5 -4
View File
@@ -13,7 +13,7 @@
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container my-3" role="main">
<div class="row">
<div class="col-12 col-sm-6">
<div class="col-12 col-sm-6 col-md-8">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
<div class="card bg-dark mb-2">
<div class="card-header bg-light" id="heading01">
@@ -30,10 +30,11 @@
</div>
</div>
</div>
</div>
<div class="col-12 col-sm-6">
<uc4:mod_confProd ID="mod_confProd1" runat="server" />
<uc1:mod_controlliProd runat="server" id="mod_controlliProd" />
<uc1:mod_controlliProd runat="server" ID="mod_controlliProd" />
</div>
<div class="col-12 col-sm-6 col-md-4">
<uc1:mod_directLinks runat="server" ID="mod_directLinks" />
</div>
<%--<uc3:mod_dettTurni ID="mod_dettTurni2" runat="server" />--%>
MP-Tablet/MP-Tablet.csproj.user
+2 -25
View File
@@ -10,30 +10,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<ProjectExtensions />
</Project>
MP-Tablet/MappaStato.aspx
+1 -1
View File
@@ -3,7 +3,7 @@
<%@ Register Src="~/WebUserControls/mod_mappaStato.ascx" TagName="mod_mappaStato" TagPrefix="uc1" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-fluid my-3" role="main">
<div class="container-fluid my-3 px-3 px-md-4" role="main">
<uc1:mod_mappaStato ID="mod_mappaStato1" runat="server" />
</div>
</asp:Content>
MP-Tablet/Turni.aspx
+15 -3
View File
@@ -3,15 +3,27 @@
<%@ Register Src="WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc1" %>
<%@ Register Src="WebUserControls/mod_turni.ascx" TagName="mod_turni" TagPrefix="uc2" %>
<%@ Register Src="~/WebUserControls/mod_directLinks.ascx" TagPrefix="uc1" TagName="mod_directLinks" %>
<%@ Register Src="~/WebUserControls/mod_dettTurni.ascx" TagPrefix="uc1" TagName="mod_dettTurni" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container my-3" role="main">
<div class="row">
<div class="col-12 col-sm-6 col-md-4 col-lg-3">
<div class="col-12 col-sm-6 col-md-8">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
<div class="row my-2">
<div class="col-12 col-md-7">
<uc2:mod_turni ID="mod_turni1" runat="server" />
</div>
<div class="col-12 col-md-5 text-center">
<uc1:mod_dettTurni runat="server" ID="mod_dettTurni" />
</div>
</div>
</div>
<div class="col-12 col-sm-6 col-md-8 col-lg-9 align-self-center">
<uc2:mod_turni ID="mod_turni1" runat="server" />
<div class="col-12 col-sm-6 col-md-4">
<uc1:mod_directLinks runat="server" ID="mod_directLinks" />
</div>
</div>
</div>
MP-Tablet/Turni.aspx.cs
+10
View File
@@ -12,6 +12,16 @@ namespace MoonProTablet
{
Session["TipoLink"] = "EditMacch";
}
mod_turni1.eh_updated += Mod_turni1_eh_updated;
}
/// <summary>
/// Aggiorno visualizzzazione x update
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void Mod_turni1_eh_updated(object sender, EventArgs e)
{
mod_dettTurni.DataBind();
}
}
}
MP-Tablet/Turni.aspx.designer.cs
Generated
+18
View File
@@ -29,5 +29,23 @@ namespace MoonProTablet {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_turni mod_turni1;
/// <summary>
/// Controllo mod_dettTurni.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_dettTurni mod_dettTurni;
/// <summary>
/// Controllo mod_directLinks.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_directLinks mod_directLinks;
}
}
MP-Tablet/WebMasterPages/Bootstrap.Master
+1 -1
View File
@@ -57,7 +57,7 @@
<asp:UpdatePanel ID="uppContainer" runat="server">
<ContentTemplate>
<div class="row bodyDark">
<div class="col-12 px-2">
<div class="col-12 px-0">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
<div class="container" role="main">
<h1>hello world!</h1>
MP-Tablet/WebUserControls/mod_turni.ascx.cs
+9
View File
@@ -6,6 +6,10 @@ namespace MoonProTablet.WebUserControls
{
public partial class mod_turni : System.Web.UI.UserControl
{
/// <summary>
/// registrato nuovo valore
/// </summary>
public event EventHandler eh_updated;
/// <summary>
/// idx macchina selezionata
/// </summary>
@@ -54,6 +58,11 @@ namespace MoonProTablet.WebUserControls
{
DataLayer.obj.taTurniMacc.stp_turniMacchineUpdateTurno(idxMacchina.ToString(), turno);
setupTurni();
// sollevo evento!
if (eh_updated != null)
{
eh_updated(this, new EventArgs());
}
}
protected void chkT1_CheckedChanged(object sender, EventArgs e)
MP/MP.csproj.user
+2 -25
View File
@@ -10,30 +10,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<ProjectExtensions />
</Project>