X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=ui%2Fweb%2Fsrc%2Fcomponents%2Fcharging-stations%2FCSConnector.vue;h=f6cda45af6715868ebc8d0f312ccecd3646feec5;hb=a64b9a64f0cb3b2b9b07ec38ec4001dcc7024a60;hp=d828ae8620e0d3874a83b62b7f4421f838f82227;hpb=68220b423c52da387fdf41967dd8c738da0ff52e;p=e-mobility-charging-stations-simulator.git

diff --git a/ui/web/src/components/charging-stations/CSConnector.vue b/ui/web/src/components/charging-stations/CSConnector.vue
index d828ae86..f6cda45a 100644
--- a/ui/web/src/components/charging-stations/CSConnector.vue
+++ b/ui/web/src/components/charging-stations/CSConnector.vue
@@ -1,39 +1,43 @@
 <template>
-  <td class="cs-table__action-col">
-    <Button @click="startChargingStation()">Start Charging Station</Button>
-    <Button @click="stopChargingStation()">Stop Charging Station</Button>
-    <Button @click="openConnection()">Open Connection</Button>
-    <Button @click="closeConnection()">Close Connection</Button>
-    <Button @click="startTransaction()">Start Transaction</Button>
-    <!-- <IdTagInputModal
-      :visibility="state.isIdTagModalVisible"
-      :id-tag="state.idTag"
-      @close="hideIdTagModal()"
-      @done="compose(state.transaction, hideIdTagModal)()"
-    >
-      Start Transaction
-    </IdTagInputModal> -->
-    <Button @click="stopTransaction()">Stop Transaction</Button>
-    <Button @click="startAutomaticTransactionGenerator()">Start ATG</Button>
-    <Button @click="stopAutomaticTransactionGenerator()">Stop ATG</Button>
-  </td>
-  <td class="cs-table__connector-col">{{ connectorId }}</td>
-  <td class="cs-table__status-col">{{ connector.status }}</td>
-  <td class="cs-table__transaction-col">{{ connector.transactionStarted ? 'Yes' : 'No' }}</td>
+  <tr class="connectors-table__row">
+    <td class="connectors-table__column">{{ connectorId }}</td>
+    <td class="connectors-table__column">{{ connector.status ?? 'Ø' }}</td>
+    <td class="connectors-table__column">
+      {{ connector.transactionStarted === true ? 'Yes' : 'No' }}
+    </td>
+    <td class="connectors-table__column">
+      {{ atgStatus?.start === true ? 'Yes' : 'No' }}
+    </td>
+    <td class="connectors-table__column">
+      <Button @click="startTransaction()">Start Transaction</Button>
+      <!-- <IdTagInputModal
+        :visibility="state.isIdTagModalVisible"
+        :id-tag="state.idTag"
+        @close="hideIdTagModal()"
+        @done="compose(state.transaction, hideIdTagModal)()"
+      >
+        Start Transaction
+      </IdTagInputModal> -->
+      <Button @click="stopTransaction()">Stop Transaction</Button>
+      <Button @click="startAutomaticTransactionGenerator()">Start ATG</Button>
+      <Button @click="stopAutomaticTransactionGenerator()">Stop ATG</Button>
+    </td>
+  </tr>
 </template>
 
 <script setup lang="ts">
+import { getCurrentInstance } from 'vue'
 // import { reactive } from 'vue'
-import Button from '../buttons/Button.vue'
-// import IdTagInputModal from './IdTagInputModal.vue'
-import type { ConnectorStatus } from '@/types'
-import { UIClient } from '@/composables/UIClient'
-// import { compose } from '@/composables/Utils'
+// import IdTagInputModal from '@/components/charging-stations/IdTagInputModal.vue'
+import Button from '@/components/buttons/Button.vue'
+import type { ConnectorStatus, Status } from '@/types'
+// import { compose } from '@/composables'
 
 const props = defineProps<{
   hashId: string
-  connector: ConnectorStatus
   connectorId: number
+  connector: ConnectorStatus
+  atgStatus?: Status
   transactionId?: number
   idTag?: string
 }>()
@@ -62,28 +66,18 @@ const props = defineProps<{
 //   state.isIdTagModalVisible = false
 // }
 
-function startChargingStation(): void {
-  UIClient.getInstance().startChargingStation(props.hashId)
-}
-function stopChargingStation(): void {
-  UIClient.getInstance().stopChargingStation(props.hashId)
-}
-function openConnection(): void {
-  UIClient.getInstance().openConnection(props.hashId)
-}
-function closeConnection(): void {
-  UIClient.getInstance().closeConnection(props.hashId)
-}
+const UIClient = getCurrentInstance()?.appContext.config.globalProperties.$UIClient
+
 function startTransaction(): void {
-  UIClient.getInstance().startTransaction(props.hashId, props.connectorId, props.idTag)
+  UIClient.startTransaction(props.hashId, props.connectorId, props.idTag)
 }
 function stopTransaction(): void {
-  UIClient.getInstance().stopTransaction(props.hashId, props.transactionId)
+  UIClient.stopTransaction(props.hashId, props.transactionId)
 }
 function startAutomaticTransactionGenerator(): void {
-  UIClient.getInstance().startAutomaticTransactionGenerator(props.hashId, props.connectorId)
+  UIClient.startAutomaticTransactionGenerator(props.hashId, props.connectorId)
 }
 function stopAutomaticTransactionGenerator(): void {
-  UIClient.getInstance().stopAutomaticTransactionGenerator(props.hashId, props.connectorId)
+  UIClient.stopAutomaticTransactionGenerator(props.hashId, props.connectorId)
 }
 </script>