Merge branch 'develop' of http://git.provm.cl/Incoviba/operadores.git

into develop

api/common/Controller/Proyectos.php

@@ -44,12 +44,14 @@ 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) {
-        if ($item) {
+        $arr = $item->as_array();
-          return $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);

api/nginx.conf

@@ -18,7 +18,7 @@ server {
   location ~ \.php$ {
     try_files $uri =404;
     fastcgi_split_path_info ^(.+\.php)(/.+)$;
-    fastcgi_pass backend:9000;
+    fastcgi_pass operadores-backend:9000;
     fastcgi_index index.php;
     include fastcgi_params;
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

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 = [];
+      $pas = array_filter($pas, function($pa) {
-      foreach ($pas as $pa) {
+          return ($pa->agente_tipo()->tipo() === 'operador');
-        $id = $pa->agente_tipo()->agente()->id;
+      });
-        $operadores []= Model::factory(Operador::class)->find_one($id);
+      $this->operadores = $pas;
-      }
-      $this->operadores = $operadores;
     }
     return $this->operadores;
   }

docker-compose.yml

@@ -1,53 +1,61 @@
 version: '3'
 
 services:
-  backend-proxy:
+  operadores-backend-proxy:
-    container_name: backend_proxy
+    profiles:
+      - operadores
+    container_name: operadores_api
     image: nginx
     volumes:
-      - ./api/:/app/
+      - ${OPERADORES_PATH:-.}/api/:/app/
-      - ./api/nginx.conf:/etc/nginx/conf.d/default.conf
+      - ${OPERADORES_PATH:-.}/api/nginx.conf:/etc/nginx/conf.d/default.conf
-      - ./logs/api/:/var/log/nginx/
+      - ./logs/operadores/api/:/var/log/nginx/
     restart: unless-stopped
     ports:
       - 8001:80
     depends_on:
-      - backend
+      - operadores-backend
-  backend:
+  operadores-backend:
-    container_name: backend
+    profiles:
+      - operadores
+    container_name: operadores_backend
     restart: unless-stopped
     image: php
     build:
-      context: ./api
+      context: ${OPERADROES_PATH:-.}/api
       dockerfile: PHP.Dockerfile
-    env_file: .db.env
+    env_file: ${OPERADORES_PATH:-.}/.db.env
     volumes:
-      - ./api/:/app/
+      - ${OPERADORES_PATH:-.}/api/:/app/
 #    depends_on:
 #      - db
 
-  frontend-proxy:
+  operadores-frontend-proxy:
-    container_name: frontend_proxy
+    profiles:
+      - operadores
+    container_name: operadores_ui
     image: nginx
     volumes:
-      - ./ui/:/app/
+      - ${OPERADORES_PATH:-.}/ui/:/app/
-      - ./ui/nginx.conf:/etc/nginx/conf.d/default.conf
+      - ${OPERADORES_PATH:-.}/ui/nginx.conf:/etc/nginx/conf.d/default.conf
-      - ./logs/ui/:/var/log/nginx/
+      - ./logs/operadores/ui/:/var/log/nginx/
     restart: unless-stopped
     ports:
       - 8000:80
     depends_on:
-      - frontend
+      - operadores-frontend
-  frontend:
+  operadores-frontend:
-    container_name: frontend
+    profiles:
+    - operadores
+    container_name: operadores_frontend
     restart: unless-stopped
     image: php:ui
     build:
-      context: ./ui
+      context: ${OPERADORES_PATH:-.}/ui
       dockerfile: PHP.Dockerfile
-    env_file: .ui.env
+    env_file: ${OPERADORES_PATH:-.}/.ui.env
     volumes:
-      - ./ui/:/app/
+      - ${OPERADORES_PATH:-.}/ui/:/app/
 #
 #  db:
 #    image: mariadb
@@ -68,3 +76,8 @@ services:
 #
 #volumes:
 #  database:
+
+networks:
+  default:
+    external: true
+    name: incoviba_network

ui/nginx.conf

@@ -13,7 +13,7 @@ server {
   location ~ \.php$ {
     try_files $uri =404;
     fastcgi_split_path_info ^(.+\.php)(/.+)$;
-    fastcgi_pass frontend:9000;
+    fastcgi_pass operadores-frontend:9000;
     fastcgi_index index.php;
     include fastcgi_params;
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

ui/resources/views/layout/menu.blade.php

@@ -23,6 +23,13 @@
 			@include('layout.menu.informes')
 		</li>
 
+		<li rol="presentation" class="dropdown">
+                        <a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
+                                Operadores <span class="caret"></span>
+                        </a>
+                        @include('layout.menu.operadores')
+                </li>
+
 		<li role="presentation" class="dropdown">
                         <a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
                                 Operadores <span class="caret"></span>

ui/resources/views/layout/menu/operadores.blade.php

@@ -6,6 +6,6 @@
     <a href="{{$urls->base}}/ventas">Ventas</a>
   </li>
   <li>
-    <a href="{{$urls->base}}/informe">Informe</a>
+    <a href="{{$urls->base}}/facturas">Informe</a>
   </li>
 </ul>