@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Illuminate\Database\Eloquent\Model; |
6 | 6 | |
7 | -class Institution_shift extends Base_Model { |
|
7 | +class Institution_shift extends Base_Model { |
|
8 | 8 | |
9 | 9 | /** |
10 | 10 | * The database table used by the model. |
@@ -41,29 +41,29 @@ discard block |
||
41 | 41 | */ |
42 | 42 | protected $dates = ['modified', 'created']; |
43 | 43 | |
44 | - public function shiftExists($shift){ |
|
44 | + public function shiftExists($shift) { |
|
45 | 45 | return self::query() |
46 | - ->where('institution_id',$shift['institution_id']) |
|
47 | - ->where('location_institution_id',$shift['location_institution_id']) |
|
48 | - ->where('shift_option_id',$shift['shift_option_id']) |
|
49 | - ->where('academic_period_id',$shift['academic_period_id'])->exists(); |
|
46 | + ->where('institution_id', $shift['institution_id']) |
|
47 | + ->where('location_institution_id', $shift['location_institution_id']) |
|
48 | + ->where('shift_option_id', $shift['shift_option_id']) |
|
49 | + ->where('academic_period_id', $shift['academic_period_id'])->exists(); |
|
50 | 50 | } |
51 | 51 | |
52 | - public function getShiftsToClone(int $year){ |
|
52 | + public function getShiftsToClone(int $year) { |
|
53 | 53 | return self::query() |
54 | 54 | ->select('institution_shifts.*') |
55 | - ->join('academic_periods','academic_periods.id','=','institution_shifts.academic_period_id') |
|
55 | + ->join('academic_periods', 'academic_periods.id', '=', 'institution_shifts.academic_period_id') |
|
56 | 56 | // ->where('academic_periods.code',$year) |
57 | - ->where('institution_shifts.cloned',$year) |
|
57 | + ->where('institution_shifts.cloned', $year) |
|
58 | 58 | ->get()->toArray(); |
59 | 59 | } |
60 | 60 | |
61 | - public function getShiftsTodelete(int $year,$academic_period_id){ |
|
61 | + public function getShiftsTodelete(int $year, $academic_period_id) { |
|
62 | 62 | return self::query() |
63 | 63 | ->select('institution_shifts.*') |
64 | - ->join('academic_periods','academic_periods.id','=','institution_shifts.academic_period_id') |
|
65 | - ->where('academic_period_id',$academic_period_id) |
|
66 | - ->where('institution_shifts.cloned',$year) |
|
64 | + ->join('academic_periods', 'academic_periods.id', '=', 'institution_shifts.academic_period_id') |
|
65 | + ->where('academic_period_id', $academic_period_id) |
|
66 | + ->where('institution_shifts.cloned', $year) |
|
67 | 67 | ->get()->toArray(); |
68 | 68 | } |
69 | 69 | } |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Illuminate\Database\Eloquent\Model; |
6 | 6 | |
7 | -class Education_grades_subject extends Model { |
|
7 | +class Education_grades_subject extends Model { |
|
8 | 8 | |
9 | 9 | /** |
10 | 10 | * The database table used by the model. |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | protected $dates = ['modified', 'created']; |
43 | 43 | |
44 | 44 | |
45 | - public function institutionGradeSubject(){ |
|
46 | - return $this->hasMany('App\Models\Institution_subject','education_grade_id','education_grade_id'); |
|
45 | + public function institutionGradeSubject() { |
|
46 | + return $this->hasMany('App\Models\Institution_subject', 'education_grade_id', 'education_grade_id'); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | } |
50 | 50 | \ No newline at end of file |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | DbSchema::dropIfExists('students_count_view_table'); |
37 | 37 | DB::statement('CREATE TABLE students_count_view_table AS (select * from students_count_view)'); |
38 | 38 | $output->writeln('creat : students_count_view'); |
39 | - } catch (\Throwable $th) { |
|
39 | + }catch (\Throwable $th) { |
|
40 | 40 | $output->writeln($th->getMessage()); |
41 | 41 | } |
42 | 42 | } |
@@ -103,17 +103,17 @@ discard block |
||
103 | 103 | ->leftJoin("education_grades as eg", "eg.id", "i.id") |
104 | 104 | ->leftJoin("institution_class_students as ics", "ist.student_id", "ics.student_id") |
105 | 105 | ->leftJoin("institution_classes as ic", "ic.id", "ics.institution_class_id") |
106 | - ->leftJoin("student_guardians as sgf", function ($join) { |
|
106 | + ->leftJoin("student_guardians as sgf", function($join) { |
|
107 | 107 | $join->on("sgf.student_id", "stu.id"); |
108 | 108 | $join->where("sgf.guardian_relation_id", 1); |
109 | 109 | }) |
110 | 110 | ->leftJoin("security_users as sufu", "sgf.guardian_id", "sufu.id") |
111 | - ->leftJoin("student_guardians as sgm", function ($join) { |
|
111 | + ->leftJoin("student_guardians as sgm", function($join) { |
|
112 | 112 | $join->on("sgm.student_id", "stu.id"); |
113 | 113 | $join->where("sgm.guardian_relation_id", 2); |
114 | 114 | }) |
115 | 115 | ->leftJoin("security_users as sumu", "sgm.guardian_id", "sumu.id") |
116 | - ->leftJoin("student_guardians as sg", function ($join) { |
|
116 | + ->leftJoin("student_guardians as sg", function($join) { |
|
117 | 117 | $join->on("sg.student_id", "stu.id"); |
118 | 118 | $join->where("sg.guardian_relation_id", 3); |
119 | 119 | }) |
@@ -132,27 +132,27 @@ discard block |
||
132 | 132 | ->leftJoin("academic_periods as acps", "acps.id", "ist.academic_period_id") |
133 | 133 | ->leftJoin("institution_subject_students as iss", "stu.id", "iss.student_id") |
134 | 134 | ->leftJoin("education_subjects as edus", "edus.id", "iss.education_subject_id") |
135 | - ->leftJoin("nationalities as natif", function ($join) { |
|
135 | + ->leftJoin("nationalities as natif", function($join) { |
|
136 | 136 | $join->on("sufu.nationality_id", "natif.id"); |
137 | 137 | $join->where("sgf.guardian_relation_id", 1); |
138 | 138 | }) |
139 | - ->leftJoin("nationalities as natim", function ($join) { |
|
139 | + ->leftJoin("nationalities as natim", function($join) { |
|
140 | 140 | $join->on("sumu.nationality_id", "natim.id"); |
141 | 141 | $join->where("sgm.guardian_relation_id", 2); |
142 | 142 | }) |
143 | - ->leftJoin("nationalities as natig", function ($join) { |
|
143 | + ->leftJoin("nationalities as natig", function($join) { |
|
144 | 144 | $join->on("sugu.nationality_id", "natig.id"); |
145 | 145 | $join->where("sg.guardian_relation_id", 3); |
146 | 146 | }) |
147 | - ->leftJoin("identity_types as idtf", function ($join) { |
|
147 | + ->leftJoin("identity_types as idtf", function($join) { |
|
148 | 148 | $join->on("sufu.nationality_id", "idtf.id"); |
149 | 149 | $join->where("sgf.guardian_relation_id", 1); |
150 | 150 | }) |
151 | - ->leftJoin("identity_types as idtm", function ($join) { |
|
151 | + ->leftJoin("identity_types as idtm", function($join) { |
|
152 | 152 | $join->on("sumu.nationality_id", "idtm.id"); |
153 | 153 | $join->where("sgm.guardian_relation_id", 2); |
154 | 154 | }) |
155 | - ->leftJoin("identity_types as idtg", function ($join) { |
|
155 | + ->leftJoin("identity_types as idtg", function($join) { |
|
156 | 156 | $join->on("sugu.nationality_id", "idtg.id"); |
157 | 157 | $join->where("sg.guardian_relation_id", 3); |
158 | 158 | }) |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | DB::statement('CREATE INDEX user_institution ON students_list_view_table (institution_id);'); |
167 | 167 | $output->writeln('created : students_list_view_table'); |
168 | 168 | $output->writeln('created : students_list_view'); |
169 | - } catch (\Throwable $th) { |
|
169 | + }catch (\Throwable $th) { |
|
170 | 170 | $output->writeln($th->getMessage()); |
171 | 171 | } |
172 | 172 | } |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | Schema::createOrReplaceView('upload_list_view', $query); |
227 | 227 | Schema::disableForeignKeyConstraints('upload_list_view'); |
228 | 228 | $output->writeln('created : upload_list_view'); |
229 | - } catch (\Throwable $th) { |
|
229 | + }catch (\Throwable $th) { |
|
230 | 230 | $output->writeln($th->getMessage()); |
231 | 231 | } |
232 | 232 | } |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | Schema::dropIfExists("upload_count_view"); |
262 | 262 | Schema::createOrReplaceView("upload_count_view", $query); |
263 | 263 | $output->writeln('created : upload_count_view'); |
264 | - } catch (\Throwable $th) { |
|
264 | + }catch (\Throwable $th) { |
|
265 | 265 | $output->writeln($th->getMessage()); |
266 | 266 | } |
267 | 267 | } |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | Schema::dropIfExists("institution_info_view"); |
289 | 289 | Schema::createOrReplaceView("institution_info_view", $query); |
290 | 290 | $output->writeln('created : institution_info_view'); |
291 | - } catch (\Throwable $th) { |
|
291 | + }catch (\Throwable $th) { |
|
292 | 292 | $output->writeln($th->getMessage()); |
293 | 293 | } |
294 | 294 | } |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | Schema::dropIfExists("students_count_by_grade_view"); |
327 | 327 | Schema::createOrReplaceView('students_count_by_grade_view', $query); |
328 | 328 | $output->writeln('created : students_count_by_grade_view'); |
329 | - } catch (\Throwable $th) { |
|
329 | + }catch (\Throwable $th) { |
|
330 | 330 | $output->writeln($th->getMessage()); |
331 | 331 | } |
332 | 332 | } |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | "ist.created" |
352 | 352 | ) |
353 | 353 | ->join("institutions as i", "i.id", "ist.institution_id") |
354 | - ->join('user_body_masses as ubm', function ($join) { |
|
354 | + ->join('user_body_masses as ubm', function($join) { |
|
355 | 355 | $join->on('ubm.security_user_id', 'ist.student_id'); |
356 | 356 | $join->where('ubm.academic_period_id', 'ist.academic_period_id'); |
357 | 357 | }) |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | Schema::dropIfExists("students_count_by_bmi_view"); |
360 | 360 | Schema::createOrReplaceView("students_count_by_bmi_view", $query); |
361 | 361 | $output->writeln('created : students_count_by_bmi_view'); |
362 | - } catch (\Throwable $th) { |
|
362 | + }catch (\Throwable $th) { |
|
363 | 363 | $output->writeln($th->getMessage()); |
364 | 364 | } |
365 | 365 | } |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | Schema::dropIfExists("student_count_by_class_view"); |
393 | 393 | Schema::createOrReplaceView('student_count_by_class_view', $query); |
394 | 394 | $output->writeln('created : student_count_by_class_view'); |
395 | - } catch (\Throwable $th) { |
|
395 | + }catch (\Throwable $th) { |
|
396 | 396 | $output->writeln($th->getMessage()); |
397 | 397 | } |
398 | 398 | } |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | use Illuminate\Database\Eloquent\Model; |
6 | 6 | use Webpatser\Uuid\Uuid; |
7 | 7 | |
8 | -class Institution_class_subject extends Base_Model { |
|
8 | +class Institution_class_subject extends Base_Model { |
|
9 | 9 | |
10 | 10 | /** |
11 | 11 | * The database table used by the model. |
@@ -42,19 +42,19 @@ discard block |
||
42 | 42 | */ |
43 | 43 | protected $dates = ['modified', 'created']; |
44 | 44 | |
45 | - public function institutionMandatorySubject(){ |
|
46 | - return $this->belongsTo('App\Models\Institution_subject','institution_subject_id','id') |
|
45 | + public function institutionMandatorySubject() { |
|
46 | + return $this->belongsTo('App\Models\Institution_subject', 'institution_subject_id', 'id') |
|
47 | 47 | ->with('institutionGradeSubject') |
48 | - ->whereHas('institutionGradeSubject', function ($query) { |
|
49 | - $query->where('auto_allocation',1); |
|
48 | + ->whereHas('institutionGradeSubject', function($query) { |
|
49 | + $query->where('auto_allocation', 1); |
|
50 | 50 | }); |
51 | 51 | } |
52 | 52 | |
53 | - public function institutionOptionalSubject(){ |
|
54 | - return $this->belongsTo('App\Models\Institution_subject','institution_subject_id','id') |
|
53 | + public function institutionOptionalSubject() { |
|
54 | + return $this->belongsTo('App\Models\Institution_subject', 'institution_subject_id', 'id') |
|
55 | 55 | ->with('institutionGradeSubject') |
56 | - ->whereHas('institutionGradeSubject', function ($query) { |
|
57 | - $query->where('auto_allocation',0); |
|
56 | + ->whereHas('institutionGradeSubject', function($query) { |
|
57 | + $query->where('auto_allocation', 0); |
|
58 | 58 | }); |
59 | 59 | |
60 | 60 | } |
@@ -62,23 +62,23 @@ discard block |
||
62 | 62 | public static function boot() |
63 | 63 | { |
64 | 64 | parent::boot(); |
65 | - self::creating(function ($model) { |
|
65 | + self::creating(function($model) { |
|
66 | 66 | $model->id = (string) Uuid::generate(4); |
67 | 67 | }); |
68 | 68 | } |
69 | 69 | |
70 | - public function institutionSubject(){ |
|
71 | - return $this->belongsTo('App\Models\Institution_subject','institution_subject_id','id') |
|
70 | + public function institutionSubject() { |
|
71 | + return $this->belongsTo('App\Models\Institution_subject', 'institution_subject_id', 'id') |
|
72 | 72 | ->with('institutionGradeSubject'); |
73 | 73 | } |
74 | 74 | |
75 | 75 | |
76 | - public static function getMandetorySubjects($institutionClass){ |
|
76 | + public static function getMandetorySubjects($institutionClass) { |
|
77 | 77 | $institutionGrade = Institution_class_grade::where('institution_class_id', '=', $institutionClass)->first(); |
78 | 78 | $mandatorySubject = Institution_class_subject::with(['institutionSubject']) |
79 | - ->whereHas('institutionSubject', function ($query) use ($institutionGrade) { |
|
80 | - $query->whereHas('institutionGradeSubject',function($query){ |
|
81 | - $query->where('auto_allocation',1); |
|
79 | + ->whereHas('institutionSubject', function($query) use ($institutionGrade) { |
|
80 | + $query->whereHas('institutionGradeSubject', function($query) { |
|
81 | + $query->where('auto_allocation', 1); |
|
82 | 82 | })->where('education_grade_id', $institutionGrade->education_grade_id); |
83 | 83 | // ->where('auto_allocation', $institutionGrade->education_grade_id); |
84 | 84 | }) |
@@ -87,10 +87,10 @@ discard block |
||
87 | 87 | return $mandatorySubject; |
88 | 88 | } |
89 | 89 | |
90 | - public static function getAllSubjects($institutionClass){ |
|
90 | + public static function getAllSubjects($institutionClass) { |
|
91 | 91 | $institutionGrade = Institution_class_grade::where('institution_class_id', '=', $institutionClass)->first(); |
92 | 92 | $allSubjects = Institution_class_subject::with(['institutionSubject']) |
93 | - ->whereHas('institutionSubject', function ($query) use ($institutionGrade) { |
|
93 | + ->whereHas('institutionSubject', function($query) use ($institutionGrade) { |
|
94 | 94 | $query->whereHas('institutionGradeSubject')->where('education_grade_id', $institutionGrade->education_grade_id); |
95 | 95 | }) |
96 | 96 | ->where('institution_class_id', '=', $institutionClass) |
@@ -102,9 +102,9 @@ discard block |
||
102 | 102 | $data = []; |
103 | 103 | foreach ($subjects as $subject) { |
104 | 104 | $subjectId = Institution_class_subject::with(['institutionSubject']) |
105 | - ->whereHas('institutionSubject', function ($query) use ($row, $subject, $student) { |
|
106 | - $query->whereHas('institutionGradeSubject',function($query){ |
|
107 | - $query->where('auto_allocation',0); |
|
105 | + ->whereHas('institutionSubject', function($query) use ($row, $subject, $student) { |
|
106 | + $query->whereHas('institutionGradeSubject', function($query) { |
|
107 | + $query->where('auto_allocation', 0); |
|
108 | 108 | }) |
109 | 109 | ->where('name', '=', $row[$subject]) |
110 | 110 | ->where('education_grade_id', '=', $student->education_grade_id); |
@@ -117,15 +117,15 @@ discard block |
||
117 | 117 | return $data; |
118 | 118 | } |
119 | 119 | |
120 | - public function getInstitutionClassSubjects($academicPeriodId,$classIds){ |
|
120 | + public function getInstitutionClassSubjects($academicPeriodId, $classIds) { |
|
121 | 121 | return self::query() |
122 | - ->whereIn('institution_class_id',$classIds) |
|
122 | + ->whereIn('institution_class_id', $classIds) |
|
123 | 123 | ->get() |
124 | 124 | ->toArray(); |
125 | 125 | } |
126 | 126 | |
127 | - public function isDuplicated($subject){ |
|
128 | - return self::query()->where('institution_subject_id',$subject['institution_subject_id']) |
|
129 | - ->where('institution_class_id',$subject['institution_class_id'])->get()->toArray(); |
|
127 | + public function isDuplicated($subject) { |
|
128 | + return self::query()->where('institution_subject_id', $subject['institution_subject_id']) |
|
129 | + ->where('institution_class_id', $subject['institution_class_id'])->get()->toArray(); |
|
130 | 130 | } |
131 | 131 | } |
@@ -67,13 +67,13 @@ |
||
67 | 67 | 'institution_id' => $admissionInfo['instituion']->id, |
68 | 68 | 'academic_period_id' => $admissionInfo['academic_period']->id, |
69 | 69 | 'education_grade_id' => $admissionInfo['education_grade']->id, |
70 | - 'institution_class_id' => (($admissionInfo['instituion_class'] != []) && (count($admissionInfo['instituion_class'])==1)) ? $admissionInfo['instituion_class']['id'] : null, |
|
70 | + 'institution_class_id' => (($admissionInfo['instituion_class'] != []) && (count($admissionInfo['instituion_class']) == 1)) ? $admissionInfo['instituion_class']['id'] : null, |
|
71 | 71 | 'comment' => 'Imported From Examination Data', |
72 | 72 | 'updated_from' => 'doe', |
73 | 73 | 'created_user_id' => 1 |
74 | 74 | ]; |
75 | 75 | self::create($data); |
76 | - } catch (\Throwable $th) { |
|
76 | + }catch (\Throwable $th) { |
|
77 | 77 | Log::error($th); |
78 | 78 | } |
79 | 79 | } |
@@ -20,7 +20,7 @@ |
||
20 | 20 | */ |
21 | 21 | public function __construct($user) |
22 | 22 | { |
23 | - $this->user = $user; |
|
23 | + $this->user = $user; |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | /** |
@@ -41,10 +41,10 @@ |
||
41 | 41 | { |
42 | 42 | $year = $this->argument('year'); |
43 | 43 | $institutions = $this->instituion_grade->getInstitutionGradeList($year); |
44 | - array_walk($institutions,array($this,'callPromotion'),$year); |
|
44 | + array_walk($institutions, array($this, 'callPromotion'), $year); |
|
45 | 45 | } |
46 | 46 | |
47 | - protected function callPromotion($institution,$count,$year){ |
|
48 | - $this->call('promote:students',['year' => $year,'institution' => $institution['code']]); |
|
47 | + protected function callPromotion($institution, $count, $year) { |
|
48 | + $this->call('promote:students', ['year' => $year, 'institution' => $institution['code']]); |
|
49 | 49 | } |
50 | 50 | } |
@@ -43,29 +43,29 @@ |
||
43 | 43 | $this->start_time = microtime(TRUE); |
44 | 44 | $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
45 | 45 | $this->output->writeln('############### Starting delete Duplication ################'); |
46 | - $studentsIdsWithDuplication = DB::table('institution_students as ins') |
|
47 | - ->select(DB::raw('count(*) as total'),'student_id','id','academic_period_id','education_grade_id') |
|
48 | - ->having('total','>',1) |
|
46 | + $studentsIdsWithDuplication = DB::table('institution_students as ins') |
|
47 | + ->select(DB::raw('count(*) as total'), 'student_id', 'id', 'academic_period_id', 'education_grade_id') |
|
48 | + ->having('total', '>', 1) |
|
49 | 49 | ->groupBy('ins.student_id') |
50 | 50 | ->orderBy('ins.student_id') |
51 | - ->chunk(100,function($Students){ |
|
51 | + ->chunk(100, function($Students) { |
|
52 | 52 | foreach ($Students as $Student) { |
53 | - Institution_student::where('institution_students.id','>',$Student->id) |
|
54 | - ->where('institution_students.student_id',$Student->student_id) |
|
55 | - ->where('institution_students.academic_period_id',$Student->academic_period_id) |
|
56 | - ->where('institution_students.education_grade_id',$Student->education_grade_id) |
|
53 | + Institution_student::where('institution_students.id', '>', $Student->id) |
|
54 | + ->where('institution_students.student_id', $Student->student_id) |
|
55 | + ->where('institution_students.academic_period_id', $Student->academic_period_id) |
|
56 | + ->where('institution_students.education_grade_id', $Student->education_grade_id) |
|
57 | 57 | ->delete(); |
58 | 58 | } |
59 | 59 | $this->end_time = microtime(TRUE); |
60 | - $this->output->writeln('Deleted 100 starting with' .$Students[0]->id); |
|
61 | - $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete'); |
|
60 | + $this->output->writeln('Deleted 100 starting with'.$Students[0]->id); |
|
61 | + $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete'); |
|
62 | 62 | }); |
63 | 63 | $this->end_time = microtime(TRUE); |
64 | 64 | $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$'); |
65 | - $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete'); |
|
65 | + $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete'); |
|
66 | 66 | $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$'); |
67 | 67 | |
68 | - } catch (\Throwable $th) { |
|
68 | + }catch (\Throwable $th) { |
|
69 | 69 | dd($th); |
70 | 70 | } |
71 | 71 | } |
@@ -61,7 +61,7 @@ |
||
61 | 61 | { |
62 | 62 | $year = $this->argument('year'); |
63 | 63 | $institution = $this->argument('institution'); |
64 | - $institutionGrade = $this->instituion_grade->getInstitutionGradeToPromoted($year,$institution); |
|
65 | - (new BulkPromotion())->callback($institutionGrade,$year); |
|
64 | + $institutionGrade = $this->instituion_grade->getInstitutionGradeToPromoted($year, $institution); |
|
65 | + (new BulkPromotion())->callback($institutionGrade, $year); |
|
66 | 66 | } |
67 | 67 | } |