diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml index 8b45ebf8..fc5c1e33 100644 --- a/Step.Utils/languages/IT.xml +++ b/Step.Utils/languages/IT.xml @@ -169,9 +169,15 @@ Creazione nuova famiglia Modifica gruppo %s Creazione nuovo gruppo - Untensile %d + Utensile %d Modifica utensile %d della famiglia %s Modifica utensile %d del gruppo %s + Cerca un utensile per nome + Cerca un colodo per Id + Cerca un Multitool per Id + Cerca una manina per Id + Cerca una famiglia per nome + Cerca un gruppo-utensili per nome Generali: diff --git a/Step.Utils/languages/en.xml b/Step.Utils/languages/en.xml index 05812bbd..dba018a9 100644 --- a/Step.Utils/languages/en.xml +++ b/Step.Utils/languages/en.xml @@ -171,7 +171,13 @@ Tool no. %d Edit Tool no. %d of family: %s Edit Tool no. %d of group: %s - + Find a tool by name + Find a shank by Id + Find a Multitool by Id + Find a mag.position by Id + Find a family by name + Find a tool-Group by name + Generics: Tool - Groups: diff --git a/Step/Controllers/WebApi/ToolTableController.cs b/Step/Controllers/WebApi/ToolTableController.cs index f04092a0..a52335b8 100644 --- a/Step/Controllers/WebApi/ToolTableController.cs +++ b/Step/Controllers/WebApi/ToolTableController.cs @@ -163,6 +163,22 @@ namespace Step.Controllers.WebApi } + [Route("magazine/{magazineId:int}/positions"), HttpGet] + public IHttpActionResult GetMagazinePositions(int magazineId) + { + using (NcHandler ncHandler = new NcHandler()) + { + ncHandler.Connect(); + CmsError libraryError = ncHandler.GetMagazinesPositionsData(out List magazines); + // Filter by magazine id + magazines = magazines.Where(x => x.MagazineId == magazineId).ToList(); + if (libraryError.IsError()) + return BadRequest(libraryError.localizationKey); + + return Ok(magazines); + } + } + [Route("magazine/{magazineId}/position/{positionId}"), HttpPut] public IHttpActionResult PutMagazinePosition([Required]int magazineId, [Required]int positionId, [FromBody]DTOMagazinesPositionsModel magazinesPos) { @@ -315,7 +331,7 @@ namespace Step.Controllers.WebApi } } - [Route("magazine/{magazineId:int}"), HttpGet] + [Route("magazine/{magazineId:int}/mounted_tools"), HttpGet] public IHttpActionResult GetMagazineTools(int magazineId) { using (NcHandler ncHandler = new NcHandler()) diff --git a/Step/wwwroot/assets/styles/base/layout.less b/Step/wwwroot/assets/styles/base/layout.less index edc7d8ef..a70bfbe2 100644 --- a/Step/wwwroot/assets/styles/base/layout.less +++ b/Step/wwwroot/assets/styles/base/layout.less @@ -88,7 +88,7 @@ body { -webkit-user-select: none; } -#app.blur { +.blur { filter: blur(10px); } diff --git a/Step/wwwroot/assets/styles/base/tooling-equipment.less b/Step/wwwroot/assets/styles/base/tooling-equipment.less index 35d9da7e..0af311d7 100644 --- a/Step/wwwroot/assets/styles/base/tooling-equipment.less +++ b/Step/wwwroot/assets/styles/base/tooling-equipment.less @@ -71,6 +71,9 @@ box-sizing: border-box; font-size: 18px; } + input[type=text]{ + padding-left: 5px; + } i{ width: 44px; height: 44px; diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index 97c6753b..67ac9b5d 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -5115,6 +5115,24 @@ footer .container button.big:before { box-sizing: border-box; font-size: 18px; } +.tooling-equipment-container .tooling-equipment-box .body .list-left .search .group-btn input[type=text], +.tooling-families-container .tooling-equipment-box .body .list-left .search .group-btn input[type=text], +.tooling-shanks-container .tooling-equipment-box .body .list-left .search .group-btn input[type=text], +.tooling-magpos-container .tooling-equipment-box .body .list-left .search .group-btn input[type=text], +.tooling-equipment-container .tooling-families-box .body .list-left .search .group-btn input[type=text], +.tooling-families-container .tooling-families-box .body .list-left .search .group-btn input[type=text], +.tooling-shanks-container .tooling-families-box .body .list-left .search .group-btn input[type=text], +.tooling-magpos-container .tooling-families-box .body .list-left .search .group-btn input[type=text], +.tooling-equipment-container .tooling-shanks-box .body .list-left .search .group-btn input[type=text], +.tooling-families-container .tooling-shanks-box .body .list-left .search .group-btn input[type=text], +.tooling-shanks-container .tooling-shanks-box .body .list-left .search .group-btn input[type=text], +.tooling-magpos-container .tooling-shanks-box .body .list-left .search .group-btn input[type=text], +.tooling-equipment-container .tooling-magpos-box .body .list-left .search .group-btn input[type=text], +.tooling-families-container .tooling-magpos-box .body .list-left .search .group-btn input[type=text], +.tooling-shanks-container .tooling-magpos-box .body .list-left .search .group-btn input[type=text], +.tooling-magpos-container .tooling-magpos-box .body .list-left .search .group-btn input[type=text] { + padding-left: 5px; +} .tooling-equipment-container .tooling-equipment-box .body .list-left .search .group-btn i, .tooling-families-container .tooling-equipment-box .body .list-left .search .group-btn i, .tooling-shanks-container .tooling-equipment-box .body .list-left .search .group-btn i, @@ -7836,7 +7854,7 @@ body { user-select: none; -webkit-user-select: none; } -#app.blur { +.blur { filter: blur(10px); } #main-view { diff --git a/Step/wwwroot/src/App.vue b/Step/wwwroot/src/App.vue index 96e687fe..8a344bac 100644 --- a/Step/wwwroot/src/App.vue +++ b/Step/wwwroot/src/App.vue @@ -6,7 +6,7 @@
- +
@@ -62,6 +62,15 @@ export default { this.applyBlur = false; }); + + ms.subscribeToChannel("show-modal2", args => { + this.applyBlurInternal = true; + }); + + ms.subscribeToChannel("hide-modal2", args => { + this.applyBlurInternal = false; + }); + ms.subscribeToChannel("show-loading", args => { this.loadingOperations++; }); @@ -189,6 +198,7 @@ export default { return { state: this.$store.state, applyBlur: false, + applyBlurInternal: false, loadingOperations: 0 }; } diff --git a/Step/wwwroot/src/components/tooling-equipment.vue b/Step/wwwroot/src/components/tooling-equipment.vue index 5e1292a7..9f2374bf 100644 --- a/Step/wwwroot/src/components/tooling-equipment.vue +++ b/Step/wwwroot/src/components/tooling-equipment.vue @@ -14,7 +14,7 @@ {{'tooling_equipment_label_search' | localize("Seleziona un utensile")}}
- + diff --git a/Step/wwwroot/src/components/tooling-families.vue b/Step/wwwroot/src/components/tooling-families.vue index 241988b6..52cf47aa 100644 --- a/Step/wwwroot/src/components/tooling-families.vue +++ b/Step/wwwroot/src/components/tooling-families.vue @@ -14,7 +14,7 @@ {{'tooling_families_label_search' | localize("Seleziona una famiglia")}}
- +
diff --git a/Step/wwwroot/src/components/tooling-magpos.vue b/Step/wwwroot/src/components/tooling-magpos.vue index ac0d4b60..8c901c2a 100644 --- a/Step/wwwroot/src/components/tooling-magpos.vue +++ b/Step/wwwroot/src/components/tooling-magpos.vue @@ -14,7 +14,7 @@ {{'tooling_magpos_label_search' | localize("Seleziona una manina")}}
- +
diff --git a/Step/wwwroot/src/components/tooling-shanks.vue b/Step/wwwroot/src/components/tooling-shanks.vue index b70170c3..b88e4979 100644 --- a/Step/wwwroot/src/components/tooling-shanks.vue +++ b/Step/wwwroot/src/components/tooling-shanks.vue @@ -14,7 +14,7 @@ {{'tooling_shanks_label_search' | localize("Seleziona un codolo")}}
- +
diff --git a/Step/wwwroot/src/services/depotService.ts b/Step/wwwroot/src/services/depotService.ts index a2212534..54daa23f 100644 --- a/Step/wwwroot/src/services/depotService.ts +++ b/Step/wwwroot/src/services/depotService.ts @@ -5,7 +5,7 @@ import { store, AppModel } from "../store"; export class DepotService extends baseRestService { BASE_URL = "api/tool_manager/"; async GetMagazine(magazineId: any){ - let result = await this.Get(this.BASE_URL + "magazine/" + magazineId); + let result = await this.Get(this.BASE_URL + "magazine/" + magazineId + "/mounted_tools"); depotActions.updateDepot(store, result); return result; }