Merge pull request #18 from Kunstmaan/bugfix/segment-issues

Bugfix/segment issues
Kunstmaan · May 15, 2014 · 5ace4e2 · 5ace4e2
2 parents 61c48a8 + 0998b8a
commit 5ace4e2
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 9 deletions.
diff --git a/Command/GoogleAnalyticsDataCollectCommand.php b/Command/GoogleAnalyticsDataCollectCommand.php
@@ -259,7 +259,8 @@ public function updateData($overviews)
 
                 $this->em->getRepository('KunstmaanDashboardBundle:AnalyticsConfig')->setUpdated($overview->getConfig()->getId());
             } catch (\Google_ServiceException $e) {
-                $this->output->writeln("\t" . '<fg=red>Invalid segment</fg=red>');
+                $error = explode(')', $e->getMessage())[1];
+                $this->output->writeln("\t" . '<fg=red>Invalid segment: </fg=red>' .$error);
                 $this->errors += 1;
             }
         }

diff --git a/Command/Helper/Analytics/GoalCommandHelper.php b/Command/Helper/Analytics/GoalCommandHelper.php
@@ -209,6 +209,8 @@ private function parseGoals(&$overview, $goalCollection)
             $goals = $overview->getGoals();
             $goals[] = $goal;
 
+            $this->em->persist($goal);
+
             $this->output->writeln("\t\t" . 'Fetched goal ' . $goal->getPosition() . ': "' . $goal->getName() . '" @ ' . $totalVisits);
         }
     }

diff --git a/Controller/GoogleAnalyticsAJAXController.php b/Controller/GoogleAnalyticsAJAXController.php
@@ -189,6 +189,15 @@ public function saveConfigAction(Request $request) {
             $em->persist($config);
             $em->flush();
 
+            // set the config name
+            $configHelper = $this->container->get('kunstmaan_dashboard.helper.google.analytics.config');
+            $configHelper->init($config->getId());
+            $profile = $configHelper->getActiveProfile();
+            $config->setName($profile['profileName']);
+
+            $em->persist($config);
+            $em->flush();
+
             $this->get('session')->getFlashBag()->add(
                 'success',
                 'Succesfully saved!'

diff --git a/Controller/GoogleAnalyticsController.php b/Controller/GoogleAnalyticsController.php
@@ -128,6 +128,8 @@ public function configAction(Request $request)
         $config = $em->getRepository('KunstmaanDashboardBundle:AnalyticsConfig')->findFirst();
 
         $params['accountId'] = $config->getAccountId();
+        $params['propertyId'] = 0;
+        $params['profileId'] = 0;
 
         if ($params['accountId']) {
             $params['propertyId'] = $config->getPropertyId();

diff --git a/Helper/Google/Analytics/ConfigHelper.php b/Helper/Google/Analytics/ConfigHelper.php
@@ -318,6 +318,10 @@ public function getActiveProfile() {
             $profiles = $this->getProfiles();
             $profileId = $this->getProfileId();
 
+            if (!is_array($profiles)) {
+                throw new \Exception('<fg=red>The config is invalid</fg=red>');
+            }
+
             foreach ($profiles as $profile) {
                 if ($profile['profileId'] == $profileId) {
                     return $profile;

diff --git a/Resources/public/js/analytics/tabs.js b/Resources/public/js/analytics/tabs.js
@@ -66,6 +66,7 @@ $(function () {
     $("#segment-menu select").chosen(
         {'search_contains' : true}
     );
+
     $("#segment-menu select").change(function() {
         var segmentId = $(this).find('option:selected').attr('data-segment-id');
         var configId = $(this).find('option:selected').attr('data-config-id');

diff --git a/Resources/public/js/setup/setup.js b/Resources/public/js/setup/setup.js
@@ -1,7 +1,7 @@
 $(function () {
-    var accountId = 0;
-    var propertyId = 0;
-    var profileId = 0;
+    var accountId = $('#account_id').attr('data-id');
+    var propertyId = $('#property_id').attr('data-id');
+    var profileId = $('#profile_id').attr('data-id');
 
     $('#submit_save').click(function() {
         // get the option data

diff --git a/Resources/public/scss/_dashboard-tabs.scss b/Resources/public/scss/_dashboard-tabs.scss
@@ -7,7 +7,7 @@
     @include clearfix;
     margin: 40px 0 0;
     list-style: none;
-    width: 50%;
+    width: 75%;
     * {
         -moz-box-sizing: border-box;
         -webkit-box-sizing: border-box;

diff --git a/Resources/views/GoogleAnalytics/setup.html.twig b/Resources/views/GoogleAnalytics/setup.html.twig
@@ -89,6 +89,9 @@
     <input type="hidden" id="path_segment_delete" data-url="{{ path('kunstmaan_dashboard_ajax_segment_delete') }}" />
     <input type="hidden" id="path_segment_edit" data-url="{{ path('kunstmaan_dashboard_ajax_segment_edit') }}" />
     <input type="hidden" id="path_config_save" data-url="{{ path('kunstmaan_dashboard_ajax_config_save') }}" />
+    <input type="hidden" id="account_id" data-id="{{accountId}}" />
+    <input type="hidden" id="property_id" data-id="{{propertyId}}" />
+    <input type="hidden" id="profile_id" data-id="{{profileId}}" />
 {% endblock %}
 
 {% block extrajavascript %}

diff --git a/Resources/views/GoogleAnalytics/widget.html.twig b/Resources/views/GoogleAnalytics/widget.html.twig
@@ -1,15 +1,13 @@
 {% if token %}
 <div class="dashboard">
-
     {% if segments | length > 0 %}
         <nav id="segment-menu">
             <select>
-                <option>Choose a segment..</option>
-                <option data-segment-id="#" data-config-id="{% if configId is defined %}{{configId}}{% endif %}">
+                <option data-segment-id="#" data-config-id="{% if configId is defined %}{{configId}}{% endif %}" {% if segmentId is null %}selected{% endif %} >
                     Default
                 </option>
                 {% for segment in segments %}
-                    <option data-segment-id="{{segment.id}}" data-config-id="{{segment.config.id}}">
+                    <option data-segment-id="{{segment.id}}" data-config-id="{{segment.config.id}}" {% if segment.id == segmentId %}selected{% endif %} >
                         {{segment.name}}
                     </option>
                 {% endfor %}