父节点
当前提交
7b478736bd

+ 3
- 0
app/views/local/managers/admins/new_assessment_report.blade.php 查看文件

@@ -296,6 +296,9 @@
296 296
                                                     if (!$expected) {
297 297
                                                         $expected = 'It has not been defined in the annual plan';
298 298
                                                     }
299
+                                                    else{
300
+                                            $expected = $expected->expected_target;
301
+                                        }
299 302
                                                     ?>
300 303
                                                     {{ $expected }}
301 304
                                                 </i>

+ 3
- 1
app/views/local/managers/pCoords/new_assessment_report.blade.php 查看文件

@@ -271,7 +271,9 @@
271 271
                                             if (!$expected) {
272 272
                                                 $expected = 'It has not been defined in the annual plan';
273 273
                                             }
274
-                                            
274
+                                            else{
275
+                                            $expected = $expected->expected_target;
276
+                                        }
275 277
                                             ?>
276 278
                                             {{ $expected }}
277 279
                                         </i>

+ 3
- 0
app/views/local/managers/sCoords/new_assessment_report.blade.php 查看文件

@@ -289,6 +289,9 @@
289 289
                                                 if (!$expected) {
290 290
                                                     $expected = 'It has not been defined in the annual plan';
291 291
                                                 }
292
+                                                else{
293
+                                            $expected = $expected->expected_target;
294
+                                        }
292 295
                                                 ?>
293 296
                                                 {{ $expected }}
294 297
                                             </i>

+ 6
- 0
app/views/local/professors/compare_activities.blade.php 查看文件

@@ -289,6 +289,9 @@
289 289
                         if (!$expected) {
290 290
                             $expected = 'It has not been defined in the annual plan';
291 291
                         }
292
+                        else{
293
+                                            $expected = $expected->expected_target;
294
+                                        }
292 295
                         
293 296
                         ?>
294 297
                         {{ $expected }}
@@ -527,6 +530,9 @@
527 530
                         if (!$expected) {
528 531
                             $expected = 'It has not been defined in the annual plan';
529 532
                         }
533
+                        else{
534
+                                            $expected = $expected->expected_target;
535
+                                        }
530 536
                         ?>
531 537
                         {{ $expected }}
532 538
                     </i>

+ 5
- 1
app/views/local/professors/new_assessment_report.blade.php 查看文件

@@ -284,7 +284,11 @@
284 284
                                             ->where('semester_id', $course->semester_id)
285 285
                                             ->first(); //->expected_target;
286 286
                                         if (!$expected) {
287
-                                            $expected = 'It has not been defined in the annual plan';
287
+                                            
288
+                                             $expected = 'It has not been defined in the annual plan';
289
+                                        }
290
+                                        else{
291
+                                            $expected = $expected->expected_target;
288 292
                                         }
289 293
                                         
290 294
                                         ?>