Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

Step.Utils/languages/IT.xml

@@ -169,9 +169,15 @@
   <tooling_families_boxright_newlabel>Creazione nuova famiglia</tooling_families_boxright_newlabel>
   <siemens_tooling_families_boxright_editlabel>Modifica gruppo %s</siemens_tooling_families_boxright_editlabel>
   <siemens_tooling_families_boxright_newlabel>Creazione nuovo gruppo</siemens_tooling_families_boxright_newlabel>  
-  <tooling_childtoolsfamily_skill_tools>Untensile %d</tooling_childtoolsfamily_skill_tools>  
+  <tooling_childtoolsfamily_skill_tools>Utensile %d</tooling_childtoolsfamily_skill_tools>  
   <tooling_childtoolsfamily_boxright_editlabel>Modifica utensile %d della famiglia %s</tooling_childtoolsfamily_boxright_editlabel>
   <siemens_tooling_childtoolsfamily_boxright_editlabel>Modifica utensile %d del gruppo %s</siemens_tooling_childtoolsfamily_boxright_editlabel>
+  <tooling_equipment_search_placeholder>Cerca un utensile per nome</tooling_equipment_search_placeholder>
+  <tooling_shank_search_placeholder>Cerca un colodo per Id</tooling_shank_search_placeholder>
+  <siemens_tooling_shank_search_placeholder>Cerca un Multitool per Id</siemens_tooling_shank_search_placeholder>
+  <tooling_magpos_search_placeholder>Cerca una manina per Id</tooling_magpos_search_placeholder>
+  <tooling_families_search_placeholder>Cerca una famiglia per nome</tooling_families_search_placeholder>
+  <siemens_tooling_families_search_placeholder>Cerca un gruppo-utensili per nome</siemens_tooling_families_search_placeholder>
   
   <!-- Tool Manager - Categories -->
   <tooling_equipment_list_category_general>Generali:</tooling_equipment_list_category_general>

Step.Utils/languages/en.xml

@@ -171,7 +171,13 @@
   <tooling_childtoolsfamily_skill_tools>Tool no. %d</tooling_childtoolsfamily_skill_tools>  
   <tooling_childtoolsfamily_boxright_editlabel>Edit Tool no. %d of family: %s</tooling_childtoolsfamily_boxright_editlabel>
   <siemens_tooling_childtoolsfamily_boxright_editlabel>Edit Tool no. %d of group: %s</siemens_tooling_childtoolsfamily_boxright_editlabel>
-
+  <tooling_equipment_search_placeholder>Find a tool by name</tooling_equipment_search_placeholder>
+  <tooling_shank_search_placeholder>Find a shank by Id</tooling_shank_search_placeholder>
+  <siemens_tooling_shank_search_placeholder>Find a Multitool by Id</siemens_tooling_shank_search_placeholder>
+  <tooling_magpos_search_placeholder>Find a mag.position by Id</tooling_magpos_search_placeholder>
+  <tooling_families_search_placeholder>Find a family by name</tooling_families_search_placeholder>
+  <siemens_tooling_families_search_placeholder>Find a tool-Group by name</siemens_tooling_families_search_placeholder>
+  
   <!-- Tool Manager - Categories -->
   <tooling_equipment_list_category_general>Generics:</tooling_equipment_list_category_general>
   <siemens_tooling_equipment_list_category_family>Tool - Groups:</siemens_tooling_equipment_list_category_family>

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<PositionModel> 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())

Step/wwwroot/assets/styles/base/layout.less

@@ -88,7 +88,7 @@ body {
     -webkit-user-select: none;
 }
 
-#app.blur {
+.blur {
     filter: blur(10px);
 }
 

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;

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 {

Step/wwwroot/src/App.vue

@@ -6,7 +6,7 @@
 
       <under-the-hood></under-the-hood>
       <div id="main-view" ref="main-view" :class="{liftedUp : isMainViewLiftedUp}">
-        <router-view/>
+        <router-view  :class="{'blur':applyBlurInternal}" />
         <modal-container name="modal" container-name="modal2" :inform-hmi="false" ></modal-container>
       </div>
       <div id="main-view-handler" ref="main-view-handler" @click="toggleMainView()"  :class="{liftedUp : isMainViewLiftedUp}">
@@ -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
     };
   }

Step/wwwroot/src/components/tooling-equipment.vue

@@ -14,7 +14,7 @@
                         {{'tooling_equipment_label_search' | localize("Seleziona un utensile")}}
                     </div>
                     <div class="group-btn">
-                        <input type="text" v-model="searchText">
+                        <input type="text" v-model="searchText" :placeholder="'tooling_equipment_search_placeholder' | localize('Cerca un utensile per nome')">
                         <i class="fa fa-2x fa-search"></i>
                         <!-- <button class="btn square" @click="applyFilter()"><i class="fa fa-search"></i></button> -->
                         <!-- <button class="btn square"><i class="fa fa-filter"></i></button> -->

Step/wwwroot/src/components/tooling-families.vue

@@ -14,7 +14,7 @@
                         {{'tooling_families_label_search' | localize("Seleziona una famiglia")}}
                     </div>
                     <div class="group-btn">
-                        <input type="text" v-model="searchText">
+                        <input type="text" v-model="searchText" :placeholder="'tooling_families_search_placeholder' | localize('Cerca una famiglia per nome')">
                         <i class="fa fa-2x fa-search"></i>
                         <!-- <button class="btn square"><i class="fa fa-filter"></i></button> -->
                     </div>

Step/wwwroot/src/components/tooling-magpos.vue

@@ -14,7 +14,7 @@
                         {{'tooling_magpos_label_search' | localize("Seleziona una manina")}}
                     </div>
                     <div class="group-btn">
-                        <input type="text" v-model="searchText">
+                        <input type="text" v-model="searchText" :placeholder="'tooling_magpos_search_placeholder' | localize('Cerca una manina per id')">
                         <i class="fa fa-2x fa-search"></i>
                         <!-- <button class="btn square"><i class="fa fa-filter"></i></button> -->
                     </div>

Step/wwwroot/src/components/tooling-shanks.vue

@@ -14,7 +14,7 @@
                         {{'tooling_shanks_label_search' | localize("Seleziona un codolo")}}
                     </div>
                     <div class="group-btn">
-                        <input type="text" v-model="searchText">
+                        <input type="text" v-model="searchText" :placeholder="'tooling_shank_search_placeholder' | localize('Cerca un codolo per id')" >
                         <i class="fa fa-2x fa-search"></i>
                         <!-- <button class="btn square"><i class="fa fa-filter"></i></button> -->
                     </div>

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<server.DepotModel[]>(this.BASE_URL + "magazine/" + magazineId);
+        let result = await this.Get<server.DepotModel[]>(this.BASE_URL + "magazine/" + magazineId + "/mounted_tools");
         depotActions.updateDepot(store, result);
         return result;
     }