diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php index 19186d488..7dde07cf9 100644 --- a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php +++ b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php @@ -93,8 +93,7 @@ $datum_obj = new datum(); $uebung_id = (isset($_GET['uebung_id'])?$_GET['uebung_id']:''); $uid = (isset($_GET['uid'])?$_GET['uid']:''); -?> - +?> @@ -783,7 +782,7 @@ echo ''; - +
".$p->t('global/datum')." ".$p->t('benotungstool/note')."
@@ -792,7 +791,7 @@ echo ''; - +
".$p->t('global/datum')." ".$p->t('benotungstool/note')."
@@ -804,22 +803,25 @@ echo ''; if($grade_from_moodle) { + flush(); + ob_flush(); + $moodle24 = new moodle24_course(); $moodle24->loadNoten($lvid, $stsem); - $moodle24_course_bezeichung=array(); + $moodle24_course_bezeichnung=array(); if(count($moodle24->result)>0) { // Bezeichnungen der Moodlekurse laden foreach($moodle24->result as $obj) { - if(!isset($moodle24_course_bezeichnung)) + if(!isset($moodle24_course_bezeichnung[$obj->mdl_course_id])) { $moodle24course = new moodle24_course(); $moodle24course->load($obj->mdl_course_id); - - $moodle24_course_bezeichung[$obj->mdl_course_id]=$moodle24course->mdl_shortname; + + $moodle24_course_bezeichnung[$obj->mdl_course_id]=$moodle24course->mdl_shortname; } } } @@ -960,10 +962,10 @@ echo '
'; else $leneg = ' style="font-weight: bold;"'; $title="Moodle 2.4 KursID: ".$moodle24_noten->mdl_course_id. - "\nKursbezeichnung: ".$moodle24_course_bezeichung[$moodle24_noten->mdl_course_id]. + "\nKursbezeichnung: ".$moodle24_course_bezeichnung[$moodle24_noten->mdl_course_id]. "\nUser: ".$moodle24_noten->uid. "\nNote: $moodle24_noten->note"; - $note_les_str .= "
".$moodle24_noten->note." (".$moodle24_course_bezeichung[$moodle24_noten->mdl_course_id].") "; + $note_les_str .= "
".$moodle24_noten->note." (".$moodle24_course_bezeichnung[$moodle24_noten->mdl_course_id].") "; } } @@ -1067,7 +1069,7 @@ echo '
'; echo ""; + echo ""; } echo "
"; echo $pr_datum."".$pr_note.""; echo ""; - echo "
"; echo ""; diff --git a/system/moodlePlugin/fhcompletews/externallib.php b/system/moodlePlugin/fhcompletews/externallib.php index 919a9ff0a..e332706aa 100644 --- a/system/moodlePlugin/fhcompletews/externallib.php +++ b/system/moodlePlugin/fhcompletews/externallib.php @@ -88,6 +88,7 @@ class local_fhcompletews_external extends external_api if($grade_item->itemtype=='course') { $final_id=$key; + $finalitem = $grade_item; break; } } @@ -100,7 +101,7 @@ class local_fhcompletews_external extends external_api // Liste mit allen Studierenden des Kurses durchlaufen $geub = new grade_export_update_buffer(); - $gui = new graded_users_iterator($export->course, $export->columns, $export->groupid); + $gui = new graded_users_iterator($export->course, array($final_id=>$finalitem), $export->groupid); //$export->columns $gui->init(); $kursgrad =array(); @@ -119,9 +120,11 @@ class local_fhcompletews_external extends external_api { $gradestr = $export->format_grade($userdata->grades[$final_id]); $user_item['note']=$gradestr; + + // nur zurueckliefern wenn eine Note gefunden wurde und diese nicht '-' ist + if($user_item['note']!='-') + $data[]=$user_item; } - - $data[]=$user_item; } $gui->close(); diff --git a/system/moodlePlugin/fhcompletews/version.php b/system/moodlePlugin/fhcompletews/version.php index 1118cf278..09a673c71 100644 --- a/system/moodlePlugin/fhcompletews/version.php +++ b/system/moodlePlugin/fhcompletews/version.php @@ -12,7 +12,7 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -$plugin->version = 2013031302; // The (date) version of this module + 2 extra digital for daily versions +$plugin->version = 2014030605; // The (date) version of this module + 2 extra digital for daily versions // This version number is displayed into /admin/forms.php // TODO: if ever this plugin get branched, the old branch number // will not be updated to the current date but just incremented. We will @@ -20,5 +20,5 @@ $plugin->version = 2013031302; // The (date) version of this module + 2 extra // display this version number with userdate (dev friendly) $plugin->requires = 2010112400; // Requires this Moodle version - at least 2.0 $plugin->cron = 0; -$plugin->release = '1.0 (Build: 2013031302)'; +$plugin->release = '1.0 (Build: 2014030605)'; $plugin->maturity = MATURITY_STABLE;