diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index a9172a69..44cd7a67 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.Database/Controllers/MaintenancesController.cs b/Step.Database/Controllers/MaintenancesController.cs
index 6342fcd1..d2fa9f9b 100644
--- a/Step.Database/Controllers/MaintenancesController.cs
+++ b/Step.Database/Controllers/MaintenancesController.cs
@@ -42,13 +42,14 @@ namespace Step.Database.Controllers
}
- public PerformedMaintenanceModel PerformeMaintenance(uint counterValue, int maintenanceId)
+ public PerformedMaintenanceModel PerformeMaintenance(uint counterValue, int maintenanceId, int userId)
{
PerformedMaintenanceModel performed = new PerformedMaintenanceModel()
{
CounterValue = (int)counterValue,
Date = DateTime.Now,
- MaintenanceId = maintenanceId
+ MaintenanceId = maintenanceId,
+ MaintainerId = userId
};
dbCtx.PerformedMaintenances.Add(performed);
diff --git a/Step.Database/Migrations/201809251027480_InitMigration.resx b/Step.Database/Migrations/201809251027480_InitMigration.resx
deleted file mode 100644
index ae760d79..00000000
--- a/Step.Database/Migrations/201809251027480_InitMigration.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 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
-
-
- dbo
-
-
\ No newline at end of file
diff --git a/Step.Database/Migrations/201809251027480_InitMigration.Designer.cs b/Step.Database/Migrations/201810041521424_InitMigration.Designer.cs
similarity index 92%
rename from Step.Database/Migrations/201809251027480_InitMigration.Designer.cs
rename to Step.Database/Migrations/201810041521424_InitMigration.Designer.cs
index 95ee3146..04ceda31 100644
--- a/Step.Database/Migrations/201809251027480_InitMigration.Designer.cs
+++ b/Step.Database/Migrations/201810041521424_InitMigration.Designer.cs
@@ -13,7 +13,7 @@ namespace Step.Database.Migrations
string IMigrationMetadata.Id
{
- get { return "201809251027480_InitMigration"; }
+ get { return "201810041521424_InitMigration"; }
}
string IMigrationMetadata.Source
diff --git a/Step.Database/Migrations/201809251027480_InitMigration.cs b/Step.Database/Migrations/201810041521424_InitMigration.cs
similarity index 97%
rename from Step.Database/Migrations/201809251027480_InitMigration.cs
rename to Step.Database/Migrations/201810041521424_InitMigration.cs
index d2e9fd20..ba8b6000 100644
--- a/Step.Database/Migrations/201809251027480_InitMigration.cs
+++ b/Step.Database/Migrations/201810041521424_InitMigration.cs
@@ -212,10 +212,13 @@ namespace Step.Database.Migrations
date = c.DateTime(nullable: false, precision: 0),
counter_value = c.Int(nullable: false),
maintenance = c.Int(nullable: false),
+ maintainers_id = c.Int(),
})
.PrimaryKey(t => t.id)
+ .ForeignKey("dbo.user", t => t.maintainers_id)
.ForeignKey("dbo.maintenance", t => t.maintenance, cascadeDelete: true)
- .Index(t => t.maintenance);
+ .Index(t => t.maintenance)
+ .Index(t => t.maintainers_id);
CreateTable(
"dbo.queue",
@@ -249,6 +252,7 @@ namespace Step.Database.Migrations
{
DropForeignKey("dbo.session", "machine_user_id", "dbo.machine_user");
DropForeignKey("dbo.performed_maintenance", "maintenance", "dbo.maintenance");
+ DropForeignKey("dbo.performed_maintenance", "maintainers_id", "dbo.user");
DropForeignKey("dbo.maintenance_note", "user_id", "dbo.user");
DropForeignKey("dbo.maintenance_note", "maintenance_id", "dbo.maintenance");
DropForeignKey("dbo.maintenance_file", "user_id", "dbo.user");
@@ -261,6 +265,7 @@ namespace Step.Database.Migrations
DropForeignKey("dbo.shank", new[] { "magazine_id", "position_id" }, "dbo.magazine_position");
DropForeignKey("dbo.tool", "family_id", "dbo.family");
DropIndex("dbo.session", new[] { "machine_user_id" });
+ DropIndex("dbo.performed_maintenance", new[] { "maintainers_id" });
DropIndex("dbo.performed_maintenance", new[] { "maintenance" });
DropIndex("dbo.maintenance_note", new[] { "maintenance_id" });
DropIndex("dbo.maintenance_note", new[] { "user_id" });
diff --git a/Step.Database/Migrations/201810041521424_InitMigration.resx b/Step.Database/Migrations/201810041521424_InitMigration.resx
new file mode 100644
index 00000000..3fc2f4e4
--- /dev/null
+++ b/Step.Database/Migrations/201810041521424_InitMigration.resx
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 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
+
+
+ dbo
+
+
\ No newline at end of file
diff --git a/Step.Database/Step.Database.csproj b/Step.Database/Step.Database.csproj
index 6f1e8977..22f8e227 100644
--- a/Step.Database/Step.Database.csproj
+++ b/Step.Database/Step.Database.csproj
@@ -80,9 +80,9 @@
-
-
- 201809251027480_InitMigration.cs
+
+
+ 201810041521424_InitMigration.cs
@@ -118,8 +118,8 @@
-
- 201809251027480_InitMigration.cs
+
+ 201810041521424_InitMigration.cs
diff --git a/Step.Model/DatabaseModels/PerformedMaintenanceModel.cs b/Step.Model/DatabaseModels/PerformedMaintenanceModel.cs
index f553e107..beb855a4 100644
--- a/Step.Model/DatabaseModels/PerformedMaintenanceModel.cs
+++ b/Step.Model/DatabaseModels/PerformedMaintenanceModel.cs
@@ -22,5 +22,11 @@ namespace Step.Model.DatabaseModels
[ForeignKey("MaintenanceId")]
public MaintenanceModel Maintenance { get; set; }
+
+ [Column("maintainers_id")]
+ public int? MaintainerId { get; set; }
+
+ [ForeignKey("MaintainerId")]
+ public UserModel Maintainer { get; set; }
}
}
\ No newline at end of file
diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs
index a7ae52cf..e4f79974 100644
--- a/Step.NC/NcHandler.cs
+++ b/Step.NC/NcHandler.cs
@@ -112,7 +112,7 @@ namespace Step.NC
return FILE_NOT_FOUND_ERROR;
string base64Img = model.Metadata.Generics.Images.Count() > 0 ? model.Metadata.Generics.Images[0].Base64 : "";
-
+
fileInfo = new InfoFile()
{
AbsolutePath = path,
@@ -885,11 +885,11 @@ namespace Step.NC
return cmsError;
}
- public CmsError GetMaintenanceData(out DTOMaintenanceModel dTOMaintenance, int maintenanceId, int userId)
+ public CmsError GetMaintenanceDataById(int maintenanceId, int userId, out DTOMaintenanceModel dTOMaintenance)
{
dTOMaintenance = null;
- CmsError cmsError = GetMaintenances(out List maintenance, userId);
+ CmsError cmsError = GetMaintenancesWithPermissions(out List maintenance, userId);
if (cmsError.IsError())
return cmsError;
@@ -898,7 +898,7 @@ namespace Step.NC
return cmsError;
}
- public CmsError GetMaintenances(out List dtoMaintenancesModel, int userId)
+ public CmsError GetMaintenancesWithPermissions(out List dtoMaintenancesModel, int userId)
{
// Return value
dtoMaintenancesModel = new List();
diff --git a/Step/Controllers/WebApi/MaintenanceController.cs b/Step/Controllers/WebApi/MaintenanceController.cs
index 13c33a84..d681bd06 100644
--- a/Step/Controllers/WebApi/MaintenanceController.cs
+++ b/Step/Controllers/WebApi/MaintenanceController.cs
@@ -36,8 +36,8 @@ namespace Step.Controllers.WebApi
using (NcHandler ncHandler = new NcHandler())
{
ncHandler.Connect();
- // Get list of maintenances
- CmsError cmsError = ncHandler.GetMaintenances(out List maintenances, Convert.ToInt32(userId.Value));
+ // Get list of maintenances with user's permission
+ CmsError cmsError = ncHandler.GetMaintenancesWithPermissions(out List maintenances, Convert.ToInt32(userId.Value));
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
@@ -63,7 +63,7 @@ namespace Step.Controllers.WebApi
using (NcHandler ncHandler = new NcHandler())
{
ncHandler.Connect();
- CmsError cmsError = ncHandler.GetMaintenanceData(out DTOMaintenanceModel maintenance, dbMaint.MaintenanceId, Convert.ToInt32(userId.Value));
+ CmsError cmsError = ncHandler.GetMaintenanceDataById(dbMaint.MaintenanceId, Convert.ToInt32(userId.Value), out DTOMaintenanceModel maintenance);
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
@@ -90,7 +90,7 @@ namespace Step.Controllers.WebApi
if (dbMaint == null)
return NotFound();
- // Check if is created by CMS
+ // Check if is created by CMS
if (dbMaint.UserId == null)
return Unauthorized();
@@ -107,7 +107,7 @@ namespace Step.Controllers.WebApi
using (NcHandler ncHandler = new NcHandler())
{
ncHandler.Connect();
- CmsError cmsError = ncHandler.GetMaintenanceData(out DTOMaintenanceModel maintenance, dbMaint.MaintenanceId, Convert.ToInt32(userId.Value));
+ CmsError cmsError = ncHandler.GetMaintenanceDataById(dbMaint.MaintenanceId, Convert.ToInt32(userId.Value), out DTOMaintenanceModel maintenance);
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
@@ -272,7 +272,7 @@ namespace Step.Controllers.WebApi
using (NcHandler ncHandler = new NcHandler())
{
ncHandler.Connect();
- CmsError cmsError = ncHandler.GetMaintenanceData(out DTOMaintenanceModel maintData, maintenanceId, Convert.ToInt32(userId.Value));
+ CmsError cmsError = ncHandler.GetMaintenanceDataById(maintenanceId, Convert.ToInt32(userId.Value), out DTOMaintenanceModel maintData);
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
@@ -282,7 +282,7 @@ namespace Step.Controllers.WebApi
using (MaintenancesController maintenancesController = new MaintenancesController())
{
// Check if maintenance id
- PerformedMaintenanceModel performed = maintenancesController.PerformeMaintenance(maintData.PlcCounter, maintenanceId);
+ PerformedMaintenanceModel performed = maintenancesController.PerformeMaintenance(maintData.PlcCounter, maintenanceId, Convert.ToInt32(userId.Value));
if (performed == null)
return NotFound();
maintData.LastPerformedDate = performed.Date;
diff --git a/Step/Controllers/WebApi/NcFileController.cs b/Step/Controllers/WebApi/NcFileController.cs
index b66f9e18..466f8648 100644
--- a/Step/Controllers/WebApi/NcFileController.cs
+++ b/Step/Controllers/WebApi/NcFileController.cs
@@ -93,7 +93,7 @@ namespace Step.Controllers.WebApi
return BadRequest(cmsError.localizationKey);
return Ok(fileInfo);
- }
+ }
}
[Route("upload"), HttpPost]