Bläddra i källkod

Minor - Adding more students in the fill users feature

Julio Montoya 13 år sedan
förälder
incheckning
cd274b2cc1
3 ändrade filer med 21 tillägg och 18 borttagningar
  1. 3 3
      main/admin/filler.php
  2. 16 14
      tests/datafiller/data_users.php
  3. 2 1
      tests/datafiller/fill_users.php

+ 3 - 3
main/admin/filler.php

@@ -50,12 +50,12 @@ Display::display_header($nameTools);
 $result = '';
 if (count($output)>0) {
     $result = '<div class="filler-report">'."\n";
-    $result .= '<div class="filler-report-title">'.$output[0]['title'].'</div>'."\n";
+    $result .= '<h3>'.$output[0]['title'].'</h3>'."\n";
     $result .= '<table>';
     foreach ($output as $line) {
         $result .= '<tr>';
-	    $result .= '<td class="filler-report-data-init">'.$line['line-init'].'</td><td class="filler-report-data">'.$line['line-info'].'</td>';
-	    $result .= '</tr>'."\n";
+	    $result .= '<td class="filler-report-data-init">'.$line['line-init'].' </td><td class="filler-report-data">'.$line['line-info'].'</td>';
+	    $result .= '</tr>';
     }
     $result .= '</table>';
     $result .= '</div>';

+ 16 - 14
tests/datafiller/data_users.php

@@ -150,19 +150,21 @@ $users[] = array('username' => 'jlennon','pass' => 'jlennon','firstname' => 'Joh
 $users[] = array('username' => 'pchavez','pass' => 'pchavez','firstname' => 'Parol','lastname' => 'Chavez','status' => 5,'auth_source' => 'platform','email' => 'pchavez@example.com','creator_id' => 1,'active' => 1);
 $users[] = array('username' => 'cvallejo','pass' => 'cvallejo','firstname' => 'César','lastname' => 'Vallejo','status' => 5,'auth_source' => 'platform','email' => 'cvallejo@example.com','creator_id' => 1,'active' => 1);
 $users[] = array('username' => 'ftruffaut','pass'=> 'ftruffaut','firstname' => 'François','lastname' => 'Truffaut','status' => 5,'auth_source' => 'platform','email' => 'ftruffaut@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'mjoy','pass'=> 'mjoy','firstname' => 'Marion','lastname' => 'Joy','status' => 5,'auth_source' => 'platform','email' => 'marion@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'dmassa','pass'=> 'dmassa','firstname' => 'Diego','lastname' => 'Massa','status' => 5,'auth_source' => 'platform','email' => 'dmassa@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'mjagger','pass'=> 'mjagger','firstname' => 'Mick','lastname' => 'Jag','status' => 5,'auth_source' => 'platform','email' => 'mjagger@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'mcotilla','pass'=> 'mcotilla','firstname' => 'Marion','lastname' => 'Cotillard','status' => 5,'auth_source' => 'platform','email' => 'mcotilla@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'pepelepew','pass'=> 'pepelepew','firstname' => 'Pepe','lastname' => 'Le Pew','status' => 5,'auth_source' => 'platform','email' => 'pepelepew@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'nrubia','pass'=> 'nrubia','firstname' => 'Nathalie','lastname' => 'Rubia','status' => 5,'auth_source' => 'platform','email' => 'nrubia@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'psanchez','pass'=> 'psanchez','firstname' => 'Peri','lastname' => 'Sanchez','status' => 5,'auth_source' => 'platform','email' => 'psanchez@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'acostea','pass'=> 'acostea','firstname' => 'Andreea','lastname' => 'Costea','status' => 5,'auth_source' => 'platform','email' => 'acostea@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'telera','pass'=> 'telera','firstname' => 'Tania','lastname' => 'Helera','status' => 5,'auth_source' => 'platform','email' => 'telera@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'dstrauss','pass'=> 'dstrauss','firstname' => 'Domingo','lastname' => 'Strauss','status' => 5,'auth_source' => 'platform','email' => 'dstrauss@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'helena','pass'=> 'helena','firstname' => 'Helena','lastname' => 'Duarte','status' => 5,'auth_source' => 'platform','email' => 'helena@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'acostea','pass'=> 'acostea','firstname' => 'Andreea','lastname' => 'Costea','status' => 5,'auth_source' => 'platform','email' => 'acostea@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'cgonzales','pass'=> 'cgonzales','firstname' => 'Cecilia','lastname' => 'Gonzales','status' => 5,'auth_source' => 'platform','email' => 'cgonzales@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'amann','pass'=> 'amann','firstname' => 'Aimee','lastname' => 'Mann','status' => 5,'auth_source' => 'platform','email' => 'amann@example.com','creator_id' => 1,'active' => 1);
+$users[] = array('username' => 'zazup','pass'=> 'zazup','firstname' => 'Zazup','lastname' => 'Zazupar','status' => 5,'auth_source' => 'platform','email' => 'zazup@example.com','creator_id' => 1,'active' => 1);
+
 
 
-/*
-$users[] = array(
-    'username' => '',
-    'pass' => '',
-    'firstname' => '',
-    'lastname' => '',
-    'status' => 1,
-    'auth_source' => 'platform',
-    'email' => '',
-    'status' => 1,
-    'creator_id' => 1,
-    'active' => 1,
-);
-*/

+ 2 - 1
tests/datafiller/fill_users.php

@@ -23,7 +23,8 @@ function fill_users() {
     foreach ($users as $i => $user) {
         //first check that the first item doesn't exist already
     	$output[$i]['line-init'] = $user['firstname'];
-    	$output[$i]['line-info'] = ($res = UserManager::create_user($user['firstname'],$user['lastname'],$user['status'],$user['email'],$user['username'],$user['pass'],null,null,null,null,$user['auth_source'],null,$user['active'])?$res:get_lang('NotInserted'));
+        $res = UserManager::create_user($user['firstname'],$user['lastname'],$user['status'],$user['email'],$user['username'],$user['pass'],null,null,null,null,$user['auth_source'],null,$user['active']);
+    	$output[$i]['line-info'] = $res ? get_lang('Inserted') : get_lang('NotInserted');
     	$i++;
     }
     return $output;