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

complete ticket

Browse Source
This commit is contained in:
saeid
2019-07-03 09:56:10 +04:30
parent 1ab25bf79d
commit a8bc46151e
11 changed files with 237 additions and 67178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MessageController.php
+34 -14
View File
@@ -9,16 +9,9 @@ use App\User;
class MessageController extends Controller class MessageController extends Controller
{ {
public function index() public function index(Request $request)
{ {
// $Messages = Message::with('recipient_user', 'sender_user')->paginate(10);
$User = auth('api')->user(); $User = auth('api')->user();
// $ReceivedMessages = $User->messagesReceived;
// $SentMessages = $User->messagesSent;
// //
// $Messages = $SentMessages->merge($ReceivedMessages);
// $Users = User::whereHas('messagesSent')
$role = null; $role = null;
$medical_center_id = null; $medical_center_id = null;
@@ -27,7 +20,7 @@ class MessageController extends Controller
$medical_center_id = $User->medical_center_id; $medical_center_id = $User->medical_center_id;
$role = 'Admin'; $role = 'Admin';
} }
$remove = $User->id;
$Users = User::whereHas('messagesSent', function($q) use($User){ $Users = User::whereHas('messagesSent', function($q) use($User){
$q->where('sender_user_id', $User->id)->orWhere('recipient_user_id', $User->id); $q->where('sender_user_id', $User->id)->orWhere('recipient_user_id', $User->id);
})->orWhereHas('messagesReceived', function($q) use($User){ })->orWhereHas('messagesReceived', function($q) use($User){
@@ -41,10 +34,23 @@ class MessageController extends Controller
}) })
->paginate(10); ->paginate(10);
// foreach ($Users as $User) { foreach ($Users as $user) {
// $CountMessages = $User->messagesSent->count() + $User->messagesReceived->count(); $UnReadReceivedMessages = Message::where('sender_user_id', $user->id)->where('recipient_user_id', $User->id)->where('status','UnRead')->get()->count();
// $User->message_count = $CountMessages; $user->unread_messages_count = $UnReadReceivedMessages;
// }
$MessagesCount = Message::where(function ($query) use ($user,$User){
$query->where('sender_user_id', $user->id)->where('recipient_user_id', $User->id);
})->orWhere(function ($query) use ($user,$User){
$query->where('sender_user_id', $User->id)->where('recipient_user_id', $user->id);
})->get()->count();
$user->messages_count = $MessagesCount;
}
//
// $Users = $Users->filter(function ($value, $key) use($remove){
// return $value['id'] != $remove;
// });
return \MessageResponse::data($Users); return \MessageResponse::data($Users);
} }
@@ -100,10 +106,24 @@ class MessageController extends Controller
} }
public function destroy(Message $Message) public function destroy(Message $Message)
{ {
if (!auth('api')->user()->can('delete', $Message)) { if (auth('api')->user()->cant('delete', $Message)) {
return \MessageResponse::error(trans('messages.access_denied')); return \MessageResponse::error(trans('messages.access_denied'));
} }
$Message->delete(); $Message->delete();
return \MessageResponse::success(trans('messages.success')); return \MessageResponse::success(trans('messages.success'));
} }
public function destroyUserMessages(User $User)
{
// if (auth('api')->user()->cant('deleteUserMessage', Message::class)) {
// return \MessageResponse::error(trans('messages.access_denied'));
// }
Message::where(function ($query) use ($User)
{
$query->where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $User->id);
})->orWhere(function ($query) use ($User)
{
$query->where('sender_user_id', $User->id)->where('recipient_user_id', auth('api')->user()->id);
})->get()->each->delete();
return \MessageResponse::success(trans('messages.success'));
}
} }
app/Http/Controllers/UserController.php
+1 -1
View File
@@ -183,7 +183,7 @@ class UserController extends Controller
} }
} }
$users = User::select('id', 'name')->where('name', 'LIKE', '%'.$request->name.'%') $users = User::where('id', '<>', $User->id)->select('id', 'name')->where('name', 'LIKE', '%'.$request->name.'%')
->when($medical_center_id, function($query) use ($medical_center_id){ ->when($medical_center_id, function($query) use ($medical_center_id){
$query->where('medical_center_id', $medical_center_id); $query->where('medical_center_id', $medical_center_id);
}) })
public/js/vue/app.js
Vendored
+1 -66982
View File
File diff suppressed because one or more lines are too long
resources/js/vue/components/core/Toolbar.vue
+1 -3
View File
@@ -72,7 +72,6 @@
<v-list> <v-list>
<router-link <router-link
v-ripple
class="toolbar-items" class="toolbar-items"
:to="{name: 'MyInfo'}" :to="{name: 'MyInfo'}"
> >
@@ -83,7 +82,6 @@
<router-link <router-link
v-ripple
class="toolbar-items" class="toolbar-items"
:to="{name: 'Tickets'}" :to="{name: 'Tickets'}"
> >
@@ -116,7 +114,7 @@
</v-card> </v-card>
</v-menu> </v-menu>
<v-badge v-ripple class="toolbar-items Pointer" @click.native="submitLogout" > <v-badge class="toolbar-items Pointer" @click.native="submitLogout" >
<v-icon color="tertiary">input</v-icon> <v-icon color="tertiary">input</v-icon>
</v-badge> </v-badge>
</v-flex> </v-flex>
resources/js/vue/components/modal/ticket/NewMessage.vue
+1 -2
View File
@@ -38,7 +38,7 @@ export default {
}, },
watch: { watch: {
search(val) { search(val) {
val && this.querySelections(val); val && val.length > 2 && this.querySelections(val);
} }
}, },
methods: { methods: {
@@ -48,7 +48,6 @@ export default {
const result = await ApiService.get(urls.userSearch(val)); const result = await ApiService.get(urls.userSearch(val));
if (result && result.data.data) { if (result && result.data.data) {
this.items = result.data.data; this.items = result.data.data;
this.user_id = this.data.data.id;
this.loading = false; this.loading = false;
} }
} }
resources/js/vue/components/ticket/SendMessage.vue
+11 -2
View File
@@ -23,7 +23,7 @@
import { ApiService } from "@/services"; import { ApiService } from "@/services";
import { urls } from "@/config/urls"; import { urls } from "@/config/urls";
import toast from "@/services/global/toast.service"; import toast from "@/services/global/toast.service";
import { mapMutations } from "vuex"; import { mapMutations, mapGetters } from "vuex";
export default { export default {
data() { data() {
return { return {
@@ -47,17 +47,26 @@ export default {
this.form.user_id = this.userId; this.form.user_id = this.userId;
}, },
methods: { methods: {
...mapMutations("modal", ["closeModal"]), ...mapMutations("modal", ["closeModal", "setResultModal"]),
async register() { async register() {
if(this.userId > 0) { if(this.userId > 0) {
const result = await ApiService.post( urls.storeMessages, this.form ); const result = await ApiService.post( urls.storeMessages, this.form );
if (result && result.status == 200) { if (result && result.status == 200) {
this.setResultModal(Math.random(12));
this.closeModal(); this.closeModal();
} }
} else { } else {
toast.error('please Select User'); toast.error('please Select User');
} }
} }
},
watch: {
userId(val) {
this.form.user_id = val;
}
},
computed: {
...mapGetters("modal", ["getModalProperties"])
} }
}; };
</script> </script>
resources/js/vue/config/urls.js
Vendored
+6 -1
View File
@@ -15,13 +15,18 @@ const urls = {
sendVerifyCode : `/password/verifyCode`, sendVerifyCode : `/password/verifyCode`,
changePassword : `/password/reset`, changePassword : `/password/reset`,
storeMessages : `/Messages`, storeMessages : `/Messages`,
listMessages : `/Messages`, listMessages : function(page) {
return `/Messages?page=${page}`;
},
userSearch : function(val) { userSearch : function(val) {
return `/users/search?name=${val}`; return `/users/search?name=${val}`;
}, },
showMessages : function(user_id) { showMessages : function(user_id) {
return "/Messages/" + user_id; return "/Messages/" + user_id;
}, },
removeUserMessage : function(user_id) {
return "/Messages/User/" + user_id;
},
listTestType : function(filter) { listTestType : function(filter) {
return "/TestTypes" + filter; return "/TestTypes" + filter;
}, },
resources/js/vue/views/Dashboard.vue
+4 -2
View File
@@ -2,6 +2,7 @@
<v-container fluid> <v-container fluid>
<material-card class="" <material-card class=""
v-if="$hasRole('Admin')"
color="black" color="black"
title="Admin" title="Admin"
text="" text=""
@@ -26,7 +27,8 @@
</material-card> </material-card>
<material-card class="" <material-card
v-if="$hasRole('Supervisor|Admin')"
color="black" color="black"
title="Supervisor" title="Supervisor"
text="" text=""
@@ -50,7 +52,7 @@
</v-layout> </v-layout>
</material-card> </material-card>
<material-card class="" <material-card
color="black" color="black"
title="User" title="User"
text="" text=""
resources/js/vue/views/Tickets/List.vue
+51 -23
View File
@@ -3,11 +3,7 @@
<material-card class color="black" title="My Recent ChatList" text> <material-card class color="black" title="My Recent ChatList" text>
<v-toolbar flat color="white"> <v-toolbar flat color="white">
<v-toolbar-title></v-toolbar-title> <v-toolbar-title></v-toolbar-title>
<v-divider <v-divider class="mx-2" inset vertical></v-divider>
class="mx-2"
inset
vertical
></v-divider>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-btn color="black" @click="newmessage" class="WM-ActionButton mb-2"> <v-btn color="black" @click="newmessage" class="WM-ActionButton mb-2">
<v-icon class="white--text mr-2 caption">fas fa-plus</v-icon> <v-icon class="white--text mr-2 caption">fas fa-plus</v-icon>
@@ -27,29 +23,38 @@
/> />
</template> </template>
<template slot="items" slot-scope="{ item }"> <template slot="items" slot-scope="{ item }">
<td class="headline font-weight-light WM-NoLetterSpacing">{{ item.name }}</td> <td
class="headline font-weight-light WM-NoLetterSpacing"
>{{ item.name }}</td>
<td class="title font-weight-light"> <td class="title font-weight-light">
<span class="Chip"> <span class="Chip">
<span class="Count Content"> <span class="Count Content">{{ item.messages_count }} count</span>
3 count
</span>
<!-- {{ item.messages_count }} -->
</span> </span>
</td> </td>
<td class="title font-weight-light"> <td class="title font-weight-light">
<span class="Chip"> <span class="Chip">
<span class="Unread Content"> <span
3 unread class="Unread Content"
<!-- {{ item.unread_messages_count }} --> >{{ item.unread_messages_count }} unread</span>
</span> </span>
</span>
<!-- {{ item.unread_messages_count }} -->
</td> </td>
<td class="text-xs-right"> <td class="text-xs-right">
<v-btn color="pink" @click="showmessages(item.id)" class="WM-ActionButton"> <v-btn
color="pink"
@click="showmessages(item.id)"
class="WM-ActionButton"
>
<v-icon class="white--text mr-2 caption">fas fa-chevron-right</v-icon> <v-icon class="white--text mr-2 caption">fas fa-chevron-right</v-icon>
<span>Show Message</span> <span>Show Message</span>
</v-btn> </v-btn>
<v-btn
color="pink"
@click="remove(item.id)"
class="WM-ActionButton"
>
<v-icon class="white--text mr-2 caption">fas fa-trash</v-icon>
<span>delete</span>
</v-btn>
</td> </td>
</template> </template>
</v-data-table> </v-data-table>
@@ -74,7 +79,7 @@
<script> <script>
import { ApiService } from "@/services"; import { ApiService } from "@/services";
import { urls } from "@/config/urls"; import { urls } from "@/config/urls";
import { mapMutations } from 'vuex'; import { mapMutations, mapGetters } from "vuex";
export default { export default {
data: () => ({ data: () => ({
headers: [ headers: [
@@ -101,9 +106,10 @@ export default {
} }
], ],
filter: { filter: {
name: '' name: ""
}, },
items: [], items: [],
refresh: "",
currentPage: 1, currentPage: 1,
lastPage: 1 lastPage: 1
}), }),
@@ -112,24 +118,48 @@ export default {
}, },
methods: { methods: {
async load(page = 1) { async load(page = 1) {
const result = await ApiService.get(urls.listMessages); const result = await ApiService.get(urls.listMessages(page));
if (result && result.data.data) { if (result && result.data.data) {
this.items = result.data.data.data; this.items = result.data.data.data;
this.currentPage = result.data.data.current_page; this.currentPage = result.data.data.current_page;
this.lastPage = result.data.data.last_page; this.lastPage = result.data.data.last_page;
} }
}, },
...mapMutations('modal',['changeCurrentModal']), ...mapMutations("modal", ["changeCurrentModal"]),
newmessage() { newmessage() {
this.changeCurrentModal({ modal: "modal-ticket-new-message" }); this.changeCurrentModal({ modal: "modal-ticket-new-message" });
}, },
showmessages(user_id) { showmessages(user_id) {
this.changeCurrentModal({ modal: "modal-ticket-show-messages", properties: { user_id : user_id } }); this.changeCurrentModal({
modal: "modal-ticket-show-messages",
properties: { user_id: user_id }
});
}, },
async remove(user_id) {
const result = await ApiService.delete(
urls.removeUserMessage(user_id)
);
if (result && result.status == 200) {
for (const key in this.items) {
if (
this.items.hasOwnProperty(key) &&
this.items[key].id == user_id
) {
this.items.splice(key, 1);
}
}
}
}
},
computed: {
...mapGetters("modal", ["getModalResult"])
}, },
watch: { watch: {
currentPage(page) { currentPage(page) {
this.load(page); this.load(page);
},
getModalResult() {
this.load();
} }
} }
}; };
@@ -166,10 +196,8 @@ export default {
} }
.Chip .Content.Count { .Chip .Content.Count {
background-color: #b2dfdb; background-color: #b2dfdb;
} }
.Chip .Content.Unread { .Chip .Content.Unread {
background-color: #ffcdd2; background-color: #ffcdd2;
} }
</style> </style>
resources/js/vue/views/Tickets/MyTicket.vue
-22
View File
@@ -1,22 +0,0 @@
<template>
<div>
<v-container grid-list-xs fluid>
<v-layout align-center justify-center wrap class="px-5 my-3">
<v-flex xs12 sm4 md4>
<v-card>
<v-card-title>salam</v-card-title>
<v-card-text>khoobi</v-card-text>
</v-card>
</v-flex>
</v-layout>
<v-layout align-center justify-center wrap class="px-5 my-3">
<v-flex xs12 sm4 md4>
<v-card>
<v-card-title>salam</v-card-title>
<v-card-text>khoobi</v-card-text>
</v-card>
</v-flex>
</v-layout>
</v-container>
</div>
</template>
routes/api.php
+1
View File
@@ -47,5 +47,6 @@ Route::middleware('auth:api')->group(function () {
Route::resource('Packages', 'PackageController'); Route::resource('Packages', 'PackageController');
Route::resource('Messages', 'MessageController'); Route::resource('Messages', 'MessageController');
Route::delete('Messages/User/{User}', 'MessageController@destroyUserMessages');
Route::post('/Package/Verify/{Package}', 'PackageController@verifyPackage'); Route::post('/Package/Verify/{Package}', 'PackageController@verifyPackage');
}); });