 Samuele Locatelli
|
807e225de8
|
Confirm recipe post PLC request
|
2020-06-26 12:19:30 +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 |
|