Desenvolvendo issues #127 e #103

backend/__tests__/Client.test.ts

@@ -30,6 +30,7 @@ test("store a Client and fetch it", async () => {
       name: "Joe",
       email:"joe2@gmail.com",
       phone:"(86)8988-8989",
+      nickbame:"joezinho",
       password:"doidinho123",
       type:0
   }
@@ -54,6 +55,7 @@ test("store a Client and update it", async () => {
       name: "Joe",
       email:"joe2@gmail.com",
       phone:"(86)8988-8989",
+      nickbame:"joezinho",
       password:"doidinho123",
       type:0
   }

backend/__tests__/Professional.test.ts

@@ -28,6 +28,7 @@ test("store a Professional and fetch it", async () => {
 
   const newProfessional = {
       name: "Joe",
+      nickbame:"joezao",
       email:"joe2@gmail.com",
       speciality:"psicologia forense",
       crm_crp:"071.122.811-79",
@@ -49,43 +50,6 @@ test("store a Professional and fetch it", async () => {
 });
 
 
-test("store a Client and update it", async () => {
-
-  const newProfessional = {
-    name: "Joe",
-    email:"joe2@gmail.com",
-    speciality:"psicologia forense",
-    crm_crp:"071.122.811-79",
-    password:"joepsicologia",
-    type:1
-  }
-
-
-  const userService = new UserService();
-
-  await userService.createUser(newProfessional);
-
-
-  let joe = await getRepository(Professional).findOne({
-      where: {
-        crm_crp:"071.122.811-79"
-      }
-  });
-
-  const professionalService = new ProfessionalService();
-
-  await professionalService.update({id:joe.id, name:"Joe Atualizado",});
-
-  let joe2 = await getRepository(Professional).findOne({
-    where: {
-      id:joe.id
-    }
-});
-
-
-  expect(joe2.name).toBe("Joe Atualizado");
-});
-
 test("Fetch all clients from a professional", async () => {
   const professional = {
     name: "Maria Soares",
@@ -94,6 +58,7 @@ test("Fetch all clients from a professional", async () => {
     crm_crp:"071.122.811-79",
     association_code: "#322T",
     password:"mariapsicologia",
+    nickbame:"mariazinha",
     type:1
   }
 
@@ -102,6 +67,7 @@ test("Fetch all clients from a professional", async () => {
 
   const client = {
     name: "Joe",
+    nickbame:"joezinho",
     email: "joe2@gmail.com",
     phone: "(86)8988-8989",
     password: "joe123",

backend/__tests__/User.test.ts

@@ -29,6 +29,7 @@ test("store a User and recognize him/her as a Client or a Professional", async (
         name: "Maria Soares",
         email: "maria_soares@gmail.com",
         speciality: "psicologia forense",
+        nickbame:"joezinho",
         crm_crp: "071.122.811-79",
         association_code: "#322T",
         password: "mariapsicologia",
@@ -41,6 +42,7 @@ test("store a User and recognize him/her as a Client or a Professional", async (
     const client = {
         name: "Joe",
         email: "joe2@gmail.com",
+        nickbame:"joezinho",
         phone: "(86)8988-8989",
         password: "joe123",
         type: 0

backend/src/database/migrations/1625436997301-UpadateProfessionalColumns.ts

@@ -0,0 +1,17 @@
+import {MigrationInterface, QueryRunner, TableColumn} from "typeorm";
+
+export class UpadateProfessionalColumns1625436997301 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.addColumn('professionals', new TableColumn({
+            name:"nickname",
+            type:"varchar",
+            default:'""'
+        }))
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.dropColumn("professionals",'nickname')
+    }
+
+}

backend/src/database/migrations/1625439373381-UpadateClientColumns.ts

@@ -0,0 +1,17 @@
+import {MigrationInterface, QueryRunner, TableColumn} from "typeorm";
+
+export class UpadateClientColumns1625439373381 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.addColumn('clients', new TableColumn({
+            name:"nickname",
+            type:"varchar",
+            default:'""'
+        }))
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.dropColumn("clients",'nickname')
+    }
+
+}

backend/src/entities/Client.ts

@@ -12,6 +12,9 @@ import { EmotionalReaction } from './EmotionalReaction';
     @Column()
     name:string;
 
+    @Column({default:""})
+    nickname:string;
+
     @Column()
     phone:string;
 

backend/src/entities/Professional.ts

@@ -11,6 +11,9 @@ import { User } from './User';
       @Column()
       name:string;
 
+      @Column({default:""})
+      nickname:string;
+
       @Column()
       speciality:string;
 

frontend/src/views/RecordsList/index.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { FlatList,ActivityIndicator} from 'react-native';
+import { useNavigation } from '@react-navigation/native';
 import Alert2Options from '../../components/Alert2Options';
 import Record_card from '../../components/Record_card';
 import { Title,Container,NothingFound,ContainerAll,TextNothingFound } from './styles';
@@ -13,8 +14,9 @@ interface Record{
 }
 
 export default function RecordsList() {
-
-    const client_id = "1";
+
+    const navigation = useNavigation();
+    const client_id = "1avb";
     const [idCurrent, setIdCurrent] = useState<string>("");
     const [loading, setLoading] = useState<boolean>(true);
     const [modalIsVisible, setModalIsVisible] = useState<boolean>(false);
@@ -39,7 +41,7 @@ export default function RecordsList() {
 
                 const fields = Object.entries(record);
 
-                const fields_cont = fields.filter( field => field[1] !== '').length;
+                const fields_cont = fields.filter( field => ( (field[1] !== null) && (field[1] !== "") && (String(field[1]).length > 1) )).length;
 
                 const fields_completed = Math.round(fields_cont / fields.length * 100);
 
@@ -85,7 +87,7 @@ export default function RecordsList() {
     }
 
     function onPressCard(){
-
+        navigation.navigate('Registration');
     }
 
     return (