Commit 64bc3052 authored by Stéphane Bouvry's avatar Stéphane Bouvry
Browse files

Ajout du status dans la synchronisation JSON > Oscar

parent 5219ee5d
Loading
Loading
Loading
Loading
+47 −2
Changes for install/demo/import-activites/import-activites.result.json: 47 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -10,12 +10,14 @@
                "US Robot"
            ]
        },
        "status": 404,
        "persons": {
            "Responsable Scientifique": [
                "Albert Einstein"
            ],
            "Ing\u00e9nieur": [
        "Marcel Grossmann"
                "Marcel Grossmann",
                "Serge Le Normand"
            ],
            "Participants": [
                "Batman",
@@ -24,6 +26,10 @@
        },
        "milestones": [],
        "payments": [],
        "tva": null,
        "currency": null,
        "assietteSubventionnable": null,
        "financialImpact": "Recette",
        "description": "Description 1",
        "acronym": "RELATIV",
        "label": "Relativit\u00e9 restreinte",
@@ -42,6 +48,7 @@
                "US Robot"
            ]
        },
        "status": "102",
        "persons": {
            "Responsable Scientifique": [
                "Albert Einstein"
@@ -64,7 +71,7 @@
        "payments": [
            {
                "amount": 20000,
        "date": "2018-01-01",
                "date": "2018-01-06",
                "predicted": "2018-01-01"
            },
            {
@@ -78,6 +85,10 @@
                "predicted": null
            }
        ],
        "tva": null,
        "currency": "$",
        "assietteSubventionnable": 15,
        "financialImpact": "D\u00e9pense",
        "description": "Description 2",
        "acronym": "RELATIV",
        "label": "Relativit\u00e9 g\u00e9n\u00e9rale",
@@ -87,5 +98,39 @@
        "datepfi": "2017-12-24",
        "type": "Concours scientifique",
        "datesigned": "2017-12-31"
    },
    {
        "uid": "R3",
        "organizations": {
            "Composante Responsable": [
                "Universit\u00e9 des sciences de Berne"
            ],
            "Laboratoire": [
                "Universit\u00e9 des sciences de Berlin",
                "US Robot"
            ]
        },
        "status": "101",
        "persons": {
            "Responsable Scientifique": [
                "Max Plank"
            ],
            "Ing\u00e9nieur": [
                "Niels Bohr",
                "Erwin Schr\u00f6dinger"
            ]
        },
        "milestones": [],
        "payments": [],
        "tva": 19.6,
        "currency": "Yens",
        "assietteSubventionnable": 5,
        "financialImpact": "Aucune",
        "description": "M\u00e9canique quantique",
        "acronym": "QUANTIK",
        "label": "Th\u00e9orie des cordes",
        "projectlabel": "M\u00e9canique quantique",
        "pfi": "EOTP201600004",
        "amount": 15000
    }
]
 No newline at end of file
+7 −0
Changes for module/Oscar/src/Oscar/Connector/ConnectorActivityJSON.php: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -448,6 +448,12 @@ class ConnectorActivityJSON implements ConnectorInterface
                $tva = null;
            }

            if( $data->status ){
                $status = (int)$data->status;
            } else {
                $status = Activity::STATUS_ERROR_STATUS;
            }



            $activity
@@ -461,6 +467,7 @@ class ConnectorActivityJSON implements ConnectorInterface
                ->setActivityType($type)
                ->setDateSigned($data->datesigned ? new \DateTime($data->datesigned) : null)
                ->setDateOpened($data->datePFI ? new \DateTime($data->datePFI) : null)
                ->setStatus($status)
                ->setAmount(((double)$data->amount));

            if( $data->datestart ){