Merge pull request #50 from fga-eps-mds/137-fix-corrige-data-OS

#137 FIX: Corrige data e cor da tabela de OS
fga-eps-mds · Jun 21, 2023 · 70b3648 · 70b3648
2 parents bf63171 + b411d37
commit 70b3648
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/constants/orderservice.ts b/src/constants/orderservice.ts
@@ -21,7 +21,7 @@ export const OSStatusStyleMap = new Map<
   ],
   [
     'CONCLUDED',
-    { color: colors.green[100], fontWeight: 'bold', fontSize: '16px' },
+    { color: colors.green[700], fontWeight: 'bold', fontSize: '16px' },
   ],
   ['WARRANTY', { color: colors.red, fontWeight: 'bold', fontSize: '16px' }],
 ]);

diff --git a/src/pages/order-service/OrderServiceControl.tsx b/src/pages/order-service/OrderServiceControl.tsx
@@ -58,15 +58,15 @@ export interface Equipment {
 
 export interface OrderServiceData {
   id: string;
-  date: Date;
+  date: string;
   description?: string;
   authorId: string;
   receiverName: string;
   sender?: string;
   equipmentSnapshot: any;
   senderFunctionalNumber: string;
-  createdAt: Date;
-  updatedAt: Date;
+  createdAt: string;
+  updatedAt: string;
   equipment: Equipment;
   history: History;
   receiverFunctionalNumber: string;
@@ -407,9 +407,9 @@ function OrderServiceTable() {
                           </Td>
 
                           <Td>
-                            {new Date(orderService.date).toLocaleDateString(
-                              'pt-BR'
-                            )}
+                            {new Date(
+                              orderService.createdAt
+                            ).toLocaleDateString('pt-BR', { timeZone: 'UTC' })}
                           </Td>
                           <Td>
                             <button onClick={onOpenEditOrderService}>