|
@@ -4,7 +4,7 @@ discard block |
|
|
block discarded – undo |
|
4
|
4
|
|
|
5
|
5
|
use Illuminate\Database\Eloquent\Model; |
|
6
|
6
|
|
|
7
|
|
-class Institution_class extends Base_Model { |
|
|
7
|
+class Institution_class extends Base_Model { |
|
8
|
8
|
|
|
9
|
9
|
public const CREATED_AT = 'created'; |
|
10
|
10
|
public const UPDATED_AT = 'modified'; |
|
@@ -48,33 +48,33 @@ discard block |
|
|
block discarded – undo |
|
48
|
48
|
*/ |
|
49
|
49
|
protected $dates = ['modified', 'created']; |
|
50
|
50
|
|
|
51
|
|
- public function class_teacher(){ |
|
52
|
|
- return $this->belongsTo('App\Models\Security_group_user','staff_id','security_user_id'); |
|
|
51
|
+ public function class_teacher() { |
|
|
52
|
+ return $this->belongsTo('App\Models\Security_group_user', 'staff_id', 'security_user_id'); |
|
53
|
53
|
} |
|
54
|
54
|
|
|
55
|
|
- public function institution(){ |
|
56
|
|
- return $this->belongsTo('App\Models\Institution','institution_id'); |
|
|
55
|
+ public function institution() { |
|
|
56
|
+ return $this->belongsTo('App\Models\Institution', 'institution_id'); |
|
57
|
57
|
} |
|
58
|
58
|
|
|
59
|
59
|
|
|
60
|
|
- public function getShiftClasses($shift){ |
|
|
60
|
+ public function getShiftClasses($shift) { |
|
61
|
61
|
return self::query() |
|
62
|
|
- ->select('institution_classes.id','institution_classes.institution_id','institution_classes.institution_shift_id', |
|
63
|
|
- 'institution_classes.name','institution_classes.no_of_students','institution_classes.class_number','institution_class_grades.education_grade_id') |
|
64
|
|
- ->where('institution_shift_id',$shift) |
|
|
62
|
+ ->select('institution_classes.id', 'institution_classes.institution_id', 'institution_classes.institution_shift_id', |
|
|
63
|
+ 'institution_classes.name', 'institution_classes.no_of_students', 'institution_classes.class_number', 'institution_class_grades.education_grade_id') |
|
|
64
|
+ ->where('institution_shift_id', $shift) |
|
65
|
65
|
// ->where('academic_period_id',$academicPeriod) |
|
66
|
|
- ->join('institution_class_grades','institution_classes.id','institution_class_grades.institution_class_id') |
|
|
66
|
+ ->join('institution_class_grades', 'institution_classes.id', 'institution_class_grades.institution_class_id') |
|
67
|
67
|
->groupBy('institution_classes.id') |
|
68
|
68
|
->get()->toArray(); |
|
69
|
69
|
} |
|
70
|
70
|
|
|
71
|
|
- public static function getGradeClasses($education_grade_id,$institution_id){ |
|
|
71
|
+ public static function getGradeClasses($education_grade_id, $institution_id) { |
|
72
|
72
|
return self::query() |
|
73
|
|
- ->select('institution_classes.id','institution_classes.institution_id','institution_classes.institution_shift_id', |
|
74
|
|
- 'institution_classes.name','institution_classes.no_of_students','institution_classes.class_number','institution_class_grades.education_grade_id') |
|
75
|
|
- ->where('institution_class_grades.education_grade_id',$education_grade_id) |
|
76
|
|
- ->where('institution_class_grades.institution_id',$institution_id) |
|
77
|
|
- ->join('institution_class_grades','institution_classes.id','institution_class_grades.institution_class_id') |
|
|
73
|
+ ->select('institution_classes.id', 'institution_classes.institution_id', 'institution_classes.institution_shift_id', |
|
|
74
|
+ 'institution_classes.name', 'institution_classes.no_of_students', 'institution_classes.class_number', 'institution_class_grades.education_grade_id') |
|
|
75
|
+ ->where('institution_class_grades.education_grade_id', $education_grade_id) |
|
|
76
|
+ ->where('institution_class_grades.institution_id', $institution_id) |
|
|
77
|
+ ->join('institution_class_grades', 'institution_classes.id', 'institution_class_grades.institution_class_id') |
|
78
|
78
|
->groupBy('institution_classes.id') |
|
79
|
79
|
->get()->toArray(); |
|
80
|
80
|
} |
moe-lk /
bulk-upload
