subir y matricular estudiantes

app/controllers/CoursesController.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Facades\Log;
+
 class
 CoursesController extends \BaseController
 {
@@ -50,6 +52,176 @@ CoursesController extends \BaseController
         return View::make('local.professors.course', compact('title', 'course', 'activities', 'students', 'outcomes', 'outcomes_achieved', 'outcomes_attempted', 'active_semesters'));
     }
 
+    public function editView()
+    {
+        $title = 'Create/Edit Course';
+        switch (Auth::user()->role) {
+            case 1:
+
+                $programs = Program::with('school')->orderBy('name', 'asc')->get();
+                $professors = User::select(array('id', 'first_name', 'surnames'))->orderBy('surnames', 'asc')->orderBy('first_name', 'asc')->get();
+                break;
+            case 2:
+                $programs = Program::where("school_id", Auth::user()->school->id);
+                $professors = User::fromSchool(Auth::user()->school->id)->select(array('id', 'first_name', 'surnames'))->orderBy('surnames', 'asc')->orderBy('first_name', 'asc')->get();
+                break;
+            case 3:
+                $programs = Auth::user()->programs;
+                $program_ids = Program::join('program_user', 'program_user.program_id', '=', 'programs.id')
+                    ->where('program_user.user_id', Auth::user()->id)
+                    ->lists('programs.id');
+
+                $professors = User::fromPrograms($program_ids)->select(array('id', 'first_name', 'surnames'))->orderBy('surnames', 'asc')->orderBy('first_name', 'asc')->get();
+                break;
+        }
+        //$users = User::select(array('id', 'first_name', 'surnames'))->orderBy('surnames', 'asc')->orderBy('first_name', 'asc')->get();
+        $semesters = Semester::where('is_visible', '1')->orderBy('start', 'desc')->get();
+        $modalities = DB::table("courses")
+            ->groupBy("modality")
+            ->lists("modality");
+
+        return View::make('local.managers.shared.course_edit', compact('title', 'programs', 'professors', 'modalities', 'semesters'));
+    }
+
+    public function create()
+    {
+
+        $all_input = Input::all();
+        $name = $all_input['name'];
+        $code = $all_input['code'];
+        $number = $all_input['number'];
+        $section = $all_input['section'];
+        $program = $all_input['program'];
+        $professor_id = $all_input['professor_id'];
+        $semester_id = $all_input['semester_id'];
+        //Input::file('students')//->move('course_student/', 'test.txt');
+
+
+
+        Log::info($all_input);
+
+        /** Instantiate new Objective */
+        $course = new Course;
+        $course->name = $name;
+        $course->code = $code;
+        $course->number = $number;
+        $course->section = $section;
+        $course->program_id = $program;
+        $course->user_id = $professor_id;
+        $course->semester_id = $semester_id;
+
+
+
+
+
+
+
+        /** If Objective is saved, send success message */
+        if ($course->save()) {
+
+            //$students->move('./course_student', 'test.txt');
+            $student_nums = file(Input::file('students'));
+
+            if ($student_nums) {
+                foreach ($student_nums as $stu_num) {
+                    Log::info($stu_num);
+                    Log::info("Stunum");
+                    $student_id = DB::select("select id from students where number = " . $stu_num);
+                    /*DB::table("students")
+                        ->where('number', '=', $stu_num)
+                        ->first();
+                    */
+                    if ($student_id) {
+                        $student_id = $student_id[0]->id;
+                        DB::table("course_student")
+                            ->insert(array(
+                                'course_id' => $course->id,
+                                'student_id' => $student_id,
+                                'semester_id' => $course->semester_id
+                            ));
+                    } else {
+                        $course->forceDelete();
+                        Session::flash('status', 'danger');
+                        Session::flash('message', '<p>Error Enrolling students. Please try again later.</p>');
+                        return Redirect::to('editCourses')->withInput();
+                    }
+                }
+
+                Session::flash('status', 'success');
+                Session::flash('message', 'Course created: "' . $course->name . '".');
+                return Redirect::to('editCourses');
+
+
+
+                //fclose($student_nums);
+            } else {
+                $course->forceDelete();
+                Session::flash('status', 'danger');
+                Session::flash('message', '<p>Error creating course. Please try again later.</p>');
+                return Redirect::to('editCourses')->withInput();
+            }
+            /*$objectiveId = $objective->id;
+
+            Log::info($clean_input['outcome_id']);
+
+
+
+
+            foreach ($clean_input['program_id'] as $program_id) {
+                DB::insert("insert into objective_program (objective_id, program_id) values({$objectiveId},{$program_id})");
+            }
+            foreach ($clean_input['outcome_id'] as $outcome_id) {
+                DB::insert("insert into `objective_outcome` (objective_id, outcome_id) values ({$objectiveId}, {$outcome_id})");
+                //DB::raw("insert ignore into `objective_outcome` (objective_id, outcome_id) values ({$objectiveId}, {$outcome_id})");
+                /*if (!($objectiveOutcome->save())) {
+                    Session::flash('status', 'danger');
+                    Session::flash('message', '<p>Error creating objective. Please try again later.</p>');
+                    return Redirect::to('objective')->withInput();
+                }
+            }
+            DB::table('criterion_objective_outcome')
+                ->join('program_criterion', 'criterion_objective_outcome.criterion_id', "=", 'program_criterion.criterion_id')
+                ->whereIn('program_id', $clean_input['program_id'])
+                ->whereIn('outcome_id', $clean_input['outcome_id'])
+                ->where('objective_id', '=', 0)
+                ->update(array('objective_id' => $objectiveId));
+            // 				update("update criterion_objective_outcome coo join program_criterion pc on coo.criterion_id=pc.criterion_id set 
+            // 				objective_id= {$objectiveId} where program_id in (".$clean_input['program_id'].") and objective_id=0 and outcome_id in (".$clean_input['outcome_id'].")");
+            */
+
+            /*$role = Auth::user()['role'];
+            switch ($role) {
+                case 1:
+                    return Redirect::to('objective')->withInput(Input::only('outcome_id'));
+
+                case 2:
+                    return Redirect::to('school-objective')->withInput(Input::only('outcome_id'));
+
+                case 3:
+                    return Redirect::to('program-objective')->withInput(Input::only('outcome_id'));
+            }*/
+        }
+
+        /** If saving fails, send error message and old data */
+        else {
+            Session::flash('status', 'danger');
+            Session::flash('message', '<p>Error creating course. Please try again later.</p>');
+            return Redirect::to('editCourse')->withInput();
+            /*$role = Auth::user()['role'];
+            switch ($role) {
+                case 1:
+                    return Redirect::to('objective')->withInput();
+
+                case 2:
+                    return Redirect::to('school-objective')->withInput();
+
+                case 3:
+                    return Redirect::to('program-objective')->withInput();
+            }*/
+        }
+    }
+
+
     public function newShow($id)
     {
         $course = Course::findOrFail($id);
@@ -231,8 +403,8 @@ CoursesController extends \BaseController
             ->where('semester_id', $semester->id)
             ->groupBy(array('code', 'number'))->get();
 
-//         Log::info($grouped_courses[0]->id);
-// exit();
+        //         Log::info($grouped_courses[0]->id);
+        // exit();
         $level = DB::table('courses')
             ->join('programs', 'programs.id', '=', 'courses.program_id')
             ->where('courses.id', $grouped_courses[0]->id)
@@ -242,7 +414,7 @@ CoursesController extends \BaseController
         $outcomes = Outcome::active_by_semesters(array($semester), $level->is_graduate);
 
 
-//         $outcomes = Outcome::orderBy('name', 'asc')->get();
+        //         $outcomes = Outcome::orderBy('name', 'asc')->get();
         $outcomeCount = Outcome::all()->count();
 
         foreach ($grouped_courses as $index => $grouped_course) {
@@ -258,30 +430,30 @@ CoursesController extends \BaseController
 
             // For each of the sections, add the attempted and achieved criteria per outcome
             foreach ($sections as &$section) {
-                        if ($section->outcomes_ach()) {
-						$section->outcomes_attempted=true;
-						$course_outcomes_achieved = $section->outcomes_ach();
-						$course_outcomes_attempted = $section->outcomes_att();
-						foreach ($course_outcomes_achieved as $outcome => $score) {
-							if (array_key_exists($outcome, $outcomes_achieved))
-								$outcomes_achieved[$outcome] += $score;
-							else $outcomes_achieved[$outcome] = $score;
-						}
-						foreach ($course_outcomes_attempted as $outcome => $score) {
-							if (array_key_exists($outcome, $outcomes_attempted))
-								$outcomes_attempted[$outcome] += $score;
-							else $outcomes_attempted[$outcome] = $score;
-						}
-					}
-            
-//                 if ($section->outcomes_achieved != NULL) {
-//                     $section_outcomes_achieved = json_decode($section->outcomes_achieved, true);
-//                     $section_outcomes_attempted = json_decode($section->outcomes_attempted, true);
-//                     for ($i = 1; $i <= count($outcomes_attempted); $i++) {
-//                         $outcomes_achieved[$i] += $section_outcomes_achieved[$i];
-//                         $outcomes_attempted[$i] += $section_outcomes_attempted[$i];
-//                     }
-//                 }
+                if ($section->outcomes_ach()) {
+                    $section->outcomes_attempted = true;
+                    $course_outcomes_achieved = $section->outcomes_ach();
+                    $course_outcomes_attempted = $section->outcomes_att();
+                    foreach ($course_outcomes_achieved as $outcome => $score) {
+                        if (array_key_exists($outcome, $outcomes_achieved))
+                            $outcomes_achieved[$outcome] += $score;
+                        else $outcomes_achieved[$outcome] = $score;
+                    }
+                    foreach ($course_outcomes_attempted as $outcome => $score) {
+                        if (array_key_exists($outcome, $outcomes_attempted))
+                            $outcomes_attempted[$outcome] += $score;
+                        else $outcomes_attempted[$outcome] = $score;
+                    }
+                }
+
+                //                 if ($section->outcomes_achieved != NULL) {
+                //                     $section_outcomes_achieved = json_decode($section->outcomes_achieved, true);
+                //                     $section_outcomes_attempted = json_decode($section->outcomes_attempted, true);
+                //                     for ($i = 1; $i <= count($outcomes_attempted); $i++) {
+                //                         $outcomes_achieved[$i] += $section_outcomes_achieved[$i];
+                //                         $outcomes_attempted[$i] += $section_outcomes_attempted[$i];
+                //                     }
+                //                 }
             }
         }
 
@@ -291,7 +463,7 @@ CoursesController extends \BaseController
             ->lists('id');
 
         // Activities with transforming actions
-//         $activities = Activity::with('course')->whereNotNull('transforming_actions')->whereIn('course_id', $section_ids)->orderBy('name')->groupBy('transforming_actions')->get();
+        //         $activities = Activity::with('course')->whereNotNull('transforming_actions')->whereIn('course_id', $section_ids)->orderBy('name')->groupBy('transforming_actions')->get();
         $activities = Activity::with('course')->whereIn('course_id', $section_ids)->orderBy('name')->get();
 
         return View::make('local.managers.shared.print_course', compact('role', 'title', 'grouped_courses', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'sections', 'activities'));
@@ -334,14 +506,14 @@ CoursesController extends \BaseController
             fputcsv($file, array($activity_name));
 
             // Get assessments
-//             $assessments = DB::table('assessments')
-//             	->join('students', 'assessments.student_id', '=', 'students.id')
-//             	->where('activity_id', '=', $activity->id)->orderBy('assessments.id', 'asc')->get();
+            //             $assessments = DB::table('assessments')
+            //             	->join('students', 'assessments.student_id', '=', 'students.id')
+            //             	->where('activity_id', '=', $activity->id)->orderBy('assessments.id', 'asc')->get();
 
             $assessments = DB::table('assessments')
-            	->join('students', 'assessments.student_id', '=', 'students.id')
-            	->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
-            	->where('activity_criterion.activity_id', '=', $activity->id)->orderBy('assessments.id', 'asc')->get();
+                ->join('students', 'assessments.student_id', '=', 'students.id')
+                ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+                ->where('activity_criterion.activity_id', '=', $activity->id)->orderBy('assessments.id', 'asc')->get();
 
             // Get rubric contents
             $rubric_contents = json_decode($activity->rubric->contents);
@@ -542,4 +714,4 @@ CoursesController extends \BaseController
         } else {
         }
     }
-}
+}

app/models/User.php

@@ -44,6 +44,20 @@ class User extends Eloquent implements UserInterface, RemindableInterface
 		],
 	];
 
+	public function scopeFromSchool($query, $school_id)
+	{
+		return $query->join('program_user', 'program_user.user_id', '=', 'users.id')
+			->join('programs', 'program_user.program_id', '=', 'programs.id')
+			->where('programs.school_id', $school_id)
+			->select('users.*');
+	}
+
+	public function scoreFromPrograms($query, $program_ids)
+	{
+		return $query->join("program_user", 'users.id', '=', 'program_user.user_id')
+			->whereIn('program_user.program_id', $program_ids)
+			->select('users.*');
+	}
 
 	public function program()
 	{
@@ -70,4 +84,4 @@ class User extends Eloquent implements UserInterface, RemindableInterface
 	{
 		return $this->belongsToMany('Program')->select('programs.id', 'programs.name', 'programs.school_id', 'programs.is_graduate');
 	}
-}
+}

app/routes.php

@@ -215,6 +215,12 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'uses' => 'AnnualPlansController@fetchAnnualReport'
     ));
 
+    //Shared course creation, ( por si School coordinator y Program coordinator
+    // van a poder crear luego)
+    Route::get('editCourses', 'CoursesController@editView');
+    Route::post("createCourse", 'CoursesController@create');
+
+
     //shared viewTransformativeActions
 
     Route::get('viewTransformativeActions', 'TransformativeActionsController@viewTransformativeActions');

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

@@ -72,7 +72,8 @@
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
                     aria-expanded="false">Management<span class="caret"></span></a>
                 <ul class="dropdown-menu dropdown-menu-left" role="menu">
-                    <li>{{ HTML::linkAction('CoursesController@reassign', 'Courses') }}</li>
+                    <li>{{ HTML::linkAction('CoursesController@editView','Create Courses')}}</li>
+                    <li>{{ HTML::linkAction('CoursesController@reassign', 'Reassign Courses') }}</li>
 
                     <li>{{ HTML::linkAction('OutcomesController@index', 'Learning Outcomes') }}</li>
 

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

@@ -0,0 +1,205 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @include('local.managers.admins._new_navigation')
+@stop
+@section('main')
+
+    <div class="row">
+        <div class="col-md-6">
+            <div class="panel panel-default panel-button">
+                <div class="panel-heading">
+                    Create a Course
+                </div>
+                <div class="panel-body">
+
+                    {{ Form::open(['action' => 'CoursesController@create','enctype'=>"multipart/form-data"]) }}
+                    <div class="form-group">
+                        {{ Form::label("name",'Name')}}
+                        {{ Form::text('name', Input::old('name'), ['class'=>'form-control', 'placeholder' => "Introducción a la ..."])}}
+                    </div>
+                    <div class="form-group">
+                        {{ Form::label('code', 'Code') }}
+                        {{ Form::text('code', Input::old('code'), ['class' => 'form-control', 'placeholder' => 'TEST', 'maxLength' => 4]) }}
+                    </div>
+
+                    <div class="form-group">
+                        {{ Form::label('number', 'Number') }}
+                        {{ Form::text('number', Input::old('number'), ['class' => 'form-control', 'placeholder' => '3001', 'maxLength' => 4]) }}
+                    </div>
+
+                    <div class="form-group">
+                        {{ Form::label('section', 'Section') }}
+                        {{ Form::text('section', Input::old('section'), ['class' => 'form-control', 'placeholder' => '001', 'maxLength' => 3]) }}
+                    </div>
+
+                    <!-- Program -->
+                    <div class="form-group">
+                        {{ Form::label('program', 'Program') }}
+                        <select id="program" name="program" class="form-control selectpicker">
+                            
+                            @foreach ($programs as $program)
+                                @if (Input::old('program') != $program->id)
+                                    <option value="{{ $program->id }}">{{ $program->name }}
+                                        ({{ $program->school->name }})</option>
+                                @else
+                                    <option selected value="{{ $program->id }}">{{ $program->name }}
+                                        ({{ $program->school->name }})</option>
+                                @endif
+                            @endforeach
+                        </select>
+                    </div>
+
+                    <div class="form-group">
+                        {{ Form::label('user_id', 'Professor') }}
+                        <select id="professor_id" name="professor_id" class="form-control selectpicker">
+                             @foreach ($professors as $professor)
+                                 @if (Input::old('professor_id') != $professor->id )
+                                    <option value="{{$professor->id}}">{{ $professor->surnames }}, {{$professor->first_name}}
+                                        {{-- $professor->program->name --}}</option>
+                                @else
+                                    <option selected value="{{ $professor->id }}">{{ $professor->name }}
+                                        {{-- $professor->program->name --}}</option>
+                               
+
+                                    
+                                @endif
+                            @endforeach
+                        </select>
+                    </div>
+
+                    <div class ="form-group">
+                        {{ Form::label("semester_id",'Semester')}}
+
+                        <select id ="semester_id" name="semester_id" class="form-control selectpicker">
+                            @foreach ($semesters as $semester)
+                                @if (Input::old('semester_prof') != $semester->id)
+                                    <option value="{{ $semester->id }}">{{ $semester->name }}</option>
+                                @else
+                                    <option selected value="{{ $semester->id }}">{{ $semester->name }}</option>
+                                @endif
+                            @endforeach
+                        </select>
+                    </div>
+
+                    <div class ="form-group">
+                        <label for="file">Choose student text file</label>
+                        <input type="file"
+                        id="students" class="form-control" name="students"
+                        accept=".txt">
+                    </div>
+
+                    <br>
+
+                    {{ Form::submit('Create Course', ['class' => 'btn btn-primary btn-block', 'name' => 'create_course']) }}
+                    {{ Form::close() }}
+
+                    <br>
+
+                    @if (Session::has('courses'))
+                        <p><strong>The following courses were updated:</strong></p>
+                        <ul>
+                            @foreach (json_decode(Session::get('courses')) as $course)
+                                <li>
+
+                                    @if (Session::has('show_sections'))
+                                        {{ $course->code }}{{ $course->number }}-{{ $course->section }}
+                                    @else
+                                        {{ $course->code }}{{ $course->number }}
+                                    @endif
+                                </li>
+                            @endforeach
+                        </ul>
+                    @endif
+                </div>
+            </div>
+        </div>
+
+        <div class="col-md-6">
+            <div class="panel panel-default panel-button">
+                <div class="panel-heading">
+                    Reassign Sections' Professors
+                </div>
+                <div class="panel-body">
+
+                    <p>Use this to reassign a section to a specific professor. Write down the code, number and section of
+                        the course. Then, choose a professor from the list. <strong>All fields are required.</strong></p>
+
+                    {{ Form::open(['action' => 'CoursesController@update']) }}
+
+                    <div class="form-group">
+                        {{ Form::label('code_prof', 'Code') }}
+                        {{ Form::text('code_prof', Input::old('code_prof'), ['class' => 'form-control', 'placeholder' => 'TEST', 'maxLength' => 4]) }}
+                    </div>
+
+                    <div class="form-group">
+                        {{ Form::label('number_prof', 'Number') }}
+                        {{ Form::text('number_prof', Input::old('number_prof'), ['class' => 'form-control', 'placeholder' => '3001', 'maxLength' => 4]) }}
+                    </div>
+
+                    <div class="form-group">
+                        {{ Form::label('section_prof', 'Section') }}
+                        {{ Form::text('section_prof', Input::old('section_prof'), ['class' => 'form-control', 'placeholder' => '001', 'maxLength' => 3]) }}
+                    </div>
+
+                    <!-- Program -->
+                    {{--
+                    <div class="form-group">
+                        {{ Form::label('user_prof', 'User') }}
+                        <select id="user_prof" name="user_prof" class="form-control">
+                            @foreach ($users as $user)
+                                @if (Input::old('user_prof') != $user->id)
+                                    <option value="{{ $user->id }}">{{ $user->surnames }},
+                                        {{ $user->first_name }}</option>
+                                @else
+                                    <option selected value="{{ $user->id }}">{{ $user->surnames }},
+                                        {{ $user->first_name }}</option>
+                                @endif
+                            @endforeach
+                        </select>
+                    </div>
+                    --}}
+
+                    <!-- Semester -->
+                    <div class="form-group">
+                        {{ Form::label('semester_prof', 'Semester') }}
+                        <select id="semester_prof" name="semester_prof" class="form-control selectpicker">
+                            @foreach ($semesters as $semester)
+                                @if (Input::old('semester_prof') != $semester->id)
+                                    <option value="{{ $semester->id }}">{{ $semester->name }}</option>
+                                @else
+                                    <option selected value="{{ $semester->id }}">{{ $semester->name }}</option>
+                                @endif
+                            @endforeach
+                        </select>
+                    </div>
+
+                    <br>
+
+                    {{ Form::submit('Create Course', ['class' => 'btn btn-primary btn-block', 'name' => 'create_professor']) }}
+                    {{ Form::close() }}
+
+                </div>
+            </div>
+        </div>
+    </div>
+@stop
+
+@section('javascript')
+
+    // --------------------------------------------------------------------------
+    // Page load
+    // --------------------------------------------------------------------------
+
+
+    // --------------------------------------------------------------------------
+    // Functions
+    // --------------------------------------------------------------------------
+
+
+
+    // --------------------------------------------------------------------------
+    // Events
+    // --------------------------------------------------------------------------
+
+@stop

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

@@ -135,7 +135,21 @@ $(function () {
             max: 100,
             title: {
                 text: 'Percentage'
-            }
+            },
+			plotLines:[{
+                value:66.67,
+                color: '#000',
+                width:3,
+                zIndex:4,
+                label:{
+                    text: 'Goal (66.67%)',
+                    style: {
+                        color: '#000',
+                        fontSize: '14px',
+                    }
+        
+                }
+            }]
         },
         tooltip: {
             headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
@@ -176,7 +190,14 @@ $(function () {
                         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 }}},
+
+                        <?php
+                            if (isset($outcomes_achieved[$outcome->id])){
+                                $achieved = $outcomes_achieved[$outcome->id];
+                            }
+                            else $achieved = 0;
+                        ?>
+                        {{{ ($achieved/$outcomes_attempted[$outcome->id])*100 }}},
                     @else
                         0,
                     @endif
@@ -184,7 +205,7 @@ $(function () {
 
             ],
             pointPadding: 0,
-        }, {
+        } {{--, {
             name: 'Expected',
             color: '#555555',
             dataLabels: {
@@ -212,7 +233,7 @@ $(function () {
             ],
             pointPadding: 0,
 
-        }]
+        } --}}]
     });
 
     // Include dummy graph for outcomes

course_student/test.txt

@@ -0,0 +1,4 @@
+801211047
+840080010
+401050006
+955970041