Se crea pagina de agreement para todos los usuarios. Se arregla texto en annual plans. Se anhade auto-sum en activities assess

app/config/app.php

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

app/controllers/ActivitiesController.php

@@ -226,14 +226,15 @@ class ActivitiesController extends \BaseController
             ->addSelect('activity_criterion.activity_id', 'activity_criterion.weight', 'activity_criterion.id as activity_criterion_id')
             ->addSelect('rubric_criterion.rubric_id', 'rubric_criterion.id as rubric_criterion_id')
             ->get();
-
+$total_weights=0;
         foreach ($rubric_criterion as $index => $singleCR) {
             $singleCR->scales = json_encode(DB::table('scales')
                 ->join('criterion_scale', 'criterion_scale.scale_id', '=', 'scales.id')
                 ->where('criterion_scale.criterion_id', '=', $singleCR->criterion_id)
                 ->orderBy('position')
                 ->lists('description'));
-        }
+             $total_weights+=$singleCR->weight;
+       }
         $rubric_criterion_ids = DB::table('rubric_criterion')->where('rubric_id', '=', $rubric->id)->lists('id');
 
 
@@ -260,7 +261,7 @@ class ActivitiesController extends \BaseController
         }
 
 
-        return View::make('local.professors.assessment', compact('activity', 'title', 'students', 'course', 'rubric_criterion', 'assessments', 'scores_array', 'rubric'));
+        return View::make('local.professors.assessment', compact('total_weights', 'activity', 'title', 'students', 'course', 'rubric_criterion', 'assessments', 'scores_array', 'rubric'));
     }
 
     public function saveAssessment()

app/controllers/AgreementController.php

@@ -0,0 +1,117 @@
+<?php
+
+class AgreementController extends \BaseController {
+
+	/**
+	 * Display a listing of the resource.
+	 *
+	 * @return Response
+	 */
+	public function index()
+	{
+		//
+			$user = Auth::user();
+		$title = "Agreement";
+	return View::make('global.agreement',compact( 'title', 'user'));
+	}
+
+
+	/**
+	 * Show the form for creating a new resource.
+	 *
+	 * @return Response
+	 */
+	public function 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
+		{
+			return Redirect::intended('logout');
+
+		}
+	
+
+		//
+	}
+
+
+	/**
+	 * Store a newly created resource in storage.
+	 *
+	 * @return Response
+	 */
+	public function store()
+	{
+		//
+	}
+
+
+	/**
+	 * Display the specified resource.
+	 *
+	 * @param  int  $id
+	 * @return Response
+	 */
+	public function show($id)
+	{
+		//
+	}
+
+
+	/**
+	 * Show the form for editing the specified resource.
+	 *
+	 * @param  int  $id
+	 * @return Response
+	 */
+	public function edit($id)
+	{
+		//
+	}
+
+
+	/**
+	 * Update the specified resource in storage.
+	 *
+	 * @param  int  $id
+	 * @return Response
+	 */
+	public function update($id)
+	{
+		//
+	}
+
+
+	/**
+	 * Remove the specified resource from storage.
+	 *
+	 * @param  int  $id
+	 * @return Response
+	 */
+	public function destroy($id)
+	{
+		//
+	}
+
+
+}

app/controllers/AnnualPlansController.php

@@ -1,7 +1,7 @@
 <?php
 
 use Barryvdh\DomPDF\PDF as PDF;
-use Response;
+// use Response;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;

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'));
@@ -141,6 +141,7 @@ class AuthController extends \BaseController
 			}
 
 			// Redirect depending on user
+						return Redirect::intended('agreement');
 			switch (Auth::user()->role) {
 				case 1:
 					return Redirect::intended('administrator');
@@ -148,6 +149,7 @@ class AuthController extends \BaseController
 
 				case 2:
 					return Redirect::intended('school-coordinator');
+// 					return Redirect::intended('agreement');
 					break;
 
 				case 3:

app/controllers/FeedbackController.php

@@ -80,10 +80,10 @@ class FeedbackController extends \BaseController {
           	Mail::send('emails.feedback-email-copy', $data, function($message){
         		$message
         		->to(Input::get('email'), Auth::user()->first_name.' '.Auth::user()->surnames)
-                ->cc('oeae.uprrp@upr.edu')
+                ->cc('peticiones.diia@upr.edu')
         		->subject('Feedback for OLAS');
     		});
-
+//peticiones.diia@upr.edu
             Session::flash('status', 'success');
             Session::flash('message', '<p>Success! Check your email for a copy of your message. Thank you for your feedback. </p>');
             return Redirect::back();

app/routes.php

@@ -355,7 +355,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
         array('only' => array('create'))
     );
 
-    // Show users all learning outcomes and criteria
+ 	Route::get('agreement', 'AgreementController@index');
+    Route::post('agreement/agree', array('before' => 'csrf', 'uses' => 'AgreementController@agree'));
+
+   // Show users all learning outcomes and criteria
     Route::get('learning-outcomes-criteria', 'CriteriaController@index');
     Route::post('fetchOutcome', array('before' => 'csrf', 'uses' => 'OutcomesController@fetchOutcome'));
     // Show users all objectives and criteria

app/views/global/agreement.blade.php

@@ -0,0 +1,37 @@
+@extends('layouts.master')
+
+@section('main')
+
+    <div class="row">
+        <div class="col-md-12">
+The Family Educational Rights and Privacy Act of 1974 (FERPA) establishes parameters for the protection of the confidentiality of student academic information, recognizing their right to inspect and review their academic records. In 2012, an amendment was approved, which extended access conditions to any designated third party to private information of personal identification and to that found in academic records, including grades, with the purpose of academic progress evaluation. Consequently, seeking to improve, among many things, the effectiveness of said academic program. 
+</p><p>
+Student learning assessment is an activity mandated by the institutional rules, and a practice tied to the teaching process which seeks to measure the effectiveness and promote transformation aimed at excellence. OLAS, an online platform created on Campus, compiles information about the performance of students through assessment rubrics developed and used by its users (assessment coordinators of both the Division of Institutional Research and Assessment and of the faculties, as well as professors) who compile and receive data. 
+</p><p>
+FERPA defines an authorized representative as any entity or designated individual by a state or local authority, who conducts any audit or evaluation or any compliance activity in connection with federal legal requirements related to the programs. It could be any officer or university official that has a legitimate academic interest as part of his/her professional-administrative responsibilities, academic supervision, research, or support under the duties he/she carries. 
+</p><p>
+The Division of Institutional Research and Assessment (DIIA for its Spanish acronym) during the process of receiving, analyzing, and disseminating information contained in learning assessment reports generated by each faculty uses reasonable methods like the constant monitoring of the online platform, controlled access to the program, among other measures, to ensure that it keeps the identity of the student protected. 
+</p><p>
+Your login to this platform and the reading of the information related to the management of the student’s file, exposed above, implies that:
+</p><ul>
+<li>	you agree that the data located on and extracted from the platform is for educational purposes
+<li>	you act within the framework of its role as coordinator of the learning assessment  and/or professor and
+<li>	you are committed to safeguarding the principle of privacy and confidentiality of the student.
+</ul>
+
+            {{ Form::open(['action' => 'AgreementController@agree', 'class' => 'form-horizontal']) }}
+            <div class="form-group">
+             <div class="form-group">
+                <div class="col-md-6">
+                    {{ Form::submit('Do not Agree', ['class' => 'btn btn-lg btn-primary pull-right','name'=>"submitbutton"]) }}
+                </div>
+                <div class="col-md-6">
+                    {{ Form::submit('Agree', ['class' => 'btn btn-lg btn-primary pull-left','name'=>"submitbutton"]) }}
+                </div>
+            </div>
+
+            {{ Form::close() }}
+        </div>
+    </div>
+
+@stop

app/views/global/feedback.blade.php

@@ -33,7 +33,7 @@
                             '3' => 'Other',
                         ],
                         null,
-                        ['class' => 'form-control', 'name' => 'type'],
+                        ['class' => 'form-control', 'name' => 'type']
                     ) }}
                 </div>
             </div>

app/views/local/managers/shared/annual-plans.blade.php

@@ -273,7 +273,7 @@
                     $('.no-outcome').parent().hide();
 
                     $('#criteria_for_courses').html('Criteria for Courses Associated to ' + name);
-                    $('#transformative_title').html('Transformative Actions for ' + name);
+                    $('#transformative_title').html('Activities Assessment and Program Transformative Actions for ' + name);
                     $('#outcome-display .panel-title').html(name);
 
                     $('#submit_modal').hide();
@@ -521,7 +521,7 @@
                         $('#expected-outcome .form-control').val(expected_target.expected_target);
 
                         $('#criteria_for_courses').html('Criteria for Courses Associated to ' + name);
-                        $('#transformative_title').html('Transformative Actions for ' + name);
+                        $('#transformative_title').html('Activities Assessment and Program Transformative Actions for ' + name);
 
 
 

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

@@ -109,6 +109,12 @@
                         Weight<input class="form-control" id="weight-{{$index}}" name='weight[]' type="text"  value="{{$criterion->weight}}" data-activity-criterion-id="{{$criterion->activity_criterion_id}}">
                         </div></th>
                 @endforeach
+                <th colspan=3>
+                <div class="th-box">
+                        
+                        Total<input class="form-control" id="total" name='total' type="text"  value="{{$total_weights}}" readonly>
+                        </div>
+                </th>
                 </tr>
                     <tr>
                         <th>
@@ -477,9 +483,10 @@ function percentagePerStudent(row)
     var max_score = parseInt($('#max').val());
     sum_of_weight = 0;
     per_of_weight =0;
-
+	var sum_of_weight_fixed=0.0;
     row.find('td.score-field').each(function(index)
-    {
+    {	
+    	sum_of_weight_fixed+=parseFloat($('#weight-'+index).val());
         var val = parseInt($(this).children('select').find(':selected').val());
         if(val % 1 === 0) //If number is integer
         {
@@ -490,6 +497,9 @@ function percentagePerStudent(row)
         }
 
     });
+    $('#total').val(sum_of_weight_fixed.toFixed(2));
+<!--     console.log(sum_of_weight_fixed); -->
+
     percentage_per_weight = (100 *(per_of_weight/(max_score*sum_of_weight))).toFixed(2);
     percentage =((sum/(total*max_score))*100).toFixed(2);