Develop #10
@@ -9,11 +9,11 @@
|
||||
<ResourceDictionary>
|
||||
<DataTemplate DataType="{x:Type viewModels:MainViewModel}">
|
||||
<views:MainView />
|
||||
<!-- This is a UserControl -->
|
||||
<!-- This is a Page -->
|
||||
</DataTemplate>
|
||||
<DataTemplate DataType="{x:Type viewModels:LoginViewModel}">
|
||||
<views:LoginView />
|
||||
<!-- This is a UserControl -->
|
||||
<!-- This is a Page -->
|
||||
</DataTemplate>
|
||||
<DataTemplate DataType="{x:Type viewModels:ClientInfoViewModel}">
|
||||
<views:ClientInfoView/>
|
||||
|
||||
@@ -111,7 +111,6 @@ namespace DoctorApp.Utils
|
||||
Console.WriteLine("Set resistance identifier");
|
||||
break;
|
||||
case DataParser.NEW_CONNECTION:
|
||||
Debug.WriteLine("doctor client new connection");
|
||||
this.MainViewModel.NewConnectedUser(DataParser.getUsernameFromResponseJson(payloadbytes));
|
||||
break;
|
||||
case DataParser.DISCONNECT:
|
||||
|
||||
@@ -3,6 +3,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.ComponentModel;
|
||||
using System.Diagnostics;
|
||||
using System.Text;
|
||||
using System.Windows.Controls;
|
||||
using Util;
|
||||
@@ -26,6 +27,7 @@ namespace DoctorApp.ViewModels
|
||||
|
||||
public void NewConnectedUser(string username)
|
||||
{
|
||||
Debug.WriteLine("new tab with name " + username);
|
||||
App.Current.Dispatcher.Invoke((Action)delegate
|
||||
{
|
||||
Tabs.Add(new ClientInfoViewModel(MainWindowViewModel, username));
|
||||
|
||||
Reference in New Issue
Block a user