|
|
@ -87,15 +87,14 @@ if ($mform->is_submitted()) { |
|
|
|
if (isset($formdata->ident['uname'])) { |
|
|
|
$data->tabhead[] = get_string('username'); |
|
|
|
} |
|
|
|
if (isset($formdata->ident['idnumber'])) { |
|
|
|
$data->tabhead[] = get_string('idnumber'); |
|
|
|
} |
|
|
|
if (isset($formdata->ident['institution'])) { |
|
|
|
$data->tabhead[] = get_string('institution'); |
|
|
|
|
|
|
|
$optional = array('idnumber', 'institution', 'department'); |
|
|
|
foreach ($optional as $opt) { |
|
|
|
if (isset($formdata->ident[$opt])) { |
|
|
|
$data->tabhead[] = get_string($opt); |
|
|
|
} |
|
|
|
if (isset($formdata->ident['department'])) { |
|
|
|
$data->tabhead[] = get_string('department'); |
|
|
|
} |
|
|
|
|
|
|
|
$data->tabhead[] = get_string('lastname'); |
|
|
|
$data->tabhead[] = get_string('firstname'); |
|
|
|
|
|
|
@ -122,15 +121,14 @@ if ($mform->is_submitted()) { |
|
|
|
if (isset($formdata->ident['uname'])) { |
|
|
|
$data->table[$i][] = $user->username; |
|
|
|
} |
|
|
|
if (isset($formdata->ident['idnumber'])) { |
|
|
|
$data->table[$i][] = $user->idnumber; |
|
|
|
} |
|
|
|
if (isset($formdata->ident['institution'])) { |
|
|
|
$data->table[$i][] = $user->institution; |
|
|
|
|
|
|
|
$optional_row = array('idnumber', 'institution', 'department'); |
|
|
|
foreach ($$optional_row as $opt) { |
|
|
|
if (isset($formdata->ident[$opt])) { |
|
|
|
$data->table[$i][] = $user->$opt; |
|
|
|
} |
|
|
|
if (isset($formdata->ident['department'])) { |
|
|
|
$data->table[$i][] = $user->department; |
|
|
|
} |
|
|
|
|
|
|
|
$data->table[$i][] = $user->lastname; |
|
|
|
$data->table[$i][] = $user->firstname; |
|
|
|
$cellsgenerator = new user_sessions_cells_text_generator($reportdata, $user); |
|
|
|