merge

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

@@ -336,6 +336,11 @@
         .card-tool-depot-image{
             margin-top: 20px;
             margin-left: 18px;
+            img{
+                max-width: 104px;
+                max-height: 104px;
+
+            }
         }
         .card-tool-depot-title{
             display: flex;

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

@@ -41,7 +41,7 @@ sans-serif;
         padding: 0;
         width: 100%;
     }
-    input.invalid, input[aria-invalid="true"] {
+    input.invalid:not([readonly]), input[aria-invalid="true"]:not([readonly]) {
         border-color: @color-scarlet;
     }
     small.error {
@@ -68,6 +68,6 @@ sans-serif;
     margin: auto !important;
 }
 
-input[aria-invalid="true"] {
+input[aria-invalid="true"]:not([readonly]) {
   border-color: @color-scarlet !important;
 }

Step/wwwroot/assets/styles/style.css

@@ -599,8 +599,8 @@
   padding: 0;
   width: 100%;
 }
-.form-group input.invalid,
-.form-group input[aria-invalid="true"] {
+.form-group input.invalid:not([readonly]),
+.form-group input[aria-invalid="true"]:not([readonly]) {
   border-color: #d0021b;
 }
 .form-group small.error {
@@ -622,7 +622,7 @@
 .block-center {
   margin: auto !important;
 }
-input[aria-invalid="true"] {
+input[aria-invalid="true"]:not([readonly]) {
   border-color: #d0021b !important;
 }
 button:focus {
@@ -3357,6 +3357,10 @@ footer .container button.big:before {
   margin-top: 20px;
   margin-left: 18px;
 }
+.card-tool-depot .card-tool-depot-body .card-tool-depot-image img {
+  max-width: 104px;
+  max-height: 104px;
+}
 .card-tool-depot .card-tool-depot-body .card-tool-depot-title {
   display: flex;
   height: 100%;

Step/wwwroot/src/components/depot.ts

@@ -147,4 +147,13 @@ export default class depot extends Vue {
 
     
   }
+
+  public getInfoEquipmentIcon(id) {
+    console.log(id);
+    if(id && (id==151 || id==700))
+        return "../assets/icons/Tools/Saw.png";
+    else  
+        return "../assets/icons/Tools/Tools.png";
+  }
+
 }

Step/wwwroot/src/components/info-equipment.ts

@@ -58,8 +58,16 @@ export default class InfoEquipment extends Vue {
     }
 
     public getInfoEquipmentIcon() {
-        return "../assets/icons/_png/fresa-raggiatura-popup-280x280.png"
+        if(!this.enableModals){
+            if(this.selectedTool && (this.selectedTool.toolType==151 || this.selectedTool.toolType==700))
+                return "../assets/icons/Tools/Saw.png";
+            else  
+                return "../assets/icons/Tools/Tools.png";
+        }
+        else
+            return "../assets/icons/Tools/Shanks.png";
     }
+    
     public close(){
         Factory.Get(MessageService).deleteChannel("esc_pressed");
         ModalHelper.HideModal();

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

@@ -224,11 +224,11 @@ export default class toolingEquipment extends Vue {
 
   public getToolIcon = function (id) {
     if (id == 9999)
-      return "../assets/images/list-undefined.PNG"
+      return "../assets/iicons/Tools/Undefined.png"
     else if (id == 151 || id == 700)
-      return "../assets/images/list-blade.PNG"
+      return "../assets/icons/Tools/Saw.png"
     else
-      return "../assets/images/list-tool.PNG"
+      return "../assets/icons/Tools/Tools.png"
   }
 
   private internalCounter = -1;

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

@@ -22,7 +22,7 @@
                   <div class="list-vertical scrollable" ref="familyList" >
                       <equipment v-for="f in families.filter(f => f.name.toLowerCase().indexOf(currentFilter) >=0)" :key="f.uid" :title="f.name || f.oldName"
                                  :class="{selected: selectedTool && selectedTool.uid == f.uid}"
-                                 :img-source="'../assets/images/list-families.PNG'"
+                                 :img-source="'../assets/icons/Tools/Families.png'"
                                  @click="selectTool(f)"></equipment>
                   </div>
                   <div class="footer" v-if="!(isSiemens() || isDemo())">

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

@@ -22,7 +22,7 @@
                   <div class="list-vertical scrollable">
                       <equipment v-for="(m,k) in magpos.filter(m =>(($options.filters.localize('tooling_magpos','Manina')) + ' ' + m.positionId).toString().toLowerCase().indexOf(currentFilter) >=0)" :key="k" :code=" $options.filters.localize('tooling_magazine','Magazzino') + ' ' + m.magazineId" :title="$options.filters.localize('tooling_magpos','Manina') + ' ' + m.positionId"
                                  :class="{selected: selectedTool && selectedTool.positionId == m.positionId && selectedTool.magazineId == m.magazineId   }"
-                                 :img-source="'../assets/images/list-mag-pos.PNG'"
+                                 :img-source="'../assets/icons/Tools/Magpos.png'"
                                  @click="selectTool(m)"></equipment>
                   </div>
               </div>

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

@@ -22,7 +22,7 @@
                   <div class="list-vertical scrollable" ref="shankList">
                       <equipment v-for="s in shanks.filter(i => ($options.filters.localize('tooling_shanks_name','Codolo %d',i.id)).toLowerCase().indexOf(currentFilter) >=0)" :key="s.id" :title="'tooling_shanks_name' | localize('Codolo %d', s.id)"
                                  v-if="s.id != null"
-                                 :img-source="'../assets/images/list-shank.PNG'"
+                                 :img-source="'../assets/icons/Tools/Shanks.png'"
                                  :class="{selected: selectedTool && selectedTool.id == s.id}"
                                  @click="selectTool(s)"></equipment>
                   </div>