From c310e021602b30c40c1a4fbfdba78014c6bf5661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leon=20A=2E=20Okida=20Gon=C3=A7alves?= <laog19@inf.ufpr.br>
Date: Mon, 3 Apr 2023 11:00:49 -0300
Subject: [PATCH] Add city_name, city_id, state_name, state_id fields to new
routes
---
src/libs/routes_v2/simcaqDivisionOfResponsibility.js | 6 ++++--
src/libs/routes_v2/simcaqEnrollmentDiagnosis.js | 6 ++++--
src/libs/routes_v2/simcaqFirstReport.js | 6 ++++--
src/libs/routes_v2/simcaqSecondReport.js | 6 ++++--
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/libs/routes_v2/simcaqDivisionOfResponsibility.js b/src/libs/routes_v2/simcaqDivisionOfResponsibility.js
index e115ed41..ca7b7c12 100644
--- a/src/libs/routes_v2/simcaqDivisionOfResponsibility.js
+++ b/src/libs/routes_v2/simcaqDivisionOfResponsibility.js
@@ -55,7 +55,8 @@ rqf.addField({
}).addValue({
name: 'city',
table: 'municipio',
- tableField: 'id',
+ tableField: ['nome', 'id'],
+ resultField: ['city_name', 'city_id'],
where: {
relation: '=',
type: 'integer',
@@ -69,7 +70,8 @@ rqf.addField({
}, 'dims').addValue({
name: 'state',
table: 'estado',
- tableField: 'id',
+ tableField: ['nome', 'id'],
+ resultField: ['state_name', 'state_id'],
where: {
relation: '=',
type: 'integer',
diff --git a/src/libs/routes_v2/simcaqEnrollmentDiagnosis.js b/src/libs/routes_v2/simcaqEnrollmentDiagnosis.js
index d77aa191..1d6c7082 100644
--- a/src/libs/routes_v2/simcaqEnrollmentDiagnosis.js
+++ b/src/libs/routes_v2/simcaqEnrollmentDiagnosis.js
@@ -64,7 +64,8 @@ rqf.addField({
}).addValue({
name: 'city',
table: 'municipio',
- tableField: 'id',
+ tableField: ['nome', 'id'],
+ resultField: ['city_name', 'city_id'],
where: {
relation: '=',
type: 'integer',
@@ -78,7 +79,8 @@ rqf.addField({
}, 'dims').addValue({
name: 'state',
table: 'estado',
- tableField: 'id',
+ tableField: ['nome', 'id'],
+ resultField: ['state_name', 'state_id'],
where: {
relation: '=',
type: 'integer',
diff --git a/src/libs/routes_v2/simcaqFirstReport.js b/src/libs/routes_v2/simcaqFirstReport.js
index d8e3cf0f..6c037cf4 100644
--- a/src/libs/routes_v2/simcaqFirstReport.js
+++ b/src/libs/routes_v2/simcaqFirstReport.js
@@ -73,7 +73,8 @@ rqf.addField({
}).addValue({
name: 'city',
table: 'municipio',
- tableField: 'id',
+ tableField: ['nome', 'id'],
+ resultField: ['city_name', 'city_id'],
where: {
relation: '=',
type: 'integer',
@@ -87,7 +88,8 @@ rqf.addField({
}, 'dims').addValue({
name: 'state',
table: 'estado',
- tableField: 'id',
+ tableField: ['nome', 'id'],
+ resultField: ['state_name', 'state_id'],
where: {
relation: '=',
type: 'integer',
diff --git a/src/libs/routes_v2/simcaqSecondReport.js b/src/libs/routes_v2/simcaqSecondReport.js
index cfe27ddd..4c30f8d1 100644
--- a/src/libs/routes_v2/simcaqSecondReport.js
+++ b/src/libs/routes_v2/simcaqSecondReport.js
@@ -64,7 +64,8 @@ rqf.addField({
}).addValue({
name: 'city',
table: 'municipio',
- tableField: 'id',
+ tableField: ['nome', 'id'],
+ resultField: ['city_name', 'city_id'],
where: {
relation: '=',
type: 'integer',
@@ -78,7 +79,8 @@ rqf.addField({
}, 'dims').addValue({
name: 'state',
table: 'estado',
- tableField: 'id',
+ tableField: ['nome', 'id'],
+ resultField: ['state_name', 'state_id'],
where: {
relation: '=',
type: 'integer',
--
GitLab