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

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

Browse Source
This commit is contained in:
Paolo Possanzini
2019-01-03 09:47:26 +01:00
parent 8fff050126 e130d2bfa5
commit abea2525fc
30 changed files with 876 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Client/Program.cs
+1 -1
View File
@@ -209,7 +209,7 @@ namespace CMS_Client
#region ALARM_METHODS
//Method Used to Show an alarm and close the application
private static void ShowAlarmAndClose(string Message)
public static void ShowAlarmAndClose(string Message)
{
MessageBox.Show(Message,
Application.ProductName,
Client/View/MainForm.cs
+53 -4
View File
@@ -119,7 +119,7 @@ namespace CMS_Client.View
}
else
{
if (Config.VendorHmiConfig.Enabled)
if (Config.VendorHmiConfig.Enabled && NcFrm != null)
NcFrm.Show();
if (NcWindow.State == NcState.SHOW)
@@ -434,6 +434,14 @@ namespace CMS_Client.View
private void ShowWindow()
{
if(Config.ClientConfig.DeveloperMode && Width < 1920 && Height < 1080)
{
double ratio = (((double)Width) / 1920.0) * 100.0;
//Funzione sperimentale presa da Forum CEF
double delta = 5.46149645 * Math.Log(ratio) - 25.12;
Browser.BrowserHost.ZoomLevel = delta;
}
//Invoke method if is needed or call the method in STD mode
if (!IsDisposed)
{
@@ -583,7 +591,7 @@ namespace CMS_Client.View
//Hide NC Method
public void HideNCWindow()
{
if (!Config.VendorHmiConfig.Enabled)
if (!Config.VendorHmiConfig.Enabled || NcFrm==null)
return;
//Invoke method if is needed or call the method in STD mode
@@ -617,13 +625,55 @@ namespace CMS_Client.View
private void CalcWindowPosition()
{
//Position of the Window
Screen ps = Screen.AllScreens.FirstOrDefault(S => S.Primary == true);
if (Screen.AllScreens.Length > 1 && Config.ClientConfig.RunningOnSecondaryScreen)
{
Screen ps = Screen.AllScreens.FirstOrDefault(S => S.Primary == true);
Screen ss = Screen.AllScreens.FirstOrDefault(S => S.Primary == false);
X = ps.Bounds.Width;
if (ss.Bounds.Top != 0)
Y = ss.Bounds.Top;
//Set the Secondary screen Size
if (Config.ClientConfig.DeveloperMode)
{
if (ss.Bounds.Width < 1920 && ss.Bounds.Height < 1080)
{
this.Width = ss.Bounds.Width;
this.Height = ss.Bounds.Height;
}
}
else
{
if (ss.Bounds.Width != 1920 && ss.Bounds.Height != 1080)
{
HideLoadingWindow();
NcWindow.CloseNcWindow(false);
Program.ShowAlarmAndClose("Screen resolution " + ss.Bounds.Width + "x" + ss.Bounds.Height + " is not supported");
}
}
}
else
{
if (Config.ClientConfig.DeveloperMode)
{
//Set the Prymary screen Size
if (ps.Bounds.Width < 1920 && ps.Bounds.Height < 1080)
{
this.Width = ps.Bounds.Width;
this.Height = ps.Bounds.Height;
}
}
else
{
if (ps.Bounds.Width != 1920 && ps.Bounds.Height != 1080)
{
HideLoadingWindow();
NcWindow.CloseNcWindow(false);
Program.ShowAlarmAndClose("Screen resolution " + ps.Bounds.Width + "x" + ps.Bounds.Height + " is not supported");
}
}
}
}
@@ -659,7 +709,6 @@ namespace CMS_Client.View
}
}
#endregion
}
}
Step.Config/Config/serverConfig.xml
+1
View File
@@ -12,6 +12,7 @@
<serverConfig>
<serverPort>9000</serverPort>
<serverAddress>*</serverAddress>
<networkCardId>1</networkCardId>
<language>en</language>
<enableDirectoryBrowsing>true</enableDirectoryBrowsing>
<databaseAddress>localhost</databaseAddress>
Step.Config/Config/serverConfigValidator.xsd
+2 -1
View File
@@ -9,7 +9,7 @@
<xs:element name="ncVendor" type="ncType" minOccurs='1' maxOccurs='1'/>
<xs:element name="showNcHMI" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
<xs:element name="ncIpAddress" minOccurs='1' maxOccurs='1'/>
<xs:element name="ncPort" type="xs:int" minOccurs='1' maxOccurs='1'/>
<xs:element name="ncPort" type="xs:int" minOccurs='1' maxOccurs='1'/>
<xs:element name="machineModel" type="xs:string" minOccurs='1' maxOccurs='1'/>
<xs:element name="sharedPath" type="xs:string" minOccurs='1' maxOccurs='1'/>
<xs:element name="sharedName" type="xs:string" minOccurs='1' maxOccurs='1'/>
@@ -22,6 +22,7 @@
<xs:all>
<xs:element name="serverAddress" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="serverPort" type="xs:int" minOccurs='1' maxOccurs='1'/>
<xs:element name="networkCardId" type="xs:int" minOccurs='1' maxOccurs='1'/>
<xs:element name="language" type="xs:language" minOccurs='1' maxOccurs='1' default="en"/>
<xs:element name="enableDirectoryBrowsing" type="xs:boolean" default="false"/>
<xs:element name="databaseAddress" type="xs:string" minOccurs="1" maxOccurs="1"/>
Step.Config/ServerConfigController.cs
+1
View File
@@ -200,6 +200,7 @@ namespace Step.Config
Language = CultureInfo.CreateSpecificCulture(x.Element("language").Value),
ServerAddress = x.Element("serverAddress").Value,
ServerPort = Convert.ToInt32(x.Element("serverPort").Value),
NetworkCardId = Convert.ToInt32(x.Element("networkCardId").Value),
EnableDirectoryBrowsing = Convert.ToBoolean(x.Element("enableDirectoryBrowsing").Value),
DatabaseAddress = x.Element("databaseAddress").Value,
AutoOpenCmsClient = Convert.ToBoolean(x.Element("autoOpenCmsClient").Value)
Step.Core/ThreadsFunctions.cs
+55
View File
@@ -1,9 +1,12 @@
using CMS_CORE_Library.Models;
using Step.Config;
using Step.Core;
using Step.Model.DTOModels;
using Step.Model.DTOModels.AlarmModels;
using Step.Model.DTOModels.ToolModels;
using Step.NC;
using Step.Utils;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;
@@ -715,6 +718,58 @@ public static class ThreadsFunctions
}
}
public static void MonitorPanelPCResources()
{
float SumRec, SumSen;
Stopwatch sw = new Stopwatch();
DTONetworkMonitor Monitor = new DTONetworkMonitor();
int CardId = ServerConfig.ServerStartupConfig.NetworkCardId - 1;
PerformanceCounterCategory performanceCounterCategory = new PerformanceCounterCategory("Network Interface");
if(CardId<0 || CardId > performanceCounterCategory.GetInstanceNames().Length )
{
Monitor.Name = "No card to monitor";
MessageServices.Current.Publish(NETWORK_USAGE, null, Monitor);
return;
}
Monitor.Name = performanceCounterCategory.GetInstanceNames()[0];
PerformanceCounter PC_Bandwith = new PerformanceCounter("Network Interface", "Current Bandwidth", Monitor.Name);
PerformanceCounter PC_RecievedBytes = new PerformanceCounter("Network Interface", "Bytes Received/sec", Monitor.Name);
PerformanceCounter PC_SentBytes = new PerformanceCounter("Network Interface", "Bytes Sent/sec", Monitor.Name);
Monitor.Bandwidth = PC_Bandwith.NextValue();
try
{
while (true)
{
sw.Restart();
SumRec = 0;
SumSen = 0;
for (int index = 0; index < 50; index++)
{
SumRec += PC_RecievedBytes.NextValue();
SumSen += PC_SentBytes.NextValue();
}
Monitor.Value = Math.Round(((8 * (SumSen + SumRec)) / (Monitor.Bandwidth * 50) * 100), 2) ;
MessageServices.Current.Publish(NETWORK_USAGE, null, Monitor);
sw.Stop();
// Wait
Thread.Sleep(CalcSleepTime(2000, (int)sw.ElapsedMilliseconds));
}
}
catch (ThreadAbortException)
{
ExceptionManager.Manage(ERROR_LEVEL.FATAL, "Fatal error in Network Performance monitor Thread");
}
}
#endregion Functions
#region SupportFunctions
Step.Core/ThreadsHandler.cs
+5
View File
@@ -34,6 +34,11 @@ namespace Step.Core
public static void Start()
{
ThreadsFunctions.RestoreConnection();
//Start THread Network monitor
Action Monitor = new Action(ThreadsFunctions.MonitorPanelPCResources);
Thread t = new Thread(() => Monitor());
t.Start();
}
public static void StartWorkers()
Step.Model/ConfigModels/ServerConfigModel.cs
+1
View File
@@ -12,6 +12,7 @@ namespace Step.Model.ConfigModels
public CultureInfo Language { get; set; }
public int ServerPort { get; set; }
public string ServerAddress { get; set; }
public int NetworkCardId { get; set; }
public bool EnableDirectoryBrowsing { get; set; }
public string DatabaseAddress { get; set; }
public bool AutoOpenCmsClient { get; set; }
Step.Model/Constants.cs
+1
View File
@@ -186,6 +186,7 @@ namespace Step.Model
public const string NC_MAGAZINE_IS_ACTIVE = "UPDATE_NC_MAGAZINE_STATUS";
public const string SEND_QUEUE_DATA = "SEND_QUEUE_DATA";
public const string SEND_M155_DATA = "SEND_M155_DATA";
public const string NETWORK_USAGE = "NETWORK_USAGE";
public const string BROADCAST_DATA = "BROADCAST_DATA";
Step.Model/DTOModels/DTONetworkMonitor.cs
+15
View File
@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Step.Model.DTOModels
{
public class DTONetworkMonitor
{
public String Name;
public Double Bandwidth;
public Double Value;
}
}
Step.Model/DTOModels/MaintenanceModels/DTOMaintenanceModel.cs
+1 -1
View File
@@ -38,6 +38,6 @@ namespace Step.Model.DTOModels.MaintenanceModels
public bool CanPerform { get; set; }
public DTOMessageUserModel User { get; set; }
public DTOMessageUserModel Maintainer { get; set; }
}
}
Step.Model/Step.Model.csproj
+167 -166
View File
@@ -1,167 +1,168 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{631375DD-06D3-49BB-8130-D9DDB34C429D}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Step.Model</RootNamespace>
<AssemblyName>Step.Model</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="CMS_CORE_Library">
<HintPath>..\Libs\CMS_CORE_Library.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.EntityFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.1\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ConfigModels\AlarmsConfigModel.cs" />
<Compile Include="ConfigModels\HeadsConfigModel.cs" />
<Compile Include="ConfigModels\MagazineNamesModel.cs" />
<Compile Include="ConfigModels\MaintenanceConfigModel.cs" />
<Compile Include="ConfigModels\NcSoftKeysModel.cs" />
<Compile Include="ConfigModels\ServerConfigModel.cs" />
<Compile Include="ConfigModels\AreasConfigModel.cs" />
<Compile Include="ConfigModels\NcConfigModel.cs" />
<Compile Include="ConfigModels\ToolManagerConfigModel.cs" />
<Compile Include="ConfigModels\UserSoftKeyConfigModel.cs" />
<Compile Include="Constants.cs" />
<Compile Include="DatabaseModels\AlarmFileModel.cs" />
<Compile Include="DatabaseModels\AlarmDescriptionsModel.cs" />
<Compile Include="DatabaseModels\AlarmNoteModel.cs" />
<Compile Include="DatabaseModels\AlarmOccurrencesModel.cs" />
<Compile Include="DatabaseModels\AlarmUserModel.cs" />
<Compile Include="DatabaseModels\FavoriteUserSoftKeyModel.cs" />
<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\NcOffsetModel.cs" />
<Compile Include="DatabaseModels\NcFamilyModel.cs" />
<Compile Include="DatabaseModels\NcMagazinePositionModel.cs" />
<Compile Include="DatabaseModels\NcShankModel.cs" />
<Compile Include="DatabaseModels\NcToolModel.cs" />
<Compile Include="DatabaseModels\PerformedMaintenanceModel.cs" />
<Compile Include="DatabaseModels\QueueItemsModel.cs" />
<Compile Include="DatabaseModels\RoleModel.cs">
<Generator>DtsGenerator</Generator>
<LastGenOutput>RoleModel.cs.d.ts</LastGenOutput>
</Compile>
<Compile Include="DatabaseModels\MachineUserModel.cs" />
<Compile Include="DatabaseModels\SessionModel.cs" />
<Compile Include="DTOModels\AlarmModels\DTONewAlarmNoteModel.cs" />
<Compile Include="DTOModels\DTOActiveProgramInfoModel.cs" />
<Compile Include="DTOModels\AlarmModels\DTOAlarmHistoricModel.cs" />
<Compile Include="DTOModels\AlarmModels\DTOAlarmsModel.cs" />
<Compile Include="DTOModels\DTOAxesModel.cs" />
<Compile Include="DTOModels\DTOAxisNameModel.cs" />
<Compile Include="DTOModels\DTOClientConfigurationModel.cs" />
<Compile Include="DTOModels\JobModels\DTOGenericParamModel.cs" />
<Compile Include="DTOModels\JobModels\DTOImageParamModel.cs" />
<Compile Include="DTOModels\JobModels\DTOJobCustomParamModel.cs" />
<Compile Include="DTOModels\JobModels\DTOJobModel.cs" />
<Compile Include="DTOModels\DTOQueueModel.cs" />
<Compile Include="DTOModels\JobModels\DTOMetadataFieldsModel.cs" />
<Compile Include="DTOModels\JobModels\DTOMetadataModel.cs" />
<Compile Include="DTOModels\ToolModels\DTONewToolDataModel.cs" />
<Compile Include="DTOModels\MaintenanceModels\DTOExpiredMaintenanceModel.cs" />
<Compile Include="DTOModels\DTOHeadModel.cs" />
<Compile Include="DTOModels\DTOHeadsConfigModel.cs" />
<Compile Include="DTOModels\DTOLanguageModel.cs">
<Generator>DtsGenerator</Generator>
<LastGenOutput>DTOLanguageModel.cs.d.ts</LastGenOutput>
</Compile>
<Compile Include="DTOModels\DTONcGenericDataModel.cs" />
<Compile Include="DTOModels\DTONcSoftKeyModel.cs" />
<Compile Include="DTOModels\DTOPowerOnDataModel.cs" />
<Compile Include="DTOModels\DTOProcessDataModel.cs" />
<Compile Include="DTOModels\DTORoleModel.cs" />
<Compile Include="DTOModels\DTORuntimeFunctionAccessModel.cs" />
<Compile Include="DTOModels\DTOUserSoftKeyModel.cs" />
<Compile Include="DTOModels\DTOStartupConfigurationModel.cs" />
<Compile Include="DTOModels\DTOUserModel.cs" />
<Compile Include="DTOModels\MaintenanceModels\DTOMaintenanceModel.cs" />
<Compile Include="DTOModels\MaintenanceModels\DTOMaintenanceNoteModel.cs" />
<Compile Include="DTOModels\MaintenanceModels\DTONewMaintenanceModel.cs" />
<Compile Include="DatabaseModels\MaintenanceNoteModel.cs" />
<Compile Include="DTOModels\ToolModels\DTOEdgeModel.cs" />
<Compile Include="DTOModels\ToolModels\DTOMagazineStatusModel.cs" />
<Compile Include="DTOModels\ToolModels\DTONcFamilyModel.cs" />
<Compile Include="DTOModels\ToolModels\DTONcMagazinePositionModel.cs" />
<Compile Include="DTOModels\ToolModels\DTONcMountedShankModel.cs" />
<Compile Include="DTOModels\ToolModels\DTONcShankModel.cs" />
<Compile Include="DTOModels\ToolModels\DTONcToolModel.cs" />
<Compile Include="DTOModels\ToolModels\DTONewToolWithFamilyModel.cs" />
<Compile Include="DTOModels\ToolModels\DTOShankModel.cs" />
<Compile Include="DTOModels\ToolModels\DTOSiemensToolModel.cs" />
<Compile Include="DTOModels\ToolModels\DTOUpdateMagazineModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="DatabaseModels\UserModel.cs">
<Generator>DtsGenerator</Generator>
<LastGenOutput>UserModel.cs.d.ts</LastGenOutput>
</Compile>
<Compile Include="DTOModels\DTOFunctionAccessModel.cs" />
</ItemGroup>
<ItemGroup>
<TypeScriptCompile Include="DTOModels\DTOLanguageModel.cs.d.ts">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>DTOLanguageModel.cs</DependentUpon>
</TypeScriptCompile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{631375DD-06D3-49BB-8130-D9DDB34C429D}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Step.Model</RootNamespace>
<AssemblyName>Step.Model</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="CMS_CORE_Library">
<HintPath>..\Libs\CMS_CORE_Library.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.EntityFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.1\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ConfigModels\AlarmsConfigModel.cs" />
<Compile Include="ConfigModels\HeadsConfigModel.cs" />
<Compile Include="ConfigModels\MagazineNamesModel.cs" />
<Compile Include="ConfigModels\MaintenanceConfigModel.cs" />
<Compile Include="ConfigModels\NcSoftKeysModel.cs" />
<Compile Include="ConfigModels\ServerConfigModel.cs" />
<Compile Include="ConfigModels\AreasConfigModel.cs" />
<Compile Include="ConfigModels\NcConfigModel.cs" />
<Compile Include="ConfigModels\ToolManagerConfigModel.cs" />
<Compile Include="ConfigModels\UserSoftKeyConfigModel.cs" />
<Compile Include="Constants.cs" />
<Compile Include="DatabaseModels\AlarmFileModel.cs" />
<Compile Include="DatabaseModels\AlarmDescriptionsModel.cs" />
<Compile Include="DatabaseModels\AlarmNoteModel.cs" />
<Compile Include="DatabaseModels\AlarmOccurrencesModel.cs" />
<Compile Include="DatabaseModels\AlarmUserModel.cs" />
<Compile Include="DatabaseModels\FavoriteUserSoftKeyModel.cs" />
<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\NcOffsetModel.cs" />
<Compile Include="DatabaseModels\NcFamilyModel.cs" />
<Compile Include="DatabaseModels\NcMagazinePositionModel.cs" />
<Compile Include="DatabaseModels\NcShankModel.cs" />
<Compile Include="DatabaseModels\NcToolModel.cs" />
<Compile Include="DatabaseModels\PerformedMaintenanceModel.cs" />
<Compile Include="DatabaseModels\QueueItemsModel.cs" />
<Compile Include="DatabaseModels\RoleModel.cs">
<Generator>DtsGenerator</Generator>
<LastGenOutput>RoleModel.cs.d.ts</LastGenOutput>
</Compile>
<Compile Include="DatabaseModels\MachineUserModel.cs" />
<Compile Include="DatabaseModels\SessionModel.cs" />
<Compile Include="DTOModels\AlarmModels\DTONewAlarmNoteModel.cs" />
<Compile Include="DTOModels\DTOActiveProgramInfoModel.cs" />
<Compile Include="DTOModels\AlarmModels\DTOAlarmHistoricModel.cs" />
<Compile Include="DTOModels\AlarmModels\DTOAlarmsModel.cs" />
<Compile Include="DTOModels\DTOAxesModel.cs" />
<Compile Include="DTOModels\DTOAxisNameModel.cs" />
<Compile Include="DTOModels\DTOClientConfigurationModel.cs" />
<Compile Include="DTOModels\DTONetworkMonitor.cs" />
<Compile Include="DTOModels\JobModels\DTOGenericParamModel.cs" />
<Compile Include="DTOModels\JobModels\DTOImageParamModel.cs" />
<Compile Include="DTOModels\JobModels\DTOJobCustomParamModel.cs" />
<Compile Include="DTOModels\JobModels\DTOJobModel.cs" />
<Compile Include="DTOModels\DTOQueueModel.cs" />
<Compile Include="DTOModels\JobModels\DTOMetadataFieldsModel.cs" />
<Compile Include="DTOModels\JobModels\DTOMetadataModel.cs" />
<Compile Include="DTOModels\ToolModels\DTONewToolDataModel.cs" />
<Compile Include="DTOModels\MaintenanceModels\DTOExpiredMaintenanceModel.cs" />
<Compile Include="DTOModels\DTOHeadModel.cs" />
<Compile Include="DTOModels\DTOHeadsConfigModel.cs" />
<Compile Include="DTOModels\DTOLanguageModel.cs">
<Generator>DtsGenerator</Generator>
<LastGenOutput>DTOLanguageModel.cs.d.ts</LastGenOutput>
</Compile>
<Compile Include="DTOModels\DTONcGenericDataModel.cs" />
<Compile Include="DTOModels\DTONcSoftKeyModel.cs" />
<Compile Include="DTOModels\DTOPowerOnDataModel.cs" />
<Compile Include="DTOModels\DTOProcessDataModel.cs" />
<Compile Include="DTOModels\DTORoleModel.cs" />
<Compile Include="DTOModels\DTORuntimeFunctionAccessModel.cs" />
<Compile Include="DTOModels\DTOUserSoftKeyModel.cs" />
<Compile Include="DTOModels\DTOStartupConfigurationModel.cs" />
<Compile Include="DTOModels\DTOUserModel.cs" />
<Compile Include="DTOModels\MaintenanceModels\DTOMaintenanceModel.cs" />
<Compile Include="DTOModels\MaintenanceModels\DTOMaintenanceNoteModel.cs" />
<Compile Include="DTOModels\MaintenanceModels\DTONewMaintenanceModel.cs" />
<Compile Include="DatabaseModels\MaintenanceNoteModel.cs" />
<Compile Include="DTOModels\ToolModels\DTOEdgeModel.cs" />
<Compile Include="DTOModels\ToolModels\DTOMagazineStatusModel.cs" />
<Compile Include="DTOModels\ToolModels\DTONcFamilyModel.cs" />
<Compile Include="DTOModels\ToolModels\DTONcMagazinePositionModel.cs" />
<Compile Include="DTOModels\ToolModels\DTONcMountedShankModel.cs" />
<Compile Include="DTOModels\ToolModels\DTONcShankModel.cs" />
<Compile Include="DTOModels\ToolModels\DTONcToolModel.cs" />
<Compile Include="DTOModels\ToolModels\DTONewToolWithFamilyModel.cs" />
<Compile Include="DTOModels\ToolModels\DTOShankModel.cs" />
<Compile Include="DTOModels\ToolModels\DTOSiemensToolModel.cs" />
<Compile Include="DTOModels\ToolModels\DTOUpdateMagazineModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="DatabaseModels\UserModel.cs">
<Generator>DtsGenerator</Generator>
<LastGenOutput>UserModel.cs.d.ts</LastGenOutput>
</Compile>
<Compile Include="DTOModels\DTOFunctionAccessModel.cs" />
</ItemGroup>
<ItemGroup>
<TypeScriptCompile Include="DTOModels\DTOLanguageModel.cs.d.ts">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>DTOLanguageModel.cs</DependentUpon>
</TypeScriptCompile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
Step.NC/NcHandler.cs
+3 -3
View File
@@ -99,7 +99,7 @@ namespace Step.NC
{
if (NcConfig.NcVendor != NC_VENDOR.SIEMENS)
{
// TODO Manare
// TODO Fix in the future
return File.Exists(path);
}
else
@@ -1063,7 +1063,7 @@ namespace Step.NC
CreatedByCms = currMaintenance.UserId == null,
CanEdit = canEdit,
CanPerform = canPerform,
User = performed?.Maintainer == null ? null : (DTOMessageUserModel)performed.Maintainer
Maintainer = performed?.Maintainer == null ? null : (DTOMessageUserModel)performed.Maintainer
});
}
}
@@ -1463,7 +1463,7 @@ namespace Step.NC
if (cmsError.IsError())
return cmsError;
if (NcConfig.NcVendor != NC_VENDOR.SIEMENS)
if (NcConfig.NcVendor != NC_VENDOR.SIEMENS && NcConfig.NcVendor != NC_VENDOR.DEMO)
{
config.FamilyOptionActive = true;
config.MultitoolOptionActive = true;
Step.UI/ServerControlWindow.Designer.cs
Generated
+102 -6
View File
@@ -46,9 +46,17 @@ namespace Step.UI
this.TXTType = new System.Windows.Forms.Label();
this.CHNcConnected = new MetroFramework.Controls.MetroCheckBox();
this.label1 = new System.Windows.Forms.Label();
this.labelNetworkName = new System.Windows.Forms.Label();
this.metroPanel1 = new MetroFramework.Controls.MetroPanel();
this.label3 = new System.Windows.Forms.Label();
this.labelNetworkSpeed = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.labelNetworkBand = new System.Windows.Forms.Label();
this.NotifyIconMenu.SuspendLayout();
this.metroTabControl1.SuspendLayout();
this.ThreadsInfo.SuspendLayout();
this.metroPanel1.SuspendLayout();
this.SuspendLayout();
//
// StepNotifyIcon
@@ -78,7 +86,7 @@ namespace Step.UI
// openUiButton
//
this.openUiButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.openUiButton.Location = new System.Drawing.Point(8, 371);
this.openUiButton.Location = new System.Drawing.Point(11, 477);
this.openUiButton.Name = "openUiButton";
this.openUiButton.Size = new System.Drawing.Size(151, 42);
this.openUiButton.TabIndex = 1;
@@ -130,7 +138,7 @@ namespace Step.UI
this.LISTThreadStatus.OwnerDraw = true;
this.LISTThreadStatus.Scrollable = false;
this.LISTThreadStatus.ShowGroups = false;
this.LISTThreadStatus.Size = new System.Drawing.Size(328, 275);
this.LISTThreadStatus.Size = new System.Drawing.Size(331, 275);
this.LISTThreadStatus.TabIndex = 2;
this.LISTThreadStatus.UseCompatibleStateImageBehavior = false;
this.LISTThreadStatus.UseSelectable = true;
@@ -151,7 +159,7 @@ namespace Step.UI
// stopServerButton
//
this.stopServerButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.stopServerButton.Location = new System.Drawing.Point(185, 371);
this.stopServerButton.Location = new System.Drawing.Point(188, 477);
this.stopServerButton.Name = "stopServerButton";
this.stopServerButton.Size = new System.Drawing.Size(151, 42);
this.stopServerButton.TabIndex = 3;
@@ -179,7 +187,7 @@ namespace Step.UI
this.TXTstatus.Enabled = false;
this.TXTstatus.Lines = new string[] {
"..."};
this.TXTstatus.Location = new System.Drawing.Point(-1, 427);
this.TXTstatus.Location = new System.Drawing.Point(-1, 535);
this.TXTstatus.MaxLength = 32767;
this.TXTstatus.Name = "TXTstatus";
this.TXTstatus.PasswordChar = '\0';
@@ -226,11 +234,90 @@ namespace Step.UI
this.label1.TabIndex = 54;
this.label1.Text = "Vendor:";
//
// labelNetworkName
//
this.labelNetworkName.Location = new System.Drawing.Point(82, 12);
this.labelNetworkName.Name = "labelNetworkName";
this.labelNetworkName.Size = new System.Drawing.Size(242, 22);
this.labelNetworkName.TabIndex = 55;
this.labelNetworkName.Text = "---";
this.labelNetworkName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// metroPanel1
//
this.metroPanel1.AccessibleName = "";
this.metroPanel1.Controls.Add(this.label4);
this.metroPanel1.Controls.Add(this.labelNetworkBand);
this.metroPanel1.Controls.Add(this.label3);
this.metroPanel1.Controls.Add(this.labelNetworkSpeed);
this.metroPanel1.Controls.Add(this.label2);
this.metroPanel1.Controls.Add(this.labelNetworkName);
this.metroPanel1.HorizontalScrollbarBarColor = true;
this.metroPanel1.HorizontalScrollbarHighlightOnWheel = false;
this.metroPanel1.HorizontalScrollbarSize = 10;
this.metroPanel1.Location = new System.Drawing.Point(8, 371);
this.metroPanel1.Name = "metroPanel1";
this.metroPanel1.Size = new System.Drawing.Size(331, 100);
this.metroPanel1.TabIndex = 56;
this.metroPanel1.Tag = "";
this.metroPanel1.VerticalScrollbarBarColor = true;
this.metroPanel1.VerticalScrollbarHighlightOnWheel = false;
this.metroPanel1.VerticalScrollbarSize = 10;
//
// label3
//
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(3, 34);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(73, 22);
this.label3.TabIndex = 58;
this.label3.Text = "Load: ";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// labelNetworkSpeed
//
this.labelNetworkSpeed.Location = new System.Drawing.Point(82, 34);
this.labelNetworkSpeed.Name = "labelNetworkSpeed";
this.labelNetworkSpeed.Size = new System.Drawing.Size(242, 22);
this.labelNetworkSpeed.TabIndex = 57;
this.labelNetworkSpeed.Text = "0.0%";
this.labelNetworkSpeed.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label2
//
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(3, 12);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(73, 22);
this.label2.TabIndex = 56;
this.label2.Text = "NIC Name: ";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label4
//
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(3, 56);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(73, 22);
this.label4.TabIndex = 60;
this.label4.Text = "Bandwidth: ";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// labelNetworkBand
//
this.labelNetworkBand.Location = new System.Drawing.Point(82, 56);
this.labelNetworkBand.Name = "labelNetworkBand";
this.labelNetworkBand.Size = new System.Drawing.Size(242, 22);
this.labelNetworkBand.TabIndex = 59;
this.labelNetworkBand.Text = "0 Mb/s";
this.labelNetworkBand.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// ServerControlWindow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(350, 457);
this.ClientSize = new System.Drawing.Size(350, 565);
this.Controls.Add(this.metroPanel1);
this.Controls.Add(this.label1);
this.Controls.Add(this.TXTType);
this.Controls.Add(this.CHNcConnected);
@@ -251,8 +338,10 @@ namespace Step.UI
this.NotifyIconMenu.ResumeLayout(false);
this.metroTabControl1.ResumeLayout(false);
this.ThreadsInfo.ResumeLayout(false);
this.metroPanel1.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
@@ -269,6 +358,13 @@ namespace Step.UI
private MetroFramework.Controls.MetroTextBox TXTstatus;
private Label TXTType;
private MetroFramework.Controls.MetroCheckBox CHNcConnected;
private Label label1;
private Label label1;
private Label labelNetworkName;
private MetroFramework.Controls.MetroPanel metroPanel1;
private Label label3;
private Label labelNetworkSpeed;
private Label label2;
private Label label4;
private Label labelNetworkBand;
}
}
Step.UI/ServerControlWindow.cs
+18
View File
@@ -151,6 +151,24 @@ namespace Step.UI
//ShowMessage on UI
TXTstatus.Text = "[" + DateTime.Now.ToString("T") + "] " + message.Message;
});
}),
MessageServices.Current.Subscribe(NETWORK_USAGE, (a, b) =>
{
DTONetworkMonitor NICMonitor = (DTONetworkMonitor)a;
if (!IsDisposed)
Invoke((MethodInvoker)delegate ()
{
labelNetworkSpeed.Text = NICMonitor.Value + " %";
labelNetworkName.Text = NICMonitor.Name;
if(NICMonitor.Bandwidth >= Math.Pow(10,9))
labelNetworkBand.Text = (NICMonitor.Bandwidth * Math.Pow(10,-9)).ToString() + " Gb/s";
else
labelNetworkBand.Text = (NICMonitor.Bandwidth * Math.Pow(10,-6)).ToString() + " Mb/s";
if(NICMonitor.Value > 95.0)
StepNotifyIcon.ShowBalloonTip(30000, "Network Card Warning", "Network Card - Bandwith Overload", ToolTipIcon.Error);
});
}),
// NC status handler
MessageServices.Current.Subscribe(SEND_NC_STATUS, (a, b) =>
Step.Utils/languages/IT.xml
+4 -5
View File
@@ -140,7 +140,6 @@
<tooling_edgesdataequip_new>Nuovo Offset</tooling_edgesdataequip_new>
<siemens_tooling_edgesdataequip_new>Nuovo Tagliente</siemens_tooling_edgesdataequip_new>
<tooling_parameters_tab>Parametri</tooling_parameters_tab>
<siemens_tooling_equipment_editlabel>Modifica utensile n. %d - %s</siemens_tooling_equipment_editlabel>
<tooling_equipment_editlabel>Modifica utensile n. %d</tooling_equipment_editlabel>
<tooling_equipment_newlabel>Creazione Nuovo Utensile</tooling_equipment_newlabel>
<siemens_tooling_edgesdata_label_edit>Modifica Tagliente n. %d</siemens_tooling_edgesdata_label_edit>
@@ -470,10 +469,10 @@
<maintenance_card_btn_cancel_modify_note>Cancella</maintenance_card_btn_cancel_modify_note>
<maintenance_card_btn_save_modify_note>Salva</maintenance_card_btn_save_modify_note>
<maintenance_date_neverdone>Nessun intervento di manutenzione effettuato</maintenance_date_neverdone>
<maintenance_date_justdone>Ultimo intervento effettuato pochi minuti fa</maintenance_date_justdone>
<maintenance_date_hours>Ultimo intervento effettuato %d ore fa</maintenance_date_hours>
<maintenance_date_days>Ultimo intervento effettuato %d giorni fa</maintenance_date_days>
<maintenance_date_fixeddate>Ultimo intervento effettuato in data: %s</maintenance_date_fixeddate>
<maintenance_date_justdone>Ultimo intervento effettuato pochi minuti fa, da: %s</maintenance_date_justdone>
<maintenance_date_hours>Ultimo intervento effettuato %d ore fa, da: %s</maintenance_date_hours>
<maintenance_date_days>Ultimo intervento effettuato %d giorni fa, da: %s</maintenance_date_days>
<maintenance_date_fixeddate>Ultimo intervento effettuato in data: %s, da: %s</maintenance_date_fixeddate>
<maintenance_card_created_timestamp>Manutenzione creata in data %s alle ore %s</maintenance_card_created_timestamp>
<maintenance_card_attachments>Allegati</maintenance_card_attachments>
<maintenance_card_notes>Note</maintenance_card_notes>
Step.Utils/languages/en.xml
+4 -5
View File
@@ -140,7 +140,6 @@
<tooling_edgesdataequip_new>New Offset</tooling_edgesdataequip_new>
<siemens_tooling_edgesdataequip_new>New Cutting Edge</siemens_tooling_edgesdataequip_new>
<tooling_parameters_tab>Parameters</tooling_parameters_tab>
<siemens_tooling_equipment_editlabel>Edit Tool no. %d - %s</siemens_tooling_equipment_editlabel>
<tooling_equipment_editlabel>Edit Tool no. %d</tooling_equipment_editlabel>
<tooling_equipment_newlabel>New Tool Creation</tooling_equipment_newlabel>
<tooling_edgesdata_label_edit>Edit Offset no. %d</tooling_edgesdata_label_edit>
@@ -469,10 +468,10 @@
<maintenance_card_btn_cancel_modify_note>Cancel</maintenance_card_btn_cancel_modify_note>
<maintenance_card_btn_save_modify_note>Save</maintenance_card_btn_save_modify_note>
<maintenance_date_neverdone>Maintenance never registered</maintenance_date_neverdone>
<maintenance_date_justdone>Last maintenance registered few minutes ago</maintenance_date_justdone>
<maintenance_date_hours>Last maintenance registered %d hours ago</maintenance_date_hours>
<maintenance_date_days>Last maintenance registered %d days ago</maintenance_date_days>
<maintenance_date_fixeddate>Last maintenance registered in: %s</maintenance_date_fixeddate>
<maintenance_date_justdone>Last maintenance registered few minutes ago, from: %s</maintenance_date_justdone>
<maintenance_date_hours>Last maintenance registered %d hours ago, from: %s</maintenance_date_hours>
<maintenance_date_days>Last maintenance registered %d days ago, from: %s</maintenance_date_days>
<maintenance_date_fixeddate>Last maintenance registered in: %s, from: %s</maintenance_date_fixeddate>
<maintenance_card_created_timestamp>Maintenance created in %s at %s</maintenance_card_created_timestamp>
<maintenance_card_attachments>Attachments</maintenance_card_attachments>
<maintenance_card_notes>Notes</maintenance_card_notes>
Step/wwwroot/assets/styles/base/card.less
+20 -5
View File
@@ -1264,11 +1264,26 @@
justify-content: center;
height: 335px;
margin: 0px 18px 0 18px;
img{
max-height:315px;
box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.4);
max-width: 100%;
}
.container{
margin: auto;
overflow: visible;
position: relative;
cursor: pointer;
img {
display: block;
max-height:315px;
box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.4);
max-width: 100%;
}
.eye{
position: absolute;
bottom: 2px;
right: 10px;
font-size: 25px;
color: @color-darkish-blue;
}
}
.noimage{
display: flex;
align-items: center;
Step/wwwroot/assets/styles/base/modals.less
+185 -172
View File
@@ -989,6 +989,7 @@
justify-content: center;
display: flex;
background-color: #cccccc;
position: relative;
}
#imagecontainer{
position: relative;
@@ -1085,178 +1086,7 @@
flex-flow: row;
hr {
width: 5%;
}
.imageViewerZoom {
position: absolute;
width: 100%;
height: inherit;
background: #cccccc;
top: 0;
display: block;
overflow:hidden;
cursor: -webkit-grab;
.container{
width: 100%;
height: 100%;
}
img{
position: absolute;
user-drag: none;
-webkit-user-drag: none;
box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.4)
}
&::-webkit-scrollbar {
width: 4px;
height: 4px;
background-color: transparent;
}
&::-webkit-scrollbar-thumb {
border-radius: 2px;
background-color: rgba(0, 0, 0, 0.3);
}
.btngroup_close{
position: absolute;
top: 0;
right: 0;
margin-right: 20px;
margin-top: 20px;
}
.btngroup{
position: absolute;
bottom: 0;
right: 0;
margin-right: 20px;
margin-bottom: 50px;
button{
margin-top: 20px;
}
button.searchminus{
margin-top: 0px;
}
}
button {
font-size: 20px;
justify-content: center;
display: flex;
background-color: @color-header-button-background-color;
background-image: linear-gradient(to bottom, #1756ad, #002680);
box-shadow: @color-header-button-box-shadow;
border-radius: @header-button-size /2;
border: none;
height: @header-button-size;
max-height: @header-button-size;
min-width: @header-button-size;
max-width: @header-button-size;
cursor: pointer;
color: #FFF;
z-index: 1;
}
button:disabled {
background-color: #002680 !important;;
filter: grayscale(100%);
}
button>img {
margin: auto;
height: @header-button-size/2;
margin: auto;
display: block;
}
button>img.h-20 {
height: 20px;
}
button>img.h-24 {
height: 24px;
}
button .machine-info small {
display: block;
text-align: left;
margin-left: 5px;
font-family: 'Work Sans', sans-serif;
font-size: 11px;
}
button.red {
background-color: @color-scarlet;
color: white;
box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.4), inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
}
button.blue {
background-color: @color-clear-blue;
color: white;
}
button.dark-blue {
background-color: @color-darkish-blue;
color: white;
}
button.dark-blue:active {
background-color: @color-clear-blue;
}
button.gray {
background-color: @color-greyish-brown;
color: white;
}
button.profile {
width: @header-button-size; // background-image: url(../profile.png);
color: #000;
// background-size: cover;
&.colorWhite{
color: #FFF;
}
}
button.unclickable {
cursor: default;
}
input[type=range] {
-webkit-appearance: none;
margin: 18px 0;
width: 200px;
transform: rotate(-90deg);
margin-top:200px;
}
input[type=range]:focus {
outline: none;
}
input[type=range]::-webkit-slider-runnable-track {
width: 100%;
height: 9px;
cursor: pointer;
background: #979797;
border-radius: 4px;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.4);
}
input[type=range]::-webkit-slider-thumb {
height: 30px;
width: 30px;
border-radius: 15px;
background-color: #ffffff;
background-image: linear-gradient(to left, #1756ad, #002680);
box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.4);
cursor: pointer;
-webkit-appearance: none;
margin-top: -10px;
}
.rangecontainer{
height: 257px;
width: 44px;
overflow: hidden;
.range{
position: absolute;
top: -15px;
left: -79px;
}
}
}
.imageViewerZoom:active {
cursor: -webkit-grabbing;
}
}
.first-column {
min-width: 215px;
border-right: solid 2px @color-whitethree;
@@ -2272,4 +2102,187 @@
justify-content: flex-end;
}
}
}
.imageViewerZoom {
position: absolute;
width: 100%;
height: 100%;
background: #cccccc;
top: 0;
display: block;
overflow:hidden;
.container{
width: 100%;
height: 100%;
cursor: -webkit-grab;
}
.loading{
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
background: #cccccc;
display: flex;
align-items: center;
text-align: center;
font-size: 4em;
justify-content: center;
cursor:wait;
color: #4b4b4b;
}
img{
position: absolute;
user-drag: none;
-webkit-user-drag: none;
box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.4)
}
&::-webkit-scrollbar {
width: 4px;
height: 4px;
background-color: transparent;
}
&::-webkit-scrollbar-thumb {
border-radius: 2px;
background-color: rgba(0, 0, 0, 0.3);
}
.btngroup_close{
position: absolute;
top: 0;
right: 0;
margin-right: 20px;
margin-top: 20px;
}
.btngroup{
position: absolute;
bottom: 0;
right: 0;
margin-right: 20px;
margin-bottom: 50px;
button{
margin-top: 20px;
}
button.searchminus{
margin-top: 0px;
}
}
button {
font-size: 20px;
justify-content: center;
display: flex;
background-color: @color-header-button-background-color;
background-image: linear-gradient(to bottom, #1756ad, #002680);
box-shadow: @color-header-button-box-shadow;
border-radius: @header-button-size /2;
border: none;
height: @header-button-size;
max-height: @header-button-size;
min-width: @header-button-size;
max-width: @header-button-size;
cursor: pointer;
color: #FFF;
z-index: 1;
}
button:disabled {
background-color: #002680 !important;;
filter: grayscale(100%);
}
button>img {
margin: auto;
height: @header-button-size/2;
margin: auto;
display: block;
}
button>img.h-20 {
height: 20px;
}
button>img.h-24 {
height: 24px;
}
button .machine-info small {
display: block;
text-align: left;
margin-left: 5px;
font-family: 'Work Sans', sans-serif;
font-size: 11px;
}
button.red {
background-color: @color-scarlet;
color: white;
box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.4), inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
}
button.blue {
background-color: @color-clear-blue;
color: white;
}
button.dark-blue {
background-color: @color-darkish-blue;
color: white;
}
button.dark-blue:active {
background-color: @color-clear-blue;
}
button.gray {
background-color: @color-greyish-brown;
color: white;
}
button.profile {
width: @header-button-size; // background-image: url(../profile.png);
color: #000;
// background-size: cover;
&.colorWhite{
color: #FFF;
}
}
button.unclickable {
cursor: default;
}
input[type=range] {
-webkit-appearance: none;
margin: 18px 0;
width: 200px;
transform: rotate(-90deg);
margin-top:200px;
}
input[type=range]:focus {
outline: none;
}
input[type=range]::-webkit-slider-runnable-track {
width: 100%;
height: 9px;
cursor: pointer;
background: #979797;
border-radius: 4px;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.4);
}
input[type=range]::-webkit-slider-thumb {
height: 30px;
width: 30px;
border-radius: 15px;
background-color: #ffffff;
background-image: linear-gradient(to left, #1756ad, #002680);
box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.4);
cursor: pointer;
-webkit-appearance: none;
margin-top: -10px;
}
.rangecontainer{
height: 257px;
width: 44px;
overflow: hidden;
.range{
position: absolute;
top: -15px;
left: -79px;
}
}
}
.imageViewerZoom:active {
cursor: -webkit-grabbing;
}
Step/wwwroot/assets/styles/style.css
+191 -251
View File
@@ -935,6 +935,7 @@
justify-content: center;
display: flex;
background-color: #cccccc;
position: relative;
}
.modal.modal-image #imagecontainer {
position: relative;
@@ -1060,256 +1061,6 @@
.modal.modal-add-element-queue .modal-add-element-queue-body hr {
width: 5%;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom {
position: absolute;
width: 100%;
height: inherit;
background: #cccccc;
top: 0;
display: block;
overflow: hidden;
cursor: -webkit-grab;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom .container,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom .container,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom .container,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom .container {
width: 100%;
height: 100%;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom img,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom img,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom img,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom img {
position: absolute;
user-drag: none;
-webkit-user-drag: none;
box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.4);
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom::-webkit-scrollbar,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom::-webkit-scrollbar,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom::-webkit-scrollbar,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom::-webkit-scrollbar {
width: 4px;
height: 4px;
background-color: transparent;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom::-webkit-scrollbar-thumb,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom::-webkit-scrollbar-thumb,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom::-webkit-scrollbar-thumb,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom::-webkit-scrollbar-thumb {
border-radius: 2px;
background-color: rgba(0, 0, 0, 0.3);
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom .btngroup_close,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom .btngroup_close,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom .btngroup_close,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom .btngroup_close {
position: absolute;
top: 0;
right: 0;
margin-right: 20px;
margin-top: 20px;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom .btngroup,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom .btngroup,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom .btngroup,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom .btngroup {
position: absolute;
bottom: 0;
right: 0;
margin-right: 20px;
margin-bottom: 50px;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom .btngroup button,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom .btngroup button,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom .btngroup button,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom .btngroup button {
margin-top: 20px;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom .btngroup button.searchminus,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom .btngroup button.searchminus,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom .btngroup button.searchminus,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom .btngroup button.searchminus {
margin-top: 0px;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom button,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom button,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom button,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom button {
font-size: 20px;
justify-content: center;
display: flex;
background-color: #ffffff;
background-image: linear-gradient(to bottom, #1756ad, #002680);
box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.4);
border-radius: 22px;
border: none;
height: 44px;
max-height: 44px;
min-width: 44px;
max-width: 44px;
cursor: pointer;
color: #FFF;
z-index: 1;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom button:disabled,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom button:disabled,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom button:disabled,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom button:disabled {
background-color: #002680 !important;
filter: grayscale(100%);
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom button > img,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom button > img,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom button > img,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom button > img {
height: 22px;
margin: auto;
display: block;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom button > img.h-20,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom button > img.h-20,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom button > img.h-20,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom button > img.h-20 {
height: 20px;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom button > img.h-24,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom button > img.h-24,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom button > img.h-24,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom button > img.h-24 {
height: 24px;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom button .machine-info small,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom button .machine-info small,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom button .machine-info small,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom button .machine-info small {
display: block;
text-align: left;
margin-left: 5px;
font-family: 'Work Sans', sans-serif;
font-size: 11px;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom button.red,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom button.red,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom button.red,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom button.red {
background-color: #d0021b;
color: white;
box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.4), inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom button.blue,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom button.blue,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom button.blue,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom button.blue {
background-color: #1791ff;
color: white;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom button.dark-blue,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom button.dark-blue,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom button.dark-blue,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom button.dark-blue {
background-color: #002680;
color: white;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom button.dark-blue:active,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom button.dark-blue:active,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom button.dark-blue:active,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom button.dark-blue:active {
background-color: #1791ff;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom button.gray,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom button.gray,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom button.gray,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom button.gray {
background-color: #4b4b4b;
color: white;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom button.profile,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom button.profile,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom button.profile,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom button.profile {
width: 44px;
color: #000;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom button.profile.colorWhite,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom button.profile.colorWhite,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom button.profile.colorWhite,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom button.profile.colorWhite {
color: #FFF;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom button.unclickable,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom button.unclickable,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom button.unclickable,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom button.unclickable {
cursor: default;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom input[type=range],
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom input[type=range],
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom input[type=range],
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom input[type=range] {
-webkit-appearance: none;
margin: 18px 0;
width: 200px;
transform: rotate(-90deg);
margin-top: 200px;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom input[type=range]:focus,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom input[type=range]:focus,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom input[type=range]:focus,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom input[type=range]:focus {
outline: none;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom input[type=range]::-webkit-slider-runnable-track,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom input[type=range]::-webkit-slider-runnable-track,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom input[type=range]::-webkit-slider-runnable-track,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom input[type=range]::-webkit-slider-runnable-track {
width: 100%;
height: 9px;
cursor: pointer;
background: #979797;
border-radius: 4px;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.4);
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom input[type=range]::-webkit-slider-thumb,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom input[type=range]::-webkit-slider-thumb,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom input[type=range]::-webkit-slider-thumb,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom input[type=range]::-webkit-slider-thumb {
height: 30px;
width: 30px;
border-radius: 15px;
background-color: #ffffff;
background-image: linear-gradient(to left, #1756ad, #002680);
box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.4);
cursor: pointer;
-webkit-appearance: none;
margin-top: -10px;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom .rangecontainer,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom .rangecontainer,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom .rangecontainer,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom .rangecontainer {
height: 257px;
width: 44px;
overflow: hidden;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom .rangecontainer .range,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom .rangecontainer .range,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom .rangecontainer .range,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom .rangecontainer .range {
position: absolute;
top: -15px;
left: -79px;
}
.modal.modal-load-program .modal-load-program-body .imageViewerZoom:active,
.modal.modal-add-element-queue .modal-load-program-body .imageViewerZoom:active,
.modal.modal-load-program .modal-add-element-queue-body .imageViewerZoom:active,
.modal.modal-add-element-queue .modal-add-element-queue-body .imageViewerZoom:active {
cursor: -webkit-grabbing;
}
.modal.modal-load-program .modal-load-program-body .first-column,
.modal.modal-add-element-queue .modal-load-program-body .first-column,
.modal.modal-load-program .modal-add-element-queue-body .first-column,
@@ -2401,6 +2152,181 @@
align-items: center;
justify-content: flex-end;
}
.imageViewerZoom {
position: absolute;
width: 100%;
height: 100%;
background: #cccccc;
top: 0;
display: block;
overflow: hidden;
}
.imageViewerZoom .container {
width: 100%;
height: 100%;
cursor: -webkit-grab;
}
.imageViewerZoom .loading {
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
background: #cccccc;
display: flex;
align-items: center;
text-align: center;
font-size: 4em;
justify-content: center;
cursor: wait;
color: #4b4b4b;
}
.imageViewerZoom img {
position: absolute;
user-drag: none;
-webkit-user-drag: none;
box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.4);
}
.imageViewerZoom::-webkit-scrollbar {
width: 4px;
height: 4px;
background-color: transparent;
}
.imageViewerZoom::-webkit-scrollbar-thumb {
border-radius: 2px;
background-color: rgba(0, 0, 0, 0.3);
}
.imageViewerZoom .btngroup_close {
position: absolute;
top: 0;
right: 0;
margin-right: 20px;
margin-top: 20px;
}
.imageViewerZoom .btngroup {
position: absolute;
bottom: 0;
right: 0;
margin-right: 20px;
margin-bottom: 50px;
}
.imageViewerZoom .btngroup button {
margin-top: 20px;
}
.imageViewerZoom .btngroup button.searchminus {
margin-top: 0px;
}
.imageViewerZoom button {
font-size: 20px;
justify-content: center;
display: flex;
background-color: #ffffff;
background-image: linear-gradient(to bottom, #1756ad, #002680);
box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.4);
border-radius: 22px;
border: none;
height: 44px;
max-height: 44px;
min-width: 44px;
max-width: 44px;
cursor: pointer;
color: #FFF;
z-index: 1;
}
.imageViewerZoom button:disabled {
background-color: #002680 !important;
filter: grayscale(100%);
}
.imageViewerZoom button > img {
height: 22px;
margin: auto;
display: block;
}
.imageViewerZoom button > img.h-20 {
height: 20px;
}
.imageViewerZoom button > img.h-24 {
height: 24px;
}
.imageViewerZoom button .machine-info small {
display: block;
text-align: left;
margin-left: 5px;
font-family: 'Work Sans', sans-serif;
font-size: 11px;
}
.imageViewerZoom button.red {
background-color: #d0021b;
color: white;
box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.4), inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
}
.imageViewerZoom button.blue {
background-color: #1791ff;
color: white;
}
.imageViewerZoom button.dark-blue {
background-color: #002680;
color: white;
}
.imageViewerZoom button.dark-blue:active {
background-color: #1791ff;
}
.imageViewerZoom button.gray {
background-color: #4b4b4b;
color: white;
}
.imageViewerZoom button.profile {
width: 44px;
color: #000;
}
.imageViewerZoom button.profile.colorWhite {
color: #FFF;
}
.imageViewerZoom button.unclickable {
cursor: default;
}
.imageViewerZoom input[type=range] {
-webkit-appearance: none;
margin: 18px 0;
width: 200px;
transform: rotate(-90deg);
margin-top: 200px;
}
.imageViewerZoom input[type=range]:focus {
outline: none;
}
.imageViewerZoom input[type=range]::-webkit-slider-runnable-track {
width: 100%;
height: 9px;
cursor: pointer;
background: #979797;
border-radius: 4px;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.4);
}
.imageViewerZoom input[type=range]::-webkit-slider-thumb {
height: 30px;
width: 30px;
border-radius: 15px;
background-color: #ffffff;
background-image: linear-gradient(to left, #1756ad, #002680);
box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.4);
cursor: pointer;
-webkit-appearance: none;
margin-top: -10px;
}
.imageViewerZoom .rangecontainer {
height: 257px;
width: 44px;
overflow: hidden;
}
.imageViewerZoom .rangecontainer .range {
position: absolute;
top: -15px;
left: -79px;
}
.imageViewerZoom:active {
cursor: -webkit-grabbing;
}
.popup {
width: 288px;
height: 218px;
@@ -6881,11 +6807,25 @@ footer .container button.big:before {
height: 335px;
margin: 0px 18px 0 18px;
}
.card-job-production .card-job-production-body .card-job-production-body-top img {
.card-job-production .card-job-production-body .card-job-production-body-top .container {
margin: auto;
overflow: visible;
position: relative;
cursor: pointer;
}
.card-job-production .card-job-production-body .card-job-production-body-top .container img {
display: block;
max-height: 315px;
box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.4);
max-width: 100%;
}
.card-job-production .card-job-production-body .card-job-production-body-top .container .eye {
position: absolute;
bottom: 2px;
right: 10px;
font-size: 25px;
color: #002680;
}
.card-job-production .card-job-production-body .card-job-production-body-top .noimage {
display: flex;
align-items: center;
Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.ts
+5 -4
View File
@@ -165,14 +165,15 @@ export default class MaintenanceCard extends Vue {
var end = moment(m.lastPerformedDate);
var days = (moment.duration(today.diff(end)) as any)._data.days;
var hours = (moment.duration(today.diff(end)) as any)._data.hours;
var author = m.maintainer.username;
if (hours == 0)
return this.$options.filters.localize("maintenance_date_justdone", "Ultimo intervento effettuato pochi minuti fa");
return this.$options.filters.localize("maintenance_date_justdone", "Ultimo intervento effettuato pochi minuti fa, da: %s",author);
else if (days == 0)
return this.$options.filters.localize("maintenance_date_hours", "Ultimo intervento effettuato %d ore fa", hours);
return this.$options.filters.localize("maintenance_date_hours", "Ultimo intervento effettuato %d ore fa, da: %s", hours,author);
else if (days <= 7)
return this.$options.filters.localize("maintenance_date_days", "Ultimo intervento effettuato %d giorni fa", days);
return this.$options.filters.localize("maintenance_date_days", "Ultimo intervento effettuato %d giorni fa, da: %s", days,author);
else
return this.$options.filters.localize("maintenance_date_fixeddate", "Ultimo intervento effettuato in data: %s", moment(m.lastPerformedDate).format('L'));
return this.$options.filters.localize("maintenance_date_fixeddate", "Ultimo intervento effettuato in data: %s, da: %s", moment(m.lastPerformedDate).format('L'),author);
}
return "";
}
Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.vue
+3 -1
View File
@@ -11,7 +11,9 @@
<div class="body">
<div class="box scrollable">
<div class="title-box">{{getDescMaintenance(selectedMaintenance.createdByCms, selectedMaintenance.id, selectedMaintenance.description)}}</div>
<div class="subtitle" v-if="existMantainance() && selectedMaintenance.state!='closed'">{{this.getDaysFromLastExpiration(selectedMaintenance)}}</div>
<div class="subtitle" v-if="existMantainance() && selectedMaintenance.state!='closed'">
{{this.getDaysFromLastExpiration(selectedMaintenance)}}
</div>
<div class="subtitle closed" v-if="existMantainance() && selectedMaintenance.state=='closed'">&nbsp;</div>
<div class="subtitle" v-if="!existMantainance()">{{'maintenance_date_neverdone' | localize("Nessuna manutenzione effettuata")}}</div>
<div class="info">
Step/wwwroot/src/app_modules/production/components/card-job-production.ts
+8 -2
View File
@@ -1,11 +1,11 @@
import Vue from "vue";
import cardProductionSectionFile from "./card-production-section-file.vue";
import moment from "moment";
import { fileService, FileService } from "src/services/fileService";
import Component from "vue-class-component";
import { Prop, Watch } from "vue-property-decorator";
import { ModalHelper,Modal } from "src/components/modals";
import { ModalImage } from "src/modules/base-components/index";
@Component({
components: {
@@ -92,6 +92,12 @@ export default class CardJobProduction extends Vue {
selectRow(row) {
this.rowSelected = row;
}
zoomImage() {
ModalHelper.modalImage.content = this.currentProgramImage;
ModalHelper.modalImage.title = this.currentProgramName;
ModalHelper.ShowModal(ModalImage);
}
async deactivateProgram() {
await fileService.deactivateProgram();
}
Step/wwwroot/src/app_modules/production/components/card-job-production.vue
+6 -1
View File
@@ -16,7 +16,12 @@
</div>
<div class="card-job-production-body">
<div class="card-job-production-body-top">
<img :src="currentProgramImage" v-if="currentProgramImage">
<div v-if="currentProgramImage" class="container" @click="zoomImage()">
<img :src="currentProgramImage" >
<div class="eye"><i class="fa fa-eye" aria-hidden="true"></i></div>
</div>
<div v-if="!currentProgramImage" class="noimage">
{{'modal_load_program_lbl_img_not_found' | localize('Preview non disponibile')}}
</div>
Step/wwwroot/src/app_modules/tooling/components/depot-action-generic.ts
-2
View File
@@ -6,6 +6,4 @@ import Modal from "src/components/modals/modal.vue";
@Component({ components: { modal: Modal } })
export default class DepotActionGeneric extends Vue {
@Prop({ default: "../assets/icons/png/start-machine.png" })
imgSource;
}
Step/wwwroot/src/app_modules/tooling/components/depot-action-loading.ts
-2
View File
@@ -7,8 +7,6 @@ import { cardAssistedTooling } from "src/modules/base-components/cards";
@Component({ components: { cardAssistedTooling, modal: Modal } })
export default class DepotActionLoading extends Vue {
@Prop({ default: "/assets/icons/png/start-machine.png" })
imgSource;
magazineStatusModel() {
Step/wwwroot/src/app_modules/tooling/components/depot-action-transfer.ts
-2
View File
@@ -7,8 +7,6 @@ import { cardAssistedTooling } from "src/modules/base-components/cards";
@Component({ components: { cardAssistedTooling, modal: Modal } })
export default class DepotActionTransfer extends Vue {
@Prop({ default: "../../assets/icons/png/start-machine.png" })
imgSource;
magazineStatusModel() {
Step/wwwroot/src/app_modules/tooling/components/depot-action-unloading.ts
-3
View File
@@ -7,9 +7,6 @@ import { cardAssistedTooling } from "src/modules/base-components/cards";
@Component({ components: { cardAssistedTooling, modal: Modal } })
export default class DepotActionUnloading extends Vue {
@Prop({ default: "../assets/icons/png/start-machine.png" })
imgSource;
magazineStatusModel() {
return this.$store.state.depot.magazineStatusModel;
Step/wwwroot/src/modules/base-components/modal-image.vue
+3 -4
View File
@@ -1,17 +1,16 @@
<template>
<modal type="modal-image" :title="title">
<button class="close" slot="header-buttons" @click="close()"><i class="fa fa-remove"></i></button>
<img id="imagecontainer" :src="this.content" />
<!-- <img :src="content" /> -->
<zoom-image :imageSrc="this.content" :showBackButton="false" />
</modal>
</template>
<script lang="ts">
import { Modal, ModalHelper } from "src/components/modals";
import { Factory, MessageService } from "../../_base";
import ZoomImage from './zoom-image.vue'
export default {
components: { modal: Modal },
components: { modal: Modal, ZoomImage },
data: function() {
return {
content: "",
Step/wwwroot/src/modules/base-components/zoom-image.vue
+21 -10
View File
@@ -1,9 +1,17 @@
<template>
<div class="imageViewerZoom" >
<div ref="container" class="container" @mousemove="move" @mousedown="dw" @wheel="ScaleImage" @touchstart="dw" @touchmove="move" @dblclick="zoomPlusAnimated" >
<img ref="imageChild" :style="{'transform':transImage,'transition':animation}" :src="imageSrc" >
<div ref="container" class="container"
@mousemove="move"
@mousedown="dw"
@wheel="ScaleImage"
@touchstart="dw"
@touchmove="move"
@dblclick="zoomPlusAnimated">
<img ref="imageChild" :style="{'transform':transImage,'transition':animation}" :src="imageSrc" v-on:load="onImageLoaded" >
</div>
<div class="btngroup_close">
<div class="loading" v-if="!imageLoaded"><i class="fa fa-circle-o-notch fa-spin"></i></div>
<div class="btngroup_close" v-if="showBackButton">
<button @click="close"><i class="fa fa-chevron-left" ></i></button>
</div>
<div class="btngroup">
@@ -38,11 +46,13 @@ export default {
maxScale: 5,
zoomStep: 0.3,
animation: "0s" ,
animationTime: "0.2s"
animationTime: "0.2s",
imageLoaded:false
};
},
props: {
imageSrc: { default: "" },
showBackButton: { default: true },
},
beforeMount() {
@@ -50,17 +60,18 @@ export default {
mounted() {
this.containerWidth = this.$refs.container.offsetWidth;
this.containerHeight = this.$refs.container.offsetHeight;
this.imageWidth = this.$refs.imageChild.offsetWidth;
this.imageHeight = this.$refs.imageChild.offsetHeight;
this.animation= "0s";
this.centerimage();
this.animation= "0s";
},
methods: {
close() {
this.$emit("close");
},
onImageLoaded (){
this.imageWidth = this.$refs.imageChild.offsetWidth;
this.imageHeight = this.$refs.imageChild.offsetHeight;
this.centerimage();
this.imageLoaded = true;
},
dw(event) {
if(event.touches && event.touches[0])
{