Graficas

Las de programa y escuela tienen el query por estudiante dentro del programa y escuela.
Las que tienen curso y actividad, cantidad de estudiantes que intentaron criterios en esas actividades, o en esos cursos, y cuantos pasaron el dominio, como el excel de arlene.

.gitignore

@@ -11,7 +11,7 @@ app/config/packages/*
 app/config/testing/*
 app/config/database.php
 app/config/app.php
-app/config/*
+
 app/storage/annual_pdfs/*
 public/exports/*
 

app/config/app.php

@@ -16,6 +16,7 @@ return array(
 	//'debug' => $_ENV['APP_DEBUG'] ?: false,
 
 	'debug' => true,
+	//'debug' => false,
 	/*
 	|--------------------------------------------------------------------------
 	| Application URL

app/config/auth.php

@@ -0,0 +1,71 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Default Authentication Driver
+	|--------------------------------------------------------------------------
+	|
+	| This option controls the authentication driver that will be utilized.
+	| This driver manages the retrieval and authentication of the users
+	| attempting to get access to protected areas of your application.
+	|
+	| Supported: "database", "eloquent"
+	|
+	*/
+
+	'driver' => 'eloquent',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Authentication Model
+	|--------------------------------------------------------------------------
+	|
+	| When using the "Eloquent" authentication driver, we need to know which
+	| Eloquent model should be used to retrieve your users. Of course, it
+	| is often just the "User" model but you may use whatever you like.
+	|
+	*/
+
+	'model' => 'User',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Authentication Table
+	|--------------------------------------------------------------------------
+	|
+	| When using the "Database" authentication driver, we need to know which
+	| table should be used to retrieve your users. We have chosen a basic
+	| default value but you may easily change it to any table you like.
+	|
+	*/
+
+	'table' => 'users',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Password Reminder Settings
+	|--------------------------------------------------------------------------
+	|
+	| Here you may set the settings for password reminders, including a view
+	| that should be used as your password reminder e-mail. You will also
+	| be able to set the name of the table that holds the reset tokens.
+	|
+	| The "expire" time is the number of minutes that the reminder should be
+	| considered valid. This security feature keeps tokens short-lived so
+	| they have less time to be guessed. You may change this as needed.
+	|
+	*/
+
+	'reminder' => array(
+
+		'email' => 'emails.auth.reminder',
+
+		'table' => 'password_reminders',
+
+		'expire' => 60,
+
+	),
+
+);

app/config/cache.php

@@ -0,0 +1,89 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Default Cache Driver
+	|--------------------------------------------------------------------------
+	|
+	| This option controls the default cache "driver" that will be used when
+	| using the Caching library. Of course, you may use other drivers any
+	| time you wish. This is the default when another is not specified.
+	|
+	| Supported: "file", "database", "apc", "memcached", "redis", "array"
+	|
+	*/
+
+	'driver' => 'file',
+
+	/*
+	|--------------------------------------------------------------------------
+	| File Cache Location
+	|--------------------------------------------------------------------------
+	|
+	| When using the "file" cache driver, we need a location where the cache
+	| files may be stored. A sensible default has been specified, but you
+	| are free to change it to any other place on disk that you desire.
+	|
+	*/
+
+	'path' => storage_path().'/cache',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Database Cache Connection
+	|--------------------------------------------------------------------------
+	|
+	| When using the "database" cache driver you may specify the connection
+	| that should be used to store the cached items. When this option is
+	| null the default database connection will be utilized for cache.
+	|
+	*/
+
+	'connection' => null,
+
+	/*
+	|--------------------------------------------------------------------------
+	| Database Cache Table
+	|--------------------------------------------------------------------------
+	|
+	| When using the "database" cache driver we need to know the table that
+	| should be used to store the cached items. A default table name has
+	| been provided but you're free to change it however you deem fit.
+	|
+	*/
+
+	'table' => 'cache',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Memcached Servers
+	|--------------------------------------------------------------------------
+	|
+	| Now you may specify an array of your Memcached servers that should be
+	| used when utilizing the Memcached cache driver. All of the servers
+	| should contain a value for "host", "port", and "weight" options.
+	|
+	*/
+
+	'memcached' => array(
+
+		array('host' => '127.0.0.1', 'port' => 11211, 'weight' => 100),
+
+	),
+
+	/*
+	|--------------------------------------------------------------------------
+	| Cache Key Prefix
+	|--------------------------------------------------------------------------
+	|
+	| When utilizing a RAM based store such as APC or Memcached, there might
+	| be other applications utilizing the same cache. So, we'll specify a
+	| value to get prefixed to all our keys so we can avoid collisions.
+	|
+	*/
+
+	'prefix' => 'laravel',
+
+);

app/config/compile.php

@@ -0,0 +1,18 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Additional Compiled Classes
+	|--------------------------------------------------------------------------
+	|
+	| Here you may specify additional classes to include in the compiled file
+	| generated by the `artisan optimize` command. These should be classes
+	| that are included on basically every request into the application.
+	|
+	*/
+
+
+
+);

app/config/mail.php

@@ -0,0 +1,124 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Mail Driver
+	|--------------------------------------------------------------------------
+	|
+	| Laravel supports both SMTP and PHP's "mail" function as drivers for the
+	| sending of e-mail. You may specify which one you're using throughout
+	| your application here. By default, Laravel is setup for SMTP mail.
+	|
+	| Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "log"
+	|
+	*/
+
+	'driver' => 'smtp',
+
+	/*
+	|--------------------------------------------------------------------------
+	| SMTP Host Address
+	|--------------------------------------------------------------------------
+	|
+	| Here you may provide the host address of the SMTP server used by your
+	| applications. A default option is provided that is compatible with
+	| the Mailgun mail service which will provide reliable deliveries.
+	|
+	*/
+
+	'host' => 'smtp.gmail.com',
+
+	/*
+	|--------------------------------------------------------------------------
+	| SMTP Host Port
+	|--------------------------------------------------------------------------
+	|
+	| This is the SMTP port used by your application to deliver e-mails to
+	| users of the application. Like the host we have set this value to
+	| stay compatible with the Mailgun e-mail application by default.
+	|
+	*/
+
+	'port' => 465,
+
+	/*
+	|--------------------------------------------------------------------------
+	| Global "From" Address
+	|--------------------------------------------------------------------------
+	|
+	| You may wish for all e-mails sent by your application to be sent from
+	| the same address. Here, you may specify a name and address that is
+	| used globally for all e-mails that are sent by your application.
+	|
+	*/
+
+	'from' => array('address' => 'olas.rrp@upr.edu', 'name' => 'OLAS Mail'),
+
+	/*
+	|--------------------------------------------------------------------------
+	| E-Mail Encryption Protocol
+	|--------------------------------------------------------------------------
+	|
+	| Here you may specify the encryption protocol that should be used when
+	| the application send e-mail messages. A sensible default using the
+	| transport layer security protocol should provide great security.
+	|
+	*/
+
+	'encryption' => 'ssl',
+
+	/*
+	|--------------------------------------------------------------------------
+	| SMTP Server Username
+	|--------------------------------------------------------------------------
+	|
+	| If your SMTP server requires a username for authentication, you should
+	| set it here. This will get used to authenticate with your server on
+	| connection. You may also set the "password" value below this one.
+	|
+	*/
+
+	'username' => 'olas.rrp@upr.edu',
+
+	/*
+	|--------------------------------------------------------------------------
+	| SMTP Server Password
+	|--------------------------------------------------------------------------
+	|
+	| Here you may set the password required by your SMTP server to send out
+	| messages from your application. This will be given to the server on
+	| connection so that the application will be able to send messages.
+	|
+	*/
+
+	'password' => 'rectoria2015',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Sendmail System Path
+	|--------------------------------------------------------------------------
+	|
+	| When using the "sendmail" driver to send e-mails, we will need to know
+	| the path to where Sendmail lives on this server. A default path has
+	| been provided here, which will work well on most of your systems.
+	|
+	*/
+
+	'sendmail' => '/usr/sbin/sendmail -bs',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Mail "Pretend"
+	|--------------------------------------------------------------------------
+	|
+	| When this option is enabled, e-mail will not actually be sent over the
+	| web and will instead be written to your application's logs files so
+	| you may inspect the message. This is great for local development.
+	|
+	*/
+
+	'pretend' => false,
+
+);

app/config/queue.php

@@ -0,0 +1,85 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Default Queue Driver
+	|--------------------------------------------------------------------------
+	|
+	| The Laravel queue API supports a variety of back-ends via an unified
+	| API, giving you convenient access to each back-end using the same
+	| syntax for each one. Here you may set the default queue driver.
+	|
+	| Supported: "sync", "beanstalkd", "sqs", "iron", "redis"
+	|
+	*/
+
+	'default' => 'sync',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Queue Connections
+	|--------------------------------------------------------------------------
+	|
+	| Here you may configure the connection information for each server that
+	| is used by your application. A default configuration has been added
+	| for each back-end shipped with Laravel. You are free to add more.
+	|
+	*/
+
+	'connections' => array(
+
+		'sync' => array(
+			'driver' => 'sync',
+		),
+
+		'beanstalkd' => array(
+			'driver' => 'beanstalkd',
+			'host'   => 'localhost',
+			'queue'  => 'default',
+			'ttr'    => 60,
+		),
+
+		'sqs' => array(
+			'driver' => 'sqs',
+			'key'    => 'your-public-key',
+			'secret' => 'your-secret-key',
+			'queue'  => 'your-queue-url',
+			'region' => 'us-east-1',
+		),
+
+		'iron' => array(
+			'driver'  => 'iron',
+			'host'    => 'mq-aws-us-east-1.iron.io',
+			'token'   => 'your-token',
+			'project' => 'your-project-id',
+			'queue'   => 'your-queue-name',
+			'encrypt' => true,
+		),
+
+		'redis' => array(
+			'driver' => 'redis',
+			'queue'  => 'default',
+		),
+
+	),
+
+	/*
+	|--------------------------------------------------------------------------
+	| Failed Queue Jobs
+	|--------------------------------------------------------------------------
+	|
+	| These options configure the behavior of failed queue job logging so you
+	| can control which database and table are used to store the jobs that
+	| have failed. You may change them to any database / table you wish.
+	|
+	*/
+
+	'failed' => array(
+
+		'database' => 'mysql', 'table' => 'failed_jobs',
+
+	),
+
+);

app/config/remote.php

@@ -0,0 +1,59 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Default Remote Connection Name
+	|--------------------------------------------------------------------------
+	|
+	| Here you may specify the default connection that will be used for SSH
+	| operations. This name should correspond to a connection name below
+	| in the server list. Each connection will be manually accessible.
+	|
+	*/
+
+	'default' => 'production',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Remote Server Connections
+	|--------------------------------------------------------------------------
+	|
+	| These are the servers that will be accessible via the SSH task runner
+	| facilities of Laravel. This feature radically simplifies executing
+	| tasks on your servers, such as deploying out these applications.
+	|
+	*/
+
+	'connections' => array(
+
+		'production' => array(
+			'host'      => '',
+			'username'  => '',
+			'password'  => '',
+			'key'       => '',
+			'keyphrase' => '',
+			'root'      => '/var/www',
+		),
+
+	),
+
+	/*
+	|--------------------------------------------------------------------------
+	| Remote Server Groups
+	|--------------------------------------------------------------------------
+	|
+	| Here you may list connections under a single group name, which allows
+	| you to easily access all of the servers at once using a short name
+	| that is extremely easy to remember, such as "web" or "database".
+	|
+	*/
+
+	'groups' => array(
+
+		'web' => array('production')
+
+	),
+
+);

app/config/services.php

@@ -0,0 +1,31 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Third Party Services
+	|--------------------------------------------------------------------------
+	|
+	| This file is for storing the credentials for third party services such
+	| as Stripe, Mailgun, Mandrill, and others. This file provides a sane
+	| default location for this type of information, allowing packages
+	| to have a conventional place to find your various credentials.
+	|
+	*/
+
+	'mailgun' => array(
+		'domain' => '',
+		'secret' => '',
+	),
+
+	'mandrill' => array(
+		'secret' => '',
+	),
+
+	'stripe' => array(
+		'model'  => 'User',
+		'secret' => '',
+	),
+
+);

app/config/session.php

@@ -0,0 +1,140 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Default Session Driver
+	|--------------------------------------------------------------------------
+	|
+	| This option controls the default session "driver" that will be used on
+	| requests. By default, we will use the lightweight native driver but
+	| you may specify any of the other wonderful drivers provided here.
+	|
+	| Supported: "file", "cookie", "database", "apc",
+	|            "memcached", "redis", "array"
+	|
+	*/
+
+	'driver' => 'file',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Session Lifetime
+	|--------------------------------------------------------------------------
+	|
+	| Here you may specify the number of minutes that you wish the session
+	| to be allowed to remain idle before it expires. If you want them
+	| to immediately expire on the browser closing, set that option.
+	|
+	*/
+
+	'lifetime' => 120,
+
+	'expire_on_close' => false,
+
+	/*
+	|--------------------------------------------------------------------------
+	| Session File Location
+	|--------------------------------------------------------------------------
+	|
+	| When using the native session driver, we need a location where session
+	| files may be stored. A default has been set for you but a different
+	| location may be specified. This is only needed for file sessions.
+	|
+	*/
+
+	'files' => storage_path().'/sessions',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Session Database Connection
+	|--------------------------------------------------------------------------
+	|
+	| When using the "database" or "redis" session drivers, you may specify a
+	| connection that should be used to manage these sessions. This should
+	| correspond to a connection in your database configuration options.
+	|
+	*/
+
+	'connection' => null,
+
+	/*
+	|--------------------------------------------------------------------------
+	| Session Database Table
+	|--------------------------------------------------------------------------
+	|
+	| When using the "database" session driver, you may specify the table we
+	| should use to manage the sessions. Of course, a sensible default is
+	| provided for you; however, you are free to change this as needed.
+	|
+	*/
+
+	'table' => 'sessions',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Session Sweeping Lottery
+	|--------------------------------------------------------------------------
+	|
+	| Some session drivers must manually sweep their storage location to get
+	| rid of old sessions from storage. Here are the chances that it will
+	| happen on a given request. By default, the odds are 2 out of 100.
+	|
+	*/
+
+	'lottery' => array(2, 100),
+
+	/*
+	|--------------------------------------------------------------------------
+	| Session Cookie Name
+	|--------------------------------------------------------------------------
+	|
+	| Here you may change the name of the cookie used to identify a session
+	| instance by ID. The name specified here will get used every time a
+	| new session cookie is created by the framework for every driver.
+	|
+	*/
+
+	'cookie' => 'olas_session',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Session Cookie Path
+	|--------------------------------------------------------------------------
+	|
+	| The session cookie path determines the path for which the cookie will
+	| be regarded as available. Typically, this will be the root path of
+	| your application but you are free to change this when necessary.
+	|
+	*/
+
+	'path' => '/',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Session Cookie Domain
+	|--------------------------------------------------------------------------
+	|
+	| Here you may change the domain of the cookie used to identify a session
+	| in your application. This will determine which domains the cookie is
+	| available to in your application. A sensible default has been set.
+	|
+	*/
+
+	'domain' => null,
+
+	/*
+	|--------------------------------------------------------------------------
+	| HTTPS Only Cookies
+	|--------------------------------------------------------------------------
+	|
+	| By setting this option to true, session cookies will only be sent back
+	| to the server if the browser has a HTTPS connection. This will keep
+	| the cookie from being sent to you if it can not be done securely.
+	|
+	*/
+
+	'secure' => false,
+
+);

app/config/view.php

@@ -0,0 +1,31 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| View Storage Paths
+	|--------------------------------------------------------------------------
+	|
+	| Most templating systems load templates from disk. Here you may specify
+	| an array of paths that should be checked for your views. Of course
+	| the usual Laravel view path has already been registered for you.
+	|
+	*/
+
+	'paths' => array(__DIR__.'/../views'),
+
+	/*
+	|--------------------------------------------------------------------------
+	| Pagination View
+	|--------------------------------------------------------------------------
+	|
+	| This view will be used to render the pagination link output, and can
+	| be easily customized here to show any view you like. A clean view
+	| compatible with Twitter's Bootstrap is given to you by default.
+	|
+	*/
+
+	'pagination' => 'pagination::slider-3',
+
+);

app/config/workbench.php

@@ -0,0 +1,31 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Workbench Author Name
+	|--------------------------------------------------------------------------
+	|
+	| When you create new packages via the Artisan "workbench" command your
+	| name is needed to generate the composer.json file for your package.
+	| You may specify it now so it is used for all of your workbenches.
+	|
+	*/
+
+	'name' => '',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Workbench Author E-Mail Address
+	|--------------------------------------------------------------------------
+	|
+	| Like the option above, your e-mail address is used when generating new
+	| workbench packages. The e-mail is placed in your composer.json file
+	| automatically after the package is created by the workbench tool.
+	|
+	*/
+
+	'email' => '',
+
+);

app/controllers/AgreementController.php

@@ -1,6 +1,7 @@
 <?php
 
-class AgreementController extends \BaseController {
+class AgreementController extends \BaseController
+{
 
 	/**
 	 * Display a listing of the resource.
@@ -10,9 +11,9 @@ class AgreementController extends \BaseController {
 	public function index()
 	{
 		//
-			$user = Auth::user();
+		$user = Auth::user();
 		$title = "Agreement";
-	return View::make('global.agreement',compact( 'title', 'user'));
+		return View::make('global.agreement', compact('title', 'user'));
 	}
 
 
@@ -23,33 +24,29 @@ class AgreementController extends \BaseController {
 	 */
 	public function agree()
 	{
-// 		var_dump(Input::get('submitbutton'));exit();
-		if(Input::get('submitbutton')=="Agree")
-		{
+		// 		var_dump(Input::get('submitbutton'));exit();
+		if (Input::get('submitbutton') == "Agree") {
 			switch (Auth::user()->role) {
-		case 1:
-			return Redirect::intended('administrator');
-			break;
-
-		case 2:
-			return Redirect::intended('school-coordinator');
-			break;
-
-		case 3:
-			return Redirect::intended('program-coordinator');
-			break;
-
-		case 4:
-			return Redirect::intended('professor');
-			break;
-		}
-		}
-		else
-		{
+				case 1:
+					return Redirect::intended('administrator');
+					break;
+
+				case 2:
+					return Redirect::intended('school/' . Auth::user()->school->id);
+					break;
+
+				case 3:
+					return Redirect::intended('program-coordinator');
+					break;
+
+				case 4:
+					return Redirect::intended('professor');
+					break;
+			}
+		} else {
 			return Redirect::intended('logout');
-
 		}
-	
+
 
 		//
 	}
@@ -112,6 +109,4 @@ class AgreementController extends \BaseController {
 	{
 		//
 	}
-
-
-}
+}

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/CoursesController.php

@@ -589,6 +589,7 @@ CoursesController extends \BaseController
         $grouped_courses = Course::where('code', $code)
             ->where('number', $number)
             ->where('semester_id', $semester->id)
+            ->select("courses.*", DB::raw("1 as grouped"))
             ->groupBy(array('code', 'number'))->get();
 
         //         Log::info($grouped_courses[0]->id);
@@ -600,15 +601,19 @@ CoursesController extends \BaseController
             ->first();
 
         $outcomes = Outcome::active_by_semesters(array($semester), $level->is_graduate);
+        $outcomeCount = count((array)$outcomes);
+
+
+        foreach ($outcomes as $outcome) {
+            $outcomes_attempted[$outcome->id] = 0;
+            $outcomes_achieved[$outcome->id] = 0;
+        }
 
 
         //         $outcomes = Outcome::orderBy('name', 'asc')->get();
-        $outcomeCount = Outcome::all()->count();
+
 
         foreach ($grouped_courses as $index => $grouped_course) {
-            // Blank outcomes for one course
-            $outcomes_achieved = array_fill(1, $outcomeCount, 0);
-            $outcomes_attempted = array_fill(1, $outcomeCount, 0);
 
             // Find sections for this course
             $sections = Course::where('code', $grouped_course->code)
@@ -616,6 +621,15 @@ CoursesController extends \BaseController
                 ->where('semester_id', $grouped_course->semester_id)
                 ->get();
 
+
+            $results = $grouped_course->student_report_for_outcome;
+            // Log::info($results);
+            foreach ($outcomes as $outcome) {
+                $outcomes_attempted[$outcome->id] += isset($results[$outcome->id]) ? $results[$outcome->id]['calculations']['student_attempted'] : 0;
+                $outcomes_achieved[$outcome->id] +=  isset($results[$outcome->id]) ? $results[$outcome->id]['calculations']['student_achieved'] : 0;
+            }
+            /*
+
             // For each of the sections, add the attempted and achieved criteria per outcome
             foreach ($sections as &$section) {
                 if ($section->outcomes_ach()) {
@@ -644,6 +658,8 @@ CoursesController extends \BaseController
                 //                 }
             }
         }
+        */
+        }
 
         $section_ids = Course::where('code', $code)
             ->where('number', $number)

app/controllers/ProfessorsController.php

@@ -33,6 +33,8 @@ class ProfessorsController extends \BaseController
 
 
 
+
+
         foreach ($grouped_courses as $index => $grouped_course) {
             // Blank outcomes for one course
 
@@ -42,6 +44,11 @@ class ProfessorsController extends \BaseController
             $outcomes_achieved = [];
             $outcomes_attempted = [];
 
+            foreach ($outcomes as $outcome) {
+                $outcomes_achieved[$outcome->id] = 0;
+                $outcomes_attempted[$outcome->id] = 0;
+            }
+
             // Find sections belonging to user with identifier of one course
             $sections = Course::with('program')
                 ->where('user_id', Auth::user()->id)
@@ -51,9 +58,17 @@ class ProfessorsController extends \BaseController
                 ->where('semester_id', $grouped_course->semester_id)
                 ->get();
 
+            $results = $grouped_course->student_report_for_outcome;
+            Log::info($results);
+            foreach ($outcomes as $outcome) {
+                $outcomes_attempted[$outcome->id] += isset($results[$outcome->id]) ? $results[$outcome->id]['calculations']['student_attempted'] : 0;
+                $outcomes_achieved[$outcome->id] +=  isset($results[$outcome->id]) ? $results[$outcome->id]['calculations']['student_achieved'] : 0;
+            }
+
             // 			        Log::info($sections);
 
             // For each of the professor's course sections, add the attempted and achieved criteria per outcome
+            /*
             foreach ($sections as $section) {
 
                 $section_outcomes_achieved = $section->outcomes_ach();
@@ -85,7 +100,7 @@ class ProfessorsController extends \BaseController
                         //$outcomes_attempted[$outcome_id] += $section_outcomes_attempted[$outcome_id];
                     }
                 }
-            }
+            }*/
 
             $grouped_outcomes_achieved_results[] = $outcomes_achieved;
             $grouped_outcomes_attempted_results[] = $outcomes_attempted;
@@ -113,8 +128,20 @@ class ProfessorsController extends \BaseController
         $outcomeCount = count($outcomes);
         $outcomes_achieved = [];
         $outcomes_attempted = [];
+        $program_outcomes_achieved = [];
+        $program_outcomes_attempted = [];
 
-        Log::info($program_courses);
+        //Log::info($program_courses);
+
+        foreach ($outcomes as $outcome) {
+            $outcomes_achieved[$outcome->id] = 0;
+            $outcomes_attempted[$outcome->id] = 0;
+            $program_outcomes_achieved[$outcome->id] = 0;
+            $program_outcomes_attempted[$outcome->id] = 0;
+        }
+
+        $program_outcomes_attempted = $program->program_students_per_outcome['program_info']['outcomes_attempted_combined'];
+        $program_outcomes_achieved = $program->program_students_per_outcome['program_info']['outcomes_achieved_combined'];
 
         /*
         foreach ($program_courses as $course) {
@@ -151,6 +178,21 @@ class ProfessorsController extends \BaseController
                     $outcomes_attempted[$outcome] += $outcome_score['calculations']['student_attempted'];
                 else $outcomes_attempted[$outcome] = $outcome_score['calculations']['student_attempted'];
             }
+            /*
+            $course->with_program_report = 1;
+
+            $stu_ach = $course->student_report_for_outcome;
+
+
+            foreach ($stu_ach as $outcome => $outcome_score) {
+                if (array_key_exists($outcome, $program_outcomes_achieved))
+                    $program_outcomes_achieved[$outcome] += $outcome_score['calculations']['student_achieved'];
+                else $program_outcomes_achieved[$outcome] = $outcome_score['calculations']['student_achieved'];
+
+                if (array_key_exists($outcome, $program_outcomes_attempted))
+                    $program_outcomes_attempted[$outcome] += $outcome_score['calculations']['student_attempted'];
+                else $program_outcomes_attempted[$outcome] = $outcome_score['calculations']['student_attempted'];
+            }*/
         }
 
 
@@ -167,7 +209,7 @@ class ProfessorsController extends \BaseController
             ->where('program_id', $program->id)
             ->get();
 
-        return View::make('local.professors.program', compact('title', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'scoords', 'pcoords'));
+        return View::make('local.professors.program', compact('title', 'outcomes', 'program_outcomes_achieved', 'program_outcomes_attempted', 'outcomes_attempted', 'program', 'outcomes_achieved', 'scoords', 'pcoords'));
     }
 
 

app/controllers/ProgramCoordinatorsController.php

@@ -76,8 +76,23 @@ class ProgramCoordinatorsController extends \BaseController
 
       $program_array['outcomes_achieved'] = [];
       $program_array['outcomes_attempted'] = [];
+
+      $program_array['program_outcomes_achieved'] = [];
+      $program_array['program_outcomes_attempted'] = [];
       //Log::info($program_array);
 
+      foreach ($outcomes as $outcome) {
+        $program_array['outcomes_achieved'][$outcome->id] = 0;
+        $program_array['outcomes_attempted'][$outcome->id] = 0;
+        $program_array['program_outcomes_achieved'][$outcome->id] = 0;
+        $program_array['program_outcomes_attempted'][$outcome->id] = 0;
+      }
+
+      $program_array['program_outcomes_achieved']  = $program->program_students_per_outcome['program_info']['outcomes_achieved_combined'];
+      $program_array['program_outcomes_attempted'] = $program->program_students_per_outcome['program_info']['outcomes_attempted_combined'];
+
+
+
       $program_array['program_courses'] = $program->courses;
 
 
@@ -95,6 +110,20 @@ class ProgramCoordinatorsController extends \BaseController
             if (array_key_exists($outcome_id, $program_array['outcomes_achieved']))  $program_array['outcomes_achieved'][$outcome_id] += $student_report[$outcome_id]['calculations']['student_achieved'];
             else $program_array['outcomes_achieved'][$outcome_id] = $student_report[$outcome_id]['calculations']['student_achieved'];
           }
+          /*
+
+          $course->with_program_report = 1;
+
+          $program_student_report = $course->student_report_for_outcome;
+
+          foreach ($program_student_report as $outcome_id => $score) {
+            if (array_key_exists($outcome_id, $program_array['program_outcomes_attempted']))  $program_array['program_outcomes_attempted'][$outcome_id] += $program_student_report[$outcome_id]['calculations']['student_attempted'];
+            else $program_array['program_outcomes_attempted'][$outcome_id] = $program_student_report[$outcome_id]['calculations']['student_attempted'];
+
+            if (array_key_exists($outcome_id, $program_array['program_outcomes_achieved']))  $program_array['program_outcomes_achieved'][$outcome_id] += $program_student_report[$outcome_id]['calculations']['student_achieved'];
+            else $program_array['program_outcomes_achieved'][$outcome_id] = $program_student_report[$outcome_id]['calculations']['student_achieved'];
+          } */
+
 
 
           $program_array['assessed_courses_count'] += 1;
@@ -102,6 +131,8 @@ class ProgramCoordinatorsController extends \BaseController
       }
 
 
+
+
       /*foreach ($programs as $program) {
       //Log::info($program);
       $program_array = array();
@@ -189,7 +220,9 @@ class ProgramCoordinatorsController extends \BaseController
         ->orderBy('number')
         ->orderBy('semester_id')
         ->get();
-      //Log::info($program_array);
+
+
+      $program_array['linea_de_graph'] = $program->expected_outcome_target;
       $programs_array[] = $program_array;
 
 

app/controllers/ProgramsController.php

@@ -11,8 +11,8 @@ class ProgramsController extends \BaseController
   {
 
     $program = Program::find($id);
-    Log::info(debug_backtrace()[1]['function']);
-    Log::info($program);
+    //Log::info(debug_backtrace()[1]['function']);
+    // Log::info($program);
     $title = $program->school->name . ': ' . $program->name;
     $program_courses = $program->courses;
     //     $outcomes = Outcome::orderBy('name', 'asc')->get();
@@ -54,10 +54,35 @@ class ProgramsController extends \BaseController
       })
       ->count();
 
+
+    $outcomes_attempted = [];
+    $outcomes_achieved = [];
+
+    $program_info = $program->program_students_per_outcome;
+
+    $outcomes_attempted = $program_info['program_info']['outcomes_attempted_combined'];
+    $outcomes_achieved = $program_info['program_info']['outcomes_achieved_combined'];
+    /*
     foreach ($outcomes as $outcome) {
-      $outcomes_attempted[$outcome->id] = $program->attempted_outcome($outcome->id, $selected_semesters);
-      if ($outcomes_attempted[$outcome->id]) $outcomes_achieved[$outcome->id] = $program->achieved_outcome($outcome->id, $selected_semesters);
+      $outcomes_attempted[$outcome->id] = 0;
+      $outcomes_achieved[$outcome->id] = 0;
+    }
+
+
+    //foreach ($outcomes as $outcome) {
+    //  $outcomes_attempted[$outcome->id] = $program->attempted_outcome($outcome->id, $selected_semesters);
+    //  if ($outcomes_attempted[$outcome->id]) $outcomes_achieved[$outcome->id] = $program->achieved_outcome($outcome->id, $selected_semesters);
+    //}
+
+    foreach ($program->courses as $course) {
+      $results = $course->student_report_for_outcome;
+      //Log::info($results);
+      foreach ($outcomes as $outcome) {
+        $outcomes_attempted[$outcome->id] += isset($results[$outcome->id]) ? $results[$outcome->id]['calculations']['student_attempted'] : 0;
+        $outcomes_achieved[$outcome->id] +=  isset($results[$outcome->id]) ? $results[$outcome->id]['calculations']['student_achieved'] : 0;
+      }
     }
+    */
 
     foreach ($outcomes as $outcome) {
       $assessed_courses[$outcome->id] = DB::table('activity_criterion')
@@ -668,15 +693,56 @@ class ProgramsController extends \BaseController
     $outcomes_achieved = [];
     $outcomes_attempted = [];
 
+    $program_outcomes_attempted = [];
+    $program_outcomes_achieved = [];
+
     // 	Log::info($program_courses);
     foreach ($outcomes as $outcome) {
       $outcomes_attempted[$outcome->id] = 0;
       $outcomes_achieved[$outcome->id] = 0;
+      $program_outcomes_attempted[$outcome->id] = 0;
+      $program_outcomes_achieved[$outcome->id] = 0;
     }
 
     $assessed_courses_count = 0;
+
+    $program_outcomes_attempted = $program->program_students_per_outcomes['program_info']['outcomes_attempted_combined'];
+    $program_outcomes_achieved = $program->program_students_per_outcomes['program_info']['outcomes_achieved_combined'];
+
+
     foreach ($program_courses as $course) {
 
+
+      $student_report = $course->student_report_for_outcome;
+
+      if ($student_report) {
+
+        foreach ($student_report as $outcome_id => $score) {
+          if (array_key_exists($outcome_id, $outcomes_attempted))  $outcomes_attempted[$outcome_id] += $student_report[$outcome_id]['calculations']['student_attempted'];
+          else $outcomes_attempted[$outcome_id] = $student_report[$outcome_id]['calculations']['student_attempted'];
+
+          if (array_key_exists($outcome_id, $outcomes_achieved))  $outcomes_achieved[$outcome_id] += $student_report[$outcome_id]['calculations']['student_achieved'];
+          else $outcomes_achieved[$outcome_id] = $student_report[$outcome_id]['calculations']['student_achieved'];
+        }
+      }
+      /*
+      $course->with_program_report = 1;
+      $student_report = $course->student_report_for_outcome;
+
+      if ($student_report) {
+
+        foreach ($student_report as $outcome_id => $score) {
+          if (array_key_exists($outcome_id, $program_outcomes_attempted))  $program_outcomes_attempted[$outcome_id] += $student_report[$outcome_id]['calculations']['student_attempted'];
+          else $program_outcomes_attempted[$outcome_id] = $student_report[$outcome_id]['calculations']['student_attempted'];
+
+          if (array_key_exists($outcome_id, $program_outcomes_achieved))  $program_outcomes_achieved[$outcome_id] += $student_report[$outcome_id]['calculations']['student_achieved'];
+          else $program_outcomes_achieved[$outcome_id] = $student_report[$outcome_id]['calculations']['student_achieved'];
+        }
+      }
+
+*/
+
+      /*
       if ($course->outcomes_att()) {
         $course_outcomes_attempted = $course->outcomes_att();
         foreach ($course_outcomes_attempted as $outcome => $score) {
@@ -696,6 +762,7 @@ class ProgramsController extends \BaseController
           else $outcomes_achieved[$outcome] = $score;
         }
       }
+      */
     }
 
 
@@ -848,7 +915,7 @@ class ProgramsController extends \BaseController
     $programs_contact[] = $users;
 
 
-    return View::make('local.managers.shared.print_program', compact('title', 'program', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'schools', 'program_courses', 'assessed_courses_count', 'grouped_courses'));
+    return View::make('local.managers.shared.print_program', compact('title', 'program_outcomes_achieved', 'program_outcomes_attempted', 'program', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'schools', 'program_courses', 'assessed_courses_count', 'grouped_courses'));
   }
 
 

app/controllers/SchoolCoordinatorsController.php

@@ -400,6 +400,8 @@ class SchoolCoordinatorsController extends \BaseController
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
             }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
         }
+
+
         if ($school->id == 13) {
             //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));

app/controllers/SchoolsController.php

@@ -1,5 +1,7 @@
 <?php
 
+use PhpOffice\PhpWord\Element\Object;
+
 class SchoolsController extends \BaseController
 {
 
@@ -38,10 +40,10 @@ class SchoolsController extends \BaseController
         $outcomes_grad = Outcome::active_by_semesters($semesters, 1);
         $outcomes_undergrad = Outcome::active_by_semesters($semesters, 0);
 
-        $undergrad_stu_outcome_attempted = [];
-        $grad_stu_outcome_attempted = [];
-        $undergrad_stu_outcome_achieved = [];
-        $grad_stu_outcome_achieved = [];
+        //$undergrad_stu_outcome_attempted = [];
+        //$grad_stu_outcome_attempted = [];
+        //$undergrad_stu_outcome_achieved = [];
+        //$grad_stu_outcome_achieved = [];
 
         $attemptedUndergradProgramsPerOutcome = [];
         $achievedUndergradProgramsPerOutcome = [];
@@ -49,19 +51,20 @@ class SchoolsController extends \BaseController
         $achievedGradProgramsPerOutcome = [];
 
         foreach ($outcomes_undergrad as $outcome) {
-            $undergrad_stu_outcome_attempted[$outcome->id] = 0;
-            $undergrad_stu_outcome_achieved[$outcome->id] = 0;
+            //$undergrad_stu_outcome_attempted[$outcome->id] = 0;
+            //$undergrad_stu_outcome_achieved[$outcome->id] = 0;
             $attemptedUndergradProgramsPerOutcome[$outcome->id] = [];
             $achievedUndergradProgramsPerOutcome[$outcome->id] = [];
         }
 
         foreach ($outcomes_grad as $outcome) {
-            $grad_stu_outcome_attempted[$outcome->id] = 0;
-            $grad_stu_outcome_achieved[$outcome->id] = 0;
+            //$grad_stu_outcome_attempted[$outcome->id] = 0;
+            //$grad_stu_outcome_achieved[$outcome->id] = 0;
             $attemptedGradProgramsPerOutcome[$outcome->id] = [];
             $achievedGradProgramsPerOutcome[$outcome->id] = [];
         }
 
+
         /**
          * List of grouped courses (grouped sections)
          */
@@ -101,7 +104,7 @@ class SchoolsController extends \BaseController
             ->orderBy('name', 'ASC')
             ->lists('id');
 
-
+        /*
         $undergraduate_student_query = DB::table("courses")
             ->join('activities', 'activities.course_id', '=', 'courses.id')
             ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
@@ -125,7 +128,7 @@ class SchoolsController extends \BaseController
             ->get();
 
 
-        Log::info($undergraduate_student_query);
+        //Log::info($undergraduate_student_query);
 
         $grad_student_query = DB::table("courses")
             ->join('activities', 'activities.course_id', '=', 'courses.id')
@@ -148,75 +151,19 @@ class SchoolsController extends \BaseController
             ->addSelect('outcome_id')
             ->groupBy(array('students.id', 'outcome_id'))
             ->get();
-
+*/
         //school
 
 
 
-        /*
-            student x, crit achieved, crit attempted, outcome 1
-            student x, crit achieved, crit attempted, outcome 2
-            student x, crit achieved, crit attempted, outcome 3
-            student x, crit achieved, crit attempted, outcome 4
-            student y, crit achieved, crit attempted, outcome 1
-            student y, crit achieved, crit attempted, outcome 2
-            student y, crit achieved, crit attempted, outcome 3
-            ....
-            
-
-            */
-
-        $grad_outcomes_attempted = [];
-        $grad_outcomes_achieved = [];
-        $undergrad_outcomes_attempted = [];
-        $undergrad_outcomes_achieved = [];
-
-        foreach ($outcomes_grad as $outcome) {
-            $grad_outcomes_attempted[$outcome->id] = 0;
-            $grad_outcomes_achieved[$outcome->id] = 0;
-        }
-
-        foreach ($outcomes_undergrad as $outcome) {
-            $undergrad_outcomes_attempted[$outcome->id] = 0;
-            $undergrad_outcomes_achieved[$outcome->id] = 0;
-        }
-
-        foreach ($grad_student_query as $result) {
-            if ($result->criteria_attempted != 0) {
-                if (!isset($grad_outcomes_attempted[$result->outcome_id]))
-                    continue;
-
-                $grad_outcomes_attempted[$result->outcome_id]++;
-
-                $percent = $result->criteria_achieved / $result->criteria_attempted * 100;
-
-                if ($percent >= 66.66) {
-
-
-                    $grad_outcomes_achieved[$result->outcome_id]++;
-                }
-            }
-        }
-
-
-
 
-        foreach ($undergraduate_student_query as $result) {
-            if ($result->criteria_attempted != 0) {
-                if (!isset($undergrad_outcomes_attempted[$result->outcome_id]))
-                    continue;
 
-                $undergrad_outcomes_attempted[$result->outcome_id]++;
-
-                $percent = $result->criteria_achieved / $result->criteria_attempted * 100;
+        $school_info = $school->school_students_per_outcome;
+        $grad_outcomes_attempted = $school_info['graduate_info']['outcomes_attempted_combined'];
+        $grad_outcomes_achieved = $school_info['graduate_info']['outcomes_achieved_combined'];
 
-                if ($percent >= 66.66) {
-
-
-                    $undergrad_outcomes_achieved[$result->outcome_id]++;
-                }
-            }
-        }
+        $undergrad_outcomes_attempted = $school_info['undergraduate_info']['outcomes_attempted_combined'];
+        $undergrad_outcomes_achieved = $school_info['undergraduate_info']['outcomes_achieved_combined'];
 
         $grad_grouped_courses = Course::
             //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
@@ -302,6 +249,7 @@ class SchoolsController extends \BaseController
         //asi que lo que esta haciendo es, prog 1, y coge los dominios y estudiantes que evaluason
 
 
+
         $undergrad_prog_attempted =  DB::table("courses")
             ->join('activities', 'activities.course_id', '=', 'courses.id')
             ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
@@ -468,12 +416,79 @@ class SchoolsController extends \BaseController
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
             }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
         }*/
+
+
+        //La linea negra de proposed.
+
+        //
+        $linea_undergrad = DB::table('target_outcomes_program')
+            ->join('programs', 'programs.id', '=', 'target_outcomes_program.program_id')
+            ->join('semesters', 'semesters.id', '=', 'target_outcomes_program.semester_id')
+            ->whereIn('program_id', $undergrad_programs_list)
+            ->whereIn("semester_id", Session::get('semesters_ids'))
+            ->select("target_outcomes_program.*", 'programs.name as program_name', 'semesters.name as semester_name')
+            ->addSelect(DB::raw("count(target_outcomes_program.semester_id) as count_semester_id"))
+            ->groupBy("expected_target")
+            ->orderBy("expected_target", "DESC")
+            ->first();
+        if (!isset($linea_undergrad)) {
+            $default_undergrad = 70;
+        } elseif ($linea_undergrad->count_semester_id > 1) {
+
+            $default_undergrad = null;
+
+            $linea_undergrad = DB::table('target_outcomes_program')
+                ->join('programs', 'programs.id', '=', 'target_outcomes_program.program_id')
+                ->join('semesters', 'semesters.id', '=', 'target_outcomes_program.semester_id')
+                ->whereIn('program_id', $undergrad_programs_list)
+                ->where('expected_target', $linea_undergrad->expected_target)
+                ->whereIn("semester_id", Session::get('semesters_ids'))
+                ->select("target_outcomes_program.*", 'programs.name as program_name', 'semesters.name as semester_name')
+                //->addSelect("count(semester_id) as count_semester_id")
+                //->groupBy("expected_target")
+                ->orderBy("semester_id", "DESC")
+                ->first();
+        }
+
+        $linea_grad = DB::table('target_outcomes_program')
+            ->join('programs', 'programs.id', '=', 'target_outcomes_program.program_id')
+            ->join('semesters', 'semesters.id', '=', 'target_outcomes_program.semester_id')
+            ->whereIn('program_id', $grad_programs_list)
+            ->whereIn("semester_id", Session::get('semesters_ids'))
+            ->select("target_outcomes_program.*", 'programs.name as program_name', 'semesters.name as semester_name')
+            ->addSelect(DB::raw("count(target_outcomes_program.semester_id) as count_semester_id"))
+            ->groupBy("expected_target")
+            ->orderBy("expected_target", "DESC")
+            ->first();
+        Log::info($linea_grad);
+        if (!isset($linea_grad)) {
+            $default_grad = 70;
+        } elseif ($linea_grad->count_semester_id > 1) {
+
+            $default_grad = null;
+
+            $linea_grad = DB::table('target_outcomes_program')
+                ->join('programs', 'programs.id', '=', 'target_outcomes_program.program_id')
+                ->join('semesters', 'semesters.id', '=', 'target_outcomes_program.semester_id')
+                ->whereIn('program_id', $grad_programs_list)
+                ->where('expected_target', $linea_grad->expected_target)
+                ->whereIn("semester_id", Session::get('semesters_ids'))
+                ->select("target_outcomes_program.*", 'programs.name as program_name', 'semesters.name as semester_name')
+                ->orderBy("semester_id", "DESC")
+                ->first();
+        }
+
+        Log::info($default_grad);
+
+
+
+
         if ($school->id == 13) {
             //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
-            return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
+            return View::make('local.managers.shared.school-uhs', compact('title', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
         } else {
             //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
-            return View::make('local.managers.shared.school', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
+            return View::make('local.managers.shared.school', compact('title',  'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
         }
     }
 
@@ -502,6 +517,9 @@ class SchoolsController extends \BaseController
             $programs_name[$program->id] = $program->name;
         }
 
+        $school->school_students_per_outcome;
+
+
         $grouped_courses = Course::
             //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
             select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
@@ -1025,6 +1043,39 @@ class SchoolsController extends \BaseController
         $outcomes = Outcome::orderBy('name', 'asc')->get();
         $outcomeCount = Outcome::all()->count();
 
+        $semesters = Semester::whereIn('id', Session::get('semesters_ids'))->get();
+
+
+        $outcomes_grad = Outcome::active_by_semesters($semesters, 1);
+        $outcomes_undergrad = Outcome::active_by_semesters($semesters, 0);
+
+        $undergrad_stu_outcome_attempted = [];
+        $grad_stu_outcome_attempted = [];
+        $undergrad_stu_outcome_achieved = [];
+        $grad_stu_outcome_achieved = [];
+
+        $attemptedUndergradProgramsPerOutcome = [];
+        $achievedUndergradProgramsPerOutcome = [];
+        $attemptedGradProgramsPerOutcome = [];
+        $achievedGradProgramsPerOutcome = [];
+
+        foreach ($outcomes_undergrad as $outcome) {
+            $undergrad_stu_outcome_attempted[$outcome->id] = 0;
+            $undergrad_stu_outcome_achieved[$outcome->id] = 0;
+            $attemptedUndergradProgramsPerOutcome[$outcome->id] = [];
+            $achievedUndergradProgramsPerOutcome[$outcome->id] = [];
+        }
+
+        foreach ($outcomes_grad as $outcome) {
+            $grad_stu_outcome_attempted[$outcome->id] = 0;
+            $grad_stu_outcome_achieved[$outcome->id] = 0;
+            $attemptedGradProgramsPerOutcome[$outcome->id] = [];
+            $achievedGradProgramsPerOutcome[$outcome->id] = [];
+        }
+
+
+
+
 
 
 
@@ -1034,6 +1085,425 @@ class SchoolsController extends \BaseController
 
         $program_ids = $school->programs->lists('id');
 
+
+        $undergrad_programs = DB::table('programs')
+            ->select('id', 'name', 'school_id', 'is_graduate')
+            ->where('is_graduate', '=', 0)
+            ->where('school_id', '=', $id)
+            ->orderBy('name', 'ASC')
+            ->get();
+
+
+
+        $grad_programs = DB::table('programs')
+            ->select('id', 'name', 'school_id', 'is_graduate')
+            ->where('is_graduate', '=', 1)
+            ->where('school_id', '=', $id)
+            ->orderBy('name', 'ASC')
+            ->get();
+
+
+        //quiero ver si monto el query tm aqui
+
+        $undergrad_programs_list = DB::table('programs')
+            ->select('id', 'name', 'school_id', 'is_graduate')
+            ->where('is_graduate', '=', 0)
+            ->where('school_id', '=', $id)
+            ->orderBy('name', 'ASC')
+            ->lists('id');
+
+        $grad_programs_list = DB::table('programs')
+            ->select('id', 'name', 'school_id', 'is_graduate')
+            ->where('is_graduate', '=', 1)
+            ->where('school_id', '=', $id)
+            ->orderBy('name', 'ASC')
+            ->lists('id');
+
+        /*
+
+        $undergraduate_student_query = DB::table("courses")
+            ->join('activities', 'activities.course_id', '=', 'courses.id')
+            ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+            ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+            ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+            ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+            ->join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'activity_criterion.criterion_id')
+            ->join('program_criterion_objective_outcome as poco', function ($q) {
+                $q->on('courses.program_id', '=', 'poco.program_id')
+                    ->on('cobo.id', '=', 'poco.cri_obj_out_id');
+            })
+            ->join('students', 'students.id', '=', 'assessments.student_id')
+            ->whereIn('poco.program_id',  $undergrad_programs_list)
+            ->whereIn("courses.semester_id", Session::get('semesters_ids'))
+            ->whereIn('courses.program_id',  $undergrad_programs_list)
+            ->select('students.number as student_id')
+            ->addSelect(DB::raw('count(assessments.activity_criterion_id) as criteria_attempted'))
+            ->addSelect(DB::raw('count(case when assessments.score>=rubrics.expected_points then 1 else NULL end) as criteria_achieved'))
+            ->addSelect('outcome_id')
+            ->groupBy(array('students.id', 'outcome_id'))
+            ->get();
+
+
+        //Log::info($undergraduate_student_query);
+
+        $grad_student_query = DB::table("courses")
+            ->join('activities', 'activities.course_id', '=', 'courses.id')
+            ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+            ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+            ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+            ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+            ->join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'activity_criterion.criterion_id')
+            ->join('program_criterion_objective_outcome as poco', function ($q) {
+                $q->on('courses.program_id', '=', 'poco.program_id')
+                    ->on('cobo.id', '=', 'poco.cri_obj_out_id');
+            })
+            ->join('students', 'students.id', '=', 'assessments.student_id')
+            ->whereIn('poco.program_id',  $grad_programs_list)
+            ->whereIn("courses.semester_id", Session::get('semesters_ids'))
+            ->whereIn('courses.program_id',  $grad_programs_list)
+            ->select('students.number as student_id')
+            ->addSelect(DB::raw('count(assessments.activity_criterion_id) as criteria_attempted'))
+            ->addSelect(DB::raw('count(case when assessments.score>=rubrics.expected_points then 1 else NULL end) as criteria_achieved'))
+            ->addSelect('outcome_id')
+            ->groupBy(array('students.id', 'outcome_id'))
+            ->get();
+
+            */
+
+        //school
+
+
+
+        /*
+            student x, crit achieved, crit attempted, outcome 1
+            student x, crit achieved, crit attempted, outcome 2
+            student x, crit achieved, crit attempted, outcome 3
+            student x, crit achieved, crit attempted, outcome 4
+            student y, crit achieved, crit attempted, outcome 1
+            student y, crit achieved, crit attempted, outcome 2
+            student y, crit achieved, crit attempted, outcome 3
+            ....
+            
+
+            */
+        $grad_outcomes_attempted = [];
+        $grad_outcomes_achieved = [];
+        $undergrad_outcomes_attempted = [];
+        $undergrad_outcomes_achieved = [];
+
+
+        $school_info = $school->school_students_per_outcome;
+        $grad_outcomes_attempted = $school_info['graduate_info']['outcomes_attempted_combined'];
+        $grad_outcomes_achieved = $school_info['graduate_info']['outcomes_achieved_combined'];
+
+        $undergrad_outcomes_attempted = $school_info['undergraduate_info']['outcomes_attempted_combined'];
+        $undergrad_outcomes_achieved = $school_info['undergraduate_info']['outcomes_achieved_combined'];
+
+
+
+
+
+        /*
+
+
+        $grad_outcomes_attempted = [];
+        $grad_outcomes_achieved = [];
+        $undergrad_outcomes_attempted = [];
+        $undergrad_outcomes_achieved = [];
+
+        foreach ($outcomes_grad as $outcome) {
+            $grad_outcomes_attempted[$outcome->id] = 0;
+            $grad_outcomes_achieved[$outcome->id] = 0;
+        }
+
+        foreach ($outcomes_undergrad as $outcome) {
+            $undergrad_outcomes_attempted[$outcome->id] = 0;
+            $undergrad_outcomes_achieved[$outcome->id] = 0;
+        }
+
+        foreach ($grad_student_query as $result) {
+            if ($result->criteria_attempted != 0) {
+                if (!isset($grad_outcomes_attempted[$result->outcome_id]))
+                    continue;
+
+                $grad_outcomes_attempted[$result->outcome_id]++;
+
+                $percent = $result->criteria_achieved / $result->criteria_attempted * 100;
+
+                if ($percent >= 66.66) {
+
+
+                    $grad_outcomes_achieved[$result->outcome_id]++;
+                }
+            }
+        }
+
+
+
+
+        foreach ($undergraduate_student_query as $result) {
+            if ($result->criteria_attempted != 0) {
+                if (!isset($undergrad_outcomes_attempted[$result->outcome_id]))
+                    continue;
+
+                $undergrad_outcomes_attempted[$result->outcome_id]++;
+
+                $percent = $result->criteria_achieved / $result->criteria_attempted * 100;
+
+                if ($percent >= 66.66) {
+
+
+                    $undergrad_outcomes_achieved[$result->outcome_id]++;
+                }
+            }
+        }*/
+
+        $grad_grouped_courses = Course::
+            //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
+            select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
+            ->with('semester')
+            ->with('program')
+            ->whereIn('courses.program_id', $program_ids)
+            ->whereIn('courses.semester_id', Session::get('semesters_ids'))
+            ->leftJoin('programs', 'courses.program_id', '=', 'programs.id')
+            ->where('programs.is_graduate', '=', 1)
+            ->groupBy(array('courses.code', 'courses.number', 'courses.semester_id'))
+            ->orderBy('courses.code')
+            ->orderBy('courses.number')
+            ->orderBy('courses.semester_id')
+            ->get();
+
+        $undergrad_grouped_courses = Course::
+            //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
+            select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
+            ->with('semester')
+            ->with('program')
+            ->whereIn('courses.program_id', $program_ids)
+            ->whereIn('courses.semester_id', Session::get('semesters_ids'))
+            ->leftJoin('programs', 'courses.program_id', '=', 'programs.id')
+            ->where('programs.is_graduate', '=', 0)
+            ->groupBy(array('courses.code', 'courses.number', 'courses.semester_id'))
+            ->orderBy('courses.code')
+            ->orderBy('courses.number')
+            ->orderBy('courses.semester_id')
+            ->get();
+
+        foreach ($undergrad_grouped_courses as $key => $courses) {
+            $undergrad_grouped_courses[$key]->outcomes_attempted = NULL;
+            $coursesT = Course::where('courses.code', $courses->code)->where('courses.number', $courses->number)->where('courses.semester_id', $courses->semester_id)->get();
+            foreach ($coursesT as $course) {
+                if ($course->isAssessed()) {
+                    $undergrad_grouped_courses[$key]->outcomes_attempted = true;
+                }
+            }
+        }
+
+        foreach ($grad_grouped_courses as $key => $courses) {
+            $grad_grouped_courses[$key]->outcomes_attempted = NULL;
+            $coursesT = Course::where('courses.code', $courses->code)->where('courses.number', $courses->number)->where('courses.semester_id', $courses->semester_id)->get();
+            foreach ($coursesT as $course) {
+                if ($course->isAssessed()) {
+                    $grad_grouped_courses[$key]->outcomes_attempted = true;
+                }
+            }
+        }
+
+        // Fetch programs with participation
+        $participating_programs = $this->participatingPrograms($school);
+
+        /**
+         * Calculate how many sections are doing assessment
+         */
+
+        $undergrad_assessed_sections_count = 0;
+        $undergrad_school_sections_count = 0;
+
+        $grad_assessed_sections_count = 0;
+        $grad_school_sections_count = 0;
+
+        foreach ($school->programs as $program) {
+            foreach ($program->courses as $course) {
+
+                if (!$course->program->is_graduate) {
+                    $undergrad_school_sections_count += 1;
+                    if ($course->isAssessed()) $undergrad_assessed_sections_count += 1;
+                } else {
+                    $grad_school_sections_count += 1;
+                    if ($course->isAssessed()) $grad_assessed_sections_count += 1;
+                }
+            }
+        }
+
+
+        //como resuelvo programsAttempted y eso
+
+
+        //El query es el mismo de students, lo unico que dividido con programas,
+        //asi que lo que esta haciendo es, prog 1, y coge los dominios y estudiantes que evaluason
+
+
+        $undergrad_prog_attempted =  DB::table("courses")
+            ->join('activities', 'activities.course_id', '=', 'courses.id')
+            ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+            ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+            ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+            ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+            ->join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'activity_criterion.criterion_id')
+            ->join('program_criterion_objective_outcome as poco', function ($q) {
+                $q->on('courses.program_id', '=', 'poco.program_id')
+                    ->on('cobo.id', '=', 'poco.cri_obj_out_id');
+            })
+            ->join('students', 'students.id', '=', 'assessments.student_id')
+            ->whereIn("courses.semester_id", Session::get('semesters_ids'))
+            ->whereIn('poco.program_id',  $undergrad_programs_list)
+
+            ->whereIn('courses.program_id',  $undergrad_programs_list)
+            ->select('students.number as student_id')
+            ->addSelect(DB::raw('count(assessments.activity_criterion_id) as criteria_attempted'))
+            ->addSelect(DB::raw('count(case when assessments.score>=rubrics.expected_points then 1 else NULL end) as criteria_achieved'))
+            ->addSelect('outcome_id')
+            ->addSelect("courses.program_id")
+            ->groupBy(array('students.id', 'outcome_id', 'program_id'))
+            ->get();
+
+        $grad_prog_attempted =  DB::table("courses")
+            ->join('activities', 'activities.course_id', '=', 'courses.id')
+            ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+            ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+            ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+            ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+            ->join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'activity_criterion.criterion_id')
+            ->join('program_criterion_objective_outcome as poco', function ($q) {
+                $q->on('courses.program_id', '=', 'poco.program_id')
+                    ->on('cobo.id', '=', 'poco.cri_obj_out_id');
+            })
+            ->join('students', 'students.id', '=', 'assessments.student_id')
+            ->whereIn("courses.semester_id", Session::get('semesters_ids'))
+            ->whereIn('poco.program_id',  $grad_programs_list)
+
+            ->whereIn('courses.program_id',  $grad_programs_list)
+            ->select('students.number as student_id')
+            ->addSelect(DB::raw('count(assessments.activity_criterion_id) as criteria_attempted'))
+            ->addSelect(DB::raw('count(case when assessments.score>=rubrics.expected_points then 1 else NULL end) as criteria_achieved'))
+            ->addSelect('outcome_id')
+            ->addSelect("courses.program_id")
+            ->groupBy(array('students.id', 'outcome_id', 'program_id'))
+            ->get();
+
+        //este arreglo va a tener attempted[outcome->id][program->id]
+
+        //so la cardinalidad de attempted[outcome->id] dice cuantos programas intentaron, achieved[outcome->id], va 
+        //a decir cuantos pasaron y attempted[outcome->id][program->id] la suma de estudiantes que intentaron
+        // 
+
+
+        foreach ($undergrad_prog_attempted as $row) {
+            $program_id = $row->program_id;
+            $outcome_id = $row->outcome_id;
+            if (!isset($attemptedUndergradProgramsPerOutcome[$outcome_id][$program_id]))
+                $attemptedUndergradProgramsPerOutcome[$outcome_id][$program_id] = 0;
+
+
+            $attemptedUndergradProgramsPerOutcome[$outcome_id][$program_id]++;
+
+            $criteria_attempted_by_stu = $row->criteria_attempted;
+            $criteria_achieved_by_stu = $row->criteria_achieved;
+            if ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.67) {
+
+                if (!isset($achievedUndergradProgramsPerOutcome[$outcome_id][$program_id]))
+                    $achievedUndergradProgramsPerOutcome[$outcome_id][$program_id] = 0;
+                $achievedUndergradProgramsPerOutcome[$outcome_id][$program_id]++;
+            }
+        }
+
+        foreach ($grad_prog_attempted as $row) {
+            $program_id = $row->program_id;
+            $outcome_id = $row->outcome_id;
+            if (!isset($attemptedGradProgramsPerOutcome[$outcome_id][$program_id]))
+                $attemptedGradProgramsPerOutcome[$outcome_id][$program_id] = 0;
+
+
+            $attemptedGradProgramsPerOutcome[$outcome_id][$program_id]++;
+
+            $criteria_attempted_by_stu = $row->criteria_attempted;
+            $criteria_achieved_by_stu = $row->criteria_achieved;
+            if ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.67) {
+                if (!isset($achievedGradProgramsPerOutcome[$outcome_id][$program_id]))
+                    $achievedGradProgramsPerOutcome[$outcome_id][$program_id] = 0;
+                $achievedGradProgramsPerOutcome[$outcome_id][$program_id]++;
+            }
+        }
+        //La linea negra de proposed.
+
+        //
+        $linea_undergrad = DB::table('target_outcomes_program')
+            ->join('programs', 'programs.id', '=', 'target_outcomes_program.program_id')
+            ->join('semesters', 'semesters.id', '=', 'target_outcomes_program.semester_id')
+            ->whereIn('program_id', $undergrad_programs_list)
+            ->whereIn("semester_id", Session::get('semesters_ids'))
+            ->select("target_outcomes_program.*", 'programs.name as program_name', 'semesters.name as semester_name')
+            ->addSelect(DB::raw("count(target_outcomes_program.semester_id) as count_semester_id"))
+            ->groupBy("expected_target")
+            ->orderBy("expected_target", "DESC")
+            ->first();
+        if (!isset($linea_undergrad)) {
+            $default_undergrad = 70;
+        } elseif ($linea_undergrad->count_semester_id > 1) {
+
+            $default_undergrad = null;
+
+            $linea_undergrad = DB::table('target_outcomes_program')
+                ->join('programs', 'programs.id', '=', 'target_outcomes_program.program_id')
+                ->join('semesters', 'semesters.id', '=', 'target_outcomes_program.semester_id')
+                ->whereIn('program_id', $undergrad_programs_list)
+                ->where('expected_target', $linea_undergrad->expected_target)
+                ->whereIn("semester_id", Session::get('semesters_ids'))
+                ->select("target_outcomes_program.*", 'programs.name as program_name', 'semesters.name as semester_name')
+                //->addSelect("count(semester_id) as count_semester_id")
+                //->groupBy("expected_target")
+                ->orderBy("semester_id", "DESC")
+                ->first();
+        }
+
+        $linea_grad = DB::table('target_outcomes_program')
+            ->join('programs', 'programs.id', '=', 'target_outcomes_program.program_id')
+            ->join('semesters', 'semesters.id', '=', 'target_outcomes_program.semester_id')
+            ->whereIn('program_id', $grad_programs_list)
+            ->whereIn("semester_id", Session::get('semesters_ids'))
+            ->select("target_outcomes_program.*", 'programs.name as program_name', 'semesters.name as semester_name')
+            ->addSelect(DB::raw("count(target_outcomes_program.semester_id) as count_semester_id"))
+            ->groupBy("expected_target")
+            ->orderBy("expected_target", "DESC")
+            ->first();
+        if (!isset($linea_grad)) {
+            $default_grad = 70;
+        } elseif ($linea_grad->count_semester_id > 1) {
+
+            $default_grad = null;
+
+            $linea_grad = DB::table('target_outcomes_program')
+                ->join('programs', 'programs.id', '=', 'target_outcomes_program.program_id')
+                ->join('semesters', 'semesters.id', '=', 'target_outcomes_program.semester_id')
+                ->whereIn('program_id', $grad_programs_list)
+                ->where('expected_target', $linea_grad->expected_target)
+                ->whereIn("semester_id", Session::get('semesters_ids'))
+                ->select("target_outcomes_program.*", 'programs.name as program_name', 'semesters.name as semester_name')
+                ->orderBy("semester_id", "DESC")
+                ->first();
+        }
+
+
+
+
+        if ($school->id == 13) {
+            //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+            return View::make('local.managers.shared.print_school', compact('title', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
+        } else {
+            //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+            return View::make('local.managers.shared.print_school', compact('title',  'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
+        }
+
+
         $grouped_courses = Course::
             //             select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
             select(DB::raw('name, code, number, semester_id, program_id'))

app/models/Course.php

@@ -479,6 +479,8 @@ class Course extends Eloquent
   {
     return $this->getStudentReportForOutcome($this);
   }
+
+
   //user id is for groupped professor sections. so el query es  code, number, semester y user_id
   public static function getStudentReportForOutcome($course_code = null, $user_id = null)
   {
@@ -535,6 +537,29 @@ class Course extends Eloquent
 
       // Log::info(array($course_code));
 
+
+      //ESTA ES LA TABLA QUERY PPOR STUDENT
+
+      $table_per_student =  DB::table('assessments')
+        ->join('activity_criterion', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
+        ->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
+        ->join('courses', 'courses.id', '=', 'activities.course_id')
+        ->join('students', 'students.id', '=', 'assessments.student_id')
+        ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+        ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+        ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+        ->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+        ->whereIn('students.program_id', $program_ids)
+        ->where('semester_id', $course_code->semester_id)
+        ->where('semesters.is_visible', '=', 1)
+        ->where('activities.draft', 0)
+        ->where('activities.diagnostic', 0)
+
+        ->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
+        ->distinct()
+        ->get();
+
+
       //Table
       /* Student  criterion_attempted criterion passed
       *     1             2                   1
@@ -563,7 +588,9 @@ class Course extends Eloquent
         ->where('activities.diagnostic', 0);
 
 
-      // si typ_semester_course esta prendido, then significa que es de los estudiantes del programa
+      // si typ_semester_course esta prendido
+      // o, si with_program_report está prendido
+      //, then significa que es de los estudiantes del programa
       //
 
       if (isset($course_code->typ_semester_course_id)) {
@@ -571,17 +598,17 @@ class Course extends Eloquent
           ->whereIn('program_student_semester.program_id', $program_ids)
           ->where('program_student_semester.semester_id', $course_code->semester_id);
       }
+      if (isset($course_code->with_program_report)) {
+        $table_per_student = $table_per_student->join('program_student_semester', 'program_student_semester.student_id', '=', 'course_student.student_id')
+          ->whereIn('program_student_semester.program_id', $program_ids)
+          ->where('program_student_semester.semester_id', $course_code->semester_id);
+      }
       //si entra aqui, no especifica dominio, y hay que join todos los dominios
-      else {
-        $table_per_student = $table_per_student->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id');
-        //->join('program_criterion_objective_outcome', 'program_criterion_objective_outcome.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
-        //->whereIn('program_criterion_objective_outcome.program_id', $program_ids);
-
-        /*
-        Entonces que tendrías aqui?, estudiantes por dominio?
+      if (!isset($course_code->typ_semester_course_id)) {
 
-        */
+        $table_per_student = $table_per_student->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id');
       }
+
       //si estan grouped
       if (isset($course_code->grouped)) {
         $table_per_student = $table_per_student->where('courses.semester_id', $course_code->semester_id)
@@ -615,14 +642,21 @@ class Course extends Eloquent
         $table_per_student = $table_per_student->addSelect('outcome_id')
           ->groupBy(array('students.id', 'outcome_id'));
 
-        // Log::info($table_per_student->toSql());
-        //Log::info($criteria_id);
-        //Log::info("Amiga ponle a br");
+        Log::info($table_per_student->toSql());
+        Log::info($criteria_id);
+        Log::info($course_code->id);
+        Log::info($program_ids);
+        Log::info($course_code->semester_id);
+        Log::info("Amiga ponle a br");
 
         $query = $table_per_student->get();
 
 
 
+
+
+
+
         //Aqui queremos crear un arreglo que sea
         /*
           students = {

app/models/Program.php

@@ -37,6 +37,140 @@ class Program extends Eloquent
 		return $this->hasMany('Student');
 	}
 
+	public function getProgramStudentsPerOutcomeAttribute()
+	{ {
+
+			$semesters = Semester::whereIn('id', Session::get('semesters_ids'))->get();
+
+			//if ($this->is_graduate == 1) {
+			//	$outcomes = Outcome::active_by_semesters($semesters, 1);
+			//} else {
+			//	$outcomes = Outcome::active_by_semesters($semesters, 0);
+			//}
+
+			$outcomes = Outcome::orderBy('name', 'asc')->get();
+
+			$outcome_ids = DB::table("outcomes")
+				->whereNotNull('new_outcome_id')
+				->get();
+
+			$combined_outcomes = [];
+			foreach ($outcome_ids as $outcome) {
+				$combined_outcomes[$outcome->id] = $outcome->new_outcome_id;
+			}
+
+			$array_to_send = [];
+
+
+
+			$students =
+				DB::table('assessments')
+				->join('activity_criterion', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
+				->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
+				->join('courses', 'courses.id', '=', 'activities.course_id')
+				->join('students', 'students.id', '=', 'assessments.student_id')
+				->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+				->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+				->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+				->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+				->where('students.program_id', $this->id)
+				->whereIn('semester_id', Session::get('semesters_ids'))
+				->where('semesters.is_visible', '=', 1)
+				->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
+				->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
+				->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
+
+				->groupBy('students.id', 'outcome_id')
+				->get();
+
+
+
+
+			$array_to_send['program_info'] = [];
+
+			$array_to_send['program_info']['outcomes_attempted'] = [];
+			$out_att = [];
+			$out_ach = [];
+
+			foreach ($outcomes as $outcome) {
+				$out_att[$outcome->id] = 0;
+				$out_ach[$outcome->id] = 0;
+			}
+
+
+			//las filas son , estudiante, outcome que intentó, criterios_attempted, criterion_achieved, 
+			foreach ($students as $result) {
+				$crit_att = $result->criteria_attempted;
+				$crit_ach = $result->criteria_achieved;
+
+
+				$out_att[$result->outcome_id] += 1;
+
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+					$out_ach[$result->outcome_id] += 1;
+				}
+			}
+
+
+			$array_to_send['program_info']['outcomes_attempted_uncombined'] = $out_att;
+			$array_to_send['program_info']['outcomes_achieved_uncombined'] = $out_ach;
+
+
+			$the_processed_table = [];
+			foreach ($students as $result) {
+				$student_id = $result->student_id;
+				$outcome_id = $result->outcome_id;
+				if (isset($combined_outcomes[$outcome_id]))
+					$outcome_id = $combined_outcomes[$outcome_id];
+
+
+
+				if (!isset($the_processed_table[$student_id])) {
+					$the_processed_table[$student_id] = [];
+				}
+
+
+				//si en esta tabla, el estudiante no está pareado con este dominio, entonces registra
+				// los criterios, achieved y attempted
+				if (!isset($the_processed_table[$student_id][$outcome_id])) {
+					$the_processed_table[$student_id][$outcome_id] = array(
+						"criteria_attempted" => $result->criteria_attempted,
+						"criteria_achieved" => $result->criteria_achieved
+					);
+				}
+				//si este estudiante está pareado a este dominio, significa que ahora estoy en los
+				//deprecated outcomes.
+				else {
+					$the_processed_table[$student_id][$outcome_id]['criteria_attempted'] += $result->criteria_attempted;
+					$the_processed_table[$student_id][$outcome_id]['criteria_achieved'] += $result->criteria_achieved;
+				}
+			}
+
+
+			foreach ($the_processed_table as $student_id => $outcome_ids) {
+				foreach ($outcome_ids as $outcome_id => $crit_information) {
+					$crit_att = $crit_information['criteria_attempted'];
+					$crit_ach = $crit_information['criteria_achieved'];
+
+
+					$out_att[$outcome_id] += 1;
+
+					if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+						$out_ach[$outcome_id] += 1;
+					}
+				}
+			}
+
+			$array_to_send['program_info']['outcomes_attempted_combined'] = $out_att;
+			$array_to_send['program_info']['outcomes_achieved_combined'] = $out_ach;
+
+
+
+
+			return $array_to_send;
+		}
+	}
+
 	public function getCriteriaAttribute()
 	{
 
@@ -300,6 +434,45 @@ class Program extends Eloquent
 		return $conteo;
 	}
 
+	//get linea outcome
+
+	public function getExpectedOutcomeTargetAttribute()
+	{
+
+		//
+		$linea_undergrad = DB::table('target_outcomes_program')
+			->join('programs', 'programs.id', '=', 'target_outcomes_program.program_id')
+			->join('semesters', 'semesters.id', '=', 'target_outcomes_program.semester_id')
+			->where('program_id', $this->id)
+			->whereIn("semester_id", Session::get('semesters_ids'))
+			->select("target_outcomes_program.*", 'programs.name as program_name', 'semesters.name as semester_name')
+			->addSelect(DB::raw("count(target_outcomes_program.semester_id) as count_semester_id"))
+			->groupBy("expected_target")
+			->orderBy("expected_target", "DESC")
+			->first();
+
+
+		if (!isset($linea_undergrad)) {
+			$linea_undergrad = null;
+		} elseif ($linea_undergrad->count_semester_id > 1) {
+
+
+
+			$linea_undergrad = DB::table('target_outcomes_program')
+				->join('programs', 'programs.id', '=', 'target_outcomes_program.program_id')
+				->join('semesters', 'semesters.id', '=', 'target_outcomes_program.semester_id')
+				->where('program_id', $this->id)
+				->where('expected_target', $linea_undergrad->expected_target)
+				->whereIn("semester_id", Session::get('semesters_ids'))
+				->select("target_outcomes_program.*", 'programs.name as program_name', 'semesters.name as semester_name')
+				//->addSelect("count(semester_id) as count_semester_id")
+				//->groupBy("expected_target")
+				->orderBy("semester_id", "DESC")
+				->first();
+		}
+		return $linea_undergrad;
+	}
+
 	public function achieved_outcome($outcome_id, $semesters)
 	{
 		$semesters_array = [];

app/models/School.php

@@ -14,12 +14,305 @@ class School extends Eloquent
 
 	public function courses()
 	{
-	    return $this->hasManyThrough('Course', 'Program')->orderBy('name', 'asc');
+		return $this->hasManyThrough('Course', 'Program')->orderBy('name', 'asc');
 	}
 
 	public function templates()
 	{
-	    return $this->hasMany('Template')->orderBy('name', 'asc');
+		return $this->hasMany('Template')->orderBy('name', 'asc');
 	}
 
-}
+	public function getUndergraduateProgramsAttribute()
+	{
+
+		return $this->hasMany("Program")->where('is_graduate', 0)->orderBy("name", 'asc');
+	}
+	public function getGraduateProgramsAttribute()
+	{
+
+		return $this->hasMany("Program")->where('is_graduate', 1)->orderBy("name", 'asc');
+	}
+
+	//Esto envia
+
+	/*
+[
+	undergraduate_info:[
+		outcomes_attempted_uncombined:{
+			outcome_1: count(students),
+
+		}
+		outcomes_attempted_combined:{
+
+		}
+		outcomes_achieved_uncombined:{
+
+		}
+		outcomes_achieved_combined:{
+			
+		}
+	],
+	graduate_info:[
+
+	]
+]
+
+*/
+
+	public function getSchoolStudentsPerOutcomeAttribute()
+	{
+
+		$semesters = Semester::whereIn('id', Session::get('semesters_ids'))->get();
+
+		$outcomes_grad = Outcome::active_by_semesters($semesters, 1);
+		$outcomes_undergrad = Outcome::active_by_semesters($semesters, 0);
+
+		$outcomes = Outcome::orderBy('name', 'asc')->get();
+		$array_to_send = [];
+
+
+
+		$undergraduate_students =
+			DB::table('assessments')
+			->join('activity_criterion', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
+			->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
+			->join('courses', 'courses.id', '=', 'activities.course_id')
+			->join('students', 'students.id', '=', 'assessments.student_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+			->whereIn('students.program_id', $this->undergraduate_programs->lists('id'))
+			->whereIn('semester_id', Session::get('semesters_ids'))
+			->where('semesters.is_visible', '=', 1)
+			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
+			->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
+			->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
+
+			->groupBy('students.id', 'outcome_id')
+			->get();
+
+		//$array_to_send["undergraduate_students"] = $undergraduate_students;
+
+		$graduate_students = DB::table('assessments')
+			->join('activity_criterion', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
+			->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
+			->join('courses', 'courses.id', '=', 'activities.course_id')
+			->join('students', 'students.id', '=', 'assessments.student_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+			->whereIn('students.program_id', $this->graduate_programs->lists('id'))
+			->whereIn('semester_id', Session::get('semesters_ids'))
+			->where('semesters.is_visible', '=', 1)
+			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
+			->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
+			->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
+
+			->groupBy('students.id', 'outcome_id')
+			->get();
+
+		//$array_to_send["graduate_students"] = $graduate_students;
+
+		//Log::info(count($graduate_students));
+		//Log::info(count($undergraduate_students));
+
+		$outcome_ids = DB::table("outcomes")
+			->whereNotNull('new_outcome_id')
+			->get();
+
+		$combined_outcomes = [];
+		foreach ($outcome_ids as $outcome) {
+			$combined_outcomes[$outcome->id] = $outcome->new_outcome_id;
+		}
+
+		//Necesito undergraduateCombined, undergraduateUncombined, 
+		//lo mismo pa graduate 
+
+		$array_to_send['undergraduate_info'] = [];
+		$array_to_send['graduate_info'] = [];
+
+		$array_to_send['undergraduate_info']['outcomes_attempted_uncombined'] = [];
+		$array_to_send['undergraduate_info']['outcomes_achieved_uncombined'] = [];
+		$array_to_send['graduate_info']['outcomes_attempted_uncombined']  = [];
+		$array_to_send['graduate_info']['outcomes_achieved_uncombined'] = [];
+
+		$under_out_att = [];
+		$under_out_ach = [];
+
+		foreach ($outcomes as $outcome) {
+			$under_out_att[$outcome->id] = 0;
+			$under_out_ach[$outcome->id] = 0;
+		}
+
+
+		//las filas son , estudiante, outcome que intentó, criterios_attempted, criterion_achieved, 
+		foreach ($undergraduate_students as $result) {
+			$crit_att = $result->criteria_attempted;
+			$crit_ach = $result->criteria_achieved;
+
+
+			$under_out_att[$result->outcome_id] += 1;
+
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+				$under_out_ach[$result->outcome_id] += 1;
+			}
+		}
+
+		$grad_out_att = [];
+		$grad_out_ach = [];
+
+		foreach ($outcomes as $outcome) {
+			$grad_out_att[$outcome->id] = 0;
+			$grad_out_ach[$outcome->id] = 0;
+		}
+
+
+		//las filas son , estudiante, outcome que intentó, criterios_attempted, criterion_achieved, 
+		foreach ($graduate_students as $result) {
+			$crit_att = $result->criteria_attempted;
+			$crit_ach = $result->criteria_achieved;
+
+
+			$grad_out_att[$result->outcome_id] += 1;
+
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+				$grad_out_ach[$result->outcome_id] += 1;
+			}
+		}
+
+		$array_to_send['undergraduate_info']['outcomes_attempted_uncombined'] = $under_out_att;
+		$array_to_send['undergraduate_info']['outcomes_achieved_uncombined'] = $under_out_ach;
+		$array_to_send['graduate_info']['outcomes_attempted_uncombined'] = $grad_out_att;
+		$array_to_send['graduate_info']['outcomes_achieved_uncombined'] = $grad_out_ach;
+
+
+
+		$array_to_send['undergraduate_info']['outcomes_attempted_combined'] = [];
+		$array_to_send['undergraduate_info']['outcomes_achieved_combined'] = [];
+		$array_to_send['graduate_info']['outcomes_attempted_combined']  = [];
+		$array_to_send['graduate_info']['outcomes_achieved_combined'] = [];
+
+		$under_out_att = [];
+		$under_out_ach = [];
+
+		foreach ($outcomes as $outcome) {
+			$under_out_att[$outcome->id] = 0;
+			$under_out_ach[$outcome->id] = 0;
+		}
+
+		//preprocess para combined_students
+
+		$the_processed_table = [];
+		foreach ($undergraduate_students as $result) {
+			$student_id = $result->student_id;
+			$outcome_id = $result->outcome_id;
+			if (isset($combined_outcomes[$outcome_id]))
+				$outcome_id = $combined_outcomes[$outcome_id];
+
+
+
+			if (!isset($the_processed_table[$student_id])) {
+				$the_processed_table[$student_id] = [];
+			}
+
+
+			//si en esta tabla, el estudiante no está pareado con este dominio, entonces registra
+			// los criterios, achieved y attempted
+			if (!isset($the_processed_table[$student_id][$outcome_id])) {
+				$the_processed_table[$student_id][$outcome_id] = array(
+					"criteria_attempted" => $result->criteria_attempted,
+					"criteria_achieved" => $result->criteria_achieved
+				);
+			}
+			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
+			//deprecated outcomes.
+			else {
+				$the_processed_table[$student_id][$outcome_id]['criteria_attempted'] += $result->criteria_attempted;
+				$the_processed_table[$student_id][$outcome_id]['criteria_achieved'] += $result->criteria_achieved;
+			}
+		}
+
+
+		foreach ($the_processed_table as $student_id => $outcome_ids) {
+			foreach ($outcome_ids as $outcome_id => $crit_information) {
+				$crit_att = $crit_information['criteria_attempted'];
+				$crit_ach = $crit_information['criteria_achieved'];
+
+
+				$under_out_att[$outcome_id] += 1;
+
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+					$under_out_ach[$outcome_id] += 1;
+				}
+			}
+		}
+
+		$array_to_send['undergraduate_info']['outcomes_attempted_combined'] = $under_out_att;
+		$array_to_send['undergraduate_info']['outcomes_achieved_combined'] = $under_out_ach;
+
+
+		$grad_out_att = [];
+		$grad_out_ach = [];
+
+		foreach ($outcomes as $outcome) {
+			$grad_out_att[$outcome->id] = 0;
+			$grad_out_ach[$outcome->id] = 0;
+		}
+
+		//preprocess para combined_students
+
+		$the_processed_table = [];
+		foreach ($graduate_students as $result) {
+			$student_id = $result->student_id;
+			$outcome_id = $result->outcome_id;
+			if (isset($combined_outcomes[$outcome_id]))
+				$outcome_id = $combined_outcomes[$outcome_id];
+
+
+
+			if (!isset($the_processed_table[$student_id])) {
+				$the_processed_table[$student_id] = [];
+			}
+
+
+			//si en esta tabla, el estudiante no está pareado con este dominio, entonces registra
+			// los criterios, achieved y attempted
+			if (!isset($the_processed_table[$student_id][$outcome_id])) {
+				$the_processed_table[$student_id][$outcome_id] = array(
+					"criteria_attempted" => $result->criteria_attempted,
+					"criteria_achieved" => $result->criteria_achieved
+				);
+			}
+			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
+			//deprecated outcomes.
+			else {
+				$the_processed_table[$student_id][$outcome_id]['criteria_attempted'] += $result->criteria_attempted;
+				$the_processed_table[$student_id][$outcome_id]['criteria_achieved'] += $result->criteria_achieved;
+			}
+		}
+
+
+
+
+		foreach ($the_processed_table as $student_id => $outcome_ids) {
+			foreach ($outcome_ids as $out_id => $crit_information) {
+				$crit_att = $crit_information['criteria_attempted'];
+				$crit_ach = $crit_information['criteria_achieved'];
+
+
+				$grad_out_att[$out_id] += 1;
+
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+					$grad_out_ach[$out_id] += 1;
+				}
+			}
+		}
+
+		$array_to_send['graduate_info']['outcomes_attempted_combined'] = $grad_out_att;
+		$array_to_send['graduate_info']['outcomes_achieved_combined'] = $grad_out_ach;
+		Log::info($array_to_send);
+		return $array_to_send;
+	}
+}

app/views/local/managers/pCoords/overview.blade.php

@@ -22,15 +22,31 @@
 
                 <br>
                 <br>
-
-                <a href="{{ action('ProgramsController@print_program', array($program_item['program']->id)); }}" class="btn btn-primary pull-right" alt="print"><span class="glyphicon glyphicon-print"></span></a>
+                <div class="btn-group pull-right">
+                     <a href="{{ action('ProgramsController@print_program', array($program_item['program']->id)); }}" class="btn btn-primary" alt="print"><span class="glyphicon glyphicon-print"></span></a>
+                <button type='button' class = 'btn btn-primary' id="change-view-btn{{$index}}" onclick="changeView('#allGraph{{$index}}','#programGraph{{$index}}', {{$index}}, 'Show Program Courses')">Show Program Students</button>
+                </div>
                 <br>
                 <br>
 
-
-                <div class="row">
+                <div class = 'row'>
+                    <div class ='col-md-12'>
+                    @if($program_item['linea_de_graph']== null)
+                    <p><strong>This Goal Bar is the default score. If you wish to change it, change it on the selected Semesters Annual Plan</strong></p>
+                @else
+                    <p><strong>This Goal is from {{$program_item['linea_de_graph']->program_name}} on the semester {{$program_item['linea_de_graph']->semester_name}}</strong></p>
+        
+                @endif
+                </div>
+                </div>
+                <div class="row" id = 'allGraph{{$index}}'>
                     <div class="col-md-12 graph" id="graph{{ $index }}"></div>
                 </div>
+                <div class ='row graph-stu' id = "programGraph{{$index}}">
+                    <div class="col-md-12 graph " id = "graph-stu-program{{$index}}"></div>
+              
+                    
+                </div>
 
                 <!-- ===== sub tabs ===== -->
                 <div>
@@ -235,6 +251,24 @@
             </div>
         @endforeach
     </div>
+<script>
+
+    function changeView(graph_to_hide, graph_to_show, index, message){
+
+        current_message = $("#change-view-btn"+index).html();
+        $("#change-view-btn"+index).html(message);
+
+        $(graph_to_hide).hide()
+        $(graph_to_show).show()
+        
+
+        $("#change-view-btn"+index).attr('onclick','changeView("'+graph_to_show+'", "'+graph_to_hide+'",'+index+',"'+current_message+'")')
+    }
+
+    $(".graph-stu").hide();
+
+    </script>
+
 
 
 @stop
@@ -270,7 +304,7 @@
                 type: 'bar'
             },
             title: {
-                text: 'Performance by Learning Outcome Criteria in {{ $program_item['program']->name }} Program'
+                text: 'Performance by Learning Outcome Criteria in {{ $program_item['program']->name }} Courses'
             },
             legend: {
                         reversed: true,
@@ -310,12 +344,22 @@
                 }, 
                 
                         plotLines:[{
-                    value:66.67,
-                    color: '#000',
-                    width:3,
-                    zIndex:4,
-                    label:{
-                        text: 'Goal (66.67%)',
+                @if($program_item['linea_de_graph'] != null)
+                        value:{{$program_item['linea_de_graph']->expected_target}},
+                        color: '#000',
+                        width:3,
+                        zIndex:4,
+                        label:{
+                      
+                        text: 'Goal ({{$program_item['linea_de_graph']->expected_target}}%)',
+                        @else
+                        value:70.00,
+                        color: '#000',
+                        width:3,
+                        zIndex:4,
+                        label:{
+                        text: 'Goal (70.00%)',
+                        @endif
                         style: {
                             color: '#000',
                             fontSize: '14px',
@@ -387,7 +431,7 @@
                     y:-1
                 },
                 data:[
-                    @foreach($outcomes as $index => $outcome)
+                    @foreach($outcomes as $index2 => $outcome)
                         @if(
                             is_array($program_item['outcomes_attempted'])
                             && array_key_exists($outcome->id, $program_item['outcomes_attempted'])
@@ -402,6 +446,153 @@
             }]
         });
 
+        $('#graph-stu-program{{$index}}').highcharts({
+            chart: {
+                type: 'bar'
+            },
+            title: {
+                text: 'Performance by {{ $program_item['program']->name }}\'s Students in Learning Outcomes'
+            },
+            legend: {
+                        reversed: true,
+                    },
+            xAxis: {
+                categories: [
+                    @foreach($outcomes as $outcome)
+                        @if(is_array($program_item['program_outcomes_attempted'])
+                        && array_key_exists($outcome->id, $program_item['program_outcomes_attempted'])
+                        && array_key_exists($outcome->id, $program_item['program_outcomes_achieved'])
+                        && $program_item['program_outcomes_attempted'][$outcome->id]!=0)
+
+                        "{{{ $outcome->name }}}<br> (N = {{$program_item['program_outcomes_attempted'][$outcome->id]}}, {{$program_item['program_outcomes_achieved'][$outcome->id]}})",
+                    @else
+                        "{{$outcome->name}}<br> (N = 0, 0)",
+
+                        @endif
+                    
+                        @endforeach
+                ],
+                labels: {
+                    style: {
+                        fontSize:'11px'
+                    },
+                    step:1,
+                    useHTML:true,
+                    formatter: function() {
+                        return '<div style="width:200px; word-break:break; text-overflow:ellipsis; overflow:hidden;">'+this.value+'</div>';
+                    },
+                }
+            },
+            yAxis: {
+                min: 0,
+                max: 100,
+                title: {
+                text: 'Percentage'
+                }, 
+                
+                        plotLines:[{
+                @if($program_item['linea_de_graph'] != null)
+                        value:{{$program_item['linea_de_graph']->expected_target}},
+                        color: '#000',
+                        width:3,
+                        zIndex:4,
+                        label:{
+                      
+                        text: 'Goal ({{$program_item['linea_de_graph']->expected_target}}%)',
+                        @else
+                        value:70.00,
+                        color: '#000',
+                        width:3,
+                        zIndex:4,
+                        label:{
+                        text: 'Goal (70.00%)',
+                        @endif
+                        style: {
+                            color: '#000',
+                            fontSize: '14px',
+                        }
+            
+                    }
+                }]
+            },
+            tooltip: {
+                headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
+                pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
+                    '<td style="padding:0"><b>{point.y:.2f}</b></td></tr>',
+                footerFormat: '</table>',
+                shared: true,
+                useHTML: true
+            },
+            plotOptions: {
+                bar: {
+                    //grouping: false,
+                    shadow: false,
+                    borderWidth: 0,
+                },
+                series: {
+                pointPadding: 0,
+                groupPadding: 0.075
+                },
+            },
+            series: [{{--{
+                name: 'Expected Value',
+                color: '#555555',
+                dataLabels: {
+                    enabled: true,
+                    fontSize: 8,
+                    color: '#fff',
+                    align: 'right',
+                    format: '{y:.1f}%',
+                    style: {
+                        //fontWeight: 'bold'
+                    },
+                    y:-1
+                }, 
+
+            
+                data: [
+                    @foreach($outcomes as $index => $outcome)
+                        @if(
+                            is_array($program_item['outcomes_attempted'])
+                            && array_key_exists($outcome->id, $program_item['outcomes_attempted'])
+                            && $program_item['outcomes_attempted'][$outcome->id]!=0)
+                            {{{ $outcome->expected_outcome }}},
+                        @else
+                            0,
+                        @endif
+                    @endforeach
+                ]
+
+            },--}}{
+                name: 'Obtained Value',
+                color: '#e70033',
+                dataLabels: {
+                    enabled: true,
+                    fontSize: 8,
+                    color: '#fff',
+                    align: 'right',
+                    format: '{y:.1f}%',
+                    style: {
+                        //fontWeight: 'bold'
+                    },
+                    y:-1
+                },
+                data:[
+                    @foreach($outcomes as $index => $outcome)
+                        @if(
+                            is_array($program_item['program_outcomes_attempted'])
+                            && array_key_exists($outcome->id, $program_item['program_outcomes_attempted'])
+                            && array_key_exists($outcome->id, $program_item['program_outcomes_achieved'])
+                            && $program_item['program_outcomes_attempted'][$outcome->id]!=0)
+                            {{{ ($program_item['program_outcomes_achieved'][$outcome->id]/$program_item['program_outcomes_attempted'][$outcome->id])*100 }}},
+                        @else
+                            0,
+                        @endif
+                    @endforeach
+                ]
+            }]
+        });
+
     });
 @endforeach
 

app/views/local/managers/sCoords/_new_navigation.blade.php

@@ -4,7 +4,7 @@
       {{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Online Learning Assessment System · Program Coordinator', [], ['class' => 'navbar-brand']) }}
     </div>-->
         <ul class="nav navbar-nav navbar-right ml-auto">
-            <li>{{ HTML::linkAction('SchoolCoordinatorsController@overview', 'Overview') }}</li>
+            <li>{{ HTML::linkAction('SchoolsController@show', "Overview", [Auth::user()->school->id]) }}</li>
 
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"

app/views/local/managers/shared/grouped_course.blade.php

@@ -18,6 +18,12 @@
 <a href="{{ action('CoursesController@print_course', array($grouped_courses[0]->code, $grouped_courses[0]->number, $grouped_courses[0]->semester->code )); }}" class="btn btn-primary pull-right" alt="print"><span class="glyphicon glyphicon-print"></span></a>
 <br>
 <br>
+@if($grouped_courses[0]->program->expected_outcome_target== null)
+<p><strong>This Goal Bar is the default score. If you wish to change it, change it on the selected Semesters Annual Plan</strong></p>
+@else
+<p><strong>This Goal is from {{$grouped_courses[0]->program->name}} on the semester {{$grouped_courses[0]->program->expected_outcome_target->semester_name}}</strong></p>
+
+@endif
 
 <div class="row">
     <div class="col-md-12 graph" id="graph"></div>
@@ -140,14 +146,14 @@ $(function () {
             title: {
             text: 'Percentage'
             }, 
-            
+            @if($grouped_courses[0]->program->expected_outcome_target == null)
                     plotLines:[{
-                value:66.67,
+                value:70.00,
                 color: '#000',
                 width:3,
                 zIndex:4,
                 label:{
-                    text: 'Goal (66.67%)',
+                    text: 'Goal (70.00%)',
                     style: {
                         color: '#000',
                         fontSize: '14px',
@@ -155,6 +161,23 @@ $(function () {
         
                 }
             }]
+            @else
+            plotLines:[{
+                value:{{$grouped_courses[0]->program->expected_outcome_target->expected_target}},
+                color: '#000',
+                width:3,
+                zIndex:4,
+                label:{
+                    text: 'Goal ({{$grouped_courses[0]->program->expected_outcome_target->expected_target}}%)',
+                    style: {
+                        color: '#000',
+                        fontSize: '14px',
+                    }
+        
+                }
+            }]
+
+            @endif
         },
         tooltip: {
             headerFormat: '<span style="font-size:10px">{point.key}</span><table>',

app/views/local/managers/shared/limited-course.blade.php

@@ -17,6 +17,15 @@
 			<p>{{$course->name}}</p>
 		</div>
 	</div>
+    <div class = 'row'>
+        <div class ='col-md-12'>
+        @if($course->program->expected_outcome_target== null)
+        <p><strong>This Goal Bar is the default score. If you wish to change it, change it on the selected Semesters Annual Plan</strong></p>
+    @else
+        <p><strong>This Goal is from {{$course->program->name}} on the semester {{$course->program->expected_outcome_target->semester_name}}</strong></p>
+
+    @endif
+    </div>
     <div class="row">
         <div class="col-md-12" id="graph">
         </div>
@@ -162,14 +171,14 @@ $(function () {
             title: {
             text: 'Percentage'
             }, 
-            
+            @if($course->program->expected_outcome_target == null)
                     plotLines:[{
-                value:66.67,
+                value:70.00,
                 color: '#000',
                 width:3,
                 zIndex:4,
                 label:{
-                    text: 'Goal (66.67%)',
+                    text: 'Goal (70.00%)',
                     style: {
                         color: '#000',
                         fontSize: '14px',
@@ -177,6 +186,23 @@ $(function () {
         
                 }
             }]
+            @else
+            plotLines:[{
+                value: {{$course->program->expected_outcome_target->expected_target }},
+                color: '#000',
+                width:3,
+                zIndex:4,
+                label:{
+                    text: 'Goal ({{$course->program->expected_outcome_target->expected_target}}%)',
+                    style: {
+                        color: '#000',
+                        fontSize: '14px',
+                    }
+        
+                }
+            }]
+
+            @endif
         },
         tooltip: {
             headerFormat: '<span style="font-size:10px">{point.key}</span><table>',

app/views/local/managers/shared/print_course.blade.php

@@ -32,6 +32,7 @@
             <th>Identifier</th>
             <th>Professor</th>
             <th>Assessed</th>
+            <th>Published</th>
         </tr>
     </thead>
     <tbody>
@@ -40,7 +41,12 @@
             <td>{{{ $section->code.$section->number.'-'.$section->section.' ('.$section->semester->code.')'}}}</td>
             <td>{{ $section->user->surnames }}, {{ $section->user->first_name }}</td>
             <td>
-                @if($section->outcomes_attempted!=NULL)
+                @if(count($section->assessedActivities))
+                    <span class="glyphicon glyphicon-ok"></span>
+                @endif
+            </td>
+            <td>
+                @if(count($section->publishedActivities))
                     <span class="glyphicon glyphicon-ok"></span>
                 @endif
             </td>
@@ -63,7 +69,11 @@
         <tr>
             <td>{{ $activity->name }} </td>
             <td>{{ $activity->course->section }}</td>
-            <td>{{ $activity->transforming_actions }}</td>
+            @if(isset($activity->transforming_action))
+            <td><strong>{{ $activity->transforming_action->at_text }}: </strong>{{$activity->transforming_action->description}}</td>
+            @else
+            <td></td>
+            @endif
         </tr>
     @endforeach
 
@@ -105,7 +115,7 @@ $(function () {
         xAxis: {
             categories: [
                 @foreach($outcomes as $outcome)
-                    "{{{ $outcome->name }}}",
+                    "{{{ $outcome->name }}}<br>(N = {{$outcomes_attempted[$outcome->id]}}, {{$outcomes_achieved[$outcome->id]}})",
                 @endforeach
             ],
             labels: {
@@ -123,8 +133,40 @@ $(function () {
             min: 0,
             max: 100,
             title: {
-                text: 'Percentage'
-            }
+            text: 'Percentage'
+            }, 
+            @if($grouped_courses[0]->program->expected_outcome_target == null)
+                    plotLines:[{
+                value:70.00,
+                color: '#000',
+                width:3,
+                zIndex:4,
+                label:{
+                    text: 'Goal (70.00%)',
+                    style: {
+                        color: '#000',
+                        fontSize: '14px',
+                    }
+        
+                }
+            }]
+            @else
+            plotLines:[{
+                value:{{$grouped_courses[0]->program->expected_outcome_target->expected_target}},
+                color: '#000',
+                width:3,
+                zIndex:4,
+                label:{
+                    text: 'Goal ({{$grouped_courses[0]->program->expected_outcome_target->expected_target}}%)',
+                    style: {
+                        color: '#000',
+                        fontSize: '14px',
+                    }
+        
+                }
+            }]
+
+            @endif
         },
         tooltip: {
             enabled:false,
@@ -141,7 +183,7 @@ $(function () {
                 animation:false,
             },
         },
-        series: [{
+        series: [/*{
             name: 'Expected Value',
             color: '#555555',
             dataLabels: {
@@ -168,7 +210,7 @@ $(function () {
                 @endforeach
             ]
 
-        },{
+        },*/{
             name: 'Obtained Value',
             color: '#e70033',
             dataLabels: {

app/views/local/managers/shared/print_program.blade.php

@@ -15,7 +15,10 @@
 
 @section('main')
 
-<div id="graph"></div>
+<div class = "col-md-8" id="graph"></div>
+<div class = 'col-md-4'></div>
+<div class = "col-md-8" id="graph-stu-program"></div>
+<div class = 'col-md-4'></div>
 
 <h3>Courses</h3>
 @if($program_courses->count()>0)
@@ -102,7 +105,7 @@ $('#graph').highcharts({
         type: 'bar'
     },
     title: {
-        text: 'Performance by Learning Outcome Criteria in {{ $program->name }} Program'
+        text: 'Performance by Learning Outcome Criteria in {{ $program->name }} Courses'
     },
     legend: {
         reversed: true,
@@ -110,7 +113,7 @@ $('#graph').highcharts({
     xAxis: {
         categories: [
             @foreach($outcomes as $outcome)
-                "{{{ $outcome->name }}}",
+                "{{{ $outcome->name }}} <br>(N = {{$outcomes_attempted[$outcome->id]}}, {{$outcomes_achieved[$outcome->id]}})",
             @endforeach
         ],
         labels: {
@@ -124,12 +127,45 @@ $('#graph').highcharts({
             },
         }
     },
+   
     yAxis: {
         min: 0,
         max: 100,
         title: {
-            text: 'Percentage'
-        }
+        text: 'Percentage'
+        }, 
+        @if($program->expected_outcome_target == null)
+                plotLines:[{
+            value:70.00,
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+                text: 'Goal (70.00%)',
+                style: {
+                    color: '#000',
+                    fontSize: '14px',
+                }
+    
+            }
+        }]
+        @else
+        plotLines:[{
+            value:{{$program->expected_outcome_target->expected_target}},
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+                text: 'Goal ({{$program->expected_outcome_target->expected_target}}%)',
+                style: {
+                    color: '#000',
+                    fontSize: '14px',
+                }
+    
+            }
+        }]
+
+        @endif
     },
     tooltip: {
         enabled:false
@@ -146,7 +182,7 @@ $('#graph').highcharts({
                 animation: false
             },
         },
-    series: [{
+    series: [/*{
         name: 'Expected Value',
         color: '#555555',
         dataLabels: {
@@ -173,7 +209,7 @@ $('#graph').highcharts({
             @endforeach
         ]
 
-    },{
+    },*/{
         name: 'Obtained Value',
         color: '#e70033',
         dataLabels: {
@@ -203,4 +239,143 @@ $('#graph').highcharts({
     }]
 });
 
+$('#graph-stu-program').highcharts({
+    chart: {
+        type: 'bar'
+    },
+    title: {
+        text: 'Performance by {{ $program->name }}\'s Students in Learning Outcomes '
+    },
+    legend: {
+        reversed: true,
+    },
+    xAxis: {
+        categories: [
+            @foreach($outcomes as $outcome)
+                "{{{ $outcome->name }}} <br>(N = {{$program_outcomes_attempted[$outcome->id]}}, {{$program_outcomes_achieved[$outcome->id]}})",
+            @endforeach
+        ],
+        labels: {
+            style: {
+                fontSize:'11px'
+            },
+            step:1,
+            useHTML:true,
+            formatter: function() {
+                return '<div style="width:100px; word-break:break; text-overflow:ellipsis; overflow:hidden;">'+this.value+'</div>';
+            },
+        }
+    },
+   
+    yAxis: {
+        min: 0,
+        max: 100,
+        title: {
+        text: 'Percentage'
+        }, 
+        @if($program->expected_outcome_target == null)
+                plotLines:[{
+            value:70.00,
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+                text: 'Goal (70.00%)',
+                style: {
+                    color: '#000',
+                    fontSize: '14px',
+                }
+    
+            }
+        }]
+        @else
+        plotLines:[{
+            value:{{$program->expected_outcome_target->expected_target}},
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+                text: 'Goal ({{$program->expected_outcome_target->expected_target}}%)',
+                style: {
+                    color: '#000',
+                    fontSize: '14px',
+                }
+    
+            }
+        }]
+
+        @endif
+    },
+    tooltip: {
+        enabled:false
+    },
+    plotOptions: {
+            bar: {
+                //grouping: false,
+                shadow: false,
+                borderWidth: 0,
+            },
+            series: {
+                pointPadding: 0,
+                groupPadding: 0.075,
+                animation: false
+            },
+        },
+    series: [/*{
+        name: 'Expected Value',
+        color: '#555555',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y:-1
+        },
+        data: [
+            @foreach($outcomes as $index => $outcome)
+                @if(
+                    is_array($outcomes_attempted)
+                    && array_key_exists($outcome->id, $outcomes_attempted)
+                    && $outcomes_attempted[$outcome->id]!=0)
+                    {{{ $outcome->expected_outcome }}},
+                @else
+                    0,
+                @endif
+            @endforeach
+        ]
+
+    },*/{
+        name: 'Obtained Value',
+        color: '#e70033',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y:-1
+        },
+        data:[
+            @foreach($outcomes as $index => $outcome)
+                @if(
+                    is_array($program_outcomes_attempted)
+                    && array_key_exists($outcome->id, $program_outcomes_attempted)
+                    && $program_outcomes_attempted[$outcome->id]!=0)
+                    {{{ ($program_outcomes_achieved[$outcome->id]/$program_outcomes_attempted[$outcome->id])*100 }}},
+                @else
+                    0,
+                @endif
+            @endforeach
+
+        ]
+    }]
+});
+
 @stop

app/views/local/managers/shared/print_school.blade.php

@@ -15,12 +15,7 @@
 
 @section('main')
 
-<div class="row">
-    <div class="col-md-12" id="graph"></div>
-</div>
-<br>
-<br>
-<br>
+
 <h3>Programs</h3>
 <table class="tabletable-condensed">
     <tr>
@@ -40,8 +35,13 @@
         </tr>
     @endforeach
 </table>
-
-<h3>Assessment Results by Learning Outcomes in Academic Programs</h3>
+<br>
+<br>
+<br>
+<div class="row">
+    <div class="col-md-12" id="graph-undergrad"></div>
+</div>
+<h3>Assessment Results by Learning Outcomes in Academic Undergraduate Programs</h3>
 <table>
     <thead>
         <th>Learning Outcome</th>
@@ -50,14 +50,14 @@
         <th>Success Rate</th>
     </thead>
     <tbody>
-        @foreach($outcomes as $outcome)
+        @foreach($outcomes_undergrad as $outcome)
             <tr>
                 <td class="col-md-6">{{ $outcome->name }}</td>
-                <td class="col-md-2">{{{ $achievedProgramsPerOutcome[$outcome->id] }}}</td>
-                <td class="col-md-2">{{{ $attemptedProgramsPerOutcome[$outcome->id] }}}</td>
+                <td class="col-md-2">{{{ count($attemptedUndergradProgramsPerOutcome[$outcome->id]) }}}</td>
+                <td class="col-md-2">{{{ count($achievedUndergradProgramsPerOutcome[$outcome->id]) }}}</td>
                 <td class="col-md-2">
-                    @if($attemptedProgramsPerOutcome[$outcome->id]!=0)
-                        {{{ round($achievedProgramsPerOutcome[$outcome->id] / $attemptedProgramsPerOutcome[$outcome->id]*100, 2) }}}%
+                    @if(count($attemptedUndergradProgramsPerOutcome[$outcome->id])!=0)
+                        {{{ round( count($achievedUndergradProgramsPerOutcome[$outcome->id]) / count($attemptedUndergradProgramsPerOutcome[$outcome->id])*100, 2) }}}%
                     @else
                         N/M
                     @endif
@@ -70,7 +70,7 @@
 </table>
 
 <h3>Courses</h3>
-@if($school_sections_count>0)
+@if($undergrad_school_sections_count>0)
     <table>
         <thead>
             <tr>
@@ -81,7 +81,7 @@
             </tr>
         </thead>
         <tbody>
-            @foreach($grouped_courses as $grouped_course)
+            @foreach($undergrad_grouped_courses as $grouped_course)
                 <tr>
                     <td class="col-md-2">{{ $grouped_course->code.$grouped_course->number.' ('.$grouped_course->semester->code.')' }}</td>
                     <td class="col-md-4">{{{ $grouped_course->name}}}</td>
@@ -102,9 +102,9 @@
 @endif
 
 <h3>Sections</h3>
-@if($school_sections_count>0)
-    <p class="lead"> {{{ $assessed_sections_count }}} out of {{{ $school_sections_count }}} section(s) doing Assessment ({{{ round($assessed_sections_count/$school_sections_count*100, 2) }}}%)</p>
-    <table>
+@if($undergrad_school_sections_count>0)
+<p class="lead"> {{{ $undergrad_assessed_sections_count }}} out of {{{ $undergrad_school_sections_count }}} section(s) doing Assessment ({{{ round($undergrad_assessed_sections_count/$undergrad_school_sections_count*100, 2) }}}%)</p>
+<table>
         <thead>
             <tr>
                 <th>Identifier</th>
@@ -117,7 +117,9 @@
         </thead>
         <tbody>
             @foreach($school->programs as $program)
+            @if(!$program->is_graduate)
                 @foreach($program->courses as $course)
+               
                 <tr>
                     <td class="col-md-2">{{ $course->code.$course->number.'-'.$course->section.' ('.$course->semester->code.')' }}</td>
                     <td class="col-md-4">{{{ $course->name}}}</td>
@@ -125,16 +127,21 @@
                     <td class="col-md-3">{{{ $course->user->surnames }}}, {{{ $course->user->first_name }}}</td>
                     <td class="col-md-1">
                         @if(count($course->assessedActivities))
-                            <span class="glyphicon glyphicon-ok"></span>
+                            Yes
+                        @else
+                            No
                         @endif
                     </td>
                     <td class="col-md-1">
                         @if(count($course->publishedActivities))
-                            <span class="glyphicon glyphicon-ok"></span>
+                            Yes
+                        @else
+                            No
                         @endif
                     </td>
                 </tr>
                 @endforeach
+            @endif
             @endforeach
         </tbody>
     </table>
@@ -142,6 +149,123 @@
     <p class="lead"> No sections assigned.</p>
 @endif
 
+
+<br>
+<br>
+<br>
+<div class="row">
+    <div class="col-md-12" id="graph-grad"></div>
+</div>
+
+
+<h3>Assessment Results by Learning Outcomes in Academic Graduate Programs</h3>
+<table>
+    <thead>
+        <th>Learning Outcome</th>
+        <th>Programs Achieved</th>
+        <th>Programs doing Assessment</th>
+        <th>Success Rate</th>
+    </thead>
+    <tbody>
+        @foreach($outcomes_grad as $outcome)
+        <tr>
+            <td class="col-md-6">{{ link_to_action('OutcomesController@show', $outcome->name, array($outcome->id), $attributes = array()) }}</td>
+            <td class="col-md-2">{{{ count($attemptedGradProgramsPerOutcome[$outcome->id]) }}}</td>
+            <td class="col-md-2">{{{ count($achievedGradProgramsPerOutcome[$outcome->id]) }}}</td>
+            <td class="col-md-2">
+                @if(count($attemptedGradProgramsPerOutcome[$outcome->id])!=0)
+                    {{{ round(count($achievedGradProgramsPerOutcome[$outcome->id]) / count($attemptedGradProgramsPerOutcome[$outcome->id])*100, 2) }}}%
+                @else
+                    N/M
+                @endif
+            </td>
+        </tr>
+        @endforeach
+    </tbody>
+    <tfoot></tfoot>
+    <caption>N/M: Not Measured</caption>
+</table>
+
+
+<h3>Courses</h3>
+@if($grad_school_sections_count>0)
+    <table>
+        <thead>
+            <tr>
+                <th>Identifier</th>
+                <th>Name</th>
+                <th>Program</th>
+                <th>Assessed and Published</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach($grad_grouped_courses as $grouped_course)
+                <tr>
+                    <td class="col-md-2">{{ $grouped_course->code.$grouped_course->number.' ('.$grouped_course->semester->code.')' }}</td>
+                    <td class="col-md-4">{{{ $grouped_course->name}}}</td>
+                    <td class="col-md-2">{{{ $grouped_course->program->name }}}</td>
+                    <td class="col-md-1">
+                        @if($grouped_course->outcomes_attempted!=NULL)
+                            Yes
+                        @else
+                            No
+                        @endif
+                    </td>
+                </tr>
+            @endforeach
+        </tbody>
+    </table>
+@else
+    <p class="lead"> No courses assigned.</p>
+@endif
+
+<h3>Sections</h3>
+@if($grad_school_sections_count>0)
+<p class="lead"> {{{ $grad_assessed_sections_count }}} out of {{{ $grad_school_sections_count }}} section(s) doing Assessment ({{{ round($grad_assessed_sections_count/$grad_school_sections_count*100, 2) }}}%)</p>
+<table>
+        <thead>
+            <tr>
+                <th>Identifier</th>
+                <th>Name</th>
+                <th>Program</th>
+                <th>Professor</th>
+                <th>Assessed Activities</th>
+                <th>Assessed Results</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach($school->programs as $program)
+            @if($program->is_graduate)
+                @foreach($program->courses as $course)
+               
+                <tr>
+                    <td class="col-md-2">{{ $course->code.$course->number.'-'.$course->section.' ('.$course->semester->code.')' }}</td>
+                    <td class="col-md-4">{{{ $course->name}}}</td>
+                    <td class="col-md-2">{{{ $course->program->name }}}</td>
+                    <td class="col-md-3">{{{ $course->user->surnames }}}, {{{ $course->user->first_name }}}</td>
+                    <td class="col-md-1">
+                        @if(count($course->assessedActivities))
+                            Yes
+                        @else
+                            No
+                        @endif
+                    </td>
+                    <td class="col-md-1">
+                        @if(count($course->publishedActivities))
+                            Yes
+                        @else
+                            No
+                        @endif
+                    </td>
+                </tr>
+                @endforeach
+            @endif
+            @endforeach
+        </tbody>
+    </table>
+@else
+    <p class="lead"> No sections assigned.</p>
+@endif
 @stop
 
 @section('included-js')
@@ -159,21 +283,21 @@ $(function () {
         e.preventDefault()
         $(this).tab('show');
     });
-
-    $('#graph').highcharts({
+    
+    $('#graph-grad').highcharts({
         chart: {
             type: 'bar'
         },
         title: {
-            text: 'Performance by Learning Outcome Criteria in {{ $school->name }}'
+            text: 'Graduate Performance by {{ $school->name }} Students by Learning Outcome Criteria'
         },
         legend: {
             reversed: true,
         },
         xAxis: {
             categories: [
-                @foreach($outcomes as $outcome)
-                    "{{{ $outcome->name }}}",
+                @foreach($outcomes_grad as $outcome)
+                    "{{{ $outcome->name }}} <br> (N = {{$grad_outcomes_attempted[$outcome->id]}} , {{$grad_outcomes_achieved[$outcome->id]}})",
                 @endforeach
             ],
             labels: {
@@ -192,10 +316,48 @@ $(function () {
             max: 100,
             title: {
                 text: 'Percentage'
+            },
+            
+        @if(isset($default_grad))
+            plotLines:[{
+        value:66.67,
+        color: '#000',
+        width:3,
+        zIndex:4,
+        label:{
+            text: 'Goal (70%)',
+            style: {
+                color: '#000',
+                fontSize: '14px',
+            }
+
+        }
+    }]
+    @else
+    plotLines:[{
+        value:{{$linea_grad->expected_target}},
+        color: '#000',
+        width:3,
+        zIndex:4,
+        label:{
+            text: 'Goal ({{$linea_grad->expected_target}}%)',
+            style: {
+                color: '#000',
+                fontSize: '14px',
             }
+
+        }
+    }]
+
+    @endif
         },
         tooltip: {
-            enabled: false,
+            headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
+            pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
+                '<td style="padding:0"><b>{point.y:.2f}</b></td></tr>',
+            footerFormat: '</table>',
+            shared: true,
+            useHTML: true
         },
         plotOptions: {
             bar: {
@@ -208,7 +370,7 @@ $(function () {
             groupPadding: 0.075
             },
         },
-        series: [{
+        series: [/*{
             name: 'Expected Value',
             color: '#555555',
             dataLabels: {
@@ -223,19 +385,19 @@ $(function () {
                 y:-1
             },
             data: [
-                @foreach($outcomes as $index => $outcome)
+                @foreach($outcomes_grad as $index => $outcome)
                     @if(
-                        is_array($outcomes_attempted)
-                        && array_key_exists($outcome->id, $outcomes_attempted)
-                        && $outcomes_attempted[$outcome->id]!=0)
+                        is_array($grad_outcomes_attempted)
+                        && array_key_exists($outcome->id, $grad_outcomes_attempted)
+                        && $grad_outcomes_attempted[$outcome->id]!=0)
                         {{{ $outcome->expected_outcome }}},
                     @else
                         0,
                     @endif
                 @endforeach
-            ]
-
-        }, {
+            ],
+            pointPadding: 0,
+        }, */{
             name: 'Obtained Value',
             color: '#e70033',
             dataLabels: {
@@ -250,23 +412,185 @@ $(function () {
                 y:-1
             },
             data:[
-                @foreach($outcomes as $index => $outcome)
+                @foreach($outcomes_grad as $index => $outcome)
                     @if(
-                        is_array($outcomes_attempted)
-                        && array_key_exists($outcome->id, $outcomes_attempted)
-                        && $outcomes_attempted[$outcome->id]!=0)
-                        {{{ ($outcomes_achieved[$outcome->id]/$outcomes_attempted[$outcome->id])*100 }}},
+                        is_array($grad_outcomes_attempted)
+                        && array_key_exists($outcome->id, $grad_outcomes_attempted)
+                        && $grad_outcomes_attempted[$outcome->id]!=0)
+                        <?php
+                         if (isset($grad_outcomes_achieved[$outcome->id]))
+                        $achieved = $grad_outcomes_achieved[$outcome->id];
+                        else {
+                            $achieved =0;
+                        }
+                        ?>
+                        {{{ ($achieved/$grad_outcomes_attempted[$outcome->id])*100 }}},
                     @else
                         0,
                     @endif
                 @endforeach
+            ],
+            pointPadding: 0,
+        }]
+    });
+});
 
-            ]
-        }, ]
+    $('#graph-undergrad').highcharts({
+        chart: {
+            type: 'bar'
+        },
+        title: {
+            text: 'Undergraduate Performance of {{ $school->name }} Students by Learning Outcome'
+        },
+        legend: {
+            reversed: true,
+        },
+        xAxis: {
+            categories: [
+                @foreach($outcomes_undergrad as $outcome)
+                    "{{{ $outcome->name }}},  <br> (N = {{$undergrad_outcomes_attempted[$outcome->id]}} ,{{$undergrad_outcomes_achieved[$outcome->id]}})",
+                @endforeach
+            ],
+            labels: {
+                style: {
+                    fontSize:'11px'
+                },
+                step:1,
+                useHTML:true,
+                formatter: function() {
+                    return '<div style="width:200px; word-break:break; text-overflow:ellipsis; overflow:hidden;">'+this.value+'</div>';
+                },
+            }
+        },
+        yAxis: {
+            min: 0,
+            max: 100,
+            title: {
+                text: 'Percentage'
+            }, 
+        @if(isset($default_undergrad))
+            plotLines:[{
+        value:66.67,
+        color: '#000',
+        width:3,
+        zIndex:4,
+        label:{
+            text: 'Goal (70%)',
+            style: {
+                color: '#000',
+                fontSize: '14px',
+            }
+
+        }
+    }]
+    @else
+    plotLines:[{
+        value:{{$linea_undergrad->expected_target}},
+        color: '#000',
+        width:3,
+        zIndex:4,
+        label:{
+            text: 'Goal ({{$linea_undergrad->expected_target}}%)',
+            style: {
+                color: '#000',
+                fontSize: '14px',
+            }
+
+        }
+    }]
+
+    @endif
+        },
+        tooltip: {
+            headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
+            pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
+                '<td style="padding:0"><b>{point.y:.2f}</b></td></tr>',
+            footerFormat: '</table>',
+            shared: true,
+            useHTML: true
+        },
+        plotOptions: {
+            bar: {
+                //grouping: false,
+                shadow: false,
+                borderWidth: 0,
+            },
+            series: {
+            pointPadding: 0,
+            groupPadding: 0.075
+            },
+        },
+        series: [/*{
+            name: 'Expected Value',
+            color: '#555555',
+            dataLabels: {
+                enabled: true,
+                fontSize: 8,
+                color: '#fff',
+                align: 'right',
+                format: '{y:.1f}%',
+                style: {
+                    //fontWeight: 'bold'
+                }, 
+                y:-1
+            },
+            data: [
+                @foreach($outcomes_undergrad as $index => $outcome)
+                    @if(
+                        is_array($undergrad_outcomes_attempted)
+                        && array_key_exists($outcome->id, $undergrad_outcomes_attempted)
+                        && $undergrad_outcomes_attempted[$outcome->id]!=0)
+                        {{{ $outcome->expected_outcome }}},
+                    @else
+                        0,
+                    @endif
+                @endforeach
+            ],
+            pointPadding: 0,
+        },*/ {
+            name: 'Obtained Value',
+            color: '#e70033',
+            dataLabels: {
+                enabled: true,
+                fontSize: 8,
+                color: '#fff',
+                align: 'right',
+                format: '{y:.1f}%',
+                style: {
+                    //fontWeight: 'bold'
+                },
+                y:-1
+            },
+            data:[
+                @foreach($outcomes_undergrad as $index => $outcome)
+                    @if(
+                        is_array($undergrad_outcomes_attempted)
+                        && array_key_exists($outcome->id, $undergrad_outcomes_attempted)
+                        && $undergrad_outcomes_attempted[$outcome->id]!=0)
+                        <?php
+                        
+                        if (isset($undergrad_outcomes_achieved[$outcome->id]))
+                        $achieved = $undergrad_outcomes_achieved[$outcome->id];
+                        else {
+                            $achieved =0;
+                        }
+                        
+                        ?>
+                        {{{ ($achieved/$undergrad_outcomes_attempted[$outcome->id])*100 }}},
+                    @else
+                        0,
+                    @endif
+                @endforeach
+            ],
+            pointPadding: 0,
+        }]
     });
 
+
+   
+
     // Include dummy graph for outcomes
     @include('global.dummy-outcomes')
-});
+
 
 @stop

app/views/local/managers/shared/program.blade.php

@@ -242,7 +242,7 @@ reversed: true,
 xAxis: {
 categories: [
 @foreach($outcomes as $outcome)
-"{{{ $outcome->name }}}",
+"{{{ $outcome->name }}},  <br> (N = {{$outcomes_attempted[$outcome->id]}} ,{{$outcomes_achieved[$outcome->id]}})",
 @endforeach
 ],
 labels: {
@@ -261,7 +261,39 @@ min: 0,
 max: 100,
 title: {
 text: 'Percentage'
-}
+},
+@if($program->expected_outcome_target == null)
+                plotLines:[{
+            value:66.67,
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+                text: 'Goal (70%)',
+                style: {
+                    color: '#000',
+                    fontSize: '14px',
+                }
+    
+            }
+        }]
+        @else
+        plotLines:[{
+            value:{{$program->expected_outcome_target->expected_target}},
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+                text: 'Goal ({{$program->expected_outcome_target->expected_target}}%)',
+                style: {
+                    color: '#000',
+                    fontSize: '14px',
+                }
+    
+            }
+        }]
+
+        @endif
 },
 tooltip: {
 headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
@@ -282,7 +314,7 @@ pointPadding: 0,
 groupPadding: 0.075
 },
 },
-series: [{
+series: [/*{
 name: 'Expected Value',
 color: '#555555',
 dataLabels: {
@@ -309,7 +341,7 @@ is_array($outcomes_attempted)
 @endforeach
 ]
 
-},{
+},*/{
 name: 'Obtained Value',
 color: '#e70033',
 dataLabels: {

app/views/local/managers/shared/program_student_result.blade.php

@@ -321,6 +321,7 @@ $('#graph').highcharts({
         title: {
             text: 'Percentage'
         },
+        @if($program->expected_outcome_target == null)
 			plotLines:[{
 		value:70,
 		color: '#000',
@@ -335,6 +336,22 @@ $('#graph').highcharts({
 
 		}
 	}]
+    @else
+    plotLines:[{
+		value:{{$program->expected_outcome_target->expected_target}},
+		color: '#000',
+		width:3,
+		zIndex:4,
+		label:{
+			text: 'Goal ({{$program->expected_outcome_target->expected_target}}%)',
+			style: {
+				color: '#000',
+				fontSize: '14px',
+			}
+
+		}
+	}]
+    @endif
 
     },
     tooltip: {
@@ -443,21 +460,37 @@ $('#graph2').highcharts({
         max: 100,
         title: {
             text: 'Percentage'
-        },
-        			plotLines:[{
-		value:70,
-		color: '#000',
-		width:3,
-		zIndex:4,
-		label:{
-			text: 'Goal (70%)',
-			style: {
-				color: '#000',
-				fontSize: '14px',
-			}
+        },        @if($program->expected_outcome_target == null)
+        plotLines:[{
+    value:70,
+    color: '#000',
+    width:3,
+    zIndex:4,
+    label:{
+        text: 'Goal (70%)',
+        style: {
+            color: '#000',
+            fontSize: '14px',
+        }
 
-		}
-	}]
+    }
+}]
+@else
+plotLines:[{
+    value:{{$program->expected_outcome_target->expected_target}},
+    color: '#000',
+    width:3,
+    zIndex:4,
+    label:{
+        text: 'Goal ({{$program->expected_outcome_target->expected_target}}%)',
+        style: {
+            color: '#000',
+            fontSize: '14px',
+        }
+
+    }
+}]
+@endif
 
     },
     tooltip: {

app/views/local/managers/shared/school.blade.php

@@ -25,7 +25,8 @@
     <div role="tabpanel" class="tab-pane active" id="undergraduate">
         <div class="row">
             <div class="col-md-9 graph" id="graph-undergrad"></div>
-                <div class="col-md-3">
+
+            <div class="col-md-3">
                 <br>
                     <div class="panel panel-default panel-scrolling">
                         <div class="panel-heading" role="tab" id="headingOne">
@@ -52,8 +53,17 @@
                             </table>
                         </div>
                     </div>
+                    <br>
+
+                @if(isset($default_undergrad))
+                <p><strong>This Goal Bar is the default score. If you wish to change it, change it on the selected Semesters Annual Plan</strong></p>
+            @else
+                <p><strong>This Goal is from {{$linea_undergrad->program_name}} on the semester {{$linea_undergrad->semester_name}}</strong></p>
+    
+            @endif
                 </div>
-            </div>
+
+                        </div>
 
         <div>
             <!-- Nav tabs -->
@@ -61,6 +71,9 @@
                 <li role="presentation" class="active"><a href="#undergrad-outcomes-assessed" aria-controls="undergrad-outcomes-assessed" role="tab">Assessment Results by Learning Outcomes in Academic Programs</a></li>
                 <li role="presentation"><a href="#undergrad-courses" aria-controls="undergrad-courses" role="tab"> Undergraduate Courses</a></li>
                 <li role="presentation"><a href="#undergrad-sections" aria-controls="undergrad-sections" role="tab">Sections</a></li>
+               <!-- <li role="presentation"><a href="#performance-undergrad-students" aria-controls = 'performance-undergrad-students' role="tab">Performance by Students in Learning Outcomes</a></li>-->
+
+      
             </ul>
 
             <!-- Tab panes -->
@@ -213,6 +226,7 @@
                         </div>
                     </div>
                 </div>
+                <div role="tabpanel" class="tab-pane" id="performance-undergrad-students"></div>
             </div>
         </div>
     </div>
@@ -247,6 +261,15 @@
                             </table>
                         </div>
                     </div>
+
+                    <br>
+
+                    @if(isset($default_grad))
+                    <p><strong>This Goal Bar is the default score. If you wish to change it, change it on the selected Semesters Annual Plan</strong></p>
+                @else
+                    <p><strong>This Goal is from {{$linea_grad->program_name}} on the semester {{$linea_grad->semester_name}}</strong></p>
+        
+                @endif
                 </div>
             </div>
 
@@ -256,6 +279,7 @@
                 <li role="presentation" class="active"><a href="#grad-outcomes-assessed" aria-controls="grad-outcomes-assessed" role="tab">Assessment Results by Learning Outcomes in Academic Programs</a></li>
                 <li role="presentation"><a href="#grad-courses" aria-controls="grad-courses" role="tab"> Graduate Courses</a></li>
                 <li role="presentation"><a href="#grad-sections" aria-controls="grad-sections" role="tab">Sections</a></li>
+                <!--<li role="presentation"><a href="#performance-grad-students" aria-controls = 'performance-grad-students' role="tab">Performance by Students in Learning Outcomes</a></li>-->
             </ul>
 
             <!-- Tab panes -->
@@ -408,6 +432,8 @@
                         </div>
                     </div>
                 </div>
+                <div role="tabpanel" class = "tab-pane" id = "performance-grad-students">
+                </div>
             </div>
         </div>
     </div>
@@ -449,7 +475,7 @@ $(function () {
                 type: 'bar'
             },
             title: {
-                text: 'Undergraduate Performance by Learning Outcome Criteria in {{ $school->name }}'
+                text: 'Undergraduate Performance of {{ $school->name }} Students by Learning Outcome'
             },
             legend: {
                 reversed: true,
@@ -476,7 +502,39 @@ $(function () {
                 max: 100,
                 title: {
                     text: 'Percentage'
+                }, 
+            @if(isset($default_undergrad))
+                plotLines:[{
+            value:66.67,
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+                text: 'Goal (70%)',
+                style: {
+                    color: '#000',
+                    fontSize: '14px',
+                }
+    
+            }
+        }]
+        @else
+        plotLines:[{
+            value:{{$linea_undergrad->expected_target}},
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+                text: 'Goal ({{$linea_undergrad->expected_target}}%)',
+                style: {
+                    color: '#000',
+                    fontSize: '14px',
                 }
+    
+            }
+        }]
+
+        @endif
             },
             tooltip: {
                 headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
@@ -568,7 +626,7 @@ $(function () {
                 type: 'bar'
             },
             title: {
-                text: 'Graduate Performance by Learning Outcome Criteria in {{ $school->name }}'
+                text: 'Graduate Performance by {{ $school->name }} Students by Learning Outcome Criteria'
             },
             legend: {
                 reversed: true,
@@ -595,7 +653,40 @@ $(function () {
                 max: 100,
                 title: {
                     text: 'Percentage'
+                },
+                
+            @if(isset($default_grad))
+                plotLines:[{
+            value:70.00,
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+                text: 'Goal (70%)',
+                style: {
+                    color: '#000',
+                    fontSize: '14px',
+                }
+    
+            }
+        }]
+        @else
+        plotLines:[{
+            value:{{$linea_grad->expected_target}},
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+                text: 'Goal ({{$linea_grad->expected_target}}%)',
+                style: {
+                    color: '#000',
+                    fontSize: '14px',
                 }
+    
+            }
+        }]
+
+        @endif
             },
             tooltip: {
                 headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
@@ -616,7 +707,7 @@ $(function () {
                 groupPadding: 0.075
                 },
             },
-            series: [{
+            series: [/*{
                 name: 'Expected Value',
                 color: '#555555',
                 dataLabels: {
@@ -643,7 +734,7 @@ $(function () {
                     @endforeach
                 ],
                 pointPadding: 0,
-            }, {
+            }, */{
                 name: 'Obtained Value',
                 color: '#e70033',
                 dataLabels: {
@@ -713,7 +804,39 @@ $(function () {
                 max: 100,
                 title: {
                     text: 'Percentage'
+                }, 
+                @if(isset($default_undergrad))
+                    plotLines:[{
+                value:66.67,
+                color: '#000',
+                width:3,
+                zIndex:4,
+                label:{
+                    text: 'Goal (70%)',
+                    style: {
+                        color: '#000',
+                        fontSize: '14px',
+                    }
+        
                 }
+            }]
+            @else
+            plotLines:[{
+                value:{{$linea_undergrad->expected_target}},
+                color: '#000',
+                width:3,
+                zIndex:4,
+                label:{
+                    text: 'Goal ({{$linea_undergrad->expected_target}}%)',
+                    style: {
+                        color: '#000',
+                        fontSize: '14px',
+                    }
+        
+                }
+            }]
+    
+            @endif
             },
             tooltip: {
                 headerFormat: '<span style="font-size:10px">{point.key}</span><table>',

app/views/local/professors/activity.blade.php

@@ -506,7 +506,7 @@
         //array_key_exists($outcome->id, $outcomes_attempted) &&
         //$outcomes_attempted[$outcome->id] != 0
         )
-        
+         
             <?php
             $attempted = $outcomes_activity[$outcome->id]->attempted;
             $achieved = $outcomes_activity[$outcome->id]->achieved;
@@ -539,14 +539,15 @@
     title: {
     text: 'Percentage'
     }, 
+    @if($activity->course->program->expected_outcome_target == null)
     
 			plotLines:[{
-		value:66.67,
+		value:70.00,
 		color: '#000',
 		width:3,
 		zIndex:4,
 		label:{
-			text: 'Goal (66.67%)',
+			text: 'Goal (70.00%)',
 			style: {
 				color: '#000',
 				fontSize: '14px',
@@ -554,6 +555,25 @@
 
 		}
 	}]
+
+    @else
+    plotLines:[{
+		value:{{$activity->course->program->expected_outcome_target->expected_target}},
+		color: '#000',
+		width:3,
+		zIndex:4,
+		label:{
+			text: 'Goal ({{$activity->course->program->expected_outcome_target->expected_target}})',
+			style: {
+				color: '#000',
+				fontSize: '14px',
+			}
+
+		}
+	}]
+
+    @endif
+
     },
     tooltip: {
     headerFormat: '<span style="font-size:10px">{point.key}</span><table>',

app/views/local/professors/compare_activities.blade.php

@@ -843,14 +843,29 @@
         title: {
         text: 'Percentage'
         }, 
-        
-                plotLines:[{
-            value:66.67,
+        @if($activity_1->course->program->expected_outcome_target == null)
+        plotLines:[{
+            value:70.00,
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+                text: 'Goal (70.00%)',
+                style: {
+                    color: '#000',
+                    fontSize: '14px',
+                }
+    
+            }
+        }]
+        @else
+        plotLines:[{
+            value:{{$activity_1->course->program->expected_outcome_target->expected_target}},
             color: '#000',
             width:3,
             zIndex:4,
             label:{
-                text: 'Goal (66.67%)',
+                text: 'Goal ({{$activity_1->course->program->expected_outcome_target->expected_target}}%)',
                 style: {
                     color: '#000',
                     fontSize: '14px',
@@ -858,6 +873,8 @@
     
             }
         }]
+        @endif
+
     },
     tooltip: {
     headerFormat: '<span style="font-size:10px">{point.key}</span>'+
@@ -968,14 +985,16 @@
         title: {
         text: 'Percentage'
         }, 
+
+        @if($activity_2->course->program->expected_outcome_target == null)
         
                 plotLines:[{
-            value:66.67,
+            value:70.00,
             color: '#000',
             width:3,
             zIndex:4,
             label:{
-                text: 'Goal (66.67%)',
+                text: 'Goal (70.00%)',
                 style: {
                     color: '#000',
                     fontSize: '14px',
@@ -983,6 +1002,25 @@
     
             }
         }]
+        @else
+         
+        plotLines:[{
+            value:{{$activity_2->course->program->expected_outcome_target->expected_target}},
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+                text: 'Goal ({{$activity_2->course->program->expected_outcome_target->expected_target}}%)',
+                style: {
+                    color: '#000',
+                    fontSize: '14px',
+                }
+    
+            }
+        }]
+
+        @endif
+        
     },
     tooltip: {
     headerFormat: '<span style="font-size:10px">{point.key}</span>'+

app/views/local/professors/course.blade.php

@@ -311,13 +311,14 @@ $(function () {
             title: {
                 text: 'Percentage'
             },
+            @if($course->program->expected_outcome_target == null)
             plotLines:[{
-                value:66.67,
+                value:70.00,
                 color: '#000',
                 width:3,
                 zIndex:4,
                 label:{
-                    text: 'Goal (66.67%)',
+                    text: 'Goal (70.00%)',
                     style: {
                         color: '#000',
                         fontSize: '14px',
@@ -325,6 +326,23 @@ $(function () {
         
                 }
             }]
+            @else
+            plotLines:[{
+                value:{{$course->program->expected_outcome_target->expected_target}},
+                color: '#000',
+                width:3,
+                zIndex:4,
+                label:{
+                    text: 'Goal ({{$course->program->expected_outcome_target->expected_target}}%)',
+                    style: {
+                        color: '#000',
+                        fontSize: '14px',
+                    }
+        
+                }
+            }]
+            @endif
+
         },
         tooltip: {
             headerFormat: '<span style="font-size:10px">{point.key}</span><table>',

app/views/local/professors/overview.blade.php

@@ -174,14 +174,14 @@ function loadGraphs() {
                     text: 'Percentage'
                 },
 
-                
+                @if($grouped_course->program->expected_outcome_target == null)
 			plotLines:[{
-		value:66.67,
+		value:70.00,
 		color: '#000',
 		width:3,
 		zIndex:4,
 		label:{
-			text: 'Goal (66.67%)',
+			text: 'Goal (70.00%)',
 			style: {
 				color: '#000',
 				fontSize: '14px',
@@ -189,6 +189,22 @@ function loadGraphs() {
 
 		}
 	}]
+    @else			plotLines:[{
+		value:{{$grouped_course->program->expected_outcome_target->expected_target}},
+		color: '#000',
+		width:3,
+		zIndex:4,
+		label:{
+			text: 'Goal ({{$grouped_course->program->expected_outcome_target->expected_target}})',
+			style: {
+				color: '#000',
+				fontSize: '14px',
+			}
+
+		}
+	}]
+    @endif
+
 
             },
             tooltip: {

app/views/local/professors/program.blade.php

@@ -14,9 +14,13 @@
 
 @section('main')
 
-<div class="row">
+<button type='button' class = 'btn btn-primary' id="change-view-btn" onclick="changeView('#allGraph','#programGraph', '', 'Show All Students')">Show Program Students</button>
+<div class="row" id = "allGraph">
     <div class="col-md-12" id="graph"></div>
 </div>
+<div class="row graph-stu" id = "programGraph">
+    <div class = "col-md-12" id="graph-stu-program"></div>
+</div>
 
 <div class="row">
     <div class="col-md-12">
@@ -94,6 +98,23 @@
     </div>
 </div>
 
+<script>
+
+function changeView(graph_to_hide, graph_to_show, index, message){
+
+current_message = $("#change-view-btn"+index).html();
+$("#change-view-btn"+index).html(message);
+
+$(graph_to_hide).hide()
+$(graph_to_show).show()
+
+
+$("#change-view-btn"+index).attr('onclick','changeView("'+graph_to_show+'", "'+graph_to_hide+'","'+index+'","'+current_message+'")')
+}
+
+$(".graph-stu").hide();
+</script>
+
 @stop
 
 @section('included-js')
@@ -116,7 +137,7 @@ $(function () {
         xAxis: {
             categories: [
                 @foreach($outcomes as $outcome)
-                    "{{{ $outcome->name }}}",
+                    "{{{ $outcome->name }}}<br> (N = {{$outcomes_attempted[$outcome->id]}}, {{$outcomes_achieved[$outcome->id]}})",
                 @endforeach
             ],
             labels: {
@@ -135,21 +156,38 @@ $(function () {
             max: 100,
             title: {
                 text: 'Percentage'
-            },
-			plotLines:[{
-                value:66.67,
+            },@if($program->expected_outcome_target == null)
+            plotLines:[{
+        value:70.00,
+        color: '#000',
+        width:3,
+        zIndex:4,
+        label:{
+            text: 'Goal (70.00%)',
+            style: {
                 color: '#000',
-                width:3,
-                zIndex:4,
-                label:{
-                    text: 'Goal (66.67%)',
-                    style: {
-                        color: '#000',
-                        fontSize: '14px',
-                    }
-        
-                }
-            }]
+                fontSize: '14px',
+            }
+
+        }
+    }]
+    @else
+    plotLines:[{
+        value:{{$program->expected_outcome_target->expected_target}},
+        color: '#000',
+        width:3,
+        zIndex:4,
+        label:{
+            text: 'Goal ({{$program->expected_outcome_target->expected_target}}%)',
+            style: {
+                color: '#000',
+                fontSize: '14px',
+            }
+
+        }
+    }]
+
+    @endif
         },
         tooltip: {
             headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
@@ -236,6 +274,119 @@ $(function () {
         } --}}]
     });
 
+    
+$('#graph-stu-program').highcharts({
+    chart: {
+        type: 'bar'
+    },
+    title: {
+        text: 'Performance by Learning Outcome Criteria in Program\'s students'
+    },
+    legend: {
+        reversed: true,
+    },
+    xAxis: {
+        categories: [
+            @foreach($outcomes as $outcome)
+                "{{{ $outcome->name }}} <br>(N = {{$program_outcomes_attempted[$outcome->id]}}, {{$program_outcomes_achieved[$outcome->id]}})",
+            @endforeach
+        ],
+        labels: {
+            style: {
+                fontSize:'11px'
+            },
+            step:1,
+            useHTML:true,
+            formatter: function() {
+                return '<div style="width:100px; word-break:break; text-overflow:ellipsis; overflow:hidden;">'+this.value+'</div>';
+            },
+        }
+    },
+   
+    yAxis: {
+        min: 0,
+        max: 100,
+        title: {
+        text: 'Percentage'
+        }, 
+        @if($program->expected_outcome_target == null)
+                plotLines:[{
+            value:70.00,
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+                text: 'Goal (70.00%)',
+                style: {
+                    color: '#000',
+                    fontSize: '14px',
+                }
+    
+            }
+        }]
+        @else
+        plotLines:[{
+            value:{{$program->expected_outcome_target->expected_target}},
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+                text: 'Goal ({{$program->expected_outcome_target->expected_target}}%)',
+                style: {
+                    color: '#000',
+                    fontSize: '14px',
+                }
+    
+            }
+        }]
+
+        @endif
+    },
+    tooltip: {
+        enabled:false
+    },
+    plotOptions: {
+            bar: {
+                //grouping: false,
+                shadow: false,
+                borderWidth: 0,
+            },
+            series: {
+                pointPadding: 0,
+                groupPadding: 0.075,
+                animation: false
+            },
+        },
+    series: [{
+        name: 'Obtained Value',
+        color: '#e70033',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y:-1
+        },
+        data:[
+            @foreach($outcomes as $index => $outcome)
+                @if(
+                    is_array($program_outcomes_attempted)
+                    && array_key_exists($outcome->id, $program_outcomes_attempted)
+                    && $program_outcomes_attempted[$outcome->id]!=0)
+                    {{{ ($program_outcomes_achieved[$outcome->id]/$program_outcomes_attempted[$outcome->id])*100 }}},
+                @else
+                    0,
+                @endif
+            @endforeach
+
+        ]
+    }]
+});
+
     // Include dummy graph for outcomes
     @include('global.dummy-outcomes')
 });