make statistics recursive

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=880632

diff --git a/keduvocdocument/keduvoccontainer.cpp b/keduvocdocument/keduvoccontainer.cpp
index 354d0033c80cb6a21f345ba8a14e4caaaa134446..d26ca7392b3a2ce68dd0e1c3c6191b4ca3c52a98 100644 (file)
--- a/keduvocdocument/keduvoccontainer.cpp
+++ b/keduvocdocument/keduvoccontainer.cpp
@@ -243,21 +243,21 @@ void KEduVocContainer::invalidateChildLessonEntries()
     }
 }
 
-double KEduVocContainer::averageGrade(int translation)
+double KEduVocContainer::averageGrade(int translation, EnumEntriesRecursive recursive)
 {
     // grades range from 0..7 right now
     int sum = 0;
-    foreach (KEduVocExpression *entry, entries(NotRecursive)) {
+    foreach (KEduVocExpression *entry, entries(recursive)) {
         sum += entry->translation(translation)->grade();
     }
     // make that a percentage
-    return (sum * 100.0/7.0)/entryCount(NotRecursive);
+    return (sum * 100.0/7.0)/entryCount(recursive);
 }
 
-int KEduVocContainer::expressionsOfGrade(int translation, grade_t grade)
+int KEduVocContainer::expressionsOfGrade(int translation, grade_t grade, EnumEntriesRecursive recursive)
 {
     int sum = 0;
-    foreach (KEduVocExpression *entry, entries(NotRecursive)) {
+    foreach (KEduVocExpression *entry, entries(recursive)) {
         if (entry->translation(translation)->grade() == grade) {
             sum++;
         }

diff --git a/keduvocdocument/keduvoccontainer.h b/keduvocdocument/keduvoccontainer.h
index 42e464d4b13e5f5f6af668c775be6e1535909a0b..016aa189cdb8a906c118cdd0cc056eff153d83f5 100644 (file)
--- a/keduvocdocument/keduvoccontainer.h
+++ b/keduvocdocument/keduvoccontainer.h
@@ -131,9 +131,9 @@ public:
      */
     void setImageUrl(const KUrl &url);
 
-    double averageGrade(int translation);
+    double averageGrade(int translation, EnumEntriesRecursive recursive);
 
-    int expressionsOfGrade(int translation, grade_t grade);
+    int expressionsOfGrade(int translation, grade_t grade, EnumEntriesRecursive recursive);
 
     /**
      * Remove grades from all entries of this lessons