 =
|
23af55e1e1
|
riscaldi
|
2020-09-17 17:23:43 +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 |
|
|
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 |
|