arregle bug de logout en admins, cambios a los seeders para ajustarnos a los formatos nuevos de archivos y cambio para que se ajuste a production cuando este en el servidor

app/database/seeds/CourseStudentTableSeeder.php

@@ -15,7 +15,7 @@ class CourseStudentTableSeeder extends Seeder {
         $time_start = microtime(true);
 
         // Open file
-        if($file = fopen('app/database/csv/course_student.csv', 'r'))
+        if($file = fopen('app/database/csv/estudiante_curso.csv', 'r'))
         {
             // Initialize count variables
             $read = 0;
@@ -25,16 +25,16 @@ class CourseStudentTableSeeder extends Seeder {
             $semester_id = NULL;
 
             // Read each row
-            while($data = fgetcsv($file, 5000, "|")) // se cambio delimitador para evitar problemas con nombre separados del apellido con coma
+            while($data = fgetcsv($file, 5000)) // se cambio delimitador para evitar problemas con nombre separados del apellido con coma
             {
                 // Add read count
                 $read++;
 
                 try
                 {
-                    $code_number_section = trim($data[3]);
-                    $student_number = trim($data[0]);
-                    $term_code = trim($data[2]);
+                    $student_number = trim($data[1]);
+                    $code_number_section = trim($data[2]);
+                    $term_code = trim($data[3]);
 
                     // If any required field is empty, raise an exception
                     if(!$code_number_section || !$student_number || !$term_code)

app/database/seeds/CourseTableSeeder.php

@@ -13,7 +13,7 @@ class CourseTableSeeder extends Seeder {
         $time_start = microtime(true);
 
         // Open file
-        if($file = fopen('app/database/csv/courses.csv', 'r'))
+        if($file = fopen('app/database/csv/cursos.csv', 'r'))
         {
             // Initialize count variables
             $read = 0;
@@ -22,7 +22,7 @@ class CourseTableSeeder extends Seeder {
             $error = 0;
 
             // Read each row
-            while($data = fgetcsv($file, 5000, "|")) // se cambio delimitador para evitar problemas con nombres separados del apellido por coma
+            while($data = fgetcsv($file, 5000)) // se cambio delimitador para evitar problemas con nombres separados del apellido por coma
             {
                 // Add read count
                 $read++;
@@ -31,13 +31,14 @@ class CourseTableSeeder extends Seeder {
                 try
                 {
                     // Get row info
-                    $name = $data[6];
-                    $code = trim(substr($data[0], 0, 4));
-                    $number = trim(substr($data[0], 4, 4));
-                    $section = trim(substr($data[0], 8, 3));
-                    $user_id = User::select('id')->where('ssn', trim($data[14]))->first();
-                    $semester_id = Semester::select('id')->where('code', strtoupper(trim($data[2])))->first();
-                    $program_code = trim($data[7]);
+                    $name = $data[8];
+                    $code = trim(substr($data[1], 0, 4));
+                    $number = trim(substr($data[1], 4, 4));
+                    $section = trim(substr($data[1], 8, 3));
+                    $user_id = User::select('id')->where('ssn', trim($data[11]))->first();
+                    $semester_id = Semester::select('id')->where('code', strtoupper(trim($data[3])))->first();
+                    $program_code = trim($data[9]);
+                    $modality = trim($data[5]);
 
                     // If any row is empty, raise an exception
                     if($name=='' || $code=='' || $number=='' || $section=='' || trim($data[14])=='' || trim($data[2])=='')
@@ -93,6 +94,7 @@ class CourseTableSeeder extends Seeder {
                                     'code' => $code,
                                     'number' => $number,
                                     'section' => $section,
+                                    'modality' => $modality,
                                     'program_id' => $program_id,
                                     'user_id' => $user_id,
                                     'updated_at' => date("Y-m-d H:i:s", time())
@@ -110,6 +112,7 @@ class CourseTableSeeder extends Seeder {
                             'code' => $code,
                             'number' => $number,
                             'section' => $section,
+                            'modality' => $modality,
                             'program_id' => $program_id,
                             'user_id' => $user_id,
                             'semester_id' => $semester_id

app/database/seeds/UserTableSeeder.php

@@ -29,7 +29,7 @@ class UserTableSeeder extends Seeder {
             $error = 0;
 
             // Read each row
-            while($data = fgetcsv($file, 5000, "|"))
+            while($data = fgetcsv($file, 5000))
             {
                 // Add read count
                 $read++;
@@ -44,6 +44,18 @@ class UserTableSeeder extends Seeder {
                     $email = strtolower(trim($data[3]));
                     $emp_number = strtolower(trim($data[4]));
 
+                    if($email=="null" or $email=="")
+                    {
+                    	$email="email".rand()."@upr.edu";
+//                     	print($email);
+//                     	var_dump($data);exit();
+                    }
+                    if($emp_number=="null" or $emp_number=="")
+                    {
+                    	$emp_number="NO".rand(10000000,99999999);
+//                     	print($emp_number);
+//                     	var_dump($data);exit();
+                    }
                     // Program unavailable.For the moment, I'm setting it to null, but it should eventually be the commented line below
                     // $program_id = trim($data[4]);
                     $program_id = NULL;

app/views/local/managers/admins/_navigation.blade.php

@@ -72,14 +72,16 @@
       </li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Account<span class="caret"></span></a>
-{{--         <ul class="dropdown-menu" role="menu">
+         <ul class="dropdown-menu" role="menu">
           <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
           <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}</li>
         </ul>
       </li>
+<!-- 
           <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}
       </li>
-    </ul>--}}
+ -->
+    </ul>
     </li>
     </ul>
   </div>

bootstrap/start.php

@@ -23,13 +23,21 @@ $app = new Illuminate\Foundation\Application;
 | given environment, then we will automatically detect it for you.
 |
 */
-
+/*
 $env = $app->detectEnvironment(array(
 
 	'local' => array(gethostname(), 'RPV20111.rrp.campus', 'homestead'),
     'production' => array('*.com', '*.edu', '*.org'),
 
 ));
+*/
+
+$env = $app->detectEnvironment(array(
+
+	'local' => array('RPV20111.rrp.campus', 'homestead'),
+    'production' => array('*.com', '*.edu', '*.org'),
+
+));
 
 /*
 |--------------------------------------------------------------------------