sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
Conversation 0 Commits 229 Files Changed 107 +4 -3
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 163d2321cc - Show all commits

4
DoctorApp/App.xaml
View File

@@ -9,11 +9,11 @@
<ResourceDictionary> <ResourceDictionary>
<DataTemplate DataType="{x:Type viewModels:MainViewModel}"> <DataTemplate DataType="{x:Type viewModels:MainViewModel}">
<views:MainView /> <views:MainView />
<!-- This is a UserControl --> <!-- This is a Page -->
</DataTemplate> </DataTemplate>
<DataTemplate DataType="{x:Type viewModels:LoginViewModel}"> <DataTemplate DataType="{x:Type viewModels:LoginViewModel}">
<views:LoginView /> <views:LoginView />
<!-- This is a UserControl --> <!-- This is a Page -->
</DataTemplate> </DataTemplate>
<DataTemplate DataType="{x:Type viewModels:ClientInfoViewModel}"> <DataTemplate DataType="{x:Type viewModels:ClientInfoViewModel}">
<views:ClientInfoView/> <views:ClientInfoView/>

1
DoctorApp/Utils/Client.cs
View File

@@ -111,7 +111,6 @@ namespace DoctorApp.Utils
Console.WriteLine("Set resistance identifier"); Console.WriteLine("Set resistance identifier");
break; break;
case DataParser.NEW_CONNECTION: case DataParser.NEW_CONNECTION:
Debug.WriteLine("doctor client new connection");
this.MainViewModel.NewConnectedUser(DataParser.getUsernameFromResponseJson(payloadbytes)); this.MainViewModel.NewConnectedUser(DataParser.getUsernameFromResponseJson(payloadbytes));
break; break;
case DataParser.DISCONNECT: case DataParser.DISCONNECT:

2
DoctorApp/ViewModels/MainViewModel.cs
View File

@@ -3,6 +3,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.ComponentModel; using System.ComponentModel;
using System.Diagnostics;
using System.Text; using System.Text;
using System.Windows.Controls; using System.Windows.Controls;
using Util; using Util;
@@ -26,6 +27,7 @@ namespace DoctorApp.ViewModels
public void NewConnectedUser(string username) public void NewConnectedUser(string username)
{ {
Debug.WriteLine("new tab with name " + username);
App.Current.Dispatcher.Invoke((Action)delegate App.Current.Dispatcher.Invoke((Action)delegate
{ {
Tabs.Add(new ClientInfoViewModel(MainWindowViewModel, username)); Tabs.Add(new ClientInfoViewModel(MainWindowViewModel, username));