Commit 0ed36203 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Fix : Affichage des personnes/organisations et rôles selon leurs activités 

Fix : Nom des containers docker
parent 618649c4

docker/.env.dev.dist

+6 −6
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ APP_ADMINISTRATORS=stephane.bouvry@unicaen.fr 
# Exemple avec : PROXY=http://proxy.unicaen.fr:3128

# Exemple sans : PROXY=

HTTP_PROXY=

NO_PROXY=no_proxy=localhost,*.unicaen.fr,127.0.0.1,app-progresql,app-elasticsearch,app-gearman,app-apache,app-php,app-worker,app-vite

NO_PROXY=no_proxy=localhost,*.unicaen.fr,127.0.0.1,kusanagi-progresql,kusanagi-elasticsearch,kusanagi-gearman,kusanagi-apache,kusanagi-php,kusanagi-worker,kusanagi-vite



# ----------------------------------------------------------------------------

# MAILS ----------------------------------------------------------------------
@@ -28,7 +28,7 @@ MAILER_TYPE="smtp" 
# -- Host

#MAILER_CMD="/usr/sbin/sendmail -bs"

MAILER_CMD=

MAILER_HOST="app-mailhog"

MAILER_HOST="kusanagi-mailhog"

MAILER_PORT=1025

MAILER_USERNAME=""

MAILER_PASSWORD=""
@@ -80,7 +80,7 @@ VOLUMES_TIMESHEET_SPENT_ACTIVITY=${VOLUMES_TEMPLATES}/estimated_spent_activity_. 
# ----------------------------------------------------------------------------

## POSTGRESQL ----------------------------------------------------------------

# Cas 1 : Postgresql dans un container

POSGRESQL=app-postgres

POSGRESQL=kusanagi-postgres

POSGRESQL_USER=oscar_dev_user

POSGRESQL_PASS=oscar_dev_pass

POSGRESQL_BASE=oscar_dev_db
@@ -156,7 +156,7 @@ ENV_MODE=prod 




# PHP FPM  -------------------------------------------------------------------

PHP_HOST=app-php

PHP_HOST=kusanagi-php
@@ -171,12 +171,12 @@ VITE_BASE_URL_DEV="http://localhost:5173" 
VITE_BASE_URL_PROD="/js/oscar/vite/dist"



# Gearman --------------------------------------------------------------------

GEARMAN_HOST=app-gearman

GEARMAN_HOST=kusanagi-gearman

GEARMAN_PORT=4730

GEARMAN_ADDR=${GEARMAN_HOST}:${GEARMAN_PORT}



# Elasticsearch --------------------------------------------------------------

ELASTICSEARCH_HOST=app-elasticsearch

ELASTICSEARCH_HOST=kusanagi-elasticsearch

ELASTICSEARCH_PORT=9200

ELASTICSEARCH_ADDR=${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}

ELASTICSEARCH_MEMORY=1g

docker/.env.prod.dist

+6 −6
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ APP_ADMINISTRATORS=admin.oscar@your-domain.ext 
# Exemple avec : PROXY=http://proxy.your-domain.ext:3128

# Exemple sans : PROXY=

HTTP_PROXY=

NO_PROXY=no_proxy=localhost,*.your-domain.ext,127.0.0.1,app-progresql,app-elasticsearch,app-gearman,app-apache,app-php,app-worker,app-vite

NO_PROXY=no_proxy=localhost,*.your-domain.ext,127.0.0.1,kusanagi-progresql,kusanagi-elasticsearch,kusanagi-gearman,kusanagi-apache,kusanagi-php,kusanagi-worker,kusanagi-vite



# ----------------------------------------------------------------------------

# MAILS ----------------------------------------------------------------------
@@ -28,7 +28,7 @@ MAILER_TYPE="smtp" 
# -- Host

#MAILER_CMD="/usr/sbin/sendmail -bs"

MAILER_CMD=

MAILER_HOST="app-mailhog"

MAILER_HOST="kusanagi-mailhog"

MAILER_PORT=1025

MAILER_USERNAME=""

MAILER_PASSWORD=""
@@ -80,7 +80,7 @@ VOLUMES_TIMESHEET_SPENT_ACTIVITY=${VOLUMES_TEMPLATES}/estimated_spent_activity_. 
# ----------------------------------------------------------------------------

## POSTGRESQL ----------------------------------------------------------------

# Cas 1 : Postgresql dans un container

POSGRESQL=app-postgres

POSGRESQL=kusanagi-postgres

POSGRESQL_USER=oscar_dev_user

POSGRESQL_PASS=oscar_dev_pass

POSGRESQL_BASE=oscar_dev_db
@@ -156,7 +156,7 @@ ENV_MODE=prod 




# PHP FPM  -------------------------------------------------------------------

PHP_HOST=app-php

PHP_HOST=kusanagi-php
@@ -171,12 +171,12 @@ VITE_BASE_URL_DEV="http://localhost:5173" 
VITE_BASE_URL_PROD="/js/oscar/vite/dist"



# Gearman --------------------------------------------------------------------

GEARMAN_HOST=app-gearman

GEARMAN_HOST=kusanagi-gearman

GEARMAN_PORT=4730

GEARMAN_ADDR=${GEARMAN_HOST}:${GEARMAN_PORT}



# Elasticsearch --------------------------------------------------------------

ELASTICSEARCH_HOST=app-elasticsearch

ELASTICSEARCH_HOST=kusanagi-elasticsearch

ELASTICSEARCH_PORT=9200

ELASTICSEARCH_ADDR=${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}

ELASTICSEARCH_MEMORY=1g

docker/compose.dev.yml

+34 −34
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# OSCAR DOCKER (Prod)

########################################################################

networks:

  app-network:

  kusanagi-network:

    driver: bridge



volumes:
@@ -12,8 +12,8 @@ volumes: 
services:

  ######################################################################

  # POSTGRESQL

  app-postgres:

    container_name: app-postgres

  kusanagi-postgres:

    container_name: kusanagi-postgres



    restart: always
@@ -34,7 +34,7 @@ services: 
      no_proxy: ${NO_PROXY}



    networks:

      - app-network

      - kusanagi-network



    env_file:

      - .env
@@ -54,17 +54,17 @@ services: 


  ######################################################################

  ### APACHE

  app-apache:

    container_name: app-apache

  kusanagi-apache:

    container_name: kusanagi-apache

    restart: unless-stopped

    volumes:

      - ./:/var/application



    depends_on:

      - app-php

      - kusanagi-php



    networks:

      - app-network

      - kusanagi-network



    environment:

      http_proxy: ${HTTP_PROXY}
@@ -88,16 +88,16 @@ services: 


  ######################################################################

  ### GEARMAN

  app-gearman:

    container_name: app-gearman

  kusanagi-gearman:

    container_name: kusanagi-gearman

    image: artefactual/gearmand:1.1.21.2-alpine

    depends_on:

      - app-postgres

      - kusanagi-postgres

    environment:

      http_proxy: ${HTTP_PROXY}

      no_proxy: ${NO_PROXY}

    networks:

      - app-network

      - kusanagi-network

    env_file:

      - .env

    tty: true
@@ -106,15 +106,15 @@ services: 


  ######################################################################

  ### ELASTICSEARCH

  app-elasticsearch:

    container_name: app-elasticsearch

  kusanagi-elasticsearch:

    container_name: kusanagi-elasticsearch

    image: elasticsearch:7.17.28

    environment:

      - discovery.type=single-node

      - bootstrap.memory_lock=true

      - "ES_JAVA_OPTS=-Xms${ELASTICSEARCH_MEMORY} -Xmx${ELASTICSEARCH_MEMORY}"

    depends_on:

      app-postgres:

      kusanagi-postgres:

        condition: service_healthy

    ulimits:

      memlock:
@@ -126,7 +126,7 @@ services: 
      - elastic_data:/usr/share/elasticsearch/data

    user: "1000:1000"

    networks:

      - app-network

      - kusanagi-network

    env_file:

      - .env

    tty: true
@@ -135,11 +135,11 @@ services: 


  ######################################################################

  ### APPLICATION (Utilisée par Apache)

  app-php:

    container_name: app-php

  kusanagi-php:

    container_name: kusanagi-php

    restart: unless-stopped

    depends_on:

      - app-worker

      - kusanagi-worker

    volumes:

      - ./:/var/application

      # Dossiers
@@ -166,11 +166,11 @@ services: 
      # Fichiers de configuration (PHP)

      - ${VOLUMES_CONFIG}/php/90-app.ini:/usr/local/etc/php/conf.d/90-app.ini

      # Fichiers (DEVELOPPEMENT UNIQUEMENT)

      #- ./docker/app_99-debug.ini:/usr/local/etc/php/conf.d/99-app-debug.ini

      #- ./docker/app_99-debug.ini:/usr/local/etc/php/conf.d/99-kusanagi-debug.ini

    #    command:

    #      - chmod -R 777 /var/application/data

    networks:

      - app-network

      - kusanagi-network

    env_file:

      - .env

    environment:
@@ -186,11 +186,11 @@ services: 


    ######################################################################

  ### APPLICATION (Utilisée en mode CLI)

  app-worker:

    container_name: app-worker

  kusanagi-worker:

    container_name: kusanagi-worker

    restart: unless-stopped

    depends_on:

      - app-elasticsearch

      - kusanagi-elasticsearch

    volumes:

      - ./:/var/application

      # Dossiers
@@ -210,7 +210,7 @@ services: 
      # Fichiers de configuration (PHP)

      - ${VOLUMES_CONFIG}/php/95-cli.ini:/usr/local/etc/php/conf.d/95-cli.ini

    networks:

      - app-network

      - kusanagi-network

    env_file:

      - .env

    environment:
@@ -226,12 +226,12 @@ services: 


  ######################################################################

  ### VITE

  app-vite:

    container_name: app-vite

  kusanagi-vite:

    container_name: kusanagi-vite

    volumes:

      - ./:/var/application

    networks:

      - app-network

      - kusanagi-network

    build:

      context: ./docker/dev/vite

      dockerfile: Dockerfile
@@ -245,15 +245,15 @@ services: 
  # KIBANA

  kibana:

    image: docker.elastic.co/kibana/kibana:7.16.1

    container_name: app-kibana

    container_name: kusanagi-kibana

    depends_on:

      - app-elasticsearch

      - kusanagi-elasticsearch

    networks:

      - app-network

      - kusanagi-network

    #    deploy:

    #      replicas: ${DEVELOPPEMENT:-0}

    environment:

      - ELASTICSEARCH_HOSTS=http://app-elasticsearch:9200  # Connexion à Elasticsearch

      - ELASTICSEARCH_HOSTS=http://kusanagi-elasticsearch:9200  # Connexion à Elasticsearch

      - LOGGING_ROOT_LEVEL=error

    ports:

      - "5601:5601"
@@ -263,9 +263,9 @@ services: 
  # MAILHOG (capture les mails envoyés depuis Oscar)

  mailhog:

    image: mailhog/mailhog

    container_name: app-mailhog

    container_name: kusanagi-mailhog

    networks:

      - app-network

      - kusanagi-network

    #    deploy:

    #      replicas: ${DEVELOPPEMENT:-0}

    #

docker/compose.prod.yml

+25 −25
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# OSCAR DOCKER (Prod)

########################################################################

networks:

  app-network:

  kusanagi-network:

    driver: bridge



volumes:
@@ -12,8 +12,8 @@ volumes: 
services:

  ######################################################################

  # POSTGRESQL

  app-postgres:

    container_name: app-postgres

  kusanagi-postgres:

    container_name: kusanagi-postgres



    restart: always
@@ -34,7 +34,7 @@ services: 
      no_proxy: ${NO_PROXY}



    networks:

      - app-network

      - kusanagi-network



    env_file:

      - .env
@@ -54,17 +54,17 @@ services: 


  ######################################################################

  ### APACHE

  app-apache:

    container_name: app-apache

  kusanagi-apache:

    container_name: kusanagi-apache

    restart: unless-stopped

    volumes:

      - ./:/var/application



    depends_on:

      - app-php

      - kusanagi-php



    networks:

      - app-network

      - kusanagi-network



    environment:

      http_proxy: ${HTTP_PROXY}
@@ -88,16 +88,16 @@ services: 


  ######################################################################

  ### GEARMAN

  app-gearman:

    container_name: app-gearman

  kusanagi-gearman:

    container_name: kusanagi-gearman

    image: artefactual/gearmand:1.1.21.2-alpine

    depends_on:

      - app-postgres

      - kusanagi-postgres

    environment:

      http_proxy: ${HTTP_PROXY}

      no_proxy: ${NO_PROXY}

    networks:

      - app-network

      - kusanagi-network

    env_file:

      - .env

    tty: true
@@ -106,15 +106,15 @@ services: 


  ######################################################################

  ### ELASTICSEARCH

  app-elasticsearch:

    container_name: app-elasticsearch

  kusanagi-elasticsearch:

    container_name: kusanagi-elasticsearch

    image: elasticsearch:7.17.28

    environment:

      - discovery.type=single-node

      - bootstrap.memory_lock=true

      - "ES_JAVA_OPTS=-Xms${ELASTICSEARCH_MEMORY} -Xmx${ELASTICSEARCH_MEMORY}"

    depends_on:

      app-postgres:

      kusanagi-postgres:

        condition: service_healthy

    ulimits:

      memlock:
@@ -126,7 +126,7 @@ services: 
      - elastic_data:/usr/share/elasticsearch/data

    user: "1000:1000"

    networks:

      - app-network

      - kusanagi-network

    env_file:

      - .env

    tty: true
@@ -135,11 +135,11 @@ services: 


  ######################################################################

  ### APPLICATION (Utilisée par Apache)

  app-php:

    container_name: app-php

  kusanagi-php:

    container_name: kusanagi-php

    restart: unless-stopped

    depends_on:

      - app-worker

      - kusanagi-worker

    volumes:

      - ./:/var/application

      # Dossiers
@@ -166,11 +166,11 @@ services: 
      # Fichiers de configuration (PHP)

      - ${VOLUMES_CONFIG}/php/90-app.ini:/usr/local/etc/php/conf.d/90-app.ini

      # Fichiers (DEVELOPPEMENT UNIQUEMENT)

      #- ./docker/app_99-debug.ini:/usr/local/etc/php/conf.d/99-app-debug.ini

      #- ./docker/app_99-debug.ini:/usr/local/etc/php/conf.d/99-kusanagi-debug.ini

    #    command:

    #      - chmod -R 777 /var/application/data

    networks:

      - app-network

      - kusanagi-network

    env_file:

      - .env

    environment:
@@ -186,11 +186,11 @@ services: 


    ######################################################################

  ### APPLICATION (Utilisée en mode CLI)

  app-worker:

    container_name: app-worker

  kusanagi-worker:

    container_name: kusanagi-worker

    restart: unless-stopped

    depends_on:

      - app-elasticsearch

      - kusanagi-elasticsearch

    volumes:

      - ./:/var/application

      # Dossiers
@@ -210,7 +210,7 @@ services: 
      # Fichiers de configuration (PHP)

      - ${VOLUMES_CONFIG}/php/95-cli.ini:/usr/local/etc/php/conf.d/95-cli.ini

    networks:

      - app-network

      - kusanagi-network

    env_file:

      - .env

    environment:

module/Oscar/src/Oscar/Controller/ProjectGrantController.php

+1 −1
Original line number Diff line number Diff line
@@ -2454,7 +2454,7 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 
                'roleLabel'     => $activityPerson->getRole(),

                'roleId'        => $activityPerson->getRoleObj() ? $activityPerson->getRoleObj()->getId() : "",

                'rolePrincipal' => $activityPerson->isPrincipal(),

                'personEnd'     => DateTimeUtils::toStr($activityPerson->getPerson()->getLdapFinInscription(), 'Y-m-d'),

                'personEnd'     => $activityPerson->getPerson()->getLdapFinInscription(),

                'urlDelete'     => $urlDelete,

                'context'       => $context,

                'contextKey'    => $contextKey,