paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* rc20-alpah2 + empty Model set from Yavsc

Browse Source
This commit is contained in:
Paul Schneider
2018-05-15 14:07:27 +02:00
parent f7d4447594
commit 1ea3cb749c
6 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Yavsc/Models/Messaging/EstimationEvent.cs → Yavsc.Server/Models/Messaging/EstimationEvent.cs
View File

@ -11,16 +11,12 @@ namespace Yavsc.Models.Messaging
public class EstimationEvent: IEvent
{
public EstimationEvent(ApplicationDbContext context, Estimate estimate, IStringLocalizer SR)
public EstimationEvent( Estimate estimate, IStringLocalizer SR)
{
Topic = "Estimation";
Estimation = estimate;
perfer = context.Performers.Include(
p=>p.Performer
).FirstOrDefault(
p => p.PerformerId == estimate.OwnerId
);
// Use estimate.OwnerId;
perfer = estimate.Owner;
ProviderInfo = new ProviderClientInfo {
Rate = perfer.Rate,
UserName = perfer.Performer.UserName,
@ -52,7 +48,7 @@ namespace Yavsc.Models.Messaging
public string CreateBody()
{
return string.Format(_localizer["EstimationMessageToClient"], perfer.Performer.UserName, this.Estimation.Bill.Addition());
return string.Format( _localizer["EstimationMessageToClient"], perfer.Performer.UserName, this.Estimation.Bill.Addition());
}
}
}

2
Yavsc/ApiControllers/BillingController.cs
View File

@ -125,7 +125,7 @@ namespace Yavsc.ApiControllers
// Notify the client
var locstr = _localizer["EstimationMessageToClient"];
var yaev = new EstimationEvent(dbContext,estimate,_localizer);
var yaev = new EstimationEvent(estimate,_localizer);
var regids = estimate.Client.Devices.Select(d => d.GCMRegistrationId).ToArray();
bool gcmSent = false;

2
Yavsc/Models/Access/Rule.cs
View File

@ -9,6 +9,6 @@ namespace Yavsc.Models.Access
}
// Abstract method to compute any authorization on a resource
public abstract bool Allow(ApplicationDbContext context, string userId, TResource resource, TRequirement requirement);
public abstract bool Allow(string userId, TResource resource, TRequirement requirement);
}
}

2
Yavsc/Models/Access/RuleSet.cs
View File

@ -4,7 +4,7 @@ namespace Yavsc.Models.Access
{
public abstract class RuleSet <TResource,TRequirement>:List<Rule<TResource,TRequirement>> {
public abstract bool Allow(ApplicationDbContext context, string userId, TResource resource, TRequirement requirement);
public abstract bool Allow(string userId, TResource resource, TRequirement requirement);
}
}

2
Yavsc/Yavsc.nuspec
View File

@ -19,7 +19,7 @@
<dependencies>
<dependency id="Yavsc.Abstract" version="$version$"></dependency>
<dependency id="Yavsc.Server" version="$version$"></dependency>
</dependencies>
</dependencies>
</metadata>
<files>
<file src="bin/$config$/dnx451/Yavsc.dll" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />

3
rc-num.txt
View File

@ -1,2 +1 @@
20-alpha2
20-alpha3