-
+ <%: SteamWare.memLayer.ML.confReadString("_titoloPagina") %>
+ <%--
<%: DateTime.Now.ToString("ddd dd/MM/yyyy - HH:mm:ss") %>
- <%--|
+ |
<%: GMW_data.MagClass.magazzino.CodSoggCurrUser %>--%>
diff --git a/GMW-RT/Bootstrap.Master.designer.cs b/GMW-RT/Bootstrap.Master.designer.cs
index ddddbfe4..c2ecf5b0 100644
--- a/GMW-RT/Bootstrap.Master.designer.cs
+++ b/GMW-RT/Bootstrap.Master.designer.cs
@@ -84,15 +84,6 @@ namespace GMW_RT {
///
protected global::System.Web.UI.WebControls.ContentPlaceHolder Main;
- ///
- /// lblDateTime control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Label lblDateTime;
-
///
/// lblVers control.
///
diff --git a/GMW-RT/Broad.cs b/GMW-RT/Broad.cs
index 0b26d99d..c2a42e84 100644
--- a/GMW-RT/Broad.cs
+++ b/GMW-RT/Broad.cs
@@ -35,11 +35,28 @@ namespace GMW_RT
{
//var hubContext = GlobalHost.ConnectionManager.GetHubContext();
//hubContext.Clients.All.broadcastMessage("BroadCast", messaggio);
- _hubContext.Clients.All.broadcastMessage(sender, messaggio);
+ _hubContext.Clients.All.broadcastMessage(sender, messaggio);
// non va cross domain, va fatto un setup + complesso...
//http://www.asp.net/signalr/overview/signalr-20/hubs-api/hubs-api-guide-javascript-client#crossdomain
}
+ ///
+ /// metodo invio messaggio a pagina tablet
+ ///
+ /// Testo primario (codice UDC)
+ /// Testo secondario (particolare)
+ /// Note per utente
+ /// num pezzi caricati
+ /// num pezzi tot
+ /// num pezzi restanti
+ /// Classe css blocco 1
+ /// Classe css blocco 2
+ /// Classe css blocco 3
+ public void updateTablet(string text01, string text02, string text03, string text04, string text05, string text06, string css1, string css2, string css3)
+ {
+ // invio le stringhe alla pagina via signalR
+ _hubContext.Clients.All.sendPanelUpdate(text01, text02, text03, text04, text05, text06, css1, css2, css3);
+ }
}
}
\ No newline at end of file
diff --git a/GMW-RT/ChatHub.cs b/GMW-RT/ChatHub.cs
index 303d2fb9..e55a51ca 100644
--- a/GMW-RT/ChatHub.cs
+++ b/GMW-RT/ChatHub.cs
@@ -17,5 +17,22 @@ namespace GMW_RT
// Call the broadcastMessage method to update clients.
Clients.All.broadcastMessage(name, message);
}
+#if false
+ ///
+ /// metodo invio messaggio a pagina tablet
+ ///
+ /// Testo primario (codice UDC)
+ /// Testo secondario (particolare)
+ /// Note per utente
+ /// num pezzi caricati
+ /// num pezzi tot
+ /// num pezzi restanti
+ /// Stile css del panel
+ public void updateTablet(string text01, string text02, string text03, string text04, string text05, string text06, string css)
+ {
+ // invio le stringhe alla pagina via signalR
+ Clients.All.sendPanelUpdate(text01, text02, text03, text04, text05, text06, css);
+ }
+#endif
}
}
\ No newline at end of file
diff --git a/GMW-RT/MBC.aspx.cs b/GMW-RT/MBC.aspx.cs
index e8773ad4..a59288df 100644
--- a/GMW-RT/MBC.aspx.cs
+++ b/GMW-RT/MBC.aspx.cs
@@ -18,6 +18,20 @@ namespace GMW_RT
{
Broad.cast.sendMess(mittente, messaggio);
}
+
+ string txt01 = Request.QueryString["txt01"];
+ string txt02 = Request.QueryString["txt02"];
+ string txt03 = Request.QueryString["txt03"];
+ string txt04 = Request.QueryString["txt04"];
+ string txt05 = Request.QueryString["txt05"];
+ string txt06 = Request.QueryString["txt06"];
+ string css1 = Request.QueryString["css1"];
+ string css2 = Request.QueryString["css2"];
+ string css3 = Request.QueryString["css3"];
+ if (txt01 != "" || txt02 != "" || txt03 != "" || txt04 != "" || txt05 != "" || txt06 != "" || css1 != "" || css2 != "" || css3 != "")
+ {
+ Broad.cast.updateTablet(txt01, txt02, txt03, txt04, txt05, txt06, css1, css2, css3);
+ }
}
}
}
\ No newline at end of file
diff --git a/GMW-RT/PostLiquidi.aspx b/GMW-RT/PostLiquidi.aspx
index 92b72975..b1cb6db8 100644
--- a/GMW-RT/PostLiquidi.aspx
+++ b/GMW-RT/PostLiquidi.aspx
@@ -5,20 +5,20 @@
-
-
+
+
-
USPFI14000007
+
USPFI14000007
-
+
-
1GRZ02760001
+
1GRZ02760001
-
descrizione particolare
+
messaggio operatore
-
+
Pezzi caricati
@@ -31,19 +31,53 @@
Rimanenti
-
+
+
+
+
diff --git a/GMW-RT/PostLiquidi.aspx.designer.cs b/GMW-RT/PostLiquidi.aspx.designer.cs
index 88e6584b..e603cfd5 100644
--- a/GMW-RT/PostLiquidi.aspx.designer.cs
+++ b/GMW-RT/PostLiquidi.aspx.designer.cs
@@ -13,57 +13,57 @@ namespace GMW_RT {
public partial class PostLiquidi {
///
- /// lblUDC control.
+ /// lblTxt01 control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.Label lblUDC;
+ protected global::System.Web.UI.WebControls.Label lblTxt01;
///
- /// lblParticolare control.
+ /// lblTxt02 control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.Label lblParticolare;
+ protected global::System.Web.UI.WebControls.Label lblTxt02;
///
- /// lblDescrizione control.
+ /// lblTxt03 control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.Label lblDescrizione;
+ protected global::System.Web.UI.WebControls.Label lblTxt03;
///
- /// lblNumCaricati control.
+ /// lblTxt04 control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.Label lblNumCaricati;
+ protected global::System.Web.UI.WebControls.Label lblTxt04;
///
- /// lblQtaTot control.
+ /// lblTxt05 control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.Label lblQtaTot;
+ protected global::System.Web.UI.WebControls.Label lblTxt05;
///
- /// lblRimanenti control.
+ /// lblTxt06 control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.Label lblRimanenti;
+ protected global::System.Web.UI.WebControls.Label lblTxt06;
}
}
diff --git a/GMW-RT/Web.config b/GMW-RT/Web.config
index 3eb06061..b9a0290a 100644
--- a/GMW-RT/Web.config
+++ b/GMW-RT/Web.config
@@ -14,18 +14,25 @@
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -75,20 +82,22 @@
-
+
-
+
+
-
+
+
@@ -101,11 +110,12 @@
- -->
+ -->
-
+
+
diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll
index fcb6e312..2fc16ba0 100644
Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ
diff --git a/GMW-RT/bin/SteamWare.dll b/GMW-RT/bin/SteamWare.dll
index cf0b2cd1..ab76819e 100644
Binary files a/GMW-RT/bin/SteamWare.dll and b/GMW-RT/bin/SteamWare.dll differ
diff --git a/GMW-RT/index.html b/GMW-RT/index.html
index 5bb240ed..ec50cd49 100644
--- a/GMW-RT/index.html
+++ b/GMW-RT/index.html
@@ -24,6 +24,7 @@
+
diff --git a/GMW/bin/GMW-RT.dll b/GMW/bin/GMW-RT.dll
index fcb6e312..2fc16ba0 100644
Binary files a/GMW/bin/GMW-RT.dll and b/GMW/bin/GMW-RT.dll differ
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll
index 9f753c25..0683fd7b 100644
Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ
diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll
index 0d54c817..f80ca9b9 100644
Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ
diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll
index cf0b2cd1..ab76819e 100644
Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ