diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index 59dd457b..52db11c7 100644 Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ diff --git a/Step.Config/Config/toolManagerConfig.xml b/Step.Config/Config/toolManagerConfig.xml index 0e7cddc2..8820ae18 100644 --- a/Step.Config/Config/toolManagerConfig.xml +++ b/Step.Config/Config/toolManagerConfig.xml @@ -3,7 +3,7 @@ DIAMETER true - false + true true true true @@ -76,4 +76,847 @@ + + + + 0 + false + + Generic + Generico + Générique + Allgemein + Opće + Generic + Algemeen + Γενικό + Общий + Ogólny + Generisk + Generel + Genérico + Genérico + + + + + 10 + false + + Angular Transmission + Rinvio Angolare + Transmission Angulaire + Scheibe + Disk + Transmisie unghiulară + Hoekige transmissie + Γωνιακή μετάδοση + Угловой контрпривод + Przekładnia kątowa + Vinkelöverföring + Vinkel mellemarm + Transmissão Angular + Reenvío Angular + + + + + 70 + false + + Ultrasound disk amplitude 15%% + Disco ultrasuoni amplitude 15%% + Disque à ultrasons, amplitude 15%% + Ultraschallscheibenamplitude 15%% + Amplituda ultrazvučnog diska 15%% + Disc de ultrasunete, amplitudine 15%% + Ultrasoon schijf amplitude 15%% + Δίσκος υπερήχων πλάτους 15%% + Ультразвуковой диск амплитуда 15%% + Tarcza ultradźwiękowa amplituda 15%% + Amplitud ultraljudsskiva 15%% + Ultralydsskive amplitude 15%% + Disco ultrassom amplitude 15%% + Disco ultrasonidos amplitud 15%% + + + + + 71 + false + + Ultrasound disk amplitude 20%% + Disco ultrasuoni amplitude 20%% + Disque à ultrasons, amplitude 20%% + Ultraschallscheibenamplitude 20%% + Amplituda ultrazvučnog diska 20%% + Disc de ultrasunete, amplitudine 20%% + Ultrasoon schijf amplitude 20%% + Δίσκος υπερήχων πλάτους 20%% + Ультразвуковой диск амплитуда 20%% + Tarcza ultradźwiękowa amplituda 20%% + Amplitud ultraljudsskiva 20%% + Ultralydsskive amplitude 20%% + Disco ultrassom amplitude 20%% + Disco ultrasonidos amplitud 20%% + + + + + 72 + false + + Ultrasound disk amplitude 30%% + Disco ultrasuoni amplitude 30%% + Disque à ultrasons, amplitude 30%% + Ultraschallscheibenamplitude 30%% + Amplituda ultrazvučnog diska 30%% + Disc de ultrasunete, amplitudine 30%% + Ultrasoon schijf amplitude 30%% + Δίσκος υπερήχων πλάτους 30%% + Ультразвуковой диск амплитуда 30%% + Tarcza ultradźwiękowa amplituda 30%% + Amplitud ultraljudsskiva 30%% + Ultralydsskive amplitude 30%% + Disco ultrassom amplitude 30%% + Disco ultrasonidos amplitud 30%% + + + + + 73 + false + + Ultrasound disk amplitude 40%% + Disco ultrasuoni amplitude 40%% + Disque à ultrasons, amplitude 40%% + Ultraschallscheibenamplitude 40%% + Amplituda ultrazvučnog diska 40%% + Disc de ultrasunete, amplitudine 40%% + Ultrasoon schijf amplitude 40%% + Δίσκος υπερήχων πλάτους 40%% + Ультразвуковой диск амплитуда 40%% + Tarcza ultradźwiękowa amplituda 40%% + Amplitud ultraljudsskiva 40%% + Ultralydsskive amplitude 40%% + Disco ultrassom amplitude 40%% + Disco ultrasonidos amplitud 40%% + + + + + 74 + false + + Ultrasound disk amplitude 50%% + Disco ultrasuoni amplitude 50%% + Disque à ultrasons, amplitude 50%% + Ultraschallscheibenamplitude 50%% + Amplituda ultrazvučnog diska 50%% + Disc de ultrasunete, amplitudine 50%% + Ultrasoon schijf amplitude 50%% + Δίσκος υπερήχων πλάτους 50%% + Ультразвуковой диск амплитуда 50%% + Tarcza ultradźwiękowa amplituda 50%% + Amplitud ultraljudsskiva 50%% + Ultralydsskive amplitude 50%% + Disco ultrassom amplitude 50%% + Disco ultrasonidos amplitud 50%% + + + + + 75 + false + + Ultrasound disk amplitude 60%% + Disco ultrasuoni amplitude 60%% + Disque à ultrasons, amplitude 60%% + Ultraschallscheibenamplitude 60%% + Amplituda ultrazvučnog diska 60%% + Disc de ultrasunete, amplitudine 60%% + Ultrasoon schijf amplitude 60%% + Δίσκος υπερήχων πλάτους 60%% + Ультразвуковой диск амплитуда 60%% + Tarcza ultradźwiękowa amplituda 60%% + Amplitud ultraljudsskiva 60%% + Ultralydsskive amplitude 60%% + Disco ultrassom amplitude 60%% + Disco ultrasonidos amplitud 60%% + + + + + 76 + false + + Ultrasound disk amplitude 70%% + Disco ultrasuoni amplitude 70%% + Disque à ultrasons, amplitude 70%% + Ultraschallscheibenamplitude 70%% + Amplituda ultrazvučnog diska 70%% + Disc de ultrasunete, amplitudine 70%% + Ultrasoon schijf amplitude 70%% + Δίσκος υπερήχων πλάτους 70%% + Ультразвуковой диск амплитуда 70%% + Tarcza ultradźwiękowa amplituda 70%% + Amplitud ultraljudsskiva 70%% + Ultralydsskive amplitude 70%% + Disco ultrassom amplitude 70%% + Disco ultrasonidos amplitud 70%% + + + + + 77 + false + + Ultrasound disk amplitude 80%% + Disco ultrasuoni amplitude 80%% + Disque à ultrasons, amplitude 80%% + Ultraschallscheibenamplitude 80%% + Amplituda ultrazvučnog diska 80%% + Disc de ultrasunete, amplitudine 80%% + Ultrasoon schijf amplitude 80%% + Δίσκος υπερήχων πλάτους 80%% + Ультразвуковой диск амплитуда 80%% + Tarcza ultradźwiękowa amplituda 80%% + Amplitud ultraljudsskiva 80%% + Ultralydsskive amplitude 80%% + Disco ultrassom amplitude 80%% + Disco ultrasonidos amplitud 80%% + + + + + 78 + false + + Ultrasound disk amplitude 90%% + Disco ultrasuoni amplitude 90%% + Disque à ultrasons, amplitude 90%% + Ultraschallscheibenamplitude 90%% + Amplituda ultrazvučnog diska 90%% + Disc de ultrasunete, amplitudine 90%% + Ultrasoon schijf amplitude 90%% + Δίσκος υπερήχων πλάτους 90%% + Ультразвуковой диск амплитуда 90%% + Tarcza ultradźwiękowa amplituda 90%% + Amplitud ultraljudsskiva 90%% + Ultralydsskive amplitude 90%% + Disco ultrassom amplitude 90%% + Disco ultrasonidos amplitud 90%% + + + + + 79 + false + + Ultrasound disk amplitude 100%% + Disco ultrasuoni amplitude 100%% + Disque à ultrasons, amplitude 100%% + Ultraschallscheibenamplitude 100%% + Amplituda ultrazvučnog diska 100%% + Disc de ultrasunete, amplitudine 100%% + Ultrasoon schijf amplitude 100%% + Δίσκος υπερήχων πλάτους 100%% + Ультразвуковой диск амплитуда 100%% + Tarcza ultradźwiękowa amplituda 100%% + Amplitud ultraljudsskiva 100%% + Ultralydsskive amplitude 100%% + Disco ultrassom amplitude 100%% + Disco ultrasonidos amplitud 100%% + + + + + 80 + false + + Ultrasound blade amplitude 10%% + Lama ultrasuoni amplitude 10%% + Lame à ultrasons, amplitude 10%% + Ultraschallklingenamplitude 10%% + Amplituda ultrazvučne oštrice 10%% + Lama cu ultrasunete, amplitudine 10%% + Ultrasoon mes amplitude 10%% + Λεπίδα υπερήχων πλάτους 10%% + Ультразвуковой резец амплитуда 10%% + Ostrze ultradźwiękowe amplituda 10%% + Amplitud ultraljudsblad 10%% + Ultralydsklinge amplitude 10%% + Lâmina ultrassom amplitude 10%% + Cuchilla ultrasonidos amplitud 10%% + + + + + 81 + false + + Ultrasound blade amplitude 20%% + Lama ultrasuoni amplitude 20%% + Lame à ultrasons, amplitude 20%% + Ultraschallklingenamplitude 20%% + Amplituda ultrazvučne oštrice 20%% + Lama cu ultrasunete, amplitudine 20%% + Ultrasoon mes amplitude 20%% + Λεπίδα υπερήχων πλάτους 20%% + Ультразвуковой резец амплитуда 20%% + Ostrze ultradźwiękowe amplituda 20%% + Amplitud ultraljudsblad 20%% + Ultralydsklinge amplitude 20%% + Lâmina ultrassom amplitude 20%% + Cuchilla ultrasonidos amplitud 20%% + + + + + 82 + false + + Ultrasound blade amplitude 30%% + Lama ultrasuoni amplitude 30%% + Lame à ultrasons, amplitude 30%% + Ultraschallklingenamplitude 30%% + Amplituda ultrazvučne oštrice 30%% + Lama cu ultrasunete, amplitudine 30%% + Ultrasoon mes amplitude 30%% + Λεπίδα υπερήχων πλάτους 30%% + Ультразвуковой резец амплитуда 30%% + Ostrze ultradźwiękowe amplituda 30%% + Amplitud ultraljudsblad 30%% + Ultralydsklinge amplitude 30%% + Lâmina ultrassom amplitude 30%% + Cuchilla ultrasonidos amplitud 30%% + + + + + 83 + false + + Ultrasound blade amplitude 40%% + Lama ultrasuoni amplitude 40%% + Lame à ultrasons, amplitude 40%% + Ultraschallklingenamplitude 40%% + Amplituda ultrazvučne oštrice 40%% + Lama cu ultrasunete, amplitudine 40%% + Ultrasoon mes amplitude 40%% + Λεπίδα υπερήχων πλάτους 40%% + Ультразвуковой резец амплитуда 40%% + Ostrze ultradźwiękowe amplituda 40%% + Amplitud ultraljudsblad 40%% + Ultralydsklinge amplitude 40%% + Lâmina ultrassom amplitude 40%% + Cuchilla ultrasonidos amplitud 40%% + + + + + 84 + false + + Ultrasound blade amplitude 50%% + Lama ultrasuoni amplitude 50%% + Lame à ultrasons, amplitude 50%% + Ultraschallklingenamplitude 50%% + Amplituda ultrazvučne oštrice 50%% + Lama cu ultrasunete, amplitudine 50%% + Ultrasoon mes amplitude 50%% + Λεπίδα υπερήχων πλάτους 50%% + Ультразвуковой резец амплитуда 50%% + Ostrze ultradźwiękowe amplituda 50%% + Amplitud ultraljudsblad 50%% + Ultralydsklinge amplitude 50%% + Lâmina ultrassom amplitude 50%% + Cuchilla ultrasonidos amplitud 50%% + + + + + 85 + false + + Ultrasound blade amplitude 60%% + Lama ultrasuoni amplitude 60%% + Lame à ultrasons, amplitude 60%% + Ultraschallklingenamplitude 60%% + Amplituda ultrazvučne oštrice 60%% + Lama cu ultrasunete, amplitudine 60%% + Ultrasoon mes amplitude 60%% + Λεπίδα υπερήχων πλάτους 60%% + Ультразвуковой резец амплитуда 60%% + Ostrze ultradźwiękowe amplituda 60%% + Amplitud ultraljudsblad 60%% + Ultralydsklinge amplitude 60%% + Lâmina ultrassom amplitude 60%% + Cuchilla ultrasonidos amplitud 60%% + + + + + 86 + false + + Ultrasound blade amplitude 70%% + Lama ultrasuoni amplitude 70%% + Lame à ultrasons, amplitude 70%% + Ultraschallklingenamplitude 70%% + Amplituda ultrazvučne oštrice 70%% + Lama cu ultrasunete, amplitudine 70%% + Ultrasoon mes amplitude 70%% + Λεπίδα υπερήχων πλάτους 70%% + Ультразвуковой резец амплитуда 70%% + Ostrze ultradźwiękowe amplituda 70%% + Amplitud ultraljudsblad 70%% + Ultralydsklinge amplitude 70%% + Lâmina ultrassom amplitude 70%% + Cuchilla ultrasonidos amplitud 70%% + + + + + 87 + false + + Ultrasound blade amplitude 80%% + Lama ultrasuoni amplitude 80%% + Lame à ultrasons, amplitude 80%% + Ultraschallklingenamplitude 80%% + Amplituda ultrazvučne oštrice 80%% + Lama cu ultrasunete, amplitudine 80%% + Ultrasoon mes amplitude 80%% + Λεπίδα υπερήχων πλάτους 80%% + Ультразвуковой резец амплитуда 80%% + Ostrze ultradźwiękowe amplituda 80%% + Amplitud ultraljudsblad 80%% + Ultralydsklinge amplitude 80%% + Lâmina ultrassom amplitude 80%% + Cuchilla ultrasonidos amplitud 80%% + + + + + 88 + false + + Ultrasound blade amplitude 90%% + Lama ultrasuoni amplitude 90%% + Lame à ultrasons, amplitude 90%% + Ultraschallklingenamplitude 90%% + Amplituda ultrazvučne oštrice 90%% + Lama cu ultrasunete, amplitudine 90%% + Ultrasoon mes amplitude 90%% + Λεπίδα υπερήχων πλάτους 90%% + Ультразвуковой резец амплитуда 90%% + Ostrze ultradźwiękowe amplituda 90%% + Amplitud ultraljudsblad 90%% + Ultralydsklinge amplitude 90%% + Lâmina ultrassom amplitude 90%% + Cuchilla ultrasonidos amplitud 90%% + + + + + 89 + false + + Ultrasound blade amplitude 100%% + Lama ultrasuoni amplitude 100%% + Lame à ultrasons, amplitude 100%% + Ultraschallklingenamplitude 100%% + Amplituda ultrazvučne oštrice 100%% + Lama cu ultrasunete, amplitudine 100%% + Ultrasoon mes amplitude 100%% + Λεπίδα υπερήχων πλάτους 100%% + Ультразвуковой резец амплитуда 100%% + Ostrze ultradźwiękowe amplituda 100%% + Amplitud ultraljudsblad 100%% + Ultralydsklinge amplitude 100%% + Lâmina ultrassom amplitude 100%% + Cuchilla ultrasonidos amplitud 100%% + + + + + 90 + false + + Blade 1 + Lama 1 + Lame 1 + Klinge 1 + List pile 1 + Lama 1 + Mes 1 + Λάμα 1 + Резец 1 + Ostrze 1 + Blad 1 + Klinge 1 + Lâmina 1 + Cuchilla 1 + + + + + 91 + false + + Blade 2 + Lama 2 + Lame 2 + Klinge 2 + List pile 2 + Lama 2 + Mes 2 + Λάμα 2 + Резец 2 + Ostrze 2 + Blad 2 + Klinge 2 + Lâmina 2 + Cuchilla 2 + + + + + 92 + false + + Blade 3 + Lama 3 + Lame 3 + Klinge 3 + List pile 3 + Lama 3 + Mes 3 + Λάμα 3 + Резец 3 + Ostrze 3 + Blad 3 + Klinge 3 + Lâmina 3 + Cuchilla 3 + + + + + 93 + false + + Blade 4 + Lama 4 + Lame 4 + Klinge 4 + List pile 4 + Lama 4 + Mes 4 + Λάμα 4 + Резец 4 + Ostrze 4 + Blad 4 + Klinge 4 + Lâmina 4 + Cuchilla 4 + + + + + 94 + false + + Blade 5 + Lama 5 + Lame 5 + Klinge 5 + List pile 5 + Lama 5 + Mes 5 + Λάμα 5 + Резец 5 + Ostrze 5 + Blad 5 + Klinge 5 + Lâmina 5 + Cuchilla 5 + + + + + 95 + false + + Blade 6 + Lama 6 + Lame 6 + Klinge 6 + List pile 6 + Lama 6 + Mes 6 + Λάμα 6 + Резец 6 + Ostrze 6 + Blad 6 + Klinge 6 + Lâmina 6 + Cuchilla 6 + + + + + 96 + false + + Blade 7 + Lama 7 + Lame 7 + Klinge 7 + List pile 7 + Lama 7 + Mes 7 + Λάμα 7 + Резец 7 + Ostrze 7 + Blad 7 + Klinge 7 + Lâmina 7 + Cuchilla 7 + + + + + 97 + false + + Blade ⌀300 + Lama ⌀300 + Lame ⌀300 + Klinge ⌀300 + List pile ⌀300 + Lama ⌀300 + Mes ⌀300 + Λάμα ⌀300 + Резец ⌀300 + Ostrze ⌀300 + Blad ⌀300 + Klinge ⌀300 + Lâmina ⌀300 + Cuchilla ⌀300 + + + + + 98 + false + + Blade ⌀400 + Lama ⌀400 + Lame ⌀400 + Klinge ⌀400 + List pile ⌀400 + Lama ⌀400 + Mes ⌀400 + Λάμα ⌀400 + Резец ⌀400 + Ostrze ⌀400 + Blad ⌀400 + Klinge ⌀400 + Lâmina ⌀400 + Cuchilla ⌀400 + + + + + 99 + false + + Blade ⌀500 + Lama ⌀500 + Lame ⌀500 + Klinge ⌀500 + List pile ⌀500 + Lama ⌀500 + Mes ⌀500 + Λάμα ⌀500 + Резец ⌀500 + Ostrze ⌀500 + Blad ⌀500 + Klinge ⌀500 + Lâmina ⌀500 + Cuchilla ⌀500 + + + + + 101 + false + + Radio Probe 1 - Reciever 1 + Radio Probe 1 - Ricevitore 1 + Radio Probe 1 - Récepteur 1 + Radio Probe 1 - Empfänger 1 + Radio Probe 1 - Prijemnik 1 + Probe Radio 1 - Receptor 1 + Radio Probe 1 - Ontvanger 1 + Ραδιο-ανιχνευτής 1 - Δέκτης 1 + Радиодатчик 1 - Приемник 1 + Sonda radiowa 1 - Odbiornik 1 + Radiosond 1 - Mottagare 1 + Radio Sonde 1 - Modtager 1 + Sonda Probe 1 - Receptor 1 + Radio Probe 1 - Receptor 1 + + + + + 102 + false + + Radio Probe 2 - Reciever 1 + Radio Probe 2 - Ricevitore 1 + Radio Probe 2 - Récepteur 1 + Radio Probe 2 - Empfänger 1 + Radio Probe 2 - Prijemnik 1 + Probe Radio 2 - Receptor 1 + Radio Probe 2 - Ontvanger 1 + Ραδιο-ανιχνευτής 2 - Δέκτης 1 + Радиодатчик 2 - Приемник 1 + Sonda radiowa 2 - Odbiornik 1 + Radiosond 2 - Mottagare 1 + Radio Sonde 2 - Modtager 1 + Sonda Probe 2 - Receptor 1 + Radio Probe 2 - Receptor 1 + + + + + 103 + false + + Radio Probe 3 - Reciever 1 + Radio Probe 3 - Ricevitore 1 + Radio Probe 3 - Récepteur 1 + Radio Probe 3 - Empfänger 1 + Radio Probe 3 - Prijemnik 1 + Probe Radio 3 - Receptor 1 + Radio Probe 3 - Ontvanger 1 + Ραδιο-ανιχνευτής 3 - Δέκτης 1 + Радиодатчик 3 - Приемник 1 + Sonda radiowa 3 - Odbiornik 1 + Radiosond 3 - Mottagare 1 + Radio Sonde 3 - Modtager 1 + Sonda Probe 3 - Receptor 1 + Radio Probe 3 - Receptor 1 + + + + + 104 + false + + Radio Probe 4 - Reciever 1 + Radio Probe 4 - Ricevitore 1 + Radio Probe 4 - Récepteur 1 + Radio Probe 4 - Empfänger 1 + Radio Probe 4 - Prijemnik 1 + Probe Radio 4 - Receptor 1 + Radio Probe 4 - Ontvanger 1 + Ραδιο-ανιχνευτής 4 - Δέκτης 1 + Радиодатчик 4 - Приемник 1 + Sonda radiowa 4 - Odbiornik 1 + Radiosond 4 - Mottagare 1 + Radio Sonde 4 - Modtager 1 + Sonda Probe 4 - Receptor 1 + Radio Probe 4 - Receptor 1 + + + + + 105 + false + + Radio Probe 1 - Reciever 2 + Radio Probe 1 - Ricevitore 2 + Radio Probe 1 - Récepteur 2 + Radio Probe 1 - Empfänger 2 + Radio Probe 1 - Prijemnik 2 + Probe Radio 1 - Receptor 2 + Radio Probe 1 - Ontvanger 2 + Ραδιο-ανιχνευτής 1 - Δέκτης 2 + Радиодатчик 1 - Приемник 2 + Sonda radiowa 1 - Odbiornik 2 + Radiosond 1 - Mottagare 2 + Radio Sonde 1 - Modtager 2 + Sonda Probe 1 - Receptor 2 + Radio Probe 1 - Receptor 2 + + + + + 106 + false + + Radio Probe 2 - Reciever 2 + Radio Probe 2 - Ricevitore 2 + Radio Probe 2 - Récepteur 2 + Radio Probe 2 - Empfänger 2 + Radio Probe 2 - Prijemnik 2 + Probe Radio 2 - Receptor 2 + Radio Probe 2 - Ontvanger 2 + Ραδιο-ανιχνευτής 2 - Δέκτης 2 + Радиодатчик 2 - Приемник 2 + Sonda radiowa 2 - Odbiornik 2 + Radiosond 2 - Mottagare 2 + Radio Sonde 2 - Modtager 2 + Sonda Probe 2 - Receptor 2 + Radio Probe 2 - Receptor 2 + + + + + 107 + false + + Radio Probe 3 - Reciever 2 + Radio Probe 3 - Ricevitore 2 + Radio Probe 3 - Récepteur 2 + Radio Probe 3 - Empfänger 2 + Radio Probe 3 - Prijemnik 2 + Probe Radio 3 - Receptor 2 + Radio Probe 3 - Ontvanger 2 + Ραδιο-ανιχνευτής 3 - Δέκτης 2 + Радиодатчик 3 - Приемник 2 + Sonda radiowa 3 - Odbiornik 2 + Radiosond 3 - Mottagare 2 + Radio Sonde 3 - Modtager 2 + Sonda Probe 3 - Receptor 2 + Radio Probe 3 - Receptor 2 + + + + + 108 + false + + Radio Probe 4 - Reciever 2 + Radio Probe 4 - Ricevitore 2 + Radio Probe 4 - Récepteur 2 + Radio Probe 4 - Empfänger 2 + Radio Probe 4 - Prijemnik 2 + Probe Radio 4 - Receptor 2 + Radio Probe 4 - Ontvanger 2 + Ραδιο-ανιχνευτής 4 - Δέκτης 2 + Радиодатчик 4 - Приемник 2 + Sonda radiowa 4 - Odbiornik 2 + Radiosond 4 - Mottagare 2 + Radio Sonde 4 - Modtager 2 + Sonda Probe 4 - Receptor 2 + Radio Probe 4 - Receptor 2 + + + + \ No newline at end of file diff --git a/Step.Config/Config/toolManagerConfigValidator.xsd b/Step.Config/Config/toolManagerConfigValidator.xsd index 305328ba..c554b87e 100644 --- a/Step.Config/Config/toolManagerConfigValidator.xsd +++ b/Step.Config/Config/toolManagerConfigValidator.xsd @@ -123,12 +123,19 @@ - - - + + + + + + + + + + @@ -149,4 +156,19 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Step.Config/ServerConfigController.cs b/Step.Config/ServerConfigController.cs index 54ef5766..5768d74b 100644 --- a/Step.Config/ServerConfigController.cs +++ b/Step.Config/ServerConfigController.cs @@ -658,6 +658,20 @@ namespace Step.Config ), }) .ToList(); + + ToolManagerConfig.ToolTypes = xmlConfigFile + .Root + .Descendants("toolTypes") + .Elements() + .Select(x => new ToolTypeConfigModel() + { + Id = Convert.ToInt32(x.Element("id").Value), + Disabled = Convert.ToBoolean(x.Element("disabled").Value), + LocalizedNames = x.Element("localizedNames").Elements().ToDictionary( // Read localized names and convert into a dictionary + y => y.Attribute("langKey").Value, y => y.Value + ), + }) + .ToList(); } diff --git a/Step.Model/ConfigModels/ToolManagerConfigModel.cs b/Step.Model/ConfigModels/ToolManagerConfigModel.cs index 17b21ac4..88f26007 100644 --- a/Step.Model/ConfigModels/ToolManagerConfigModel.cs +++ b/Step.Model/ConfigModels/ToolManagerConfigModel.cs @@ -27,6 +27,8 @@ namespace Step.Model.ConfigModels public CooligTranslations CooligsTranslations { get; set; } public List MagazineNames { get; set; } + + public List ToolTypes { get; set; } } public class CooligTranslations diff --git a/Step.Model/ConfigModels/ToolTypeConfigModel.cs b/Step.Model/ConfigModels/ToolTypeConfigModel.cs new file mode 100644 index 00000000..268bc406 --- /dev/null +++ b/Step.Model/ConfigModels/ToolTypeConfigModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Step.Model.ConfigModels +{ + public class ToolTypeConfigModel + { + public int Id { get; set; } + + public bool Disabled { get; set; } + + public Dictionary LocalizedNames { get; set; } + } +} diff --git a/Step.Model/Step.Model.csproj b/Step.Model/Step.Model.csproj index bb361ece..6114d62a 100644 --- a/Step.Model/Step.Model.csproj +++ b/Step.Model/Step.Model.csproj @@ -75,6 +75,7 @@ + diff --git a/Step.NC/SiemensToolTableAdapter.cs b/Step.NC/SiemensToolTableAdapter.cs index 743c95e6..9576effc 100644 --- a/Step.NC/SiemensToolTableAdapter.cs +++ b/Step.NC/SiemensToolTableAdapter.cs @@ -30,6 +30,11 @@ namespace Step.NC if (!ToolManagerConfig.SelfAdaptivePathOpt) config.SelfAdaptivePathOptionActive = false; + // Update Tool types list + config.ToolsConfiguration.Where(x => x.Name == "toolTypeCode").FirstOrDefault().SelectValues = ToolManagerConfig + .ToolTypes.Where(x => !x.Disabled) + .ToDictionary(x => x.Id, x => x.Id.ToString()); + if (NcConfig.NcVendor != NC_VENDOR.SIEMENS && NcConfig.NcVendor != NC_VENDOR.DEMO) { // Setup options @@ -96,7 +101,7 @@ namespace Step.NC if (!ToolManagerConfig.ReviveOpt) categories.Add("revive"); - + // Remove category from configurations config.ToolsConfiguration = config.ToolsConfiguration.Where(x => !categories.Contains(x.Category)).ToList(); diff --git a/Step.Utils/Step.Utils.csproj b/Step.Utils/Step.Utils.csproj index 3bdaab21..a42185f5 100644 --- a/Step.Utils/Step.Utils.csproj +++ b/Step.Utils/Step.Utils.csproj @@ -88,6 +88,7 @@ + PreserveNewest @@ -97,6 +98,7 @@ PreserveNewest + PreserveNewest @@ -112,12 +114,14 @@ PreserveNewest + PreserveNewest PreserveNewest + Always diff --git a/Step/Controllers/WebApi/LanguageController.cs b/Step/Controllers/WebApi/LanguageController.cs index 28fa1be5..4246d5e3 100644 --- a/Step/Controllers/WebApi/LanguageController.cs +++ b/Step/Controllers/WebApi/LanguageController.cs @@ -54,7 +54,7 @@ namespace Step.Controllers.WebApi Dictionary alarmsNames = GetPlcAlarmsTranslations(language); Dictionary headsNames = GetLocalizedHeadsNames(language); Dictionary coolingNames = GetCoolingTranslations(language); - Dictionary magazinesNames = GetMagazineTranslations(language); + Dictionary magazinesNames = GetToolManagerTranslations(language); Dictionary scadaTranslations = GetScadaTranslations(language); @@ -226,7 +226,7 @@ namespace Step.Controllers.WebApi return dictionary; } - private static Dictionary GetMagazineTranslations(string language) + private static Dictionary GetToolManagerTranslations(string language) { Dictionary translatedNames = new Dictionary(); @@ -238,6 +238,14 @@ namespace Step.Controllers.WebApi ); } + foreach(var toolType in ToolManagerConfig.ToolTypes) + { + translatedNames.Add( + "tooling_equipment_list_select_" + toolType.Id, + GetValueFromLocalizationList(toolType.LocalizedNames, language, "Magazine_" + toolType.Id) + ); + } + return translatedNames; }