@@ -388,20 +388,30 @@ private static function paper($id) {
388388 $ antrag = Antrag::model ()->findByPk ($ id );
389389
390390 $ data = [
391- 'id ' => OParl10Controller::getOparlObjectUrl ('paper ' , $ antrag ->id ),
392- 'type ' => self ::TYPE_PAPER ,
393- 'body ' => OParl10Controller::getOparlObjectUrl ('body ' , ($ antrag ->ba_nr != null ? $ antrag ->ba_nr : 0 )),
394- 'name ' => $ antrag ->getName (),
395- 'reference ' => $ antrag ->antrags_nr ,
396- 'paperType ' => $ antrag ->getTypName (),
397- 'auxiliaryFile ' => [],
398- 'underDirectionOf ' => [OParl10Controller::getOparlObjectUrl ('organization ' , $ antrag ->referat_id , 'referat ' )],
399- 'keyword ' => [],
400- 'web ' => SITE_BASE_URL . $ antrag ->getLink (),
401- 'created ' => OParl10Controller::mysqlToOparlDateTime ($ antrag ->created ),
402- 'modified ' => OParl10Controller::mysqlToOparlDateTime ($ antrag ->modified ),
391+ 'id ' => OParl10Controller::getOparlObjectUrl ('paper ' , $ antrag ->id ),
392+ 'type ' => self ::TYPE_PAPER ,
393+ 'body ' => OParl10Controller::getOparlObjectUrl ('body ' , ($ antrag ->ba_nr != null ? $ antrag ->ba_nr : 0 )),
394+ 'name ' => $ antrag ->getName (),
395+ 'reference ' => $ antrag ->antrags_nr ,
396+ 'paperType ' => $ antrag ->getTypName (),
397+ 'auxiliaryFile ' => [],
398+ 'originatorPerson ' => [],
399+ 'underDirectionOf ' => [OParl10Controller::getOparlObjectUrl ('organization ' , $ antrag ->referat_id , 'referat ' )],
400+ 'keyword ' => [],
401+ 'web ' => SITE_BASE_URL . $ antrag ->getLink (),
402+ 'created ' => OParl10Controller::mysqlToOparlDateTime ($ antrag ->created ),
403+ 'modified ' => OParl10Controller::mysqlToOparlDateTime ($ antrag ->modified ),
403404 ];
404405
406+ foreach ($ antrag ->antraegePersonen as $ ap ) {
407+ if ($ ap ->typ == AntragPerson::$ TYP_GESTELLT_VON ) {
408+ // TODO this should not be a Person but an Organization ("Fraktion")
409+ //$data['originatorOrganization'][] = OParl10Controller::getOparlObjectUrl('organization', $ap->person->id)
410+ } else if ($ ap ->typ == AntragPerson::$ TYP_INITIATORIN ) {
411+ $ data ['originatorPerson ' ][] = OParl10Controller::getOparlObjectUrl ('person ' , $ ap ->person ->id )
412+ }
413+ }
414+
405415 foreach ($ antrag ->dokumente as $ dokument )
406416 $ data ['auxiliaryFile ' ][] = self ::file ($ dokument ->id );
407417
0 commit comments