mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
MDL-19794 Upgraded calls to choose_from_menu
This commit is contained in:
nicolasconnault
parent
ba179d56c9
commit
5387640a12
5 changed files with 57 additions and 41 deletions
|
|
@ -3,7 +3,7 @@
|
|||
function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $selecteddate='today',
|
||||
$modname="", $modid=0, $modaction='', $selectedgroup=-1, $showcourses=0, $showusers=0, $logformat='showashtml') {
|
||||
|
||||
global $USER, $CFG, $SITE, $DB;
|
||||
global $USER, $CFG, $SITE, $DB, $OUTPUT;
|
||||
require_once $CFG->dirroot.'/mnet/peer.php';
|
||||
|
||||
$mnet_peer = new mnet_peer();
|
||||
|
|
@ -227,7 +227,7 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select
|
|||
} else {
|
||||
$courses = array();
|
||||
$courses[$course->id] = $course->fullname . ((empty($course->category)) ? ' ('.get_string('site').') ' : '');
|
||||
choose_from_menu($courses,"id",$course->id,false);
|
||||
echo $OUTPUT->select(html_select::make($courses,"id",$course->id, false));
|
||||
if (has_capability('coursereport/log:view', $sitecontext)) {
|
||||
$a = new object();
|
||||
$a->url = "$CFG->wwwroot/course/report/log/index.php?chooselog=0&group=$selectedgroup&user=$selecteduser"
|
||||
|
|
@ -245,11 +245,11 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select
|
|||
else {
|
||||
$groups = array();
|
||||
}
|
||||
choose_from_menu ($groups, "group", $selectedgroup, get_string("allgroups") );
|
||||
echo $OUTPUT->select(html_select::make($groups, "group", $selectedgroup, get_string("allgroups")));
|
||||
}
|
||||
|
||||
if ($showusers) {
|
||||
choose_from_menu ($users, "user", $selecteduser, get_string("allparticipants") );
|
||||
echo $OUTPUT->select(html_select::make($users, "user", $selecteduser, get_string("allparticipants")));
|
||||
}
|
||||
else {
|
||||
$users = array();
|
||||
|
|
@ -260,20 +260,26 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select
|
|||
else {
|
||||
$users[0] = get_string('allparticipants');
|
||||
}
|
||||
choose_from_menu($users, 'user', $selecteduser, false);
|
||||
echo $OUTPUT->select(html_select::make($users, "user", $selecteduser, false));
|
||||
$a->url = "$CFG->wwwroot/course/report/log/index.php?chooselog=0&group=$selectedgroup&user=$selecteduser"
|
||||
."&id=$course->id&date=$selecteddate&modid=$selectedactivity&showusers=1&showcourses=$showcourses";
|
||||
print_string('logtoomanyusers','moodle',$a);
|
||||
}
|
||||
choose_from_menu ($dates, "date", $selecteddate, get_string("alldays"));
|
||||
choose_from_menu ($activities, "modid", $selectedactivity, get_string("allactivities"), "", "");
|
||||
choose_from_menu ($actions, 'modaction', $modaction, get_string("allactions"));
|
||||
|
||||
echo $OUTPUT->select(html_select::make($dates, "date", $selecteddate, get_string("alldays")));
|
||||
|
||||
$select = html_select::make($activities, "modid", $selectedactivity);
|
||||
$select->nothinglabel = get_string("allactivities");
|
||||
$select->nothingvalue = '';
|
||||
echo $OUTPUT->select($select);
|
||||
|
||||
echo $OUTPUT->select(html_select::make($actions, 'modaction', $modaction, get_string("allactions")));
|
||||
|
||||
$logformats = array('showashtml' => get_string('displayonpage'),
|
||||
'downloadascsv' => get_string('downloadtext'),
|
||||
'downloadasods' => get_string('downloadods'),
|
||||
'downloadasexcel' => get_string('downloadexcel'));
|
||||
choose_from_menu ($logformats, 'logformat', $logformat, false);
|
||||
echo $OUTPUT->select(html_select::make($logformats, 'logformat', $logformat, false));
|
||||
echo '<input type="submit" value="'.get_string('gettheselogs').'" />';
|
||||
echo '</div>';
|
||||
echo '</form>';
|
||||
|
|
@ -282,7 +288,7 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select
|
|||
function print_log_selector_form($course, $selecteduser=0, $selecteddate='today',
|
||||
$modname="", $modid=0, $modaction='', $selectedgroup=-1, $showcourses=0, $showusers=0, $logformat='showashtml') {
|
||||
|
||||
global $USER, $CFG, $DB;
|
||||
global $USER, $CFG, $DB, $OUTPUT;
|
||||
|
||||
// first check to see if we can override showcourses and showusers
|
||||
$numcourses = $DB->count_records("course");
|
||||
|
|
@ -434,12 +440,12 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate='today'
|
|||
echo "<input type=\"hidden\" name=\"showusers\" value=\"$showusers\" />\n";
|
||||
echo "<input type=\"hidden\" name=\"showcourses\" value=\"$showcourses\" />\n";
|
||||
if (has_capability('coursereport/log:view', $sitecontext) && $showcourses) {
|
||||
choose_from_menu ($courses, "id", $course->id, "");
|
||||
echo $OUTPUT->select(html_select::make($courses, "id", $course->id, false));
|
||||
} else {
|
||||
// echo '<input type="hidden" name="id" value="'.$course->id.'" />';
|
||||
$courses = array();
|
||||
$courses[$course->id] = $course->fullname . (($course->id == SITEID) ? ' ('.get_string('site').') ' : '');
|
||||
choose_from_menu($courses,"id",$course->id,false);
|
||||
echo $OUTPUT->select(html_select::make($courses,"id",$course->id, false));
|
||||
if (has_capability('coursereport/log:view', $sitecontext)) {
|
||||
$a = new object();
|
||||
$a->url = "$CFG->wwwroot/course/report/log/index.php?chooselog=0&group=$selectedgroup&user=$selecteduser"
|
||||
|
|
@ -457,11 +463,11 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate='today'
|
|||
else {
|
||||
$groups = array();
|
||||
}
|
||||
choose_from_menu ($groups, "group", $selectedgroup, get_string("allgroups") );
|
||||
echo $OUTPUT->select(html_select::make($groups, "group", $selectedgroup, get_string("allgroups")));
|
||||
}
|
||||
|
||||
if ($showusers) {
|
||||
choose_from_menu ($users, "user", $selecteduser, get_string("allparticipants") );
|
||||
echo $OUTPUT->select(html_select::make($users, "user", $selecteduser, get_string("allparticipants")));
|
||||
}
|
||||
else {
|
||||
$users = array();
|
||||
|
|
@ -472,21 +478,27 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate='today'
|
|||
else {
|
||||
$users[0] = get_string('allparticipants');
|
||||
}
|
||||
choose_from_menu($users, 'user', $selecteduser, false);
|
||||
echo $OUTPUT->select(html_select::make($users, "user", $selecteduser, false));
|
||||
$a = new object();
|
||||
$a->url = "$CFG->wwwroot/course/report/log/index.php?chooselog=0&group=$selectedgroup&user=$selecteduser"
|
||||
."&id=$course->id&date=$selecteddate&modid=$selectedactivity&showusers=1&showcourses=$showcourses";
|
||||
print_string('logtoomanyusers','moodle',$a);
|
||||
}
|
||||
choose_from_menu ($dates, "date", $selecteddate, get_string("alldays"));
|
||||
choose_from_menu ($activities, "modid", $selectedactivity, get_string("allactivities"), "", "");
|
||||
choose_from_menu ($actions, 'modaction', $modaction, get_string("allactions"));
|
||||
echo $OUTPUT->select(html_select::make($dates, "date", $selecteddate, get_string("alldays")));
|
||||
|
||||
$select = html_select::make($activities, "modid", $selectedactivity);
|
||||
$select->nothinglabel = get_string("allactivities");
|
||||
$select->nothingvalue = '';
|
||||
echo $OUTPUT->select($select);
|
||||
|
||||
echo $OUTPUT->select(html_select::make($actions, 'modaction', $modaction, get_string("allactions")));
|
||||
|
||||
$logformats = array('showashtml' => get_string('displayonpage'),
|
||||
'downloadascsv' => get_string('downloadtext'),
|
||||
'downloadasods' => get_string('downloadods'),
|
||||
'downloadasexcel' => get_string('downloadexcel'));
|
||||
choose_from_menu ($logformats, 'logformat', $logformat, false);
|
||||
|
||||
echo $OUTPUT->select(html_select::make($logformats, 'logformat', $logformat, false));
|
||||
echo '<input type="submit" value="'.get_string('gettheselogs').'" />';
|
||||
echo '</div>';
|
||||
echo '</form>';
|
||||
|
|
|
|||
|
|
@ -121,11 +121,11 @@
|
|||
$select->nested = true;
|
||||
echo $OUTPUT->select($select);
|
||||
echo '<label for="menutimefrom">'.get_string('lookback').'</label>'."\n";
|
||||
choose_from_menu($timeoptions,'timefrom',$timefrom);
|
||||
echo $OUTPUT->select(html_select::make($timeoptions,'timefrom',$timefrom));
|
||||
echo '<label for="menuroleid">'.get_string('showonly').'</label>'."\n";
|
||||
choose_from_menu($roleoptions,'roleid',$roleid,'');
|
||||
echo $OUTPUT->select(html_select::make($roleoptions,'roleid',$roleid,false));
|
||||
echo '<label for="menuaction">'.get_string('showactions').'</label>'."\n";
|
||||
choose_from_menu($actionoptions,'action',$action,'');
|
||||
echo $OUTPUT->select(html_select::make($actionoptions,'action',$action,false));
|
||||
helpbutton('participationreport',get_string('participationreport'));
|
||||
echo '<input type="submit" value="'.get_string('go').'" />'."\n</div></form>\n";
|
||||
|
||||
|
|
|
|||
|
|
@ -44,21 +44,21 @@
|
|||
}
|
||||
|
||||
$table->align = array('left','left','left','left','left','left','left','left');
|
||||
$table->data[] = array(get_string('course'),choose_from_menu($courseoptions,'course',$course->id,'','','',true),
|
||||
get_string('users'),choose_from_menu($users,'userid',$userid,'','','',true),
|
||||
get_string('statsreporttype'),choose_from_menu($reportoptions,'report',($report == 5) ? $report.$roleid : $report,'','','',true),
|
||||
get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
|
||||
$table->data[] = array(get_string('course'),$OUTPUT->select(html_select::make($courseoptions,'course',$course->id,false)),
|
||||
get_string('users'),$OUTPUT->select(html_select::make($users,'userid',$userid,false)),
|
||||
get_string('statsreporttype'),$OUTPUT->select(html_select::make($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false)),
|
||||
get_string('statstimeperiod'),$OUTPUT->select(html_select::make($timeoptions,'time',$time,false)),
|
||||
'<input type="submit" value="'.get_string('view').'" />') ;
|
||||
} else if ($mode == STATS_MODE_RANKED) {
|
||||
$table->align = array('left','left','left','left','left','left');
|
||||
$table->data[] = array(get_string('statsreporttype'),choose_from_menu($reportoptions,'report',($report == 5) ? $report.$roleid : $report,'','','',true),
|
||||
get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
|
||||
$table->data[] = array(get_string('statsreporttype'),$OUTPUT->select(html_select::make($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false)),
|
||||
get_string('statstimeperiod'),$OUTPUT->select(html_select::make($timeoptions,'time',$time,false)),
|
||||
'<input type="submit" value="'.get_string('view').'" />') ;
|
||||
} else if ($mode == STATS_MODE_GENERAL) {
|
||||
$table->align = array('left','left','left','left','left','left','left');
|
||||
$table->data[] = array(get_string('course'),choose_from_menu($courseoptions,'course',$course->id,'','','',true),
|
||||
get_string('statsreporttype'),choose_from_menu($reportoptions,'report',($report == 5) ? $report.$roleid : $report,'','','',true),
|
||||
get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
|
||||
$table->data[] = array(get_string('course'),$OUTPUT->select(html_select::make($courseoptions,'course',$course->id,false)),
|
||||
get_string('statsreporttype'),$OUTPUT->select(html_select::make($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false)),
|
||||
get_string('statstimeperiod'),$OUTPUT->select(html_select::make($timeoptions,'time',$time,false)),
|
||||
'<input type="submit" value="'.get_string('view').'" />') ;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue