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

Compare commits

merge into: Egalware/cms_thermo_active:feature/add/ProdInfo
Branches Tags
Egalware/cms_thermo_active:develop Egalware/cms_thermo_active:new/ThermoCamManager Egalware/cms_thermo_active:new/UnderTheHood Egalware/cms_thermo_active:Connect-UI Egalware/cms_thermo_active:Star_Paddle Egalware/cms_thermo_active:Thermocamera Egalware/cms_thermo_active:featue/Axes Egalware/cms_thermo_active:new/M156 Egalware/cms_thermo_active:new/dirSaveMgt Egalware/cms_thermo_active:feature/prodMgmt Egalware/cms_thermo_active:bugfix/softkeys Egalware/cms_thermo_active:bugfix/calcoloStatus Egalware/cms_thermo_active:feature/recipe Egalware/cms_thermo_active:feature/alarms Egalware/cms_thermo_active:cleanup Egalware/cms_thermo_active:feature/check/alarms Egalware/cms_thermo_active:feature/add/ProdInfo Egalware/cms_thermo_active:feature/add/risk Egalware/cms_thermo_active:feature/add/prodData Egalware/cms_thermo_active:feature/add/moduleBlock Egalware/cms_thermo_active:feature/add/recipeModel Egalware/cms_thermo_active:feature/add/testing-signalr Egalware/cms_thermo_active:feature/FixNamespace Egalware/cms_thermo_active:feature/removal/toolMan
Egalware/cms_thermo_active:192 Egalware/cms_thermo_active:191 Egalware/cms_thermo_active:187 Egalware/cms_thermo_active:186 Egalware/cms_thermo_active:v_185 Egalware/cms_thermo_active:AutoSave_2024/02/02 Egalware/cms_thermo_active:AutoSave_2024/10/01 Egalware/cms_thermo_active:AutoSave_2024/03/08 Egalware/cms_thermo_active:2024/01/09 Egalware/cms_thermo_active:185 Egalware/cms_thermo_active:184 Egalware/cms_thermo_active:183 Egalware/cms_thermo_active:182 Egalware/cms_thermo_active:179 Egalware/cms_thermo_active:1.1.174 Egalware/cms_thermo_active:v_0.12.70 Egalware/cms_thermo_active:v_0.12.69 Egalware/cms_thermo_active:v_0.9.46 Egalware/cms_thermo_active:v_0.9.21
...
pull from: Egalware/cms_thermo_active:bugfix/softkeys
Branches Tags
Egalware/cms_thermo_active:new/ThermoCamManager Egalware/cms_thermo_active:develop Egalware/cms_thermo_active:new/UnderTheHood Egalware/cms_thermo_active:Connect-UI Egalware/cms_thermo_active:Star_Paddle Egalware/cms_thermo_active:Thermocamera Egalware/cms_thermo_active:featue/Axes Egalware/cms_thermo_active:new/M156 Egalware/cms_thermo_active:new/dirSaveMgt Egalware/cms_thermo_active:feature/prodMgmt Egalware/cms_thermo_active:bugfix/softkeys Egalware/cms_thermo_active:bugfix/calcoloStatus Egalware/cms_thermo_active:feature/recipe Egalware/cms_thermo_active:feature/alarms Egalware/cms_thermo_active:cleanup Egalware/cms_thermo_active:feature/check/alarms Egalware/cms_thermo_active:feature/add/ProdInfo Egalware/cms_thermo_active:feature/add/risk Egalware/cms_thermo_active:feature/add/prodData Egalware/cms_thermo_active:feature/add/moduleBlock Egalware/cms_thermo_active:feature/add/recipeModel Egalware/cms_thermo_active:feature/add/testing-signalr Egalware/cms_thermo_active:feature/FixNamespace Egalware/cms_thermo_active:feature/removal/toolMan
Egalware/cms_thermo_active:192 Egalware/cms_thermo_active:191 Egalware/cms_thermo_active:187 Egalware/cms_thermo_active:186 Egalware/cms_thermo_active:v_185 Egalware/cms_thermo_active:AutoSave_2024/02/02 Egalware/cms_thermo_active:AutoSave_2024/10/01 Egalware/cms_thermo_active:AutoSave_2024/03/08 Egalware/cms_thermo_active:2024/01/09 Egalware/cms_thermo_active:185 Egalware/cms_thermo_active:184 Egalware/cms_thermo_active:183 Egalware/cms_thermo_active:182 Egalware/cms_thermo_active:179 Egalware/cms_thermo_active:1.1.174 Egalware/cms_thermo_active:v_0.12.70 Egalware/cms_thermo_active:v_0.12.69 Egalware/cms_thermo_active:v_0.9.46 Egalware/cms_thermo_active:v_0.9.21

472 Commits
feature/add/ProdInfo ... bugfix/softkeys

Author SHA1 Message Date
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
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
= 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
656 changed files with 59731 additions and 72671 deletions
Expand all files Collapse all files
.gitignore
+1
View File
@@ -20,3 +20,4 @@ Output/
*.ntvs*
*.njsproj
/ConsoleApp1
/WindowsFormsApp1
Client.Chromium/CEF/Release_X64/cef.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/cef_100_percent.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/cef_200_percent.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/cef_extensions.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/cef_sandbox.lib
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/chrome_elf.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/d3dcompiler_47.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/devtools_resources.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/icudtl.dat
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/libEGL.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/libGLESv2.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/libcef.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/libcef.lib
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/libcfx64.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/libcfx64.exp
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/libcfx64.ilk
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/libcfx64.lib
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/libcfx64.pdb
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/natives_blob.bin
+2536 -8624
View File
File diff suppressed because it is too large Load Diff
Client.Chromium/CEF/Release_X64/snapshot_blob.bin
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/swiftshader/libEGL.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/swiftshader/libGLESv2.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X64/v8_context_snapshot.bin
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/cef.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/cef_100_percent.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/cef_200_percent.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/cef_extensions.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/cef_sandbox.lib
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/chrome_elf.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/d3dcompiler_43.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/d3dcompiler_47.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/devtools_resources.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/icudtl.dat
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/libEGL.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/libGLESv2.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/libcef.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/libcef.lib
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/natives_blob.bin
-8660
View File
File diff suppressed because it is too large Load Diff
Client.Chromium/CEF/Release_X86/snapshot_blob.bin
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/swiftshader/libEGL.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/swiftshader/libGLESv2.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/v8_context_snapshot.bin
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Release_X86/widevinecdmadapter.dll
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/am.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/ar.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/bg.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/bn.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/ca.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/cs.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/da.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/de.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/el.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/en-GB.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/en-US.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/es-419.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/es.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/et.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/fa.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/fi.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/fil.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/fr.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/gu.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/he.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/hi.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/hr.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/hu.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/id.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/it.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/ja.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/kn.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/ko.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/lt.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/lv.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/ml.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/mr.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/ms.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/nb.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/nl.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/pl.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/pt-BR.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/pt-PT.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/ro.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/ru.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/sk.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/sl.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/sr.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/sv.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/sw.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/ta.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/te.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/th.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/tr.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/uk.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/vi.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/zh-CN.pak
BIN
View File
Binary file not shown.
Client.Chromium/CEF/Resources/locales/zh-TW.pak
BIN
View File
Binary file not shown.
Client.Chromium/ChromiumFX.dll
BIN
View File
Binary file not shown.
Client.Chromium/ChromiumFX.xml
+33994 -29797
View File
File diff suppressed because it is too large Load Diff
Client.Chromium/ChromiumWebBrowser.dll
BIN
View File
Binary file not shown.

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