FIx some styles / Behaviour

2018-08-03 17:18:54 +02:00
parent 0244e967dc
commit c712362acd
7 changed files with 143 additions and 33 deletions
@@ -666,6 +666,17 @@
            align-items: center;
            justify-content: space-between;
            margin-top: 8px;
+
+            &._7{
+                min-height: 26px;
+            }
+            &._8{
+                min-height: 22px;
+            }
+            &._9{
+                min-height: 18px;
+            }
+
            .variable{
                font-size: 48px;
                width: 75px;
@@ -673,6 +684,19 @@
                font-weight: bold;
                color: @color-greyish-brown;
                text-align: right;
+                
+                &._7{
+                    font-size: 42px;
+                }
+                &._8{
+                    font-size: 36px;
+                }
+                &._9{
+                    font-size: 29px;
+                }
+                &.more9{
+                    width: 69px;
+                }
            }
            .number{
                width: 130px;
@@ -685,6 +709,21 @@
                color: @color-greyish-brown;
                padding-right: 8px;
                font-size: 20px;
+
+                &._7{
+                    height: 26px;
+                }
+                &._8{
+                    height: 22px;
+                }
+                &._9{
+                    height: 18px;
+                    font-size: 18px;
+                }
+                &.more9{
+                    margin-right: 5px;
+                }
+
            }
        }
        .axes:nth-child(odd) .number{
@@ -1040,16 +1079,19 @@
                max-width: 100%;
              }
              .noimage{
-                display: block;
-                margin: auto;
+                display: flex;
+                align-items: center;
+                justify-content: center;
                height: 290px;
-                width: 90%;
+                width: 100%;
+                max-width: 100%;
                text-align: center;
-                line-height: 290px;
                color: @color-greyish-brown;
                font-size: 24px;
                box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.4);
                border: 1px solid rgba(0, 0, 0, 0.1);
+                padding-left: 100px;
+                padding-right: 100px;
    
              }
        }
@@ -866,7 +866,6 @@
      width: 5%;
    }
    .first-column {
-      height: calc(~"100% - 78px");
      min-width: 215px;
      border-right: solid 2px @color-whitethree;
      display: flex;
@@ -801,7 +801,6 @@
  width: 5%;
 }
 .modal.modal-load-program .modal-load-program-body .first-column {
-  height: calc(100% - 78px);
  min-width: 215px;
  border-right: solid 2px #e7e7e7;
  display: flex;
@@ -4783,6 +4782,18 @@ footer .container button.big:before {
  justify-content: space-between;
  margin-top: 8px;
 }
+.card-axes-production .first-box-axes .axes._7,
+.card-axes-production .second-box-axes .axes._7 {
+  min-height: 26px;
+}
+.card-axes-production .first-box-axes .axes._8,
+.card-axes-production .second-box-axes .axes._8 {
+  min-height: 22px;
+}
+.card-axes-production .first-box-axes .axes._9,
+.card-axes-production .second-box-axes .axes._9 {
+  min-height: 18px;
+}
 .card-axes-production .first-box-axes .axes .variable,
 .card-axes-production .second-box-axes .axes .variable {
  font-size: 48px;
@@ -4792,6 +4803,22 @@ footer .container button.big:before {
  color: #4b4b4b;
  text-align: right;
 }
+.card-axes-production .first-box-axes .axes .variable._7,
+.card-axes-production .second-box-axes .axes .variable._7 {
+  font-size: 42px;
+}
+.card-axes-production .first-box-axes .axes .variable._8,
+.card-axes-production .second-box-axes .axes .variable._8 {
+  font-size: 36px;
+}
+.card-axes-production .first-box-axes .axes .variable._9,
+.card-axes-production .second-box-axes .axes .variable._9 {
+  font-size: 29px;
+}
+.card-axes-production .first-box-axes .axes .variable.more9,
+.card-axes-production .second-box-axes .axes .variable.more9 {
+  width: 69px;
+}
 .card-axes-production .first-box-axes .axes .number,
 .card-axes-production .second-box-axes .axes .number {
  width: 130px;
@@ -4805,6 +4832,23 @@ footer .container button.big:before {
  padding-right: 8px;
  font-size: 20px;
 }
+.card-axes-production .first-box-axes .axes .number._7,
+.card-axes-production .second-box-axes .axes .number._7 {
+  height: 26px;
+}
+.card-axes-production .first-box-axes .axes .number._8,
+.card-axes-production .second-box-axes .axes .number._8 {
+  height: 22px;
+}
+.card-axes-production .first-box-axes .axes .number._9,
+.card-axes-production .second-box-axes .axes .number._9 {
+  height: 18px;
+  font-size: 18px;
+}
+.card-axes-production .first-box-axes .axes .number.more9,
+.card-axes-production .second-box-axes .axes .number.more9 {
+  margin-right: 5px;
+}
 .card-axes-production .first-box-axes .axes:nth-child(odd) .number,
 .card-axes-production .second-box-axes .axes:nth-child(odd) .number {
  background-color: #f3f3f3;
@@ -5154,16 +5198,19 @@ footer .container button.big:before {
  max-width: 100%;
 }
 .card-job-production .card-job-production-body .card-job-production-body-top .noimage {
-  display: block;
-  margin: auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
  height: 290px;
-  width: 90%;
+  width: 100%;
+  max-width: 100%;
  text-align: center;
-  line-height: 290px;
  color: #4b4b4b;
  font-size: 24px;
  box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.4);
  border: 1px solid rgba(0, 0, 0, 0.1);
+  padding-left: 100px;
+  padding-right: 100px;
 }
 .card-job-production .card-job-production-body .card-job-production-body-bottom {
  width: 464px;
@@ -2,11 +2,11 @@
 <!-- <div class="test-container"> -->
  <div class="card-axes-production">
      <div class="first-box-axes scrollable">
-          <div class="axes" v-for="a in axes(nameAxes,axesInterpoleted)" :key="a.id">
-              <div class="variable">
+          <div class="axes" v-for="a in axes(nameAxes,axesInterpoleted)" :key="a.id" :class="numAxes">
+              <div class="variable" :class="numAxes">
                  {{a.name}}
              </div>
-              <div class="number" :class="{'width-number': axes.length > 6}">
+              <div class="number"  :class="numAxes">
                  {{a.value.toFixed(3)}}
              </div>
          </div>
@@ -18,31 +18,31 @@
              <button class="tab" :class="{'active': enableProg}" @click="selectTab('ERR')">{{'card_axes_production_axes_tab_prog' | localize("PROG")}}</button>
          </div>
          <div class="content-box scrollable" v-if="enableOm">
-            <div class="axes" v-for="a in axes(nameAxes,axesMachine)" :key="a.id">
-              <div class="variable">
+            <div class="axes" v-for="a in axes(nameAxes,axesMachine)" :key="a.id" :class="numAxes">
+              <div class="variable" :class="numAxes">
                  {{a.name}}
              </div>
-              <div class="number">
+              <div class="number" :class="numAxes">
                  {{a.value.toFixed(3)}}
              </div>
            </div>
          </div>
          <div class="content-box scrollable" v-if="enableGoto">
-            <div class="axes" v-for="a in axes(nameAxes,axesToGo)" :key="a.id">
-              <div class="variable">
+            <div class="axes" v-for="a in axes(nameAxes,axesToGo)" :key="a.id"  :class="numAxes">
+              <div class="variable"  :class="numAxes">
                  {{a.name}}
              </div>
-              <div class="number">
+              <div class="number"  :class="numAxes">
                  {{a.value.toFixed(3)}}
              </div>
          </div>
          </div>
          <div class="content-box scrollable" v-if="enableProg">
-            <div class="axes" v-for="a in axes(nameAxes,axesProgrammePos)" :key="a.id">
-              <div class="variable">
+            <div class="axes" v-for="a in axes(nameAxes,axesProgrammePos)" :key="a.id"  :class="numAxes">
+              <div class="variable"  :class="numAxes">
                  {{a.name}}
              </div>
-              <div class="number">
+              <div class="number"  :class="numAxes">
                  {{a.value.toFixed(3)}}
              </div>
          </div>
@@ -57,11 +57,7 @@
 import { Hub } from "src/services/hub";
 export default {
    props:{
-        numberX: {default: 0},
-        numberY: {default: 0},
-        numberZ: {default: 0},
-        numberA: {default: 0}, 
-        numberB: {default: 0}
+        followAxesNumber: {default: true}
    },
    data: function(){
        return{
@@ -74,6 +70,21 @@ export default {
        nameAxes: function(){
            return this.$store.state.process.axes;
        },
+        numAxes: function(){        
+            if (!this.followAxesNumber)
+                return null;
+
+            var n = this.$store.state.process.axes.length;
+            if(n == 7)
+                return '_7';
+            else if(n == 8)
+                return '_8';
+            else if(n == 9)
+                return '_9';
+            else if(n > 9)
+                return '_9 more9';
+            return null;
+        },
        axesInterpoleted: function(){
            return this.$store.state.process.valueAxisSelected.interpolated;
        },
@@ -15,7 +15,10 @@
        </div>
        <div class="card-job-production-body">
            <div class="card-job-production-body-top">
-                <img :src="currentProgramImage">
+                <img :src="currentProgramImage" v-if="currentProgramImage">
+                <div v-if="!currentProgramImage" class="noimage">
+                  {{'modal_load_program_lbl_img_not_found' | localize('Preview non disponibile')}}
+                </div>
            </div>
            <div class="card-job-production-body-bottom" :class="{'width-body-bottom':noQueue}">
                <div class="tabs">
@@ -23,7 +26,7 @@
                    <button class="tab" :class="{'active': enableFileSections}" @click="selectTab('FileSections')">Sezioni File</button>
                </div>
                <div class="content-box" v-if="enableIsoLines && currentProgram">
-                    <div class="row" :class="{'selected': idx==0,'width-100':noQueue}" v-for="(l, idx) in currentProgram.isoLines" :key="idx" >
+                    <div class="row" :class="{'selected': idx==indexofActiveLine,'width-100':noQueue}" v-for="(l, idx) in currentProgram.isoLines" :key="idx" >
                      <div class="triangle"></div><label>{{l}}</label>
                    </div>
                </div>
@@ -38,6 +41,7 @@
 <!-- </div> -->
 </template>
 <script>
+import Vue from "vue";
 import cardProductionSectionFile from "./card-production-section-file.vue";
 import moment from "moment";
 import { fileService } from "../../../services/fileService";
@@ -59,6 +63,12 @@ export default {
    currentProgram: function() {
      return this.$store.state.process.currentProgram;
    },
+    indexofActiveLine: function() {
+      if(this.isOsai())
+        return 1;
+      else
+        return 0;
+    },
    currentProgramImage: function() {
      return this.$store.state.process.currentProgramImage;
    },
@@ -2,7 +2,7 @@ import Vue from "vue";
 import Component from "vue-class-component";
 import Modal from "src/modules/base-components/modal.vue";
 import { ModalHelper } from "src/modules/base-components/ModalHelper";
-import { Factory, MessageService } from "../../_base";
+import { Factory, MessageService,awaiter } from "../../_base";
 // import { MaintenanceService } from "../services/maintenanceService";
 // import { store } from "src/store";
 // import { maintenanceActions } from "../store/maintenance.store";
@@ -120,11 +120,12 @@ export default class ModalLoadProgram extends Vue {
    this.isLocalNavigation = local;
    var result = null;
    if (local) result = JSON.parse(cmsClient.getFileList(path));
-    else result = await fileService.getFiles(path);
+    else result = await awaiter(fileService.getFiles(path));

    return this.toUpperCaseModel(result);
  }

+
  toUpperCaseModel(data: Array<any>): Array<PathInfo> {
    return data.map(i => {
      return {
@@ -41,7 +41,7 @@
                            :name="val.Name"
                            :class="{dark: val.AbsolutePath == lastClickPath}"
                            :selected="isInPath(val.AbsolutePath) || val.AbsolutePath == lastClickPath"
-                            :withArrow="val.IsDirectory"
+                            :withArrow="val.IsDirectory == true"
                            :iconType="val.IsDirectory? 'FOLDER':'FILE'"
                            @click="val.IsDirectory ? navigateTo(val.AbsolutePath, isLocalNavigation, 2,1): fileInfo(val.AbsolutePath,1)"></card-folder-path>
                    </div>
@@ -62,7 +62,7 @@
                            :name="val.Name"
                            :class="{dark: val.AbsolutePath == lastClickPath}"
                            :selected="isInPath(val.AbsolutePath) || val.AbsolutePath == lastClickPath"
-                            :withArrow="val.IsDirectory"
+                            :withArrow="val.IsDirectory == true"
                            :iconType="val.IsDirectory? 'FOLDER':'FILE'"
                            @click="val.IsDirectory? navigateTo(val.AbsolutePath, isLocalNavigation, 2,2):fileInfo(val.AbsolutePath,2) "></card-folder-path>
                        <!-- <card-folder-path name="Cliente A" @click="selectItem()" :with-arrow="false"></card-folder-path>-->