Changing how we use jquery to select the options

Author: bassrock

Controller/PushAdminController.php

@@ -258,10 +258,9 @@ public function pushMessagesAction() {
      *  description="Gets the data to be converted for the graph",
      *  section="DABSquared Push Notifications (Dashboard Data)"
      * )
-     *
+     * @Rest\View()
      * @Route("push/data/app_open_graph", defaults={"_format": "json"}, name="dabsquared_push_notifications_data_app_open_graph")
      * @Method("POST")
-     * @Rest\View(serializerGroups={"app_event"})
      * @RequestParam(name="device_state", description="What device state to grab", strict=true)
      * @RequestParam(name="internal_app_ids", description="The vendor device identifier of the Android device.", strict=true, array=true)
      */
@@ -270,10 +269,40 @@ public function getAppOpenGraphDataAction(ParamFetcher $paramFetcher) {
         $internalAppIds = $paramFetcher->get('internal_app_ids');
 
         $appEvents = $this->appEventManager->getAppEvents(array(AppEventInterface::APP_OPEN), array(Types::OS_IOS), $internalAppIds, $deviceState, new \DateTime('2005-08-15T15:52:01+00:00'), new \DateTime('2015-08-15T15:52:01+00:00'));
+        $appEventDayCounts = array();
 
+        /** @var $appEvent \DABSquared\PushNotificationsBundle\Model\AppEventInterface */
+        foreach($appEvents as $appEvent) {
+            $day = $appEvent->getCreatedAt()->format('Y-m-d');
+            $appId = $appEvent->getDevice()->getAppId();
 
+            if(!isset($appEventDayCounts[$day])) {
+                $appEventDayCounts[$day] = array();
+            }
+
+            if(!isset($appEventDayCounts[$day][$appId])) {
+                $appEventDayCounts[$day][$appId] = 0;
+            }
+
+            $appEventDayCounts[$day][$appId] = $appEventDayCounts[$day][$appId] + 1;
+        }
+
+        ksort($appEventDayCounts);
+
+        $appEventCounts = array();
+
+        foreach($appEventDayCounts as $key => $val) {
+            $tempPointArray = array();
+            $tempPointArray['day'] = $key;
+
+            foreach($appEventDayCounts[$key] as $key1 => $val1) {
+                $tempPointArray[$key1] = $val1;
+            }
+
+            $appEventCounts[] = $tempPointArray;
+        }
 
-        return $appEvents;
+        return $appEventCounts;
     }
 
 

Resources/doc/2-mapping_orm.md

@@ -199,7 +199,6 @@ namespace MyProject\MyBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 use DABSquared\PushNotificationsBundle\Entity\AppEvent as BaseAppEvent;
-use JMS\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
@@ -210,7 +209,6 @@ class AppEvent extends BaseAppEvent {
 
     /**
      * @ORM\ManyToOne(targetEntity="MyProject\MyBundle\Entity\Device", inversedBy="appEvents")
-     * @Serializer\Groups({"app_event"})
      */
     protected $device;
 

Resources/views/Dashboard/dashboard.html.twig

@@ -43,13 +43,21 @@
         });
 
         function loadGraphData() {
+            var deviceState =  $("input:radio[name=device_state]:checked").val();
+            var internal_app_ids =  Array();
+
+            $('input[name="internal_app_ids"]:checked').each(function() {
+                internal_app_ids.push(this.value);
+            });
+
             $.ajax ({
-                url: "{{ path('dabsquared_push_notifications_data_app_open_graph')}}",
+                url: "{{ create_proper_route('dabsquared_push_notifications_data_app_open_graph')}}",
                 type: "POST",
-                data: JSON.stringify({internal_app_ids: ["0000001"], device_state: 0 }),
+                data: JSON.stringify({internal_app_ids: internal_app_ids, device_state: deviceState }),
                 dataType: "json",
                 contentType: "application/json; charset=utf-8",
                 success: function(data){
+                    window.graph.setData(data);
                 }
             });
 
@@ -67,17 +75,11 @@
                     element: 'appOpensChart',
                     // Chart data records -- each entry in this array corresponds to a point on
                     // the chart.
-                    data: [
-                        { day: '2008', value: 20 },
-                        { day: '2009', value: 10 },
-                        { day: '2010', value: 5 },
-                        { day: '2011', value: 5 },
-                        { day: '2012', value: 20 }
-                    ],
+                    data: [],
                     // The name of the data record attribute that contains x-values.
                     xkey: 'day',
                     // A list of names of data record attributes that contain y-values.
-                    ykeys: ['value'],
+                    ykeys: [{% for app in apps %} '{{ app.internal_app_id }}', {% endfor %}],
                     // Labels for the ykeys -- will be displayed when you hover over the
                     // chart.
                     labels: yLabels