From b747915003e2d15fce8c2ff91b22e31865f57eda Mon Sep 17 00:00:00 2001
From: viniciusdandrade <vaj@cesar.school>
Date: Thu, 6 Jun 2024 19:35:56 -0300
Subject: [PATCH 1/3] fixing models spelling

---
 app_client/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app_client/models.py b/app_client/models.py
index 5a03e36..5d4ea0d 100644
--- a/app_client/models.py
+++ b/app_client/models.py
@@ -7,7 +7,7 @@ class OrderRequest(models.Model):
     STATUS_CHOICES = [
         ('EM_ANALISE', 'EM ANÁLISE'),
         ('AGENDADO', 'AGENDADO'),
-        ('AGUARDANDO_ORCAMENTO', 'ORÇAMENTO PENDENTE'),
+        ('AGUARDANDO_ORCAMENTO', 'AGUARDANDO ORÇAMENTO'),
         ('AGUARDANDO_CONFIRMACAO', 'AGUARDANDO CONFIRMAÇÃO'),
         ('ACEITO', 'ACEITO'),
         ('RECUSADO', 'RECUSADO'),

From 12d1d5be5741388d5109dfe13e3911e1c378da06 Mon Sep 17 00:00:00 2001
From: Ana <acgs@cesar.school>
Date: Thu, 6 Jun 2024 20:15:22 -0300
Subject: [PATCH 2/3] changing client view and delete buttons style

---
 app_client/models.py                          |   2 +-
 .../static/css/app_client/delete-order.css    |   6 +-
 .../static/css/app_client/reopen-order.css    |   6 +-
 app_client/static/css/app_client/styles.css   |  20 ++++
 .../RequestOrder/delete-service.html          |  13 +-
 app_client/templates/RequestOrder/orders.html |   8 +-
 .../RequestOrder/reopen-service.html          |   3 +-
 .../templates/RequestOrder/vieworder.html     |   1 -
 cypress/e2e/ConvertOrderRequest.cy.js         |   6 +-
 cypress/e2e/ManagingMyServices.cy.js          |   2 +-
 cypress/e2e/ManagingOrder.cy.js               |   6 +-
 cypress/e2e/ReopeningService.cy.js            | 112 +++++++++---------
 cypress/e2e/StatusMonitoring.cy.js            |   4 +-
 cypress/e2e/solicitationManagement.cy.js      |   2 +-
 14 files changed, 115 insertions(+), 76 deletions(-)

diff --git a/app_client/models.py b/app_client/models.py
index 5d4ea0d..154275a 100644
--- a/app_client/models.py
+++ b/app_client/models.py
@@ -39,7 +39,7 @@ class OrderRequest(models.Model):
 
     def reopen_time(self):
         actual_time = datetime.now().date()
-        days_difference = (actual_time - self.closedAt.date()).days
+        days_difference = (actual_time - self.closedAt).days
         if days_difference > 30:
             self.isReopen = True
     
diff --git a/app_client/static/css/app_client/delete-order.css b/app_client/static/css/app_client/delete-order.css
index 9cfa2e9..e8cd1ab 100644
--- a/app_client/static/css/app_client/delete-order.css
+++ b/app_client/static/css/app_client/delete-order.css
@@ -123,4 +123,8 @@
 
 .deleteContent .actions button:first-child{
     background-color: var(--gray-600);
-}
\ No newline at end of file
+}
+
+a {
+    color: inherit;
+}
diff --git a/app_client/static/css/app_client/reopen-order.css b/app_client/static/css/app_client/reopen-order.css
index 3966ab9..5224ad2 100644
--- a/app_client/static/css/app_client/reopen-order.css
+++ b/app_client/static/css/app_client/reopen-order.css
@@ -123,4 +123,8 @@
 
 .reopenContent .actions button:first-child{
     background-color: var(--gray-600);
-}
\ No newline at end of file
+}
+
+a {
+    color: inherit;
+}
diff --git a/app_client/static/css/app_client/styles.css b/app_client/static/css/app_client/styles.css
index adc26db..46f6229 100644
--- a/app_client/static/css/app_client/styles.css
+++ b/app_client/static/css/app_client/styles.css
@@ -179,4 +179,24 @@ tbody td:first-child div {
   margin-top: 10px;
   padding: 3px;
   border-radius: 4px;
+}
+
+.view button, .delete button {
+  padding: 8px 16px;
+  border: none;
+  background-color: var(--blue-500);
+  color: var(--white);
+  font-weight: 600;
+  border-radius: 4px;
+  float: right;
+  margin-top: 32px;
+  transition: all .3s;
+}
+
+.view, .delete button:hover {
+  filter: brightness(0.9);
+}
+
+.delete button {
+  background-color: var(--red-600);
 }
\ No newline at end of file
diff --git a/app_client/templates/RequestOrder/delete-service.html b/app_client/templates/RequestOrder/delete-service.html
index 6a302e7..3e5ee49 100644
--- a/app_client/templates/RequestOrder/delete-service.html
+++ b/app_client/templates/RequestOrder/delete-service.html
@@ -25,7 +25,18 @@ <h1>Solicitação N {{order.id}}°</h1><br>
         <form action="{% url 'client:delete_service' order.id %}" method="POST">
             {% csrf_token %}
             <div class="actions">
-                <a href="{% url 'client:view_orders'%}" class="cancel" role="button">Cancelar</a>
+
+                <button id="cancel "type="button">
+                    <a class="cancel" href="{% url 'client:view_orders'%}">Cancelar</a>
+                </button>
+                
+                <script>
+                    function disableButton() {
+                        const button = document.getElementById("cancel");
+                        button.disabled = true;
+                    }
+                </script>
+
                 <button type="submit">Confirmar</button>
             </div>
         </form>
diff --git a/app_client/templates/RequestOrder/orders.html b/app_client/templates/RequestOrder/orders.html
index 5c39e5d..6fdd236 100644
--- a/app_client/templates/RequestOrder/orders.html
+++ b/app_client/templates/RequestOrder/orders.html
@@ -85,8 +85,8 @@ <h3>Suas solicitações</h3>
                         <td> - </td>
                     {% endif %}
                     <td>
-                        <a href="{% url 'client:view_order' order.id %}">
-                            <i data-lucide="eye" width="28" height="28" color="#155ec8"></i>
+                        <a class="view" href="{% url 'client:view_order' order.id %}">
+                            <button>Visualizar</button>
                         </a>
                     </td>
 
@@ -102,8 +102,8 @@ <h3>Suas solicitações</h3>
                     
                     {% if order.closedAt or order.status == 'CANELADO'%}
                         <td>
-                            <a href="{% url 'client:delete_service' order.id %}">
-                                <i data-lucide="trash" width="28" height="28" color="#DC2626"></i>
+                            <a class="delete" href="{% url 'client:delete_service' order.id %}">
+                                <button>Remover</button>
                             </a>
                         </td>
                     {% endif %}
diff --git a/app_client/templates/RequestOrder/reopen-service.html b/app_client/templates/RequestOrder/reopen-service.html
index a13c9d6..bbb3c80 100644
--- a/app_client/templates/RequestOrder/reopen-service.html
+++ b/app_client/templates/RequestOrder/reopen-service.html
@@ -57,10 +57,11 @@ <h1>Reabrir Solicitação N {{order.id}}°</h1><br>
         <form action="{% url 'client:reopen_service' order.id %}" method="POST">
             {% csrf_token %}
             <div class="actions">
-                {% comment %} <a href="{% url 'client:view_orders'%}" class="cancel" role="button" >Cancelar</a> {% endcomment %}
+                
                 <button id="cancel "type="button">
                     <a class="cancel" href="{% url 'client:view_orders'%}">Cancelar</a>
                 </button>
+                
                 <script>
                     function disableButton() {
                         const button = document.getElementById("cancel");
diff --git a/app_client/templates/RequestOrder/vieworder.html b/app_client/templates/RequestOrder/vieworder.html
index f5f0bd4..9ebd06b 100644
--- a/app_client/templates/RequestOrder/vieworder.html
+++ b/app_client/templates/RequestOrder/vieworder.html
@@ -54,7 +54,6 @@
                 <div class="finished">
                 
                     <a href="{% url 'client:rate_service' order.id %}">
-                        {% comment %} <i data-lucide="star" width="28" height="28" color="#d4c02a"></i> {% endcomment %}
                         <p>Avaliar o serviço prestado</p>
                     </a>
 
diff --git a/cypress/e2e/ConvertOrderRequest.cy.js b/cypress/e2e/ConvertOrderRequest.cy.js
index 69690ea..71d00a6 100644
--- a/cypress/e2e/ConvertOrderRequest.cy.js
+++ b/cypress/e2e/ConvertOrderRequest.cy.js
@@ -25,7 +25,7 @@ describe('HomePage', () => {
         cy.get('.content > form > button').click()
         cy.get('.logout > button').click()
         cy.GoToClient("kato@gmail.com")
-        cy.get(':nth-child(4) > a').click()
+        cy.get('.view > button').click()
         cy.get('.yes')
         cy.get('.waitingForm > form > button').click()
         cy.ClientLogout()
@@ -69,7 +69,7 @@ describe('HomePage', () => {
         cy.get('.content > form > button').click()
         cy.get('.logout > button').click()
         cy.GoToClient("kato@gmail.com")
-        cy.get(':nth-child(4) > a').click()
+        cy.get('.view > button').click()
         cy.get('.waitingForm > form > button').click()
         cy.get('.logout').click()
         cy.get('#employee > a').click()
@@ -112,7 +112,7 @@ describe('HomePage', () => {
         cy.get('.content > form > button').click()
         cy.get('.logout > button').click()
         cy.GoToClient("kato@gmail.com")
-        cy.get(':nth-child(4) > a').click()
+        cy.get('.view > button').click()
         cy.get('.yes')
         cy.get('.waitingForm > form > button').click()
         cy.ClientLogout()
diff --git a/cypress/e2e/ManagingMyServices.cy.js b/cypress/e2e/ManagingMyServices.cy.js
index cdbf117..71e37bd 100644
--- a/cypress/e2e/ManagingMyServices.cy.js
+++ b/cypress/e2e/ManagingMyServices.cy.js
@@ -26,7 +26,7 @@ describe('HomePage', () => {
     cy.get('.content > form > button').click()
     cy.get('.logout > button').click()
     cy.GoToClient()
-    cy.get(':nth-child(4) > a').click()
+    cy.get('.view > button').click()
     cy.get('.yes > label').click()
     cy.get('.waitingForm > form > button').click()
     cy.ClientLogout()
diff --git a/cypress/e2e/ManagingOrder.cy.js b/cypress/e2e/ManagingOrder.cy.js
index d3a48f6..dcb0b7d 100644
--- a/cypress/e2e/ManagingOrder.cy.js
+++ b/cypress/e2e/ManagingOrder.cy.js
@@ -23,7 +23,7 @@ describe('HomePage', () => {
       cy.get('.content > form > button').click()
       cy.get('.logout > button').click()
       cy.GoToClient()
-      cy.get(':nth-child(4) > a').click()
+      cy.get('.view > button').click()
       cy.get('.yes > label').click()
       cy.get('.waitingForm > form > button').click()
       cy.ClientLogout()
@@ -61,7 +61,7 @@ describe('HomePage', () => {
         cy.get('.content > form > button').click()
         cy.get('.logout > button').click()
         cy.GoToClient()
-        cy.get(':nth-child(4) > a').click()
+        cy.get('.view > button').click()
         cy.get('.yes > label').click()
         cy.get('.waitingForm > form > button').click()
         cy.ClientLogout()
@@ -103,7 +103,7 @@ describe('HomePage', () => {
         cy.get('.content > form > button').click()
         cy.get('.logout > button').click()
         cy.GoToClient()
-        cy.get(':nth-child(4) > a').click()
+        cy.get('.view > button').click()
         cy.get('.yes > label').click()
         cy.get('.waitingForm > form > button').click()
         cy.ClientLogout()
diff --git a/cypress/e2e/ReopeningService.cy.js b/cypress/e2e/ReopeningService.cy.js
index 0583a1a..8fdd771 100644
--- a/cypress/e2e/ReopeningService.cy.js
+++ b/cypress/e2e/ReopeningService.cy.js
@@ -29,7 +29,7 @@ describe('Reopening Service Tests', () => {
       cy.Logout()
 
       cy.GoToClient()
-      cy.get(':nth-child(4) > a').click()
+      cy.get('.view > button').click()
       cy.get('.waitingForm > form > button').click()
       cy.Logout()
 
@@ -49,7 +49,7 @@ describe('Reopening Service Tests', () => {
       cy.Logout()
 
       cy.GoToClient()
-      cy.get(':nth-child(4) > a').click()
+      cy.get('.view > button').click()
       cy.get('#reopen > p').invoke('text').should('have.string', 'Reabrir solicitação')
       cy.get('#reopen > p').click()
       cy.get('.actions > [type="submit"]').click()
@@ -58,61 +58,61 @@ describe('Reopening Service Tests', () => {
 
     })
 
-    it('insurance expired', () => {
+    // it('insurance expired', () => {
       
-      cy.exec('python manage.py migrate')
-      cy.DeleteAndCreateAdm()
-      cy.visit('/')
-      cy.on("uncaught:exception", (e, runnable) => {
-          console.log("error", e);
-          console.log("runnable", runnable);
-          console.log("error", e.message);
-          return false;
-      });
-
-      cy.CreateClient()
-      cy.CreateSolicitation()
-      // cy.clock()
-      cy.visit('/')
-      cy.ClientLogout()
-      cy.CreateAdmin()
-
-      cy.get('ul > :nth-child(1)').click()
-      cy.get(':nth-child(6) > a').click()
-      cy.get('#status').select('Aguardando orçamento')
-      cy.get('.content > form > button').click()
+    //   cy.exec('python manage.py migrate')
+    //   cy.DeleteAndCreateAdm()
+    //   cy.visit('/')
+    //   cy.on("uncaught:exception", (e, runnable) => {
+    //       console.log("error", e);
+    //       console.log("runnable", runnable);
+    //       console.log("error", e.message);
+    //       return false;
+    //   });
+
+    //   cy.CreateClient()
+    //   cy.CreateSolicitation()
+    //   // cy.clock()
+    //   cy.visit('/')
+    //   cy.ClientLogout()
+    //   cy.CreateAdmin()
+
+    //   cy.get('ul > :nth-child(1)').click()
+    //   cy.get(':nth-child(6) > a').click()
+    //   cy.get('#status').select('Aguardando orçamento')
+    //   cy.get('.content > form > button').click()
       
-      cy.get('.budgetContainer > input').type('90')
-      cy.get('.content > form > button').click()
-      cy.Logout()
-
-      cy.GoToClient()
-      cy.get(':nth-child(4) > a').click()
-      cy.get('.waitingForm > form > button').click()
-      cy.Logout()
-
-      cy.ChangeToAdmin()
-      cy.get('ul > :nth-child(1)').click()
-      cy.get(':nth-child(6) > a').click()
-      cy.get('.works > button').click()
-
-      cy.get('#detailed_problem_description').type('A')
-      cy.get('#necessary_parts').type('B')
-      cy.get('.works > button').click()
-
-      cy.get(':nth-child(6) > a').click()
-      cy.get('#status').select('Conserto finalizado')
-      cy.get('.update').click()
-
-      cy.Logout()
-      // cy.clock()
-
-      cy.GoToClient()
-      cy.get(':nth-child(4) > a').click()
-      // cy.get('#reopen > p').should('not.exist')
-      // cy.get('#reopen > p').click()
-      // cy.get('.actions > [type="submit"]').click()
-      // cy.get('.EM_ANALISE').invoke('text').should('have.string', 'EM ANÁLISE')
+    //   cy.get('.budgetContainer > input').type('90')
+    //   cy.get('.content > form > button').click()
+    //   cy.Logout()
+
+    //   cy.GoToClient()
+    //   cy.get('.view > button').click()
+    //   cy.get('.waitingForm > form > button').click()
+    //   cy.Logout()
+
+    //   cy.ChangeToAdmin()
+    //   cy.get('ul > :nth-child(1)').click()
+    //   cy.get(':nth-child(6) > a').click()
+    //   cy.get('.works > button').click()
+
+    //   cy.get('#detailed_problem_description').type('A')
+    //   cy.get('#necessary_parts').type('B')
+    //   cy.get('.works > button').click()
+
+    //   cy.get(':nth-child(6) > a').click()
+    //   cy.get('#status').select('Conserto finalizado')
+    //   cy.get('.update').click()
+
+    //   cy.Logout()
+    //   // cy.clock()
+
+    //   cy.GoToClient()
+    //   cy.get('.view > button').click()
+    //   // cy.get('#reopen > p').should('not.exist')
+    //   // cy.get('#reopen > p').click()
+    //   // cy.get('.actions > [type="submit"]').click()
+    //   // cy.get('.EM_ANALISE').invoke('text').should('have.string', 'EM ANÁLISE')
       
-    })
+    // })
 })
\ No newline at end of file
diff --git a/cypress/e2e/StatusMonitoring.cy.js b/cypress/e2e/StatusMonitoring.cy.js
index bf8b5b7..40f5726 100644
--- a/cypress/e2e/StatusMonitoring.cy.js
+++ b/cypress/e2e/StatusMonitoring.cy.js
@@ -20,7 +20,7 @@ describe('test suite status monitoring', () => {
         cy.get('.content > form > button').click();
         cy.get('.logout > button').click();
         cy.GoToClient();
-        cy.get(':nth-child(4) > a').click();
+        cy.get('.view > button').click();
         cy.get('.AGENDADO').invoke('text').should('have.string', 'AGENDADO')
     });
     it('Alterar o status de “Aceito” para “Em reparo”', () => {
@@ -48,7 +48,7 @@ describe('test suite status monitoring', () => {
         cy.get('.content > form > button').click()
         cy.get('.logout > button').click();
         cy.GoToClient();
-        cy.get(':nth-child(4) > a').click();
+        cy.get('.view > button').click();
         cy.get('.waitingForm > form > button').click()
         cy.ClientLogout();
         cy.get('#employee > a').click()
diff --git a/cypress/e2e/solicitationManagement.cy.js b/cypress/e2e/solicitationManagement.cy.js
index 46b3293..9d3525d 100644
--- a/cypress/e2e/solicitationManagement.cy.js
+++ b/cypress/e2e/solicitationManagement.cy.js
@@ -66,7 +66,7 @@ const oneMonthFromToday = formatDate(new Date(today.getFullYear(), today.getMont
         cy.get('.content > form > button').click()
         cy.get('.logout > button').click()
         cy.GoToClient()
-        cy.get(':nth-child(4) > a').click()
+        cy.get('.view > button').click()
         cy.get('.price > span').invoke('text').should('have.string', "50,00")
         cy.get('.waitingForm > p').invoke('text').should('have.string', "Você deseja prosseguir com o serviço?")
      })

From 7862c2cb8e9fa633ceaada3e31f0b3054101a8aa Mon Sep 17 00:00:00 2001
From: sophia <deletrasopa@gmail.com>
Date: Thu, 6 Jun 2024 20:32:30 -0300
Subject: [PATCH 3/3] refactoring button styles

---
 app_client/static/css/app_client/styles.css       | 4 +---
 app_client/templates/RequestOrder/orders.html     | 2 --
 app_company/static/app_company/js/filter-order.js | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app_client/static/css/app_client/styles.css b/app_client/static/css/app_client/styles.css
index 46f6229..0fa9c67 100644
--- a/app_client/static/css/app_client/styles.css
+++ b/app_client/static/css/app_client/styles.css
@@ -182,14 +182,12 @@ tbody td:first-child div {
 }
 
 .view button, .delete button {
-  padding: 8px 16px;
+  padding: 4px 8px;
   border: none;
   background-color: var(--blue-500);
   color: var(--white);
   font-weight: 600;
   border-radius: 4px;
-  float: right;
-  margin-top: 32px;
   transition: all .3s;
 }
 
diff --git a/app_client/templates/RequestOrder/orders.html b/app_client/templates/RequestOrder/orders.html
index 6fdd236..880fd1e 100644
--- a/app_client/templates/RequestOrder/orders.html
+++ b/app_client/templates/RequestOrder/orders.html
@@ -96,8 +96,6 @@ <h3>Suas solicitações</h3>
                                 <i data-lucide="star" width="28" height="28" color="#d4c02a"></i>
                             </a>
                         </td>
-
-                         
                     {% endif %} 
                     
                     {% if order.closedAt or order.status == 'CANELADO'%}
diff --git a/app_company/static/app_company/js/filter-order.js b/app_company/static/app_company/js/filter-order.js
index 28ce954..3754b14 100644
--- a/app_company/static/app_company/js/filter-order.js
+++ b/app_company/static/app_company/js/filter-order.js
@@ -60,7 +60,7 @@ function handleLoadFilteredHtml(order) {
         ${order.fields.isOs ? "Ordem de Serviço" : "Solicitação"}
       </td>
       <td>
-        <a href="${order.fields.isOs ? `/empresa/os/${order.pk}` : `/empresa/os/${order.pk}`}">
+        <a href="${order.fields.isOs ? `/empresa/os/${order.pk}` : `/empresa/solicitacao/${order.pk}`}">
           <svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28" fill="none" stroke="#155ec8" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-eye"><path d="M2 12s3-7 10-7 10 7 10 7-3 7-10 7-10-7-10-7Z"/><circle cx="12" cy="12" r="3"/></svg>
         </a>
       </td>