Merge Develop to main

Dockerfile

@@ -26,8 +26,8 @@ RUN echo "deb http://archive.debian.org/debian buster main contrib non-free" > /
     ruby ruby-dev libpq-dev gnupg git \
     libfreetype6-dev libjpeg62-turbo-dev libpng-dev sudo procps \
     #instalação do node 14 
-    && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
-    && apt-get install -y nodejs \
+    && curl -fsSL https://nodejs.org/dist/v14.21.3/node-v14.21.3-linux-x64.tar.xz \
+    | tar -xJ -C /usr/local --strip-components=1 \
     # Install uglify and terser
     && npm install -g \
     terser \

compose/local/Dockerfile

@@ -6,21 +6,21 @@ RUN sed -i 's|deb.debian.org|archive.debian.org|g' /etc/apt/sources.list \
     && apt-get update
 
 RUN apt-get install -y --no-install-recommends \
-        curl libcurl4-gnutls-dev locales imagemagick libmagickcore-dev libmagickwand-dev zip unzip \
-        ruby ruby-dev libpq-dev gnupg nano iputils-ping git \
-        libfreetype6-dev libjpeg62-turbo-dev libpng-dev less vim \
-        sudo procps
+    curl libcurl4-gnutls-dev locales imagemagick libmagickcore-dev libmagickwand-dev zip unzip \
+    ruby ruby-dev libpq-dev gnupg nano iputils-ping git \
+    libfreetype6-dev libjpeg62-turbo-dev libpng-dev less vim \
+    sudo procps
 
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
-    && apt-get install -y nodejs
+RUN curl -fsSL https://nodejs.org/dist/v14.21.3/node-v14.21.3-linux-x64.tar.xz \
+    | tar -xJ -C /usr/local --strip-components=1
 
 RUN rm -rf /var/lib/apt/lists
 
 # Install uglify and terser
 RUN npm install -g \
-        terser \
-        uglifycss \
-        autoprefixer
+    terser \
+    uglifycss \
+    autoprefixer
 
 # Install sass
 RUN gem install sass -v 3.4.22
@@ -52,7 +52,7 @@ RUN yes | pecl install xdebug-2.9.8 \
 RUN docker-php-ext-install -j$(nproc) iconv \
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
     && docker-php-ext-install -j$(nproc) gd
-    
+
 # Install composer
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
     php composer-setup.php --version=1.10.16 --install-dir=/usr/local/bin && \

src/protected/application/conf/agent-types.php

@@ -119,7 +119,8 @@
                 return Utils::formatCnpjCpf($value);
             },
             'validations' => array(
-                'v::cnpj()' => \MapasCulturais\i::__('O número de CNPJ informado é inválido.')
+                'v::cnpj()' => \MapasCulturais\i::__('O número de CNPJ informado é inválido.'),
+                'unique' => 'Este CNPJ já está cadastrado em nosso sistema.',
              ),
             'available_for_opportunities' => true,
         ),
@@ -145,7 +146,8 @@
                 return Utils::formatCnpjCpf($value);
             },
             'validations' => array(
-                'v::cpf()' => \MapasCulturais\i::__('O número de CPF informado é inválido.')
+                'v::cpf()' => \MapasCulturais\i::__('O número de CPF informado é inválido.'),
+                'unique' => 'Este CPF já está cadastrado em nosso sistema.',
              ),
             'available_for_opportunities' => true,
         ),

src/protected/application/conf/conf-base.d/routes.php

@@ -69,7 +69,8 @@
             'agente'        => 'agent',
             'evento'        => 'event',
             'inscricao'     => 'registration',
-            'prestacoes-de-contas' => 'accountability'
+            'prestacoes-de-contas' => 'accountability',
+            'contrarrazoes' => 'counterArguments',
         ],
 
         'readableNames' => [
@@ -98,4 +99,4 @@
             'search'        => i::__('Busca')
         ]
     ]
-];
+];

src/protected/application/lib/MapasCulturais/Controllers/Panel.php

@@ -429,4 +429,14 @@ function GET_accountability()
             'isFiscal' => $oppAsFiscal ? true : false,
         ]);
     }
+
+    public function GET_counterArguments()
+    {
+        $this->requireAuthentication();
+
+        $userId = App::i()->getUser()->id;
+        $counterArguments = App::i()->repo('CounterArgument')->getAllByUserId($userId);
+
+        $this->render('counter-arguments', ['counterArguments' => $counterArguments]);
+    }
 }

src/protected/application/lib/MapasCulturais/Entities/CounterArgument.php

@@ -3,18 +3,28 @@
 namespace MapasCulturais\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
-use MapasCulturais\App;
+use MapasCulturais\Traits;
 
 /**
  * CounterArgument
  * 
  * @ORM\Table(name="counter_argument")
  * @ORM\Entity
- * @ORM\entity(repositoryClass="MapasCulturais\Repository")
+ * @ORM\entity(repositoryClass="MapasCulturais\Repositories\CounterArgument")
  */
 class CounterArgument extends \MapasCulturais\Entity
 {
-    const STATUS_SEND = self::STATUS_ENABLED;
+    use Traits\EntityFiles;
+
+    const STATUS_WAITING = self::STATUS_ENABLED;
+    const STATUS_DEFERRED = 10;
+    const STATUS_REJECTED = 3;
+
+    const STATUSES = [
+        self::STATUS_WAITING => 'Aguardando resposta',
+        self::STATUS_DEFERRED => 'Deferida',
+        self::STATUS_REJECTED => 'Indeferida',
+    ];
 
     /**
      * @var integer
@@ -38,18 +48,33 @@ class CounterArgument extends \MapasCulturais\Entity
      *
      * @ORM\Column(name="status", type="smallint", nullable=false)
      */
-    protected $status = self::STATUS_SEND;
+    protected $status = self::STATUS_WAITING;
 
     /**
      * @var \MapasCulturais\Entities\Registration
      *
-     * @ORM\OneToOne(targetEntity="MapasCulturais\Entities\Registration", inversedBy="CounterArgument\Entities\CounterArgument", cascade={"persist"})
+     * @ORM\OneToOne(targetEntity="MapasCulturais\Entities\Registration", cascade={"persist"})
      * @ORM\JoinColumns({
      *   @ORM\JoinColumn(name="registration_id", referencedColumnName="id", nullable=false, onDelete="CASCADE")
      * })
      */
     protected $registration;
 
+    /**
+     * @var \MapasCulturais\Entities\CounterArgumentFile[] Files
+     *
+     * @ORM\OneToMany(targetEntity="MapasCulturais\Entities\CounterArgumentFile", fetch="EXTRA_LAZY", mappedBy="owner", cascade="remove", orphanRemoval=true)
+     * @ORM\JoinColumn(name="id", referencedColumnName="object_id", onDelete="CASCADE")
+     */
+    protected $__files;
+
+    /**
+     * @var \MapasCulturais\Entities\CounterArgumentResponse|null
+     *
+     * @ORM\OneToOne(targetEntity="MapasCulturais\Entities\CounterArgumentResponse", mappedBy="counterArgument", fetch="LAZY")
+     */
+    protected $response;
+
     /**
      * @var \DateTime
      *
@@ -63,11 +88,4 @@ class CounterArgument extends \MapasCulturais\Entity
      * @ORM\Column(name="update_timestamp", type="datetime", nullable=true)
      */
     protected $updateTimestamp;
-
-    public function send(array $data)
-    {
-        $this->text = $data['text'];
-        $this->registration = App::i()->repo('Registration')->find($data['registration']);
-        $this->save();
-    }
 }

src/protected/application/lib/MapasCulturais/Entities/CounterArgumentResponse.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace MapasCulturais\Entities;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * CounterArgumentResponse
+ * 
+ * @ORM\Table(name="counter_argument_response")
+ * @ORM\Entity
+ * @ORM\entity(repositoryClass="MapasCulturais\Repositories\CounterArgument")
+ */
+class CounterArgumentResponse extends \MapasCulturais\Entity
+{
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer", nullable=false)
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="SEQUENCE")
+     * @ORM\SequenceGenerator(sequenceName="counter_argument_response_id_seq", allocationSize=1, initialValue=1)
+     */
+    protected $id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="text", type="text", nullable=false)
+     */
+    protected $text;
+
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="published", type="boolean", nullable=false)
+     */
+    protected $published = false;
+
+    /**
+     * @var \MapasCulturais\Entities\Agent
+     *
+     * @ORM\ManyToOne(targetEntity="MapasCulturais\Entities\Agent", fetch="LAZY")
+     * @ORM\JoinColumns({
+     *   @ORM\JoinColumn(name="agent_id", referencedColumnName="id", nullable=false, onDelete="CASCADE")
+     * })
+     */
+    protected $owner;
+
+    /**
+     * @var \MapasCulturais\Entities\CounterArgument
+     *
+     * @ORM\OneToOne(targetEntity="MapasCulturais\Entities\CounterArgument", cascade={"persist"})
+     * @ORM\JoinColumns({
+     *   @ORM\JoinColumn(name="counter_argument_id", referencedColumnName="id", nullable=false, onDelete="CASCADE")
+     * })
+     */
+    protected $counterArgument;
+
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(name="create_timestamp", type="datetime", nullable=false)
+     */
+    protected $createTimestamp;
+
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(name="update_timestamp", type="datetime", nullable=true)
+     */
+    protected $updateTimestamp;
+}

src/protected/application/lib/MapasCulturais/Entities/Registration.php

@@ -1371,11 +1371,15 @@ function saveEvaluation(RegistrationEvaluation $evaluation, array $data, $evalua
 
     function saveUserEvaluation(array $data, User $user = null, $evaluation_status = null){
         $app = App::i();
-        if(is_null($user)){
-            $user = $app->user;
+
+        if ($this->opportunity->canUser('@control') && !empty($data['uid'])) {
+            $user = $app->repo('User')->find($data['uid']);
+        } else {
+            $user = $user ?? $app->user;
         }
 
         $evaluation = $this->getUserEvaluation($user);
+
         if(!$evaluation){
             $evaluation = new RegistrationEvaluation;
             $evaluation->user = $user;

src/protected/application/lib/MapasCulturais/Repositories/CounterArgument.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace MapasCulturais\Repositories;
+
+use MapasCulturais\App;
+use MapasCulturais\Entities\CounterArgument as CounterArgumentEntity;
+
+class CounterArgument extends \MapasCulturais\Repository
+{
+    public function getAllByUserId(int $userId): array
+    {
+        $qb = App::i()->em->createQueryBuilder();
+        $qb->select('ca')
+            ->from(CounterArgumentEntity::class, 'ca')
+            ->innerJoin('ca.registration', 'r')
+            ->innerJoin('r.owner', 'a')
+            ->where('a.user = :userId')
+            ->setParameter('userId', $userId);
+
+        return $qb->getQuery()->getResult();
+    }
+
+    public function getAllByOpportunityId($opportunityId): array
+    {
+        $qb = App::i()->em->createQueryBuilder();
+        $qb->select('ca')
+            ->from(CounterArgumentEntity::class, 'ca')
+            ->innerJoin('ca.registration', 'r')
+            ->where('r.opportunity = :opportunityId')
+            ->setParameter('opportunityId', $opportunityId);
+
+        return $qb->getQuery()->getResult();
+    }
+}