From e672ac48a7d65c58835449ed09bd30dc2da9f5e4 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Mon, 24 Jan 2022 17:58:20 -0300 Subject: [PATCH 1/4] FIX: API Proyecto Operadores --- api/common/Controller/Proyectos.php | 7 ++++--- api/src/Proyecto.php | 10 ++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/api/common/Controller/Proyectos.php b/api/common/Controller/Proyectos.php index 106e840..3d4ff13 100644 --- a/api/common/Controller/Proyectos.php +++ b/api/common/Controller/Proyectos.php @@ -47,9 +47,10 @@ class Proyectos { $output = [ 'proyecto' => $proyecto->as_array(), 'operadores' => $proyecto->operadores() ? array_map(function($item) { - if ($item) { - return $item->as_array(); - } + $arr = $item->as_array(); + $arr['agente_tipo'] = $item->agente_tipo()->as_array(); + $arr['agente_tipo']['agente'] = $arr['operador'] = $item->agente_tipo()->agente()->as_array(); + return $arr; }, $proyecto->operadores()) : null ]; return $this->withJson($response, $output); diff --git a/api/src/Proyecto.php b/api/src/Proyecto.php index dbf7d92..78be0a6 100644 --- a/api/src/Proyecto.php +++ b/api/src/Proyecto.php @@ -45,12 +45,10 @@ class Proyecto extends Model { public function operadores() { if ($this->operadores === null) { $pas = $this->has_many(ProyectoAgente::class, 'proyecto')->find_many(); - $operadores = []; - foreach ($pas as $pa) { - $id = $pa->agente_tipo()->agente()->id; - $operadores []= Model::factory(Operador::class)->find_one($id); - } - $this->operadores = $operadores; + $pas = array_filter($pas, function($pa) { + return ($pa->agente_tipo()->tipo() === 'operador'); + }); + $this->operadores = $pas; } return $this->operadores; } From 71e10c52bddbaa7a78220b69c4dd31681bf74fd5 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Mon, 24 Jan 2022 18:19:46 -0300 Subject: [PATCH 2/4] FIX: link informes --- ui/resources/views/layout/menu/operadores.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/resources/views/layout/menu/operadores.blade.php b/ui/resources/views/layout/menu/operadores.blade.php index fcb579f..90bcded 100644 --- a/ui/resources/views/layout/menu/operadores.blade.php +++ b/ui/resources/views/layout/menu/operadores.blade.php @@ -6,6 +6,6 @@ Ventas
  • - Informe + Informe
    • From 52e922685dc9f5c947d8d70e7bddd5acf88d39da Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 7 Mar 2022 12:43:32 +0000 Subject: [PATCH 3/4] Update 2022-03-07 --- api/common/Controller/Proyectos.php | 1 + api/setup/settings/01_env.php | 2 +- docker-compose.yml | 50 ++++++++++++------------ ui/resources/views/layout/menu.blade.php | 13 +++--- ui/setup/settings/01_env.php | 1 + 5 files changed, 36 insertions(+), 31 deletions(-) diff --git a/api/common/Controller/Proyectos.php b/api/common/Controller/Proyectos.php index 3d4ff13..c310f34 100644 --- a/api/common/Controller/Proyectos.php +++ b/api/common/Controller/Proyectos.php @@ -44,6 +44,7 @@ class Proyectos { } public function operadores(Request $request, Response $response, $id_proyecto): Response { $proyecto = Model::factory(Proyecto::class)->find_one($id_proyecto); +error_log(var_export($proyecto->operadores(), true)); $output = [ 'proyecto' => $proyecto->as_array(), 'operadores' => $proyecto->operadores() ? array_map(function($item) { diff --git a/api/setup/settings/01_env.php b/api/setup/settings/01_env.php index 9c8d337..d12fd58 100644 --- a/api/setup/settings/01_env.php +++ b/api/setup/settings/01_env.php @@ -7,7 +7,7 @@ return [ 'engine' => 'mysql', 'name' => $_ENV['MYSQL_DATABASE'], 'host' => (object) [ - 'name' => 'db' + 'name' => $_ENV['MYSQL_HOST'] ], 'user' => (object) [ 'name' => $_ENV['MYSQL_USER'], diff --git a/docker-compose.yml b/docker-compose.yml index 7fa8dc3..0e448f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,11 +10,12 @@ services: - ./logs/api/:/var/log/nginx/ restart: unless-stopped ports: - - 8081:80 + - 8001:80 depends_on: - backend backend: container_name: backend + restart: unless-stopped image: php build: context: ./api @@ -22,8 +23,8 @@ services: env_file: .db.env volumes: - ./api/:/app/ - depends_on: - - db +# depends_on: +# - db frontend-proxy: container_name: frontend_proxy @@ -34,11 +35,12 @@ services: - ./logs/ui/:/var/log/nginx/ restart: unless-stopped ports: - - 8080:80 + - 8000:80 depends_on: - frontend frontend: container_name: frontend + restart: unless-stopped image: php:ui build: context: ./ui @@ -46,23 +48,23 @@ services: env_file: .ui.env volumes: - ./ui/:/app/ - - db: - image: mariadb - volumes: - - database:/var/lib/mysql - env_file: .db.env - adminer: - image: adminer - environment: - ADMINER_PLUGINS: "dump-json edit-foreign enum-option json-column" - ADMINER_DESIGN: "dracula" - volumes: - - ./adminer/plugins-enabled/:/var/www/html/plugins-enabled/ - ports: - - 8082:8080 - depends_on: - - db - -volumes: - database: +# +# db: +# image: mariadb +# volumes: +# - database:/var/lib/mysql +# env_file: .db.env +# adminer: +# image: adminer +# environment: +# ADMINER_PLUGINS: "dump-json edit-foreign enum-option json-column" +# ADMINER_DESIGN: "dracula" +# volumes: +# - ./adminer/plugins-enabled/:/var/www/html/plugins-enabled/ +# ports: +# - 8082:8080 +# depends_on: +# - db +# +#volumes: +# database: diff --git a/ui/resources/views/layout/menu.blade.php b/ui/resources/views/layout/menu.blade.php index 090a66b..d8fe9d4 100644 --- a/ui/resources/views/layout/menu.blade.php +++ b/ui/resources/views/layout/menu.blade.php @@ -23,18 +23,19 @@ @include('layout.menu.informes') +
  • + + @include('layout.menu.operadores') +
    • + -
  • - - @include('layout.menu.operadores') -