@@ -23,9 +23,9 @@ |
||
23 | 23 | } |
24 | 24 | |
25 | 25 | function clean($string) { |
26 | - $string = str_replace(' ', '-', $string); // Replaces all spaces with hyphens. |
|
26 | + $string = str_replace(' ', '-', $string); // Replaces all spaces with hyphens. |
|
27 | 27 | |
28 | - return preg_replace('/[^A-Za-z0-9\-]/', '', $string); // Removes special chars. |
|
28 | + return preg_replace('/[^A-Za-z0-9\-]/', '', $string); // Removes special chars. |
|
29 | 29 | } |
30 | 30 | |
31 | 31 |
@@ -29,9 +29,9 @@ discard block |
||
29 | 29 | |
30 | 30 | } |
31 | 31 | |
32 | - /** |
|
33 | - * @return \Illuminate\Support\Collection |
|
34 | - */ |
|
32 | + /** |
|
33 | + * @return \Illuminate\Support\Collection |
|
34 | + */ |
|
35 | 35 | public function importExportView() |
36 | 36 | { |
37 | 37 | if(Auth::user()->super_admin ){ |
@@ -45,11 +45,11 @@ discard block |
||
45 | 45 | |
46 | 46 | |
47 | 47 | /** |
48 | - * @return \Illuminate\Support\Collection |
|
49 | - */ |
|
48 | + * @return \Illuminate\Support\Collection |
|
49 | + */ |
|
50 | 50 | public function export(Request $request) |
51 | 51 | { |
52 | - $request->validate([ |
|
52 | + $request->validate([ |
|
53 | 53 | 'class' => 'required' |
54 | 54 | ]); |
55 | 55 | return Excel::download(new UsersExport($request->input('class')), 'users.xlsx'); |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | |
59 | 59 | |
60 | 60 | /** |
61 | - * @return \Illuminate\Support\Collection |
|
62 | - */ |
|
61 | + * @return \Illuminate\Support\Collection |
|
62 | + */ |
|
63 | 63 | public function import(Request $request) |
64 | 64 | { |
65 | 65 |
@@ -80,7 +80,7 @@ |
||
80 | 80 | } |
81 | 81 | |
82 | 82 | }) |
83 | - ->editColumn('error', function ($data) { |
|
83 | + ->editColumn('error', function ($data) { |
|
84 | 84 | if(\App::environment('local') || \App::environment('stage')){ |
85 | 85 | return '<a href="/download/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
86 | 86 |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | * `select total from students_count_view where institution_id = $id` |
16 | 16 | * `select male from students_count_view where institution_id = $id` |
17 | 17 | * `select female from students_count_view where institution_id = $id` |
18 | - **/ |
|
18 | + **/ |
|
19 | 19 | DashboardViews::createOrUpdateStudentCount(); |
20 | 20 | |
21 | 21 | /** |
@@ -48,10 +48,10 @@ discard block |
||
48 | 48 | */ |
49 | 49 | DashboardViews::createOrUpdateStudentsCountByGrade(); |
50 | 50 | |
51 | - /** |
|
52 | - * Students count by BMI |
|
53 | - * select * from students_count_by_bmi_view where institution_id = $id |
|
54 | - */ |
|
51 | + /** |
|
52 | + * Students count by BMI |
|
53 | + * select * from students_count_by_bmi_view where institution_id = $id |
|
54 | + */ |
|
55 | 55 | DashboardViews::createOrUpdateStudentCountByBMI(); |
56 | 56 | |
57 | 57 | /** |
@@ -27,11 +27,11 @@ |
||
27 | 27 | */ |
28 | 28 | protected $description = 'Update the students count male/female'; |
29 | 29 | |
30 | - /** |
|
31 | - * Create a new command instance. |
|
32 | - * |
|
33 | - * @return void |
|
34 | - */ |
|
30 | + /** |
|
31 | + * Create a new command instance. |
|
32 | + * |
|
33 | + * @return void |
|
34 | + */ |
|
35 | 35 | public function __construct() |
36 | 36 | { |
37 | 37 | parent::__construct(); |
@@ -39,7 +39,7 @@ |
||
39 | 39 | */ |
40 | 40 | public function handle() |
41 | 41 | { |
42 | - $views = new DashboardViewsController(); |
|
43 | - $views->callback(); |
|
42 | + $views = new DashboardViewsController(); |
|
43 | + $views->callback(); |
|
44 | 44 | } |
45 | 45 | } |
@@ -152,12 +152,12 @@ |
||
152 | 152 | ->get()->toArray(); |
153 | 153 | } |
154 | 154 | |
155 | - /** |
|
156 | - * First level search for students |
|
157 | - * |
|
158 | - * @param array $student |
|
159 | - * @return array |
|
160 | - */ |
|
155 | + /** |
|
156 | + * First level search for students |
|
157 | + * |
|
158 | + * @param array $student |
|
159 | + * @return array |
|
160 | + */ |
|
161 | 161 | public function getStudentCount($student) |
162 | 162 | { |
163 | 163 | return $this |
@@ -37,8 +37,8 @@ |
||
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
40 | - * @return \Illuminate\Support\Collection |
|
41 | - */ |
|
40 | + * @return \Illuminate\Support\Collection |
|
41 | + */ |
|
42 | 42 | public function query() |
43 | 43 | { |
44 | 44 | return Examination_student::query()->whereNotNull('nsid') |
@@ -70,21 +70,21 @@ |
||
70 | 70 | */ |
71 | 71 | public static function isDuplicated($inputs){ |
72 | 72 | |
73 | - $exists = self::where('student_id','=',$inputs['student_id']) |
|
74 | - ->where('institution_subject_id','=',$inputs['institution_subject_id']) |
|
75 | - ->where('education_subject_id','=',$inputs['education_subject_id'])->count(); |
|
73 | + $exists = self::where('student_id','=',$inputs['student_id']) |
|
74 | + ->where('institution_subject_id','=',$inputs['institution_subject_id']) |
|
75 | + ->where('education_subject_id','=',$inputs['education_subject_id'])->count(); |
|
76 | 76 | |
77 | 77 | |
78 | 78 | return $exists ? true :false; |
79 | 79 | } |
80 | 80 | |
81 | 81 | |
82 | - public function student(){ |
|
82 | + public function student(){ |
|
83 | 83 | return $this->belongsTo('App\Models\Security_user','student_id'); |
84 | 84 | } |
85 | 85 | |
86 | 86 | public static function getStudentsCount($institution_subject_id){ |
87 | - $total_male_students = self::with(['student' => function($query) { |
|
87 | + $total_male_students = self::with(['student' => function($query) { |
|
88 | 88 | $query->where('student.gender_id', '=', 1); |
89 | 89 | }])->whereHas('student', function ($query) { |
90 | 90 | $query->where('gender_id', '=', 1); |