Cambios a los seeders, auth necesite el passwd, Admins les sirvan las rúbricas, y dominios diferenciados para graduados y subgraduados en typ

.gitignore

@@ -10,6 +10,7 @@ app/database/csv/*
 app/config/packages/*
 app/config/testing/*
 app/config/database.php
+app/config/app.php
 app/config/*
 
 

app/config/app.php

@@ -15,7 +15,7 @@ return array(
 
 	//'debug' => $_ENV['APP_DEBUG'] ?: false,
 
-	'debug' => true,
+	'debug' => false,
 	/*
 	|--------------------------------------------------------------------------
 	| Application URL
@@ -80,9 +80,12 @@ return array(
 	*/
 
 	// 'key' => 'YourSecretKey!!!',
-	'key' => 'JozBz0yQBrZ5kEcPvgxch3RR3E3INSGs',
+// 	'key' => 'JozBz0yQBrZ5kEcPvgxch3RR3E3INSGs',
+// 
+// 	'cipher' => MCRYPT_RIJNDAEL_256,
+	'key' => '+H!WZJxd5qwb!EHYR8^MLsX@^X6Y?e@+',
 
-	'cipher' => MCRYPT_RIJNDAEL_256,
+	'cipher' => MCRYPT_RIJNDAEL_128,
 
 	/*
 	|--------------------------------------------------------------------------

app/controllers/AdministratorsController.php

@@ -322,7 +322,8 @@ class AdministratorsController extends \BaseController
 		$outcomes = DB::table('overview')
 			->rightJoin('outcomes', 'outcomes.id', '=', 'overview.outcome_id')
 			->whereIn('outcomes.level',$levels)
-			->selectRaw('outcomes.name, coalesce(outcomes.new_outcome_id,outcomes.id) as id, sum(overview.total_evaluated) as total_evaluated, sum(overview.total_achieved) as total_achieved')
+// 			->selectRaw('outcomes.name, coalesce(outcomes.new_outcome_id,outcomes.id) as id, sum(overview.total_evaluated) as total_evaluated, sum(overview.total_achieved) as total_achieved')
+			->selectRaw('coalesce(outcomes.new_outcome_id,outcomes.id) as id, sum(overview.total_evaluated) as total_evaluated, sum(overview.total_achieved) as total_achieved')
 			->orderBy('outcomes.name', 'asc')
 			->groupBy(DB::raw('coalesce(outcomes.new_outcome_id,outcomes.id)'))
 			->get();
@@ -347,7 +348,12 @@ class AdministratorsController extends \BaseController
 				->orderBy('semesters.code', 'asc')
 				->groupBy('overview.semester_id')
 				->get();
+			$outcome->name=DB::table('outcomes')->select('name')->where('id',$outcome->id)->pluck('name');
 		}
+		usort($outcomes, function ($item1, $item2) {
+    if ($item1->name == $item2->name) return 0;
+    return $item1->name < $item2->name ? -1 : 1;
+});
 // var_dump($outcomes);
 // 		exit();
 // dd(DB::getQueryLog());

app/controllers/AuthController.php

@@ -28,9 +28,9 @@ class AuthController extends \BaseController
 
 		if (!$validator->fails()) {
 			//			TODO: Remove this for production environment
-			if (App::environment('local', 'staging')) {
-				return $this->processLogin();
-			}
+// 			if (App::environment('local', 'staging')) {
+// 				return $this->processLogin();
+// 			}
 			try {
 				// User input
 				$username = str_replace('@upr.edu', '', Input::get('email'));

app/controllers/ThreeYearPlanController.php

@@ -55,6 +55,8 @@ class ThreeYearPlanController extends \BaseController
     }
 
     $program = Program::find($program_id);
+        Log::info($program);
+
     // el ID de los semestres que el usuario tiene seleccionado.
     $semesters_ids = Session::get('semesters_ids');
     // buscar informacion de los semestres seleccionados
@@ -70,7 +72,14 @@ class ThreeYearPlanController extends \BaseController
       ->select('program_id')
       ->get();
     $program_id = $program_id[0]->program_id;*/
-    $outcomes = DB::table('outcomes')->where('deactivation_date', '=', null)->orderBy('name', 'ASC')->get();
+    if($program->is_graduate==0)
+    {
+	    $outcomes = DB::table('outcomes')->where('deactivation_date', '=', null)->orderBy('name', 'ASC')->get();
+    }
+    else
+    {
+	    $outcomes = DB::table('outcomes')->where('deactivation_date', '=', null)->where('level', '=', 3)->orderBy('name', 'ASC')->get();    
+    }
     // se annadio la nueva variable
     return View::make('global.view-three-year-plan', compact('title', 'last_year', 'outcomes', 'typs', 'criteria', 'semesters', 'program_id'));
   }

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/cursos.csv', 'r'))
+        if($file = fopen('app/database/csv/PSR010223_C12.txt', '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, 0,"|")) // se cambio delimitador para evitar problemas con nombres separados del apellido por coma
             {
                 // Add read count
                 $read++;
@@ -31,17 +31,18 @@ class CourseTableSeeder extends Seeder {
                 try
                 {
                     // Get row info
-                    $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]);
+                    $name = trim($data[14]);
+                    $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[24]))->first();
+                    $semester_id = Semester::select('id')->where('code', strtoupper(trim($data[2])))->first();
+                    $program_code = trim($data[15]);
+                    $faculty_code = trim($data[13]);
+                    $modality = trim($data[6]);
 
                     // If any row is empty, raise an exception
-                    if($name=='' || $code=='' || $number=='' || $section=='' || trim($data[14])=='' || trim($data[2])=='')
+                    if($name=='' || $code=='' || $number=='' || $section=='' || $semester_id=='' || $user_id=='')
                     {
                         throw new Exception('NON-FATAL ERROR(line '.$read.'): Missing information, read \''.implode(",", $data).'\'');
                     }
@@ -67,12 +68,14 @@ class CourseTableSeeder extends Seeder {
                     elseif(Program::select('id')->where('code', $program_code)->first())
                     {
                         $program_id = Program::select('id')->where('code', $program_code)->first()->id;
+                        $this->command->info("curso sin programa ".$code.$number." de facultad ".$faculty_code);
                     }
 
                     // Fetch user. If it doesn't exist, set default user
                     if(!$user_id && !$user_id['id'])
                     {
                         $user_id = 60; // Id for default user. Check DB for user with ssn 000000000.
+                        $this->command->info("curso sin profesor en sistema ".$code.$number." de facultad ".$faculty_code);
                     }
                     else
                     {

app/database/seeds/StudentTableSeeder.php

@@ -5,7 +5,8 @@ class StudentTableSeeder extends Seeder {
     public function run()
     {
         // Set term
-        $term = "B91";
+        $term = "C12";
+		$semester_id = Semester::select('id')->where('code', $term)->first();
 
         // Disable query logging to avoid memory exhaustion
         DB::disableQueryLog();
@@ -14,10 +15,12 @@ class StudentTableSeeder extends Seeder {
 
         // Initiates time
         $time_start = microtime(true);
-
+/*
+		//Primero entra la informacion basica eg. numero_estu, nombre, email
         // Open file
-        $file_path = 'http://136.145.180.72/tools/proceso_files/';
-        $file_name = 'webmatri_vivienda_b83-b91.dat';
+        $file_path = 'app/database/csv/';
+//         $file_name = 'ARCEXTRT-20-C12-20220411-164329.TXT';
+        $file_name = 'ARCEXT-20-C12-20220411-164329.TXT';
 
         if($file = fopen($file_path.$file_name, 'r'))
         {
@@ -29,13 +32,13 @@ class StudentTableSeeder extends Seeder {
             $warning = 0;
 
             // Read each row
-            while($data = fgetcsv($file, 5000, ";"))
+            while($data = fgetcsv($file, 0, ";"))
             {
                 // Skip iterations from previous semesters
-                if(trim($data[8]) != $term)
-                {
-                    continue;
-                }
+//                 if(trim($data[8]) != $term)
+//                 {
+//                     continue;
+//                 }
 
                 // Add read count
                 $read++;
@@ -43,11 +46,11 @@ class StudentTableSeeder extends Seeder {
                 try
                 {
                     // Get row info
-                    $number = str_pad(trim($data[1]), 9, '000000000', STR_PAD_LEFT);
-                    $name = trim(ucwords(strtoupper($data[2])));
-                    $email = trim($data[15]).'@upr.edu';
-                    $school_code = trim($data[5]);
-                    $conc_code = trim($data[7]);
+                    $number = str_pad(trim($data[2]), 9, '000000000', STR_PAD_LEFT);
+                    $name = trim(ucwords(strtoupper($data[4])));
+                    $email = trim($data[5]).'@upr.edu';
+//                     $school_code = trim($data[5]);
+                    $gender = trim($data[7]);
 
                     // If any row is empty, raise an exception
                     if(!$number || !$name)
@@ -78,12 +81,13 @@ class StudentTableSeeder extends Seeder {
                                 array(
                                     'name' => $name,
                                     'email' => $email,
-                                    'school_code' => $school_code,
-                                    'conc_code' => $conc_code,
+                                    'gender' => $gender,
+//                                     'school_code' => $school_code,
+//                                     'conc_code' => $conc_code,
                                     'updated_at' => date("Y-m-d H:i:s"),
                                 )
                             );
-                        $this->command->info($read.' - Updated '.$number.': '.$name.' ['.$school_code.' '.$conc_code.']');
+                        $this->command->info($read.' - Updated '.$number.': '.$name.' ['.$gender.']');
                         $updated++;
 
                     }
@@ -95,8 +99,9 @@ class StudentTableSeeder extends Seeder {
                             'number' => $number,
                             'name' => $name,
                             'email' => $email,
-                            'school_code' => $school_code,
-                            'conc_code' => $conc_code,
+							'gender' => $gender,
+//                             'school_code' => $school_code,
+//                             'conc_code' => $conc_code,
                             'created_at' => date("Y-m-d H:i:s"),
                             'updated_at' => date("Y-m-d H:i:s")
                             )
@@ -137,6 +142,138 @@ class StudentTableSeeder extends Seeder {
         {
             $this->command->info('File '.$file_name.' could not be opened. Make sure it is located in the app/database/csv directory of this project.');
         }
+*/    
+		//  Segundo entra la informacion de programa, grado, nivel, anho y anhade en program_student_semester
+         $file_path = 'app/database/csv/';
+        $file_name = 'ARCEXTRT-20-C12-20220411-164329.TXT';
+//         $file_name = 'ARCEXT-20-C12-20220411-164329.TXT';
+
+        if($file = fopen($file_path.$file_name, 'r'))
+        {
+            // Initialize count variables
+            $read = 0;
+            $added =0;
+            $updated = 0;
+            $error = 0;
+            $warning = 0;
+
+            // Read each row
+            while($data = fgetcsv($file, 0, ";"))
+            {
+                // Skip iterations from previous semesters
+//                 if(trim($data[8]) != $term)
+//                 {
+//                     continue;
+//                 }
+// 
+                // Add read count
+                $read++;
+
+                try
+                {
+                    // Get row info
+                    $number = str_pad(trim($data[3]), 9, '000000000', STR_PAD_LEFT);
+//                     $name = trim(ucwords(strtoupper($data[4])));
+//                     $email = trim($data[5]).'@upr.edu';
+                    $school_code = trim($data[19]);
+                    $conc_code = trim($data[21]);
+                    $level = trim($data[16]);
+                    $degree = trim($data[23]);
+                    $year = trim($data[25]);
+//                     $school_code = trim($data[5]);
+//                     $conc_code = trim($data[7]);
+
+                    // If any row is empty, raise an exception
+                    if(!$number)
+                    {
+                        throw new Exception('NON-FATAL ERROR(line '.$read.'): Missing name or student number, read \''.implode(",", $data).'\'');
+                    }
+
+                    $program=DB::table('programs')
+                            ->where('code', $conc_code)
+                            ->where('degree', $degree)
+                            ->select('id')
+                            ->first();
+//                             var_dump($program_id);
+					if(!$program)$program->id=null;
+                    // Check if student exists
+                    $student = Student::where('number', $number)->count();
+
+                    // If s/he does, update information and add to updated
+                    if($student)
+                    {
+						$student_id = Student::select('id')->where('number', $number)->first();
+//                     print $read."\n";
+						
+                        DB::table('students')
+                            ->where('number', $number)
+                            ->update(
+                                array(
+//                                     'name' => $name,
+//                                     'email' => $email,
+                                    'school_code' => $school_code,
+                                    'conc_code' => $conc_code,
+                                    'program_id' => $program->id,
+                                    'degree' => $degree,
+                                    'level' => $level,
+                                    'year' => $year,
+                                    'updated_at' => date("Y-m-d H:i:s"),
+                                )
+                            );
+                        $this->command->info($read.' - Updated '.$number.': '.$program->id.' ['.$school_code.' '.$conc_code.']');
+                        $updated++;
+                        
+                        DB::table('program_student_semester')->insert(
+							array('student_id' => $student_id->id,
+								  'program_id' => $program->id,
+								  'semester_id' => $semester_id->id
+								  )
+						);
+
+                    }
+
+                    // Otherwise, add student and add to added
+                    else
+                    {
+                        $this->command->info($read.' - Student not in system'.$number.': '.$name);
+                        $warning++;
+                    }
+
+                }
+
+                // If an exception is raised, show the message and add to error
+                catch(Exception $e)
+                {
+                    $this->command->info($e->getMessage());
+                    $error++;
+                };
+            }
+
+            // Stop time
+            $time_end = microtime(true);
+
+            // Display results
+            $this->command->info('------------------------------------------------------------');
+            $this->command->info('Results on '.date('M d, Y, h:i:s a'));
+            $this->command->info('- Runtime: '.(round($time_end - $time_start, 3)).' seconds');
+            $this->command->info('- Read: '.$read);
+            $this->command->info('- Updated (active): '.$updated);
+            $this->command->info('- Added (new active, all): '.$added);
+            $this->command->info('- Added (new active, without email): '.$warning);
+            $this->command->info('- Not updated (inactive): '.(Student::count() - $updated - $added));
+            $this->command->info('- Not added/updated (errors or missing information): '.($error));
+
+            // Close file
+            fclose($file);
+        }
+        // File cannot be opened, display error and exit
+        else
+        {
+            $this->command->info('File '.$file_name.' could not be opened. Make sure it is located in the app/database/csv directory of this project.');
+        }
+    
+   
+    
     }
 
 }