Commit Graph

951 Commits

Author SHA1 Message Date
Alessandro Francia 375d730abf validation number negative 2018-06-07 12:08:40 +02:00
Alessandro Francia f6e0b0aa53 fix info utensile 2018-06-07 11:42:44 +02:00
Alessandro Francia dd83c7146b fix 2018-06-07 10:29:19 +02:00
Alessandro Francia e556b243d3 info utensile 2018-06-07 10:27:44 +02:00
Lucio Maranta db79e57529 Fix demo 2018-06-07 08:51:39 +02:00
Lucio Maranta a40426198d Fix write residual life&nominal life on Siemens 2018-06-07 08:39:33 +02:00
Lucio Maranta f3921285b1 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-06 16:24:14 +02:00
Lucio Maranta c35bbbf911 Fix Nc Data API 2018-06-06 16:23:36 +02:00
Nicola Carminati 48c3432a80 Added Magazines Name 2018-06-06 16:22:05 +02:00
Alessandro Francia f4a595c10b Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-06 16:15:21 +02:00
Alessandro Francia f462463df2 mdoal info utensile tab + wait merge 2018-06-06 16:14:32 +02:00
Lucio Maranta bda30869dc Fix magazine name 2018-06-06 15:35:33 +02:00
Nicola Carminati 2b9f9d8492 Fix Translations for Tool positions 2018-06-06 15:04:51 +02:00
Nicola Carminati 2dc5fd7462 Added magazine in tool manager 2018-06-06 14:57:17 +02:00
Lucio Maranta 0cdd22b0af Added multitoolId in Tool model 2018-06-06 14:52:58 +02:00
Lucio Maranta 001d28a4a2 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-06 14:26:41 +02:00
Lucio Maranta 286e5d75f5 Added multitool location in magazine 2018-06-06 14:26:14 +02:00
Lucio Maranta 7b464a8d9e Added active magazine, name, added magazine and position in tool data 2018-06-06 14:13:04 +02:00
Alessandro Francia 9c60103559 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-06 14:12:48 +02:00
Alessandro Francia 81d3c63bcc Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-06 14:12:03 +02:00
Alessandro Francia efede7f2dc fix load and info utensile 2018-06-06 14:11:14 +02:00
Lucio Maranta 5ae53daa4e Added is loadingIsActive field in magazine configuration 2018-06-06 12:24:28 +02:00
Alessandro Francia 24bcfc09c2 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-06 11:58:36 +02:00
Lucio Maranta 664fdab230 Added magazine positizion size check before load a tool in mag
Magazine names
2018-06-06 11:58:17 +02:00
Alessandro Francia d30efe4a10 fix bug modal info utensile 2018-06-06 11:58:03 +02:00
Alessandro Francia ec3cc5658b Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-06 11:40:19 +02:00
Alessandro Francia 577c4e25e8 fix 2018-06-06 11:39:25 +02:00
Nicola Carminati d71cd628b9 Styled Disabled Magazine position 2018-06-05 17:18:06 +02:00
Lucio Maranta c36161817d Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-05 17:11:04 +02:00
Lucio Maranta d633152d0f Fix disabled magazine position bug 2018-06-05 17:10:39 +02:00
Alessandro Francia ad05ecea2b merge 2018-06-05 17:03:56 +02:00
Alessandro Francia cb1ad04aef load Depot Modal 2018-06-05 16:59:47 +02:00
Nicola Carminati 801e422345 Added drag & drop features + Square resize 2018-06-05 12:42:20 +02:00
Lucio Maranta ee61764fef Fix available tools after load/unload in magazine 2018-06-05 11:28:40 +02:00
Nicola Carminati 21aa1bb47d Fix 2018-06-05 10:20:06 +02:00
Nicola Carminati a82b37d78d Fix Icon Card 2018-06-05 10:19:46 +02:00
Alessandro Francia ed4c28f291 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-05 10:03:50 +02:00
Alessandro Francia 391506b649 modal load depot 2018-06-05 10:03:04 +02:00
Nicola Carminati 92e1ee52ec Fix Magazine navigation (Siemens) 2018-06-05 09:52:38 +02:00
Nicola Carminati ab9aa1a027 Added functionality to Depot 2018-06-05 09:32:19 +02:00
Alessandro Francia 4816da97a2 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-04 16:58:03 +02:00
Lucio Maranta e9156f6d72 Added magazinePosition and tool type check before load 2018-06-04 16:57:42 +02:00
Alessandro Francia 0d0c9a92ba add button plus and disable if magpos occupied 2018-06-04 16:57:20 +02:00
Lucio Maranta 58168945af Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-06-04 15:01:10 +02:00
Alessandro Francia ca85db0aef fix 2018-06-04 14:57:35 +02:00
Lucio Maranta c5887a2754 FIx 2018-06-04 14:52:29 +02:00
Alessandro Francia 45b5e7a94b merge 2018-06-04 14:33:38 +02:00
Alessandro Francia 88cbd374d3 fix magazine position depot and info modal depot 2018-06-04 14:30:02 +02:00
Nicola Carminati 5144c947b5 Fix speed-load magazine view 2018-06-04 14:26:28 +02:00
Lucio Maranta a9c0d93bf5 Fix siemens library connection 2018-06-04 12:53:12 +02:00