Loading front/components/Application/Popover.vue 0 → 100644 +17 −0 Changes for front/components/Application/Popover.vue: 17 added lines, 0 removed lines. Original line number Diff line number Diff line <template> {{ title }} Mon popover super </template> <script> export default { name: "Popover", props: { title: String } } </script> <style scoped> </style> No newline at end of file front/components/Mission/Liste.vue +4 −6 Changes for front/components/Mission/Liste.vue: 4 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -36,12 +36,10 @@ export default { }, mounted() { var that = this; $.ajax({ url: Util.url("mission/liste/:intervenant", {intervenant: this.intervenant}), success: (response) => { that.missions = response; } axios.get( Util.url("mission/liste/:intervenant", {intervenant: this.intervenant}) ).then((response) => { this.missions = response.data; }); } } Loading front/components/Mission/Mission.vue +10 −2 Changes for front/components/Mission/Mission.vue: 10 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -54,12 +54,19 @@ </div> </div> </form> <popover title="Mon titre cool"></popover> </div> </template> <script> import popover from '@components/Application/Popover.vue'; export default { name: 'Mission', components: { popover }, props: { mission: {required: true}, options: {type: Object} Loading @@ -75,9 +82,10 @@ export default { { axios.post( Util.url('mission/modifier'), this.mission this.mission, {submitter: event.submitter} ).then((response) => { this.mission = response.data.data; this.mission = response.data; }); }, deleteMission(mission) Loading module/Application/src/Controller/Plugin/Axios.php +27 −0 Changes for module/Application/src/Controller/Plugin/Axios.php: 27 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,8 @@ namespace Application\Controller\Plugin; use Laminas\Mvc\Controller\Plugin\AbstractPlugin; use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger; use Laminas\View\Model\JsonModel; /** * Description of Axios Loading @@ -26,4 +28,29 @@ class Axios extends AbstractPlugin } } public function send(array $data): JsonModel { /** @var FlashMessenger $flashMessenger */ $flashMessenger = $this->controller->flashMessenger(); $jsonData = [ 'data' => $data, 'messages' => [ $flashMessenger::NAMESPACE_ERROR => $flashMessenger->getCurrentErrorMessages(), $flashMessenger::NAMESPACE_SUCCESS => $flashMessenger->getCurrentSuccessMessages(), $flashMessenger::NAMESPACE_WARNING => $flashMessenger->getCurrentWarningMessages(), $flashMessenger::NAMESPACE_INFO => $flashMessenger->getCurrentInfoMessages(), ], ]; $flashMessenger->clearCurrentMessages($flashMessenger::NAMESPACE_ERROR); $flashMessenger->clearCurrentMessages($flashMessenger::NAMESPACE_SUCCESS); $flashMessenger->clearCurrentMessages($flashMessenger::NAMESPACE_WARNING); $flashMessenger->clearCurrentMessages($flashMessenger::NAMESPACE_INFO); $model = new JsonModel($jsonData); return $model; } } No newline at end of file module/Mission/src/Controller/MissionController.php +5 −14 Changes for module/Mission/src/Controller/MissionController.php: 5 added lines, 14 removed lines. Original line number Diff line number Diff line Loading @@ -73,34 +73,25 @@ class MissionController extends AbstractController $missionForm = $this->getFormMission(); $missionForm->bind($mission); $missionForm->setData($data); $result = []; //$this->flashMessenger()->addErrorMessage('et merde!'); if ($missionForm->isValid()) { try { $this->getServiceMission()->save($mission); } catch (\Exception $e) { $result = [ 'error' => $e->getMessage(), ]; $this->flashMessenger()->addErrorMessage($e->getMessage()); } } else { $result['form-errors'] = []; foreach ($missionForm->getElements() as $element) { if ($messages = $element->getMessages()) { $result['form-errors'][$element->getName()] = []; foreach ($messages as $message) { $result['form-errors'][$element->getName()][] = $message; } $this->flashMessenger()->addErrorMessage($message); } } if (empty($result['form-errors'])) { unset($result['form-errors']); } } $result = $missionForm->getHydrator()->extract($mission); $result['data'] = $missionForm->getHydrator()->extract($mission); return new JsonModel($result); return $this->axios()->send($result); } Loading Loading
front/components/Application/Popover.vue 0 → 100644 +17 −0 Changes for front/components/Application/Popover.vue: 17 added lines, 0 removed lines. Original line number Diff line number Diff line <template> {{ title }} Mon popover super </template> <script> export default { name: "Popover", props: { title: String } } </script> <style scoped> </style> No newline at end of file
front/components/Mission/Liste.vue +4 −6 Changes for front/components/Mission/Liste.vue: 4 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -36,12 +36,10 @@ export default { }, mounted() { var that = this; $.ajax({ url: Util.url("mission/liste/:intervenant", {intervenant: this.intervenant}), success: (response) => { that.missions = response; } axios.get( Util.url("mission/liste/:intervenant", {intervenant: this.intervenant}) ).then((response) => { this.missions = response.data; }); } } Loading
front/components/Mission/Mission.vue +10 −2 Changes for front/components/Mission/Mission.vue: 10 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -54,12 +54,19 @@ </div> </div> </form> <popover title="Mon titre cool"></popover> </div> </template> <script> import popover from '@components/Application/Popover.vue'; export default { name: 'Mission', components: { popover }, props: { mission: {required: true}, options: {type: Object} Loading @@ -75,9 +82,10 @@ export default { { axios.post( Util.url('mission/modifier'), this.mission this.mission, {submitter: event.submitter} ).then((response) => { this.mission = response.data.data; this.mission = response.data; }); }, deleteMission(mission) Loading
module/Application/src/Controller/Plugin/Axios.php +27 −0 Changes for module/Application/src/Controller/Plugin/Axios.php: 27 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,8 @@ namespace Application\Controller\Plugin; use Laminas\Mvc\Controller\Plugin\AbstractPlugin; use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger; use Laminas\View\Model\JsonModel; /** * Description of Axios Loading @@ -26,4 +28,29 @@ class Axios extends AbstractPlugin } } public function send(array $data): JsonModel { /** @var FlashMessenger $flashMessenger */ $flashMessenger = $this->controller->flashMessenger(); $jsonData = [ 'data' => $data, 'messages' => [ $flashMessenger::NAMESPACE_ERROR => $flashMessenger->getCurrentErrorMessages(), $flashMessenger::NAMESPACE_SUCCESS => $flashMessenger->getCurrentSuccessMessages(), $flashMessenger::NAMESPACE_WARNING => $flashMessenger->getCurrentWarningMessages(), $flashMessenger::NAMESPACE_INFO => $flashMessenger->getCurrentInfoMessages(), ], ]; $flashMessenger->clearCurrentMessages($flashMessenger::NAMESPACE_ERROR); $flashMessenger->clearCurrentMessages($flashMessenger::NAMESPACE_SUCCESS); $flashMessenger->clearCurrentMessages($flashMessenger::NAMESPACE_WARNING); $flashMessenger->clearCurrentMessages($flashMessenger::NAMESPACE_INFO); $model = new JsonModel($jsonData); return $model; } } No newline at end of file
module/Mission/src/Controller/MissionController.php +5 −14 Changes for module/Mission/src/Controller/MissionController.php: 5 added lines, 14 removed lines. Original line number Diff line number Diff line Loading @@ -73,34 +73,25 @@ class MissionController extends AbstractController $missionForm = $this->getFormMission(); $missionForm->bind($mission); $missionForm->setData($data); $result = []; //$this->flashMessenger()->addErrorMessage('et merde!'); if ($missionForm->isValid()) { try { $this->getServiceMission()->save($mission); } catch (\Exception $e) { $result = [ 'error' => $e->getMessage(), ]; $this->flashMessenger()->addErrorMessage($e->getMessage()); } } else { $result['form-errors'] = []; foreach ($missionForm->getElements() as $element) { if ($messages = $element->getMessages()) { $result['form-errors'][$element->getName()] = []; foreach ($messages as $message) { $result['form-errors'][$element->getName()][] = $message; } $this->flashMessenger()->addErrorMessage($message); } } if (empty($result['form-errors'])) { unset($result['form-errors']); } } $result = $missionForm->getHydrator()->extract($mission); $result['data'] = $missionForm->getHydrator()->extract($mission); return new JsonModel($result); return $this->axios()->send($result); } Loading