Mostrar a conexão que está sendo usada no momento

rtenorioh · Mar 23, 2022 · 6165724 · 6165724
1 parent d30a856
commit 6165724
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 2 deletions.
diff --git a/backend/src/services/TicketServices/ListTicketsService.ts b/backend/src/services/TicketServices/ListTicketsService.ts
@@ -6,6 +6,7 @@ import Contact from "../../models/Contact";
 import Message from "../../models/Message";
 import Queue from "../../models/Queue";
 import ShowUserService from "../UserServices/ShowUserService";
+import Whatsapp from "../../models/Whatsapp";
 
 interface Request {
   searchParam?: string;
@@ -50,6 +51,11 @@ const ListTicketsService = async ({
       model: Queue,
       as: "queue",
       attributes: ["id", "name", "color"]
+    },
+    {
+      model: Whatsapp,
+      as: "whatsapp",
+      attributes: ["name"]
     }
   ];
 

diff --git a/frontend/src/components/TicketListItem/index.js b/frontend/src/components/TicketListItem/index.js
@@ -99,6 +99,21 @@ const useStyles = makeStyles(theme => ({
 		top: "0%",
 		left: "0%",
 	},
+
+	userTag: {
+		position: "absolute",
+		marginRight: 5,
+		right: 5,
+		bottom: 5,
+		background:"#2576D2",
+		color: "#ffffff",
+		border:"1px solid #CCC",
+		padding: 1,
+		paddingLeft: 5,
+		paddingRight: 5,
+		borderRadius: 10,
+		fontSize: "1em"
+	},
 }));
 
 const TicketListItem = ({ ticket }) => {
@@ -196,6 +211,9 @@ const TicketListItem = ({ ticket }) => {
 									)}
 								</Typography>
 							)}
+							{ticket.whatsappId && (
+								<div className={classes.userTag} title={i18n.t("ticketsList.connectionTitle")}>{ticket.whatsapp.name}</div>
+							)}
 						</span>
 					}
 					secondary={

diff --git a/frontend/src/translate/languages/en.js b/frontend/src/translate/languages/en.js
@@ -259,6 +259,7 @@ const messages = {
         pendingHeader: "Queue",
         assignedHeader: "Working on",
         noTicketsTitle: "Nothing here!",
+        connectionTitle: "Connection that is currently being used.",
         noTicketsMessage: "No tickets found with this status or search term.",
         buttons: {
           accept: "Accept",

diff --git a/frontend/src/translate/languages/es.js b/frontend/src/translate/languages/es.js
@@ -262,6 +262,7 @@ const messages = {
         pendingHeader: "Cola",
         assignedHeader: "Trabajando en",
         noTicketsTitle: "¡Nada acá!",
+        connectionTitle: "Conexión que se está utilizando actualmente.",
         noTicketsMessage:
           "No se encontraron tickets con este estado o término de búsqueda",
         buttons: {

diff --git a/frontend/src/translate/languages/pt.js b/frontend/src/translate/languages/pt.js
@@ -262,8 +262,8 @@ const messages = {
         pendingHeader: "Aguardando",
         assignedHeader: "Atendendo",
         noTicketsTitle: "Nada aqui!",
-        noTicketsMessage:
-          "Nenhum ticket encontrado com esse status ou termo pesquisado",
+        noTicketsMessage: "Nenhum ticket encontrado com esse status ou termo pesquisado",
+        connectionTitle: "Conexão que está sendo utilizada atualmente.",
         buttons: {
           accept: "Responder",
         },