Browse Source

para que los N/A de avaluo no cuenten como 0 y no se reporten

parent
commit
5e83351ab1

+ 1
- 1
app/controllers/OutcomesController.php View File

983
             ->first();
983
             ->first();
984
         Log::info($program);
984
         Log::info($program);
985
 
985
 
986
-
986
+// exit();
987
         return View::make('local.managers.pCoords.new_assessment_report', compact('title', 'program'));
987
         return View::make('local.managers.pCoords.new_assessment_report', compact('title', 'program'));
988
     }
988
     }
989
 
989
 

+ 1
- 1
app/database/seeds/CourseStudentTableSeeder.php View File

15
         $time_start = microtime(true);
15
         $time_start = microtime(true);
16
 
16
 
17
         // Open file
17
         // Open file
18
-        if($file = fopen('app/database/csv/ARCEXTPR-20-20220829-030414.TXT', 'r'))
18
+        if($file = fopen('app/database/csv/estusLabC21.txt', 'r'))
19
         {
19
         {
20
             // Initialize count variables
20
             // Initialize count variables
21
             $read = 0;
21
             $read = 0;

+ 1
- 0
app/models/Criterion.php View File

105
 			$students_attempted += DB::table('assessments')
105
 			$students_attempted += DB::table('assessments')
106
 				->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
106
 				->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
107
 				->where('activity_criterion.id', $activity_criterion->id)
107
 				->where('activity_criterion.id', $activity_criterion->id)
108
+				->whereNotNull('score')
108
 				->count();
109
 				->count();
109
 		}
110
 		}
110
 		return $students_attempted;
111
 		return $students_attempted;

+ 4
- 2
app/views/local/managers/pCoords/new_assessment_report.blade.php View File

99
                                     <br>
99
                                     <br>
100
                                     <h5 style="display: inline;">Performance Indicators: </h5>
100
                                     <h5 style="display: inline;">Performance Indicators: </h5>
101
                                     <?php
101
                                     <?php
102
-                                    Log::info($activity->rubric[0]);
102
+//                                     Log::info($activity->rubric[0]);
103
                                     ?>
103
                                     ?>
104
                                     <p style="display: inline;"><i>{{ $activity->rubric[0]->num_scales }} (
104
                                     <p style="display: inline;"><i>{{ $activity->rubric[0]->num_scales }} (
105
                                             <?php
105
                                             <?php
165
                                         </thead>
165
                                         </thead>
166
                                         <tbody>
166
                                         <tbody>
167
                                             @foreach ($activity->allActivityCriterionInfo() as $index5 => $ac_criterion)
167
                                             @foreach ($activity->allActivityCriterionInfo() as $index5 => $ac_criterion)
168
+                                             @if ( Criterion::students_attempted($ac_criterion->criterion_id, $activity->id) )
168
                                                 <tr>
169
                                                 <tr>
169
                                                     <td> {{ $ac_criterion->name }}</td>
170
                                                     <td> {{ $ac_criterion->name }}</td>
170
                                                     <td>{{ Criterion::students_attempted($ac_criterion->criterion_id, $activity->id) }}
171
                                                     <td>{{ Criterion::students_attempted($ac_criterion->criterion_id, $activity->id) }}
203
 
204
 
204
                                                     </td>
205
                                                     </td>
205
                                                 </tr>
206
                                                 </tr>
207
+                                             @endif
206
                                             @endforeach
208
                                             @endforeach
207
                                         </tbody>
209
                                         </tbody>
208
 
210
 
330
                                     <br>
332
                                     <br>
331
                                     <h5 style="display: inline;">Performance Indicators: </h5>
333
                                     <h5 style="display: inline;">Performance Indicators: </h5>
332
                                     <?php
334
                                     <?php
333
-                                    Log::info($activity->rubric[0]);
335
+//                                     Log::info($activity->rubric[0]);
334
                                     ?>
336
                                     ?>
335
                                     <p style="display: inline;"><i>{{ $activity->rubric[0]->num_scales }} (
337
                                     <p style="display: inline;"><i>{{ $activity->rubric[0]->num_scales }} (
336
                                             <?php
338
                                             <?php