diff --git a/application/views/default/scripts/giant/retrivemonitoring.phtml b/application/views/default/scripts/giant/retrivemonitoring.phtml index 3d034f2a8..84be00db3 100644 --- a/application/views/default/scripts/giant/retrivemonitoring.phtml +++ b/application/views/default/scripts/giant/retrivemonitoring.phtml @@ -1,71 +1,186 @@ +
-diff --git a/library/Giant/WSgiant.php b/library/Giant/WSgiant.php index bb42e6351..f98dbe8d3 100644 --- a/library/Giant/WSgiant.php +++ b/library/Giant/WSgiant.php @@ -281,7 +281,6 @@ Class CreditData extends GiantFunction { $parametres = new stdClass(); $parametres->InternalOrderId = (float)$InternalOrderId; - var_dump((float)$InternalOrderId); if (!empty($StartFrom)) {$parametres->StartFrom = $StartFrom;} try { $result = $this->soapG->RetrieveMonitoringEventsForOrder($parametres); diff --git a/public/themes/default/styles/giant.css b/public/themes/default/styles/giant.css index b79186a0c..1d189b6be 100644 --- a/public/themes/default/styles/giant.css +++ b/public/themes/default/styles/giant.css @@ -294,4 +294,18 @@ { width:671px; margin: 0 auto; +} +.gen_div{ + width: 600px; + margin-left: 41px; +} +.left_div{ + float:left; + width: 300px; + padding-bottom:15px; +} +.right_div{ + float:left; + width: 300px; + padding-bottom:15px; } \ No newline at end of file-- +GENERAL.ADDRESS_CHANGE
++GENERAL.ADDRESS_CHANGE
++ val['GENERAL.ADDRESS_CHANGE'] as $report):?>- val['GENERAL.ADDRESS_CHANGE'] as $report):?> - - -+ + +- - Données officielles- - + +
--
-- ProviderEventId =$report->ProviderEventId?>
-- InternalEventId =$report->InternalEventId?>
-- CompanyId =$report->Company->CompanyId?>
-- CompanyName =$report->Company->CompanyName[0]->_?>
-- EventCode =$report->Company->Event[0]->EventCode?>
-- ProviderEventCode =$report->Company->Event[0]->ProviderEventCode->_?>
-- Source =$report->Company->Event[0]->Source->_?>
-- Description =$report->Company->Event[0]->Description->_?>
-- FreeText =$report->Company->Event[0]->FreeText->_?>
-
- - Données officielles
--
- Old Address -- OldCompanyName =$report->Company->Event[0]->Value[0]->Company[0]->CompanyName[0]->_?>
-- NewCompanyName =$report->Company->Event[0]->Value[1]->Company[0]->CompanyName[0]->_?>
--
-- InternalEventId =$report->InternalEventId?>
-- CompanyId =$report->Company->CompanyId?>
-- CompanyName =$report->Company->CompanyName[0]->_?>
-- EventCode =$report->Company->Event[0]->EventCode?>
-- ProviderEventCode =$report->Company->Event[0]->ProviderEventCode->_?>
-- Source =$report->Company->Event[0]->Source->_?>
-- Description =$report->Company->Event[0]->Description->_?>
-- FreeText =$report->Company->Event[0]->FreeText->_?>
-Données officielles
++++ProviderEventIdProviderEventId)?>+InternalEventIdInternalEventId)?>+CompanyIdCompany->CompanyId)?>+CompanyNameCompany->CompanyName[0]->_)?>+EventCodeCompany->Event[0]->EventCode)?>+SourceCompany->Event[0]->Source->_)?>+DescriptionCompany->Event[0]->Description->_)?>FreeTextCompany->Event[0]->FreeText->_)?>
+Données officielles
+++OldCompanyNameCompany->Event[0]->Value[0]->Company[0]->CompanyName[0]->_)?>+NewCompanyNameCompany->Event[0]->Value[1]->Company[0]->CompanyName[0]->_)?>
+Old Address
+++StreetCompany->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->Street)?>+HouseNumberCompany->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->HouseNumber)?>+PostCodeCompany->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->PostCode)?>+CityCompany->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->City)?>+CountryCompany->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->Country)?>
+New Address
++++StreetCompany->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->Street)?>+HouseNumberCompany->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->HouseNumber)?>+PostCodeCompany->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->PostCode)?>+CityCompany->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->City)?>+CountryCompany->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->Country)?>
+GENERAL.COMPANY_NAME_CHANGE
-Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. - Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, - condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam - mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a - velit eu ante scelerisque vulputate.
+ val['GENERAL.COMPANY_NAME_CHANGE'] as $report):?> +++ + +Données officielles
++++ProviderEventIdProviderEventId)?>+InternalEventIdInternalEventId)?>+CompanyIdCompany->CompanyId)?>+CompanyNameCompany->CompanyName[0]->_)?>+EventCodeCompany->Event[0]->EventCode)?>+SourceCompany->Event[0]->Source->_)?>+DescriptionCompany->Event[0]->Description->_)?>FreeTextCompany->Event[0]->FreeText->_)?>
+Old Values
+++CompanyIdCompany->Event[0]->Value[0]->Company[0]->CompanyId)?>+CompanyNameCompany->Event[0]->Value[0]->Company[0]->CompanyName[0]->_)?>
+New Values
++++CompanyIdCompany->Event[0]->Value[1]->Company[0]->CompanyId)?>+CompanyNameCompany->Event[0]->Value[1]->Company[0]->CompanyName[0]->_)?>
+GENERAL.LEGALFORM_CHANGE
-Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. - Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, - condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam - mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a - velit eu ante scelerisque vulputate.
+ val['GENERAL.LEGALFORM_CHANGE'] as $report):?> +++Données officielles
++++ProviderEventIdProviderEventId)?>+InternalEventIdInternalEventId)?>+CompanyIdCompany->CompanyId)?>+CompanyNameCompany->CompanyName[0]->_)?>+EventCodeCompany->Event[0]->EventCode)?>+SourceCompany->Event[0]->Source->_)?>+DescriptionCompany->Event[0]->Description->_)?>+FreeTextCompany->Event[0]->FreeText->_)?>
+Old Values
+++CompanyIdCompany->Event[0]->Value[0]->Company[0]->CompanyId)?>+CompanyNameCompany->Event[0]->Value[0]->Company[0]->CompanyName[0]->_)?>
+New Values
+++CompanyIdCompany->Event[0]->Value[1]->Company[0]->CompanyId)?>+CompanyNameCompany->Event[0]->Value[1]->Company[0]->CompanyName[0]->_)?>
+Old LegalForm
+++CountryLegalFormCompany->Event[0]->Value[0]->Company[0]->LegalForm[0]->CountryLegalForm->_)?>+UnifiedLegalFormCompany->Event[0]->Value[0]->Company[0]->LegalForm[0]->UnifiedLegalForm)?>+FoundedAsLegalFormCompany->Event[0]->Value[0]->Company[0]->LegalForm[0]->FoundedAsLegalForm->_)?>+AddressLineCompany->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->FlexibleAddress->AddressLine[0])?>+CountryCompany->Event[0]->Value[0]->Company[0]->LegalForm[0]->Country)?>+IsSocialCompany->Event[0]->Value[0]->Company[0]->LegalForm[0]->IsSocial)?>+IsCivilCompany->Event[0]->Value[0]->Company[0]->LegalForm[0]->IsCivil)?>
+New LegalForm
++++CountryLegalFormCompany->Event[0]->Value[1]->Company[0]->LegalForm[0]->CountryLegalForm->_)?>+UnifiedLegalFormCompany->Event[0]->Value[1]->Company[0]->LegalForm[0]->UnifiedLegalForm)?>+FoundedAsLegalFormCompany->Event[0]->Value[1]->Company[0]->LegalForm[0]->FoundedAsLegalForm->_)?>+AddressLineCompany->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->FlexibleAddress->AddressLine[0])?>+CountryCompany->Event[0]->Value[1]->Company[0]->LegalForm[0]->Country)?>+IsSocialCompany->Event[0]->Value[1]->Company[0]->LegalForm[0]->IsSocial)?>+IsCivilCompany->Event[0]->Value[1]->Company[0]->LegalForm[0]->IsCivil)?>
+GENERAL.POSITION_CHANGE
-Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. - Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, - condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam - mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a - velit eu ante scelerisque vulputate.
+ val['GENERAL.POSITION_CHANGE'] as $report):?> + +++Données officielles
++++ProviderEventIdProviderEventId)?>+InternalEventIdInternalEventId)?>+CompanyIdCompany->CompanyId)?>+CompanyNameCompany->CompanyName[0]->_)?>+EventCodeCompany->Event[0]->EventCode)?>+SourceCompany->Event[0]->Source->_)?>+DescriptionCompany->Event[0]->Description->_)?>+FreeTextCompany->Event[0]->FreeText->_)?>
+Old Values
+++CompanyIdCompany->Event[0]->Value[0]->Company[0]->CompanyId)?>+CompanyNameCompany->Event[0]->Value[0]->Company[0]->CompanyName[0]->_)?>
+New Values
+++CompanyIdCompany->Event[0]->Value[1]->Company[0]->CompanyId)?>+CompanyNameCompany->Event[0]->Value[1]->Company[0]->CompanyName[0]->_)?>
+Old Position
+++FirstNameCompany->Event[0]->Value[0]->Company[0]->Position[0]->Person->FirstName)?>+LastNameCompany->Event[0]->Value[0]->Company[0]->Position[0]->Person->LastName)?>+InitialsCompany->Event[0]->Value[0]->Company[0]->Position[0]->Person->Initials)?>+TitleCompany->Event[0]->Value[0]->Company[0]->Position[0]->Person->Title)?>+Position StartDatedateT('Ymd', 'd/m/Y', $report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Period->StartDate->_))?>+Position EndDatedateT('Ymd', 'd/m/Y', $report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Period->EndDate->_))?>+PositionChangeReasonCompany->Event[0]->Value[0]->Company[0]->Position[0]->PositionChangeReason)?>+PositionTitleCompany->Event[0]->Value[0]->Company[0]->Position[0]->PositionTitle->_)?>+TypeCompany->Event[0]->Value[0]->Company[0]->Position[0]->Type)?>
+New Position
+++FirstNameCompany->Event[0]->Value[1]->Company[0]->Position[0]->Person->FirstName)?>+LastNameCompany->Event[0]->Value[1]->Company[0]->Position[0]->Person->LastName)?>+InitialsCompany->Event[0]->Value[1]->Company[0]->Position[0]->Person->Initials)?>+TitleCompany->Event[0]->Value[1]->Company[0]->Position[0]->Person->Title)?>+Position StartDatedateT('Ymd', 'd/m/Y', $report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Period->StartDate->_))?>+Position EndDatedateT('Ymd', 'd/m/Y', $report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Period->EndDate->_))?>+PositionChangeReasonCompany->Event[0]->Value[1]->Company[0]->Position[0]->PositionChangeReason)?>+PositionTitleCompany->Event[0]->Value[1]->Company[0]->Position[0]->PositionTitle->_)?>+TypeCompany->Event[0]->Value[1]->Company[0]->Position[0]->Type)?>
+
+GENERAL.NEWS
@@ -149,5 +264,5 @@