Compare commits

..

1100 Commits

Author SHA1 Message Date
Samuele E. Locatelli 96b7e4e455 Merge remote-tracking branch 'origin/Connect-UI' into develop 2020-11-11 10:07:49 +01:00
Samuele E. Locatelli cab2a84231 Fix changes 2020-11-11 10:07:05 +01:00
Samuele Locatelli 33498ba894 new rel 146 2020-11-10 20:01:33 +01:00
Samuele Locatelli 337b834869 Merge branch 'Star_Paddle' into Connect-UI 2020-11-10 19:59:23 +01:00
Samuele E. Locatelli cefb9df5bd Merge branch 'Star_Paddle' into develop 2020-11-10 18:22:31 +01:00
Samuele E. Locatelli fe3b630e56 Added Vacuum chart fixes 2020-11-10 18:21:47 +01:00
Samuele E. Locatelli aede998431 Fix Loader image 2020-11-10 17:40:22 +01:00
Samuele E. Locatelli c47efbfbfc Fix UI behaviour 2020-11-09 16:54:21 +01:00
Samuele E. Locatelli 496e38ab7d Added Backend 2020-11-09 15:05:01 +01:00
Samuele E. Locatelli ad3e3f8b9b Added Backend 2020-11-05 18:04:08 +01:00
Samuele E. Locatelli 8b44ff84af Added Type to DB Softkey 2020-11-05 12:35:21 +01:00
Samuele E. Locatelli e375f3323b Merge branch 'develop' into Star_Paddle 2020-11-05 10:33:50 +01:00
Samuele E. Locatelli 1a217424f8 Merge remote-tracking branch 'origin/Connect-UI' into develop 2020-11-05 10:32:04 +01:00
Samuele E. Locatelli 526b83d0fe Fix Thermocamera UI 2020-11-05 10:31:51 +01:00
Samuele Locatelli 7e7fb3dab7 Merge branch 'Thermocamera' into Connect-UI 2020-11-04 10:05:10 +01:00
Samuele Locatelli 7576b33e93 update conf x gestione cache warmers 2020-11-04 10:04:57 +01:00
Samuele E. Locatelli 1c13bf0bae Added OPC variables 2020-11-04 09:54:14 +01:00
Samuele Locatelli 3dd81652b5 Fix richiesta warmers SEMPRE senza cache 2020-11-04 09:23:55 +01:00
Samuele Locatelli ee21a0fe2e Merge remote-tracking branch 'origin/develop' into develop 2020-11-04 08:49:47 +01:00
Samuele Locatelli 66293fc2d2 New rel 2020-11-04 08:49:41 +01:00
Samuele E. Locatelli fcec70b367 Fix Thermocamera UI 2020-11-03 21:48:21 +01:00
Samuele E. Locatelli cb3082522c Merge remote-tracking branch 'origin/Connect-UI' into develop 2020-11-03 21:04:20 +01:00
Samuele Locatelli 94beb343eb Merge branch 'develop' into Connect-UI 2020-11-03 19:11:11 +01:00
Samuele Locatelli fa3916c2a4 Update metodi cancel/confirm x ricetta... 2020-11-03 19:10:59 +01:00
Samuele Locatelli 45505d70e1 new rel 2020-11-03 17:19:46 +01:00
Samuele E. Locatelli 0d26ddb4f6 Fix Resistance color 2020-11-03 17:06:39 +01:00
Samuele E. Locatelli 20b5d2c99c Merge remote-tracking branch 'origin/Connect-UI' into develop 2020-11-03 15:57:22 +01:00
Samuele E. Locatelli 3401ba241b Added Backup Recipes 2020-11-03 15:57:11 +01:00
Samuele Locatelli 0badc4b4a8 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-11-03 12:43:34 +01:00
Samuele Locatelli e463f0ece5 new rel 2020-11-03 12:39:38 +01:00
Samuele Locatelli 96ee5ad494 Merge remote-tracking branch 'gitlab.steamware/Thermocamera' into Connect-UI 2020-11-03 12:38:46 +01:00
Samuele E. Locatelli 94bc8a7c50 Aggiunto parametro x swapping X/Y in richieste FLIR 2020-11-03 12:35:19 +01:00
Samuele E. Locatelli f7a0291ab0 Added other fixes 2020-11-02 21:57:17 +01:00
Samuele E. Locatelli 20d76d43ec Thermocamera UI Fix 2020-11-02 21:40:56 +01:00
Samuele Locatelli c014b16ace Merge remote-tracking branch 'gitlab.steamware/Connect-UI' into develop 2020-11-02 09:41:11 +01:00
Samuele Locatelli b89bc03791 v_0.110.142 2020-11-02 09:03:50 +01:00
Samuele Locatelli 244f7132af fix serverconfig x prod 2020-11-02 09:03:14 +01:00
Samuele Locatelli c6510b928d Merge remote-tracking branch 'origin/develop' into Thermocamera 2020-11-02 08:53:00 +01:00
Samuele E. Locatelli 5bc750da90 Merge remote-tracking branch 'origin/Connect-UI' into develop 2020-10-30 19:09:49 +01:00
Samuele E. Locatelli 0f44285d8a Merge branch 'Connect-UI' into Thermocamera 2020-10-30 19:08:49 +01:00
Samuele E. Locatelli 5c20450d4c Fix configurazioni x termocamera 2020-10-30 19:08:40 +01:00
Samuele E. Locatelli d1359ac605 Fix gauges 2020-10-30 18:04:08 +01:00
Samuele E. Locatelli bd03826140 Merge remote-tracking branch 'origin/Connect-UI' into develop 2020-10-30 17:47:12 +01:00
Samuele E. Locatelli b4de394af6 Fix thermocamera 2020-10-30 17:46:45 +01:00
Samuele E. Locatelli 09ebcca66c start modifica x gestione dimensione riflettori 2020-10-30 16:55:19 +01:00
Samuele Locatelli 88aaaf78a3 Merge remote-tracking branch 'gitlab.steamware/Connect-UI' into develop 2020-10-30 16:18:44 +01:00
Samuele Locatelli 97c4e1ce97 new rel 141 2020-10-30 16:18:38 +01:00
Samuele E. Locatelli a3a2f75bde fix calcolo centro in posizione video 2020-10-30 16:00:52 +01:00
Samuele Locatelli bc784720ba ver 140 2020-10-30 14:01:46 +01:00
Samuele Locatelli 1a5145fe2f Merge remote-tracking branch 'gitlab.steamware/Connect-UI' into develop 2020-10-30 13:49:40 +01:00
Samuele Locatelli d33061aeda Merge remote-tracking branch 'origin/develop' into develop 2020-10-30 13:49:32 +01:00
Samuele E. Locatelli b16dee60ba Merge remote-tracking branch 'origin/Connect-UI' into develop 2020-10-30 12:43:28 +01:00
Samuele E. Locatelli 17156418f0 Added Screenshot 2020-10-30 12:42:40 +01:00
Samuele E. Locatelli 637e691a7b Merge remote-tracking branch 'origin/Connect-UI' into Thermocamera 2020-10-30 12:30:29 +01:00
Samuele E. Locatelli adb1d0e27c fix conv floating point 2020-10-30 12:29:57 +01:00
Samuele Locatelli be0feb3705 Merge branch 'develop' into Connect-UI 2020-10-30 12:02:32 +01:00
Samuele Locatelli a1560a8e78 update rev 2020-10-30 12:02:17 +01:00
Samuele E. Locatelli b39ea3815b Fix gestioen ,/. per float ThermoCam 2020-10-30 11:58:21 +01:00
Samuele Locatelli 6b97cd1a4d Merge branch 'Connect-UI' into Thermocamera 2020-10-30 10:25:08 +01:00
Samuele Locatelli f7e5e4da3c new rel 2020-10-30 10:24:56 +01:00
Samuele Locatelli 7149f29f98 Fix ack/strobe for ThermoCam processing 2020-10-30 10:24:42 +01:00
Samuele Locatelli a3894b3561 Merge remote-tracking branch 'origin/Thermocamera' into develop 2020-10-28 12:11:47 +01:00
Samuele Locatelli f8afb1a1b4 Update x gestione (sim) della termocam su richiesta PLC 2020-10-28 12:11:03 +01:00
Samuele E. Locatelli f76b03d957 Merge remote-tracking branch 'origin/Connect-UI' into Thermocamera 2020-10-27 17:34:15 +01:00
Samuele Locatelli 7013193a75 Merge remote-tracking branch 'origin/Thermocamera' into Thermocamera 2020-10-27 17:31:19 +01:00
Samuele Locatelli d33ecbe685 update x refresh warmers post load ricetta 2020-10-27 17:31:10 +01:00
Samuele E. Locatelli 687e2d7809 Fix Thermo-prophet 2020-10-27 17:30:16 +01:00
Samuele E. Locatelli eb8cb57ae2 fix gestione null x ricette legacy 2020-10-27 16:16:36 +01:00
Samuele E. Locatelli 0392251697 Merge remote-tracking branch 'origin/Connect-UI' into Thermocamera 2020-10-27 15:59:45 +01:00
Samuele E. Locatelli bc427cf0ef cms-connect store fix 2020-10-27 15:59:35 +01:00
Samuele Locatelli 9bab587ecd Merge branch 'Thermocamera' into Connect-UI 2020-10-27 15:53:51 +01:00
Samuele Locatelli 61b94daf28 primo giro load/save ThermoCamData 2020-10-27 15:51:32 +01:00
Samuele Locatelli 4911353eb1 reset dati ThermoCam alla rich
iesta conf Risc da PLC
2020-10-27 15:08:49 +01:00
Samuele Locatelli 6cced708fd new rel 2020-10-27 14:29:53 +01:00
Samuele Locatelli 2aaf3e06d2 FIx calcolo centroidi delle resistenze 2020-10-27 14:29:47 +01:00
Samuele Locatelli 0f5cd7cf89 Merge branch 'develop' into Connect-UI 2020-10-27 12:19:27 +01:00
Samuele Locatelli 4436eb2ab0 new rel 2020-10-27 12:19:16 +01:00
Samuele Locatelli 655407a9a8 WebAPI x status TCam 2020-10-27 12:17:40 +01:00
Samuele Locatelli 00ce6c2a04 Merge remote-tracking branch 'origin/Connect-UI' into Thermocamera 2020-10-26 19:21:59 +01:00
Samuele Locatelli beaa30a24d Update vers 133 2020-10-26 19:19:41 +01:00
Samuele Locatelli 375f5556ef Update x salvataggio valori canali warmers in ricetta 2020-10-26 19:19:32 +01:00
Samuele E. Locatelli 8c79299d2f Merge remote-tracking branch 'origin/Connect-UI' into Connect-UI 2020-10-26 17:35:55 +01:00
Samuele E. Locatelli 94cc2cc80b Fix messages bounce 2020-10-26 17:35:25 +01:00
Samuele Locatelli a3f0758380 new rel 2020-10-24 18:58:33 +02:00
Samuele Locatelli 0f30b9f8fc Fix sim scrittura ThermoCam data 2020-10-24 18:58:18 +02:00
Samuele E. Locatelli 27a741e843 Merge remote-tracking branch 'origin/Connect-UI' into Connect-UI 2020-10-24 15:44:31 +02:00
Samuele E. Locatelli 2f9d847410 fix UI Thermocamera 2020-10-24 15:43:39 +02:00
Samuele Locatelli d72c6104fd Merge branch 'Thermocamera' into Connect-UI 2020-10-24 15:25:31 +02:00
Samuele Locatelli 8422f75978 New Rel 2020-10-24 15:25:10 +02:00
Samuele Locatelli 3d5703ad79 Update WebApi x gestione chiamate Termo fino a S7Net 2020-10-24 15:24:59 +02:00
Samuele Locatelli ca80c97455 Mock metodo lettura sw termocamera x simulare 2020-10-24 14:42:00 +02:00
Samuele Locatelli 5bf06971df Merge branch 'Thermocamera' into Connect-UI 2020-10-24 14:24:53 +02:00
Samuele Locatelli 44123da2c2 fix tutte letture 2020-10-24 14:24:11 +02:00
Samuele Locatelli 6f7a2675ef fix gestione lettura thermo params 2020-10-24 14:18:41 +02:00
Samuele Locatelli fc41652d44 Aggiunta commenti a termocamera... 2020-10-24 14:03:00 +02:00
Samuele Locatelli 6c3d22278a Merge remote-tracking branch 'origin/Connect-UI' into Thermocamera 2020-10-24 12:45:19 +02:00
Samuele Locatelli d7bd17f679 new rel 2020-10-24 12:45:14 +02:00
Samuele Locatelli 30a5592196 Fix lettura warmers 2020-10-24 12:44:43 +02:00
Samuele E. Locatelli 998ca04b99 Fix functions "private/public" 2020-10-24 12:41:34 +02:00
Samuele Locatelli b466235c58 Aggiunta chiamate WebApi x termocamera 2020-10-24 12:11:19 +02:00
Samuele Locatelli 735026187d Merge branch 'Connect-UI' of https://bitbucket.org/ncarminati/cms_thermo_active into Thermocamera 2020-10-24 12:00:05 +02:00
Samuele E. Locatelli 457cef0eb6 ReadCMSCOnnectCOnfig 2020-10-24 11:51:10 +02:00
Samuele E. Locatelli 36ef955bb6 Fix UI Modals 2020-10-24 11:50:52 +02:00
Samuele Locatelli e6b2b00aa5 Update metodi lettura TCam 2020-10-24 11:40:30 +02:00
Samuele Locatelli 6c4c441d65 Merge branch 'Connect-UI' of https://bitbucket.org/ncarminati/cms_thermo_active into Thermocamera 2020-10-24 10:02:33 +02:00
Samuele Locatelli 7ca2ad059f Typo + eventi lettura inseriti come segnaposto 2020-10-24 10:02:18 +02:00
Samuele E. Locatelli bf6510c149 anycpu Client 2020-10-24 10:00:04 +02:00
Samuele Locatelli eddfe40814 Merge remote-tracking branch 'origin/Connect-UI' into develop 2020-10-24 09:10:45 +02:00
Samuele Locatelli 4ac901df06 Merge remote-tracking branch 'origin/develop' into Thermocamera 2020-10-23 19:55:41 +02:00
Samuele Locatelli fad3c82b46 Proseguo configurazione livelli di accesso dati ThermoCam + refactor 2020-10-23 19:51:07 +02:00
Samuele E. Locatelli b6bd0b734c first commit runnable 2020-10-23 18:26:12 +02:00
Samuele E. Locatelli bd9682361c Merge remote-tracking branch 'origin/develop' into develop 2020-10-23 18:25:16 +02:00
Samuele E. Locatelli 8281bf0ff5 Clean some unused images 2020-10-23 18:24:36 +02:00
Nicola eb14841bfd Fix Chromium devtools 2020-10-23 18:12:03 +02:00
Nicola f8a140cdf6 DIsable transparent on Chromium 2020-10-23 17:09:45 +02:00
Nicola 358f8c9330 Fix last commit 2020-10-23 16:34:01 +02:00
Nicola 17100d2f93 Merge remote-tracking branch 'origin/Thermocamera' into develop 2020-10-23 16:31:24 +02:00
Nicola 5eb07dfaa4 Changed Client library 2020-10-23 16:23:59 +02:00
Samuele Locatelli b7984023f9 start vers con ThermoCam 0.106.128 2020-10-23 15:08:26 +02:00
Samuele Locatelli 2344940480 Merge remote-tracking branch 'origin/Thermocamera' into develop 2020-10-23 15:06:42 +02:00
Samuele Locatelli 498bfdbf34 start modifica DTO riscaldi 2020-10-23 15:06:31 +02:00
Samuele E. Locatelli 42fc70e319 Added UI to Thermocamera 2020-10-22 18:48:47 +02:00
Samuele E. Locatelli 865a09fe89 Added first part of frontend 2020-10-22 17:19:03 +02:00
Samuele E. Locatelli 44702e769a First commit of thermocamera 2020-10-22 17:02:39 +02:00
Samuele E. Locatelli cbe5e7d303 Fix Piece count CONNECT 2020-10-22 17:00:50 +02:00
Samuele E. Locatelli 510b6c8a96 Fix CMS-Connect 2020-10-22 16:15:39 +02:00
Samuele Locatelli 0a8e49082d Fix nuget packages su DB (Netwtonsoft.Json) 2020-10-22 08:29:13 +02:00
Samuele Locatelli bf5ad49bfa Merge remote-tracking branch 'origin/develop' into develop 2020-10-22 08:21:56 +02:00
Samuele Locatelli 75bfe30d68 New rel number 2020-10-22 08:21:50 +02:00
Samuele E. Locatelli 98dbb7946a predisposizione futura 2020-10-21 11:16:10 +02:00
Samuele E. Locatelli b5a024ba0e CMSConnect Fix 2020-10-21 10:54:37 +02:00
Samuele E. Locatelli e3df06bb08 Fix COnnect startup 2020-10-20 19:03:32 +02:00
Samuele E. Locatelli 946ce23f6f Added variables 2020-10-20 17:49:27 +02:00
Samuele E. Locatelli 7fd5ee32fb Fix First commit CMS-Connect 2020-10-20 14:17:31 +02:00
Samuele Locatelli c8d50d1dc7 update vers num 2020-10-20 13:03:09 +02:00
Samuele Locatelli 215452a92f Update 4.6.2 COMPILA!!! 2020-10-20 13:01:49 +02:00
Samuele Locatelli 0ada41f47d new rel 125.. 2020-10-19 19:11:44 +02:00
Samuele Locatelli 0df05264eb Added nuget package per MConnectSDK e 4.6.2 2020-10-19 19:11:29 +02:00
Samuele Locatelli 82aa2e84b9 vers 0.102.124 2020-10-19 18:47:41 +02:00
Samuele Locatelli a794402ccb Aggiunta gestione LastTCicloNetto ( denom. % tempo cerchio) 2020-10-19 18:47:20 +02:00
Samuele Locatelli 95a7a1355e update tutti i proj alla 4.6.2 2020-10-19 18:03:09 +02:00
Samuele E. Locatelli 5bfe2bfa1f Design 2020-10-16 15:18:52 +02:00
Samuele E. Locatelli b5c32938df Fix Load program 2020-10-16 12:36:03 +02:00
Samuele Locatelli 59246cab9e Merge remote-tracking branch 'origin/develop' into develop 2020-10-16 11:39:19 +02:00
Samuele Locatelli 26d0132274 update vers number 2020-10-16 11:38:26 +02:00
Samuele E. Locatelli 74ad352393 Merge remote-tracking branch 'origin/develop' into develop 2020-10-16 11:25:28 +02:00
Samuele E. Locatelli f8ccb0492a Fix combo disabled 2020-10-16 11:23:14 +02:00
Samuele E. Locatelli 5f1ca0699a Fixes 2020-10-16 11:05:23 +02:00
Samuele E. Locatelli bd4cb3504a FIx load recipe 2020-10-15 15:47:22 +02:00
Samuele Locatelli 7c2db0170c update vers numb 2020-10-15 13:14:11 +02:00
Samuele E. Locatelli dee9084d62 fix Process-start window 2020-10-15 12:56:08 +02:00
Samuele E. Locatelli f842773efc Fix a lot of UI 2020-10-15 12:07:17 +02:00
Samuele E. Locatelli b64446e68e ancora fix serverCOnfig.xml 2020-10-14 16:18:45 +02:00
Samuele E. Locatelli 34d3414f8e fix serverconfig con IP di produzioen (messo SIM) + log WinCC 2020-10-14 16:10:41 +02:00
Samuele Locatelli e303abec94 new rel 2020-10-14 15:06:01 +02:00
Samuele E. Locatelli d643f693d7 Merge remote-tracking branch 'origin/develop' into develop 2020-10-14 14:59:54 +02:00
Samuele E. Locatelli 75fe84861a Fix Dashboard 2020-10-14 14:59:30 +02:00
Samuele Locatelli fdaf80247f typo static x boolean 2020-10-14 12:24:43 +02:00
Samuele Locatelli 83393d4aa1 Merge remote-tracking branch 'origin/develop' into develop 2020-10-14 12:23:30 +02:00
Samuele Locatelli 8cfa418a75 vers 119: semaforo x sync update DB dei dati prod 2020-10-14 12:22:50 +02:00
Samuele E. Locatelli 3ed6d88523 Merge remote-tracking branch 'origin/develop' into develop 2020-10-14 10:58:06 +02:00
Samuele E. Locatelli 8822d1e9d2 Fix Config 2020-10-14 10:57:40 +02:00
Samuele Locatelli f1f00e3326 vers 118: dati prod panel SOLO SE ho fatto 1 pezzo 2020-10-14 10:34:43 +02:00
Samuele E. Locatelli 42a6eaa77f fix calcolo inizio lotto da tciclo (/1000) 2020-10-14 09:31:04 +02:00
Samuele Locatelli 06ef9d377d Merge remote-tracking branch 'origin/develop' into develop 2020-10-14 09:04:11 +02:00
Samuele Locatelli 5b9f771d06 vers 117 2020-10-14 09:03:26 +02:00
Samuele Locatelli 49de435bab cambio gestione epsilon per valori gauges (x10) 2020-10-14 09:03:04 +02:00
Samuele Locatelli e8c55ada85 update gestione data inizio a null fino a primo pezzo (+ fix tcGross) 2020-10-14 08:51:24 +02:00
Samuele E. Locatelli c2cd9adef8 Fix Dashboards UI 2020-10-13 18:10:57 +02:00
Samuele E. Locatelli df0c74540f check modifica num riscaldi + cambio ordine check x save prod 2020-10-13 16:27:05 +02:00
Samuele Locatelli 5d3d1f45f8 new rel 116 2020-10-13 16:10:37 +02:00
Samuele Locatelli 57e96b9eb9 update x refresh prodPanel 2020-10-13 16:10:27 +02:00
Samuele Locatelli 795af144c1 Merge remote-tracking branch 'origin/develop' into develop 2020-10-13 14:45:06 +02:00
Samuele Locatelli 075a7e2e8d new rel 115 2020-10-13 14:45:00 +02:00
Samuele Locatelli 523300e5e1 refresh periodo lettura 2020-10-13 14:43:55 +02:00
Samuele E. Locatelli 0e9d0acfcb Fix Warmers behaviour 2020-10-13 11:14:12 +02:00
Samuele E. Locatelli c7c8564aff Merge remote-tracking branch 'origin/develop' into develop 2020-10-13 10:03:08 +02:00
Samuele E. Locatelli cadf52012c Fix keyboard behaviour 2020-10-13 10:01:35 +02:00
Samuele Locatelli d3d49c6bf9 Merge remote-tracking branch 'origin/develop' into develop 2020-10-12 11:53:54 +02:00
Samuele Locatelli 32409742e8 new rel 2020-10-12 11:53:44 +02:00
Samuele E. Locatelli 3c329bb5c8 Fix loader 2020-10-12 11:49:26 +02:00
Samuele E. Locatelli 542769af1c Fix Translations 2020-10-12 11:25:52 +02:00
Samuele E. Locatelli 66564fde66 Fix UI Caricatore 2020-10-12 11:13:17 +02:00
Samuele E. Locatelli f3e10a223b Fix Translations 2020-10-10 16:58:19 +02:00
Samuele E. Locatelli edd1e7cf47 Fix loader Behaviour (SVG in progress) 2020-10-10 16:46:30 +02:00
Samuele E. Locatelli 19a57d4ba7 FIx Pirometro behaviour 2020-10-10 15:17:19 +02:00
Samuele E. Locatelli a35b7485fb Fix riscaldi behaviour 2020-10-10 12:53:40 +02:00
Samuele E. Locatelli 3a991b7d5e Fix Auto behaviour 2020-10-09 17:37:25 +02:00
Samuele E. Locatelli 47f2b80abd Fix preriscaldi UI 2020-10-09 15:49:38 +02:00
Samuele Locatelli 339f590010 Merge remote-tracking branch 'origin/develop' into develop 2020-10-09 15:31:40 +02:00
Samuele Locatelli 894c732c61 fix lettura preriscaldi 2020-10-09 15:30:23 +02:00
Samuele E. Locatelli 60e144968f FIx Barriers Image 2020-10-09 15:23:36 +02:00
Samuele Locatelli 685db9d4da Merge remote-tracking branch 'origin/develop' into develop 2020-10-09 12:54:02 +02:00
Samuele E. Locatelli 6d52d14f58 Fix UI Dashboard 2020-10-09 12:52:51 +02:00
Samuele Locatelli 8f48a05914 Fix x forzare rilettura TUTTO da WebAPI 2020-10-09 12:52:43 +02:00
Samuele E. Locatelli acb12da71a Fix Pirometro View 2020-10-09 11:21:17 +02:00
Samuele E. Locatelli 07d23bd055 Fix slider behaviour 2020-10-09 10:40:16 +02:00
Samuele Locatelli 4b5f406849 new rel number 2020-10-08 19:08:48 +02:00
Samuele Locatelli 491321a509 Merge remote-tracking branch 'origin/develop' into develop 2020-10-08 19:08:28 +02:00
Samuele E. Locatelli 0d6b42c356 Added loader on setup pages 2020-10-08 19:06:01 +02:00
Samuele E. Locatelli 592984bd22 Fix UI components 2020-10-08 18:09:46 +02:00
Samuele E. Locatelli ccb3054ec7 Merge remote-tracking branch 'origin/develop' into develop 2020-10-08 18:04:01 +02:00
= 79b1fc2f24 fix update recipe 2020-10-08 15:28:34 +02:00
Samuele Locatelli 6ffd356eba fix richieste hist impossibili (start<0) 2020-10-07 13:03:27 +02:00
Samuele Locatelli a4f6ffcc28 update vers numb 2020-10-05 15:51:48 +02:00
Samuele Locatelli 704049c7a7 Merge remote-tracking branch 'origin/develop' into develop 2020-10-05 15:51:17 +02:00
= 91ac201873 Merge remote-tracking branch 'CMS/develop' into develop 2020-10-05 15:49:40 +02:00
= 56ee15521d fix numero negativo in progresso 2020-10-05 15:49:36 +02:00
Samuele Locatelli 5180881114 refresh conf x prod 2020-10-05 15:40:04 +02:00
Samuele E. Locatelli 6144554b4e Merge remote-tracking branch 'origin/develop' into develop 2020-10-05 15:12:52 +02:00
Samuele E. Locatelli e4ed4b6b0f update xml softkeys 2020-10-05 15:12:42 +02:00
Samuele Locatelli 8769127f91 set vers 0.99 2020-10-05 15:10:36 +02:00
Samuele Locatelli f0ee892ce5 typo 2020-10-05 15:08:32 +02:00
Samuele Locatelli 23bcf80ba7 Merge remote-tracking branch 'origin/develop' into develop 2020-10-05 15:05:51 +02:00
Samuele Locatelli cb16049c72 typo, start vers 1 2020-10-05 15:05:40 +02:00
= 6c834482a4 fix gauge & dashboard 2020-10-05 15:02:34 +02:00
= 51e682c166 fix setpointhmi invalid 2020-10-05 14:45:43 +02:00
= 0ec2d5e931 disgno formato 2020-10-05 14:36:07 +02:00
= 4e431a7be7 dashboard e statistiche 2020-10-05 11:43:37 +02:00
= e60b47560e fix naming dei files e dashboard con cestino 2020-10-05 11:10:58 +02:00
= 3c05f497ef Merge remote-tracking branch 'CMS/develop' into develop 2020-10-03 18:36:29 +02:00
= ab9f65391e dashboar grafico e legenda 2020-10-03 18:32:57 +02:00
= d207f82cc1 dashboard legend 2020-10-03 18:08:55 +02:00
Samuele E. Locatelli fd98b2fabb Merge remote-tracking branch 'origin/develop' into develop 2020-10-03 16:26:23 +02:00
Samuele E. Locatelli dfc2eca2c2 UI preheating complete 2020-10-03 16:25:46 +02:00
Samuele Locatelli f7cc7c202b vers 106: senza schedTask --> disabled 7gg 2020-10-03 15:01:37 +02:00
Samuele Locatelli 164ffffc95 Merge remote-tracking branch 'origin/develop' into develop 2020-10-03 14:55:46 +02:00
Samuele Locatelli 6ca90f00bd Implementata gestione load/save SchedTask su file in area TMP 2020-10-03 14:55:38 +02:00
Samuele E. Locatelli bb24cdd2cc Merge remote-tracking branch 'origin/develop' into develop 2020-10-03 14:45:38 +02:00
Samuele E. Locatelli 4fcc0a52fb FIx Preriscaldi UI WIP 2020-10-03 14:42:56 +02:00
Samuele Locatelli 9f1e9a9b6a Completato metodi x mockup lettura SchedTask 2020-10-03 13:16:40 +02:00
Samuele Locatelli c881dae49b bozza gestioen SchedTask 2020-10-03 13:07:19 +02:00
Samuele Locatelli 4aa4fbb40d Add model x sched task 2020-10-03 12:42:08 +02:00
Samuele Locatelli 7ad55f3f9d new rel 2020-10-03 12:00:39 +02:00
Samuele Locatelli 0f63c012c8 Merge remote-tracking branch 'origin/develop' into develop 2020-10-03 12:00:16 +02:00
Samuele Locatelli eefb9e751f Completamento gestione thread setpointHMI invalidati 2020-10-03 12:00:11 +02:00
Samuele Locatelli bf27fb3ce1 COmpletata bozza gestione setpointHmi invalidato 2020-10-03 11:48:37 +02:00
Samuele Locatelli 6e5b5cbd00 NEW command parameters from PLC 2020-10-03 10:50:12 +02:00
= 41830e6b9d fix update recipe 2020-10-03 07:49:50 +02:00
Samuele Locatelli 60a78f434f update vers numb 2020-10-02 12:12:04 +02:00
Samuele Locatelli 3ad4905de3 Merge remote-tracking branch 'origin/develop' into develop 2020-10-02 09:36:16 +02:00
Samuele Locatelli 840491fcb3 Merge remote-tracking branch 'origin/develop' into develop 2020-10-02 09:30:34 +02:00
Samuele Locatelli 50a1d2708c refresh vue from build 2020-10-02 09:30:23 +02:00
Samuele Locatelli 7ca411b9a1 Fix condition for ProdInfoUpdate calc 2020-10-02 09:30:15 +02:00
Samuele E. Locatelli ebf1bcd62e fix translations 2020-10-02 09:29:37 +02:00
Samuele E. Locatelli 6f4128ce2f Merge remote-tracking branch 'origin/develop' into develop 2020-10-02 09:05:11 +02:00
Samuele E. Locatelli c959946e1d Fix SSL connections 2020-10-02 09:04:24 +02:00
Samuele Locatelli 7d6e934b2a Merge remote-tracking branch 'origin/develop' into develop 2020-10-02 08:20:07 +02:00
Samuele E. Locatelli 12b5525fb5 Fix translations 2020-10-01 17:57:15 +02:00
= cc90b8422a Merge remote-tracking branch 'CMS/develop' into develop 2020-10-01 16:58:39 +02:00
= fc5a5f9c9c fix labels reactivity 2020-10-01 16:57:58 +02:00
Samuele E. Locatelli e2089e6d5a Merge remote-tracking branch 'origin/develop' into develop 2020-10-01 16:54:56 +02:00
Samuele E. Locatelli 494627ddfc translations 2020-10-01 16:53:43 +02:00
= 86cef70db6 fix chiamate multiple dashboard e formato remaining time 2020-10-01 16:29:46 +02:00
Samuele E. Locatelli 3ef99c0e0b Fix labels 2020-10-01 16:12:13 +02:00
Samuele E. Locatelli 269e8873aa setup correctly languages 2020-10-01 15:29:32 +02:00
= d58aae4e61 fix conferma ricetta 2020-10-01 11:00:19 +02:00
= 9e4188bf90 fix tempo rimanente 2020-10-01 10:54:36 +02:00
= 21a3c1fc1c fix tempo rimanente 2020-10-01 10:27:38 +02:00
= 095a98daf1 vuex version 2020-10-01 10:11:19 +02:00
= daf0c77f04 fix gantt footer font size 2020-10-01 09:55:48 +02:00
= 682f84b1d7 fix rendering valuation bottleneck 2020-10-01 09:49:12 +02:00
Samuele Locatelli ee846a4998 fix condizioni update invio 2020-09-30 21:49:36 +02:00
Samuele Locatelli 94da9f2aad start rel 103 2020-09-30 21:19:15 +02:00
Samuele E. Locatelli 02ba937d02 Fix styles 2020-09-30 12:39:36 +02:00
Samuele E. Locatelli 515c4d14b9 commit altra modifica Nicola... 2020-09-29 17:40:47 +02:00
Samuele E. Locatelli f0985fa0d6 Merge remote-tracking branch 'origin/develop' into develop 2020-09-29 16:48:04 +02:00
Samuele E. Locatelli 001877453a Fix Folder managing 2020-09-29 16:47:28 +02:00
Samuele Locatelli 39acc17b98 Update modello x fornire cicli pre-riscaldo 2020-09-29 16:07:32 +02:00
Samuele Locatelli 130cbceaed Fix calcolo tempo stimato 2020-09-29 15:25:13 +02:00
Samuele Locatelli 657072ee90 Aggiunta metodi retrieve asc/desc 2020-09-29 15:25:00 +02:00
Samuele Locatelli e53443ffe3 Merge remote-tracking branch 'origin/develop' into develop 2020-09-29 12:37:29 +02:00
Samuele Locatelli bd8577b32e Fix calcolo fine stimata (sec --> minuti) 2020-09-29 12:37:23 +02:00
Samuele Locatelli 14d91f173b start rel 102 2020-09-29 12:37:10 +02:00
Samuele E. Locatelli 045e0b62d8 Folder editor WIP 2020-09-29 10:53:23 +02:00
Samuele E. Locatelli af8820ba4e Fix Buttons style 2020-09-29 10:27:36 +02:00
Samuele E. Locatelli 5e2b482098 added activated status on setup-buttons 2020-09-29 10:10:42 +02:00
Samuele Locatelli 2d4c585a49 Merge remote-tracking branch 'origin/develop' into develop 2020-09-28 19:14:12 +02:00
Samuele Locatelli 5491ea4abd fix calcoli stima durata e tempi ciclo x casi riscaldo ed in generale... 2020-09-28 19:13:54 +02:00
Samuele Locatelli 6e95f35295 start new rel 2020-09-28 19:13:15 +02:00
Samuele E. Locatelli 5acf57c494 Merge remote-tracking branch 'origin/develop' into develop 2020-09-28 17:28:21 +02:00
Samuele E. Locatelli 06f15d5533 fix load-program WIP 2020-09-28 17:27:22 +02:00
= 456eb99262 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-28 16:39:31 +02:00
= 5e5b5b02d4 fix dashboard 2020-09-28 16:38:54 +02:00
Samuele E. Locatelli 472ed086eb Merge remote-tracking branch 'origin/develop' into develop 2020-09-28 16:23:58 +02:00
Samuele E. Locatelli ead744cb07 fix crystallisation box 2020-09-28 16:23:12 +02:00
= 496d64d53a Merge remote-tracking branch 'CMS/develop' into develop 2020-09-28 16:21:36 +02:00
= 82583c8387 svuoto lista done 2020-09-28 16:21:23 +02:00
Samuele E. Locatelli 2039417194 fix options-cycle 2020-09-28 16:16:31 +02:00
= 3a9c801eec pulizia ciclo... 2020-09-28 16:09:51 +02:00
= 96d7a571ac barbatrucco per la gestione della keyboard senza refresh 2020-09-28 16:01:11 +02:00
= 31ae8a93b5 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-28 15:05:24 +02:00
= 93e48d5fd8 fix modal 2020-09-28 15:05:11 +02:00
Samuele E. Locatelli 72bcdeb301 Fix first page to Process 2020-09-28 15:00:30 +02:00
= 958b97814a Merge remote-tracking branch 'CMS/develop' into develop 2020-09-28 14:36:33 +02:00
= 63e7629a72 fix pan zoom 2020-09-28 14:36:23 +02:00
Samuele Locatelli c0c97cc0c7 Merge remote-tracking branch 'origin/develop' into develop 2020-09-28 13:09:00 +02:00
Samuele Locatelli fc9a727118 typo + DB (insert or update) solo con BIT 2020-09-28 13:08:50 +02:00
= 7d57c489d1 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-28 12:52:34 +02:00
= 4bcf940134 hub setpoint hmi 2020-09-28 12:51:28 +02:00
Samuele Locatelli c7052ac390 Salvataggio spostamento ordine load recipe 2020-09-28 11:21:37 +02:00
Samuele Locatelli 7497f01e7a FIx ordine scrittura conferma HMI e mod recipe UI 2020-09-28 10:52:47 +02:00
Samuele Locatelli 024f5369e8 typo 2020-09-28 10:52:27 +02:00
Samuele Locatelli a990dcf712 inizio vers 0.20.100 2020-09-28 10:51:50 +02:00
= a382a313e2 fix zoom 2020-09-28 10:24:29 +02:00
= 39f5be6d9c fix delay disegno riscaldi 2020-09-28 10:11:01 +02:00
Samuele E. Locatelli cead2275eb Merge remote-tracking branch 'origin/develop' into develop 2020-09-28 09:20:07 +02:00
Samuele E. Locatelli e808411cb2 Merge branch 'featue/Axes' into develop 2020-09-28 09:18:13 +02:00
= da8744de56 fix dashboard time layut 2020-09-28 09:18:12 +02:00
Samuele E. Locatelli 0ea0fbd8d4 fix client problems and slider behaviour 2020-09-28 09:16:54 +02:00
= 4d31463688 tempo trascorso + production hub 2020-09-28 09:16:06 +02:00
Samuele Locatelli 7086c0a83f Merge remote-tracking branch 'origin/develop' into featue/Axes 2020-09-25 11:47:17 +02:00
Samuele Locatelli c5bda8d774 revisione gest sample periods configurabili da XML 2020-09-25 11:46:55 +02:00
Samuele Locatelli c0bc78cb5e update conf dei periodi sample/sleep 2020-09-25 11:46:28 +02:00
Samuele Locatelli 5504019044 new rel 2020-09-25 11:46:16 +02:00
Samuele Locatelli 08d48f6044 modifica calcoli equality x uso epsilon a 0.1 2020-09-25 11:46:10 +02:00
Samuele Locatelli a554e42f06 Gestione lettura conf periodi sampling + setup x cicli principali del periodo di sampling 2020-09-25 09:49:00 +02:00
Samuele Locatelli b4fe6f0c05 Modifica conf server x gestione sampling interval 2020-09-25 09:48:41 +02:00
= 5f117de287 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-25 09:19:35 +02:00
= 89e0e90166 fix hub logging 2020-09-25 09:19:10 +02:00
Samuele E. Locatelli 7a6d6aad56 update DTO model x ridurre variazione a epsilon * 100 2020-09-24 19:34:34 +02:00
Samuele E. Locatelli c85ed17448 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-09-24 18:00:17 +02:00
Samuele E. Locatelli a74d2abb19 fix slider behaviour 2020-09-24 17:59:15 +02:00
= 91fafd459b fix riscaldi resize 2020-09-24 17:51:32 +02:00
= 5fead0145c Merge remote-tracking branch 'CMS/develop' into develop 2020-09-24 17:35:13 +02:00
= 8f97eeecfd autocompose a 0 fix 2020-09-24 17:35:02 +02:00
Samuele E. Locatelli 1cadbfd640 Merge remote-tracking branch 'origin/develop' into develop 2020-09-24 17:24:02 +02:00
NICOLA CARMINATI c6ee7a74b0 Fix riscaldi & softkey 2020-09-24 17:23:04 +02:00
Samuele E. Locatelli 98f64f57e5 Merge branch 'featue/Axes' into develop 2020-09-24 17:21:33 +02:00
Samuele E. Locatelli 287e5d1ab8 Fix client 2020-09-24 17:06:44 +02:00
Samuele E. Locatelli 88e1c64c3b FIx "salva con nome" 2020-09-24 17:06:19 +02:00
Samuele Locatelli ad3a91ad1c new rel 98 2020-09-24 11:03:17 +02:00
= fb9f1c4b72 fix assi 2020-09-24 10:47:14 +02:00
= b8e3cd7ef0 axis 2020-09-24 10:35:17 +02:00
= 074df56d4d Merge remote-tracking branch 'CMS/develop' into develop 2020-09-24 09:03:20 +02:00
= f4d226fc2b fix gaude info 2020-09-24 09:03:07 +02:00
Samuele E. Locatelli 790652a8c8 Merge remote-tracking branch 'origin/develop' into featue/Axes 2020-09-24 08:49:35 +02:00
Samuele E. Locatelli 816d49a08c pulizia doppia gestione eccezione 2020-09-24 08:49:17 +02:00
Samuele Locatelli bc7116cf5d Merge remote-tracking branch 'origin/develop' into featue/Axes 2020-09-24 08:47:49 +02:00
Samuele Locatelli 617bb783d2 fix invio gauges (eliminato commento) 2020-09-24 08:47:38 +02:00
= 26f225fabc Merge remote-tracking branch 'CMS/develop' into develop 2020-09-24 08:30:44 +02:00
Samuele Locatelli ac1c8f7067 Merge branch 'featue/Axes' into develop 2020-09-23 23:25:01 +02:00
Samuele Locatelli 7238579305 update vers numb 2020-09-23 23:24:47 +02:00
Samuele Locatelli f13cadd145 Fix errata duplicazione invio dati assi, fix anche x GAUGES e dati ricetta 2020-09-23 23:24:19 +02:00
Samuele Locatelli 216980b923 @Paolo: hub.ts: track info assi (log su console) 2020-09-23 23:24:01 +02:00
Samuele Locatelli 149205e998 Merge branch 'featue/Axes' into develop 2020-09-23 20:03:36 +02:00
Samuele Locatelli ffd24f2539 COmpletata gestione dll core assi thermo 2020-09-23 20:03:11 +02:00
Samuele Locatelli 147b84ab19 NC config per lettura assi (per ora 0 da core_library) 2020-09-23 19:04:16 +02:00
Samuele Locatelli ec9e23071f pulizia commenti + conf lettura ogni 200ms 2020-09-23 18:15:21 +02:00
Samuele Locatelli 85aebf6385 Start rel 95 con VERA lettura assi 2020-09-23 18:12:57 +02:00
Samuele Locatelli 17eabc16da Merge remote-tracking branch 'origin/develop' into develop 2020-09-23 18:06:18 +02:00
Samuele Locatelli 1faba838a7 Pacchetto modifiche x nuovo DTO info assi 2020-09-23 18:06:06 +02:00
Samuele Locatelli 12378bdac7 start new rel 94 2020-09-23 18:05:49 +02:00
= 611fcb940d fix layout 2020-09-23 17:51:36 +02:00
= ab345f7f99 folder create 2020-09-23 17:49:03 +02:00
= e22a34a34e folder & file management 2020-09-23 17:15:18 +02:00
= 1cb0605d41 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-23 16:18:57 +02:00
= 1b8e84dd30 layout 2020-09-23 16:18:48 +02:00
= 9d8a3cd1ea layout assi 2020-09-23 16:15:56 +02:00
Samuele Locatelli ed9f33e5e8 Merge remote-tracking branch 'origin/develop' into develop 2020-09-23 08:37:04 +02:00
Samuele Locatelli fa04f490dc new rel 2020-09-23 08:36:57 +02:00
= 4e625e71c5 fix cicli.. 2020-09-23 08:31:23 +02:00
Samuele E. Locatelli fa9bed3196 fix gestione "*" modificato in caso di annulla causa "rimbalzo reset" 2020-09-22 15:05:30 +02:00
Samuele E. Locatelli 8b645e01d1 Merge remote-tracking branch 'origin/develop' into develop 2020-09-22 14:12:23 +02:00
Samuele Locatelli a8fdd44497 vers 92 2020-09-22 14:09:55 +02:00
Samuele Locatelli f5d1aa04f1 Merge remote-tracking branch 'origin/develop' into featue/Axes 2020-09-22 14:09:37 +02:00
Samuele E. Locatelli c4468e62d8 added Utilities and Users manager 2020-09-22 14:01:58 +02:00
= bf4487909c event gantt 2020-09-22 12:50:36 +02:00
Samuele Locatelli 6dc778bbf3 ricompilazione x refresh vue 2020-09-22 11:59:27 +02:00
Samuele Locatelli 0fc43251bc Merge branch 'develop' into featue/Axes 2020-09-22 11:17:00 +02:00
Samuele Locatelli 188ce800e8 FIx gestione starred "sovrascritta" in canceledit 2020-09-22 11:16:47 +02:00
Samuele Locatelli a7db8bd047 Fix gestione nome ricetta in LOAD 2020-09-22 10:28:27 +02:00
Samuele Locatelli a6ee88e4e7 start new rel 0.16.60 2020-09-22 10:09:36 +02:00
Samuele Locatelli 75d881edf6 Merge remote-tracking branch 'origin/develop' into develop 2020-09-22 10:09:11 +02:00
Samuele Locatelli 5f95125ae2 Fix x localhost test 2020-09-22 10:09:01 +02:00
Samuele Locatelli 354bf0df6d COrrezione conf assi come da call con F.Bolis 2020-09-22 10:08:10 +02:00
= ff6a7a1962 fix gantt posizioning on zoomout 2020-09-22 09:35:06 +02:00
= d079e187e1 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-22 09:24:52 +02:00
= e21c13e7c8 asterisco 2020-09-22 09:24:25 +02:00
Samuele Locatelli 3c3ca13af3 Merge branch 'develop' into featue/Axes 2020-09-21 18:23:56 +02:00
Samuele Locatelli 2de6e9aae2 ver 89 2020-09-21 18:23:50 +02:00
Samuele E. Locatelli 87f55952f8 invio immediato cambio nome ricetta 2020-09-21 18:22:04 +02:00
Samuele E. Locatelli 843aa43240 Merge remote-tracking branch 'origin/develop' into develop 2020-09-21 17:58:46 +02:00
= 65c7379111 fix changed data 2020-09-21 17:55:11 +02:00
Samuele E. Locatelli c46f7a531a fix invio immediato nome ricetta sul salva con nome & co... 2020-09-21 17:50:28 +02:00
Samuele E. Locatelli 87494489f6 Merge remote-tracking branch 'origin/develop' into develop 2020-09-21 17:21:22 +02:00
Samuele E. Locatelli ca45edab94 Saltata verifica "in fiducia" nel debug degli errori SE visibili 2020-09-21 17:18:12 +02:00
Samuele Locatelli ca318a255e Merge remote-tracking branch 'origin/develop' into develop 2020-09-21 17:17:30 +02:00
Samuele E. Locatelli 3aae8b0f9b added "duplicate recipe" and changed warmers color 2020-09-21 17:08:01 +02:00
= 5951ab295c fix save as image 2020-09-21 09:02:02 +02:00
Samuele Locatelli 2ec4598482 Merge remote-tracking branch 'origin/develop' into develop 2020-09-21 07:44:17 +02:00
Samuele Locatelli 6730de1833 COmmentata aprte assi non testata 2020-09-21 07:43:57 +02:00
Samuele E. Locatelli 9c5644c52b Merge remote-tracking branch 'origin/develop' into develop 2020-09-21 07:21:54 +02:00
Samuele E. Locatelli 1753027afd fixes on Recipe 2020-09-20 16:18:26 +02:00
Samuele Locatelli a2c5d327db inizio aggiunta gestione info assi 2020-09-20 12:54:08 +02:00
Samuele Locatelli 04d94b572c Ok signal-r x NOMI ASSI e tipo (da conf) 2020-09-20 12:14:17 +02:00
Samuele Locatelli 134981c2d7 Aggiunta metodi preliminari gestione dati ASSI 2020-09-20 11:54:38 +02:00
Samuele Locatelli 5da1afa0eb Prosegue gestione dati assi (da conf con XML) 2020-09-20 11:54:23 +02:00
Samuele Locatelli e42a231989 Aggiunta xsd x conf assi + update conf assi 2020-09-20 11:53:46 +02:00
Samuele Locatelli e509c83b90 start new rel 88 2020-09-20 10:19:55 +02:00
Samuele Locatelli 79f28bc415 Update datamodel in OUT 2020-09-20 10:19:22 +02:00
Samuele Locatelli 2c94761966 Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 18:22:23 +02:00
Samuele Locatelli 44c6e48398 new rel 2020-09-18 18:11:52 +02:00
Samuele Locatelli 6c1aa037d5 Invio starred modifica ricetta con signal-r 2020-09-18 18:11:35 +02:00
= 3a8f702a87 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-18 17:17:35 +02:00
= b21592609b modal save confirm 2020-09-18 17:17:23 +02:00
Samuele Locatelli 5a4e86f861 Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 16:57:52 +02:00
Samuele E. Locatelli 0e41eb6033 fix apth x browser locale JS 2020-09-18 16:57:13 +02:00
Samuele E. Locatelli 11100544c9 aggiunta zip demo recipes 2020-09-18 16:57:00 +02:00
Samuele Locatelli 42069a2cb2 Update config parametri opzionali 2020-09-18 16:46:24 +02:00
Samuele Locatelli 5c1777a4b6 Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 11:02:51 +02:00
Samuele Locatelli de81cde6ec new rel 86 2020-09-18 11:02:37 +02:00
= 7c47415d65 fix autocomplete con valori stringa.. 2020-09-18 10:25:13 +02:00
= dcceb55652 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-18 09:43:40 +02:00
= 247bf212ae Merge remote-tracking branch 'CMS/develop' into develop 2020-09-18 09:43:32 +02:00
= f5b2745a87 warmers.. 2020-09-18 09:41:19 +02:00
Samuele Locatelli 6f46e5a9a5 Merge branch 'develop' into new/M156 2020-09-18 09:39:23 +02:00
Samuele Locatelli 1c0f161640 update config controller x gestione unità di misura 2020-09-18 09:36:02 +02:00
Samuele Locatelli 7a66c3d63d aggiunta unità di misura in serverConfig 2020-09-18 09:35:34 +02:00
= 23af55e1e1 riscaldi 2020-09-17 17:23:43 +02:00
Samuele Locatelli 8e3f3ec5e0 new rel 2020-09-17 13:00:59 +02:00
Samuele Locatelli cf96c67a3c Merge remote-tracking branch 'origin/develop' into develop 2020-09-17 12:55:35 +02:00
Samuele Locatelli ae8f931372 Gestione lettura ed export config parametri lastra 2020-09-17 12:55:10 +02:00
Samuele Locatelli 20d9bf716d Aggiunta XML x conf parametri lastra 2020-09-17 12:54:58 +02:00
Samuele E. Locatelli 2f6f308f19 Merge remote-tracking branch 'origin/develop' into develop 2020-09-17 12:43:59 +02:00
= 7fd2b6ca30 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-17 12:07:29 +02:00
= aff9643216 riscaldi inferiori autocomposizione 2020-09-17 12:05:17 +02:00
= 465b09c176 riscaldi autocomposizione 2020-09-17 12:02:18 +02:00
Samuele E. Locatelli 1efde033b2 Update input x nuovo tipo finirestra popup 2020-09-17 11:52:15 +02:00
NICOLA CARMINATI 4a609bc35b Other behaviour fixes 2020-09-17 11:46:27 +02:00
NICOLA CARMINATI 88aa48a3d8 Fix M156 and modal Behaviour 2020-09-17 11:40:02 +02:00
Samuele E. Locatelli b280dca20f Merge remote-tracking branch 'origin/develop' into develop 2020-09-17 10:13:36 +02:00
Samuele E. Locatelli a6d6041b06 aggiunta finestra 2 2020-09-17 10:13:05 +02:00
Samuele E. Locatelli 46b7b02da9 fix check inp button null 2020-09-17 10:01:20 +02:00
= 98d3798824 fix toggle on error color 2020-09-16 16:00:26 +02:00
= dd7e9b9e19 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-16 15:47:23 +02:00
= 550b448dc2 disegno piastra... mancano le dimensioni dei riscaldi 2020-09-16 15:46:42 +02:00
= afaa8f3576 fix numeric unit of measure 2020-09-16 15:46:14 +02:00
NICOLA CARMINATI 328d2ed176 Fix M155 merge 2020-09-16 12:56:32 +02:00
NICOLA CARMINATI 9bd1faf083 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop
# Conflicts:
#	Thermo.Active/wwwroot/src/app_modules/machine/components/m155-dialog.ts
#	Thermo.Active/wwwroot/src/app_modules/machine/components/m155-dialog.vue
2020-09-16 10:49:08 +02:00
NICOLA CARMINATI 6526a20d5c Fix m155 2020-09-16 10:47:21 +02:00
NICOLA CARMINATI 9f4adce366 Added M155 2020-09-16 10:46:24 +02:00
= 7d29511fdb click fuori da combo e paddle 2020-09-16 10:30:56 +02:00
= e28b736ebf fix keyboard 2020-09-16 09:54:23 +02:00
= 383b5417d4 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-15 14:24:24 +02:00
= 3f9b2a8c8e modali m155 m156 2020-09-15 14:24:07 +02:00
Samuele Locatelli 382d961761 Merge remote-tracking branch 'origin/develop' into develop 2020-09-15 13:04:28 +02:00
Samuele Locatelli ae3294ca46 new rel 82 2020-09-15 13:04:18 +02:00
NICOLA CARMINATI 1f75da9bef Fix Buttons UI 2020-09-15 12:38:08 +02:00
NICOLA CARMINATI ed8400619c Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-09-15 12:24:47 +02:00
NICOLA CARMINATI 67fcba0053 Added icons to the footer buttons 2020-09-15 12:23:47 +02:00
= a7548a6e78 cursore ciclo 2020-09-15 11:34:45 +02:00
= 90fe35fc1c Merge remote-tracking branch 'CMS/develop' into develop 2020-09-15 11:16:12 +02:00
= 4737d22a2f fix gantt to setup 2020-09-15 11:16:01 +02:00
Samuele Locatelli 7a9dca8807 Merge remote-tracking branch 'origin/develop' into develop 2020-09-15 09:23:04 +02:00
Samuele Locatelli 2dfc9e293f new rel 2020-09-15 09:22:50 +02:00
Samuele Locatelli 3cca07422c Unità di misura: messa in DTO da NCAdapter (era commentata) 2020-09-15 09:22:32 +02:00
NICOLA CARMINATI af4870d99d Gestione +/- e setvalue Riscaldi 2020-09-14 18:26:16 +02:00
Samuele Locatelli 7b6ee330bb abbassato sample period x produzione (500 --> 250ms) 2020-09-14 13:26:51 +02:00
Samuele Locatelli 8542b6c565 Merge branch 'develop' into new/dirSaveMgt 2020-09-12 17:25:04 +02:00
Samuele Locatelli 3c65bced53 fix letter case per xsd 2020-09-12 17:24:52 +02:00
Samuele Locatelli 95d29cc716 Aggunta files di config XML/XSD 2020-09-12 17:19:55 +02:00
Samuele Locatelli bcde0c8d86 Completato inserimento metodi x M156 2020-09-12 17:09:11 +02:00
Samuele Locatelli 76deabb93b Aggiunta preliminare metodi x gestione M156 2020-09-12 16:41:29 +02:00
Samuele Locatelli bfc99fc826 Merge branch 'develop' into new/dirSaveMgt 2020-09-10 17:26:53 +02:00
Samuele Locatelli cb28589f79 Gestione calcolo modifica parametri ricette + fix livedata save (tested) 2020-09-10 17:26:37 +02:00
Samuele Locatelli 8cae6edff2 start new rel 2020-09-10 15:33:45 +02:00
Samuele Locatelli 34a71b5784 Merge branch 'develop' into new/dirSaveMgt 2020-09-10 13:15:53 +02:00
Samuele Locatelli 455ddd660c new rel x SIM 2020-09-10 13:15:42 +02:00
Samuele Locatelli bbada3a929 update x fix calcolo tempo ciclo, calcolo durata, inizio lotto... 2020-09-10 13:15:29 +02:00
Samuele Locatelli 0a00ba3eae Merge remote-tracking branch 'origin/develop' into new/dirSaveMgt 2020-09-10 12:29:13 +02:00
Samuele Locatelli 7a3a068908 new rel 2020-09-10 12:21:13 +02:00
= 2a3de715da Merge remote-tracking branch 'CMS/develop' into develop 2020-09-10 10:12:47 +02:00
= 002b235d76 fix dashboar 2020-09-10 10:12:14 +02:00
= b135f017d5 modali da gantt 2020-09-10 09:52:02 +02:00
Samuele Locatelli 32e0c34945 rel ver x prod 2020-09-10 07:58:00 +02:00
Samuele Locatelli f32d0c0daf Merge remote-tracking branch 'origin/develop' into new/dirSaveMgt 2020-09-10 07:56:57 +02:00
NICOLA CARMINATI 014f63bd2b Added folder / file Manager to the Client 2020-09-09 18:03:56 +02:00
= a6e58365dd recipe note.. preview on save 2020-09-09 16:55:03 +02:00
= 7481d3bf28 print ricetta 2020-09-09 16:43:48 +02:00
= c036cd30e2 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-09 15:51:52 +02:00
= 682efe1928 enabled fields visibility 2020-09-09 12:16:04 +02:00
= d511b49c64 enabled fields visibility 2020-09-09 12:15:54 +02:00
Samuele Locatelli bb7ef476ed new rel 2020-09-09 09:58:42 +02:00
Samuele Locatelli 393da8156b Aggiunto metodo x fornire note ad UI 2020-09-09 09:58:31 +02:00
Samuele Locatelli 575b74c676 Merge remote-tracking branch 'origin/develop' into new/dirSaveMgt 2020-09-09 08:16:52 +02:00
Samuele Locatelli 9f27a7b5ce Impostato default dirm da serverConfig/sharedPath 2020-09-09 08:16:43 +02:00
NICOLA CARMINATI 12ee118e72 Fix OnScreenKeyboard Option 2020-09-08 18:08:02 +02:00
= 00994f993b fix number 2020-09-08 17:31:50 +02:00
= 581c6d44fe fix sovrapposizione gant boxes 2020-09-08 15:04:32 +02:00
Samuele Locatelli a75edd650e start new rel 2020-09-08 14:56:50 +02:00
= eea8a2fa5d fix apertura blocchetti da categorie 2020-09-08 12:50:59 +02:00
= 14c9fb628b warmers 2020-09-08 12:40:25 +02:00
= 18530ea7b3 fix combo 2020-09-08 10:48:46 +02:00
= 04447282ea timeline gannt 2020-09-08 10:23:52 +02:00
= 582a4455e0 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-08 10:09:28 +02:00
= 43fa8448d2 fix disegno stampo 2020-09-08 10:09:18 +02:00
Samuele Locatelli a6df5719f0 Merge remote-tracking branch 'origin/develop' into feature/prodMgmt 2020-09-08 09:49:07 +02:00
Samuele Locatelli d23f6fd4c5 new rel 2020-09-08 09:48:58 +02:00
= 91a554d616 utilities 2020-09-08 09:43:12 +02:00
= e96d97890f cancel della ricetta 2020-09-08 09:37:52 +02:00
= 42186c9509 fix remainging time negativo 2020-09-08 09:19:51 +02:00
= b0391855f5 fix numeric 2020-09-08 08:54:52 +02:00
= 305e2220f8 valueact 2020-09-08 08:48:31 +02:00
= a5d2323dea fix combo status 2020-09-08 08:41:17 +02:00
= 95db7bbdd9 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-08 08:35:44 +02:00
= 345918cdaf valueAct 2020-09-08 08:35:19 +02:00
Samuele Locatelli 8bc9fc97c8 new rel 2020-09-07 13:55:09 +02:00
Samuele Locatelli cd5ea6c6cc Merge remote-tracking branch 'origin/develop' into feature/prodMgmt 2020-09-07 13:53:07 +02:00
= fb91158ee6 fix gant print & slider. 2020-09-07 12:52:53 +02:00
= 7b724b070f slider 2020-09-07 11:16:11 +02:00
= 7bb8602595 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-07 10:32:55 +02:00
Samuele Locatelli 02b1b3b4c6 Merge branch 'feature/prodMgmt' into develop 2020-09-04 19:25:10 +02:00
Samuele Locatelli f499cdc203 new rel intermedia 71 2020-09-04 19:24:32 +02:00
Samuele Locatelli fa9db02e0e Aggiornamento gestione moduli x avere categorie + sub 2020-09-04 19:24:18 +02:00
Samuele Locatelli 136f3c40ff Update xml e validatore modBlock 2020-09-04 19:23:57 +02:00
= 0e02b0ca3f fixes 2020-09-04 17:14:15 +02:00
= 913834a34d Merge remote-tracking branch 'CMS/develop' into develop 2020-09-04 15:14:54 +02:00
= 6b0d5e2c03 fix generali e gestione produzione 2020-09-04 15:14:32 +02:00
Samuele Locatelli 3ead2b7283 Merge branch 'feature/prodMgmt' into develop 2020-09-04 11:52:21 +02:00
Samuele Locatelli 66ba44868e Update x nuova gest codici errore in core library 2020-09-04 11:46:30 +02:00
Samuele Locatelli 529266b57b Merge branch 'feature/prodMgmt' into develop 2020-09-04 10:45:54 +02:00
Samuele Locatelli e1280c193f eliminati commenti + aggiornamento readme, testato bounce ricetta 2020-09-04 10:45:41 +02:00
Samuele Locatelli 77cec0160a rimesso metodo x set AUTO + metodo x start prod full 2020-09-04 09:32:17 +02:00
Samuele Locatelli f7234dd34b new rel 2020-09-04 09:29:30 +02:00
Samuele Locatelli 4c7ad000db rimesso softkey x reset 2020-09-04 09:24:06 +02:00
Samuele Locatelli 140afc4539 Merge branch 'feature/prodMgmt' into develop 2020-09-03 17:56:52 +02:00
Samuele Locatelli 699ccfbfba Commentata gest cicli warmup come richiesto 2020-09-03 17:56:44 +02:00
Samuele Locatelli 3877cb7843 new rel 2020-09-03 12:04:11 +02:00
Samuele Locatelli 80e6192e46 Conf parameters per gestione scrittura recipe 2020-09-03 12:03:59 +02:00
Samuele Locatelli 2786c8e6a8 Merge branch 'develop' into feature/prodMgmt 2020-09-03 11:19:07 +02:00
Samuele Locatelli efbfd857f6 new rel 2020-09-03 11:18:55 +02:00
Samuele Locatelli 3968f72061 Gestione cicli riscaldo in WRITE sul PLC 2020-09-03 11:18:50 +02:00
Samuele Locatelli 88e78736f0 Merge branch 'feature/prodMgmt' into develop 2020-09-02 18:23:09 +02:00
Samuele Locatelli a362829256 Update gestione nuovo dato scrap (metodo x salvataggio...) 2020-09-02 18:21:11 +02:00
Samuele Locatelli 43abdd203b update note x migrations 2020-09-02 18:20:59 +02:00
Samuele Locatelli 74e51a4156 Update modello dati x SCRAP parts 2020-09-02 18:00:51 +02:00
Samuele Locatelli 52621f83e8 new sprint 2020-09-02 18:00:36 +02:00
= 9be02d4666 dashboard & toggle.. 2020-09-02 17:52:54 +02:00
Samuele Locatelli d16712bbd9 Merge branch 'bugfix/softkeys' into develop 2020-09-02 15:46:26 +02:00
Samuele Locatelli 8c96c46d35 typo eliminato calcolo superseeded 2020-09-02 15:46:08 +02:00
Samuele Locatelli 678312ceca Fiox display su prod panel 2020-09-02 15:44:59 +02:00
Samuele Locatelli 072b216eff Update ordinamento softkey by M.Carissoni 2020-09-02 15:44:52 +02:00
= 2f2fc02730 clock & dashboard 2020-09-02 15:44:10 +02:00
= cccd8f2c36 gantt printing 2020-09-02 15:15:41 +02:00
Samuele Locatelli 4e27d3fe63 rivisto eliminazione transports.log 2020-09-02 14:19:21 +02:00
Samuele Locatelli 8d57a29fd9 start new sprint 2020-09-02 14:17:55 +02:00
Samuele Locatelli c45c81dbf7 Merge branch 'bugfix/calcoloStatus' into develop 2020-09-02 14:05:57 +02:00
Samuele Locatelli 7417c20dcc Fix gestione (si spera) status overview 2020-09-02 13:26:16 +02:00
Samuele Locatelli a98500bade Aggiunta preliminare readme.md 2020-09-02 12:22:42 +02:00
Samuele Locatelli 154897e835 start new release 2020-09-02 11:47:46 +02:00
Samuele Locatelli 587f4b3e82 new vers numb 2020-09-02 11:41:03 +02:00
Samuele Locatelli 8714898228 Eliminato dati perturbati grafico prod 2020-09-02 11:40:21 +02:00
Samuele Locatelli 49ccfe10e7 Merge remote-tracking branch 'origin/develop' into develop 2020-09-02 11:32:14 +02:00
Samuele Locatelli 1168c826c1 Eliminazione transports.log 2020-09-02 11:31:51 +02:00
= 71a1333c12 gantt print 2020-09-01 16:52:24 +02:00
= 4c5f1e975f fix 2020-09-01 16:04:20 +02:00
= 4a5d0b9770 saveas notes 2020-09-01 16:03:31 +02:00
= 1e4dc168ac save notes 2020-09-01 15:34:22 +02:00
= d2fd9675fd header menu 2020-09-01 11:15:56 +02:00
= 9440a01ff7 numeric 2020-08-31 17:00:04 +02:00
= 968dab090d fix velocità di aggiornamento slider tramite tasti. 2020-08-31 16:10:39 +02:00
= b47975c7f6 conferma annulla 2020-08-31 10:58:12 +02:00
= cc9527fbad Merge remote-tracking branch 'CMS/develop' into develop 2020-08-31 10:30:17 +02:00
= 208b2122ac toggle disabled 2020-08-31 10:24:07 +02:00
Samuele E. Locatelli 4dde0de70a fix gestione forcing rilettura status overview 2020-08-31 10:15:02 +02:00
Samuele Locatelli d3f65680e9 Merge branch 'develop' into feature/recipe 2020-08-27 16:55:00 +02:00
Samuele Locatelli 4879979ae6 fix x core library + new rel 2020-08-27 16:54:38 +02:00
= a379fc96d3 kwh 2020-08-27 16:42:25 +02:00
Samuele Locatelli a1fd3ec363 update x calcolo modifiche ed errori su parametri SEMPRE calcolati 2020-08-27 15:39:39 +02:00
Samuele Locatelli 22b5b3453b Merge remote-tracking branch 'origin/develop' into develop 2020-08-27 15:31:01 +02:00
= 06d83de1df toggle-button visibility + enabled status 2020-08-26 11:18:12 +02:00
= 828701c865 fix layout riscaldi 2020-08-26 11:11:22 +02:00
= 5dc96371ce fix packages 2020-08-26 11:11:12 +02:00
= 3ce95c81dd babel upgrade 2020-08-26 11:05:58 +02:00
NICOLA CARMINATI 1f7d34327c Fix styled parts 2020-08-25 11:51:36 +02:00
Samuele Locatelli 8aadb503ec start new rel vers 2020-08-07 17:23:48 +02:00
Samuele Locatelli e7f221376f Merge remote-tracking branch 'origin/develop' into develop 2020-08-07 15:01:12 +02:00
Samuele Locatelli d4d26408ad Fix log recipe confirm error 2020-08-07 14:59:30 +02:00
= 3e6b9390da Merge remote-tracking branch 'CMS/develop' into develop 2020-08-07 12:21:55 +02:00
= a03fe6c7c7 softkey slider 2020-08-07 12:21:22 +02:00
= 90d3e33f2b fix save recipe 2020-08-07 12:02:26 +02:00
= 3388520048 riferimento traduzioni correnti 2020-08-07 11:57:52 +02:00
= b938239572 fix quote stampo 2020-08-07 10:24:40 +02:00
Samuele Locatelli 71fb94f59b check errori divers: debug(SIM) / release(PROD) 2020-07-29 19:31:40 +02:00
Samuele Locatelli b78cbfc38a FIx calcolo errori: SOLO parametri visibili... 2020-07-29 14:17:51 +02:00
Samuele Locatelli 3403836f7e Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-29 10:13:34 +02:00
Samuele Locatelli f0dc2333fb New release, fix strobe race condition 2020-07-29 10:13:00 +02:00
= 4fafa3a791 fix posizione toggle riscaldi superiori inferiori 2020-07-29 09:17:59 +02:00
Samuele Locatelli 3564f0cb72 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-29 08:19:36 +02:00
NICOLA CARMINATI 6b1bf6f94b Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-28 17:36:23 +02:00
NICOLA CARMINATI d2f8c7f893 Fix disabled softkey 2020-07-28 17:34:01 +02:00
= 7f3ad3dbd9 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-28 10:25:15 +02:00
= 01c42162d0 toggle & conferma disabilitato 2020-07-28 10:24:55 +02:00
= 8afcaf8f6f Merge remote-tracking branch 'CMS/develop' into develop 2020-07-28 10:09:24 +02:00
= 54573c76b1 toggle & combo 2020-07-28 09:41:58 +02:00
Samuele Locatelli 5900f2b9d9 new release 2020-07-28 09:08:18 +02:00
Samuele Locatelli 821b7accbd Fix calcolo IchMin x resistenze 2+ 2020-07-28 09:08:06 +02:00
Samuele Locatelli f6bc7e4ef4 Merge in new rel 2020-07-27 16:43:49 +02:00
Samuele Locatelli 0e35c3da9e Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-27 16:43:08 +02:00
Samuele Locatelli d48d6e7925 Correazione formula IchMin 2020-07-27 16:42:04 +02:00
NICOLA CARMINATI b91a18b434 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-27 16:29:39 +02:00
NICOLA CARMINATI abaf3a4794 General fixes 2020-07-27 16:11:25 +02:00
Samuele Locatelli dbc2777bcd Merge branch 'develop' into feature/recipe 2020-07-27 14:33:06 +02:00
Samuele Locatelli 7ee0cdb5a6 new rel 2020-07-27 14:32:56 +02:00
Samuele Locatelli 69f1398d9a fix out usersoftkeys 2020-07-27 14:32:18 +02:00
Samuele Locatelli b707c4a2f5 Merge branch 'develop' into feature/recipe 2020-07-27 10:51:51 +02:00
Samuele Locatelli f741a39644 Added Operator Confirmation in starred softkey 2020-07-27 10:42:51 +02:00
Samuele Locatelli 6624c6b219 Start new rel con nuovo XML softkey 2020-07-27 08:22:11 +02:00
Samuele Locatelli 2819c901f1 new release 2020-07-24 11:18:05 +02:00
= 30ac1496e2 fix autorizzazioni e info di processo 2020-07-24 09:36:27 +02:00
= 2bbd500360 gantt animations 2020-07-23 19:16:39 +02:00
= d887dc7d48 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-23 18:22:46 +02:00
= be669f66f1 revert login 2020-07-23 18:22:30 +02:00
Samuele Locatelli 5c96a2c9f1 Merge branch 'develop' into feature/recipe 2020-07-23 17:59:59 +02:00
Samuele Locatelli d4cc3a8877 new release 2020-07-23 17:59:46 +02:00
Samuele Locatelli d79d883224 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-23 17:58:51 +02:00
= 2e646b0547 fix softkeys 2020-07-23 17:51:20 +02:00
Samuele Locatelli 578351fbcc update min rev 2020-07-23 17:43:39 +02:00
= a1b5bbb9ef posizione tastiera & windows buttons 2020-07-23 17:26:05 +02:00
= 88095c418b fix step slider e riscaldi 2020-07-23 17:03:34 +02:00
= 866ae7c089 gantt positioning 2020-07-23 16:33:07 +02:00
= 5166e8db62 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-23 14:27:16 +02:00
= ededb27d80 .window-buttons + processinfo + gantt 2020-07-23 14:26:42 +02:00
= 7ff75037f7 dashboard e processo 2020-07-23 14:18:01 +02:00
Samuele Locatelli bd350e15e4 Merge branch 'feature/recipe' into develop 2020-07-23 12:12:17 +02:00
Samuele Locatelli 10d3e8e958 Added PPStatus + cleanup M155 & PP data 2020-07-23 12:12:05 +02:00
Samuele Locatelli fe5ea382b9 Acquired forced process status 2020-07-23 09:17:49 +02:00
Samuele Locatelli 7992723cba new release 2020-07-23 08:00:52 +02:00
Samuele Locatelli 5e22af4625 update labels 2020-07-23 07:50:23 +02:00
Samuele Locatelli 393768fe7c Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-22 19:04:48 +02:00
Samuele Locatelli 34edd6839e New Rel vers 2020-07-22 19:04:39 +02:00
= 0ef9a38073 manual/auto 2020-07-22 18:50:48 +02:00
= cb6271562b Merge remote-tracking branch 'CMS/develop' into develop 2020-07-22 18:33:26 +02:00
= 060a78964d fix starred softkeys 2020-07-22 18:32:51 +02:00
Samuele Locatelli 9159864ef2 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-22 18:24:09 +02:00
NICOLA CARMINATI 4f863b71f0 Added file-info .RCP 2020-07-22 18:18:58 +02:00
= c0edbdbd2f fix paddle starred & dashboard 2020-07-22 18:07:44 +02:00
NICOLA CARMINATI b893a9f2e0 Fix delete cache-folder on startup 2020-07-22 16:53:09 +02:00
= 71f4192bba fix posizinone card riscaldi 2020-07-22 16:43:45 +02:00
Samuele Locatelli ffadf07aaf Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-22 14:11:20 +02:00
Samuele Locatelli 0648f53c94 Fix base address for iChMin 2020-07-22 14:10:34 +02:00
Samuele Locatelli d4e917cce2 Update install script 2020-07-22 13:18:55 +02:00
Samuele Locatelli 895914fd24 Added script for PROD deploy 2020-07-22 12:38:33 +02:00
Samuele Locatelli bc5fde0844 Fix labels & Fix conf userSoftKeys 2020-07-22 10:46:10 +02:00
= b9f82cb6f0 starred ? 2020-07-22 10:33:52 +02:00
= cc6ba8f0ef Merge remote-tracking branch 'CMS/develop' into develop 2020-07-22 09:39:34 +02:00
= 772aa06eb9 softkeys 2020-07-22 09:39:00 +02:00
Samuele Locatelli 2399cd0a9d Merge branch 'develop' into feature/recipe 2020-07-22 09:02:08 +02:00
Samuele Locatelli 35d0e05908 start new release cycle 2020-07-22 09:01:56 +02:00
Samuele Locatelli a057bb115e Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-21 17:46:16 +02:00
Samuele Locatelli fa9a477a88 Fix decoding of softkey new data 2020-07-21 17:46:03 +02:00
Samuele Locatelli 0f23124a17 traduzione nuova label 2020-07-21 17:32:28 +02:00
Samuele Locatelli d2e728abf5 Modifica XML/XSD per gesiotne NUOVA info softkeys 2020-07-21 17:32:17 +02:00
= ecf740044d Merge remote-tracking branch 'CMS/develop' into develop 2020-07-21 16:46:25 +02:00
Samuele Locatelli 0341d98a95 Start new vers 2020-07-21 16:20:58 +02:00
= a88560e0c1 fix inversione quote 2020-07-21 14:33:55 +02:00
= 30a104854c fix inversione quote 2020-07-21 14:30:53 +02:00
Samuele Locatelli 56e8dbb508 Merge branch 'develop' into feature/recipe 2020-07-21 14:25:30 +02:00
Samuele Locatelli ecce76d0ef new release vers 2020-07-21 14:25:16 +02:00
= dde4670a75 fix bug editing 2020-07-21 13:01:35 +02:00
Samuele Locatelli 4b325448c5 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-20 20:00:12 +02:00
Samuele Locatelli 987d75c3e9 New Release vers 2020-07-20 19:59:59 +02:00
Samuele Locatelli 994a67cdb0 Update logica calcolo MinIch 2020-07-20 19:59:12 +02:00
= d8ac561423 visibilità tab su elementi disattivati 2020-07-20 17:49:38 +02:00
= 9299cccc50 fix errori generici in chart e combo 2020-07-20 16:58:54 +02:00
= f8282974b3 fix dimensionamento barra progresso gantt per terminated 2020-07-20 16:57:09 +02:00
= 465838579b fix bug maschera avvio di produzione 2020-07-20 14:57:46 +02:00
= 07157e2b7c dimensionamento stato 2020-07-17 17:09:28 +02:00
= 325c53529c miglioramento animazioni timeline e dimensionamento gantt 2020-07-17 16:44:04 +02:00
= d5e8446391 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-17 16:23:59 +02:00
= 43c620fdd7 resize dei blocchi gant su terminated 2020-07-17 16:23:14 +02:00
= ad6e349d1f fix problemi di rendering 2020-07-17 15:41:09 +02:00
Samuele Locatelli b61ee96e26 Update traduzioni 2020-07-17 15:00:07 +02:00
Samuele Locatelli 6e2f8431f1 new release fixed language 2020-07-17 14:57:11 +02:00
Samuele Locatelli 68a82ce57a Aggiunta nuovo statusbit x blocchetti terminati 2020-07-17 14:54:25 +02:00
= 00a9634b76 fix gant timing & setpoingHMI 2020-07-17 14:32:55 +02:00
Samuele Locatelli 2aa9ece99c Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-17 14:18:46 +02:00
Samuele Locatelli d0bfe30136 update gest softkey + nuovo metodo NOTE ricetta 2020-07-17 14:12:40 +02:00
Samuele Locatelli 4eb7e6d5df update demo softkey utente 2020-07-17 14:12:19 +02:00
Samuele Locatelli c5670eca9d added notes in recipe 2020-07-17 13:53:45 +02:00
Samuele Locatelli e7cb0028d0 update template + demo recipe 2020-07-17 13:53:15 +02:00
Samuele Locatelli 9744e4c8f6 rimesso token x warmers 2020-07-17 13:52:49 +02:00
= 61afcc2d01 fix visualizzazione durata stimata 2020-07-17 11:17:14 +02:00
Samuele Locatelli 302b097fce new release started 2020-07-17 10:54:14 +02:00
Samuele Locatelli 2b86136608 reinserita richeista auth token x prod 2020-07-17 10:54:02 +02:00
= a45b1b8f5e fix service auth 2020-07-17 10:49:31 +02:00
Samuele Locatelli 57ab759bdf rimesso controllo token su recipe 2020-07-17 10:49:19 +02:00
= 4960935bab Merge remote-tracking branch 'CMS/develop' into develop 2020-07-17 10:39:34 +02:00
= 5805eba8cc fix auth 2020-07-17 10:39:28 +02:00
Samuele E. Locatelli 6fb8e48a53 FIX XSD userSOftKey 2020-07-16 18:41:24 +02:00
Samuele Locatelli 2b2e99eeed Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-16 18:32:35 +02:00
= db2626e861 fix timeline to zero 2020-07-16 17:36:10 +02:00
= 517c641c99 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-16 17:30:36 +02:00
= d7467ea92d history duplicata e fluidità del gantt 2020-07-16 17:30:25 +02:00
= ba9ef98f3f fix gant scala e blocchi 2020-07-16 17:16:26 +02:00
Samuele E. Locatelli febb1735a0 update config da PROD (corrette) 2020-07-16 16:05:23 +02:00
Samuele E. Locatelli 77959ef2c3 COmmentata gestione auth token 2020-07-16 16:05:08 +02:00
Samuele Locatelli 4b7d531362 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-15 18:46:17 +02:00
= 233df935d6 fix scala grafici e barra max 2020-07-15 18:25:48 +02:00
Samuele Locatelli ca194e0636 Typo & start new release 2020-07-15 18:06:38 +02:00
Samuele Locatelli 6a9f117dcf Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-15 11:21:44 +02:00
Samuele Locatelli 5e61263aae init start TC ad avvio macchina (errori TCLast) 2020-07-15 11:19:17 +02:00
Samuele Locatelli 29e311130f Add auth metodi PUT/POST Recipe, Prod, Warmers 2020-07-15 11:16:51 +02:00
= d7abdc935f fix run manuale/auto 2020-07-15 11:00:26 +02:00
= 5b7bdaeb27 fix confirmation dialog 2020-07-15 10:30:41 +02:00
= a70dd89144 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-15 10:28:37 +02:00
= 6a7db458c6 send dati softkeys 2020-07-15 10:28:23 +02:00
Samuele Locatelli 51aa2e401b Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-15 10:18:20 +02:00
Samuele Locatelli 30b9c2bbdd Merge branch 'feature/recipe' into develop 2020-07-15 10:17:56 +02:00
Samuele Locatelli ab2dad5e4f Fix prod calcoli x DTO (scalati) 2020-07-15 10:17:39 +02:00
Samuele Locatelli b7917e82f6 Fix datetime x eventi prod 2020-07-15 10:17:23 +02:00
= 0ee2eb43c0 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-15 09:35:03 +02:00
= 19e30b5a00 gestione preferiti dell'utente 2020-07-15 09:34:52 +02:00
Samuele Locatelli c1a61e0472 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-15 08:01:04 +02:00
Samuele Locatelli ea2508a798 nuova vers stabile .39 2020-07-15 08:00:41 +02:00
Samuele Locatelli 0610284b97 Aggiunta verifica user auth token x PUT Recipe 2020-07-15 07:58:35 +02:00
= 40b5eba6f9 softkey 2020-07-15 00:00:17 +02:00
= 315d2a274e softkeys funzionanti da completare 2020-07-14 23:55:59 +02:00
Samuele Locatelli f1111e5dfd Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-14 19:26:07 +02:00
Samuele Locatelli 13456c473f Update x StarredSoftkey 2020-07-14 19:25:49 +02:00
= f77bfdf818 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-14 15:00:18 +02:00
= 1f4946f356 produzioen con storia... 2020-07-14 15:00:06 +02:00
Samuele Locatelli a4b8162355 COnf x recupero user in recipe 2020-07-14 14:34:02 +02:00
Samuele Locatelli 3801b9ba0e COmpletata prima review Starred Softkey 2020-07-14 14:32:58 +02:00
Samuele Locatelli c5fea9fa43 ancora update favorite UserStarredSoftkey 2020-07-14 14:31:54 +02:00
Samuele Locatelli 91b6131d75 update conf x userSoftKeys starred 2020-07-14 14:31:00 +02:00
= 50cd9a4acd timeline animations 2020-07-14 12:48:32 +02:00
= b4b44a765c items lavorati... last 2020-07-13 18:52:01 +02:00
= 72aa243b51 fix labels duration 2020-07-13 17:52:44 +02:00
Samuele Locatelli b0d2071ee9 inizio nuova release 0.9.38 2020-07-13 12:01:17 +02:00
Samuele Locatelli 79f4f613a8 fix stima tempo completamento lotto negativo 2020-07-13 12:00:58 +02:00
Samuele Locatelli 1b91c5d901 fix per calcolo gauges TCiclo 2020-07-13 11:27:30 +02:00
Samuele Locatelli 5a29ac454f fix filter & stats for TC 2020-07-13 10:46:43 +02:00
Samuele Locatelli bd0f7517b0 Added saveAll method for recipe 2020-07-13 10:46:17 +02:00
Samuele Locatelli c9492c6498 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-13 10:41:37 +02:00
= 9671ffb669 fix show status 2020-07-13 10:36:05 +02:00
= ede8838168 fix dimensione componenti se durata > stima 2020-07-13 10:35:41 +02:00
Samuele Locatelli 233d51d62c Fix LiveData x salvataggio dati ricetta 2020-07-13 10:32:02 +02:00
= cd887062f3 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-13 09:52:42 +02:00
= 725e8d8526 seconds position 2020-07-13 09:52:31 +02:00
= 156a840abc seconds position 2020-07-13 09:52:20 +02:00
= 4197fffd75 fix gauge 2020-07-13 09:36:57 +02:00
= 70b0d9b71c fix tempo ciclo 2020-07-13 09:34:51 +02:00
Samuele Locatelli 04457841c1 Annotation for saving recipe with user data 2020-07-11 10:20:43 +02:00
Samuele Locatelli ddd989223d Recipe serialization: DONE with formatting 2020-07-11 10:20:25 +02:00
Samuele Locatelli cb586e3fb4 start new release 2020-07-11 10:19:51 +02:00
Samuele Locatelli 6c64825fa2 Fix decimali + SIM debug variaz tempo(+/- 10s) 2020-07-10 20:15:16 +02:00
Samuele Locatelli fec3a66a9f Merge branch 'develop' into feature/recipe 2020-07-10 18:34:39 +02:00
Samuele Locatelli 47290699ec Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-10 18:33:38 +02:00
Samuele Locatelli 6ccb5682c1 Fix gestione TempiCiclo in sec! 2020-07-10 18:33:20 +02:00
= d70afa9deb Merge remote-tracking branch 'CMS/develop' into develop 2020-07-10 18:18:31 +02:00
= 008e802c1e grafico di produzione.. 2020-07-10 18:18:14 +02:00
Samuele Locatelli 1b5ad72e31 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-10 18:02:03 +02:00
Samuele Locatelli 5e5c9b70c5 Inizio mod x dati decimal in prod (s e non ms) 2020-07-10 18:01:52 +02:00
Samuele E. Locatelli cf07415cba Modifica e fix template da aprte di M.Carissoni 2020-07-10 17:21:16 +02:00
Samuele Locatelli cea90ae6c9 refresh 2020-07-10 17:05:50 +02:00
Samuele Locatelli 5923678e14 refresh template + testa.rcp, release in SIM 2020-07-10 17:05:04 +02:00
Samuele Locatelli dbaed0fffc start new version con merge UI 2020-07-10 16:59:09 +02:00
Samuele Locatelli 888e0eea0a Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-10 16:57:21 +02:00
= 2a03f7951a fix reattività immediata gantt 2020-07-10 16:24:23 +02:00
= c261b668a7 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-10 16:16:37 +02:00
= 526f076177 fix dashboard & controstampo 2020-07-10 16:13:54 +02:00
Samuele Locatelli 4059cdb144 fix caso senza dati prod... 2020-07-10 16:12:52 +02:00
Samuele Locatelli bdb0419db4 Merge branch 'feature/recipe' into develop 2020-07-10 15:54:36 +02:00
Samuele Locatelli afc5b1dd4b Fix delta e caching x ProdPanel 2020-07-10 15:54:23 +02:00
= 7fa3832970 dashboard 2020-07-10 15:24:37 +02:00
Samuele Locatelli f7c3a7158b ADD signalr + filtro SIM troppo verboso 2020-07-10 15:04:34 +02:00
Samuele Locatelli 7c0d9595cd completata SIM grafici TC / cadenza 2020-07-10 13:03:46 +02:00
Samuele Locatelli e4a5b66e47 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-10 12:11:50 +02:00
Samuele Locatelli 37fdca53a4 Add sim data for prodPlan 2020-07-10 12:07:30 +02:00
= 4b4c486221 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-09 17:57:11 +02:00
= 4e04bcebfe icone e link 2020-07-09 17:56:37 +02:00
Samuele Locatelli 6f36ec9b95 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-09 17:53:31 +02:00
Samuele Locatelli bf3084b376 Completed review of WebAPI method for prodPanel 2020-07-09 17:53:11 +02:00
Samuele Locatelli d7ca3e0563 First version of prod panel data... 2020-07-09 17:26:17 +02:00
= 68ac521e61 fix grafici 2020-07-09 17:19:07 +02:00
= cab2ed200c Merge remote-tracking branch 'CMS/develop' into develop 2020-07-09 17:09:55 +02:00
= 79064cd9ea recipe e parametri di gantt 2020-07-09 17:09:40 +02:00
Samuele Locatelli ada9a7ae55 Aggiunta modello dati pannello produzione 2020-07-09 16:45:56 +02:00
Samuele Locatelli 32f80ca5be typo fix!!! 2020-07-09 16:16:48 +02:00
Samuele Locatelli 30b2e92f43 update fix directory x sim script 2020-07-09 16:15:37 +02:00
Samuele Locatelli 4ad258b47c Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-09 16:11:22 +02:00
Samuele Locatelli fd8542d19d Merge branch 'develop' into feature/recipe 2020-07-09 16:11:00 +02:00
Samuele Locatelli ed7fe8efea Metodo uploadImage che richiede nome ricetta... 2020-07-09 16:10:49 +02:00
Samuele Locatelli acad63969b re-add NcFileMan per ispezione 2020-07-09 16:10:28 +02:00
= d953fe519c fix warmers 2020-07-09 16:06:36 +02:00
Samuele Locatelli 3377abacf7 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-09 11:55:10 +02:00
Samuele Locatelli 1a211bbb8d update naming x ricetta 2020-07-09 11:54:53 +02:00
Samuele Locatelli 4e2395f192 Modifica template/ricetta 2020-07-09 11:54:42 +02:00
= 62fbfa1f46 Merge branch 'newfeature/loadricetta' into develop 2020-07-09 10:58:08 +02:00
= 65c8d16894 modal and confirm navigation 2020-07-09 10:57:49 +02:00
Samuele Locatelli 0f2906c386 reset log msg 2020-07-09 10:48:41 +02:00
Samuele Locatelli 06755f69a0 modifications for file type selection 2020-07-09 10:46:34 +02:00
Samuele Locatelli ab3543e322 start new version.. 2020-07-09 10:25:45 +02:00
Samuele Locatelli 50e10fe692 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-09 10:22:58 +02:00
= f3feffc9fc Merge branch 'newfeature/loadricetta' into develop 2020-07-09 10:16:59 +02:00
= 6f496eb659 fix modale di login e progress 2020-07-09 10:16:24 +02:00
Samuele Locatelli b5724ae31c Merge branch 'feature/recipe' into develop 2020-07-08 18:44:59 +02:00
Samuele Locatelli ee5ec1f6a9 update template recipe 2020-07-08 18:44:49 +02:00
Samuele Locatelli c8a3b59a3a Eliminato metodi precedenti file su NC 2020-07-08 18:42:44 +02:00
Samuele Locatelli 9c4bbacd8d aggiunta 3 ricette demo 2020-07-08 18:42:16 +02:00
Samuele Locatelli fb1a36af4b fix metodo load ricetta 2020-07-08 18:41:58 +02:00
Samuele Locatelli b74ea8cdc0 stsart new release 2020-07-08 18:09:37 +02:00
= 34d96ded66 caricamento ricetta.. da verificare 2020-07-08 18:00:30 +02:00
= 2d7b63078c Merge remote-tracking branch 'CMS/develop' into develop 2020-07-08 17:16:46 +02:00
= 92247aa295 fix timeline 2020-07-08 17:09:36 +02:00
Samuele Locatelli edc024939a New release vers 2020-07-08 17:06:02 +02:00
Samuele Locatelli 7ed1d38232 Fix script x SIM e Test version... 2020-07-08 17:05:51 +02:00
= 383d83b86e Merge remote-tracking branch 'CMS/develop' into develop 2020-07-08 16:36:44 +02:00
= 0444ee4e45 fix compression row 2020-07-08 16:36:30 +02:00
Samuele Locatelli 028d67d9ca Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-08 16:34:35 +02:00
= 82f16e9b6b Merge remote-tracking branch 'CMS/develop' into develop 2020-07-08 16:15:12 +02:00
= 5cc45a7ae6 fix gantt 2020-07-08 16:14:59 +02:00
Samuele Locatelli 64a6306bfc fix version naming in zip 2020-07-08 14:37:33 +02:00
Samuele Locatelli c10dbb5bcd cleanup + fix gestione scale factor moduli 2020-07-08 14:00:15 +02:00
Samuele Locatelli b3346ebd2b update decodifica XML conf moduli 2020-07-08 13:59:42 +02:00
Samuele Locatelli 06841ca720 Appuntata nuova versione (in attesa modifiche) 2020-07-08 10:22:16 +02:00
Samuele Locatelli 06abcb65cb update script: 7zip (faster) + fix trim file end 2020-07-08 10:17:24 +02:00
Samuele Locatelli 234d53e125 Merge branch 'develop' into feature/recipe 2020-07-07 19:20:27 +02:00
Samuele Locatelli d90bc30149 Merge branch 'feature/recipe' into develop 2020-07-07 19:20:19 +02:00
Samuele Locatelli c488546c6e fix file 4 prod 2020-07-07 19:19:35 +02:00
Samuele Locatelli e172d2b173 vers 0.9.25 fix ncAdapter using & destroy 2020-07-07 19:18:35 +02:00
Samuele Locatelli 33266567c6 update script 4 build making! 2020-07-07 19:18:14 +02:00
Samuele Locatelli 80887360aa Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-07 17:24:56 +02:00
Samuele Locatelli 99dfb4b507 start powershell script 2020-07-07 17:24:39 +02:00
= 5845f9c2f2 rimosso console log 2020-07-07 17:24:27 +02:00
Samuele Locatelli 9f1a389f36 more test on batch script (-->powershell?) 2020-07-07 17:24:07 +02:00
= 41102f17fa fix build script 2020-07-07 17:20:43 +02:00
= c15556d271 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-07 17:18:28 +02:00
= 46dedc38dd Merge remote-tracking branch 'CMS/develop' into develop 2020-07-07 17:18:19 +02:00
= 47a40b98db gauges in dashboard 2020-07-07 17:18:06 +02:00
= c63700de0f refactoring gauges 2020-07-07 17:07:09 +02:00
Samuele Locatelli 97f6e8f70b Merge branch 'feature/recipe' into develop 2020-07-07 14:10:07 +02:00
Samuele Locatelli d1106eb25c update vers number 2020-07-07 14:08:52 +02:00
Samuele Locatelli 4908fa7701 makebuild script tested for release 2020-07-07 14:08:41 +02:00
Samuele Locatelli ee6d6f0331 fix machine serial try/catch error 2020-07-07 14:08:00 +02:00
Samuele Locatelli a03d6c8351 removed ncsoftkeys methods 2020-07-07 13:14:58 +02:00
Samuele Locatelli e9321dba20 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-06 19:37:47 +02:00
Samuele Locatelli aa23946048 completo invio UI con nuove const 2020-07-06 19:37:13 +02:00
Samuele Locatelli 58a0bd63f6 duie thread x inviare status conensso UI e signalr 2020-07-06 19:36:35 +02:00
= 879302c9a6 fix combo 2020-07-06 17:57:50 +02:00
= 60d3c58fc9 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-06 17:49:24 +02:00
= 8d0cf84cc6 fix debounce usage 2020-07-06 17:48:35 +02:00
Samuele Locatelli 9a94cdd562 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-06 16:59:35 +02:00
= ed3fc9649e Merge remote-tracking branch 'CMS/develop' into develop 2020-07-06 16:51:56 +02:00
= 4df18c64a3 debounce slider 2020-07-06 16:51:37 +02:00
Samuele Locatelli a8d84b537b Update version 0.9.23 2020-07-06 16:50:43 +02:00
Samuele Locatelli 18460609fb Fix config 2020-07-06 16:50:32 +02:00
Samuele Locatelli de78af9818 reduce write concurrence on recipe (check params) 2020-07-06 16:48:45 +02:00
Samuele Locatelli 68fbecb75b update localhost config 4 Active.Client 2020-07-06 16:48:16 +02:00
Samuele Locatelli 8f9513936e added 3 demo recipes 2020-07-06 16:47:52 +02:00
Samuele Locatelli a5ca95a7b3 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-06 13:12:54 +02:00
Samuele Locatelli 38f3dc6d97 inizio bat x procedura compilazione e pack 2020-07-06 13:12:42 +02:00
= 78a5a2a7cd fix slider 2020-07-06 13:05:53 +02:00
Samuele Locatelli 0ea2c1dc54 fix client output path 2020-07-06 13:02:50 +02:00
= c4646e29aa fix layout combo 2020-07-06 13:02:27 +02:00
= 6c9637b8b4 fix binding parametro 17 2020-07-06 12:56:38 +02:00
= 547d01d7bb fix parametri combo 10/13 2020-07-06 12:51:42 +02:00
= a0e0f72ab6 fix binding paremetri riscaldi 2020-07-06 12:45:04 +02:00
= 27fcd365e0 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-06 12:40:39 +02:00
= eb39c0a5be fix layout riscaldi 2020-07-06 12:40:26 +02:00
Samuele Locatelli 1f0e4c82f7 update config softkey & recipe 2020-07-06 12:27:59 +02:00
Samuele Locatelli 672b764adf Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-07-06 12:09:43 +02:00
Samuele Locatelli 7ec0d0fcf7 fix modalità compilazione 2020-07-06 12:09:16 +02:00
= 706fa28d19 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-06 12:04:12 +02:00
= 624504619d invio immediato dei dati 2020-07-06 12:03:51 +02:00
Samuele Locatelli 70ccfde92f Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-06 10:15:31 +02:00
NICOLA CARMINATI 81913ea1c4 Updated Chromium to V77 2020-07-06 09:41:57 +02:00
= 96d07cb385 signalr processo.. 2020-07-03 14:26:47 +02:00
= ecc4a0858d gauge dashboard 2020-07-03 14:08:50 +02:00
= e6ceeed28a fix riscaldi 2020-07-03 13:39:59 +02:00
= f167b88c1d Merge remote-tracking branch 'CMS/develop' into develop 2020-07-03 13:35:59 +02:00
= c256de8f7d fix timeline gantt 2020-07-03 13:35:25 +02:00
= f4b93a75be fix drawing barre di progresso su processo.. 2020-07-03 11:43:51 +02:00
Samuele E. Locatelli 2bd1881a26 fix xml tag!!! 2020-07-03 10:16:09 +02:00
Samuele Locatelli 7d7df29eee update conf ricetta x enums + relative traduzioni 2020-07-03 10:11:38 +02:00
Samuele Locatelli a161ed6303 fix conf ricetta da M.Carissoni x scale/decimal 2020-07-03 09:26:05 +02:00
Samuele Locatelli c2100175e5 config su localhost 2020-07-03 09:25:37 +02:00
Samuele Locatelli b51c9f897c Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-03 08:16:18 +02:00
Samuele Locatelli a9c16963b1 Update vers numb + update lang translations 2020-07-03 08:16:08 +02:00
= 42be145f0e fix gestione booleani in ricetta 2020-07-02 17:24:25 +02:00
= 6b34c5f590 fix visibilità dei blocchi di processo. 2020-07-02 17:11:20 +02:00
= d9512f73cc fix gauges 2020-07-02 16:02:10 +02:00
= d8f523c497 Merge remote-tracking branch 'CMS/develop' into develop 2020-07-02 15:27:37 +02:00
= acdf473fe4 gantt zoom in-out 2020-07-02 15:27:17 +02:00
Samuele Locatelli 811e0b0bd1 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-07-02 15:06:32 +02:00
Samuele Locatelli 536112ef48 Updated structure for gauges & time 2020-07-02 15:06:20 +02:00
= 9f167377df fix posizionamento verticale dei blocchi del gantt 2020-07-02 14:23:53 +02:00
Samuele Locatelli 2d3869ddae Refresh config + translations 2020-07-02 12:40:38 +02:00
Samuele Locatelli 2261bec8da Added ThermoProd config XML management 2020-07-02 12:40:03 +02:00
Samuele Locatelli 920d4fcdb2 start new release 2020-07-02 10:04:05 +02:00
= 4c7f12466d fix pan orizzontale con header fisso 2020-07-01 18:22:49 +02:00
= 76d0593f4d Merge remote-tracking branch 'CMS/develop' into develop 2020-07-01 18:09:06 +02:00
= e25e861224 gantt pan actions 2020-07-01 18:08:48 +02:00
= 6b420387e3 gantt padding.. 2020-07-01 18:08:21 +02:00
= 459ba7875c fix max valore assi 2020-07-01 17:43:00 +02:00
= 5290c9e208 fix inversione assi grafici durata portata 2020-07-01 17:29:02 +02:00
= f1e52ed3c6 gantt pan & zoom 2020-07-01 17:14:20 +02:00
Samuele Locatelli cd6d0b9e38 update vers number 2020-06-30 18:45:39 +02:00
= 992b7b8df2 fix grafici 2020-06-30 16:56:48 +02:00
paolo b150f5bcfe fix fonts 2020-06-30 16:35:24 +02:00
Samuele Locatelli a0d4e0e2e1 refresh localhost 4 prod pack 2020-06-30 15:46:35 +02:00
Samuele Locatelli cc9f87d079 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe 2020-06-30 15:30:43 +02:00
= 4f6f5ab867 light orange 2020-06-30 15:29:16 +02:00
= d272ff5e02 Merge remote-tracking branch 'CMS/develop' into develop 2020-06-30 15:25:42 +02:00
= 8c48b2c714 fix alarms 2020-06-30 15:25:05 +02:00
Samuele Locatelli ee924dce19 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-06-30 15:24:38 +02:00
Samuele Locatelli 79874f92c1 update language controller 2020-06-30 15:23:04 +02:00
= 846ae78de7 fix date picker 2020-06-30 15:12:48 +02:00
= bc51324ed0 fix grafici 2020-06-30 15:00:00 +02:00
= d92d0e8b3e Merge remote-tracking branch 'CMS/develop' into develop 2020-06-30 14:02:31 +02:00
= a98de74f19 options.. 2020-06-30 14:01:47 +02:00
Samuele Locatelli df0532dbed moved messaggi position (inside project) 2020-06-30 13:56:39 +02:00
Samuele Locatelli d7fc81b460 fix localhost stack 2020-06-30 12:06:05 +02:00
= 65543fc44d inserimento combo in luogo delle select 2020-06-30 11:45:54 +02:00
Samuele Locatelli e77f4f2900 Merge branch 'feature/alarms' into develop 2020-06-30 11:34:34 +02:00
Samuele Locatelli 1b0432babe Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-06-30 11:34:16 +02:00
Samuele Locatelli 8579511e95 FixAdded strobe/ack for start/end prod pz 2020-06-30 11:33:57 +02:00
Samuele Locatelli 9a4bb57ddb ranaming translation files 2020-06-30 11:33:25 +02:00
= 9e08721ebc Merge remote-tracking branch 'CMS/develop' into develop 2020-06-30 10:22:51 +02:00
= a48c986086 fix binding scheda 2020-06-30 10:22:27 +02:00
= c820e98403 fix portata durata su vuoto 2020-06-30 10:17:09 +02:00
= 8c9c2614ff fix modifica riscaldi 2020-06-30 10:12:12 +02:00
Samuele Locatelli 8798a2a00f Merge branch 'feature/alarms' into develop 2020-06-29 19:42:25 +02:00
Samuele Locatelli f5d9ef2dd9 Completed review of translations file 2020-06-29 19:40:54 +02:00
Samuele Locatelli 3c29a47fc9 start new language translators 2020-06-29 18:58:13 +02:00
Samuele Locatelli 488add201e Review of recipe config models and xml/xsd valid 2020-06-29 18:57:49 +02:00
Samuele Locatelli a552ab5cae Added translation files for modules & recipe param 2020-06-29 18:57:19 +02:00
Samuele Locatelli fad81cfb47 added json animations on wwwroot 2020-06-29 18:56:57 +02:00
Samuele Locatelli ce150ed3c7 Start alarm decoding 2020-06-29 15:02:15 +02:00
= 5831936b24 Merge remote-tracking branch 'CMS/develop' into develop 2020-06-29 13:53:28 +02:00
= 1b31f05fb2 selezione riscaldi con touch 2020-06-29 13:53:16 +02:00
Samuele Locatelli e2b07ff9ca Merge branch 'feature/recipe' into develop 2020-06-29 13:05:30 +02:00
Samuele Locatelli 6066c7155b Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-06-29 13:05:19 +02:00
Samuele Locatelli 07719b3fde force rewrite od osd files 2020-06-29 13:04:03 +02:00
= 59051dc908 primo binding dati dashboard.. 2020-06-26 18:18:09 +02:00
= a3b73742c2 fix selezione riscaldi 2020-06-26 17:32:03 +02:00
Samuele Locatelli b732d1d024 Fix for local deploy 2020-06-26 16:15:48 +02:00
= 71955744f6 rimozione pieces dalla dashboard.. vanno rifattorizzati 2020-06-26 16:09:44 +02:00
Samuele Locatelli 807e225de8 Confirm recipe post PLC request 2020-06-26 12:19:30 +02:00
= 26000cffd1 Merge remote-tracking branch 'CMS/develop' into develop 2020-06-26 11:46:57 +02:00
= 99a6af2491 pulizia dal vecchio progetto 2020-06-26 11:45:17 +02:00
Samuele Locatelli 251795ad19 Merge branch 'feature/recipe' into develop 2020-06-26 11:38:35 +02:00
Samuele Locatelli 002310dcb4 FIx visible/enabled/error status from PLC 2020-06-26 11:37:31 +02:00
= 8db88e9ca6 fix annulla ricetta 2020-06-26 10:13:24 +02:00
Samuele Locatelli 956b9ad191 started vers 0.9.14 with XML cleanup for ModBlock 2020-06-26 08:56:43 +02:00
Samuele Locatelli 02cf47426c Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-06-25 18:12:51 +02:00
Samuele Locatelli e2e190cf8f Merge branch 'develop' into feature/recipe 2020-06-25 18:08:51 +02:00
Samuele Locatelli 23f2299de2 Fix XML from M.Carissoni in modBlock 2020-06-25 18:08:40 +02:00
= e3f376bf51 fix finte eccezioni della direttiva di focus. 2020-06-25 17:04:50 +02:00
= 06e3345d2b Merge remote-tracking branch 'CMS/develop' into develop 2020-06-25 16:47:27 +02:00
= cf6fdeaa79 commenti 2020-06-25 16:47:11 +02:00
Samuele Locatelli 3b823cec89 Removed pattern of using (ncAdapter) from WebAPI 2020-06-25 16:46:01 +02:00
= b0684fa03f algoritmo di posizionamento verticale gantt con ottimizzazione delle posizioni in riga. 2020-06-25 16:44:32 +02:00
Samuele Locatelli b48c18ac12 Merge branch 'develop' into feature/recipe 2020-06-25 16:08:32 +02:00
Samuele Locatelli d452e69a52 update vers number! 2020-06-25 16:08:04 +02:00
Samuele Locatelli f9c354acf5 Fix NC info (static data) retrieval 2020-06-25 16:07:13 +02:00
Samuele Locatelli d0ee6d33d1 fix develop conf for local testing 2020-06-25 14:04:14 +02:00
Samuele Locatelli 91df9b99d4 fix vers 0.9.11 on testing overview 2020-06-25 13:49:31 +02:00
Samuele Locatelli 6cd224d6ce Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-06-25 12:48:45 +02:00
Samuele Locatelli 192722d10e Merge branch 'feature/recipe' into develop 2020-06-25 12:47:36 +02:00
Samuele Locatelli 6095f02b2a Forced send on recipeOverview 2020-06-25 12:47:23 +02:00
Samuele Locatelli eae5ecdf31 more fix on XML example 2020-06-25 12:47:11 +02:00
Samuele Locatelli ceccfca48a Fixed recipe config (validator & example) 2020-06-25 12:45:24 +02:00
= 2dc5ca8ebe fix footer menu size & buttons 2020-06-25 12:29:17 +02:00
= f71c03186e primo dimensionamento corretto delle barre gantt 2020-06-25 12:12:47 +02:00
Samuele Locatelli 9f7b60234a Merge branch 'feature/recipe' into develop 2020-06-25 11:59:34 +02:00
Samuele Locatelli 5a209dc1ff Merge branch 'develop' into feature/recipe 2020-06-25 11:59:24 +02:00
Samuele Locatelli 0a47e22987 Change model for recipe config (enums parameters) 2020-06-25 11:58:47 +02:00
= 6811c29f01 Merge remote-tracking branch 'CMS/develop' into develop 2020-06-25 11:54:09 +02:00
= f168f6a9d0 layout 2020-06-25 11:52:09 +02:00
= 4343386cce fix overview & confirm 2020-06-25 11:49:32 +02:00
Samuele Locatelli 1a97ad094f Merge branch 'feature/recipe' into develop 2020-06-25 10:56:36 +02:00
Samuele Locatelli e550a386ec removed forced sends... 2020-06-25 10:56:23 +02:00
Samuele Locatelli 66865d8e98 forced send of overview data 2020-06-25 10:54:39 +02:00
= 245844a243 processo primo commit 2020-06-25 10:42:33 +02:00
Samuele Locatelli de48382f3d Merge branch 'feature/recipe' into develop 2020-06-25 10:09:45 +02:00
Samuele Locatelli bc75c29f80 Fix overview for recipe template/init 2020-06-25 10:09:31 +02:00
Samuele Locatelli e7e2601a8d updated ModBLock controllers for new datamodel 2020-06-25 09:58:10 +02:00
Samuele Locatelli 4ea2cebfeb Draft for new overview calculation (to be checked) 2020-06-24 19:14:59 +02:00
Samuele Locatelli 1dd83f4e17 Refactoring methods for File persistance 2020-06-24 18:45:22 +02:00
= ab2abc7c2e Merge remote-tracking branch 'CMS/develop' into develop 2020-06-24 11:26:08 +02:00
= 8ac729f9bf Merge remote-tracking branch 'refs/remotes/teamdev/develop'
Conflicts:
	Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts
	Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue
2020-06-24 11:25:37 +02:00
= 6cabb05270 fix produzione e selezione riscaldi 2020-06-24 11:23:55 +02:00
Samuele Locatelli 9515269f39 Fix contention on ncAdapter (high level) maybe? 2020-06-23 18:46:49 +02:00
Samuele Locatelli 821f91b318 Merge branch 'feature/check/alarms' into cleanup 2020-06-23 18:22:38 +02:00
Samuele Locatelli 6c96d8f259 update vers number 2020-06-23 18:18:17 +02:00
Samuele Locatelli ed946dcd33 forced visible for status bit on recipe parameters 2020-06-23 18:18:07 +02:00
Samuele Locatelli 684ccab8a0 Fix path for Active CLient in Release 2020-06-23 18:17:44 +02:00
Samuele Locatelli d88f3f3d47 Prod controller: single NC object + fix naming prod/prod 2020-06-23 18:17:27 +02:00
Samuele Locatelli ce02165197 Warmers controller: single NC object 2020-06-23 18:17:12 +02:00
Samuele Locatelli e53f233f42 Recipe controller: single NC object 2020-06-23 18:17:04 +02:00
Alessio 6789f9162b fix gantt component 2020-06-23 16:44:11 +02:00
Samuele Locatelli aa78101506 change config prod x vue.js UI 2020-06-23 16:09:18 +02:00
Samuele Locatelli fe4f91d4ae only siemens HMI doesn't really disconnect 2020-06-23 15:08:13 +02:00
Samuele Locatelli fcc404f048 fix connect return value 2020-06-23 15:07:30 +02:00
Alessio aefad3422c fix component for the gantt graphic 2020-06-22 17:08:39 +02:00
Alessio 04f67ac97c fix component for the gantt graphic 2020-06-22 17:00:39 +02:00
Alessio 9eefbe43cc fix processo modal 2020-06-22 15:50:43 +02:00
Samuele Locatelli c5bb2f5658 Merge branch 'feature/check/alarms' into develop 2020-06-22 15:22:44 +02:00
Samuele Locatelli 7424af263f Server: with Paolo Possanzini for fixing stsatic json/ttf 2020-06-22 15:22:09 +02:00
Alessio 8e5d1f82cb add component for the gantt graphic 2020-06-22 15:14:31 +02:00
Samuele Locatelli 3bd3c5e516 change on wwwroot data for ActiveClient 2020-06-22 14:20:42 +02:00
Samuele Locatelli f6182aa622 fix path for active client & prettybin 2020-06-22 13:19:58 +02:00
Samuele Locatelli d7590f46fe developer mode for testing client 2020-06-22 13:19:13 +02:00
Samuele Locatelli ed8f87c6d3 Pretty bin for active client! 2020-06-22 13:19:01 +02:00
Alessio d315eaeca2 fix clock 2020-06-22 11:48:17 +02:00
Alessio ee4356105a fix preriscaldo dashboard 2020-06-22 11:19:42 +02:00
Alessio e921177b38 fix preriscaldo dashboard 2020-06-22 11:11:15 +02:00
Alessio a133b5d49a fix preriscaldo dashboard 2020-06-22 10:53:08 +02:00
Alessio de271c10af fix point 7 and 12 2020-06-22 10:20:18 +02:00
Samuele Locatelli a82fc98348 Merge branch 'cleanup' into develop 2020-06-19 19:28:22 +02:00
Samuele Locatelli 5b2841c01b Executed code-cleanup on solution 2020-06-19 19:28:07 +02:00
Samuele Locatelli 5d3edf46c6 Refactoring: MODELS 2020-06-19 19:06:02 +02:00
Samuele Locatelli 50c4d72464 Merge branch 'feature/add/ProdInfo' into develop 2020-06-19 18:39:06 +02:00
Samuele Locatelli 870d525c41 Code cleanup from #if false 2020-06-19 18:36:44 +02:00
= 0b0523cb28 Merge remote-tracking branch 'CMS/develop' into develop 2020-06-19 18:13:38 +02:00
= 34ab4d7adb Merge remote-tracking branch 'teamdev/develop' into develop 2020-06-19 18:08:16 +02:00
= b5d1bc37cf riscaldi inferiore 2020-06-19 18:07:34 +02:00
= fdeb79c7e2 riscaldi con selezioni a lazo :) 2020-06-19 18:00:33 +02:00
Samuele Locatelli cdc7b49387 fixed seed duplicating data for features 2020-06-19 17:22:37 +02:00
Samuele Locatelli c5cd0b1c92 Merge branch 'develop' into feature/add/ProdInfo 2020-06-19 16:38:59 +02:00
Samuele Locatelli a48ca84178 Removed duplicated task for prodInfo check 2020-06-19 16:38:36 +02:00
Samuele Locatelli fa9325c504 Fix DB persistence methods 2020-06-19 16:37:32 +02:00
Alessio 9a7c40e020 fix style programmazione preriscaldo 2020-06-19 15:52:09 +02:00
Alessio 25444bf1a3 fix dashboard 2020-06-19 15:43:10 +02:00
Samuele Locatelli 7a73cc4b08 Merge branch 'develop' into feature/add/ProdInfo 2020-06-19 15:32:38 +02:00
Samuele Locatelli dc17731a5c Completed update of errors istance name 2020-06-19 15:32:29 +02:00
Alessio 32510556d6 add usage of prodService 2020-06-19 15:20:46 +02:00
Samuele Locatelli be747c7e39 UPdate CmsError istance name 2020-06-19 15:17:21 +02:00
Samuele Locatelli 7a48f34fb9 Start vers 0.9.5 2020-06-19 15:04:15 +02:00
Samuele Locatelli 1fe26026b6 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/add/ProdInfo 2020-06-19 14:53:25 +02:00
Alessio 65ee4154f1 fix style buttons opzioni 2020-06-19 14:53:19 +02:00
Samuele Locatelli 18bc2da627 Merge branch 'develop' into feature/add/ProdInfo 2020-06-19 14:50:43 +02:00
Samuele Locatelli 20a829b50b Fix server startup for TMP file creation 2020-06-19 14:50:29 +02:00
Samuele Locatelli b287da9b95 Fix TMP folder ThermoActive 2020-06-19 14:50:07 +02:00
Samuele Locatelli 688420c42b Reading of Warming data: thread delayed 2020-06-19 14:49:42 +02:00
Alessio 279dfb6bb0 fix opzioni 2020-06-19 14:34:35 +02:00
= e6dcbf11ac fix style 2020-06-19 14:07:49 +02:00
= 5e4fecdc6f fix 2020-06-19 14:00:40 +02:00
= c55f0eddcd Merge remote-tracking branch 'teamdev/develop' into develop 2020-06-19 13:55:06 +02:00
= 92b9cea7d8 fix opzioni 2020-06-19 13:54:18 +02:00
Alessio 86370282ed fix point 12 2020-06-19 12:53:24 +02:00
Alessio 6dcffeb72b fix dashboard 2020-06-19 12:43:22 +02:00
Alessio e17d5c25de Merge remote-tracking branch 'origin/develop' into develop 2020-06-19 12:33:30 +02:00
Alessio ad589992f3 add prodService and fix dashboard 2020-06-19 12:33:23 +02:00
= de4dfdcbb0 fix grafici 2020-06-19 12:03:19 +02:00
= 49e3242f3f Merge remote-tracking branch 'CMS/develop' into develop 2020-06-19 11:04:20 +02:00
= dafafbca13 Merge remote-tracking branch 'teamdev/develop' into develop 2020-06-19 10:47:48 +02:00
= daf9c93309 fix pirometro inferiore 2020-06-19 10:45:48 +02:00
= eedd1bee1f fix termo superiore 2020-06-19 10:41:47 +02:00
Alessio 5aa519ea72 add list of components and arch-interface to the dashboard 2020-06-19 10:26:55 +02:00
Samuele Locatelli a2efd0d3f3 Merge branch 'develop' into feature/add/ProdInfo 2020-06-18 17:14:37 +02:00
Samuele Locatelli 62b0a6d481 forced recipe param error false in debug for UI 2020-06-18 17:14:24 +02:00
= 20013ef3e4 Merge remote-tracking branch 'teamdev/develop' into develop 2020-06-18 17:10:29 +02:00
= 4a4223957d fix 2020-06-18 17:10:17 +02:00
Samuele Locatelli bbc5d131ad New risk data (actual) from Marco Carissoni, new version 2020-06-18 17:02:05 +02:00
Samuele Locatelli 2741c56a22 commented actual visible/enabled for recipe for UI 2020-06-18 17:01:26 +02:00
Alessio e12c5e6b62 fix point 8 and 6 2020-06-18 16:50:47 +02:00
= 1329b7d91f fix dashboard grid size 2020-06-18 16:47:04 +02:00
Alessio 062aa0ad27 Merge remote-tracking branch 'origin/develop' into develop 2020-06-18 16:36:24 +02:00
Alessio 997f8fdfb4 Auto stash before merge of "develop" and "origin/develop" 2020-06-18 16:36:13 +02:00
= 6134047b61 fix 2020-06-18 16:36:06 +02:00
= eb4ad92f3e fix dashboard layout 2020-06-18 16:31:16 +02:00
= f54f96a42f Merge remote-tracking branch 'teamdev/develop' into develop 2020-06-18 15:40:02 +02:00
= 8fcd50d47b disattivazione sliders and numeric 2020-06-18 15:39:27 +02:00
Alessio 23e8767604 add bottom line 2020-06-18 14:40:57 +02:00
Alessio c11f9028db fix font family 2020-06-18 14:08:46 +02:00
Alessio ad196ad788 fix dashboard 2020-06-18 12:00:04 +02:00
Alessio f906a05969 add component to dashboard 2020-06-18 10:31:17 +02:00
Samuele Locatelli 8742cbee18 ver 0.9.3 for testing, prettybin lib management 2020-06-18 08:22:52 +02:00
Samuele Locatelli 7ed56b3a68 Merge branch 'feature/add/ProdInfo' into develop 2020-06-17 18:35:56 +02:00
Samuele Locatelli 54685853bb Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-06-17 18:35:49 +02:00
Samuele Locatelli fa060cb839 updated for prodInfo setup and pz target 2020-06-17 18:34:56 +02:00
= 91872776f0 Merge remote-tracking branch 'CMS/develop' into develop 2020-06-17 17:42:08 +02:00
= 77d8a6dbac Merge remote-tracking branch 'teamdev/develop' into develop 2020-06-17 17:41:19 +02:00
= d030f09709 fix clock 2020-06-17 17:41:00 +02:00
= 8858602f9c fix gauge and dashboard layout 2020-06-17 17:36:11 +02:00
Samuele Locatelli 3574dffaa6 Fix strobe/ack for new prodInfo data 2020-06-17 17:20:38 +02:00
Samuele Locatelli ed74fb9b37 Fix compilation path for client 2020-06-17 16:58:16 +02:00
Alessio c0fdf9668b fix layout processo 2020-06-17 15:31:25 +02:00
Samuele Locatelli 97c4ce8c26 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-06-17 14:52:04 +02:00
Samuele Locatelli 12dc55ef8c Completed prodInfo initial integration, beta test 2020-06-17 14:48:53 +02:00
Samuele Locatelli cc68908084 Added DB migration 2020-06-17 14:48:32 +02:00
Alessio 99279824ef fix buttons 2020-06-17 11:51:06 +02:00
Alessio 36c5ff8def fix paddle 2020-06-17 11:37:38 +02:00
= d32f00bde6 Merge remote-tracking branch 'CMS/develop' into develop 2020-06-17 09:55:05 +02:00
= 8eed4ec2eb fix chart 2020-06-17 09:53:40 +02:00
= c249d7a9be Merge remote-tracking branch 'teamdev/develop' into develop 2020-06-17 09:49:56 +02:00
= 0b8f0adb96 fix chart 2020-06-17 09:49:43 +02:00
Alessio aae6aa8c09 fix layout avvio produzione modal 2020-06-17 09:33:57 +02:00
Alessio 3d9458002b apply shrink 2020-06-17 08:59:33 +02:00
Alessio b84ca57735 Merge branch 'newfeature/paddle' into develop 2020-06-17 08:32:19 +02:00
Samuele Locatelli a6cdf864ae FIrst version of prodInfo DB persistence 2020-06-16 19:28:27 +02:00
Alessio d74f886a06 add labels to svgchart 2020-06-16 16:44:31 +02:00
Alessio 0be93533d7 fix positioning of the paddle butotn 2020-06-15 16:10:09 +02:00
Alessio 4c907a2474 fix positioning paddle 2020-06-15 13:50:08 +02:00
Alessio fe82ea006b Merge branch 'develop' into newfeature/paddle 2020-06-15 10:49:53 +02:00
Alessio cbfd2fe3c5 Merge branch 'develop' into newfeature/paddle 2020-06-11 10:48:23 +02:00
1119 changed files with 90867 additions and 268832 deletions
+1
View File
@@ -20,3 +20,4 @@ Output/
*.ntvs*
*.njsproj
/ConsoleApp1
/WindowsFormsApp1
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+33994 -29797
View File
File diff suppressed because it is too large Load Diff
Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More