diff --git a/protected/components/OParl10Object.php b/protected/components/OParl10Object.php index cf348689..44b7406f 100644 --- a/protected/components/OParl10Object.php +++ b/protected/components/OParl10Object.php @@ -388,20 +388,33 @@ private static function paper($id) { $antrag = Antrag::model()->findByPk($id); $data = [ - 'id' => OParl10Controller::getOparlObjectUrl('paper', $antrag->id), - 'type' => self::TYPE_PAPER, - 'body' => OParl10Controller::getOparlObjectUrl('body', ($antrag->ba_nr != null ? $antrag->ba_nr : 0)), - 'name' => $antrag->getName(), - 'reference' => $antrag->antrags_nr, - 'paperType' => $antrag->getTypName(), - 'auxiliaryFile' => [], - 'underDirectionOf' => [OParl10Controller::getOparlObjectUrl('organization', $antrag->referat_id, 'referat')], - 'keyword' => [], - 'web' => SITE_BASE_URL . $antrag->getLink(), - 'created' => OParl10Controller::mysqlToOparlDateTime($antrag->created), - 'modified' => OParl10Controller::mysqlToOparlDateTime($antrag->modified), + 'id' => OParl10Controller::getOparlObjectUrl('paper', $antrag->id), + 'type' => self::TYPE_PAPER, + 'body' => OParl10Controller::getOparlObjectUrl('body', ($antrag->ba_nr != null ? $antrag->ba_nr : 0)), + 'name' => $antrag->getName(), + 'reference' => $antrag->antrags_nr, + 'paperType' => $antrag->getTypName(), + 'auxiliaryFile' => [], + 'originatorPerson' => [], + 'originatorOrganization' => [], + 'underDirectionOf' => [OParl10Controller::getOparlObjectUrl('organization', $antrag->referat_id, 'referat')], + 'keyword' => [], + 'web' => SITE_BASE_URL . $antrag->getLink(), + 'created' => OParl10Controller::mysqlToOparlDateTime($antrag->created), + 'modified' => OParl10Controller::mysqlToOparlDateTime($antrag->modified), ]; + foreach ($antrag->antraegePersonen as $ap) { + if ($ap->typ == AntragPerson::$TYP_GESTELLT_VON) { + $organization = Gremium::model()->findByName($ap->person->name); + if ($organization) { + $data['originatorOrganization'][] = OParl10Controller::getOparlObjectUrl('organization', $organization->id) + } + } else if ($ap->typ == AntragPerson::$TYP_INITIATORIN) { + $data['originatorPerson'][] = OParl10Controller::getOparlObjectUrl('person', $ap->person->id) + } + } + foreach ($antrag->dokumente as $dokument) $data['auxiliaryFile'][] = self::file($dokument->id);