Merge branch 'Merge_gabriel_mayo' of https://git.ccom.uprrp.edu/CDCC/OLAS into Merge_gabriel_mayo

Sera routes?

.gitignore

@@ -23,3 +23,4 @@ vendor/*
 app/controllers/AuthController.php
 app/controllers/AuthController.php
 bootstrap/start.php
+testdisk.log

app/controllers/CoursesController.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Redirect;
 
 class
 CoursesController extends \BaseController
@@ -83,6 +84,13 @@ CoursesController extends \BaseController
         return View::make('local.managers.shared.course_edit', compact('title', 'programs', 'professors', 'modalities', 'semesters'));
     }
 
+    public function fetchCourses()
+    {
+        return Course::where('program_id', Input::get('program_id'))
+            ->where('semester_id', Input::get('semester_id'))
+            ->get();
+    }
+
     public function create()
     {
 
@@ -120,18 +128,32 @@ CoursesController extends \BaseController
         if ($course->save()) {
 
             //$students->move('./course_student', 'test.txt');
-            $student_nums = file(Input::file('students'));
+
+            if (Input::file('students') != '') {
+                $student_nums = file(Input::file('students'));
+            } else {
+                $student_nums = false;
+            }
+
+
+
+
+            //para la validación. Si se encuentra un numero de estudiante incorrecto, 
+            //set stu_not_found = true, 
+
+            $stu_not_found = false;
+            $stu_nf_list =  [];
 
             if ($student_nums) {
                 foreach ($student_nums as $stu_num) {
-                    Log::info($stu_num);
-                    Log::info("Stunum");
+                    //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) {
+                    if (count($student_id)) {
                         $student_id = $student_id[0]->id;
                         DB::table("course_student")
                             ->insert(array(
@@ -140,85 +162,160 @@ CoursesController extends \BaseController
                                 '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();
+
+                        $stu_not_found = true;
+                        $stu_nf_list[] = $stu_num;
+
+
+
+                        //$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');
+                if ($stu_not_found) {
+
+                    $error_msg = "<ul>";
+
+                    foreach ($stu_nf_list as $stu_num) {
+                        $error_msg .= "<li>" . $stu_num . "</li>";
+                    }
+                    $error_msg .= "</ul>";
+
+                    Session::flash('status', 'warning');
+                    Session::flash('message', '<p>Error Enrolling students these students</p>' . $error_msg .
+                        '<p>But course ' . $course->name . ' was created</p>');
+                    //return Redirect::to('editCourses')->withInput();
+                }
+
+
+                return Redirect::to('editCourses')->withInput();
 
 
 
                 //fclose($student_nums);
             } else {
-                $course->forceDelete();
-                Session::flash('status', 'danger');
-                Session::flash('message', '<p>Error creating course. Please try again later.</p>');
+
+                Session::flash('status', 'Warning');
+                Session::flash('message', '<p>Course ' . $course->name . ' created  but no student enrolled.</p>');
                 return Redirect::to('editCourses')->withInput();
             }
-            /*$objectiveId = $objective->id;
+        }
 
-            Log::info($clean_input['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('editCourses')->withInput();
+        }
+    }
 
+    public function updateCourseInfo()
+    {
 
+        $all_info = Input::all();
+        $course = Course::findOrFail($all_info['select-course']);
+        $course->name = $all_info['name'];
+        $course->code = $all_info['code'];
+        $course->section = $all_info['section'];
+        $course->number = $all_info['number'];
+        $course->program_id = $all_info['program'];
+        $course->user_id = $all_info['professor_id'];
+        $course->semester_id = $all_info['semester_id'];
+        $course->modality = $all_info['modality'];
 
+        if ($course->save()) {
 
-            foreach ($clean_input['program_id'] as $program_id) {
-                DB::insert("insert into objective_program (objective_id, program_id) values({$objectiveId},{$program_id})");
+            if (Input::file('students') != '') {
+                $student_nums = file(Input::file('students'));
+            } else {
+                $student_nums = false;
             }
-            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();
+            //para la validación. Si se encuentra un numero de estudiante incorrecto, 
+            //set stu_not_found = true, 
+
+            $stu_not_found = false;
+            $stu_nf_list =  [];
+
+            if ($student_nums) {
+                foreach ($student_nums as $stu_num) {
+
+                    $if_stu_matriculado = DB::table('course_student')
+                        ->where('student_id', $stu_num)
+                        ->where('course_id', $course->id)
+                        ->first();
+
+                    //si está matriculado, pichea.
+                    if ($if_stu_matriculado) {
+                        continue;
+                    }
+                    $student_id = DB::select("select id from students where number = " . $stu_num);
+
+                    if (count($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 {
+
+                        $stu_not_found = true;
+                        $stu_nf_list[] = $stu_num;
+
+
+
+                        //$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 edited: "' . $course->name . '".');
+                if ($stu_not_found) {
+
+                    $error_msg = "<ul>";
+
+                    foreach ($stu_nf_list as $stu_num) {
+                        $error_msg .= "<li>" . $stu_num . "</li>";
+                    }
+                    $error_msg .= "</ul>";
+
+                    Session::flash('status', 'warning');
+                    Session::flash('message', '<p>Error Enrolling students these students</p>' . $error_msg .
+                        '<p>But course ' . $course->name . ' was edited</p>');
+                    //return Redirect::to('editCourses')->withInput();
+                }
+
+
+                return Redirect::to('editCourses')->withInput();
+
+
+
+                //fclose($student_nums);
+            } else {
+
+                Session::flash('status', 'warning');
+                Session::flash('message', '<p>Course ' . $course->name . ' edited  but no student enrolled.</p>');
+                return Redirect::to('editCourses')->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();
-            }*/
+            return Redirect::to('editCourses')->withInput();
         }
+
+
+
+        return Redirect::to('editCourses')->withInput();
     }
 
 

app/routes.php

@@ -219,6 +219,9 @@ Route::group(array('before' => 'auth|has_access'), function () {
     // van a poder crear luego)
     Route::get('editCourses', 'CoursesController@editView');
     Route::post("createCourse", 'CoursesController@create');
+    Route::post("updateCourseInfo", 'CoursesController@updateCourseInfo');
+    Route::post("fetch_assoc_courses", 'CoursesController@fetchCourses');
+
 
 
     //shared viewTransformativeActions

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

@@ -73,7 +73,7 @@
 
                         <select id ="semester_id" name="semester_id" class="form-control selectpicker">
                             @foreach ($semesters as $semester)
-                                @if (Input::old('semester_prof') != $semester->id)
+                                @if (Input::old('semester_id') != $semester->id)
                                     <option value="{{ $semester->id }}">{{ $semester->name }}</option>
                                 @else
                                     <option selected value="{{ $semester->id }}">{{ $semester->name }}</option>
@@ -82,6 +82,22 @@
                         </select>
                     </div>
 
+                    
+                    <div class = "form-group">
+                        {{Form::label('modality','Course Modality')}}
+
+                        <select id="modality" name = "modality" class= "form-control selectpicker">
+                            @foreach($modalities as $modality)
+                                @if (Input::old('modality') != $modality)
+                                    <option value="{{ $modality }}">{{ $modality }}</option>
+                                @else
+                                    <option selected value="{{ $modality }}">{{ $modality }}</option>
+                                @endif
+                                
+                            @endforeach
+                        </select>
+                    </div>
+
                     <div class ="form-group">
                         <label for="file">Choose student text file</label>
                         <input type="file"
@@ -118,52 +134,118 @@
         <div class="col-md-6">
             <div class="panel panel-default panel-button">
                 <div class="panel-heading">
-                    Reassign Sections' Professors
+                    Edit Course
                 </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']) }}
 
+                    <p>You can enroll students in this setting, by choosing the course and uploading a .txt file with the students numbers</p>
+
+                    {{ Form::open(['action' => 'CoursesController@updateCourseInfo', 'enctype'=>"multipart/form-data"]) }}
+                    <button class="btn btn-md btn-secondary filterButton">
+                        <span class="glyphicon glyphicon-minus">
+                        </span>
+                        Filters
+                    </button>
+                    <div class="filterSection">
+                        <br>
+                        <div class="form-group">
+                            {{ Form::label('program_id2', 'Associated Program') }}
+                            <select id='select-program' class="form-control selectpicker"
+                            onchange='fetchCourses("#select-program", "#select-semester")'>
+
+                                @foreach ($programs as $program)
+                                    <option value='{{ $program->id }}' data-subtext="{{ $program->code }}">
+                                        {{ $program->name }}</option>
+                                @endforeach
+
+                            </select>
+                        </div>
+                        
+                        <div class="form-group">
+                            {{ Form::label('semester_assoc', 'Course Semester') }}
+                            <select id='select-semester' class="form-control selectpicker"
+                                onchange='fetchCourses("#select-program", "#select-semester")'>
+
+                                @foreach ($semesters as $semester)
+                                    <option value='{{ $semester->id }}' data-subtext="{{ $semester->code }}">
+                                        {{ $semester->name }}</option>
+                                @endforeach
+
+                            </select>
+                        </div>
+                        
+                    </div>
+                    <hr>
+                    <div class = "form-group">
+                        {{Form::label('select_course', "Course")}}
+                        <select id = "select-course" name = "select-course" class ='form-control selectpicker'
+                        onchange = "fetchCourseInfo('#select-course')">
+                            
+
+                        </select>
+                    </div>
+
+
+                    <div class="form-group">
+                        {{ Form::label("name",'Name')}}
+                        {{ Form::text('name', Input::old('name'), ['class'=>'form-control', 'placeholder' => "Introducción a la ...", 'id'=> 'edit_name'])}}
+                    </div>
                     <div class="form-group">
-                        {{ Form::label('code_prof', 'Code') }}
-                        {{ Form::text('code_prof', Input::old('code_prof'), ['class' => 'form-control', 'placeholder' => 'TEST', 'maxLength' => 4]) }}
+                        {{ Form::label('code', 'Code') }}
+                        {{ Form::text('code', Input::old('code'), ['class' => 'form-control', 'placeholder' => 'TEST', 'maxLength' => 4, 'id'=> 'edit_code']) }}
                     </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]) }}
+                        {{ Form::label('number', 'Number') }}
+                        {{ Form::text('number', Input::old('number'), ['class' => 'form-control', 'placeholder' => '3001', 'maxLength' => 4, 'id'=> 'edit_number']) }}
                     </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]) }}
+                        {{ Form::label('section', 'Section') }}
+                        {{ Form::text('section', Input::old('section'), ['class' => 'form-control', 'placeholder' => '001', 'maxLength' => 3, 'id'=> 'edit_section']) }}
                     </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>
+                        {{ Form::label('program', 'Program') }}
+                        <select id="edit_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="{{ $user->id }}">{{ $user->surnames }},
-                                        {{ $user->first_name }}</option>
+                                    <option selected value="{{ $program->id }}">{{ $program->name }}
+                                        ({{ $program->school->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">
+                        {{ Form::label('user_id', 'Professor') }}
+                        <select id="edit_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 ="edit_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>
@@ -174,15 +256,114 @@
                         </select>
                     </div>
 
+                    <div class = "form-group">
+                        {{Form::label('modality','Course Modality')}}
+
+                        <select id="edit_modality" name = "modality" class= "form-control selectpicker">
+                            @foreach($modalities as $modality)
+                                @if (Input::old('modality') != $modality)
+                                    <option value="{{ $modality }}">{{ $modality }}</option>
+                                @else
+                                    <option selected value="{{ $modality }}">{{ $modality }}</option>
+                                @endif
+                                
+                            @endforeach
+                        </select>
+                    </div>
+
+
+                    <div class ="form-group">
+                        <label for="file">Choose student text file</label>
+                        <input type="file"
+                        id="edit_students" class="form-control" name="students"
+                        accept=".txt">
+                    </div>
+
                     <br>
 
-                    {{ Form::submit('Create Course', ['class' => 'btn btn-primary btn-block', 'name' => 'create_professor']) }}
+                    {{ Form::submit('Edit Course', ['class' => 'btn btn-primary btn-block', 'name' => 'edit_course_info']) }}
                     {{ Form::close() }}
 
                 </div>
             </div>
         </div>
     </div>
+
+    <script>
+        $('.filterSection').show();
+        $('.filterButton').on('click', function() {
+            var span = $(this).find('span');
+            if (span.attr('class') == 'glyphicon glyphicon-plus') {
+                span.attr('class', 'glyphicon glyphicon-minus');
+            } else {
+                span.attr('class', 'glyphicon glyphicon-plus');
+            }
+            $('.filterSection').toggle(533);
+        });
+        $('.filterButton').on('click', function(e) {
+        // Prevent the default action of the clicked item. In this case that is submit
+            e.preventDefault();
+
+
+        return false;
+        });
+
+        function fetchCourses(select, semester){
+
+            
+
+            program_id = $(select).val();
+            semester_id = $(semester).val();
+            $.post(
+                "{{URL::action('CoursesController@fetchCourses')}}",
+                {
+                    program_id:program_id,
+                    semester_id:semester_id
+                },
+                function(courses){
+                    $('#select-course').html(
+                        " "
+                    )
+                    $.each(courses, function(ind, course){
+
+                        
+                        option =  "<option value= '"+course.id+"' data-subtext ='"+course.code+course.number+"'"+
+                        "data-code='"+course.code+"' data-number='"+course.number+"' data-program-id='"+course.program_id+"'"+
+                        "data-section='"+course.section+"' data-user-id='"+course.user_id+"' data-semester-id = '"+course.semester_id+"'"+
+                        "data-modality='"+course.modality+"' "+
+                        ">"+course.name+"</option>";
+                        $("#select-course").append(option);
+                    });
+                    $("#select-course").trigger('change');
+                    $("#select-course").selectpicker('refresh');
+                }
+            )
+        }
+
+        function fetchCourseInfo(course_select){
+
+            course_option = $(course_select).find(':selected');
+
+            $('#edit_name').val($(course_option).html())
+            $('#edit_code').val($(course_option).data('code'))
+            $('#edit_number').val($(course_option).data('number'))
+            $('#edit_section').val($(course_option).data('section'))
+            $('#edit_program').val($(course_option).data('program-id'))
+            $("#edit_program").selectpicker('refresh');
+            $('#edit_professor_id').val($(course_option).data('user-id'))
+            $("#edit_professor_id").selectpicker('refresh');
+            
+            $('#edit_semester_id').val($(course_option).data('semester-id'))
+            $("#edit_semester_id").selectpicker('refresh');
+
+            $('#edit_modality').val($(course_option).data('modality'))
+            $("#edit_modality").selectpicker('refresh');
+            $(course_select).selectpicker('refresh');
+
+        }
+
+
+    </script>
 @stop
 
 @section('javascript')