ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Der Kalender funktioniert wieder wie vorher.

Browse Source 
Bug bei der Anzeige von vergangenen Terminbenachrichtigungen behoben.
Kliententeams sind jetzt mit drin (noch nicht fertig).
This commit is contained in:
staccatomamba
2017-08-21 18:52:43 +02:00
parent 6e52a0c928
commit 6b6f4a65ec
14 changed files with 65 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -248,3 +248,4 @@
/ReportImp/VkmAachenSbd/obj/Debug
/ReportImp/VkmAachenSbd/obj/Release
/ReportImp/HilfeDaheim2/obj/Release
/Model/Changes_2017_06_01.txt

15
BeWo/BeWo.csproj
View File

@@ -467,10 +467,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\SchulbegleitenderDienstCustomer.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Master\SchulbegleitenderDienstMasterView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -884,8 +880,6 @@
<Compile Include="View\Navigation\CustomerTeamNavigationView.xaml.cs">
<DependentUpon>CustomerTeamNavigationView.xaml</DependentUpon>
</Compile>
<Compile Include="View\SchulbegleitenderDienstCustomer.xaml.cs">
<DependentUpon>SchulbegleitenderDienstCustomer.xaml</DependentUpon> </Compile>
<Compile Include="View\Master\SchulbegleitenderDienstMasterView.xaml.cs">
<DependentUpon>SchulbegleitenderDienstMasterView.xaml</DependentUpon>
</Compile>
@@ -1353,6 +1347,12 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\SchulbegleitenderDienst.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Report\AnnualReport\AnnualReportChartControl.xaml">
<SubType>Designer</SubType>
@@ -1767,6 +1767,9 @@
</Compile>
<Compile Include="View\PercentageDisplay.xaml.cs">
<DependentUpon>PercentageDisplay.xaml</DependentUpon>
</Compile>
<Compile Include="View\SchulbegleitenderDienst.xaml.cs">
<DependentUpon>SchulbegleitenderDienst.xaml</DependentUpon>
</Compile>
<Compile Include="View\Report\AnnualReport\AnnualReportChartControl.xaml.cs">
<DependentUpon>AnnualReportChartControl.xaml</DependentUpon>

3
BeWo/MainControl.xaml
View File

@@ -354,7 +354,8 @@
</Button.RenderTransform>
</localView:ImageButton>
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, CustomerTeam_View"
<!-- r:DemandUserRight.VisibleDemands="ViewAll, CustomerTeam_View" -->
<localView:ImageButton Visibility="Collapsed"
Click="button_CustomerTeam_Click"
x:Name="button_CustomerTeam"
Style="{StaticResource NavBarButton}"

5
BeWo/Scheduler/View/NewSchedulerView.xaml
View File

@@ -602,7 +602,8 @@
</Button>
<Button Style="{x:Null}" Margin="1" Height="24" Width="24" ToolTip="Arbeitswoche anzeigen"
Click="ButtonWorkWeekView_Click">
<Image Source="/BeWoPlaner;component/Ressources/Icons/Calendar5Day24.png" />
<!--<Image Source="/BeWoPlaner;component/Ressources/Icons/Calendar5Day24.png" />-->
<Image Source="../../Ressources/Icons/Calendar5Day24.png" />
</Button>
<Button Style="{x:Null}" Margin="1" Height="24" Width="24" ToolTip="Volle Woche anzeigen"
Click="ButtonWeekView_Click">
@@ -968,7 +969,7 @@
</CheckBox>
</StackPanel>
<ToggleButton Grid.Column="1" Style="{StaticResource VerticalExpanderLookAlikeToggleBotton}" Width="23" Height="23" Margin="3" Click="LeftExpanderClick" x:Name="LeftExpanderButton" />
<dxsch:SchedulerControl Grid.Column="2" x:Name="Scheduler" dx:ThemeManager.ThemeName="Office2010Black"
<dxsch:SchedulerControl Grid.Column="2" x:Name="Scheduler" dx:ThemeManager.ThemeName="Office2010Black" FormCustomizationUsingMVVMLocal="False"
GroupType="None" VerticalAlignment="Stretch"
EditAppointmentFormShowing="Scheduler_EditAppointmentFormShowing"
EditRecurrentAppointmentFormShowing="SchedulerControl_EditRecurrentAppointmentFormShowing"

16
BeWo/Scheduler/View/NewSchedulerView.xaml.cs
View File

@@ -1010,16 +1010,16 @@ namespace BeWo.Scheduler.View
}
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderInZeiterfassungUebernehmen))
{
var menuitem = e.Menu.ItemLinks.FirstOrDefault(f => f.GetType() == typeof(BarButtonItemLink) && ((BarButtonItemLink)f).Item.Name.Contains("ZeiterfassungButtonItem"));
//if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderInZeiterfassungUebernehmen))
//{
// var menuitem = e.Menu.ItemLinks.FirstOrDefault(f => f.GetType() == typeof(BarButtonItemLink) && ((BarButtonItemLink)f).Item.Name.Contains("ZeiterfassungButtonItem"));
if (menuitem != null)
{
e.Menu.ItemLinks.Remove(menuitem);
}
// if (menuitem != null)
// {
// e.Menu.ItemLinks.Remove(menuitem);
// }
}
//}
var ZusageUntermenue = e.Menu.ItemLinks.FirstOrDefault(f=>f.GetType() == typeof(BarSubItemLink) && ((BarSubItemLink) f).Item.Name.Equals("TeilnahmeMenue"));

13
BeWo/Scheduler/View/RequestAnswerView.xaml.cs
View File

@@ -206,9 +206,16 @@ namespace BeWo.Scheduler.View
SelektierterTermin = OTListView.SelectedItem as IBeWoAppointment;
if (selektierterTermin != null && selektierterTermin.Start < DateTime.Now && selektierterTermin.End < DateTime.Now)
{
((List<Employee2SchedulerAppointmentDC>) SelektierterTermin.CustomFields["EmployeeList"]).Find(f => f.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value).IsPC_CheckedTs = DateTime.Now;
((List<Employee2SchedulerAppointmentDC>) SelektierterTermin.CustomFields["EmployeeList"]).Find(f => f.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value).ParticipationAnswer = ParticipationAnswer.Verstrichen;
((List<Employee2SchedulerAppointmentDC>) SelektierterTermin.CustomFields["EmployeeList"]).Find(f => f.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value).IsPChanged = false;
var emp2app = ((List<Employee2SchedulerAppointmentDC>) SelektierterTermin.CustomFields["EmployeeList"]).Find(f => f.Employee2SchedulerAppointmentOid == SelektierterTermin.LabelId) ??
((List<Employee2SchedulerAppointmentDC>) SelektierterTermin.CustomFields["EmployeeList"]).Find(f => f.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value);
if (emp2app.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value)
{
emp2app.ParticipationAnswer = ParticipationAnswer.Verstrichen;
}
emp2app.IsPC_CheckedTs = DateTime.Now;
emp2app.IsPChanged = false;
ServiceFacade.DoResourceServiceAsync(s => s.UpdateSchedulerAppointments(new List<SchedulerAppointmentDC> { ((SchedulerAppointmentVM)SelektierterTermin).DataContract }), UpdateView);

3
BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs
View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Globalization;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
@@ -22,7 +21,6 @@ using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using DevExpress.Xpf.Editors;
using DevExpress.Xpf.Scheduler.Drawing;
using DevExpress.Xpf.Scheduler.UI;
using DevExpress.XtraScheduler;
using SchedulerControl = DevExpress.Xpf.Scheduler.SchedulerControl;
@@ -341,7 +339,6 @@ namespace BeWo.Scheduler.View
DeleteAppointment();
}
private void Button_CreatZeiterfassung_Click(object sender, RoutedEventArgs e)
{
var employ = SelectedMitarbeiter.Items;

14
BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
View File

@@ -51,8 +51,10 @@ namespace BeWo.Scheduler.ViewModel
mAppointmentList.AddingNew += mAppointmentList_AddingNew;
foreach (var item in VMList)
{
mAppointmentList.Add(item);
}
return mAppointmentList;
}
}
@@ -61,23 +63,23 @@ namespace BeWo.Scheduler.ViewModel
private readonly List<CompactEmployeeDC> mAllEmployees;
private readonly Dictionary<ValueListEntryDC, List<ResourceDC>> mCategories2Resources;
static void mAppointmentList_AddingNew(object sender, AddingNewEventArgs e)
private static void mAppointmentList_AddingNew(object sender, AddingNewEventArgs e)
{
var dc = new SchedulerAppointmentDC
{
EmployeeList = new List<Employee2SchedulerAppointmentDC>(),
CustomerList = new List<CompactCustomerDC>(),
ResourceList = new List<ResourceDC>(),
//Originator = ServiceFacade.DoEmployeeServiceSync(),
Status = 0
};
var neu = new SchedulerAppointmentVM(dc);
e.NewObject = neu;
}
private Dictionary<Guid, Dictionary<String, Dictionary<String, Object>>> changedOccurencyCustomFields;
public Dictionary<Guid, Dictionary<String, Dictionary<String, Object>>> ChangedOccurencyCustomFields { get; private set; }
private Dictionary<Guid, Dictionary<string, Dictionary<string, object>>> changedOccurencyCustomFields;
public Dictionary<Guid, Dictionary<string, Dictionary<string, object>>> ChangedOccurencyCustomFields { get; private set; }
public List<CompactCustomerDC> AllCustomers
{
@@ -95,7 +97,7 @@ namespace BeWo.Scheduler.ViewModel
}
private Appointment geoeffneterTermin;
public SchedulerAppointmentListVM(List<SchedulerAppointmentDC> appList, List<CompactCustomerDC> allCustomers, List<CompactEmployeeDC> allEmployees, Dictionary<ValueListEntryDC, List<ResourceDC>> lCategoriesToResources) : base(appList)
{
mCategories2Resources = lCategoriesToResources;

1
BeWo/Scheduler/ViewModel/SchedulerAppointmentVM.cs
View File

@@ -7,7 +7,6 @@ using BeWo.ViewModel;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using DevExpress.Data.Linq;
using BS.Shared.Extensions;
namespace BeWo.Scheduler.ViewModel

2
BeWo/View/Detail/CustomerView.xaml.cs
View File

@@ -1018,7 +1018,7 @@ namespace BeWo.View.Detail
{
if (tabitem_schuldienst.Content == null)
{
tabitem_schuldienst.Content = new SchulbegleitenderDienst(TableID.Customer, ViewModel.DataContract.CustomerOid.Value,SchulbegleitenderZugehörigkeitsTyp.Klient);
//tabitem_schuldienst.Content = new SchulbegleitenderDienst.SchulbegleitenderDienst(TableID.Customer, ViewModel.DataContract.CustomerOid.Value,SchulbegleitenderZugehörigkeitsTyp.Klient);
}
}

2
BeWo/View/Detail/EmployeeView.xaml.cs
View File

@@ -468,7 +468,7 @@ namespace BeWo.View.Detail
{
if (tabitem_schuldienst.Content == null)
{
tabitem_schuldienst.Content = new SchulbegleitenderDienst(TableID.Customer, ViewModel.DataContract.EmployeeOid.Value,SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter);
tabitem_schuldienst.Content = new SchulbegleitenderDienst(TableID.Customer, ViewModel.DataContract.EmployeeOid.Value, SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter);
}
}

2
Data/Access/SearchDAO.cs
View File

@@ -10,14 +10,12 @@ using NHibernate;
using NHibernate.Criterion;
using NHibernate.Engine;
using NHibernate.Impl;
using NHibernate.Loader;
using NHibernate.Loader.Criteria;
using NHibernate.Persister.Entity;
using NHibernate.SqlCommand;
using BS.Shared.Core;
using BS.Shared;
using BS.Shared.DataContracts.Compact;
using Login = BeWo.Data.Entities.Login;
namespace BeWo.Data.Access

13
Model/Changes_2017_08_21.txt Normal file
View File

@@ -0,0 +1,13 @@
CREATE TABLE customerteam (
`Oid` bigint(19) NOT NULL AUTO_INCREMENT,
`Tid` int(10) DEFAULT NULL,
`Name` varchar(256) DEFAULT NULL,
`IsActive` tinyint(4) DEFAULT NULL,
`Notice` varchar(1024) DEFAULT NULL,
`InsTs` datetime DEFAULT NULL,
`InsUser` varchar(256) DEFAULT NULL,
`UdpUser` varchar(256) DEFAULT NULL,
`Version` bigint(19) DEFAULT NULL,
`SystemEntryID` int(10) DEFAULT NULL,
PRIMARY KEY (`Oid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;

12
Shared/Extensions/ICollectionExtensions.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
@@ -44,8 +43,15 @@ namespace BS.Shared.Extensions
public static bool AreEqual<T>(this ICollection<T> pCollection, ICollection<T> pCollection2)
{
throw new Exception("Hier muss noch AddEqual implementiert werden");
}
if(pCollection.Count != pCollection2.Count)
{
return false;
}
var tmp1 = pCollection.OrderBy(x => x.GetHashCode()).ToList();
var tmp2 = pCollection2.OrderBy(x => x.GetHashCode()).ToList();
return !pCollection.Where((t, i) => !tmp1.ElementAt(i).Equals(tmp2.ElementAt(i))).Any();
}
}
}