From 095e8033e41a97443453c61b15c48a9aa03b526b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Ho=CC=88rler?= Date: Fri, 24 Aug 2018 14:09:29 +0200 Subject: [PATCH] more tests about ajax and update from service but no chance --- Client/Client/MainWindow.xaml.cs | 4 +- EHEC_Server/EHEC_Server/Service.svc.cs | 6 +- EHEC_Server/EHEC_Server/cluster.aspx | 313 ++++++++++++------------ EHEC_Server/EHEC_Server/cluster.aspx.cs | 14 +- 4 files changed, 181 insertions(+), 156 deletions(-) diff --git a/Client/Client/MainWindow.xaml.cs b/Client/Client/MainWindow.xaml.cs index 55e311b..9ec6245 100644 --- a/Client/Client/MainWindow.xaml.cs +++ b/Client/Client/MainWindow.xaml.cs @@ -59,6 +59,7 @@ namespace Client } private void ButtonSend_Click(object sender, RoutedEventArgs e) { + LabelRueckmeldungsfeld.Content = "Sende Daten... "; // wenn die Anzahl im Feld "mehrere Automatisch generieren" // grösser ist als 0 dann erstelle diese Anzahl automatisch. // hierzu wird nur die Anzahl an den Server übertragen und @@ -106,7 +107,6 @@ namespace Client { try { - LabelRueckmeldungsfeld.Content = "Sende Daten. "; // 1. Doctor Doctor newDoctor = new Doctor(TextboxArztVorname.Text, TextboxArztName.Text, @@ -269,7 +269,7 @@ namespace Client catch (Exception ex) { LabelRueckmeldungsfeld.Content = "Fehler in der löschung der felder"; - System.Diagnostics.Trace.WriteLine(" --e-- Error in Client Save: " + ex); + System.Diagnostics.Trace.WriteLine(" --e-- Error in Client CleanExam: " + ex); } } private void ButtonAutogenerateOne_Click(object sender, RoutedEventArgs e) diff --git a/EHEC_Server/EHEC_Server/Service.svc.cs b/EHEC_Server/EHEC_Server/Service.svc.cs index 63fefab..301e693 100644 --- a/EHEC_Server/EHEC_Server/Service.svc.cs +++ b/EHEC_Server/EHEC_Server/Service.svc.cs @@ -4,6 +4,9 @@ using System.Linq; using System.Runtime.Serialization; using System.ServiceModel; using System.Text; +using System.Web; +using System.Web.Security; +using System.Web.SessionState; namespace EHEC_Server @@ -89,7 +92,8 @@ namespace EHEC_Server public void ReloadCluster() { - + cluster c = new cluster(); + c.Refresh(); } } } diff --git a/EHEC_Server/EHEC_Server/cluster.aspx b/EHEC_Server/EHEC_Server/cluster.aspx index b209a7d..baed5c8 100644 --- a/EHEC_Server/EHEC_Server/cluster.aspx +++ b/EHEC_Server/EHEC_Server/cluster.aspx @@ -1,160 +1,169 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="cluster.aspx.cs" Inherits="EHEC_Server.cluster" %> - - - - CS-EHEC-II - - - - - - - - - - -
-

EHEC Clusteranalysis

-
-
- - -
-
- + + + + + + + + +
+

EHEC Clusteranalysis

+
+
+ <%-- + + + + + --%> + + +
+
+ - + + diff --git a/EHEC_Server/EHEC_Server/cluster.aspx.cs b/EHEC_Server/EHEC_Server/cluster.aspx.cs index 94bbedb..bca4c31 100644 --- a/EHEC_Server/EHEC_Server/cluster.aspx.cs +++ b/EHEC_Server/EHEC_Server/cluster.aspx.cs @@ -17,20 +17,32 @@ namespace EHEC_Server ClusterConverter cc = new ClusterConverter(); protected void Page_Load(object sender, EventArgs e) { + System.Diagnostics.Trace.WriteLine(" --i-- Cluster Pageload: generating page..."); //Clusterdata = JsonConvert.SerializeObject(cc.WriteJson()); ClusterNodes = cc.WriteJsonNodes(); ClusterEdges = cc.WriteJsonEdges(); //ClusterNodes = JsonConvert.SerializeObject(clusterNodes.GetNodes()); //ClusterEdges = JsonConvert.SerializeObject(clusterEdges.GetEdges()); } - protected void Button1_Click(object sender, EventArgs e) + public void Button1_Click(object sender, EventArgs e) { + System.Diagnostics.Trace.WriteLine(" --i-- Cluster Click: refreshing data..."); //Clusterdata = JsonConvert.SerializeObject(cc.WriteJson()); ClusterNodes = cc.WriteJsonNodes(); ClusterEdges = cc.WriteJsonEdges(); //ClusterNodes = JsonConvert.SerializeObject(clusterNodes.GetNodes()); //ClusterEdges = JsonConvert.SerializeObject(clusterEdges.GetEdges()); } + public void Refresh() + { + System.Diagnostics.Trace.WriteLine(" --i-- Cluster Refresh: refreshing page..."); + //ScriptManager.RegisterStartupScript(this.Page, typeof(Page), "text", "RefreshPage()", true); + //ClientScript.RegisterStartupScript(GetType(), "hwa", "alert('Hello World');", true); + //ScriptManager.RegisterStartupScript(this.Page, Page.GetType(), "text", "RefreshPage()", true); + //Response.Redirect(Request.RawUrl); + //Response.Redirect(Request.Url.AbsoluteUri); + //Server.TransferRequest(Request.Url.AbsolutePath, false); + } } } \ No newline at end of file