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

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

Browse Source 
# Conflicts:
#	BeWo/ServiceProxy/Generated.cs
This commit is contained in:
Christian
2017-03-07 09:01:17 +01:00
parent 1ac9ece4a8 1d32543f4f
commit 010050e851
12 changed files with 121 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BeWo/ServiceProxy/Generated.cs
View File

@@ -1056,6 +1056,10 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetOrganisationsForPersonBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactOrganisationDC> GetOrganisationsForPerson(long personoid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetPersonForOrganisations", ReplyAction="http://tempuri.org/ICustomerService/GetPersonForOrganisationsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetPersonForOrganisationsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactPersonDC> GetPersonForOrganisations(long organisationoid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/UpdateOrganisation", ReplyAction="http://tempuri.org/ICustomerService/UpdateOrganisationResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/UpdateOrganisationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
long UpdateOrganisation(BS.Shared.DataContracts.OrganisationDC pOrganisationDC);
@@ -1776,6 +1780,11 @@ namespace BeWo.ServiceProxy
return base.Channel.GetOrganisationsForPerson(personoid);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactPersonDC> GetPersonForOrganisations(long organisationoid)
{
return base.Channel.GetPersonForOrganisations(organisationoid);
}
public long UpdateOrganisation(BS.Shared.DataContracts.OrganisationDC pOrganisationDC)
{
return base.Channel.UpdateOrganisation(pOrganisationDC);

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

@@ -855,6 +855,10 @@ namespace BeWo.View.Detail
popup_organisation.IsOpen = false;
organisationsearchview.ItemSelected -= organisationsearchview_EnvironmentOrganisationSelected;
ViewModel.EnvironmentOrganisations.NewVM.Organisation = e.Data;
var orgList = ServiceFacade.DoCustomerServiceSync(s => s.GetPersonForOrganisations(e.Data.OrganisationOid));
ansprechpartnersearchview.ObjectList = orgList;
popupedit_environmentOrganisationSearch.Focus();
}
@@ -863,7 +867,7 @@ namespace BeWo.View.Detail
{
popup_ansprechpartner.IsOpen = false;
ansprechpartnersearchview.ItemSelected -= ansprechpartnersearchview_EnvironmentPersonSelected;
ViewModel.EnvironmentOrganisations.NewVM.Person = e.Data;
ViewModel.EnvironmentPersons.NewVM.Person = e.Data;
popupedit_environmentAnsprechpartnerSearch.Focus();
}
@@ -1155,7 +1159,7 @@ namespace BeWo.View.Detail
{
VMFactory.CreatePersonVMAsync((pDC as CompactPersonDC).PersonOid,
cb => this.Dispatch(
() => BeWoUtils.OpenModalViewWindow<PersonVM, PersonDC, CustomerView>(cb, this, () => this.Dispatch(
() => BeWoUtils.OpenModalViewWindow<PersonVM, PersonDC, CustomerView>(cb, this, () => this.Dispatch(
() => BeWoUtils.UpdateAllViews(ViewModel.EnvironmentPersons.NewVM.Person ?? (pDC as CompactPersonDC))), personSavedOrUpdated: (s, args) => this.Dispatch(delegate{}))));
}

60
BeWo/View/Detail/ServiceRecordView2.xaml.cs
View File

@@ -76,7 +76,7 @@ namespace BeWo.View.Detail
private bool _IgnoreGroupMultiCheck;
private int i = 0;
private int lastPosition = 0;
public static double DocumentationTextBoxFontSize
{
@@ -688,23 +688,45 @@ namespace BeWo.View.Detail
return (ServiceRecordVM) srListBox.SelectedItem;
}
public void SetSelectedServiceRecordVM(ServiceRecordVM vm)
public void SetSelectedServiceRecordVM(ServiceRecordVM vm, bool isOnDelet)
{
if (vm != null)
{
ServiceRecordVM existingVm = null;
foreach (var serviceRecordVm in ViewModel.VMList)
{
if (serviceRecordVm.Id == vm.Id)
{
existingVm = serviceRecordVm;
}
}
if (!isOnDelet)
{
foreach (var serviceRecordVm in ViewModel.VMList) //Originbal Fassung
{
if (serviceRecordVm.Id == vm.Id)
{
existingVm = serviceRecordVm;
}
}
}
else
{
foreach (var serviceRecordVm in ViewModel.VMList) // Nicht Originbal Fassung | lohnt trotzdem nicht
{
if (serviceRecordVm.Id == vm.Id)
{
if(ViewModel.VMList.Count > 0 && lastPosition > 0) {
var a = ViewModel.VMList[lastPosition - 1];
existingVm = a;
}
else
{
existingVm = serviceRecordVm;
}
}
}
}
srListBox.SelectedItem = existingVm;
srListBox.SelectedItem = existingVm;
srTableView.FocusedRow = existingVm;
}
}
@@ -840,7 +862,7 @@ namespace BeWo.View.Detail
ClosePopupView();
// ViewModel.RefreshServiceRecordsForSelectedTreeNode();
SetSelectedServiceRecordVM(vm);
SetSelectedServiceRecordVM(vm,false);
}));
@@ -902,7 +924,7 @@ namespace BeWo.View.Detail
private void RefreshFinished()
{
SetSelectedServiceRecordVM(lastSelectedVM);
SetSelectedServiceRecordVM(lastSelectedVM,false);
}
private void ShowHistory(ServiceRecordVM vm)
@@ -1053,7 +1075,7 @@ namespace BeWo.View.Detail
{
var selected = GetSelectedServiceRecordFromListBox();
ViewModel.RefreshServiceRecordsForSelectedTreeNode();
SetSelectedServiceRecordVM(selected);
SetSelectedServiceRecordVM(selected,true);
});
}
@@ -2661,14 +2683,13 @@ namespace BeWo.View.Detail
var hitInfo = srTableView.CalcHitInfo(e.OriginalSource as DependencyObject);
if (!hitInfo.InRow)
return;
i = hitInfo.RowHandle;
ServiceRecordVM vm = GetSelectedServiceRecordFromGrid();
if (vm != null && vm.EditAllowed)
StartEdit(vm);
lastPosition = ViewModel.VMList.IndexOf(vm);
}
private ServiceRecordVM GetSelectedServiceRecordFromGrid()
@@ -2692,8 +2713,11 @@ namespace BeWo.View.Detail
}
private void DxDeleteButton_OnItemClick(object sender, ItemClickEventArgs e)
{
{
ServiceRecordVM vm = GetSelectedServiceRecordFromGrid();
lastPosition = ViewModel.VMList.IndexOf(vm);
if (vm != null && vm.DeleteAllowed)
Delete(vm);
}

8
BeWoPlanerMobil/Controllers/AbstractBaseController.cs
View File

@@ -1,5 +1,8 @@
using System.Web.Mvc;
using System;
using System.Web;
using System.Web.Mvc;
using System.Web.Security;
using System.Web.UI;
using BeWo.Service.ServiceContracts;
using BeWoPlanerMobil.Service;
@@ -22,7 +25,8 @@ namespace BeWoPlanerMobil.Controllers
{
MobileSessionFacade.LogUserOut();
FormsAuthentication.SignOut();
return RedirectToActionPermanent("Index", "Login", new {tenant = MobileSessionFacade.Tenant});
return RedirectToActionPermanent("Index", "Login", new {tenant = MobileSessionFacade.Tenant});
}
}
}

2
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -142,7 +142,7 @@ namespace BeWoPlanerMobil.Controllers
[HttpPost]
public new ActionResult Logout()
{
{
return base.Logout();
}

19
BeWoPlanerMobil/Global.asax.cs
View File

@@ -1,8 +1,11 @@
using System.Web.Http;
using System;
using System.Web;
using System.Web.Http;
using System.Web.Mvc;
using System.Web.Optimization;
using System.Web.Routing;
namespace BeWoPlanerMobil
{
// Note: For instructions on enabling IIS6 or IIS7 classic mode,
@@ -18,6 +21,16 @@ namespace BeWoPlanerMobil
FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
RouteConfig.RegisterRoutes(RouteTable.Routes);
BundleConfig.RegisterBundles(BundleTable.Bundles);
}
}
}
protected void Application_BeginRequest(object sender, EventArgs e)
{
Context.Response.Cache.SetExpires(DateTime.UtcNow.AddDays(-1));
Context.Response.Cache.SetAllowResponseInBrowserHistory(false);
Context.Response.Cache.SetRevalidation(HttpCacheRevalidation.AllCaches);
Context.Response.Cache.SetCacheability(HttpCacheability.NoCache);
Context.Response.Cache.SetNoStore();
}
}
}

13
BeWoPlanerMobil/Views/Login/Index.cshtml
View File

@@ -4,10 +4,12 @@
@{
ViewBag.Title = "Login";
var usernameDef = String.Empty;
var pwDef = String.Empty;
var usernameDef = String.Empty;
var pwDef = String.Empty;
}
<img src="~/Content/images/bewoplaner_logo_big.png" alt="BeWoPlanerMobil" class="centerImg"/>
<div class="margin-div">
@@ -40,5 +42,8 @@
</div>
<script>
loadGoalsUrl = '';
</script>
loadGoalsUrl = '';
</script>

3
BeWoPlanerMobil/Views/Main/Main.cshtml
View File

@@ -3,6 +3,7 @@
@model MainModel
@{
ViewBag.Title = "Main";
}
<div class="header-div">
@@ -851,7 +852,7 @@
CheckEndDateUrl = '@Url.Action("CheckEndDate")';
CheckDokuReiterUrl = '@Url.Action("CheckDokuReiter")';
SetSaveSignatureUrl = '@Url.Action("SetSaveSignature")';
$(".toggle-btn").click(function () {
toggleOnclick(this);

7
BeWoPlanerMobil/Web.config
View File

@@ -51,7 +51,8 @@
</handlers>
<directoryBrowse enabled="true" />
</system.webServer>
<system.serviceModel>
<behaviors>
<endpointBehaviors>
@@ -150,9 +151,11 @@
</namespaces>
</pages>
<authentication mode="Forms">
<forms loginUrl="~/Login" />
<forms loginUrl="~/Login" />
</authentication>
</system.web>
<runtime>

10
Data/Access/SearchDAO.cs
View File

@@ -1964,6 +1964,16 @@ namespace BeWo.Data.Access
return c;
}
public IList<Person> GetAllPerson2OrganisationRelations(long organisationOid)
{
var c = CreateCriteriaIsActive<Organisation>()
.Add(Restrictions.Eq(BeWoEntityBase.PropertyName_Oid, organisationOid)).UniqueResult<Organisation>().Organisation2PersonList.Select(s => s.Person).ToList();
return c;
}
public ServiceRecord FindServiceRecordforHistory(long? ServiceRecordOid)
{
var c =

4
Service/ServiceContracts/ICustomerService.cs
View File

@@ -632,5 +632,9 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof (BeWoFault))]
[OperationContract]
List<CompactOrganisationDC> GetOrganisationsForPerson(long personoid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<CompactPersonDC> GetPersonForOrganisations(long organisationoid);
}
}

12
Service/ServiceImplementations/CustomerServiceImp.cs
View File

@@ -3422,7 +3422,17 @@ namespace BeWo.Service.ServiceImplementations
return items;
}
}
//Erstelle Hier die Methode für get Person for Organisation
public List<CompactPersonDC> GetPersonForOrganisations(long organisationoid)
{
var x = DAOFactory.SearchDAO.GetAllPerson2OrganisationRelations(organisationoid);
var items = MapperFactory.CompactPersonDC_Person.MapToNewDCs(x);
return items;
}
}
internal struct WohnheimbuchungsIntervallStruct
{