May 1 sync

docroot/sites/all/modules/custom/pp_frontpage/plugins/content_types/about.inc

@@ -5,15 +5,7 @@ $plugin = array(
   'title' => t('Project description for main page'),
   'single' => TRUE,
   'category' => t('PP'),
-  'hook theme' => array(
-    'pp_frontpage_about' => array(
-      'path' => drupal_get_path('module', 'pp_frontpage') . '/plugins/content_types',
-      'template' => 'about',
-      'variables' => array(
-        'text' => NULL,
-      ),
-    ),
-  ),
+  'hook theme' => 'pp_front_page_about_content_type_theme'
 );
 
 
@@ -25,16 +17,18 @@ function pp_frontpage_about_content_type_render() {
   $block->module = 'pp_frontpage';
   $block->title = '';
   $block->id = 'about_block';
-  $block->content = '
-    <div id="logo-large"><img src="/sites/all/themes/custom/ppdorg_bootstrap/logo-large.png"></div>
-    <h3>
-    ' . t('PPDORG is a project that scans Drupal.org contributions and prepare reports about contributions, grouped by country parameter.') . ' <br>
-    ' . t('Current version investigate Drupal communities of the eastern Europe') . '
-    </h3>
-  ';
   $block->content = array(
     '#theme' => 'pp_frontpage_about',
   );
-
   return $block;
 }
+
+function pp_front_page_about_content_type_theme(&$theme, $plugin) {
+  $theme['pp_frontpage_about'] = array(
+    'variables' => array(
+      'logo' => '',
+    ),
+    'path' => $plugin['path'],
+    'template' => 'about'
+  );
+}

docroot/sites/all/modules/custom/pp_frontpage/plugins/content_types/about.tpl.php

@@ -1 +1,5 @@
-<h1>TEST of THEME</h1>
+<div id="logo-large"><img src="/sites/all/themes/custom/ppdorg_bootstrap/logo-large.png"></div>
+<h3>
+  <?php print t('PPDORG is a project that scans Drupal.org contributions and prepare reports about contributions, grouped by country parameter.');?> <br>
+  <?php print t('Current version investigate Drupal communities of the eastern Europe');?>
+</h3>

docroot/sites/all/modules/custom/pp_frontpage/plugins/content_types/community_month_activity.inc

@@ -0,0 +1,61 @@
+<?php
+
+$plugin = array(
+  'title' => t('Community this month activity'),
+  'single' => TRUE,
+  'category' => t('PP'),
+  'required context' => new ctools_context_required('title','taxonomy_term'),
+  'hook theme' => 'pp_frontpage_community_month_activity_content_type_theme'
+);
+
+function pp_frontpage_community_month_activity_content_type_render($subtype, $conf, $panel_args, $context) {
+  // Localising of user group display to.
+  if (isset($context) && isset($context->data) && isset($context->data->tid)) {
+    $user_lists_tid = $context->data->tid;
+
+    $block = new stdClass();
+    $block->module = 'pp_frontpage';
+    $block->title = t('Users activity this month');
+    $query = db_select('ppgetstat', 'p')
+      ->fields('p', array('doid', 'timestamp', 'type'))
+      ->condition('p.user_group_tid', $user_lists_tid)
+      ->condition('p.timestamp', mktime(0,0,0, 1 , 1, date('Y')-1), '>=')
+      ->execute()
+      ->fetchAll();
+    $doids = $day_stat = array();
+    foreach ($query as $temp) {
+      if (isset($doids[$temp->doid])) {
+        $doids[$temp->doid]++;
+      } else {
+        $doids[$temp->doid] = 1;
+      }
+      $day_stat[date('Y-m-d', $temp->timestamp)]++;
+
+    }
+
+    dpm($day_stat);
+    $users = _ppgetstat_get_users_by_doids(array_keys($doids));
+    $doids = asort($doids);
+    drupal_add_js('http://d3js.org/d3.v3.min.js', 'external');
+    drupal_add_js(drupal_get_path('module','pp_frontpage') . '/plugins/content_types/js/month_activity.js');
+    drupal_add_js(array('pp_frontpage' => array('community_tid' => $user_lists_tid)), 'setting');
+    $block = new stdClass();
+    $block->module = 'pp_frontpage';
+    $block->title = 'Timeline';
+    $block->id = 'pp_frontpage_month_activity';
+    $block->content = array(
+      '#theme' => 'pp_frontpage_month_activity',
+    );
+    return $block;
+  }
+}
+
+function pp_frontpage_community_month_activity_content_type_theme(&$theme, $plugin) {
+  $theme['pp_frontpage_month_activity'] = array(
+    'variables' => array(
+      'logo' => '',
+    ),
+    'path' => $plugin['path'],
+    'template' => 'month_activity'
+  );
+}

docroot/sites/all/modules/custom/pp_frontpage/plugins/content_types/community_quality.inc

@@ -5,6 +5,7 @@ $plugin = array(
   'single' => TRUE,
   'category' => t('PP'),
   'required context' => new ctools_context_required('title', 'taxonomy_term'),
+  'hook theme' => 'pp_front_page_community_quality_content_type_theme'
 );
 
 /**
@@ -31,91 +32,79 @@ function pp_frontpage_community_quality_content_type_render(
 
     $block = new stdClass();
     $block->module = 'pp_frontpage';
-    $block->title = t('Community statistic');
-
+    $block->content = '';
     // Getting info for showing count of individual members at this country.
     $members_stat = _ppgetstat_get_individual_members();
 
-    $all_user_query = db_select('node', 'n');
-    $all_user_query->innerJoin(
+    // Query for global count uids, attached to the country.
+    $query = db_select('node', 'n');
+    $query->innerJoin(
       'field_data_field_user_lists',
       'fu',
       'fu.entity_id = n.nid'
     );
-    $all_user_query->condition('n.type', 'user');
-    $all_user_query->condition('fu.field_user_lists_tid', $user_lists_tid);
-    $all_user_query->addExpression('COUNT(n.nid)');
-    $all_user_result = $all_user_query->execute();
-    $all_user_count = $all_user_result->fetchField();
+    $query->fields('fu', array('field_user_lists_tid'));
+    $query->addExpression('COUNT(fu.field_user_lists_tid)', 'gc');
+    $query->condition('fu.field_user_lists_tid', $user_lists_tid);
+    $query->orderBy('gc', 'DESC');
+    $all_user_count = $query->countQuery()->execute()->fetchField();
 
+    // Getting active by commits statistics
     $active_by_commits_query = db_select('ppgetstat', 'pp');
-    $active_by_commits_query->innerJoin(
-      'field_data_field_user_id',
-      'fn',
-      'fn.field_user_id_value = pp.doid'
-    );
-    $active_by_commits_query->innerJoin(
-      'field_data_field_user_lists',
-      'fu',
-      'fu.entity_id = fn.entity_id'
-    );
     $active_by_commits_query->condition('pp.type', PPGETSTAT_TYPE_COMMITS);
-    $active_by_commits_query->condition(
-      'fu.field_user_lists_tid',
-      $user_lists_tid
-    );
+    $active_by_commits_query->condition('pp.user_group_tid', $user_lists_tid);
+    $active_by_commits_query->fields('pp',array('user_group_tid'));
+    $active_by_commits_query->addExpression('COUNT(pp.doid)', 'ac');
+
+    $active_by_commits_query->groupBy('pp.user_group_tid');
     $active_by_commits_query->groupBy('pp.doid');
-    $active_by_commits_query->addExpression('COUNT(pp.doid)');
-    $active_by_commits_count = $active_by_commits_query->execute()->fetchField(
-    );
+    $active_by_commits_count = $active_by_commits_query->countQuery()->execute()->fetchField();
 
-    $active_by_comments_query = db_select('ppgetstat', 'pp');
-    $active_by_comments_query->innerJoin(
-      'field_data_field_user_id',
-      'fn',
-      'fn.field_user_id_value = pp.doid'
-    );
-    $active_by_comments_query->innerJoin(
-      'field_data_field_user_lists',
-      'fu',
-      'fu.entity_id = fn.entity_id'
-    );
-    $active_by_comments_query->condition('pp.type', PPGETSTAT_TYPE_COMMITS);
-    $active_by_comments_query->condition(
-      'fu.field_user_lists_tid',
-      $user_lists_tid
-    );
-    $active_by_comments_query->groupBy('pp.doid');
-    $active_by_comments_query->addExpression('COUNT(pp.doid)');
-    $active_by_comments_count = $active_by_comments_query->execute()
-      ->fetchField();
+    $active_by_comments_count = 0;
 
     $individual_members_count = $members_stat['members_country_count'][$country];
+
     if ($all_user_count > 0) {
-      $block->content = '<div class="bs-callout bs-callout-primary">
-   <ul>
-   <li>' . t('Total count') . ' : <strong>' . $all_user_count . '</strong></li>
-   <li>' . t(
-          'Active committers'
-        ) . ' : <strong>' . $active_by_commits_count . ' (' . number_format(
+      $block->title = t('Community quality');
+      $block->content = array(
+        '#theme' => 'pp_frontpage_community_quality',
+        '#total' => $all_user_count,
+        '#active_committers' => $active_by_commits_count,
+        '#active_commenters' => $active_by_comments_count,
+        '#assoc_individual_members' => $individual_members_count,
+        '#active_committers_p' => number_format(
           $active_by_commits_count / $all_user_count,
           2
-        ) * 100 . ')%</strong></li>
-   <li>' . t(
-          'Active commenters'
-        ) . ' : <strong>' . $active_by_comments_count . ' (' . number_format(
-          $active_by_comments_count / $all_user_count,
-          2
-        ) * 100 . ')%</strong></li>
-   <li>' . t(
-          'Individual Assoc members'
-        ) . ' : <strong>' . $individual_members_count . ' (' . number_format(
-          $individual_members_count / $all_user_count,
-          2
-        ) * 100 . ')%</strong></li>
-   </ul>
-   </div>';
+        ) * 100,
+        '#active_commenters_p' => number_format(
+            $active_by_comments_count / $all_user_count,
+            2
+          ) * 100,
+        '#assoc_individual_members_p' => number_format(
+            $individual_members_count / $all_user_count,
+            2
+          ) * 100
+      );
     }
     return $block;
   }
 }
+
+/**
+ * hook_theme callback for this plugin.
+ */
+function pp_front_page_community_quality_content_type_theme(&$theme, $plugin) {
+  $theme['pp_frontpage_community_quality'] = array(
+    'variables' => array(
+      'total' => 0,
+      'active_committers' => 0,
+      'active_commenters' => 0,
+      'assoc_individual_members' => 0,
+      'active_committers_p' => 0,
+      'active_commenters_p' => 0,
+      'assoc_individual_members_p' => 0
+    ),
+    'path' => $plugin['path'] . '/templates/',
+    'template' => 'community_quality'
+  );
+}

docroot/sites/all/modules/custom/pp_frontpage/plugins/content_types/global_countries_members.inc

@@ -48,30 +48,20 @@ function pp_frontpage_global_countries_members_content_type_render($subtype, $co
 
 
   // Getting active by commits statistics
-  $active_by_commits_query = db_select('field_data_field_user_lists', 'fu');
-  $active_by_commits_query->innerJoin(
-    'field_data_field_user_id',
-    'fn',
-    'fu.entity_id = fn.entity_id'
-  );
-  $active_by_commits_query->innerJoin(
-    'ppgetstat',
-    'pp',
-    'pp.doid = fn.field_user_id_value'
-  );
+  $active_by_commits_query = db_select('ppgetstat', 'pp');
   $active_by_commits_query->condition('pp.type', PPGETSTAT_TYPE_COMMITS);
-  $active_by_commits_query->fields('fu',array('field_user_lists_tid'));
+  $active_by_commits_query->fields('pp',array('user_group_tid'));
   $active_by_commits_query->addExpression('COUNT(pp.doid)', 'ac');
 
-  $active_by_commits_query->groupBy('fu.field_user_lists_tid');
+  $active_by_commits_query->groupBy('pp.user_group_tid');
   $active_by_commits_query->groupBy('pp.doid');
   $active_by_commits = $active_by_commits_query->execute()->fetchAll();
   $active_commits = array();
   foreach ($active_by_commits as $temp) {
-    if (!empty($active_commits[$temp->field_user_lists_tid])) {
-      $active_commits[$temp->field_user_lists_tid]++;
+    if (!empty($active_commits[$temp->user_group_tid])) {
+      $active_commits[$temp->user_group_tid]++;
     } else {
-      $active_commits[$temp->field_user_lists_tid] = 1;
+      $active_commits[$temp->user_group_tid] = 1;
     }
   }