Merge pull request #41 from universodown/feat/final-version-pack-1

Feat/final version pack 1
universodown · Dec 20, 2021 · b452a7f · b452a7f
2 parents 16fd873 + c83ebc8
commit b452a7f
Show file tree

Hide file tree

Showing 36 changed files with 1,511 additions and 168 deletions.
diff --git a/backend/src/services/assisted.ts b/backend/src/services/assisted.ts
@@ -28,7 +28,7 @@ export default class AssistedService {
     }
 
     async update(
-        _: Context,
+        context: Context,
         id: number,
         assistedInfo: AssistedUpdate
     ) {
@@ -38,7 +38,9 @@ export default class AssistedService {
 
             return repository.save({
                 ...assisted,
-                ...assistedInfo
+                ...assistedInfo,
+                id,
+                organizationId: context.organization.id
             })
         })
     }

diff --git a/frontend/html/cadastrar/assisted.html b/frontend/html/cadastrar/assisted.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <title>Cadastro do Paciente</title>
+    <title>Cadastro do Atendido</title>
     <meta name="description" content="" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
 
@@ -26,7 +26,7 @@
       <!-- Conteúdo da Página  -->
       <div id="content">
         <div class="card col-12">
-          <h3 class="mt-4 ml-2 titulo">Cadastro do(a) Paciente</h3>
+          <h3 class="mt-4 ml-2 titulo">Cadastro do(a) Atendido</h3>
           <div class="card-body">
             <form class="form-group" id="form">
               <div class="container">
@@ -217,7 +217,6 @@ <h3 class="mt-4 ml-2 titulo">Cadastro do(a) Paciente</h3>
                       name="phone"
                       id="phone"
                       placeholder="(DDD+)"
-                      required
                     />
                   </div>
 
@@ -254,7 +253,6 @@ <h3 class="mt-4 ml-2 titulo">Cadastro do(a) Paciente</h3>
                       name="nationalIdentity"
                       id="nationalIdentity"
                       placeholder="Identidade Nacional"
-                      required
                     />
                   </div>
 
@@ -268,8 +266,7 @@ <h3 class="mt-4 ml-2 titulo">Cadastro do(a) Paciente</h3>
                       name="socialIdentificationNumber"
                       id="socialIdentificationNumber"
                       placeholder="Numero Identificação Nacional"
-                      required
-                    />
+                      />
                   </div>
 
                   <div class="col-4">

diff --git a/frontend/html/cadastrar/calendar.html b/frontend/html/cadastrar/calendar.html
@@ -32,7 +32,7 @@ <h3 class="mt-4 ml-2 titulo"> Agendamento de Consultas</h3>
                 <div class="container"> 
                     <div class="col-12">
                         <!-- SearchBar  -->
-                        <h6 class="col-12">Nome do(a) Especialista</h6>
+                        <h6 class="col-12">Nome do(a) Profissional</h6>
                         <div id="searchbar-user" name="userId"></div>
                     </div>
                         <div class="col-6">

diff --git a/frontend/html/cadastrar/evolutionRecord.html b/frontend/html/cadastrar/evolutionRecord.html
@@ -32,13 +32,13 @@ <h3 class="mt-4 ml-2 titulo">Registro da Evolução</h3>
               <div class="container">
                 <div class="row">
                   <div class="col-12">
-                    <!-- SearchBar  Paciente-->
-                    <h6 class="col-12">Nome do(a) Paciente</h6>
+                    <!-- SearchBar  Atendido-->
+                    <h6 class="col-12">Nome do(a) Atendido</h6>
                     <div id="searchbar-assisted" name="assistedId"></div>
                   </div>
                   <div class="col-12">
-                    <!-- SearchBar  Especialista-->
-                    <h6 class="col-12">Nome do(a) Especialista</h6>
+                    <!-- SearchBar  Profissional-->
+                    <h6 class="col-12">Nome do(a) Profissional</h6>
                     <div id="searchbar-user" name="userId"></div>
                   </div>
                   <div class="col-6">
@@ -75,7 +75,7 @@ <h6 class="col-12">Nome do(a) Especialista</h6>
                       name="weight"
                       id="weight"
                       step=0.01
-                      placeholder="Peso do Paciente"
+                      placeholder="Peso do Atendido"
                       required
                     />
                   </div>
@@ -86,7 +86,7 @@ <h6 class="col-12">Nome do(a) Especialista</h6>
                       class="form-control"
                       name="height"
                       id="height"
-                      placeholder="Altura do Paciente"
+                      placeholder="Altura do Atendido"
                       maxlength="4"
                       required
                     />

diff --git a/frontend/html/cadastrar/needSpeciality.html b/frontend/html/cadastrar/needSpeciality.html
@@ -33,7 +33,7 @@ <h3 class="mt-4 ml-2 titulo">Necessidade de Especialidade</h3>
                 <div class="row">
                   <div class="col-12">
                     <!-- SearchBar  -->
-                    <h6 class="col-12">Nome do(a) Paciente</h6>
+                    <h6 class="col-12">Nome do(a) Atendido</h6>
                     <div id="searchbar-evo" name="evoId"></div>
                   </div>
                   <div class="col-12">

diff --git a/frontend/html/cadastrar/professionalAttendance.html b/frontend/html/cadastrar/professionalAttendance.html
@@ -31,7 +31,7 @@ <h3 class="mt-4 ml-2 titulo">Controle do Atendimento Profissional</h3>
                 <div class="row">
                   <div class="col-12">
                     <!-- SearchBar  -->
-                    <h6 class="col-12">Nome do(a) Paciente</h6>
+                    <h6 class="col-12">Nome do(a) Atendido</h6>
                     <div id="searchbar-evo" name="evoId"></div>
                   </div>
                   <div class="col-6">

diff --git a/frontend/html/cadastrar/related.html b/frontend/html/cadastrar/related.html
@@ -34,7 +34,7 @@ <h3 class="mt-4 ml-2 titulo"> Cadastro de Familiar</h3>
                   <div class="row">
                     <div class="col-12">
                       <!-- SearchBar  -->
-                      <h6 class="col-12">Nome do(a) Paciente </h6>
+                      <h6 class="col-12">Nome do(a) Atendido </h6>
                       <div id="searchbar-assisted" name="assistedId" required></div>
                     </div>
                     <hr size=4>

diff --git a/frontend/html/cadastrar/schoolRequest.html b/frontend/html/cadastrar/schoolRequest.html
@@ -33,7 +33,7 @@ <h3 class="mt-4 ml-2 titulo">Solicitaçao Escolar</h3>
                   <div class="col-12">
                     <div class="col-12">
                       <!-- SearchBar  -->
-                      <h6 class="col-12">Nome do(a) Paciente</h6>
+                      <h6 class="col-12">Nome do(a) Atendido</h6>
                       <div id="searchbar-assisted" name="assistedId"></div>
                     </div>
                   </div>

diff --git a/frontend/html/cadastrar/specialities.html b/frontend/html/cadastrar/specialities.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <title>Cadastro de Especialista</title>
+    <title>Cadastro de Profissional</title>
 
     <!-- Bootstrap CSS -->
     <link rel="stylesheet" href="../../public/css/bootstrap.min.css" />
@@ -23,15 +23,15 @@
       <!-- Conteúdo da Página  -->
       <div id="content">
         <div class="card col-12"> 
-        <h3 class="mt-4 ml-2 titulo"> Cadastro de Especialista</h3>
+        <h3 class="mt-4 ml-2 titulo"> Cadastro de Profissional</h3>
         <div class="card-body">
           <form class="form-group" id="form" name="form">
            <hr size=4 >
             <div class="container"> 
               <div class="row">
                 <div class="col-6">
                     <!-- SearchBar  -->
-                      <h6 class="col-12">Nome do(a) Especialista </h6>
+                      <h6 class="col-12">Nome do(a) Profissional </h6>
                       <div id="searchbar-user" name="userId"></div>
                 </div>
                 <div class="col-6">

diff --git a/frontend/html/cadastrar/transportRequest.html b/frontend/html/cadastrar/transportRequest.html
@@ -34,7 +34,7 @@ <h3 class="mt-4 ml-2 titulo">Solicitaçao De Transporte</h3>
                     <div class="col-12">
                         <div class="col-12">
                             <!-- SearchBar  -->
-                            <h6 class="col-12">Nome do(a) Paciente</h6>
+                            <h6 class="col-12">Nome do(a) Atendido</h6>
                             <div id="searchbar-assisted" name="assistedId" required></div>
                         </div>
                     </div>

diff --git a/frontend/html/cadastrar/user.html b/frontend/html/cadastrar/user.html
@@ -270,7 +270,7 @@ <h3 class="mt-4 ml-2" style="text-align: center">
                       required
                     >
                       <option value="secretary">Secretaria(o)</option>
-                      <option value="professional">Especialista</option>
+                      <option value="professional">Profissional</option>
                       <option value="social-assistence">
                         Trabalhador(a) Social
                       </option>