notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests 1 Projects 2 Releases 9 Packages Wiki Activity Actions 1

refactoring

Browse source
This commit is contained in:
Paul Schneider 2016-10-07 12:49:24 +02:00
commit 61d5e6a184
7 changed files with 60 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Yavsc/Model/Billing/Estimate.cs
View file

@ -1,13 +1,12 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using Yavsc.Models.Booking;
namespace Yavsc.Models.Billing
{
public partial class Estimate
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using Yavsc.Interfaces;
using Yavsc.Models.Booking;
public partial class Estimate : IEstimate
{
[Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public long Id { get; set; }
@ -20,7 +19,7 @@ namespace Yavsc.Models.Billing
/// </summary>
/// <returns></returns>
[ForeignKey("CommandId")]
public BookQuery Query { get; set; }
public BookQuery Query { get; set; }
public string Description { get; set; }
public int? Status { get; set; }
public string Title { get; set; }
@ -35,9 +34,10 @@ namespace Yavsc.Models.Billing
[NotMapped]
public List<string> AttachedGraphics { get; set; }
public string AttachedGraphicsString {
public string AttachedGraphicsString
{
get { return string.Join(":", AttachedGraphics); }
set { AttachedGraphics = value.Split(':').ToList(); }
set { AttachedGraphics = value.Split(':').ToList(); }
}
/// <summary>
/// List of attached files
@ -48,9 +48,10 @@ namespace Yavsc.Models.Billing
/// <returns></returns>
[NotMapped]
public List<string> AttachedFiles { get; set; }
public string AttachedFilesString {
public string AttachedFilesString
{
get { return string.Join(":", AttachedFiles); }
set { AttachedFiles = value.Split(':').ToList(); }
set { AttachedFiles = value.Split(':').ToList(); }
}
[Required]
@ -58,5 +59,10 @@ namespace Yavsc.Models.Billing
[Required]
public string ClientId { get; set; }
public string CommandType
{
get; set;
}
}
}

2
Yavsc/Model/Messaging/BookQueryEvent.cs
View file

@ -24,7 +24,7 @@ using Yavsc.Model;
// You should have received a copy of the GNU Lesser General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
public class BookQueryEvent: BookQueryProviderView, IEvent
public class BookQueryEvent: BookQueryProviderInfo, IEvent
{
public BookQueryEvent()
{

6
Yavsc/Model/Messaging/ClientProviderInfo.cs
View file

@ -3,8 +3,8 @@ using System;
namespace Yavsc.Model
{
public class BookQueryProviderView { 
public ClientProviderView Client { get; set; }
public class BookQueryProviderInfo { 
public ClientProviderInfo Client { get; set; }
public Location Location { get; set; }
public long Id { get; set; }
@ -12,7 +12,7 @@ public class BookQueryProviderView { 
public DateTime EventDate { get ; set; }
public decimal? Previsional { get; set; }
}
public class ClientProviderView { 
public class ClientProviderInfo { 
public string UserName { get; set; }
public string UserId { get; set; }
public int Rate { get; set; }