Kaynağa Gözat

varios arreglos y bug

Carlos J Corrada Bravo 2 yıl önce
ebeveyn
işleme
e1224482c6

+ 1
- 1
app/controllers/ActivitiesController.php Dosyayı Görüntüle

790
         if ($course->user_id != Auth::id())
790
         if ($course->user_id != Auth::id())
791
             App::abort('403', 'Access Forbidden');
791
             App::abort('403', 'Access Forbidden');
792
 
792
 
793
-        $title = 'Assessment Sheet';
794
         $students = $course->students;
793
         $students = $course->students;
795
 
794
 
796
         // Get rubric contents
795
         // Get rubric contents
845
                 ->where("activity_id", '=', $activity->id)
844
                 ->where("activity_id", '=', $activity->id)
846
                 ->select('comments')->first()->comments;
845
                 ->select('comments')->first()->comments;
847
         }
846
         }
847
+        $title = 'Assessment Sheet';
848
 
848
 
849
         return View::make('local.professors.view_assessment', compact('activity', 'title', 'students', 'course', 'rubric_criterion', 'assessments', 'scores_array', 'rubric'));
849
         return View::make('local.professors.view_assessment', compact('activity', 'title', 'students', 'course', 'rubric_criterion', 'assessments', 'scores_array', 'rubric'));
850
     }
850
     }

+ 3
- 3
app/routes.php Dosyayı Görüntüle

348
     Route::get('learning-outcomes-criteria', 'CriteriaController@index');
348
     Route::get('learning-outcomes-criteria', 'CriteriaController@index');
349
     Route::post('fetchOutcome', array('before' => 'csrf', 'uses' => 'OutcomesController@fetchOutcome'));
349
     Route::post('fetchOutcome', array('before' => 'csrf', 'uses' => 'OutcomesController@fetchOutcome'));
350
     // Show users all objectives and criteria
350
     // Show users all objectives and criteria
351
-    Route::get('learning-objectives-criteria', 'objective2Controller@viewObjectives');
351
+    Route::get('learning-objectives-criteria', 'Objective2Controller@viewObjectives');
352
     Route::post('fetchObjectiveForCriteria', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetchObjectiveForCriteria'));
352
     Route::post('fetchObjectiveForCriteria', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetchObjectiveForCriteria'));
353
 
353
 
354
     // Show professor overview to users with courses
354
     // Show professor overview to users with courses
641
         Route::post('updateRubric', array('before' => 'csrf', 'uses' => 'RubricsController@update'));
641
         Route::post('updateRubric', array('before' => 'csrf', 'uses' => 'RubricsController@update'));
642
         Route::post('deleteRubric', array('before' => 'csrf', 'uses' => 'RubricsController@destroy'));
642
         Route::post('deleteRubric', array('before' => 'csrf', 'uses' => 'RubricsController@destroy'));
643
         Route::get('learning-outcomes-criteria', 'CriteriaController@index');
643
         Route::get('learning-outcomes-criteria', 'CriteriaController@index');
644
-        Route::get('learning-objectives-criteria', 'objective2Controller@viewObjectives');
644
+        Route::get('learning-objectives-criteria', 'Objective2Controller@viewObjectives');
645
         Route::get('export_grades/{id}', 'CoursesController@exportGrades');
645
         Route::get('export_grades/{id}', 'CoursesController@exportGrades');
646
-        Route::get('learning-objectives-criteria', 'objective2Controller@viewObjectives');
646
+        Route::get('learning-objectives-criteria', 'Objective2Controller@viewObjectives');
647
         Route::get('compare_activities/{activity_1}/{activity_2}', 'ActivitiesController@compareActivities');
647
         Route::get('compare_activities/{activity_1}/{activity_2}', 'ActivitiesController@compareActivities');
648
         // Assessment reports
648
         // Assessment reports
649
         //Route::get('professor-assessment-report/{outcome_id}', 'OutcomesController@professorAssessmentReport');
649
         //Route::get('professor-assessment-report/{outcome_id}', 'OutcomesController@professorAssessmentReport');

+ 1
- 1
app/views/local/managers/admins/_navigation.blade.php Dosyayı Görüntüle

24
                     and Criterias<span class="caret"></span></a>
24
                     and Criterias<span class="caret"></span></a>
25
                 <ul class="dropdown-menu" role="menu">
25
                 <ul class="dropdown-menu" role="menu">
26
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
26
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
27
-                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'Objectives and Criteria') }}
27
+                    <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'Objectives and Criteria') }}
28
                     </li>
28
                     </li>
29
                 </ul>
29
                 </ul>
30
             </li>
30
             </li>

+ 1
- 1
app/views/local/managers/admins/_new_navigation.blade.php Dosyayı Görüntüle

12
                     aria-expanded="false">Objectives<span class="caret"></span></a>
12
                     aria-expanded="false">Objectives<span class="caret"></span></a>
13
                 <ul class="dropdown-menu dropdown-menu-left" role="menu">
13
                 <ul class="dropdown-menu dropdown-menu-left" role="menu">
14
                     <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
14
                     <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
15
-                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
15
+                    <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
16
                     </li>
16
                     </li>
17
                 </ul>
17
                 </ul>
18
             </li>
18
             </li>

+ 29
- 26
app/views/local/managers/admins/users.blade.php Dosyayı Görüntüle

336
     var user= element.closest('tr');
336
     var user= element.closest('tr');
337
     $('#id').val(user.find('.user-name').data('user-id'));
337
     $('#id').val(user.find('.user-name').data('user-id'));
338
     $('#name').text(user.find('.user-name').text());
338
     $('#name').text(user.find('.user-name').text());
339
-    <!--         $('#email').text(user.find('.user-email').text()); -->
339
+    /*         $('#email').text(user.find('.user-email').text()); */
340
     $('#email').val(user.find('.user-email').text());
340
     $('#email').val(user.find('.user-email').text());
341
     $('#has_access').val(user.find('.user-has-access').data('value'));
341
     $('#has_access').val(user.find('.user-has-access').data('value'));
342
 
342
 
379
     // Remove all but first program
379
     // Remove all but first program
380
     modal.find('.program').not(':first').parent().remove();
380
     modal.find('.program').not(':first').parent().remove();
381
 
381
 
382
-    <!-- Select Admin role and "All" school and program -->
382
+    /* Select Admin role and "All" school and program */
383
     $('#new_role option[value="1"]').prop('selected', true);
383
     $('#new_role option[value="1"]').prop('selected', true);
384
     $('#new_school option[value="0"]').prop('selected', true);
384
     $('#new_school option[value="0"]').prop('selected', true);
385
     modal.find('.program option[value="0"]').prop('selected', true);
385
     modal.find('.program option[value="0"]').prop('selected', true);
386
 
386
 
387
     fetchPrograms(modal);
387
     fetchPrograms(modal);
388
 
388
 
389
-    <!-- Disable school and program -->
389
+    /* Disable school and program */
390
     $('#new_school').prop('disabled', true);
390
     $('#new_school').prop('disabled', true);
391
     modal.find('.program').prop('disabled', true);
391
     modal.find('.program').prop('disabled', true);
392
 
392
 
408
     var modal = $(this).closest('.modal');
408
     var modal = $(this).closest('.modal');
409
     switch($(this).find(':selected').val())
409
     switch($(this).find(':selected').val())
410
     {
410
     {
411
-    <!-- If admin, set both to All and disable selection on both-->
411
+    /* If admin, set both to All and disable selection on both*/
412
     case '1':
412
     case '1':
413
 
413
 
414
     modal.find('.school option[value="0"]').prop('selected', true);
414
     modal.find('.school option[value="0"]').prop('selected', true);
427
     modal.find('.add-program').hide();
427
     modal.find('.add-program').hide();
428
 
428
 
429
     break;
429
     break;
430
-    <!-- If scoord, set program to all and disable it -->
430
+    /* If scoord, set program to all and disable it */
431
     case '2':
431
     case '2':
432
-    <!-- Disable "All" option in schools and program -->
432
+    /* Disable "All" option in schools and program */
433
     modal.find('.school option[value="0"]').attr('disabled', true);
433
     modal.find('.school option[value="0"]').attr('disabled', true);
434
 
434
 
435
     if(modal.find('.school').find(':selected').val() == 0)
435
     if(modal.find('.school').find(':selected').val() == 0)
452
     modal.find('.add-program').hide();
452
     modal.find('.add-program').hide();
453
 
453
 
454
     break;
454
     break;
455
-    <!-- If pcoord or professor, enable everything -->
455
+    /* If pcoord or professor, enable everything */
456
     case '3':
456
     case '3':
457
     case '4':
457
     case '4':
458
-    <!-- Disable "All" option in school -->
458
+    /* Disable "All" option in school */
459
     modal.find('.school option[value="0"]').attr('disabled', true);
459
     modal.find('.school option[value="0"]').attr('disabled', true);
460
 
460
 
461
-    <!-- Enable School and select an available  option for school-->
461
+    /* Enable School and select an available  option for school*/
462
     modal.find('.school').prop('disabled', false);
462
     modal.find('.school').prop('disabled', false);
463
 
463
 
464
     if(modal.find('.school').find(':selected').val() == 0)
464
     if(modal.find('.school').find(':selected').val() == 0)
466
     modal.find('.school option:enabled:first').prop('selected', true);
466
     modal.find('.school option:enabled:first').prop('selected', true);
467
     }
467
     }
468
 
468
 
469
-    <!-- Enable program-->
469
+    /* Enable program*/
470
     modal.find('.program').prop('disabled', false);
470
     modal.find('.program').prop('disabled', false);
471
 
471
 
472
     // If it only has one child (most likely when changing from admin or scoord)
472
     // If it only has one child (most likely when changing from admin or scoord)
473
     if(modal.find('.programs').children().length == 1)
473
     if(modal.find('.programs').children().length == 1)
474
     {
474
     {
475
-    <!-- Fetch programs for the available school -->
475
+    /* Fetch programs for the available school */
476
     fetchPrograms(modal);
476
     fetchPrograms(modal);
477
 
477
 
478
-    <!-- Disable "All" option in schools and program -->
478
+    /* Disable "All" option in schools and program */
479
     modal.find('.program option[value="0"]').attr('disabled', true);
479
     modal.find('.program option[value="0"]').attr('disabled', true);
480
 
480
 
481
-    <!-- Select available option -->
481
+    /* Select available option */
482
     modal.find('.program option:enabled:first').prop('selected', true);
482
     modal.find('.program option:enabled:first').prop('selected', true);
483
     }
483
     }
484
     else
484
     else
485
     {
485
     {
486
-    <!-- Disable "All" option in schools and program -->
486
+    /* Disable "All" option in schools and program */
487
     modal.find('.program option[value="0"]').attr('disabled', true);
487
     modal.find('.program option[value="0"]').attr('disabled', true);
488
     }
488
     }
489
 
489
 
572
     case 1:
572
     case 1:
573
     fetchPrograms(modal);
573
     fetchPrograms(modal);
574
 
574
 
575
-    <!-- Select "All" in school and program -->
575
+    /* Select "All" in school and program */
576
     $('.school option[value="0"]').prop('selected', true);
576
     $('.school option[value="0"]').prop('selected', true);
577
     modal.find('.program option[value="0"]').prop('selected', true);
577
     modal.find('.program option[value="0"]').prop('selected', true);
578
 
578
 
579
-    <!-- Disable school and program -->
579
+    /* Disable school and program */
580
     $('.school').prop('disabled', true);
580
     $('.school').prop('disabled', true);
581
     modal.find('.program').prop('disabled', true);
581
     modal.find('.program').prop('disabled', true);
582
 
582
 
583
     break;
583
     break;
584
     case 2:
584
     case 2:
585
 
585
 
586
-    <!-- Find and select user's school -->
586
+    /* Find and select user's school */
587
     var school_id = user.find('.user-school').data('school-id');
587
     var school_id = user.find('.user-school').data('school-id');
588
     $('.school option[value="'+school_id+'"]').prop('selected', true);
588
     $('.school option[value="'+school_id+'"]').prop('selected', true);
589
 
589
 
590
-    <!-- Fetch programs -->
590
+    /* Fetch programs */
591
     fetchPrograms(modal);
591
     fetchPrograms(modal);
592
 
592
 
593
-    <!-- Disable "All" option in school and select the next one-->
593
+    /* Disable "All" option in school and select the next one*/
594
     $('.school option[value="0"]').attr('disabled', true);
594
     $('.school option[value="0"]').attr('disabled', true);
595
 
595
 
596
-    <!-- Disable all options in program -->
596
+    /* Disable all options in program */
597
     modal.find('.program').prop('disabled', true);
597
     modal.find('.program').prop('disabled', true);
598
 
598
 
599
-    <!--  -->
600
-
601
     break;
599
     break;
602
     case 3:
600
     case 3:
603
     case 4:
601
     case 4:
604
-    <!-- Make sure school and program are not disabled -->
602
+    /* Make sure school and program are not disabled */
605
     $('.school').prop('disabled', false);
603
     $('.school').prop('disabled', false);
606
     modal.find('.program').prop('disabled', false);
604
     modal.find('.program').prop('disabled', false);
607
 
605
 
635
 
633
 
636
     });
634
     });
637
 
635
 
638
-    for(var i =0; i < program_ids.length; i++) { var program_id=program_ids[i]; modal.find('.program:eq('+i+')
639
-        option[value="'+program_id+'" ]').prop('selected', true); } modal.find('.add-program').show(); <!-- Disable "All"
640
-        option in school and program-->
636
+    for(var i =0; i < program_ids.length; i++) 
637
+    { 
638
+    	var program_id=program_ids[i]; 
639
+    	modal.find('.program:eq('+i+') option[value="'+program_id+'" ]').prop('selected', true); 
640
+    } 
641
+    modal.find('.add-program').show(); 
642
+    /* Disable "All"
643
+        option in school and program*/
641
         $('.school option[value="0"]').attr('disabled', true);
644
         $('.school option[value="0"]').attr('disabled', true);
642
         modal.find('.program option[value="0"]').attr('disabled', true);
645
         modal.find('.program option[value="0"]').attr('disabled', true);
643
 
646
 

+ 1
- 1
app/views/local/managers/pCoords/_navigation.blade.php Dosyayı Görüntüle

34
                     and Criterias<span class="caret"></span></a>
34
                     and Criterias<span class="caret"></span></a>
35
                 <ul class="dropdown-menu" role="menu">
35
                 <ul class="dropdown-menu" role="menu">
36
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
36
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
37
-                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'Objectives and Criteria') }}
37
+                    <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'Objectives and Criteria') }}
38
                     </li>
38
                     </li>
39
                 </ul>
39
                 </ul>
40
             </li>
40
             </li>

+ 1
- 1
app/views/local/managers/pCoords/_new_navigation.blade.php Dosyayı Görüntüle

11
                     aria-expanded="false">Objectives<span class="caret"></span></a>
11
                     aria-expanded="false">Objectives<span class="caret"></span></a>
12
                 <ul class="dropdown-menu dropdown-menu-left" role="menu">
12
                 <ul class="dropdown-menu dropdown-menu-left" role="menu">
13
                     <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
13
                     <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
14
-                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
14
+                    <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
15
                     </li>
15
                     </li>
16
                 </ul>
16
                 </ul>
17
             </li>
17
             </li>

+ 1
- 1
app/views/local/managers/sCoords/_navigation.blade.php Dosyayı Görüntüle

10
                     and Criterias<span class="caret"></span></a>
10
                     and Criterias<span class="caret"></span></a>
11
                 <ul class="dropdown-menu" role="menu">
11
                 <ul class="dropdown-menu" role="menu">
12
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
12
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
13
-                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'Objectives and Criteria') }}
13
+                    <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'Objectives and Criteria') }}
14
                     </li>
14
                     </li>
15
                 </ul>
15
                 </ul>
16
             </li>
16
             </li>

+ 1
- 1
app/views/local/managers/sCoords/_new_navigation.blade.php Dosyayı Görüntüle

11
                     aria-expanded="false">Objectives<span class="caret"></span></a>
11
                     aria-expanded="false">Objectives<span class="caret"></span></a>
12
                 <ul class="dropdown-menu dropdown-menu-left" role="menu">
12
                 <ul class="dropdown-menu dropdown-menu-left" role="menu">
13
                     <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
13
                     <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
14
-                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
14
+                    <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
15
                     </li>
15
                     </li>
16
                 </ul>
16
                 </ul>
17
             </li>
17
             </li>

+ 1
- 1
app/views/local/professors/_navigation.blade.php Dosyayı Görüntüle

14
                     and Criterias<span class="caret"></span></a>
14
                     and Criterias<span class="caret"></span></a>
15
                 <ul class="dropdown-menu" role="menu">
15
                 <ul class="dropdown-menu" role="menu">
16
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
16
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
17
-                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'Objectives and Criteria') }}
17
+                    <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'Objectives and Criteria') }}
18
                     </li>
18
                     </li>
19
                 </ul>
19
                 </ul>
20
             </li>
20
             </li>

+ 2
- 2
app/views/local/professors/view_assessment.blade.php Dosyayı Görüntüle

24
             <div class="modal-body">
24
             <div class="modal-body">
25
                 <table class="table table-bordered">
25
                 <table class="table table-bordered">
26
                     <thead>
26
                     <thead>
27
-                        @foreach($rubric->titles as $i=>$title)
28
-                        <th>{{$title}} ({{1+($i*($rubric->max_score/$rubric->num_scales))}}-{{(1+$i)*($rubric->max_score/$rubric->num_scales)}})</th>
27
+                        @foreach($rubric->titles as $i=>$title2)
28
+                        <th>{{$title2}} ({{1+($i*($rubric->max_score/$rubric->num_scales))}}-{{(1+$i)*($rubric->max_score/$rubric->num_scales)}})</th>
29
                         @endforeach
29
                         @endforeach
30
                         
30
                         
31
                         <th>Notes</th>
31
                         <th>Notes</th>