refactoring

vnext
Paul Schneider 8 years ago
parent 53ad230b59
commit 8edb579a85
14 changed files with 5785 additions and 20 deletions

@ -1,7 +1,6 @@
using System;
using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Infrastructure;
using Microsoft.Data.Entity.Metadata;
using Microsoft.Data.Entity.Migrations;
using Yavsc.Models;

@ -1,5 +1,3 @@
using System;
using System.Collections.Generic;
using Microsoft.Data.Entity.Migrations;
namespace Yavsc.Migrations

@ -1,8 +1,6 @@
using System;
using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Infrastructure;
using Microsoft.Data.Entity.Metadata;
using Microsoft.Data.Entity.Migrations;
using Yavsc.Models;
namespace Yavsc.Migrations

@ -5,8 +5,9 @@ using Newtonsoft.Json;
namespace Yavsc.Models.Billing
{
using YavscLib.Billing;
public class CommandLine {
public class CommandLine : ICommandLine {
[Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public long Id { get; set; }

@ -7,9 +7,9 @@ using System.Linq;
namespace Yavsc.Models.Billing
{
using Interfaces;
using Models.Workflow;
using Newtonsoft.Json;
using YavscLib.Workflow;
public partial class Estimate : IEstimate
{

@ -26,8 +26,8 @@ namespace Yavsc.Models.Messaging
Avatar = perfer.Performer.Avatar,
UserId = perfer.PerformerId
};
((IEvent)this).Sender = perfer.Performer.UserName;
((IEvent)this).Message = string.Format(SR["EstimationMessageToClient"],perfer.Performer.UserName,
Sender = perfer.Performer.UserName;
Message = string.Format(SR["EstimationMessageToClient"],perfer.Performer.UserName,
estimate.Title,estimate.GetTotal());
}
ProviderClientInfo ProviderInfo { get; set; }

@ -16,7 +16,6 @@ using Microsoft.AspNet.Localization;
using Microsoft.AspNet.Mvc;
using Microsoft.AspNet.Mvc.Filters;
using Microsoft.AspNet.Mvc.Razor;
using Microsoft.AspNet.Http.Extensions;
using Microsoft.Data.Entity;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;

@ -81,6 +81,7 @@
"Microsoft.Extensions.Logging": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.TraceSource": "1.0.0-rc1-final",
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Globalization.CultureInfoCache": "1.0.0-rc1-final",
"Microsoft.Extensions.Localization": "1.0.0-rc1-final",

File diff suppressed because it is too large Load Diff

@ -1,12 +1,10 @@
namespace Yavsc.Interfaces
namespace YavscLib.Workflow
{
using System.Collections.Generic;
using Yavsc.Models.Billing;
public interface IEstimate
{
List<string> AttachedFiles { get; set; }
List<string> AttachedGraphics { get; }
List<CommandLine> Bill { get; set; }
string ClientId { get; set; }
long? CommandId { get; set; }
string CommandType { get; set; }

@ -0,0 +1,13 @@
namespace YavscLib.Billing
{
public interface ICommandLine
{
long Id { get; set; }
string Description { get; set; }
int Count { get; set; }
decimal UnitaryCost { get; set; }
long EstimateId { get; set; }
}
}

@ -20,6 +20,8 @@
"System.Runtime": "4.0.0",
"System.Globalization": "4.0.0",
"System.Resources.ResourceManager": "4.0.0",
"System.Collections": "4.0.0",
"System.Collections.Generic": "4.0.0"
}
}
}

@ -3,18 +3,22 @@
"version": 2,
"targets": {
".NETFramework,Version=v4.5.1": {},
".NETPortable,Version=v4.5,Profile=Profile111": {}
".NETPortable,Version=v4.5,Profile=Profile111": {},
".NETFramework,Version=v4.5.1/debian.8-x86": {},
".NETFramework,Version=v4.5.1/debian.8-x64": {},
".NETPortable,Version=v4.5,Profile=Profile111/debian.8-x86": {},
".NETPortable,Version=v4.5,Profile=Profile111/debian.8-x64": {}
},
"libraries": {},
"projectFileDependencyGroups": {
"": [],
".NETFramework,Version=v4.5.1": [],
".NETPortable,Version=v4.5,Profile=Profile111": [
"System.Globalization >= 4.0.0",
"System.Resources.ResourceManager >= 4.0.0",
"System.Runtime >= 4.0.0"
"fx/System.Runtime >= 4.0.0",
"fx/System.Globalization >= 4.0.0",
"fx/System.Resources.ResourceManager >= 4.0.0",
"fx/System.Collections >= 4.0.0",
"fx/System.Collections.Generic >= 4.0.0"
]
},
"tools": {},
"projectFileToolGroups": {}
}
}
Loading…