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

refactoring

Browse Source
This commit is contained in:
Paul Schneider
2015-01-24 17:30:21 +01:00
parent a430452bea
commit 91aa69f4bd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/Controllers/FrontOfficeApiController.cs
View File

@ -115,6 +115,7 @@ namespace Yavsc.ApiControllers
))}; ))};
} }
catch (Exception ex) { catch (Exception ex) {
return new HttpResponseMessage (HttpStatusCode.OK){ Content = return new HttpResponseMessage (HttpStatusCode.OK){ Content =
new ObjectContent (typeof(string), new ObjectContent (typeof(string),
ex.Message, new SimpleFormatter("text/text")) }; ex.Message, new SimpleFormatter("text/text")) };
@ -140,7 +141,7 @@ namespace Yavsc.ApiControllers
tmpe.Session.Add ("estim", e); tmpe.Session.Add ("estim", e);
Profile prpro = new Profile(ProfileBase.Create(e.Responsible)); Profile prpro = new Profile(ProfileBase.Create(e.Responsible));
if (!prpro.IsBankable) if (!prpro.HasBankAccount)
throw new TemplateException ("NotBankable:"+e.Responsible); throw new TemplateException ("NotBankable:"+e.Responsible);
Profile prcli = new Profile(ProfileBase.Create(e.Client)); Profile prcli = new Profile(ProfileBase.Create(e.Client));

3
yavscModel/RolesAndMemebers/Profile.cs
View File

@ -82,12 +82,11 @@ namespace Yavsc.Model.RolesAndMembers
[Display(Name="Google_calendar",ResourceType=typeof(LocalizedText))] [Display(Name="Google_calendar",ResourceType=typeof(LocalizedText))]
public string GoogleCalendar { get; set; } public string GoogleCalendar { get; set; }
public bool IsBankable { get { public bool HasBankAccount { get {
return IsBillable return IsBillable
&& !string.IsNullOrWhiteSpace (BankCode) && !string.IsNullOrWhiteSpace (BankCode)
&& !string.IsNullOrWhiteSpace (BIC) && !string.IsNullOrWhiteSpace (BIC)
&& !string.IsNullOrWhiteSpace (IBAN) && !string.IsNullOrWhiteSpace (IBAN)
&& !string.IsNullOrWhiteSpace (BankCode)
&& !string.IsNullOrWhiteSpace (WicketCode) && !string.IsNullOrWhiteSpace (WicketCode)
&& !string.IsNullOrWhiteSpace (AccountNumber) && !string.IsNullOrWhiteSpace (AccountNumber)
&& BankedKey != 0; } } && BankedKey != 0; } }