cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-12 13:31:07 +03:30
Code Issues Packages Projects Releases Wiki Activity

change Ticket

Browse Source
This commit is contained in:
saeid
2019-07-01 15:46:22 +04:30
parent f0eefd4f0a
commit 506ddf74f0
65 changed files with 368 additions and 115734 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MessageController.php
+62 -11
View File
@@ -5,33 +5,84 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Http\Requests\StoreMessageRequest;
use App\Message;
use App\User;
class MessageController extends Controller
{
public function index()
{
$Messages = Message::with('recipient_user', 'sender_user')->paginate(10);
// $User = auth('api')->user();
// $MyReceivedMessages = $User->messagesReceived;
// $MySentMessages = $User->messagesSent;
// dd($MyMessages);
return \MessageResponse::data($Messages);
// $Messages = Message::with('recipient_user', 'sender_user')->paginate(10);
$User = auth('api')->user();
// $ReceivedMessages = $User->messagesReceived;
// $SentMessages = $User->messagesSent;
// //
// $Messages = $SentMessages->merge($ReceivedMessages);
// $Users = User::whereHas('messagesSent')
$role = null;
$medical_center_id = null;
$User = auth('api')->user();
if ($User->hasRole('Supervisor') || $User->hasRole('User')) {
$medical_center_id = $User->medical_center_id;
$role = 'Admin';
}
$Users = User::whereHas('messagesSent', function($q) use($User){
$q->where('sender_user_id', $User->id)->orWhere('recipient_user_id', $User->id);
})->orWhereHas('messagesReceived', function($q) use($User){
$q->where('sender_user_id', $User->id)->orWhere('recipient_user_id', $User->id);
})
->when($medical_center_id, function($query) use ($medical_center_id){
$query->where('medical_center_id', $medical_center_id);
})
->when($role, function($query) use($role){
$query->role($role);
})
->paginate(10);
return \MessageResponse::data($Users);
}
public function create()
{
}
public function show(Message $Message)
public function show($UserID)
{
return \MessageResponse::data($Message);
// if (!auth('api')->user()->can('show', $Message)) {
// return \MessageResponse::error(trans('messages.access_denied'));
// }
// $Message->status = 'Read';
// $Message->save();
$User = User::findOrFail($UserID);
// dd($UserID);
$SendMessages = Message::where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $UserID)->get();
$ReceivedMessages = Message::where('sender_user_id', $UserID)->where('recipient_user_id', auth('api')->user()->id)->get();
// foreach ($ReceivedMessages as $ReceivedMessage) {
// $ReceivedMessage->status = 'Read';
// // $SendMessage->save();
// }
$Messages = Message::whereHas('sender_user', function($q) use($User){
$q->where('id', $User->id);
})->orWhereHas('recipient_user', function($q) use($User){
$q->where('id', $User->id);
})->get();
// $Messages = $SendMessages->merge($ReceivedMessages)->sortby('created_at');
// $Messages =
return \MessageResponse::data($Messages);
}
public function store(StoreMessageRequest $request)
{
$MessageData = [
'title' => $request->title,
'text' => $request->text,
// 'title' => $request->title,
'text' => $request->message,
'sender_user_id' => auth('api')->user()->id,
'recipient_user_id' => $request->recipient_user_id,
'recipient_user_id' => $request->user_id,
'status' => 'UnRead',
];
Message::create($MessageData);
return \MessageResponse::success(trans('messages.success'));
app/Http/Controllers/PackageController.php
+27 -2
View File
@@ -8,9 +8,18 @@ use App\Package;
class PackageController extends Controller
{
public function index()
public function index(Request $request)
{
$Packages = Package::paginate(10);
$Packages = Package::when($request->has('name') && $request->name, function($query) use($request){
$query->where('name', 'LIKE', '%'.$request->name.'%');
})
->when($request->has('result') && $request->result, function($query) use($request){
$query->where('result', $request->result);
})
->when($request->has('unique_id') && $request->unique_id, function($query) use($request){
$query->where('unique_id', $request->unique_id);
})
->with('user')->paginate(10);
return \MessageResponse::data($Packages);
}
public function create()
@@ -29,6 +38,8 @@ class PackageController extends Controller
'unique_id' => $UniqueID,
'result' => $request->result,
'description' => $request->description,
'user_id' => auth('api')->user()->id,
'verified' => 'NotVerified',
];
Package::create($PackageData);
return \MessageResponse::success(trans('messages.success'));
@@ -50,4 +61,18 @@ class PackageController extends Controller
$Package->delete();
return \MessageResponse::success(trans('messages.success'));
}
public function verifyPackage(Package $Package)
{
if (auth('api')->user()->cant('verifyPackage', $Package)) {
return \MessageResponse::error(trans('You dont have permission'));
}
if ($Package->verified == 'Verified') {
$Package->verified = 'NotVerified';
} else {
$Package->verified = 'Verified';
}
$Package->save();
$Package = $Package->load('user');
return \MessageResponse::success(trans('messages.success'), null, $Package);
}
}
app/Http/Controllers/UserController.php
+38 -1
View File
@@ -11,7 +11,7 @@ use Illuminate\Http\Request;
use App\Http\Requests\StoreUserRequest;
use App\MedicalCenter;
use App\User;
use App\Message;
class UserController extends Controller
@@ -157,5 +157,42 @@ class UserController extends Controller
{
return \MessageResponse::data([ 'user' => auth('api')->user(), 'roles' => auth('api')->user()->getRoleNames() ]);
}
public function getMessages()
{
$User = auth('api')->user();
// $ReceivedMessages = $User->messagesReceived;
// $SentMessages = $User->messagesSent;
$SentMessages = Message::with('recipient_user')->where('sender_user_id', $User->id)->get();
$ReceivedMessages = Message::with('sender_user')->where('recipient_user_id', $User->id)->get();
return \MessageResponse::data(['ReceivedMessages' => $ReceivedMessages, 'SentMessages' => $SentMessages]);
}
public function searchUser(Request $request)
{
// if (auth('api')->user()->cant('searchUser', User::class)) {
// return \MessageResponse::error(trans('messages.access_denied'));
// }
$role = null;
$medical_center_id = null;
$User = auth('api')->user();
if ($User->hasRole('Supervisor') || $User->hasRole('User')) {
$medical_center_id = $User->medical_center_id;
if ($User->hasRole('Supervisor')){
$role = 'Admin';
}
}
$users = User::select('id', 'name')->where('name', 'LIKE', '%'.$request->name.'%')
->when($medical_center_id, function($query) use ($medical_center_id){
$query->where('medical_center_id', $medical_center_id);
})
->when($role, function($query) use($role){
$query->role($role);
})
->get();
return \MessageResponse::data($users);
}
}
app/Http/Requests/StorePackageRequest.php
+1
View File
@@ -35,6 +35,7 @@ class StorePackageRequest extends FormRequest
$Package = $this->route('Package');
return [
'name' => 'required|max:100|unique:packages,id,'.$Package->id,
'unique_id' => 'required|max:100|unique:packages,id,'.$Package->id,
'result' => 'required',
];
break;
app/Message.php
+1 -1
View File
@@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model;
class Message extends Model
{
public $fillable = ['title', 'text', 'recipient_user_id', 'sender_user_id'];
public $fillable = ['title', 'text', 'status', 'recipient_user_id', 'sender_user_id'];
public function sender_user()
{
return $this->belongsTo('App\User', 'sender_user_id');
app/Package.php
+6 -2
View File
@@ -6,6 +6,10 @@ use Illuminate\Database\Eloquent\Model;
class Package extends Model
{
public $fillable = ['name', 'unique_id', 'result', 'description'];
public $fillable = ['name', 'unique_id', 'user_id', 'result', 'description'];
public function user()
{
return $this->belongsTo('App\User');
}
}
app/Policies/MessagePolicy.php
+23 -29
View File
@@ -1,29 +1,23 @@
<?php
namespace App\Policies;
use App\User;
use App\Message;
use Doctrine\Tests\Common\Inflector\InflectorTest;
class MessagePolicy
{
public function delete(User $User, Message $Message)
{
// if($User->hasRole('Admin') && $Message->users->count() == 0)
return true;
}
public function update(User $User, Message $Message)
{
// if($User->hasRole('Admin'))
return true;
}
public function store(User $User)
{
// if($User->hasRole('Admin'))
return true;
}
}
<?php␍
␍
namespace App\Policies;␍
␍
use App\User;␍
use App\Message;␍
use Doctrine\Tests\Common\Inflector\InflectorTest;␍
␍
class Message␍
{␍
public function delete(User $User, Message $Message)␍
{␍
// if($Message->sender_user_id == $User->id || $Message->recipient_user_id == $User->id)␍
return true;␍
}␍
␍
␍
public function store(User $User)␍
{␍
// if($User->hasRole('Admin'))␍
return true;␍
}␍
}␍
app/Policies/PackagePolicy.php
+5
View File
@@ -25,5 +25,10 @@ class PackagePolicy
// if($User->hasRole('Admin'))
return true;
}
public function verifyPackage(User $User, Package $Package)
{
// if($User->hasRole('Admin'))
return true;
}
}
app/User.php
+4
View File
@@ -65,4 +65,8 @@ class User extends Authenticatable
{
return $this->hasMany('App\Message', 'recipient_user_id');
}
public function packages()
{
return $this->hasMany('App\Package');
}
}