Merge branch 'feature/Attachments' into develop
# Conflicts: # Step/Controllers/WebApi/MaintenanceController.cs
This commit is contained in:
@@ -100,7 +100,9 @@ namespace Step.Model
|
||||
|
||||
// Filenames
|
||||
|
||||
// Config File Names
|
||||
public const string MAINTENANCE_ATTACHMENT_PATH = "C:\\CMS\\STEP\\attachment\\";
|
||||
|
||||
// Config File Names
|
||||
public static readonly string BASE_PATH = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
|
||||
public const string CONFIG_DIRECTORY = "Config\\";
|
||||
public const string SERVER_CONFIG_SCHEMA_PATH = CONFIG_DIRECTORY + "serverConfigValidator.xsd";
|
||||
|
||||
@@ -21,7 +21,6 @@ namespace Step.Model.DTOModels.MaintenanceModels
|
||||
public DateTime DateTime { get; set; }
|
||||
|
||||
public DTOMessageUserModel User { get; set; }
|
||||
|
||||
|
||||
public static explicit operator DTOMaintenanceNoteModel(MaintenanceNoteModel note)
|
||||
{
|
||||
@@ -35,4 +34,4 @@ namespace Step.Model.DTOModels.MaintenanceModels
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Step.Model.DatabaseModels
|
||||
{
|
||||
[Table("maintenance_file")]
|
||||
public class MaintenanceFileModel
|
||||
{
|
||||
[Key]
|
||||
[Column("id")]
|
||||
public int AttachmentId { get; set; }
|
||||
|
||||
[Column("file_name")]
|
||||
public string FileName { get; set; }
|
||||
|
||||
[Column("local_file_name")]
|
||||
public string LocalFileName { get; set; }
|
||||
|
||||
[Column("maintenance_id")]
|
||||
public int MaintenanceId { get; set; }
|
||||
|
||||
[ForeignKey("MaintenanceId")]
|
||||
public MaintenanceModel Maintenance { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -26,7 +26,7 @@ namespace Step.Model.DatabaseModels
|
||||
public UserModel User { get; set; }
|
||||
|
||||
[Column("maintenance_id")]
|
||||
public int? MaintenanceId { get; set; }
|
||||
public int MaintenanceId { get; set; }
|
||||
|
||||
[ForeignKey("MaintenanceId")]
|
||||
public MaintenanceModel Maintenance { get; set; }
|
||||
|
||||
@@ -72,6 +72,7 @@
|
||||
<Compile Include="DatabaseModels\FunctionAccessModel.cs" />
|
||||
<Compile Include="ConfigModels\MessageModel.cs" />
|
||||
<Compile Include="DatabaseModels\MachineModel.cs" />
|
||||
<Compile Include="DatabaseModels\MaintenanceFileModel.cs" />
|
||||
<Compile Include="DatabaseModels\MaintenanceModel.cs" />
|
||||
<Compile Include="DatabaseModels\PerformedMaintenanceModel.cs" />
|
||||
<Compile Include="DatabaseModels\RoleModel.cs">
|
||||
|
||||
Reference in New Issue
Block a user