Commit Graph

2562 Commits

Author SHA1 Message Date
Samuele Locatelli db7a6c39c3 Merge branch 'feature/add/moduleBlock' into develop 2020-06-05 12:07:11 +02:00
Samuele Locatelli 3b3b6c424e Completed RISK config decoding 2020-06-05 12:06:11 +02:00
Samuele Locatelli 90ef09785c update decoding objects 2020-06-04 19:03:28 +02:00
Samuele Locatelli eba5920137 Update risk naming 2020-06-04 19:03:13 +02:00
Samuele Locatelli 3d16c4d682 Fix moduleBLock config 2020-06-04 19:02:56 +02:00
Samuele Locatelli d6ea0e7f9a Update ENUM uppercase 2020-06-04 15:52:00 +02:00
Samuele Locatelli 8bd8144294 Started config setup for new objects 2020-06-04 15:21:15 +02:00
Samuele Locatelli e5daf52bb4 Add xml/xsd for ModBlock and Risk 2020-06-04 15:21:00 +02:00
Samuele Locatelli 3120746f60 Draft DTO a classess for warmers & modules 2020-06-01 19:03:32 +02:00
Samuele Locatelli 642026eadc update x nuovi metodi CORE library 2020-06-01 18:23:37 +02:00
Samuele Locatelli e3fb330264 Preliminary models added to test 2020-05-29 19:17:59 +02:00
Samuele Locatelli edfb4c4423 Merge branch 'develop' into feature/add/testing-signalr 2020-05-29 12:20:48 +02:00
Samuele Locatelli 9294cecc15 COmpletata webApi scrittura parametri ricetta 2020-05-29 12:20:34 +02:00
Samuele Locatelli 14ed50b58d WebApi method 4 params update 2020-05-29 11:42:47 +02:00
Samuele Locatelli 3d6e711bf0 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-05-28 18:51:00 +02:00
Samuele Locatelli 79bf736201 commented signal-r method to review... 2020-05-28 18:36:36 +02:00
Samuele Locatelli 3a39f20b5a Metodo scrittura ricetta da testare 2020-05-28 18:06:51 +02:00
Samuele Locatelli fa77cc11cb Update Adapter 2020-05-28 17:49:25 +02:00
Samuele Locatelli 1a120db9e3 Update conf recipeParams 2020-05-28 17:36:09 +02:00
= d3f6dc4a77 Merge remote-tracking branch 'CMS/develop' into develop 2020-05-28 14:16:31 +02:00
= e216f9597d Merge remote-tracking branch 'CMS/develop' into develop 2020-05-28 14:16:14 +02:00
= d06f36edbe fix signalr hub connection url 2020-05-28 14:15:58 +02:00
Samuele Locatelli b732e1514d typo 2020-05-27 10:31:43 +02:00
Samuele E. Locatelli 2e84a57cfb Added pause after thread start on init (it RUNS!) 2020-05-26 19:16:51 +02:00
Samuele Locatelli 100c030844 Merge branch 'feature/add/recipeModel' into develop 2020-05-26 13:04:21 +02:00
Samuele Locatelli c020a5588b Update vers number 2020-05-26 13:04:10 +02:00
Samuele Locatelli 1532898329 Fix client/server for Signal-r, test OK! 2020-05-26 13:01:37 +02:00
Samuele Locatelli d367532d11 Merge branch 'feature/add/recipeModel' into develop 2020-05-22 18:25:11 +02:00
Samuele Locatelli 302456b21b Vari update x testing client/server 2020-05-22 18:23:25 +02:00
Samuele Locatelli bc0a33cf7f refresh methods signal-r & dobug S7Net 2020-05-19 20:12:34 +02:00
Samuele Locatelli dcb65ad4f3 fix x test locale UI 2020-05-19 20:06:15 +02:00
Samuele Locatelli 117a6288bb Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-05-19 16:27:21 +02:00
Samuele Locatelli 95484c7ee7 Update metodi preliminari signal-r 2020-05-19 16:23:10 +02:00
= 4db37d663f fix caricamento signalr 2020-05-19 15:19:08 +02:00
= bbfe28edc7 log delle chiamate signalr 2020-05-19 15:13:57 +02:00
= 180334822b Merge remote-tracking branch 'teamdev/develop' into develop 2020-05-19 15:04:58 +02:00
Samuele Locatelli 63b09c1dfb OK con S7 il thermo NC!!! 2020-05-19 08:55:40 +02:00
Samuele Locatelli ea32e6b506 Debug on NC continues 2020-05-18 17:54:56 +02:00
Samuele Locatelli e65ba32e09 Start integration for S7Net NC 2020-05-18 17:25:56 +02:00
Samuele Locatelli 426eaeea95 Start update for signal-r THERMO management 2020-05-15 18:38:49 +02:00
Alessio 026a85e5ff Merge branch 'newfeature/processo' into develop 2020-05-07 12:22:32 +02:00
Alessio 85a387cc86 fix merge 2020-05-07 12:22:12 +02:00
Alessio dfcaac23ba Merge branch 'newfeature/paddle' into newfeature/processo 2020-05-07 12:08:08 +02:00
francesco.guerrieri 9c1928c7ae fix button modal and binding for modal options 2020-05-07 11:55:31 +02:00
Alessio 506c14f82a Merge branch 'newfeature/programmazione-preriscaldo' into newfeature/processo 2020-05-07 10:59:09 +02:00
Alessio 10835c555e fix footer buttons 2020-05-07 10:58:56 +02:00
Damiano c1adb138e7 Fix binding 2020-05-07 10:52:21 +02:00
Damiano f06dac3a7b Auto stash before merge of "newfeature/programmazione-preriscaldo" and "origin/newfeature/programmazione-preriscaldo" 2020-05-07 09:37:13 +02:00
Alessio 6545727c2f fix binding and footer buttons 2020-05-07 09:20:29 +02:00
francesco.guerrieri cf240405a5 fix binding for options and vacuum modal 2020-05-06 17:14:52 +02:00