Skip to content

Commit 4140fc9

Browse files
committed
add notifications
1 parent 4b919ad commit 4140fc9

File tree

11 files changed

+46
-16
lines changed

11 files changed

+46
-16
lines changed

app/Events/NewBehaviorAdded.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function __construct(StudentBehavior $studentBehavior)
4747
]);
4848
}
4949

50-
event(new changeLevel($subject));
50+
event(new changeLevel($subject,$student));
5151
}
5252

5353
/**

app/Events/changeLevel.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@ class changeLevel
2323
*
2424
* @return void
2525
*/
26-
public function __construct(Subject $subject)
26+
public function __construct(Subject $subject,$user = null)
2727
{
28-
$totalPoints = Auth::user()->totalPoints($subject->id);
29-
$authLevelID = Auth::user()->getLevelId($subject->id);
28+
if ($user == null){
29+
$user= Auth::user();
30+
}
31+
$totalPoints = $user->totalPoints($subject->id);
32+
$authLevelID = $user->getLevelId($subject->id);
3033

3134
$authLevel = $subject->levels()->where('levels.id', $authLevelID)->first();
3235
$levels = $subject->levels()->get();
@@ -47,7 +50,7 @@ public function __construct(Subject $subject)
4750

4851

4952
if ($temp_level && $temp_level->id != $authLevelID) {
50-
Auth::user()->enrolledSubject()->syncWithoutDetaching([
53+
$user->enrolledSubject()->syncWithoutDetaching([
5154
$subject->id => [
5255
'level_id' => $temp_level->id,
5356
]

app/Http/Controllers/BadgeBehaviorController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class BadgeBehaviorController extends Controller
2222
public function index()
2323
{
2424
if (Auth::user()->hasRole('Admin')) {
25+
2526
$badges = BadgeBehavior::with(['subject', 'badge', 'behavior'])->get();
2627
} else {
2728

@@ -40,7 +41,7 @@ public function index()
4041
*/
4142
public function create()
4243
{
43-
$behaviors = Behavior::all();
44+
$behaviors = Behavior::where('hidden',0)->get();
4445
$badges = Badge::all();
4546

4647
if (Auth::user()->hasRole('Admin')) {

app/Http/Controllers/Controller.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,14 @@ protected function getLastSeenObjective($modules)
7070
}
7171

7272
public function objectiveSeen($user,$objective,$subject){
73-
$user->seen()->attach($objective->id);
74-
event(new objective_complete($user, $objective, $subject));
73+
// dd($user->seen);
74+
$isSeen = $user->seen()->where('objective_seen.student_id',$user->id)
75+
->where('objective_seen.objective_id',$objective->id)->first();
76+
77+
if (!$isSeen){
78+
$user->seen()->attach($objective->id);
79+
event(new objective_complete($user, $objective, $subject));
80+
}
81+
7582
}
7683
}

app/Http/Controllers/ExamFrontController.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ public function storePlacement(Request $request, Subject $subject, Placement $pl
117117
{
118118

119119
$options = $request->get('option');
120+
120121
DB::beginTransaction();
121122
try {
122123

@@ -149,8 +150,12 @@ public function storePlacement(Request $request, Subject $subject, Placement $pl
149150
}
150151
}
151152

153+
if ($correct_questions == count($options)){
154+
event(new placement_complete($subject, $placement));
155+
}else{
156+
// event(new placement_complete($subject, $placement));
157+
}
152158

153-
event(new placement_complete($subject, $placement));
154159
$user = Auth::user();
155160
(new MainHelper)->notify_user([
156161
'user_id' => $subject->creator_id,

app/Http/Controllers/PlacementController.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ public function update(Request $request, Placement $placement)
119119
*/
120120
public function destroy(Placement $placement)
121121
{
122-
//
122+
$placement->delete();
123+
124+
return redirect()->back();
123125
}
124126
}

app/Models/User.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Illuminate\Database\Eloquent\Factories\HasFactory;
88
use Illuminate\Foundation\Auth\User as Authenticatable;
99
use Illuminate\Notifications\Notifiable;
10+
use Illuminate\Support\Facades\Auth;
1011
use Illuminate\Support\Facades\Hash;
1112
use Laravel\Sanctum\HasApiTokens;
1213
use Spatie\MediaLibrary\HasMedia\HasMedia;
@@ -124,6 +125,7 @@ public function getLevel($subject_id)
124125

125126
public function getLevelId($subject_id)
126127
{
128+
127129
return $this->getLevel($subject_id)->pivot->level_id;
128130
}
129131

@@ -150,6 +152,7 @@ public function placement_submit()
150152

151153
public function subject_placement_submit($subject_id)
152154
{
155+
153156
return $this->placement_submit()->where('subject_id', $subject_id)->first();
154157
}
155158

resources/views/backend/subjects/edit.blade.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@
5050
</div>
5151
<div class="col-md-12">
5252
<div class="form-group">
53+
5354
<label for="example-text-input" class="form-control-label">Enroll Points</label>
5455
<input class="form-control" type="number" name="process_points"
55-
value="{{$subject->points->count ?? ''}}"
56+
value="{{$subject->points[0]->count ??''}}"
5657
>
5758
<span class="text-xs">points collect if student Enroll this subject</span>
5859
</div>

resources/views/backend/subjects/students/info.blade.php

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,14 @@
1818
<span class="font-weight-bold text-lg">Student {{$student->name}} Info</span>
1919
<span class="d-block font-weight-bold text-lg">Subject {{$subject->name}}</span>
2020
</div>
21-
<a href="{{route('backend.subjects.student.placement.info',['subject'=>$subject,'student'=>$student,'placement'=>$student->subject_placement_submit($subject->id)])}}"
22-
class="btn btn-primary">Placement info</a>
21+
22+
23+
24+
@if($student->subject_placement_submit($subject->id))
25+
<a href="{{route('backend.subjects.student.placement.info',['subject'=>$subject,'student'=>$student,'placement'=>$student->subject_placement_submit($subject->id)])}}"
26+
class="btn btn-primary">Placement info</a>
27+
@endif
28+
2329

2430
</div>
2531
<div class="card-body px-0 pt-0 pb-2">
@@ -59,10 +65,11 @@ class="btn btn-primary">Placement info</a>
5965
</tr>
6066
</thead>
6167
<tbody>
68+
6269
@foreach($authPoints as $point)
6370
<tr>
64-
<td>{{$point->point->reason->name}}</td>
65-
<td>{{$point->point->behavior[0]->human_name}}</td>
71+
<td>{{$point->point->reason->name ?? ''}}</td>
72+
<td>{{$point->point->behavior[0]->human_name ?? ''}}</td>
6673
<td>{{$point->point->count}}</td>
6774
<td>{{$point->created_at}}</td>
6875
</tr>

resources/views/frontend/exam/show.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
value="{{$option->id}}">
6969
<label class="form-check-label"
7070
for="inlineRadio1{{$option->id}}">{{$option->option}}</label>
71-
@if($option->correct)
71+
@if($exam->authSubmit->first() && $option->correct)
7272
<i class="fas fa-check-circle color-green"></i>
7373
@endif
7474
</div>

routes/web.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
// dd($submit);
2626
$response = Http::get('http://localhost:3000',['url'=>$submit->getFirstMediaPath('submit_file')]);
2727
// dd($response->json());
28+
// dd($response->body());
2829
$html = $response->json('someData');
2930
return view('v',compact('html'));
3031
})->name('ss');

0 commit comments

Comments
 (0)