diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 55cb0d5..e2d5341 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -1348,15 +1348,17 @@
      *
      * @return int number of matching submissions
      */
-    public function count_submissions_need_grading() {
+    public function count_submissions_need_grading($currentgroup = false) {
         global $DB;
 
         if ($this->get_instance()->teamsubmission) {
             // This does not make sense for group assignment because the submission is shared.
             return 0;
         }
-
-        $currentgroup = groups_get_activity_group($this->get_course_module(), true);
+		
+		if(!$currentgroup){
+        	$currentgroup = groups_get_activity_group($this->get_course_module(), true);
+		}
         list($esql, $params) = get_enrolled_sql($this->get_context(), 'mod/assign:submit', $currentgroup, true);
 
         $submissionmaxattempt = 'SELECT mxs.userid, MAX(mxs.attemptnumber) AS maxattempt
@@ -1464,10 +1466,12 @@
      * @param string $status The submission status - should match one of the constants
      * @return int number of matching submissions
      */
-    public function count_submissions_with_status($status) {
+    public function count_submissions_with_status($status, $currentgroup = false) {
         global $DB;
 
-        $currentgroup = groups_get_activity_group($this->get_course_module(), true);
+        if(!$currentgroup){
+        	$currentgroup = groups_get_activity_group($this->get_course_module(), true);
+        }
         list($esql, $params) = get_enrolled_sql($this->get_context(), 'mod/assign:submit', $currentgroup, true);
 
         $params['assignid'] = $this->get_instance()->id;
@@ -3868,28 +3872,37 @@
         if ($this->can_grade()) {
             $draft = ASSIGN_SUBMISSION_STATUS_DRAFT;
             $submitted = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
+            $groups = groups_get_activity_allowed_groups($this->get_course_module(),$USER->id);
+            $countparticipants = $countsubmissiondraft = $countsubmissionsubmitted = $countsubmissionneedgrade = 0;
+            foreach ($groups as $group) {
+            	$countparticipants += $this->count_participants($group->id);
+            	$countsubmissiondraft += $this->count_submissions_with_status($draft, $group->id);
+            	$countsubmissionsubmitted += $this->count_submissions_with_status($submitted, $group->id);
+            	$countsubmissionneedgrade += $this->count_submissions_need_grading($group->id);
+            }
             if ($instance->teamsubmission) {
                 $summary = new assign_grading_summary($this->count_teams(),
                                                       $instance->submissiondrafts,
-                                                      $this->count_submissions_with_status($draft),
+                                                      $countsubmissiondraft,
                                                       $this->is_any_submission_plugin_enabled(),
-                                                      $this->count_submissions_with_status($submitted),
+                                                      $countsubmissionsubmitted,
                                                       $instance->cutoffdate,
                                                       $instance->duedate,
                                                       $this->get_course_module()->id,
-                                                      $this->count_submissions_need_grading(),
+                                                      $countsubmissionneedgrade,
                                                       $instance->teamsubmission);
                 $o .= $this->get_renderer()->render($summary);
             } else {
-                $summary = new assign_grading_summary($this->count_participants(0),
+            	
+                $summary = new assign_grading_summary($countparticipants,
                                                       $instance->submissiondrafts,
-                                                      $this->count_submissions_with_status($draft),
+                                                      $countsubmissiondraft,
                                                       $this->is_any_submission_plugin_enabled(),
-                                                      $this->count_submissions_with_status($submitted),
+                                                      $countsubmissionsubmitted,
                                                       $instance->cutoffdate,
                                                       $instance->duedate,
                                                       $this->get_course_module()->id,
-                                                      $this->count_submissions_need_grading(),
+                                                      $countsubmissionneedgrade,
                                                       $instance->teamsubmission);
                 $o .= $this->get_renderer()->render($summary);
             }