Commit 329018cb authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Merge branch 'connor' into connor-2025-09-datetype-flow

parents 7dbd77e8 ddba8a4e
Loading
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -9171,11 +9171,11 @@
        },
        {
            "name": "unicaen/signature",
            "version": "2.0.2",
            "version": "2.0.3",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/signature.git",
                "reference": "9b1271188251944024e1bfd414073a979c937e17"
                "reference": "5da3977ae8cb95b9ccb1aefb004b673e10df361c"
            },
            "require": {
                "ext-fileinfo": "*",
@@ -9205,7 +9205,7 @@
                }
            },
            "description": "Module de signature électronique",
            "time": "2025-07-23T15:36:07+00:00"
            "time": "2025-09-09T10:17:07+00:00"
        },
        {
            "name": "unicaen/utilisateur",
+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,13 @@ return [

        'redirect_internal' => 'contractdocument/my-documents',

        // Types mimes des documents supportés pour la procédure de signature
        'documents_mimes' => [
            'application/pdf',
            'application/pdf; charset=iso-8859-1',
            'application/pdf; charset=binary'
        ],

        /////////////////////////////////////////////////////////////////////////////////
        /// SYSTEME de LOG
        'logger'         => [
+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ Installation de NODEJS/YARN pour la compilation JS
curl -fsSL https://deb.nodesource.com/setup_22.x | sudo bash -
sudo apt-get install -y nodejs

# EDIT
url -fsSL https://deb.nodesource.com/setup_22.x  > setup_22.x.sh 
sudo bash setup_22.x.sh

# installation de Yarn (gestionnaire de dépendance node)
npm install --global yarn
```
+15 −8
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\ORM\QueryBuilder;
use Oscar\Exception\OscarException;
use UnicaenSignature\Entity\Db\SignatureFlow;
use UnicaenSignature\Entity\Db\SignatureRecipient;

class ContractDocumentRepository extends AbstractTreeDataRepository
{
@@ -102,19 +103,25 @@ class ContractDocumentRepository extends AbstractTreeDataRepository
     *
     * @param string $person_email
     * @return array
     * @throws \Exception
     */
    public function getDocumentsWithProcessByPerson(string $person_email)
    {
        $query = $this->createQueryBuilder('d')
            ->innerJoin('d.process', 'p')
            ->innerJoin('p.steps', 'st')
            ->innerJoin('st.signature', 's')
            ->innerJoin('d.grant', 'a')
            ->innerJoin('s.recipients', 'o')
        try {
            $q = $this->createQueryBuilder('d')
                ->join('d.process', 'p')
                ->join('p.steps', 'st')
                ->join('st.signature', 's')
                ->join('d.grant', 'a')
                ->join('s.recipients', 'o')
                ->orderBy('s.dateCreated', 'DESC')
                ->where("o.email = :email");
        $query->setParameter('email', $person_email);
        return $query->getQuery()->getResult();
            ;
            $q->setParameter('email', $person_email);
            return $q->getQuery()->getResult();
        } catch (\Exception $e) {
            throw $e;
        }
    }

    /**
+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ class JsonFormatterService implements UseOscarConfigurationService, UseEntityMan
            }
        }
        else {

            $allowProcessCreate = $this->getOscarUserContextService()->hasPrivileges(
                SignaturePrivileges::SIGNATURE_CREATE,
                $doc->getActivity()
Loading