Adding date filters and all the dashboard options. Adding images to the read me.

Author: bassrock

Controller/PushAdminController.php

@@ -262,13 +262,107 @@ public function pushMessagesAction() {
      * @Route("push/data/app_open_graph", defaults={"_format": "json"}, name="dabsquared_push_notifications_data_app_open_graph")
      * @Method("POST")
      * @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)
+     * @RequestParam(name="internal_app_ids", description="The internal app ids to see information for.", strict=true, array=true)
+     * @RequestParam(name="device_types", description="The device types to show data for", strict=true, array=true)
+     * @RequestParam(name="start_date", description="Start date", strict=false)
+     * @RequestParam(name="end_date", description="End date", strict=false)
      */
     public function getAppOpenGraphDataAction(ParamFetcher $paramFetcher) {
         $deviceState = $paramFetcher->get('device_state');
         $internalAppIds = $paramFetcher->get('internal_app_ids');
+        $deviceTypes = $paramFetcher->get('device_types');
+        $startDate = $paramFetcher->get('start_date');
+        $endDate = $paramFetcher->get('end_date');
+
+        if(is_null($startDate)) {
+            $date = new \DateTime('NOW');
+            $date->modify('-1 week');
+            $startDate = $date;
+        } else {
+            $startDate = new \DateTime($startDate);
+        }
+
+        if(is_null($endDate)) {
+            $endDate = new \DateTime('NOW');
+        }else {
+            $endDate = new \DateTime($endDate);
+        }
+
+
+        $appEvents = $this->appEventManager->getAppEvents(array(AppEventInterface::APP_OPEN), $deviceTypes, $internalAppIds, $deviceState, $startDate, $endDate);
+        $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 $appEventCounts;
+    }
+
+    /**
+     * @ApiDoc(
+     *  description="Gets the data to be converted for the graph",
+     *  section="DABSquared Push Notifications (Dashboard Data)"
+     * )
+     * @Rest\View()
+     * @Route("push/data/app_terminated_graph", defaults={"_format": "json"}, name="dabsquared_push_notifications_data_app_terminated_graph")
+     * @Method("POST")
+     * @RequestParam(name="device_state", description="What device state to grab", strict=true)
+     * @RequestParam(name="internal_app_ids", description="The internal app ids to see information for.", strict=true, array=true)
+     * @RequestParam(name="device_types", description="The device types to show data for", strict=true, array=true)
+     * @RequestParam(name="start_date", description="Start date", strict=false)
+     * @RequestParam(name="end_date", description="End date", strict=false)
+     */
+    public function getAppTerminatedGraphDataAction(ParamFetcher $paramFetcher) {
+        $deviceState = $paramFetcher->get('device_state');
+        $internalAppIds = $paramFetcher->get('internal_app_ids');
+        $deviceTypes = $paramFetcher->get('device_types');
+        $startDate = $paramFetcher->get('start_date');
+        $endDate = $paramFetcher->get('end_date');
+
+        if(is_null($startDate)) {
+            $date = new \DateTime('NOW');
+            $date->modify('-1 week');
+            $startDate = $date;
+        } else {
+            $startDate = new \DateTime($startDate);
+        }
 
-        $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'));
+        if(is_null($endDate)) {
+            $endDate = new \DateTime('NOW');
+        }else {
+            $endDate = new \DateTime($endDate);
+        }
+
+
+        $appEvents = $this->appEventManager->getAppEvents(array(AppEventInterface::APP_TERMINATED), $deviceTypes, $internalAppIds, $deviceState, $startDate, $endDate);
         $appEventDayCounts = array();
 
         /** @var $appEvent \DABSquared\PushNotificationsBundle\Model\AppEventInterface */
@@ -305,6 +399,78 @@ public function getAppOpenGraphDataAction(ParamFetcher $paramFetcher) {
         return $appEventCounts;
     }
 
+    /**
+     * @ApiDoc(
+     *  description="Gets the data to be converted for the graph",
+     *  section="DABSquared Push Notifications (Dashboard Data)"
+     * )
+     * @Rest\View()
+     * @Route("push/data/app_backgrounded_graph", defaults={"_format": "json"}, name="dabsquared_push_notifications_data_app_backgrounded_graph")
+     * @Method("POST")
+     * @RequestParam(name="device_state", description="What device state to grab", strict=true)
+     * @RequestParam(name="internal_app_ids", description="The internal app ids to see information for.", strict=true, array=true)
+     * @RequestParam(name="device_types", description="The device types to show data for", strict=true, array=true)
+     * @RequestParam(name="start_date", description="Start date", strict=false)
+     * @RequestParam(name="end_date", description="End date", strict=false)
+     */
+    public function getAppBackgroundedGraphDataAction(ParamFetcher $paramFetcher) {
+        $deviceState = $paramFetcher->get('device_state');
+        $internalAppIds = $paramFetcher->get('internal_app_ids');
+        $deviceTypes = $paramFetcher->get('device_types');
+        $startDate = $paramFetcher->get('start_date');
+        $endDate = $paramFetcher->get('end_date');
+
+        if(is_null($startDate)) {
+            $date = new \DateTime('NOW');
+            $date->modify('-1 week');
+            $startDate = $date;
+        } else {
+            $startDate = new \DateTime($startDate);
+        }
+
+        if(is_null($endDate)) {
+            $endDate = new \DateTime('NOW');
+        }else {
+            $endDate = new \DateTime($endDate);
+        }
+
+
+        $appEvents = $this->appEventManager->getAppEvents(array(AppEventInterface::APP_BACKGROUNDED), $deviceTypes, $internalAppIds, $deviceState, $startDate, $endDate);
+        $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 $appEventCounts;
+    }
 
 
 }

README.md

@@ -34,51 +34,13 @@ This bundle is under the MIT license. See the complete license in the bundle:
 
     Resources/meta/LICENSE
 
+## Admin Web Interface
 
-Configuration
--------
-
-Below you'll find all configuration options; just use what you need:
-
-``` yaml
-    dab_push_notifications:
-      android:
-          c2dm:
-              username: <string_android_c2dm_username>
-              password: <string_android_c2dm_password>
-              source: <string_android_c2dm_source>
-          gcm:
-              api_key: <string_android_gcm_api_key>
-      ios:
-          certificates:  #replace these certs with your own as well as app ids. The bundle will loop through all certs displayed here when sending a push based on the sandbox param. You can add as many certificates as you need. Also note that the bundle will send using certificates that match the internal_app_ids of the registered devices.
-            dev_prem: { sandbox: true, pem: %kernel.root_dir%/../pushcerts/premium/dev/certificate.pem, passphrase: ~, internal_app_id: 0000001}
-            dev_lite: { sandbox: true, pem: %kernel.root_dir%/../pushcerts/lite/dev/certificate.pem, passphrase: ~, internal_app_id: 0000002}
-            prod_prem: { sandbox: false, pem: %kernel.root_dir%/../pushcerts/premium/prod/certificate.pem, passphrase: ~, internal_app_id: 0000001}
-            prod_lite: { sandbox: false, pem: %kernel.root_dir%/../pushcerts/lite/prod/certificate.pem, passphrase: ~,internal_app_id: 0000002}
-      blackberry:
-          evaluation: <bool_bb_evaluation_mode>
-          app_id: <string_bb_app_id>
-          password: <string_bb_password>
-      safari:
-          pem: %kernel.root_dir%/../pushcerts/safari/safari_push.pem
-          pk12: %kernel.root_dir%/../pushcerts/safari/Certificates.p12
-          passphrase: ~
-          website_push_id: web.com.demo
-          icon16x16: %kernel.root_dir%/../pushcerts/safari/icon_16x16.png
-          icon16x16@2x: %kernel.root_dir%/../pushcerts/safari/[email protected]
-          icon32x32: %kernel.root_dir%/../pushcerts/safari/icon_32x32.png
-          icon32x32@2x: %kernel.root_dir%/../pushcerts/safari/[email protected]
-          icon128x128: %kernel.root_dir%/../pushcerts/safari/icon_128x128.png
-          icon128x128@2x: %kernel.root_dir%/../pushcerts/safari/[email protected]
-          websiteName: Demo Site
-          allowedDomains: ["https://demo.com","https://www.demo.com"]
-          urlFormatString: http://www.demo.com/%@
-          webServiceURL: https://www.demo.com
-```
-
-
+![](Resources/doc/images/dashboard.png)
+![](Resources/doc/images/devices.png)
+![](Resources/doc/images/create_message.png)
 
-## DABSquared New Usage
+## Sending Messages
 
 Send to a User: