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

Added languages fix

Browse Source 
Hided CMS connect
Fix WINDOWS 10 problems
This commit is contained in:
Lucio Maranta
2019-10-08 17:13:59 +02:00
parent 4ca49051be
commit c2c58acca6
21 changed files with 52 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/CMS_CORE_Library.dll
BIN
View File
Binary file not shown.
Step.Config/Config/serverConfig.xml
+1
View File
@@ -25,6 +25,7 @@
<textEditorPath>C:\Windows\System32\notepad.exe</textEditorPath>
<MTCFolderPath>C:\CMS\MTC\ADAPTER\</MTCFolderPath>
<MTCApplicationName>SCMA</MTCApplicationName>
<CMSConnectReady>false</CMSConnectReady>
<maxAlarmsRows>50000</maxAlarmsRows>
<alarmToDelete>5000</alarmToDelete>
</serverConfig>
Step.Config/Config/serverConfigValidator.xsd
+1
View File
@@ -40,6 +40,7 @@
<xs:element name="MTCApplicationName" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="maxAlarmsRows" type="xs:int" minOccurs="1" maxOccurs="1"/>
<xs:element name="alarmToDelete" type="xs:int" minOccurs="1" maxOccurs="1"/>
<xs:element name="CMSConnectReady" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
</xs:all>
</xs:complexType>
</xs:element>
Step.Config/ServerConfigController.cs
+3 -2
View File
@@ -33,7 +33,7 @@ namespace Step.Config
ReadAlarmsConfig();
ReadHeadsConfig();
ReadToolManagerConfig();
ReadCMSConnectConfig();
// ReadCMSConnectConfig();
ReadMacros();
ReadScadaFile();
//ReadMainProgram();
@@ -308,7 +308,8 @@ namespace Step.Config
MTCFolderPath = x.Element("MTCFolderPath").Value,
MTCApplicationName = x.Element("MTCApplicationName").Value,
MaxAlarmsRows = Convert.ToInt32(x.Element("maxAlarmsRows").Value),
AlarmToDelete = Convert.ToInt32(x.Element("alarmToDelete").Value),
AlarmToDelete = Convert.ToInt32(x.Element("alarmToDelete").Value),
CmsConnectReady = Convert.ToBoolean(x.Element("CMSConnectReady").Value)
}).FirstOrDefault();
int softwareId = 0;
Step.Core/ThreadsHandler.cs
+5 -5
View File
@@ -38,15 +38,15 @@ namespace Step.Core
public static void Start()
{
ThreadsFunctions.RestoreConnection();
//Setup CMS Connect
if(Config.ServerConfig.CmsConnectConfig.Enabled)
ThreadsFunctions.RestoreConnection();
//Setup CMS Connect
//if(Config.ServerConfig.CmsConnectConfig.Enabled)
if (Config.ServerConfig.ServerStartupConfig.CmsConnectReady)
{
Thread t = new Thread(() => ThreadSetupCmsConnect());
t.Start();
}
}
public static void StartWorkers()
Step.Database/Controllers/RedisController.cs
+7 -7
View File
@@ -9,13 +9,13 @@ namespace Step.Database.Controllers
{
public static class RedisController
{
private const String redisNotificationAddress = "Machine:ProductionProcesses:%NN%:Notification";
private const String redisProdNameAddress = "Machine:ProductionProcesses:%NN%:Programs:01:Name";
private const String redisRepsTargetAddress = "Machine:ProductionProcesses:%NN%:Programs:01:RepsTarget";
private const String redisRepsDoneAddress = "Machine:ProductionProcesses:%NN%:Programs:01:RepsDone";
private const String redisAlmCurr = "AdpConf:Plc:Condition:Curr";
private const String redisAlmIt = "AdpConf:Plc:Condition:It";
private const String redisAlmEn = "AdpConf:Plc:Condition:En";
private const string redisNotificationAddress = "Machine:ProductionProcesses:%NN%:Notification";
private const string redisProdNameAddress = "Machine:ProductionProcesses:%NN%:Programs:01:Name";
private const string redisRepsTargetAddress = "Machine:ProductionProcesses:%NN%:Programs:01:RepsTarget";
private const string redisRepsDoneAddress = "Machine:ProductionProcesses:%NN%:Programs:01:RepsDone";
private const string redisAlmCurr = "AdpConf:Plc:Condition:Curr";
private const string redisAlmIt = "AdpConf:Plc:Condition:It";
private const string redisAlmEn = "AdpConf:Plc:Condition:En";
public static void WriteProductionNotification(uint ProductionProcess, string Notification)
{
Step.Model/ConfigModels/ServerConfigModel.cs
+2 -1
View File
@@ -19,8 +19,9 @@ namespace Step.Model.ConfigModels
public string MTCFolderPath { get; set; }
public string MTCApplicationName { get; set; }
public bool CmsConnectReady { get; set; }
public int MaxAlarmsRows { get; set; }
public int AlarmToDelete { get; set; }
public int AlarmToDelete { get; set; }
}
}
Step.Utils/Step.Utils.csproj
+12
View File
@@ -91,6 +91,9 @@
<Content Include="languages\de.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="languages\el.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="languages\en.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -103,9 +106,18 @@
<Content Include="languages\it.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="languages\nl.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="languages\pl.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="languages\ro.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="languages\ru.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
Step.Utils/languages/IT.xml
+1
View File
@@ -670,4 +670,5 @@
<axes_reset_title>Azzeramento assi</axes_reset_title>
<axes_reset_message>Azzeramento assi in corso...</axes_reset_message>
<card_job_production_feed_override>Feed override:</card_job_production_feed_override>
<tooling_equipment_cedgepar_realDiameter>Diametro Reale:</tooling_equipment_cedgepar_realDiameter>
</root>
Step.Utils/languages/de.xml
+1
View File
@@ -670,4 +670,5 @@
<axes_reset_title>Achsennullung</axes_reset_title>
<axes_reset_message>Achsennullung läuft</axes_reset_message>
<card_job_production_feed_override>Feed override:</card_job_production_feed_override>
<tooling_equipment_cedgepar_realDiameter>Wirklicher Durchmesser:</tooling_equipment_cedgepar_realDiameter>
</root>
Step.Utils/languages/el.xml
+1
View File
@@ -669,4 +669,5 @@
<axes_reset_title>Μηδενισμός των αξόνων</axes_reset_title>
<axes_reset_message>Άξονες μηδενισμού σε εξέλιξη ...</axes_reset_message>
<card_job_production_feed_override>Αντικατάσταση ροής:</card_job_production_feed_override>
<tooling_equipment_cedgepar_realDiameter>Πραγματική διάμετρος:</tooling_equipment_cedgepar_realDiameter>
</root>
Step.Utils/languages/en.xml
+1
View File
@@ -670,4 +670,5 @@
<axes_reset_title>Axes zeroing</axes_reset_title>
<axes_reset_message>Axes zeroing in progress...</axes_reset_message>
<card_job_production_feed_override>Feed override:</card_job_production_feed_override>
<tooling_equipment_cedgepar_realDiameter>Real diameter:</tooling_equipment_cedgepar_realDiameter>
</root>
Step.Utils/languages/fr.xml
+1
View File
@@ -670,4 +670,5 @@
<axes_reset_title>Réinitialisation des axes</axes_reset_title>
<axes_reset_message>Réinitialisation des axes en cours ...</axes_reset_message>
<card_job_production_feed_override>Feed override:</card_job_production_feed_override>
<tooling_equipment_cedgepar_realDiameter>Diamètre réel:</tooling_equipment_cedgepar_realDiameter>
</root>
Step.Utils/languages/hr.xml
+1
View File
@@ -669,4 +669,5 @@
<axes_reset_title>Osi svesti na ništicu</axes_reset_title>
<axes_reset_message>Osi svesti na ništicu...</axes_reset_message>
<card_job_production_feed_override>Feed nadjačati:</card_job_production_feed_override>
<tooling_equipment_cedgepar_realDiameter>Stvarni Promjer:</tooling_equipment_cedgepar_realDiameter>
</root>
Step.Utils/languages/nl.xml
+1
View File
@@ -670,4 +670,5 @@
<axes_reset_title>Assen nulstellen</axes_reset_title>
<axes_reset_message>Bezig met nulstellen van assen ...</axes_reset_message>
<card_job_production_feed_override>Feed negeren:</card_job_production_feed_override>
<tooling_equipment_cedgepar_realDiameter>Werkelijke diameter:</tooling_equipment_cedgepar_realDiameter>
</root>
Step.Utils/languages/pl.xml
+2 -1
View File
@@ -336,7 +336,7 @@
<tooling_family_param_nominalLife>Żywotność nominalna</tooling_family_param_nominalLife>
<tooling_family_param_reviveDelta>Δ Regeneracji narzędzia</tooling_family_param_reviveDelta>
<siemens_tooling_equipment_cedgepar_id>Id narzędzia tnącego</siemens_tooling_equipment_cedgepar_id>
<tooling_equipment_cedgepar_id>Id offset</tooling_equipment_cedgepar_id>
<tooling_equipment_cedgepar_id>Id Offset</tooling_equipment_cedgepar_id>
<tooling_equipment_cedgepar_unitOfMeasure>Jednostka miary</tooling_equipment_cedgepar_unitOfMeasure>
<tooling_equipment_cedgepar_residualLife>Pozostała Żywotność</tooling_equipment_cedgepar_residualLife>
<tooling_equipment_cedgepar_nominalLife>Żywotność nominalna</tooling_equipment_cedgepar_nominalLife>
@@ -670,4 +670,5 @@
<axes_reset_title>Zerowanie osi</axes_reset_title>
<axes_reset_message>Trwa zerowanie osi…</axes_reset_message>
<card_job_production_feed_override>Karmić nadpisanie</card_job_production_feed_override>
<tooling_equipment_cedgepar_realDiameter>Średnica rzeczywista:</tooling_equipment_cedgepar_realDiameter>
</root>
Step.Utils/languages/ro.xml
+1
View File
@@ -670,4 +670,5 @@
<axes_reset_title>Axe zero</axes_reset_title>
<axes_reset_message>Axe zero la desfășurare...</axes_reset_message>
<card_job_production_feed_override>Înlocuirea hranei:</card_job_production_feed_override>
<tooling_equipment_cedgepar_realDiameter>Diametrul reală:</tooling_equipment_cedgepar_realDiameter>
</root>
Step.Utils/languages/ru.xml
+1
View File
@@ -670,4 +670,5 @@
<axes_reset_title>Обнуление осей</axes_reset_title>
<axes_reset_message>Производится обнуление осей...</axes_reset_message>
<card_job_production_feed_override>Переопределение подачи:</card_job_production_feed_override>
<tooling_equipment_cedgepar_realDiameter>Фактический диаметр:</tooling_equipment_cedgepar_realDiameter>
</root>
Step/Controllers/WebApi/ConfigurationController.cs
+2 -1
View File
@@ -48,7 +48,8 @@ namespace Step.Controllers.WebApi
Autorun = ServerStartupConfig.AutoOpenCmsClient,
EditorPath = ServerStartupConfig.TextEditorPath,
MgiOption = NcConfig.MgiOption,
CmsConnectReady = CmsConnectConfig.Enabled
//CmsConnectReady = CmsConnectConfig.Enabled
CmsConnectReady = ServerStartupConfig.CmsConnectReady
};
return Ok(clientConfiguration);
Step/wwwroot/src/app_modules/machine/components/user-info.vue
+1 -1
View File
@@ -5,7 +5,7 @@
<i class="fa fa-question"></i>
</button>
-->
<button class="dark-blue" v-if="cmsConnectReady"
<button class="dark-blue" v-if="false && cmsConnectReady"
@click="sendMessage('show-cmsconnect-info')">
<span>C</span>
</button>
Step/wwwroot/src/services/hub.ts
+7 -2
View File
@@ -87,12 +87,17 @@ export class Hub {
// Set authorization token
Hub.Current.updateAuthToken()
messageService.subscribeToChannel("login-reload", args => {
console.log("ENTRA")
this.updateAuthToken();
});
$.connection.hub.disconnected(() => {
Hub.manageServerStatus("disconnected");
console.log("SERVER CONNECTION: restart-connection")
setTimeout(function () {
$.connection.hub.start();
$.connection.hub.start({ transport: ['serverSentEvents'] });
}, 5000); // Restart connection after 5 seconds.
});
$.connection.hub.stateChanged(async (state) => {
@@ -106,7 +111,7 @@ export class Hub {
}
})
$.connection.hub.start();
$.connection.hub.start({ transport: ['serverSentEvents'] });
this.checkShowAxes();