Loading module/Oscar/src/Oscar/Entity/TimeSheet.php +128 −406 Changes for module/Oscar/src/Oscar/Entity/TimeSheet.php: 128 added lines, 406 removed lines. Original line number Diff line number Diff line Loading @@ -185,139 +185,11 @@ class TimeSheet implements ITrackable private $icsFileDateAdded; //////////////////////////////////////////////////// VALIDATION PROJET /// /** * @var string Personne ayant fait la validation projet. * @ORM\Column(type="string", nullable=true) */ private $validatedProjectBy; /** * @var int ID de la personne ayant fait la validation projet. * @ORM\Column(type="integer", nullable=true) */ private $validatedProjectById; /** * @var \DateTime Date de la validation projet. * @ORM\Column(type="datetime", nullable=true) */ private $validatedProjectAt; /** * @var string Personne ayant refusé la validation projet. * @ORM\Column(type="string", nullable=true) */ private $rejectedProjectBy; /** * @var int ID de la personne ayant refusé la validation projet. * @ORM\Column(type="integer", nullable=true) */ private $rejectedProjectById; /** * @var \DateTime Date du refuss de la validation projet. * @ORM\Column(type="datetime", nullable=true) */ private $rejectedProjectAt; /** * @var string Commentaire laisé par la personne ayant refusé la validation projet. * @ORM\Column(type="text", nullable=true) */ private $rejectedProjectComment; //////////////////////////////////////////////////// VALIDATION SCIENTIFIQUE /** * @var string Personne ayant fait la validation scientifique. * @ORM\Column(type="string", nullable=true) */ private $validatedSciBy; /** * @var int ID de la personne ayant fait la validation scientifique. * @ORM\Column(type="integer", nullable=true) */ private $validatedSciById; /** * @var \DateTime Date de la validation scientifique. * @ORM\Column(type="datetime", nullable=true) */ private $validatedSciAt; /** * @var string Personne ayant refusé la validation scientifique. * @ORM\Column(type="string", nullable=true) */ private $rejectedSciBy; /** * @var int ID de la personne ayant refusé la validation scientifique. * @ORM\Column(type="integer", nullable=true) */ private $rejectedSciById; /** * @var \DateTime Date du refuss de la validation scientifique. * @ORM\Column(type="datetime", nullable=true) */ private $rejectedSciAt; /** * @var string Commentaire laisé par la personne ayant refusé la validation scientifique. * @ORM\Column(type="text", nullable=true) */ private $rejectedSciComment; //////////////////////////////////////////////////// VALIDATION ADMINISTRATIVE /// /** * @var string Personne ayant fait la validation administrative. * @ORM\Column(type="string", nullable=true) */ private $validatedAdminBy; /** * @var int ID de la personne ayant fait la validation administrative. * @ORM\Column(type="integer", nullable=true) */ private $validatedAdminById; /** * @var \DateTime Date de la validation administrative. * @ORM\Column(type="datetime", nullable=true) */ private $validatedAdminAt; /** * @var string Personne ayant refusé la validation administrative. * @ORM\Column(type="string", nullable=true) */ private $rejectedAdminBy; /** * @var int ID de la personne ayant refusé la validation administrative. * @ORM\Column(type="integer", nullable=true) */ private $rejectedAdminById; /** * @var \DateTime Date du refuss de la validation administrative. * @ORM\Column(type="datetime", nullable=true) */ private $rejectedAdminAt; /** * @var string Commentaire laisé par la personne ayant refusé la validation administrative. * @ORM\Column(type="text", nullable=true) * @var ValidationPeriod * @ORM\ManyToOne(targetEntity="ValidationPeriod", inversedBy="timesheets") */ private $rejectedAdminComment; private $validationPeriod; //////////////////////////////////////////////////////////////////////////// Loading @@ -336,7 +208,22 @@ class TimeSheet implements ITrackable ->setStatus(self::STATUS_DRAFT); } /** * @return ValidationPeriod */ public function getValidationPeriod() { return $this->validationPeriod; } /** * @param ValidationPeriod $validationPeriod */ public function setValidationPeriod($validationPeriod) { $this->validationPeriod = $validationPeriod; return $this; } const UNIT_MINUTE = 60; const UNIT_HOUR = 3600; Loading Loading @@ -514,16 +401,10 @@ class TimeSheet implements ITrackable */ public function getValidatedProjectBy() { return $this->validatedProjectBy; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidatedProjectBy(); } /** * @param string $validatedProjectBy */ public function setValidatedProjectBy($validatedProjectBy) { $this->validatedProjectBy = $validatedProjectBy; return $this; return null; } /** Loading @@ -531,16 +412,10 @@ class TimeSheet implements ITrackable */ public function getValidatedProjectById() { return $this->validatedProjectById; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationActivityById(); } /** * @param int $validatedProjectById */ public function setValidatedProjectById($validatedProjectById) { $this->validatedProjectById = $validatedProjectById; return $this; return null; } /** Loading @@ -548,16 +423,10 @@ class TimeSheet implements ITrackable */ public function getValidatedProjectAt() { return $this->validatedProjectAt; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationActivityAt(); } /** * @param \DateTime $validatedProjectAt */ public function setValidatedProjectAt($validatedProjectAt) { $this->validatedProjectAt = $validatedProjectAt; return $this; return null; } /** Loading @@ -565,16 +434,10 @@ class TimeSheet implements ITrackable */ public function getRejectedProjectBy() { return $this->rejectedProjectBy; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectActivityBy(); } /** * @param string $rejectedProjectBy */ public function setRejectedProjectBy($rejectedProjectBy) { $this->rejectedProjectBy = $rejectedProjectBy; return $this; return null; } /** Loading @@ -582,16 +445,10 @@ class TimeSheet implements ITrackable */ public function getRejectedProjectById() { return $this->rejectedProjectById; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectActivityById(); } /** * @param int $rejectedProjectById */ public function setRejectedProjectById($rejectedProjectById) { $this->rejectedProjectById = $rejectedProjectById; return $this; return null; } /** Loading @@ -599,16 +456,10 @@ class TimeSheet implements ITrackable */ public function getRejectedProjectAt() { return $this->rejectedProjectAt; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectActivityBy(); } /** * @param \DateTime $rejectedProjectAt */ public function setRejectedProjectAt($rejectedProjectAt) { $this->rejectedProjectAt = $rejectedProjectAt; return $this; return null; } /** Loading @@ -616,321 +467,210 @@ class TimeSheet implements ITrackable */ public function getRejectedProjectComment() { return $this->rejectedProjectComment; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectActivityMessage(); } /** * @param string $rejectedProjectComment */ public function setRejectedProjectComment($rejectedProjectComment) { $this->rejectedProjectComment = $rejectedProjectComment; return $this; return null; } // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< /** * @return string */ public function getIcsUid() { return $this->icsUid; } /** * @param string $icsUid */ public function setIcsUid($icsUid) { $this->icsUid = $icsUid; return $this; } /** * @return string */ public function getIcsFileUid() public function getValidatedSciBy() { return $this->icsFileUid; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationSciBy(); } /** * @param string $icsFileUid */ public function setIcsFileUid($icsFileUid) { $this->icsFileUid = $icsFileUid; return $this; return null; } /** * @return string * @return int */ public function getIcsFileName() public function getValidatedSciById() { return $this->icsFileName; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationSciById(); } /** * @param string $icsFileName */ public function setIcsFileName($icsFileName) { $this->icsFileName = $icsFileName; return $this; return null; } /** * @return \DateTime */ public function getIcsFileDateAdded() public function getValidatedSciAt() { return $this->icsFileDateAdded; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationSciAt(); } /** * @param string $icsFileDateAdded */ public function setIcsFileDateAdded($icsFileDateAdded) { $this->icsFileDateAdded = $icsFileDateAdded; return $this; return null; } /** * @return string */ public function getValidatedSciBy() public function getValidatedAdminBy() { return $this->validatedSciBy; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationAdmBy(); } /** * @param string $validatedSciBy */ public function setValidatedSciBy($validatedSciBy) { $this->validatedSciBy = $validatedSciBy; return $this; return null; } /** * @return int */ public function getValidatedSciById() public function getValidatedAdminById() { return $this->validatedSciById; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationAdmById(); } /** * @param int $validatedSciById */ public function setValidatedSciById($validatedSciById) { $this->validatedSciById = $validatedSciById; return $this; return null; } /** * @return \DateTime */ public function getValidatedSciAt() public function getValidatedAdminAt() { return $this->validatedSciAt; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationAdmAt(); } /** * @param \DateTime $validatedSciAt */ public function setValidatedSciAt($validatedSciAt) { $this->validatedSciAt = $validatedSciAt; return $this; return null; } /** * @return string */ public function getValidatedAdminBy() public function getRejectedSciBy() { return $this->validatedAdminBy; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectSciBy(); } /** * @param string $validatedAdminBy */ public function setValidatedAdminBy($validatedAdminBy) { $this->validatedAdminBy = $validatedAdminBy; return $this; return null; } /** * @return int */ public function getValidatedAdminById() public function getRejectedSciById() { return $this->validatedAdminById; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectSciById(); } /** * @param int $validatedAdminById */ public function setValidatedAdminById($validatedAdminById) { $this->validatedAdminById = $validatedAdminById; return $this; return null; } /** * @return \DateTime */ public function getValidatedAdminAt() public function getRejectedSciAt() { return $this->validatedAdminAt; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectSciAt(); } /** * @param \DateTime $validatedAdminAt */ public function setValidatedAdminAt($validatedAdminAt) { $this->validatedAdminAt = $validatedAdminAt; return $this; return null; } /** * @return string */ public function getRejectedSciBy() public function getRejectedSciComment() { return $this->rejectedSciBy; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectSciMessage(); } return null; } /** * @param string $rejectedSciBy * @return string */ public function setRejectedSciBy($rejectedSciBy) public function getRejectedAdminBy() { $this->rejectedSciBy = $rejectedSciBy; return $this; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectAdmBy(); } return null; } /** * @return int */ public function getRejectedSciById() public function getRejectedAdminById() { return $this->rejectedSciById; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectAdmById(); } /** * @param int $rejectedSciById */ public function setRejectedSciById($rejectedSciById) { $this->rejectedSciById = $rejectedSciById; return $this; return null; } /** * @return \DateTime */ public function getRejectedSciAt() public function getRejectedAdminAt() { return $this->rejectedSciAt; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectAdmAt(); } /** * @param \DateTime $rejectedSciAt * @return TimeSheet */ public function setRejectedSciAt($rejectedSciAt) { $this->rejectedSciAt = $rejectedSciAt; return $this; return null; } /** * @return string */ public function getRejectedSciComment() public function getRejectedAdminComment() { return $this->rejectedSciComment; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectAdmMessage(); } /** * @param string $rejectedSciComment */ public function setRejectedSciComment($rejectedSciComment) { $this->rejectedSciComment = $rejectedSciComment; return $this; return null; } /** * @return string * @return mixed */ public function getRejectedAdminBy() public function getSendBy() { return $this->rejectedAdminBy; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getDeclarer(); } /** * @param string $rejectedAdminBy */ public function setRejectedAdminBy($rejectedAdminBy) { $this->rejectedAdminBy = $rejectedAdminBy; return $this; return null; } /** * @return int * @return string */ public function getRejectedAdminById() public function getIcsUid() { return $this->rejectedAdminById; return $this->icsUid; } /** * @param int $rejectedAdminById * @param string $icsUid */ public function setRejectedAdminById($rejectedAdminById) public function setIcsUid($icsUid) { $this->rejectedAdminById = $rejectedAdminById; $this->icsUid = $icsUid; return $this; } /** * @return \DateTime * @return string */ public function getRejectedAdminAt() public function getIcsFileUid() { return $this->rejectedAdminAt; return $this->icsFileUid; } /** * @param \DateTime $rejectedAdminAt * @param string $icsFileUid */ public function setRejectedAdminAt($rejectedAdminAt) public function setIcsFileUid($icsFileUid) { $this->rejectedAdminAt = $rejectedAdminAt; $this->icsFileUid = $icsFileUid; return $this; } Loading @@ -938,36 +678,35 @@ class TimeSheet implements ITrackable /** * @return string */ public function getRejectedAdminComment() public function getIcsFileName() { return $this->rejectedAdminComment; return $this->icsFileName; } /** * @param string $rejectedAdminComment * @param string $icsFileName */ public function setRejectedAdminComment($rejectedAdminComment) public function setIcsFileName($icsFileName) { $this->rejectedAdminComment = $rejectedAdminComment; $this->icsFileName = $icsFileName; return $this; } /** * @return mixed * @return \DateTime */ public function getSendBy() public function getIcsFileDateAdded() { return $this->sendBy; return $this->icsFileDateAdded; } /** * @param $sendBy * @return $this * @param string $icsFileDateAdded */ public function setSendBy($sendBy) public function setIcsFileDateAdded($icsFileDateAdded) { $this->sendBy = $sendBy; $this->icsFileDateAdded = $icsFileDateAdded; return $this; } Loading Loading @@ -1070,23 +809,6 @@ class TimeSheet implements ITrackable return $this; } /** * @return \DateTime */ public function getValidatedAt() { return $this->validatedAt; } /** * @param \DateTime $validatedAt */ public function setValidatedAt($validatedAt) { $this->validatedAt = $validatedAt; return $this; } /** * @return \DateTime */ Loading module/Oscar/src/Oscar/Entity/TraitTrackable.php +4 −1 Changes for module/Oscar/src/Oscar/Entity/TraitTrackable.php: 4 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -80,7 +80,10 @@ trait TraitTrackable */ public function getStatus() { return $this->status; if( $this->getValidationPeriod() ) return $this->getValidationPeriod()->getStatus(); return self::STATUS_DRAFT; } /** Loading module/Oscar/src/Oscar/Entity/ValidationPeriod.php +26 −0 Changes for module/Oscar/src/Oscar/Entity/ValidationPeriod.php: 26 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -320,6 +320,14 @@ class ValidationPeriod */ private $status; /** * liste des créneaux associés * * @var ArrayCollection * @ORM\OneToMany(targetEntity="TimeSheet", mappedBy="validationPeriod") */ protected $timesheets; /** * ValidationPeriod constructor. * @param $id Loading @@ -329,6 +337,24 @@ class ValidationPeriod $this->validatorsPrj = new ArrayCollection(); $this->validatorsSci = new ArrayCollection(); $this->validatorsAdm = new ArrayCollection(); $this->timesheets = new ArrayCollection(); } /** * @return ArrayCollection */ public function getTimesheets() { return $this->timesheets; } /** * @param ArrayCollection $timesheets */ public function setTimesheets($timesheets) { $this->timesheets = $timesheets; return $this; } public function isActivityValidation() Loading module/Oscar/src/Oscar/Service/TimesheetService.php +3 −5 Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 3 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -2900,16 +2900,14 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa 'objectId' => $objectId, 'object' => $object, 'objectGroup' => $objectGroup, 'log' => "Déclaration envoyée", 'log' => "Déclaration envoyée" ]; $this->createDeclaration($sender, $annee, $mois, $object, $objectId, $objectGroup); $declarations[$key]['declaration'] = $this->createDeclaration($sender, $annee, $mois, $object, $objectId, $objectGroup); } //$this->setTimesheetToSend($timesheet); $timesheet->setValidationPeriod($declarations[$key]['declaration']); } $this->getEntityManager()->flush($timesheets); $this->getLogger()->debug(print_r($declarations, true)); } public function getValidatorsPrj(Activity $activity) Loading Loading
module/Oscar/src/Oscar/Entity/TimeSheet.php +128 −406 Changes for module/Oscar/src/Oscar/Entity/TimeSheet.php: 128 added lines, 406 removed lines. Original line number Diff line number Diff line Loading @@ -185,139 +185,11 @@ class TimeSheet implements ITrackable private $icsFileDateAdded; //////////////////////////////////////////////////// VALIDATION PROJET /// /** * @var string Personne ayant fait la validation projet. * @ORM\Column(type="string", nullable=true) */ private $validatedProjectBy; /** * @var int ID de la personne ayant fait la validation projet. * @ORM\Column(type="integer", nullable=true) */ private $validatedProjectById; /** * @var \DateTime Date de la validation projet. * @ORM\Column(type="datetime", nullable=true) */ private $validatedProjectAt; /** * @var string Personne ayant refusé la validation projet. * @ORM\Column(type="string", nullable=true) */ private $rejectedProjectBy; /** * @var int ID de la personne ayant refusé la validation projet. * @ORM\Column(type="integer", nullable=true) */ private $rejectedProjectById; /** * @var \DateTime Date du refuss de la validation projet. * @ORM\Column(type="datetime", nullable=true) */ private $rejectedProjectAt; /** * @var string Commentaire laisé par la personne ayant refusé la validation projet. * @ORM\Column(type="text", nullable=true) */ private $rejectedProjectComment; //////////////////////////////////////////////////// VALIDATION SCIENTIFIQUE /** * @var string Personne ayant fait la validation scientifique. * @ORM\Column(type="string", nullable=true) */ private $validatedSciBy; /** * @var int ID de la personne ayant fait la validation scientifique. * @ORM\Column(type="integer", nullable=true) */ private $validatedSciById; /** * @var \DateTime Date de la validation scientifique. * @ORM\Column(type="datetime", nullable=true) */ private $validatedSciAt; /** * @var string Personne ayant refusé la validation scientifique. * @ORM\Column(type="string", nullable=true) */ private $rejectedSciBy; /** * @var int ID de la personne ayant refusé la validation scientifique. * @ORM\Column(type="integer", nullable=true) */ private $rejectedSciById; /** * @var \DateTime Date du refuss de la validation scientifique. * @ORM\Column(type="datetime", nullable=true) */ private $rejectedSciAt; /** * @var string Commentaire laisé par la personne ayant refusé la validation scientifique. * @ORM\Column(type="text", nullable=true) */ private $rejectedSciComment; //////////////////////////////////////////////////// VALIDATION ADMINISTRATIVE /// /** * @var string Personne ayant fait la validation administrative. * @ORM\Column(type="string", nullable=true) */ private $validatedAdminBy; /** * @var int ID de la personne ayant fait la validation administrative. * @ORM\Column(type="integer", nullable=true) */ private $validatedAdminById; /** * @var \DateTime Date de la validation administrative. * @ORM\Column(type="datetime", nullable=true) */ private $validatedAdminAt; /** * @var string Personne ayant refusé la validation administrative. * @ORM\Column(type="string", nullable=true) */ private $rejectedAdminBy; /** * @var int ID de la personne ayant refusé la validation administrative. * @ORM\Column(type="integer", nullable=true) */ private $rejectedAdminById; /** * @var \DateTime Date du refuss de la validation administrative. * @ORM\Column(type="datetime", nullable=true) */ private $rejectedAdminAt; /** * @var string Commentaire laisé par la personne ayant refusé la validation administrative. * @ORM\Column(type="text", nullable=true) * @var ValidationPeriod * @ORM\ManyToOne(targetEntity="ValidationPeriod", inversedBy="timesheets") */ private $rejectedAdminComment; private $validationPeriod; //////////////////////////////////////////////////////////////////////////// Loading @@ -336,7 +208,22 @@ class TimeSheet implements ITrackable ->setStatus(self::STATUS_DRAFT); } /** * @return ValidationPeriod */ public function getValidationPeriod() { return $this->validationPeriod; } /** * @param ValidationPeriod $validationPeriod */ public function setValidationPeriod($validationPeriod) { $this->validationPeriod = $validationPeriod; return $this; } const UNIT_MINUTE = 60; const UNIT_HOUR = 3600; Loading Loading @@ -514,16 +401,10 @@ class TimeSheet implements ITrackable */ public function getValidatedProjectBy() { return $this->validatedProjectBy; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidatedProjectBy(); } /** * @param string $validatedProjectBy */ public function setValidatedProjectBy($validatedProjectBy) { $this->validatedProjectBy = $validatedProjectBy; return $this; return null; } /** Loading @@ -531,16 +412,10 @@ class TimeSheet implements ITrackable */ public function getValidatedProjectById() { return $this->validatedProjectById; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationActivityById(); } /** * @param int $validatedProjectById */ public function setValidatedProjectById($validatedProjectById) { $this->validatedProjectById = $validatedProjectById; return $this; return null; } /** Loading @@ -548,16 +423,10 @@ class TimeSheet implements ITrackable */ public function getValidatedProjectAt() { return $this->validatedProjectAt; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationActivityAt(); } /** * @param \DateTime $validatedProjectAt */ public function setValidatedProjectAt($validatedProjectAt) { $this->validatedProjectAt = $validatedProjectAt; return $this; return null; } /** Loading @@ -565,16 +434,10 @@ class TimeSheet implements ITrackable */ public function getRejectedProjectBy() { return $this->rejectedProjectBy; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectActivityBy(); } /** * @param string $rejectedProjectBy */ public function setRejectedProjectBy($rejectedProjectBy) { $this->rejectedProjectBy = $rejectedProjectBy; return $this; return null; } /** Loading @@ -582,16 +445,10 @@ class TimeSheet implements ITrackable */ public function getRejectedProjectById() { return $this->rejectedProjectById; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectActivityById(); } /** * @param int $rejectedProjectById */ public function setRejectedProjectById($rejectedProjectById) { $this->rejectedProjectById = $rejectedProjectById; return $this; return null; } /** Loading @@ -599,16 +456,10 @@ class TimeSheet implements ITrackable */ public function getRejectedProjectAt() { return $this->rejectedProjectAt; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectActivityBy(); } /** * @param \DateTime $rejectedProjectAt */ public function setRejectedProjectAt($rejectedProjectAt) { $this->rejectedProjectAt = $rejectedProjectAt; return $this; return null; } /** Loading @@ -616,321 +467,210 @@ class TimeSheet implements ITrackable */ public function getRejectedProjectComment() { return $this->rejectedProjectComment; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectActivityMessage(); } /** * @param string $rejectedProjectComment */ public function setRejectedProjectComment($rejectedProjectComment) { $this->rejectedProjectComment = $rejectedProjectComment; return $this; return null; } // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< /** * @return string */ public function getIcsUid() { return $this->icsUid; } /** * @param string $icsUid */ public function setIcsUid($icsUid) { $this->icsUid = $icsUid; return $this; } /** * @return string */ public function getIcsFileUid() public function getValidatedSciBy() { return $this->icsFileUid; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationSciBy(); } /** * @param string $icsFileUid */ public function setIcsFileUid($icsFileUid) { $this->icsFileUid = $icsFileUid; return $this; return null; } /** * @return string * @return int */ public function getIcsFileName() public function getValidatedSciById() { return $this->icsFileName; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationSciById(); } /** * @param string $icsFileName */ public function setIcsFileName($icsFileName) { $this->icsFileName = $icsFileName; return $this; return null; } /** * @return \DateTime */ public function getIcsFileDateAdded() public function getValidatedSciAt() { return $this->icsFileDateAdded; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationSciAt(); } /** * @param string $icsFileDateAdded */ public function setIcsFileDateAdded($icsFileDateAdded) { $this->icsFileDateAdded = $icsFileDateAdded; return $this; return null; } /** * @return string */ public function getValidatedSciBy() public function getValidatedAdminBy() { return $this->validatedSciBy; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationAdmBy(); } /** * @param string $validatedSciBy */ public function setValidatedSciBy($validatedSciBy) { $this->validatedSciBy = $validatedSciBy; return $this; return null; } /** * @return int */ public function getValidatedSciById() public function getValidatedAdminById() { return $this->validatedSciById; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationAdmById(); } /** * @param int $validatedSciById */ public function setValidatedSciById($validatedSciById) { $this->validatedSciById = $validatedSciById; return $this; return null; } /** * @return \DateTime */ public function getValidatedSciAt() public function getValidatedAdminAt() { return $this->validatedSciAt; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getValidationAdmAt(); } /** * @param \DateTime $validatedSciAt */ public function setValidatedSciAt($validatedSciAt) { $this->validatedSciAt = $validatedSciAt; return $this; return null; } /** * @return string */ public function getValidatedAdminBy() public function getRejectedSciBy() { return $this->validatedAdminBy; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectSciBy(); } /** * @param string $validatedAdminBy */ public function setValidatedAdminBy($validatedAdminBy) { $this->validatedAdminBy = $validatedAdminBy; return $this; return null; } /** * @return int */ public function getValidatedAdminById() public function getRejectedSciById() { return $this->validatedAdminById; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectSciById(); } /** * @param int $validatedAdminById */ public function setValidatedAdminById($validatedAdminById) { $this->validatedAdminById = $validatedAdminById; return $this; return null; } /** * @return \DateTime */ public function getValidatedAdminAt() public function getRejectedSciAt() { return $this->validatedAdminAt; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectSciAt(); } /** * @param \DateTime $validatedAdminAt */ public function setValidatedAdminAt($validatedAdminAt) { $this->validatedAdminAt = $validatedAdminAt; return $this; return null; } /** * @return string */ public function getRejectedSciBy() public function getRejectedSciComment() { return $this->rejectedSciBy; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectSciMessage(); } return null; } /** * @param string $rejectedSciBy * @return string */ public function setRejectedSciBy($rejectedSciBy) public function getRejectedAdminBy() { $this->rejectedSciBy = $rejectedSciBy; return $this; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectAdmBy(); } return null; } /** * @return int */ public function getRejectedSciById() public function getRejectedAdminById() { return $this->rejectedSciById; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectAdmById(); } /** * @param int $rejectedSciById */ public function setRejectedSciById($rejectedSciById) { $this->rejectedSciById = $rejectedSciById; return $this; return null; } /** * @return \DateTime */ public function getRejectedSciAt() public function getRejectedAdminAt() { return $this->rejectedSciAt; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectAdmAt(); } /** * @param \DateTime $rejectedSciAt * @return TimeSheet */ public function setRejectedSciAt($rejectedSciAt) { $this->rejectedSciAt = $rejectedSciAt; return $this; return null; } /** * @return string */ public function getRejectedSciComment() public function getRejectedAdminComment() { return $this->rejectedSciComment; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getRejectAdmMessage(); } /** * @param string $rejectedSciComment */ public function setRejectedSciComment($rejectedSciComment) { $this->rejectedSciComment = $rejectedSciComment; return $this; return null; } /** * @return string * @return mixed */ public function getRejectedAdminBy() public function getSendBy() { return $this->rejectedAdminBy; if( $this->getValidationPeriod() ){ return $this->getValidationPeriod()->getDeclarer(); } /** * @param string $rejectedAdminBy */ public function setRejectedAdminBy($rejectedAdminBy) { $this->rejectedAdminBy = $rejectedAdminBy; return $this; return null; } /** * @return int * @return string */ public function getRejectedAdminById() public function getIcsUid() { return $this->rejectedAdminById; return $this->icsUid; } /** * @param int $rejectedAdminById * @param string $icsUid */ public function setRejectedAdminById($rejectedAdminById) public function setIcsUid($icsUid) { $this->rejectedAdminById = $rejectedAdminById; $this->icsUid = $icsUid; return $this; } /** * @return \DateTime * @return string */ public function getRejectedAdminAt() public function getIcsFileUid() { return $this->rejectedAdminAt; return $this->icsFileUid; } /** * @param \DateTime $rejectedAdminAt * @param string $icsFileUid */ public function setRejectedAdminAt($rejectedAdminAt) public function setIcsFileUid($icsFileUid) { $this->rejectedAdminAt = $rejectedAdminAt; $this->icsFileUid = $icsFileUid; return $this; } Loading @@ -938,36 +678,35 @@ class TimeSheet implements ITrackable /** * @return string */ public function getRejectedAdminComment() public function getIcsFileName() { return $this->rejectedAdminComment; return $this->icsFileName; } /** * @param string $rejectedAdminComment * @param string $icsFileName */ public function setRejectedAdminComment($rejectedAdminComment) public function setIcsFileName($icsFileName) { $this->rejectedAdminComment = $rejectedAdminComment; $this->icsFileName = $icsFileName; return $this; } /** * @return mixed * @return \DateTime */ public function getSendBy() public function getIcsFileDateAdded() { return $this->sendBy; return $this->icsFileDateAdded; } /** * @param $sendBy * @return $this * @param string $icsFileDateAdded */ public function setSendBy($sendBy) public function setIcsFileDateAdded($icsFileDateAdded) { $this->sendBy = $sendBy; $this->icsFileDateAdded = $icsFileDateAdded; return $this; } Loading Loading @@ -1070,23 +809,6 @@ class TimeSheet implements ITrackable return $this; } /** * @return \DateTime */ public function getValidatedAt() { return $this->validatedAt; } /** * @param \DateTime $validatedAt */ public function setValidatedAt($validatedAt) { $this->validatedAt = $validatedAt; return $this; } /** * @return \DateTime */ Loading
module/Oscar/src/Oscar/Entity/TraitTrackable.php +4 −1 Changes for module/Oscar/src/Oscar/Entity/TraitTrackable.php: 4 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -80,7 +80,10 @@ trait TraitTrackable */ public function getStatus() { return $this->status; if( $this->getValidationPeriod() ) return $this->getValidationPeriod()->getStatus(); return self::STATUS_DRAFT; } /** Loading
module/Oscar/src/Oscar/Entity/ValidationPeriod.php +26 −0 Changes for module/Oscar/src/Oscar/Entity/ValidationPeriod.php: 26 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -320,6 +320,14 @@ class ValidationPeriod */ private $status; /** * liste des créneaux associés * * @var ArrayCollection * @ORM\OneToMany(targetEntity="TimeSheet", mappedBy="validationPeriod") */ protected $timesheets; /** * ValidationPeriod constructor. * @param $id Loading @@ -329,6 +337,24 @@ class ValidationPeriod $this->validatorsPrj = new ArrayCollection(); $this->validatorsSci = new ArrayCollection(); $this->validatorsAdm = new ArrayCollection(); $this->timesheets = new ArrayCollection(); } /** * @return ArrayCollection */ public function getTimesheets() { return $this->timesheets; } /** * @param ArrayCollection $timesheets */ public function setTimesheets($timesheets) { $this->timesheets = $timesheets; return $this; } public function isActivityValidation() Loading
module/Oscar/src/Oscar/Service/TimesheetService.php +3 −5 Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 3 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -2900,16 +2900,14 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa 'objectId' => $objectId, 'object' => $object, 'objectGroup' => $objectGroup, 'log' => "Déclaration envoyée", 'log' => "Déclaration envoyée" ]; $this->createDeclaration($sender, $annee, $mois, $object, $objectId, $objectGroup); $declarations[$key]['declaration'] = $this->createDeclaration($sender, $annee, $mois, $object, $objectId, $objectGroup); } //$this->setTimesheetToSend($timesheet); $timesheet->setValidationPeriod($declarations[$key]['declaration']); } $this->getEntityManager()->flush($timesheets); $this->getLogger()->debug(print_r($declarations, true)); } public function getValidatorsPrj(Activity $activity) Loading