Loading composer.lock +6 −6 Changes for composer.lock: 6 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -1864,11 +1864,11 @@ }, { "name": "unicaen/app", "version": "1.3.14", "version": "1.3.17", "source": { "type": "git", "url": "https://git.unicaen.fr/lib/unicaen/app.git", "reference": "deb481c93fc6f3c01448012943dc6ca22969e291" "reference": "e043750b9658219ececbe8fe4280b742b53ea332" }, "require": { "doctrine/doctrine-orm-module": ">=0.7", Loading Loading @@ -1911,15 +1911,15 @@ ] }, "description": "Module de base des applications unicaen", "time": "2018-07-16T14:10:31+00:00" "time": "2018-11-19T11:09:37+00:00" }, { "name": "unicaen/auth", "version": "1.2.16", "version": "1.2.18", "source": { "type": "git", "url": "https://git.unicaen.fr/lib/unicaen/auth.git", "reference": "656010f6993c2b02a51e5b81d13198c5538d3e3a" "reference": "87c6802dfadfcdc8b05602607ea69b959c1ec063" }, "require": { "bjyoungblood/bjy-authorize": ">=1.4", Loading @@ -1941,7 +1941,7 @@ ] }, "description": "Module d'authentification pour les applications Unicaen", "time": "2018-08-28T07:47:53+00:00" "time": "2018-11-19T16:04:53+00:00" }, { "name": "unicaen/code", Loading data/SQL/notification.sql +1 −1 Changes for data/SQL/notification.sql: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -16,7 +16,7 @@ select SOURCE_CODE from these where id in (25948); -- 1/ Modif Vue src_these. -- -- Simule que 2 thèses ont leur résultat qui passe à 1 à l'issu de la synchro : -- Simule qu'une thèse a son résultat qui passe à 1 à l'issu de la synchro : -- -- ATTENTION !! -- Script initial de la vue src_these A VERIFIER : Loading module/Application/src/Application/Controller/TheseController.php +0 −2 Changes for module/Application/src/Application/Controller/TheseController.php: 0 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -181,8 +181,6 @@ class TheseController extends AbstractController $these = $this->requestedThese(); $etablissement = $these->getEtablissement(); $showCorrecAttendue = $these->getCorrectionAutorisee() && count($this->validationService->getValidationsAttenduesPourCorrectionThese($these)) > 0; Loading module/Application/src/Application/Entity/Db/Individu.php +37 −0 Changes for module/Application/src/Application/Entity/Db/Individu.php: 37 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -17,6 +17,23 @@ class Individu implements HistoriqueAwareInterface, SourceAwareInterface use HistoriqueAwareTrait; use SourceAwareTrait; /** * Identifiant qui correspond en fait au : * - supannEmpId (pour les acteurs) ou au * - supannEtuId (pour les doctorants) * que nous fournit l'authentification shibboleth. * * Si cet identifiant est null, cela signifie que l'individu ne pourra pas se connecter. * Sa valeur résulte de l'import de données d'une source. * NB: Sa valeur proprement dite n'a pas vocation à être utilisée, c'est simplement sa nullité ou non qui * nous intéresse. * * todo: se contenter d'une valeur booléenne + renommer en qqchose de moins lié à supann * * @var string */ protected $supannId; /** * @var string */ Loading Loading @@ -72,6 +89,26 @@ class Individu implements HistoriqueAwareInterface, SourceAwareInterface */ private $id; /** * @return string * @see supannId */ public function getSupannId() { return $this->supannId; } /** * @param string $supannId * @return self */ public function setSupannId($supannId) { $this->supannId = $supannId; return $this; } /** * Set dateNaissance * Loading module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Individu.dcm.xml +13 −12 Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Individu.dcm.xml: 13 added lines, 12 removed lines. Original line number Diff line number Diff line Loading @@ -8,21 +8,22 @@ <generator strategy="SEQUENCE"/> </id> <field name="civilite" type="string" column="CIVILITE" length="5" nullable="true"/> <field name="dateNaissance" type="datetime" column="DATE_NAISSANCE" nullable="false"/> <field name="nationalite" type="string" column="NATIONALITE" nullable="true"/> <field name="email" type="string" column="EMAIL" length="255" nullable="true"/> <field name="nomPatronymique" type="string" column="NOM_PATRONYMIQUE" length="60" nullable="false"/> <field name="nomUsuel" type="string" column="NOM_USUEL" length="60" nullable="false"/> <field name="prenom1" type="string" column="PRENOM1" length="60" nullable="false"/> <field name="prenom2" type="string" column="PRENOM2" length="60" nullable="false"/> <field name="prenom3" type="string" column="PRENOM3" length="60" nullable="false"/> <field name="supannId" column="SUPANN_ID" nullable="true"/> <field name="civilite" column="CIVILITE" nullable="true"/> <field name="dateNaissance" type="datetime" column="DATE_NAISSANCE"/> <field name="nationalite" column="NATIONALITE" nullable="true"/> <field name="email" column="EMAIL" nullable="true"/> <field name="nomPatronymique" column="NOM_PATRONYMIQUE"/> <field name="nomUsuel" column="NOM_USUEL"/> <field name="prenom1" column="PRENOM1"/> <field name="prenom2" column="PRENOM2"/> <field name="prenom3" column="PRENOM3"/> <field name="sourceCode" type="string" column="SOURCE_CODE" length="100" nullable="true"/> <field name="sourceCode" column="SOURCE_CODE" nullable="true"/> <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/> <field name="histoCreation" type="datetime" column="HISTO_CREATION"/> <field name="histoDestruction" type="datetime" column="HISTO_DESTRUCTION" nullable="true"/> <field name="histoModification" type="datetime" column="HISTO_MODIFICATION" nullable="false"/> <field name="histoModification" type="datetime" column="HISTO_MODIFICATION"/> <many-to-one field="source" target-entity="UnicaenImport\Entity\Db\Source"> <join-columns> Loading Loading
composer.lock +6 −6 Changes for composer.lock: 6 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -1864,11 +1864,11 @@ }, { "name": "unicaen/app", "version": "1.3.14", "version": "1.3.17", "source": { "type": "git", "url": "https://git.unicaen.fr/lib/unicaen/app.git", "reference": "deb481c93fc6f3c01448012943dc6ca22969e291" "reference": "e043750b9658219ececbe8fe4280b742b53ea332" }, "require": { "doctrine/doctrine-orm-module": ">=0.7", Loading Loading @@ -1911,15 +1911,15 @@ ] }, "description": "Module de base des applications unicaen", "time": "2018-07-16T14:10:31+00:00" "time": "2018-11-19T11:09:37+00:00" }, { "name": "unicaen/auth", "version": "1.2.16", "version": "1.2.18", "source": { "type": "git", "url": "https://git.unicaen.fr/lib/unicaen/auth.git", "reference": "656010f6993c2b02a51e5b81d13198c5538d3e3a" "reference": "87c6802dfadfcdc8b05602607ea69b959c1ec063" }, "require": { "bjyoungblood/bjy-authorize": ">=1.4", Loading @@ -1941,7 +1941,7 @@ ] }, "description": "Module d'authentification pour les applications Unicaen", "time": "2018-08-28T07:47:53+00:00" "time": "2018-11-19T16:04:53+00:00" }, { "name": "unicaen/code", Loading
data/SQL/notification.sql +1 −1 Changes for data/SQL/notification.sql: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -16,7 +16,7 @@ select SOURCE_CODE from these where id in (25948); -- 1/ Modif Vue src_these. -- -- Simule que 2 thèses ont leur résultat qui passe à 1 à l'issu de la synchro : -- Simule qu'une thèse a son résultat qui passe à 1 à l'issu de la synchro : -- -- ATTENTION !! -- Script initial de la vue src_these A VERIFIER : Loading
module/Application/src/Application/Controller/TheseController.php +0 −2 Changes for module/Application/src/Application/Controller/TheseController.php: 0 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -181,8 +181,6 @@ class TheseController extends AbstractController $these = $this->requestedThese(); $etablissement = $these->getEtablissement(); $showCorrecAttendue = $these->getCorrectionAutorisee() && count($this->validationService->getValidationsAttenduesPourCorrectionThese($these)) > 0; Loading
module/Application/src/Application/Entity/Db/Individu.php +37 −0 Changes for module/Application/src/Application/Entity/Db/Individu.php: 37 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -17,6 +17,23 @@ class Individu implements HistoriqueAwareInterface, SourceAwareInterface use HistoriqueAwareTrait; use SourceAwareTrait; /** * Identifiant qui correspond en fait au : * - supannEmpId (pour les acteurs) ou au * - supannEtuId (pour les doctorants) * que nous fournit l'authentification shibboleth. * * Si cet identifiant est null, cela signifie que l'individu ne pourra pas se connecter. * Sa valeur résulte de l'import de données d'une source. * NB: Sa valeur proprement dite n'a pas vocation à être utilisée, c'est simplement sa nullité ou non qui * nous intéresse. * * todo: se contenter d'une valeur booléenne + renommer en qqchose de moins lié à supann * * @var string */ protected $supannId; /** * @var string */ Loading Loading @@ -72,6 +89,26 @@ class Individu implements HistoriqueAwareInterface, SourceAwareInterface */ private $id; /** * @return string * @see supannId */ public function getSupannId() { return $this->supannId; } /** * @param string $supannId * @return self */ public function setSupannId($supannId) { $this->supannId = $supannId; return $this; } /** * Set dateNaissance * Loading
module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Individu.dcm.xml +13 −12 Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Individu.dcm.xml: 13 added lines, 12 removed lines. Original line number Diff line number Diff line Loading @@ -8,21 +8,22 @@ <generator strategy="SEQUENCE"/> </id> <field name="civilite" type="string" column="CIVILITE" length="5" nullable="true"/> <field name="dateNaissance" type="datetime" column="DATE_NAISSANCE" nullable="false"/> <field name="nationalite" type="string" column="NATIONALITE" nullable="true"/> <field name="email" type="string" column="EMAIL" length="255" nullable="true"/> <field name="nomPatronymique" type="string" column="NOM_PATRONYMIQUE" length="60" nullable="false"/> <field name="nomUsuel" type="string" column="NOM_USUEL" length="60" nullable="false"/> <field name="prenom1" type="string" column="PRENOM1" length="60" nullable="false"/> <field name="prenom2" type="string" column="PRENOM2" length="60" nullable="false"/> <field name="prenom3" type="string" column="PRENOM3" length="60" nullable="false"/> <field name="supannId" column="SUPANN_ID" nullable="true"/> <field name="civilite" column="CIVILITE" nullable="true"/> <field name="dateNaissance" type="datetime" column="DATE_NAISSANCE"/> <field name="nationalite" column="NATIONALITE" nullable="true"/> <field name="email" column="EMAIL" nullable="true"/> <field name="nomPatronymique" column="NOM_PATRONYMIQUE"/> <field name="nomUsuel" column="NOM_USUEL"/> <field name="prenom1" column="PRENOM1"/> <field name="prenom2" column="PRENOM2"/> <field name="prenom3" column="PRENOM3"/> <field name="sourceCode" type="string" column="SOURCE_CODE" length="100" nullable="true"/> <field name="sourceCode" column="SOURCE_CODE" nullable="true"/> <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/> <field name="histoCreation" type="datetime" column="HISTO_CREATION"/> <field name="histoDestruction" type="datetime" column="HISTO_DESTRUCTION" nullable="true"/> <field name="histoModification" type="datetime" column="HISTO_MODIFICATION" nullable="false"/> <field name="histoModification" type="datetime" column="HISTO_MODIFICATION"/> <many-to-one field="source" target-entity="UnicaenImport\Entity\Db\Source"> <join-columns> Loading