Implementato Assi

Thermo.Active.Utils/languages/IT.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Automatically generated by nicola.carminati: 2021-03-09 -->
+<!-- Automatically generated by nicola.carminati: 2021-03-10 -->
 <root>
   <language_it>Italiano</language_it>
   <header_maintainance_request>Effettuare manutenzione</header_maintainance_request>
@@ -420,4 +420,14 @@
   <cmsconnect_info_messages_department_production>Produzione</cmsconnect_info_messages_department_production>
   <cmsconnect_info_btn_send_message>Invia messaggio</cmsconnect_info_btn_send_message>
   <cmsconnect_info_btn_reboot>Riavvia</cmsconnect_info_btn_reboot>
+  <modal_axis_info>Info Asse</modal_axis_info>
+  <axis_info_id>Id:</axis_info_id>
+  <axis_info_name>Nome:</axis_info_name>
+  <axis_info_torque>In coppia:</axis_info_torque>
+  <axis_info_gantry>Gantry:</axis_info_gantry>
+  <axis_info_moving>In movimento:</axis_info_moving>
+  <axis_info_zero>Azzerato:</axis_info_zero>
+  <axis_info_position>In posizione:</axis_info_position>
+  <axis_info_error>In errore:</axis_info_error>
+  <axis_info_brakealm>Allarme test freno:</axis_info_brakealm>
 </root>

Thermo.Active.Utils/languages/en.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Automatically generated by nicola.carminati: 2021-03-09 -->
+<!-- Automatically generated by nicola.carminati: 2021-03-10 -->
 <root>
   <language_it>English</language_it>
   <header_maintainance_request>Maintenance request</header_maintainance_request>
@@ -420,4 +420,14 @@
   <cmsconnect_info_messages_department_production>Production</cmsconnect_info_messages_department_production>
   <cmsconnect_info_btn_send_message>Send Message</cmsconnect_info_btn_send_message>
   <cmsconnect_info_btn_reboot>Reboot</cmsconnect_info_btn_reboot>
+  <modal_axis_info>Axis Info</modal_axis_info>
+  <axis_info_id>Id:</axis_info_id>
+  <axis_info_name>Name:</axis_info_name>
+  <axis_info_torque>In Torque:</axis_info_torque>
+  <axis_info_gantry>Gantry:</axis_info_gantry>
+  <axis_info_moving>Is Moving:</axis_info_moving>
+  <axis_info_zero>Zeroed:</axis_info_zero>
+  <axis_info_position>In Position:</axis_info_position>
+  <axis_info_error>In Error:</axis_info_error>
+  <axis_info_brakealm>Brake Test Alarm:</axis_info_brakealm>
 </root>

Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/asse-row-item.ts

@@ -3,6 +3,8 @@ import { AppModel } from "@/store";
 import { underTheHoodService } from "@/services/underTheHoodService";
 import { Prop, Watch } from "vue-property-decorator";
 import { awaiter, messageService } from "@/_base";
+import { ModalHelper } from "@/components/modals";
+import { ModalInfoAxis } from "@/modules/base-components";
 
 @Component({})
 export default class AsseRowItem extends Vue {
@@ -37,11 +39,23 @@ export default class AsseRowItem extends Vue {
   getNumber(value){
     return value.toFixed(1);
   }
+  
+  hexNumber(num){
+    return num.toString(16);
+  }
 
   openCollapse(){
     this.$emit("openCollapse");
   }
 
+  
+  details() {
+    ModalHelper.selectedAxisModal.id = this.item.id;
+    ModalHelper.selectedAxisModal.name = this.item.name;
+    ModalHelper.selectedAxisModal.status = this.item.statusCode;
+    ModalHelper.ShowModal(ModalInfoAxis);
+  }
+
   async sendCommand(cmd,ax){
     if(!this.isEditable)
       return;

Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/asse-row-item.vue

@@ -14,8 +14,10 @@
 		<td class="left">{{ getNumber(item.position) }}</td>
 		<td class="left">{{ getNumber(item.speed) }}</td>
 		<td class="left">{{ getNumber(item.load) }}</td>
-		<td class="left">{{ item.statusCode }}</td>
-		<td class="left">{{ item.errorCode }}</td>
+		<td class="left status" @click="details()" >
+			0x{{ hexNumber(item.statusCode) }} <button class="btn button-details small">?</button>
+		</td>
+		<td class="left">0x{{ hexNumber(item.errorCode) }}</td>
 		<td class="left">{{ item.movPhase }}</td>
 		<td>
 			<span class="buttons-container">									

Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.css

@@ -26,6 +26,13 @@
 .assi-table td.left {
   text-align: end;
 }
+.assi-table th.status,
+.assi-table td.status {
+  display: flex;
+  flex-flow: row;
+  align-items: center;
+  justify-content: flex-end;
+}
 .assi-table .transpRow {
   background-color: #657178;
   height: 10px;

Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.less

@@ -28,6 +28,12 @@
     &.left{
       text-align: end;
     }
+    &.status{      
+      display: flex;
+      flex-flow: row;
+      align-items: center;
+      justify-content: flex-end;
+    }
   }
 
   .transpRow{

Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.ts

@@ -36,5 +36,6 @@ export default class AssiTable extends Vue {
     else this.groupVisible.push(group);
   }
 
+  
 
 }

Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/Assi/components/tables/assi-table/assi-table.vue

@@ -5,12 +5,12 @@
 				<tr>
 					<th class="assi-selector">&nbsp;</th>
 					<th class="assi-axis">{{'underthehood_label_axes' | localize("Asse")}}</th>
-					<th class="assi-position">{{'underthehood_label_position' | localize("Position")}}</th>
-					<th class="assi-velocity">{{'underthehood_label_speed' | localize("Velocity")}}</th>
-					<th class="assi-velocity">{{'underthehood_label_torque' | localize("Torque")}}</th>
-					<th class="assi-velocity">{{'underthehood_label_status' | localize("Status")}}</th>
-					<th class="assi-velocity">{{'underthehood_label_errorcode' | localize("Error Code")}}</th>
-					<th class="fase-motion">{{'underthehood_label_motion' | localize("Fase Motion")}}</th>
+					<th class="assi-position left">{{'underthehood_label_position' | localize("Position")}}</th>
+					<th class="assi-velocity left">{{'underthehood_label_speed' | localize("Velocity")}}</th>
+					<th class="assi-velocity left">{{'underthehood_label_torque' | localize("Torque")}}</th>
+					<th class="assi-velocity left">{{'underthehood_label_status' | localize("Status")}}</th>
+					<th class="assi-velocity left">{{'underthehood_label_errorcode' | localize("Error Code")}}</th>
+					<th class="assi-velocity left">{{'underthehood_label_motion' | localize("Fase Motion")}}</th>
 					<th class="assi-buttons"></th>
 				</tr>
 			</thead>

Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/log-ciclo-automatico/log-ciclo-automatico.css

@@ -1,3 +1,14 @@
+.main-container .button-details {
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4) !important;
+  background-image: linear-gradient(to bottom, #818a8f 0%, #42494e 98%) !important;
+  color: #e8e8e8 !important;
+}
+.main-container .button-details.small {
+  height: 24px;
+  width: 24px;
+  margin-right: 0;
+  padding: 0;
+}
 .main-container .log-ciclo-automatico-table tbody tr:nth-child(odd) {
   background-color: #747f85;
 }

Thermo.Active/wwwroot/src/app_modules_thermo/sotto-cofano/LogCicloAutomatico/components/log-ciclo-automatico/log-ciclo-automatico.less

@@ -9,6 +9,13 @@
       #42494e 98%
     ) !important;
     color: @very-light-pink !important;
+
+    &.small{      
+      height: 24px;
+      width: 24px;
+      margin-right: 0;
+      padding: 0;
+    }
   }
 
   .log-ciclo-automatico-table {

Thermo.Active/wwwroot/src/components/modals/ModalHelper.ts

@@ -19,6 +19,12 @@ export class ModalHelper {
     status: 0
   };
 
+  public static selectedAxisModal = {
+    id: -1,
+    name: "--",
+    status: 0
+  };
+
   public static loadDepotModal = {
     positionId: 0,
     positionType: 0,

Thermo.Active/wwwroot/src/modules/base-components/index.ts

@@ -23,6 +23,7 @@ import ModalMissingTools from "./modal-missing-tools.vue";
 import ModalJobAddParameter from "./modal-job-add-parameter.vue";
 import ModalNcContainer from "./modal-nc-container.vue";
 import ModalInfoResistance from "./modal-info-resistance.vue";
+import ModalInfoAxis from "./modal-info-axis.vue";
 
 
 export {
@@ -45,5 +46,6 @@ export {
     ModalMissingTools,
     ModalJobAddParameter,
     HistoryMaintenance,
-    ModalInfoResistance
+    ModalInfoResistance,
+    ModalInfoAxis
 };

Thermo.Active/wwwroot/src/modules/base-components/modal-info-axis.ts

@@ -0,0 +1,39 @@
+import Vue from "vue";
+import { Factory, messageService } from 'src/_base';
+import Component from "vue-class-component";
+import { Deferred } from "../../services/Deferred";
+import { Prop } from "vue-property-decorator";
+import { relativeTimeThreshold } from "moment";
+import { ModalHelper, Modal } from "@/components/modals";
+
+
+
+@Component({
+  components: {
+    modal: Modal,
+  }
+})
+export default class ModalInfoAxis extends Vue {
+
+  @Prop()
+  deferred: Deferred<any>;
+
+  get axis(){
+    return ModalHelper.selectedAxisModal;
+  }
+
+  
+  getBitVal(number){
+    if((this.axis.status & number) == number)
+      return true;
+    else
+      return false
+  }
+
+  close() {
+
+    messageService.deleteChannel("esc_pressed");
+    ModalHelper.HideModal();
+  };
+
+};

Thermo.Active/wwwroot/src/modules/base-components/modal-info-axis.vue

@@ -0,0 +1,53 @@
+<template>
+  <modal type="info-resistance" :title="'modal_axis_info' | localize('Info Asse')">
+    <button class="close" slot="header-buttons" @click="close()"><i class="fa fa-remove"></i></button>
+    <div class="details">    
+       <hr/>  
+        <div class="status"><span>{{'axis_info_id' | localize('ID:')}} </span>
+            <strong>{{axis.id}}</strong>
+        </div>
+        <div class="status"><span>{{'axis_info_name' | localize('Name:')}} </span>
+            <strong>{{axis.name}}</strong>
+        </div>
+       <hr/>
+        <div class="status"><span>{{'axis_info_torque' | localize('In coppia:')}} </span>
+            <strong v-if="getBitVal(1)"><i class="fa fa-check"></i></strong>
+            <strong v-else>-</strong>
+        </div>
+        <div class="status"><span>{{'axis_info_gantry' | localize('Gantry:')}} </span>
+            <strong v-if="getBitVal(2)"><i class="fa fa-check"></i></strong>
+            <strong v-else>-</strong>
+        </div>
+        <div class="status"><span>{{'axis_info_moving' | localize('In movimento:')}} </span>
+            <strong v-if="getBitVal(4)"><i class="fa fa-check"></i></strong>
+            <strong v-else>-</strong>
+        </div>
+        <div class="status"><span>{{'axis_info_zero' | localize('Azzerato:')}} </span>
+            <strong v-if="getBitVal(8)"><i class="fa fa-check"></i></strong>
+            <strong v-else>-</strong>
+        </div>
+        <div class="status"><span>{{'axis_info_position' | localize('In posizione:')}} </span>
+            <strong v-if="getBitVal(16)"><i class="fa fa-check"></i></strong>
+            <strong v-else>-</strong>
+        </div>
+       <hr/>
+        <div class="status"><span>{{'axis_info_error' | localize('In Error:')}} </span>
+            <strong v-if="getBitVal(32)"><i class="fa fa-exclamation-triangle"></i></strong>
+            <strong v-else><i class="fa fa-check"></i></strong>
+        </div>
+
+        <div class="status"><span>{{'axis_info_Brakealm' | localize('Brake test Alarm:')}} </span>
+            <strong v-if="getBitVal(64)"><i class="fa fa-exclamation-triangle"></i></strong>
+            <strong v-else><i class="fa fa-check"></i></strong>
+        </div>
+    </div>
+  </modal>
+</template>
+<script src="./modal-info-axis.ts" lang="ts">
+</script>
+
+
+
+
+
+