Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COmpletato refresh con migrazioen DB

Browse Source
This commit is contained in:
Samuele Locatelli
2020-04-24 13:18:51 +02:00
parent 41558f278e
commit 2cf4461c77
5 changed files with 11 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active.Database/Thermo.Active.Database.csproj
+5 -20
View File
@@ -121,17 +121,9 @@
<Compile Include="Controllers\MachinesUsersController.cs" />
<Compile Include="Controllers\UserSoftkeysController.cs" />
<Compile Include="DatabaseContext.cs" />
<Compile Include="Migrations\201902121508312_InitMigration.cs" />
<Compile Include="Migrations\201902121508312_InitMigration.Designer.cs">
<DependentUpon>201902121508312_InitMigration.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\201903070940012_InitMigrtion.cs" />
<Compile Include="Migrations\201903070940012_InitMigrtion.Designer.cs">
<DependentUpon>201903070940012_InitMigrtion.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\201904041054202_UserDeleteMigratin.cs" />
<Compile Include="Migrations\201904041054202_UserDeleteMigratin.Designer.cs">
<DependentUpon>201904041054202_UserDeleteMigratin.cs</DependentUpon>
<Compile Include="Migrations\202004241109233_Thermo-Start.cs" />
<Compile Include="Migrations\202004241109233_Thermo-Start.Designer.cs">
<DependentUpon>202004241109233_Thermo-Start.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\Configuration.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -169,16 +161,9 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Migrations\201902121508312_InitMigration.resx">
<DependentUpon>201902121508312_InitMigration.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\201903070940012_InitMigrtion.resx">
<DependentUpon>201903070940012_InitMigrtion.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\201904041054202_UserDeleteMigratin.resx">
<DependentUpon>201904041054202_UserDeleteMigratin.cs</DependentUpon>
<EmbeddedResource Include="Migrations\202004241109233_Thermo-Start.resx">
<DependentUpon>202004241109233_Thermo-Start.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
Thermo.Active.Database/Thermo.Active.Database.csproj.user
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>
Thermo.Active.Model/DatabaseModels/NcMagazinePositionModel.cs
-33
View File
@@ -1,33 +0,0 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using CMS_CORE_Library.Models;
namespace Thermo.Active.Model.DatabaseModels
{
[Table("magazine_position")]
public class DbNcMagazinePositionModel
{
[Key, Column("magazine_id", Order = 0)]
public byte MagazineId { get; set; }
[Key, Column("position_id", Order = 1)]
public int PositionId { get; set; }
[Column("type")]
public byte Type { get; set; }
[Column("disabled")]
public bool Disabled { get; set; }
public static explicit operator NcMagazinePositionModel(DbNcMagazinePositionModel obj)
{
return new NcMagazinePositionModel()
{
MagazineId = obj.MagazineId,
PositionId = (ushort)obj.PositionId,
Type = obj.Type
};
}
}
}
Thermo.Active.Model/DatabaseModels/NcShankModel.cs
-70
View File
@@ -1,70 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Runtime.Serialization;
using CMS_CORE_Library.Models;
using Newtonsoft.Json;
namespace Thermo.Active.Model.DatabaseModels
{
[Table("shank")]
public class DbNcShankModel
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.None)]
[Column("id")]
public short ShankId { get; set; }
[Column("balluf")]
public int? Balluf { get; set; }
[Column("magazine_position_type")]
public byte MagazinePositionType { get; set; }
[ForeignKey("MagazinePosition"), Column("magazine_id", Order = 0)]
public byte? MagazineId { get; set; }
[ForeignKey("MagazinePosition"), Column("position_id", Order = 1)]
public int? PositionId { get; set; }
[Column("origin_magazine_id")]
public byte? OriginMagazineId { get; set; }
[Column("origin_position_id")]
public int? OriginPositionId { get; set; }
[JsonIgnore]
[IgnoreDataMember]
public DbNcMagazinePositionModel MagazinePosition { get; set; }
public static explicit operator NcShankModel(DbNcShankModel obj)
{
return new NcShankModel()
{
ShankId = (ushort)obj.ShankId,
Balluf = obj.Balluf == null ? (ushort)0 : (ushort)obj.Balluf.Value,
MagazineId = obj.MagazineId == null ? (byte)0 : obj.MagazineId.Value,
PositionId = obj.PositionId == null ? (ushort)0 : (ushort)obj.PositionId.Value,
MagazinePositionType = obj.MagazinePositionType,
OriginMagazineId = obj.OriginMagazineId == null ? (byte)0 : obj.OriginMagazineId.Value,
OriginPositionId = obj.OriginPositionId == null ? (ushort)0 : (ushort)obj.OriginPositionId.Value,
};
}
public static explicit operator DbNcShankModel(NcShankModel obj)
{
return new DbNcShankModel()
{
ShankId = (short)obj.ShankId,
Balluf = obj.Balluf == 0 ? null : (ushort?)obj.Balluf,
MagazineId = obj.MagazineId == 0 ? null : (byte?)obj.MagazineId,
PositionId = obj.PositionId == 0 ? null : (ushort?)obj.PositionId,
MagazinePositionType = obj.MagazinePositionType,
OriginMagazineId = obj.OriginMagazineId == 0 ? null : (byte?)obj.OriginMagazineId,
OriginPositionId = obj.OriginPositionId == 0 ? null : (ushort?)obj.OriginPositionId,
};
}
}
}
Thermo.Active.Model/Thermo.Active.Model.csproj
-2
View File
@@ -88,8 +88,6 @@
<Compile Include="DatabaseModels\MaintenanceModel.cs" />
<Compile Include="DatabaseModels\NcOffsetModel.cs" />
<Compile Include="DatabaseModels\NcFamilyModel.cs" />
<Compile Include="DatabaseModels\NcMagazinePositionModel.cs" />
<Compile Include="DatabaseModels\NcShankModel.cs" />
<Compile Include="DatabaseModels\PerformedMaintenanceModel.cs" />
<Compile Include="DatabaseModels\QueueItemsModel.cs" />
<Compile Include="DatabaseModels\RoleModel.cs">